diff --git a/.editorconfig b/.editorconfig
index 25a2f7c928..0ab5ea61ec 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,4 @@
 [*.{kt,kts}]
-ktlint_ignore_back_ticked_identifier = true
 
 indent_size = 4
 indent_style = space
diff --git a/.gitignore b/.gitignore
index 25c98d5d1f..dcdbe5fc57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,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..1c44bd0851
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,212 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    kotlin("kapt")
+    kotlin("plugin.serialization")
+    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 {
+    mavenCentral()
+    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:analytics"))
+    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)
+    implementation(Library.kotlinSerialization)
+
+    /** 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/debug/res/values-ru/strings.xml b/app/src/debug/res/values-ru/strings.xml
index 1abc31ee12..682b552975 100644
--- a/app/src/debug/res/values-ru/strings.xml
+++ b/app/src/debug/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">DebugTangem</string>
+    <string name="tangem_app_name">DebugTangem</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
index bf9ef4d842..764dd201cc 100644
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translatable="false">DebugTangem</string>
+    <string name="tangem_app_name" translatable="false">DebugTangem</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/debug_beta/res/values-ru/strings.xml b/app/src/debug_beta/res/values-ru/strings.xml
index 3e2d147b31..3ae149049f 100644
--- a/app/src/debug_beta/res/values-ru/strings.xml
+++ b/app/src/debug_beta/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">BetaTangem</string>
+    <string name="tangem_app_name">BetaTangem</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/debug_beta/res/values/strings.xml b/app/src/debug_beta/res/values/strings.xml
index 3e2d147b31..3ae149049f 100644
--- a/app/src/debug_beta/res/values/strings.xml
+++ b/app/src/debug_beta/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">BetaTangem</string>
+    <string name="tangem_app_name">BetaTangem</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 874783a15d..5fa1e04d9d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,10 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.tangem.wallet">
 
-    <uses-feature
-        android:name="android.hardware.nfc"
-        android:required="true" />
-
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -19,6 +15,9 @@
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="true" />
 
     <queries>
         <intent>
@@ -29,16 +28,15 @@
 
     <application
         android:theme="@style/AppTheme"
-        android:label="@string/app_name"
+        android:label="@string/tangem_app_name"
         android:name="com.tangem.tap.TapApplication"
         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"
@@ -52,47 +50,49 @@
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data
+                    android:pathPrefix="/ndef"
                     android:host="www.tangem.com"
                     android:scheme="http" />
                 <data
+                    android:pathPrefix="/ndef"
                     android:host="www.tangem.com"
                     android:scheme="https" />
                 <data
+                    android:pathPrefix="/ndef"
                     android:host="tangem.com"
                     android:scheme="http" />
                 <data
+                    android:pathPrefix="/ndef"
                     android:host="tangem.com"
                     android:scheme="https" />
                 <data
+                    android:pathPrefix="/ndef"
                     android:host="app.tangem.com"
                     android:scheme="https" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data
-                    android:host="ext"
-                    android:pathPrefix="/android.com:pkg"
-                    android:scheme="vnd.android.nfc" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.nfc.action.TECH_DISCOVERED" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
             <meta-data
                 android:name="android.nfc.action.TECH_DISCOVERED"
                 android:resource="@xml/nfc_tech_filter" />
 
+            <intent-filter>
+                <action android:name="android.nfc.action.TAG_DISCOVERED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -102,6 +102,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 +153,4 @@
         </provider>
 
     </application>
-
 </manifest>
diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config
index a1658496e7..93150ef69d 160000
--- a/app/src/main/assets/tangem-app-config
+++ b/app/src/main/assets/tangem-app-config
@@ -1 +1 @@
-Subproject commit a1658496e777b611fc990ef2bc1a1a1fd48bc1e6
+Subproject commit 93150ef69daf244a92266d7cdfbc9294b745b4e2
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..6b5d0bd175 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -10,35 +10,46 @@ import androidx.core.view.WindowInsetsControllerCompat
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.tangem.TangemSdk
-import com.tangem.domain.common.FeatureCoroutineExceptionHandler
 import com.tangem.operations.backup.BackupService
 import com.tangem.tangem_sdk_new.extensions.init
+import com.tangem.tangem_sdk_new.extensions.initWithBiometrics
 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.GooglePayService
+import com.tangem.tap.common.shop.googlepay.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.onboarding.products.wallet.redux.BackupAction
 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.utils.coroutines.FeatureCoroutineExceptionHandler
 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 +60,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>()
@@ -64,11 +78,19 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         systemActions()
         store.dispatch(NavigationAction.ActivityCreated(WeakReference(this)))
 
-        tangemSdk = TangemSdk.init(this, TangemSdkManager.config)
+        tangemSdk = TangemSdk.initWithBiometrics(this, TangemSdkManager.config)
         tangemSdkManager = TangemSdkManager(tangemSdk, this)
+        appStateHolder.tangemSdkManager = tangemSdkManager
+        appStateHolder.tangemSdk = tangemSdk
         backupService = BackupService.init(tangemSdk, this)
+        userWalletsListManager = UserWalletsListManager.provideBiometricImplementation(
+            context = applicationContext,
+            tangemSdkManager = tangemSdkManager,
+        )
+        appStateHolder.userWalletsListManager = userWalletsListManager
+        userWalletsListManagerSafe = userWalletsListManager
+        lockUserWalletsTimer = LockUserWalletsTimer(owner = this)
 
-        store.dispatch(GlobalAction.SetResources(getAndroidResources()))
         store.dispatch(
             ShopAction.CheckIfGooglePayAvailable(
                 GooglePayService(createPaymentsClient(this), this),
@@ -76,17 +98,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)
@@ -105,19 +117,12 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         super.onResume()
         notificationsHandler = NotificationsHandler(binding.fragmentContainer)
 
-        val backStackIsEmpty = supportFragmentManager.backStackEntryCount == 0
-        val isScannedBefore = store.state.globalState.scanResponse != null
-        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))
-        }
-        intentHandler.handleIntent(intent)
+        navigateToInitialScreenIfNeeded(intent)
     }
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-        intentHandler.handleIntent(intent)
+        intentHandler.handleIntent(intent, userWalletsListManager.hasSavedUserWallets)
     }
 
     override fun onStart() {
@@ -140,7 +145,9 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         if (snackbar != null) return
 
         snackbar = Snackbar.make(
-            binding.fragmentContainer, getString(text), Snackbar.LENGTH_INDEFINITE,
+            binding.fragmentContainer,
+            getString(text),
+            Snackbar.LENGTH_INDEFINITE,
         )
         if (buttonTitle != null && action != null) {
             snackbar?.setAction(getString(buttonTitle), action)
@@ -174,4 +181,36 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     override fun removeOnActivityResultCallback(callback: OnActivityResultCallback) {
         onActivityResultCallbacks.remove(callback)
     }
+
+    override fun onUserInteraction() {
+        super.onUserInteraction()
+
+        lockUserWalletsTimer?.restart()
+    }
+
+    private fun navigateToInitialScreenIfNeeded(intent: Intent?) {
+        val backStackIsEmpty = supportFragmentManager.backStackEntryCount == 0
+        val isNotScannedBefore = store.state.globalState.scanResponse == null
+        val isOnboardingServiceNotActive = store.state.globalState.onboardingState.onboardingStarted
+        val isShopNotOpened = store.state.shopState.total != null
+        when {
+            !backStackIsEmpty && isNotScannedBefore && isOnboardingServiceNotActive && isShopNotOpened -> {
+                navigateToInitialScreen(intent)
+            }
+            backStackIsEmpty -> {
+                navigateToInitialScreen(intent)
+            }
+        }
+    }
+
+    private fun navigateToInitialScreen(intent: Intent?) {
+        if (userWalletsListManager.hasSavedUserWallets) {
+            store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Welcome))
+            store.dispatchOnMain(WelcomeAction.HandleIntentIfNeeded(intent))
+        } else {
+            store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Home))
+            intentHandler.handleIntent(intent, hasSavedUserWallets = false)
+        }
+        store.dispatch(BackupAction.CheckForUnfinishedBackup)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/NavBarInsetsFragmentLifecycleCallback.kt b/app/src/main/java/com/tangem/tap/NavBarInsetsFragmentLifecycleCallback.kt
index 2239eacd70..6e620bd0bc 100644
--- a/app/src/main/java/com/tangem/tap/NavBarInsetsFragmentLifecycleCallback.kt
+++ b/app/src/main/java/com/tangem/tap/NavBarInsetsFragmentLifecycleCallback.kt
@@ -36,4 +36,4 @@ class NavBarInsetsFragmentLifecycleCallback : FragmentLifecycleCallbacks() {
             windowInsets
         }
     }
-}
+}
\ 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..0c8ba92c53 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -7,14 +7,23 @@ 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.core.analytics.Analytics
+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.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.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
@@ -28,38 +37,100 @@ 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.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(),
+        )
+
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
 
         foregroundActivityObserver = ForegroundActivityObserver()
+        activityResultCaller = foregroundActivityObserver
         registerActivityLifecycleCallbacks(foregroundActivityObserver.callbacks)
 
         DomainLayer.init()
@@ -68,7 +139,7 @@ class TapApplication : Application(), ImageLoaderFactory {
         walletConnectRepository = WalletConnectRepository(this)
 
         assetReader = AndroidAssetReader(this)
-        val configLoader = FeaturesLocalLoader(assetReader, MoshiConverter.defaultMoshi())
+        val configLoader = FeaturesLocalLoader(assetReader, MoshiConverter.sdkMoshi)
         initConfigManager(configLoader, ::initWithConfigDependency)
         initWarningMessagesManager()
 
@@ -78,6 +149,9 @@ class TapApplication : Application(), ImageLoaderFactory {
             context = this,
             tangemTechService = store.state.domainNetworks.tangemTechService,
         )
+        appStateHolder.mainStore = store
+        appStateHolder.userTokensRepository = userTokensRepository
+        appStateHolder.walletStoresManager = walletStoresManager
     }
 
     override fun newImageLoader(): ImageLoader {
@@ -98,21 +172,29 @@ class TapApplication : Application(), ImageLoaderFactory {
     private fun initWithConfigDependency(config: Config) {
         shopService = TangemShopService(this, config.shopify!!)
         initAnalytics(this, config)
-        initFeedbackManager(this, preferencesStorage, config)
+        initFeedbackManager(this, preferencesStorage)
     }
 
     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(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.sdkMoshiConverter,
+        )
+        factory.build(Analytics, buildData)
     }
 
-    private fun initFeedbackManager(context: Context, preferencesStorage: PreferencesStorage, config: Config) {
+    private fun initFeedbackManager(context: Context, preferencesStorage: PreferencesStorage) {
         fun initAdditionalFeedbackInfo(context: Context): AdditionalFeedbackInfo = AdditionalFeedbackInfo().apply {
             appVersion = try {
                 val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
diff --git a/app/src/main/java/com/tangem/tap/WaitForMigration.kt b/app/src/main/java/com/tangem/tap/WaitForMigration.kt
index 536b9711eb..59c14fb064 100644
--- a/app/src/main/java/com/tangem/tap/WaitForMigration.kt
+++ b/app/src/main/java/com/tangem/tap/WaitForMigration.kt
@@ -4,4 +4,4 @@ package com.tangem.tap
 [REDACTED_AUTHOR]
  */
 
-val DELAY_SDK_DIALOG_CLOSE = 1400L
\ No newline at end of file
+const val DELAY_SDK_DIALOG_CLOSE = 1400L
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/CurrencyConverter.kt b/app/src/main/java/com/tangem/tap/common/CurrencyConverter.kt
index 2ae1553d38..2f3e688532 100644
--- a/app/src/main/java/com/tangem/tap/common/CurrencyConverter.kt
+++ b/app/src/main/java/com/tangem/tap/common/CurrencyConverter.kt
@@ -9,8 +9,8 @@ import java.math.RoundingMode
 [REDACTED_AUTHOR]
  */
 class CurrencyConverter(
-        private val rateValue: BigDecimal,
-        private val decimals: Int
+    private val rateValue: BigDecimal,
+    private val decimals: Int
 ) {
     private val roundingMode = RoundingMode.HALF_UP
 
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..93c54eeefa 100644
--- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
@@ -14,13 +14,14 @@ import com.tangem.tap.features.details.ui.walletconnect.dialogs.ClipboardOrScanQ
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.PersonalSignDialog
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.TransactionDialog
 import com.tangem.tap.features.onboarding.AddressInfoBottomSheetDialog
-import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
-import com.tangem.tap.features.onboarding.products.twins.ui.dialog.CreateWalletInterruptDialog
+import com.tangem.tap.features.onboarding.OnboardingDialog
+import com.tangem.tap.features.onboarding.products.twins.ui.dialog.TwinningProcessNotCompletedDialog
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupDialog
+import com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog.InterruptOnboardingDialog
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog.NoFundsForActivationDialog
+import com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog.PutVisaCardDialog
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog.RegistrationErrorDialog
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog.SaltPayDialog
-import com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog.TryToInterruptRegistrationDialog
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.AddMoreBackupCardsDialog
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.BackupInProgressDialog
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.ConfirmDiscardingBackupDialog
@@ -55,6 +56,7 @@ class DialogManager : StoreSubscriber<GlobalState> {
         store.unsubscribe(this)
     }
 
+    @Suppress("LongMethod", "ComplexMethod")
     override fun newState(state: GlobalState) {
         if (state.dialog == null) {
             dialog?.dismiss()
@@ -72,17 +74,17 @@ class DialogManager : StoreSubscriber<GlobalState> {
             is AppDialog.ScanFailsDialog -> ScanFailsDialog.create(context)
             is AppDialog.AddressInfoDialog -> AddressInfoBottomSheetDialog(state.dialog, context)
             is AppDialog.TestActionsDialog -> TestActionsBottomSheetDialog(state.dialog, context)
-            is TwinCardsAction.Wallet.ShowInterruptDialog ->
-                CreateWalletInterruptDialog.create(state.dialog, context)
+            is OnboardingDialog.TwinningProcessNotCompleted -> TwinningProcessNotCompletedDialog.create(context)
+            is OnboardingDialog.InterruptOnboarding -> InterruptOnboardingDialog.create(context, state.dialog)
             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 +93,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,
                 )
@@ -109,10 +111,8 @@ class DialogManager : StoreSubscriber<GlobalState> {
                 ChooseNetworkDialog.create(state.dialog.session, state.dialog.networks, context)
             is WalletConnectDialog.ClipboardOrScanQr ->
                 ClipboardOrScanQrDialog.create(state.dialog.clipboardUri, context)
-            is WalletConnectDialog.RequestTransaction ->
-                TransactionDialog.create(state.dialog.dialogData, context)
-            is WalletConnectDialog.PersonalSign ->
-                PersonalSignDialog.create(state.dialog.data, context)
+            is WalletConnectDialog.RequestTransaction -> TransactionDialog.create(state.dialog.dialogData, context)
+            is WalletConnectDialog.PersonalSign -> PersonalSignDialog.create(state.dialog.data, context)
             is WalletConnectDialog.BnbTransactionDialog ->
                 BnbTransactionDialog.create(
                     data = state.dialog.data,
@@ -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,
                 )
@@ -132,16 +132,18 @@ class DialogManager : StoreSubscriber<GlobalState> {
             is BackupDialog.UnfinishedBackupFound -> UnfinishedBackupFoundDialog.create(context)
             is BackupDialog.ConfirmDiscardingBackup -> ConfirmDiscardingBackupDialog.create(context)
             is SaltPayDialog.Activation.NoGas -> NoFundsForActivationDialog.create(context)
-            is SaltPayDialog.Activation.TryToInterrupt -> TryToInterruptRegistrationDialog.create(context, state.dialog)
+            is SaltPayDialog.Activation.PutVisaCard -> PutVisaCardDialog.create(context)
             is SaltPayDialog.Activation.OnError -> RegistrationErrorDialog.create(context, state.dialog)
             is WalletDialog.CurrencySelectionDialog -> CurrencySelectionDialog.create(state.dialog, context)
-            is WalletDialog.ChooseTradeActionDialog -> ChooseTradeActionBottomSheetDialog(context)
+            is WalletDialog.ChooseTradeActionDialog -> ChooseTradeActionBottomSheetDialog(context, state.dialog)
             is WalletDialog.SelectAmountToSendDialog -> AmountToSendBottomSheetDialog(context, state.dialog)
             is WalletDialog.SignedHashesMultiWalletDialog -> SignedHashesWarningDialog.create(context)
             is WalletDialog.TokensAreLinkedDialog -> SimpleAlertDialog.create(
                 title = context.getString(state.dialog.titleRes, state.dialog.currencySymbol),
                 message = context.getString(
-                    state.dialog.messageRes, state.dialog.currencySymbol, state.dialog.currencyTitle,
+                    state.dialog.messageRes,
+                    state.dialog.currencySymbol,
+                    state.dialog.currencyTitle,
                 ),
                 context = context,
             )
@@ -153,7 +155,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/GlobalLayoutStateHandler.kt b/app/src/main/java/com/tangem/tap/common/GlobalLayoutStateHandler.kt
index af4645f141..a716d772fe 100644
--- a/app/src/main/java/com/tangem/tap/common/GlobalLayoutStateHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/GlobalLayoutStateHandler.kt
@@ -7,9 +7,9 @@ import timber.log.Timber
 /**
 [REDACTED_AUTHOR]
  */
-class GlobalLayoutStateHandler<T: View>(
-        private val view: T,
-        attachImmediately: Boolean = true
+class GlobalLayoutStateHandler<T : View>(
+    private val view: T,
+    attachImmediately: Boolean = true
 ) : ViewTreeObserver.OnGlobalLayoutListener {
 
     var onStateChanged: ((T) -> Unit)? = null
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..f1cd3b1027 100644
--- a/app/src/main/java/com/tangem/tap/common/IntentHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/IntentHandler.kt
@@ -3,50 +3,76 @@ package com.tangem.tap.common
 import android.content.Intent
 import android.nfc.NfcAdapter
 import android.nfc.Tag
-import com.tangem.tap.common.redux.navigation.AppScreen
-import com.tangem.tap.common.redux.navigation.NavigationAction
+import android.os.Build
+import com.tangem.tap.common.extensions.removePrefixOrNull
 import com.tangem.tap.domain.walletconnect.WalletConnectManager
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.features.welcome.redux.WelcomeAction
+import com.tangem.tap.scope
 import com.tangem.tap.store
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 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"
+    private val nfcActions = arrayOf(
+        NfcAdapter.ACTION_NDEF_DISCOVERED,
+        NfcAdapter.ACTION_TECH_DISCOVERED,
+        NfcAdapter.ACTION_TAG_DISCOVERED,
+    )
 
-    fun handleIntent(intent: Intent?) {
-        handleBackgroundScan(intent)
+    fun handleIntent(intent: Intent?, hasSavedUserWallets: Boolean) {
+        handleBackgroundScan(intent, hasSavedUserWallets)
         handleWalletConnectLink(intent)
         handleSellCurrencyCallback(intent)
     }
 
-    private fun handleBackgroundScan(intent: Intent?) {
-        if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action ||
-                NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action
-                )
-        ) {
-            val tag = intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
-            if (tag != null) {
-                intent.action = null
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.Home))
-                store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
-                store.dispatch(HomeAction.ReadCard)
+    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
             }
         }
-    }
-
-    private fun handleWalletConnectLink(intent: Intent?) {
-        if (intent?.scheme == WalletConnectManager.WC_SCHEME) {
-            store.dispatch(WalletConnectAction.HandleDeepLink(intent.data?.toString()))
+        if (wcUri != null) {
+            store.dispatch(WalletConnectAction.HandleDeepLink(wcUri))
         }
     }
 
-    private fun handleSellCurrencyCallback(intent: Intent?) {
+    fun handleBackgroundScan(intent: Intent?, hasSavedUserWallets: Boolean): Boolean {
+        if (intent == null || intent.action !in nfcActions) return false
+
+        val tag: Tag? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            intent.getParcelableExtra(NfcAdapter.EXTRA_TAG, Tag::class.java)
+        } else {
+            @Suppress("DEPRECATION")
+            intent.getParcelableExtra(NfcAdapter.EXTRA_TAG)
+        }
+        if (tag == null) return false
+
+        intent.action = null
+        if (hasSavedUserWallets) {
+            // TODO: Remove delay after [REDACTED_JIRA]
+            scope.launch {
+                delay(timeMillis = 200)
+                store.dispatch(WelcomeAction.ProceedWithCard)
+            }
+        } else {
+            store.dispatch(HomeAction.ReadCard())
+        }
+
+        return true
+    }
+
+    fun handleSellCurrencyCallback(intent: Intent?) {
         try {
             val transactionID =
                 intent?.data?.getQueryParameter(TRANSACTION_ID_PARAM) ?: return
@@ -60,16 +86,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/KeyboardObserver.kt b/app/src/main/java/com/tangem/tap/common/KeyboardObserver.kt
index 69581a7a34..47f579ca1b 100644
--- a/app/src/main/java/com/tangem/tap/common/KeyboardObserver.kt
+++ b/app/src/main/java/com/tangem/tap/common/KeyboardObserver.kt
@@ -44,7 +44,7 @@ class KeyboardObserver(activity: Activity) {
         onKeyboardListener?.invoke(isShow)
     }
 
-    private fun isSoftKeyChanged() = ((lastWindowHeight - getWindowHeight()).absoluteValue) == getSoftKeyButtonHeight()
+    private fun isSoftKeyChanged() = (lastWindowHeight - getWindowHeight()).absoluteValue == getSoftKeyButtonHeight()
 
     private fun getSoftKeyButtonHeight(): Int {
         val applicationDisplayHeight = DisplayMetrics().apply {
@@ -57,5 +57,4 @@ class KeyboardObserver(activity: Activity) {
 
         return realDisplayHeight - applicationDisplayHeight
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/TestActions.kt b/app/src/main/java/com/tangem/tap/common/TestActions.kt
index 5eb1021886..b787e7a1b3 100644
--- a/app/src/main/java/com/tangem/tap/common/TestActions.kt
+++ b/app/src/main/java/com/tangem/tap/common/TestActions.kt
@@ -40,9 +40,10 @@ typealias TestAction = Pair<String, () -> Unit>
 
 class TestActionsBottomSheetDialog(
     private val appDialog: AppDialog.TestActionsDialog,
-    context: Context
+    context: Context,
 ) : BottomSheetDialog(context) {
 
+    @Suppress("MagicNumber")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
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/AnalyticsEventsLogger.kt b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEventsLogger.kt
index 0865d2aa81..39291d12f6 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEventsLogger.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEventsLogger.kt
@@ -1,8 +1,8 @@
 package com.tangem.tap.common.analytics
 
 import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.tap.common.analytics.api.ErrorEventLogger
-import com.tangem.tap.common.analytics.api.EventLogger
+import com.tangem.core.analytics.api.ErrorEventLogger
+import com.tangem.core.analytics.api.EventLogger
 import timber.log.Timber
 
 class AnalyticsEventsLogger(
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..ed2e3868b5
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsFactory.kt
@@ -0,0 +1,38 @@
+package com.tangem.tap.common.analytics
+
+import com.tangem.core.analytics.Analytics
+import com.tangem.core.analytics.api.AnalyticsEventFilter
+import com.tangem.core.analytics.api.ParamsInterceptor
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
+
+/**
+[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/TangemSdkErrorMapper.kt
similarity index 95%
rename from app/src/main/java/com/tangem/tap/common/analytics/TangemSdkError.kt
rename to app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
index 17e31d88c4..2f9552c1ae 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkError.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
@@ -2,10 +2,11 @@ package com.tangem.tap.common.analytics
 
 import com.tangem.common.core.TangemSdkError
 
-object TangemSdk {
+object TangemSdkErrorMapper {
 
     // This mapping is performed to group errors in FirebaseCrashlytics.
     // At the moment, the errors in Crashlytics can only be grouped by their place of creation (class and line).
+    @Suppress("LongMethod", "ComplexMethod")
     fun map(error: TangemSdkError): TangemSdkError {
         return when (error) {
             is TangemSdkError.TagLost -> TangemSdkError.TagLost()
@@ -13,12 +14,15 @@ object TangemSdk {
             is TangemSdkError.SerializeCommandError -> TangemSdkError.SerializeCommandError()
             is TangemSdkError.DeserializeApduFailed -> TangemSdkError.DeserializeApduFailed()
             is TangemSdkError.EncodingFailedTypeMismatch -> TangemSdkError.EncodingFailedTypeMismatch(
-                error.customMessage)
+                error.customMessage
+            )
             is TangemSdkError.EncodingFailed -> TangemSdkError.EncodingFailed(error.customMessage)
             is TangemSdkError.DecodingFailedMissingTag -> TangemSdkError.DecodingFailedMissingTag(
-                error.customMessage)
+                error.customMessage
+            )
             is TangemSdkError.DecodingFailedTypeMismatch -> TangemSdkError.DecodingFailedTypeMismatch(
-                error.customMessage)
+                error.customMessage
+            )
             is TangemSdkError.DecodingFailed -> TangemSdkError.DecodingFailed(error.customMessage)
             is TangemSdkError.InvalidResponse -> TangemSdkError.InvalidResponse()
             is TangemSdkError.UnknownStatus -> TangemSdkError.UnknownStatus(error.statusWord)
@@ -74,7 +78,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()
@@ -90,7 +94,8 @@ object TangemSdk {
             is TangemSdkError.BackupFailedEmptyWallets -> TangemSdkError.BackupFailedEmptyWallets()
             is TangemSdkError.BackupFailedNotEmptyWallets -> TangemSdkError.BackupFailedNotEmptyWallets()
             is TangemSdkError.NoActiveBackup -> TangemSdkError.NoActiveBackup()
-            is TangemSdkError.ResetBackupFailedHasBackupedWallets -> TangemSdkError.ResetBackupFailedHasBackupedWallets()
+            is TangemSdkError.ResetBackupFailedHasBackupedWallets ->
+                TangemSdkError.ResetBackupFailedHasBackupedWallets()
             is TangemSdkError.BackupServiceInvalidState -> TangemSdkError.BackupServiceInvalidState()
             is TangemSdkError.NoBackupCardForIndex -> TangemSdkError.NoBackupCardForIndex()
             is TangemSdkError.EmptyBackupCards -> TangemSdkError.EmptyBackupCards()
@@ -107,7 +112,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
         }
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/api/AnalyticsHandlerBuilder.kt b/app/src/main/java/com/tangem/tap/common/analytics/api/AnalyticsHandlerBuilder.kt
new file mode 100644
index 0000000000..6d23925143
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/api/AnalyticsHandlerBuilder.kt
@@ -0,0 +1,19 @@
+package com.tangem.tap.common.analytics.api
+
+import android.app.Application
+import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.core.analytics.api.AnalyticsHandler
+import com.tangem.domain.common.AnalyticsHandlersLogConfig
+import com.tangem.tap.domain.configurable.config.Config
+
+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,
+    )
+}
\ 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
deleted file mode 100644
index 08e1609e3c..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-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 com.tangem.tap.common.analytics.events.AnalyticsEvent
-import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.extensions.filterNotNull
-
-/**
-[REDACTED_AUTHOR]
- */
-interface AnalyticsEventHandler {
-    fun handleEvent(
-        event: String,
-        params: Map<String, String> = emptyMap(),
-    )
-
-    fun handleAnalyticsEvent(
-        event: AnalyticsEvent,
-        card: Card? = null,
-        blockchain: String? = null,
-    ) {
-        handleEvent(
-            event = prepareEventString(event.category, event.event),
-            params = prepareParams(card, blockchain, 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"
-    }
-}
-
-interface ErrorEventHandler {
-    fun handleErrorEvent(
-        error: Throwable,
-        params: Map<String, String> = emptyMap(),
-    )
-}
-
-interface SdkErrorEventHandler : CardSdkErrorEventHandler, BlockchainSdkErrorEventHandler
-
-interface CardSdkErrorEventHandler {
-    fun handleCardSdkErrorEvent(
-        error: TangemSdkError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String> = emptyMap(),
-        card: Card? = null,
-    )
-}
-
-interface BlockchainSdkErrorEventHandler {
-    fun handleBlockchainSdkErrorEvent(
-        error: BlockchainError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String> = mapOf(),
-        card: Card? = null,
-    )
-}
-
-interface ShopifyOrderEventHandler {
-    fun handleShopifyOrderEvent(order: Storefront.Order)
-}
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..1f227fc391
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/BasicEventConverter.kt
@@ -0,0 +1,160 @@
+package com.tangem.tap.common.analytics.converters
+
+import com.tangem.common.Converter
+import com.tangem.common.extensions.isZero
+import com.tangem.core.analytics.Analytics
+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.model.WalletDataModel
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
+import com.tangem.tap.features.wallet.redux.ProgressState
+import com.tangem.tap.features.wallet.redux.WalletState
+import com.tangem.tap.features.wallet.redux.reducers.calculateTotalCryptoAmount
+import timber.log.Timber
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+class BasicEventsPreChecker {
+
+    fun tryToSend(converterData: BasicEventsSourceData) {
+        if (!isReadyToSend(converterData)) return
+
+        BasicSignInEventConverter().convert(converterData)?.let { Analytics.send(it) }
+        BasicTopUpEventConverter().convert(converterData)?.let { Analytics.send(it) }
+    }
+
+    @Suppress("ComplexMethod")
+    private fun isReadyToSend(data: BasicEventsSourceData): Boolean {
+        val (scanResponse, walletState, biometricsWalletDataModels) = data
+        if (walletState.derivationsCheckIsScheduled) {
+            Timber.d("FAILED: derivationsCheckIsScheduled")
+            return false
+        }
+        if (scanResponse.cardTypesResolver.isMultiwalletAllowed() && walletState.missingDerivations.isNotEmpty()) {
+            Timber.d("FAILED: isMultiwalletAllowed || missingDerivations.isNotEmpty")
+            return false
+        }
+
+        if (biometricsWalletDataModels == null) {
+            Timber.d("SWITCH: OLD")
+            val walletsDataFromStores = data.walletState.walletsDataFromStores
+            if (walletsDataFromStores.isEmpty()) {
+                Timber.d("FAILED: walletsDataFromStores.isEmpty")
+                return false
+            }
+
+            val totalBalanceState = data.walletState.totalBalance?.state
+            if (totalBalanceState == null || totalBalanceState == ProgressState.Loading ||
+                totalBalanceState == ProgressState.Refreshing
+            ) {
+                Timber.d("FAILED: totalBalanceState: ${totalBalanceState?.name}")
+                return false
+            }
+
+            val balancesCount = walletsDataFromStores
+                .map { if (it.currencyData.amount == null) 0 else 1 }
+                .reduce { acc, i -> acc + i }
+
+            if (balancesCount != walletsDataFromStores.size) {
+                Timber.d("FAILED: balancesCount != walletsDataFromStores.size")
+                return false
+            }
+        } else {
+            Timber.d("SWITCH: BIOMETRICS")
+            if (biometricsWalletDataModels.isEmpty()) {
+                Timber.d("FAILED: biometricsWalletDataModels.isEmpty")
+                return false
+            }
+
+            val isCorrectStatus = biometricsWalletDataModels.any {
+                it.status is WalletDataModel.Loading ||
+                    it.status is WalletDataModel.NoAccount ||
+                    it.status is WalletDataModel.Unreachable ||
+                    it.status is WalletDataModel.MissedDerivation ||
+                    it.status.isErrorStatus
+            }
+            if (isCorrectStatus) {
+                Timber.d("FAILED: by status")
+                return false
+            }
+        }
+
+        Timber.d("SUCCESS")
+        return true
+    }
+}
+
+/**
+ *  With biometrics enabled, we should check its storage instead of "WalletState.walletsDataFromStores"
+ *  because the latter is updated after some time.
+ *  @property biometricsWalletDataModels - wallet data models from the 'WalletStoresManager'. If null, then
+ *  the "WalletState.walletsDataFromStores" will be used to determine appropriate state
+ */
+data class BasicEventsSourceData(
+    val scanResponse: ScanResponse,
+    val walletState: WalletState,
+    val biometricsWalletDataModels: List<WalletDataModel>?,
+) {
+    val batchId: String by lazy { scanResponse.card.batchId }
+
+    val userWalletIdStringValue: String? by lazy {
+        UserWalletIdBuilder.scanResponse(scanResponse)
+            .build()
+            ?.stringValue
+    }
+
+    val paramCardCurrency: AnalyticsParam.CardCurrency? by lazy {
+        ParamCardCurrencyConverter().convert(scanResponse.cardTypesResolver)
+    }
+
+    val paramCardBalanceState: AnalyticsParam.CardBalanceState by lazy { calculateAmount().toCardBalanceState() }
+
+    private fun calculateAmount(): BigDecimal {
+        return biometricsWalletDataModels?.calculateTotalCryptoAmount()
+            ?: walletState.walletsDataFromStores.calculateTotalCryptoAmount()
+    }
+
+    private fun BigDecimal.toCardBalanceState(): AnalyticsParam.CardBalanceState = when {
+        isZero() -> AnalyticsParam.CardBalanceState.Empty
+        else -> AnalyticsParam.CardBalanceState.Full
+    }
+
+    private fun List<WalletDataModel>.calculateTotalCryptoAmount(): BigDecimal {
+        return this
+            .map { it.status.amount }
+            .reduce(BigDecimal::plus)
+    }
+}
+
+class BasicSignInEventConverter : Converter<BasicEventsSourceData, Basic.SignedIn?> {
+
+    override fun convert(value: BasicEventsSourceData): Basic.SignedIn? {
+        if (value.paramCardCurrency == null || value.userWalletIdStringValue == null) return null
+
+        return Basic.SignedIn(
+            state = value.paramCardBalanceState,
+            currency = value.paramCardCurrency!!,
+            batch = value.batchId,
+        ).apply {
+            filterData = value.userWalletIdStringValue
+        }
+    }
+}
+
+class BasicTopUpEventConverter : Converter<BasicEventsSourceData, Basic.ToppedUp?> {
+
+    override fun convert(value: BasicEventsSourceData): Basic.ToppedUp? {
+        if (value.paramCardCurrency == null || value.userWalletIdStringValue == null) return null
+
+        val data = BasicTopUpFilter.Data(
+            walletId = value.userWalletIdStringValue!!,
+            cardBalanceState = value.paramCardBalanceState,
+        )
+
+        return Basic.ToppedUp(value.paramCardCurrency!!).apply { filterData = data }
+    }
+}
\ 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..61d71c5a14
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/ParamCardCurrencyConverter.kt
@@ -0,0 +1,28 @@
+package com.tangem.tap.common.analytics.converters
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.Converter
+import com.tangem.domain.common.CardTypesResolver
+import com.tangem.domain.common.SaltPayWorkaround
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+
+/**
+[REDACTED_AUTHOR]
+ */
+class ParamCardCurrencyConverter : Converter<CardTypesResolver, AnalyticsParam.CardCurrency?> {
+
+    override fun convert(value: CardTypesResolver): AnalyticsParam.CardCurrency? {
+        if (value.isMultiwalletAllowed()) return AnalyticsParam.CardCurrency.MultiCurrency
+
+        val type = when {
+            value.isTangemNote() -> AnalyticsParam.CurrencyType.Blockchain(value.getBlockchain())
+            value.isTangemTwins() -> AnalyticsParam.CurrencyType.Blockchain(Blockchain.Bitcoin)
+            value.isSaltPay() -> AnalyticsParam.CurrencyType.Token(SaltPayWorkaround.tokenFrom(Blockchain.SaltPay))
+            value.getBlockchain() != Blockchain.Unknown -> AnalyticsParam.CurrencyType.Blockchain(value.getBlockchain())
+            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..5d779e661f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/ShopOrderToEventConverter.kt
@@ -0,0 +1,28 @@
+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.Checkout, ProductType>, Shop.Purchased> {
+
+    override fun convert(value: Pair<Storefront.Checkout, ProductType>): Shop.Purchased {
+        val checkout = value.first
+        val productType = value.second
+
+        val sku = checkout.lineItems?.edges?.firstOrNull()?.node?.variant?.sku ?: productType.sku
+        val count = when (productType) {
+            ProductType.WALLET_2_CARDS -> "2"
+            ProductType.WALLET_3_CARDS -> "3"
+        }
+        val amount = "${checkout.totalPriceV2.amount} ${checkout.totalPriceV2.currencyCode.name}"
+        val code = (checkout.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
deleted file mode 100644
index 0451fdd68c..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsEvent.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.tangem.tap.common.analytics.events
-
-/**
-[REDACTED_AUTHOR]
- */
-sealed class AnalyticsEvent(
-    val category: String,
-    val event: String,
-    val params: Map<String, String> = mapOf(),
-)
\ 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..2e5a925560 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,30 @@
 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 +47,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..0d9a529469 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
@@ -1,15 +1,18 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
 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 +20,7 @@ sealed class Basic(
         params = mapOf(
             "State" to state.value,
             "Currency" to currency.value,
-            "Batch" to batch,
+            AnalyticsParam.BatchId to batch,
         ),
     )
 
@@ -25,4 +28,9 @@ sealed class Basic(
         event = "Topped up",
         params = mapOf("Currency" to currency.value),
     )
-}
+
+    class ScanError(error: Throwable) : Basic(
+        event = "Scan",
+        error = error,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
index a26109ae2a..96fa307105 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/DetailsScreen.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/DetailsScreen.kt
index 1ec8d81533..a0d34306c9 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/DetailsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/DetailsScreen.kt
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/IntroductionProcess.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/IntroductionProcess.kt
index 4b3eb7f431..0d799d379f 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/IntroductionProcess.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/IntroductionProcess.kt
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
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..6f718755f0 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
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -14,12 +16,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..55ed5f97b9 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,10 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+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 +15,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 +37,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..4db0526ad2
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/MyWallets.kt
@@ -0,0 +1,20 @@
+package com.tangem.tap.common.analytics.events
+
+import com.tangem.core.analytics.AnalyticsEvent
+
+sealed class MyWallets(
+    event: String,
+    params: Map<String, String> = mapOf(),
+) : AnalyticsEvent("My Wallets", event, params) {
+
+    class MyWalletsScreenOpened : MyWallets(event = "My Wallets Screen Opened")
+    class CardWasScanned : MyWallets(event = "Card Was Scanned")
+
+    sealed class Button {
+        class ScanNewCard : MyWallets(event = "Button - Scan New Card")
+        class UnlockWithBiometrics : MyWallets(event = "Button - Unlock all with Face ID")
+        class EditWalletTapped : MyWallets(event = "Button - Edit Wallet Tapped")
+        class DeleteWalletTapped : MyWallets(event = "Button - Delete Wallet Tapped")
+        class WalletUnlockTapped : MyWallets(event = "Button - Wallet Unlock 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..4ec37c4806 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
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -34,9 +36,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 +67,19 @@ 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 ButtonChat : Onboarding("Onboarding", "Button - Chat")
+
+    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/Portfolio.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
index 6747c2172d..71383c9f9a 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
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..03cbb88ac6 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,8 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.tap.features.details.ui.details.SocialNetwork
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -7,7 +10,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")
@@ -17,30 +21,37 @@ sealed class Settings(
     class ButtonCardSettings : Settings(event = "Button - Card Settings")
     class ButtonAppSettings : Settings(event = "Button - App Settings")
     class ButtonCreateBackup : Settings(event = "Button - Create Backup")
+    class ButtonWalletConnect : Settings(event = "Button - Wallet Connect")
 
-    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 +60,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..0ab4dd9361 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,8 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.tap.common.extensions.filterNotNull
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -8,15 +11,20 @@ sealed class Shop(
     params: Map<String, String> = mapOf(),
 ) : AnalyticsEvent("Shop", event, params) {
 
-    class ScreenOpened : IntroductionProcess("Shop Screen Opened")
+    class ScreenOpened : Shop("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(
+    class Redirected(partnerName: String?) : Shop(
         event = "Redirected",
-        params = mapOf("Partner" to partnerName),
+        params = partnerName?.let { mapOf("Partner" to partnerName) } ?: mapOf(),
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
new file mode 100644
index 0000000000..cad34430d9
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
@@ -0,0 +1,19 @@
+package com.tangem.tap.common.analytics.events
+
+import com.tangem.core.analytics.AnalyticsEvent
+
+/**
+[REDACTED_AUTHOR]
+ */
+sealed class SignIn(
+    event: String,
+    params: Map<String, String> = mapOf(),
+    error: Throwable? = null,
+) : AnalyticsEvent("Sign In", event, params, error) {
+
+    class ScreenOpened : SignIn(event = "Sing In Screen Opened")
+    class CardWasScanned : SignIn(event = "Card Was Scanned")
+
+    class ButtonBiometricSignIn : SignIn(event = "Button - Biometric Sign In")
+    class ButtonCardSignIn : SignIn(event = "Button - Card Sign In")
+}
\ No newline at end of file
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..0ad3ca514e 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,8 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.AnalyticsParam.CurrencyType
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -7,39 +10,67 @@ 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))
 
-    sealed class Recieve(
+    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 Receive(
         event: String,
         params: Map<String, String> = mapOf(),
-    ) : Token("Token / Recieve", event, params) {
+    ) : Token("Token / Receive", event, params) {
 
-        class ScreenOpened : Recieve("Recieve Screen Opened")
-        class ButtonCopyAddress : Recieve("Button - Copy Address")
-        class ButtonShareAddress : Recieve("Button - Share Address")
+        class ScreenOpened : Receive("Receive Screen Opened")
+        class ButtonCopyAddress : Receive("Button - Copy Address")
+        class ButtonShareAddress : Receive("Button - Share Address")
     }
 
     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..9ce10213ac 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
@@ -1,14 +1,21 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.core.analytics.AnalyticsEvent
+
 /**
 [REDACTED_AUTHOR]
  */
 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 ScreenOpened : WalletConnect(event = "WC Screen Opened")
     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..09c26d8d7d
--- /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.core.analytics.api.AnalyticsEventFilter
+import com.tangem.core.analytics.api.AnalyticsHandler
+import com.tangem.core.analytics.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..de89bf9e7e
--- /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.core.analytics.api.AnalyticsEventFilter
+import com.tangem.core.analytics.api.AnalyticsHandler
+import com.tangem.core.analytics.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/handlers/amplitude/AmplitudeAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt
index 27132a1f61..a1daeb7ccf 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.core.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/AmplitudeClient.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeClient.kt
index d90ed084b5..ddb27d18ff 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeClient.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeClient.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import com.amplitude.api.Amplitude
 import com.amplitude.api.AmplitudeClient
 import com.tangem.common.Converter
-import com.tangem.tap.common.analytics.api.EventLogger
+import com.tangem.core.analytics.api.EventLogger
 import org.json.JSONObject
 
 /**
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..d1b3189ab1 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,38 @@
 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.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
+import com.tangem.tap.common.analytics.events.Shop
 
 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))
+    override fun send(event: AnalyticsEvent) {
+        if (event is Shop.Purchased) {
+            send(AFInAppEventType.PURCHASE, event.params)
+        } else {
+            super.send(event)
+        }
     }
 
     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/AppsFlyerClient.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerClient.kt
index 6a7aa7cfed..40cee4e698 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerClient.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerClient.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.common.analytics.handlers.appsFlyer
 
 import android.content.Context
 import com.appsflyer.AppsFlyerLib
-import com.tangem.tap.common.analytics.api.EventLogger
+import com.tangem.core.analytics.api.EventLogger
 
 /**
 [REDACTED_AUTHOR]
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..7430fcc17f 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,58 @@
 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.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.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.api.AnalyticsHandler
+import com.tangem.core.analytics.api.ErrorEventHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
+import com.tangem.tap.common.analytics.converters.AnalyticsErrorConverter
+import com.tangem.tap.common.analytics.events.Shop
 
 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) {
+        val error = event.error
+        when {
+            error != null -> {
+                val errorConverter = AnalyticsErrorConverter()
+                if (!errorConverter.canBeHandled(error)) return
+
+                val errorParams = errorConverter.convert(error).toMutableMap()
+                errorParams["Category"] = event.category
+                errorParams["Event"] = event.event
+                errorParams.putAll(event.params)
+                send(error, errorParams)
+            }
+            event is Shop.Purchased -> {
+                send(FirebaseAnalytics.Event.PURCHASE, event.params)
+            }
+            else -> {
+                super.send(event)
+            }
+        }
+    }
+
+    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/FirebaseClient.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseClient.kt
index 07ed4c4551..33751b5e0a 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseClient.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseClient.kt
@@ -6,8 +6,8 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
-import com.tangem.tap.common.analytics.api.ErrorEventLogger
-import com.tangem.tap.common.analytics.api.EventLogger
+import com.tangem.core.analytics.api.ErrorEventLogger
+import com.tangem.core.analytics.api.EventLogger
 
 /**
 [REDACTED_AUTHOR]
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..b7e7ec6fbf
--- /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.core.analytics.api.ParamsInterceptor
+import com.tangem.core.analytics.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/AutoSizeText.kt b/app/src/main/java/com/tangem/tap/common/compose/AutoSizeText.kt
index 324fd3877e..63d98b6269 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/AutoSizeText.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/AutoSizeText.kt
@@ -11,12 +11,13 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
 
+@Suppress("MagicNumber")
 @Composable
 fun TextAutoSize(
-    modifier: Modifier = Modifier,
     text: String,
-    textStyle: TextStyle = LocalTextStyle.current,
     fontSizeRange: FontSizeRange,
+    modifier: Modifier = Modifier,
+    textStyle: TextStyle = LocalTextStyle.current,
 ) {
     val fontSizeValue = remember { mutableStateOf(fontSizeRange.max.value) }
     val readyToDraw = remember { mutableStateOf(false) }
@@ -46,7 +47,7 @@ fun TextAutoSize(
             } else {
                 readyToDraw.value = true
             }
-        }
+        },
     )
 }
 
diff --git a/app/src/main/java/com/tangem/tap/common/compose/BlockchainSpinner.kt b/app/src/main/java/com/tangem/tap/common/compose/BlockchainSpinner.kt
index 3df228a032..215fb7b312 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/BlockchainSpinner.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/BlockchainSpinner.kt
@@ -17,7 +17,7 @@ fun BlockchainSpinner(
     textFieldConverter: (Blockchain) -> String,
     dropdownItemView: @Composable ((Blockchain) -> Unit)? = null,
     closePopupTrigger: ClosePopupTrigger = ClosePopupTrigger(),
-    onItemSelected: (Blockchain) -> Unit,
+    onItemSelect: (Blockchain) -> Unit,
 ) {
     OutlinedSpinner(
         modifier = Modifier.fillMaxWidth(),
@@ -27,7 +27,7 @@ fun BlockchainSpinner(
         textFieldConverter = textFieldConverter,
         dropdownItemView = dropdownItemView,
         isEnabled = isEnabled,
-        onItemSelected = onItemSelected,
+        onItemSelected = onItemSelect,
         closePopupTrigger = closePopupTrigger,
     )
 }
\ 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..c536af17bd 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,126 +1,8 @@
 package com.tangem.tap.common.compose
 
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
 import androidx.compose.material.ripple.LocalRippleTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-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.tap.common.compose.extensions.stringResourceDefault
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun RectangleButton(
-    modifier: Modifier = Modifier,
-    text: String = "",
-    textId: Int? = null,
-    isEnabled: Boolean = true,
-    contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
-    leadingView: @Composable RowScope.() -> Unit = {},
-    middleView: @Composable RowScope.() -> Unit = { TextInButton(text = text, textId = textId) },
-    trailingView: @Composable RowScope.() -> Unit = {},
-    onClick: () -> Unit,
-) {
-    Button(
-        modifier = modifier,
-        contentPadding = contentPadding,
-        enabled = isEnabled,
-        onClick = onClick,
-    ) {
-        leadingView()
-        middleView()
-        trailingView()
-    }
-}
-
-@Composable
-private fun TextInButton(
-    modifier: Modifier = Modifier,
-    text: String = "",
-    textId: Int? = null,
-) {
-    Text(
-        modifier = modifier,
-        text = stringResourceDefault(textId, text),
-        maxLines = 1,
-        style = TextStyle(
-            fontSize = 16.sp,
-            lineHeight = 20.sp,
-            fontWeight = FontWeight.Medium,
-        )
-    )
-}
-
-@Composable
-fun PasteButton(
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    dpSize: DpSize = DpSize(40.dp, 40.dp),
-    onClick: () -> Unit,
-    tint: Color? = null,
-    content: @Composable (() -> Unit)? = null
-) {
-    IconButton(
-        modifier = modifier.size(dpSize),
-        enabled = enabled,
-        onClick = onClick,
-    ) {
-        when (content) {
-            null -> {
-                val tintColor = tint
-                    ?: colorResource(id = if (enabled) R.color.accent else R.color.accent_disabled)
-                Icon(
-                    painterResource(id = R.drawable.ic_paste),
-                    contentDescription = "Paste",
-                    tint = tintColor,
-                )
-            }
-            else -> content()
-        }
-    }
-}
-
-@Composable
-fun ClearButton(
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    dpSize: DpSize = DpSize(40.dp, 40.dp),
-    onClick: () -> Unit,
-    tint: Color? = null,
-    content: @Composable (() -> Unit)? = null
-) {
-    IconButton(
-        modifier = modifier.size(dpSize),
-        enabled = enabled,
-        onClick = onClick,
-    ) {
-        when (content) {
-            null -> {
-                val tintColor = tint
-                    ?: colorResource(id = if (enabled) R.color.accent else R.color.accent_disabled)
-                Icon(
-                    painterResource(id = R.drawable.ic_clear),
-                    contentDescription = "Clear",
-                    tint = tintColor,
-                )
-            }
-            else -> content()
-        }
-    }
-}
 
 /**
  * Used for disable ripple if button is enable = false
@@ -132,35 +14,4 @@ fun ToggledRippleTheme(
 ) {
     val theme = LocalRippleTheme provides if (isEnabled) LocalRippleTheme.current else NoRippleTheme()
     CompositionLocalProvider(theme) { content() }
-}
-
-@Preview
-@Composable
-fun ButtonTest() {
-    Scaffold(
-    ) {
-        Column(modifier = Modifier.padding(16.dp)) {
-            PreviewItem("Button") {
-                RectangleButton(text = "Some button") {}
-            }
-            PreviewItem("PasteButton") {
-                PasteButton(onClick = {})
-            }
-        }
-    }
-}
-
-@Composable
-fun PreviewItem(
-    name: String,
-    content: @Composable RowScope.() -> Unit,
-) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-        Text(
-            modifier = Modifier.weight(1f),
-            text = name,
-        )
-        content()
-    }
-    SpacerH8()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/ComposableValueDebouncer.kt b/app/src/main/java/com/tangem/tap/common/compose/ComposableValueDebouncer.kt
index b3251f3cac..44395f9279 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/ComposableValueDebouncer.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/ComposableValueDebouncer.kt
@@ -11,19 +11,19 @@ import com.tangem.domain.common.util.ValueDebouncer
 @Composable
 fun <T> valueDebouncerAsState(
     initialValue: T,
+    onValueChange: (T) -> Unit,
     debounce: Long = 600,
-    onEmitValueReceived: (T) -> Unit = {},
-    onValueChanged: (T) -> Unit,
+    onEmitValueReceive: (T) -> Unit = {},
 ): ValueDebouncer<T> {
     return remember {
-        ValueDebouncer<T>(
+        ValueDebouncer(
             initialValue = initialValue,
             debounceDuration = debounce,
             onEmitValueReceived = { emitValue ->
-                emitValue?.let { onEmitValueReceived(it) }
+                emitValue?.let { onEmitValueReceive(it) }
             },
             onValueChanged = { changedValue ->
-                changedValue?.let { onValueChanged(it) }
+                changedValue?.let { onValueChange(it) }
             },
         )
     }
@@ -32,16 +32,16 @@ fun <T> valueDebouncerAsState(
 @Composable
 fun <T> valueDebouncerNullableAsState(
     initialValue: T?,
+    onValueChange: (T?) -> Unit,
     debounce: Long = 400,
-    onEmitValueReceived: (T?) -> Unit = {},
-    onValueChanged: (T?) -> Unit,
+    onEmitValueReceive: (T?) -> Unit = {},
 ): ValueDebouncer<T?> {
     return remember {
         ValueDebouncer(
             initialValue = initialValue,
             debounceDuration = debounce,
-            onEmitValueReceived = onEmitValueReceived,
-            onValueChanged = onValueChanged,
+            onEmitValueReceived = onEmitValueReceive,
+            onValueChanged = onValueChange,
         )
     }
 }
\ No newline at end of file
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..8d0de7df69 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
@@ -79,6 +80,7 @@ private fun ShowTheDialog(dialogState: MutableState<DomainDialog?>) {
             onDismissRequest
         )
         is DomainDialog.SelectTokenDialog -> SelectTokenNetworkDialog(dialog, onDismissRequest)
+        else -> {}
     }
 }
 
@@ -105,7 +107,7 @@ fun <T> SimpleDialog(
                 modifier = Modifier.padding(22.dp)
             ) {
                 DialogTitle(title = title)
-                LazyColumn() {
+                LazyColumn {
                     items(items) { item ->
                         Row(
                             modifier = Modifier
@@ -154,4 +156,4 @@ fun ErrorDialog(
             }
         }
     )
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/ErrorViews.kt b/app/src/main/java/com/tangem/tap/common/compose/ErrorViews.kt
index 49b6625474..c8d0701b2e 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/ErrorViews.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/ErrorViews.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -19,23 +18,20 @@ import androidx.compose.ui.unit.dp
 fun ErrorView(
     text: String,
     modifier: Modifier = Modifier,
-    style: TextStyle = LocalTextStyle.current
+    style: TextStyle = LocalTextStyle.current,
 ) {
     Text(
         text,
         color = MaterialTheme.colors.error,
         modifier = modifier,
-        style = style
+        style = style,
     )
 }
 
 @Preview
 @Composable
-fun ErrorViewTest() {
-    Scaffold(
-    ) {
-        Box(Modifier.padding(16.dp)) {
-            ErrorView(text = "Some error description")
-        }
+private fun ErrorViewTest() {
+    Box(Modifier.padding(16.dp)) {
+        ErrorView(text = "Some error description")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/Theme.kt b/app/src/main/java/com/tangem/tap/common/compose/NoRippleTheme.kt
similarity index 100%
rename from app/src/main/java/com/tangem/tap/common/compose/Theme.kt
rename to app/src/main/java/com/tangem/tap/common/compose/NoRippleTheme.kt
diff --git a/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt b/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt
index 3792119da9..981e5e00e6 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt
@@ -17,14 +17,15 @@ import com.tangem.tap.common.extensions.ValueCallback
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("MagicNumber")
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun <T> OutlinedSpinner(
-    modifier: Modifier = Modifier,
     label: String,
     itemList: List<T>,
     selectedItem: Field.Data<T>,
     onItemSelected: ValueCallback<T>,
+    modifier: Modifier = Modifier,
     textFieldConverter: (T) -> String = { it.toString() },
     dropdownItemView: @Composable ((T) -> Unit)? = null,
     isEnabled: Boolean = true,
@@ -66,6 +67,7 @@ fun <T> OutlinedSpinner(
             onValueChange = {},
             label = { Text(label) },
             trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = rIsExpanded.value) },
+            colors = TangemTextFieldsDefault.defaultTextFieldColors,
         )
 
         if (isEnabled) {
@@ -94,13 +96,11 @@ class ClosePopupTrigger {
 
 @Preview
 @Composable
-fun TestSpinnerPreview() {
-    Scaffold() {
-        OutlinedSpinner(
-            label = "Blockchain name",
-            itemList = listOf(Blockchain.values()),
-            selectedItem = Field.Data(Blockchain.Avalanche, false),
-            onItemSelected = {},
-        )
-    }
-}
+private fun TestSpinnerPreview() {
+    OutlinedSpinner(
+        label = "Blockchain name",
+        itemList = listOf(Blockchain.values()),
+        selectedItem = Field.Data(Blockchain.Avalanche, false),
+        onItemSelected = {},
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt b/app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt
index deacbaf05f..113dbfb809 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt
@@ -6,6 +6,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -13,8 +14,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.LinearProgressIndicator
 import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
+import androidx.compose.material.TextFieldColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -28,6 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.tangem.common.module.ModuleError
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.common.form.Field
 import com.tangem.tap.common.CompositionLogger
 import com.tangem.tap.common.compose.extensions.stringResourceDefault
@@ -38,7 +40,6 @@ import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
  */
 @Composable
 fun OutlinedTextFieldWidget(
-    modifier: Modifier = Modifier,
     fieldData: Field.Data<String>,
     labelId: Int? = null,
     label: String = "",
@@ -53,15 +54,12 @@ fun OutlinedTextFieldWidget(
     debounceTextChanges: Long = 400,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    onTextChanged: (String) -> Unit,
+    onTextChange: (String) -> Unit,
 ) {
     if (!isVisible) return
 
-    Column(
-        modifier = modifier.animateContentSize(),
-    ) {
+    Column(modifier = Modifier.animateContentSize()) {
         OutlinedProgressTextField(
-            modifier = modifier,
             fieldData = fieldData,
             label = stringResourceDefault(labelId, label),
             placeholder = stringResourceDefault(placeholderId, placeholder),
@@ -72,15 +70,15 @@ fun OutlinedTextFieldWidget(
             debounce = debounceTextChanges,
             visualTransformation = visualTransformation,
             keyboardOptions = keyboardOptions,
-            onTextChanged = onTextChanged,
+            onTextChange = onTextChange,
         )
-        errorConverter?.let { AnimatedErrorView(error, it) }
+        errorConverter?.let { AnimatedErrorView(errorConverter = it, error = error) }
     }
 }
 
+@Suppress("LongMethod", "NestedBlockDepth", "MagicNumber", "MaxLineLength")
 @Composable
 private fun OutlinedProgressTextField(
-    modifier: Modifier = Modifier,
     fieldData: Field.Data<String>,
     label: String = "",
     placeholder: String = "",
@@ -90,8 +88,10 @@ private fun OutlinedProgressTextField(
     debounce: Long = 400,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    colors: TextFieldColors = TangemTextFieldsDefault.defaultTextFieldColors,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     trailingIcon: @Composable (() -> Unit)? = null,
-    onTextChanged: (String) -> Unit,
+    onTextChange: (String) -> Unit,
 ) {
     val logger = remember {
         CompositionLogger(label, "OutlinedProgressTextField", listOf("Символ токена"))
@@ -102,19 +102,19 @@ private fun OutlinedProgressTextField(
     val textDebouncer = valueDebouncerAsState(
         initialValue = fieldData.value,
         debounce = debounce,
-        onEmitValueReceived = {
+        onEmitValueReceive = {
             logger.log("DEBOUNCER: onEmitValueReceived: [$it]")
             logger.log("DEBOUNCER: start RECOMPOSE by new value for textValueState.value = [$it]")
             textValueState.value = it
         },
-        onValueChanged = {
+        onValueChange = {
             logger.log("DEBOUNCER: onValueChanged:  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  dispatch.toStore([$it])")
-            onTextChanged(it)
+            onTextChange(it)
         },
     )
 
     logger.log("RECOMPOSE ---------------------------------------------------------------START [${logger.count}]")
-    logger.log("RECOMPOSE --data: fieldData.value: [${fieldData}]")
+    logger.log("RECOMPOSE --data: fieldData.value: [$fieldData]")
     logger.log("RECOMPOSE --data: textValueState.value: [${textValueState.value}]")
     logger.log("RECOMPOSE --data: textDebouncer.emittedValue = [${textDebouncer.emittedValue}]")
     logger.log("RECOMPOSE --data: textDebouncer.debounced = [${textDebouncer.debounced}]")
@@ -127,21 +127,32 @@ private fun OutlinedProgressTextField(
             logger.log("$isNotUserInput: внешние данные ОДИНАКОВЫ с данными в поле")
         } else {
             logger.log("$isNotUserInput: внешние данные РАЗЛИЧАЮТСЯ с данными в поле")
-            if ((textDebouncer.emittedValue != textDebouncer.debounced) || textDebouncer.emitsCountBeforeDebounce > 0) {
+            if (textDebouncer.emittedValue != textDebouncer.debounced || textDebouncer.emitsCountBeforeDebounce > 0) {
                 logger.log("$isNotUserInput: пользователь ВВОДИТ данные -> внешние данные игнорируем, ждем RECOMPOSE")
             } else {
                 logger.log("$isNotUserInput: пользователь НЕ вводит данные -> пытаемся обработать внешние данные")
-                if (textValueState.value != textDebouncer.emittedValue || textValueState.value != textDebouncer.debounced) {
+                if (textValueState.value != textDebouncer.emittedValue ||
+                    textValueState.value != textDebouncer.debounced
+                ) {
                     logger.log("$isNotUserInput: даннные в поле не соответствуют данным из textDebouncer")
                     if (textDebouncer.emittedValue.isEmpty() && textDebouncer.debounced.isEmpty()) {
-                        logger.log("$isNotUserInput: даннные в textDebouncer ПУСТЫ -> start RECOMPOSE новые данные для textValueState.value = [${fieldData.value}]")
+                        logger.log(
+                            "$isNotUserInput: даннные в textDebouncer ПУСТЫ -> start RECOMPOSE новые данные для " +
+                                "textValueState.value = [${fieldData.value}]",
+                        )
                         textValueState.value = fieldData.value
                     } else {
-                        logger.log("$isNotUserInput: даннные в textDebouncer НЕ ПУСТЫ  -> start RECOMPOSE новые данные для textValueState.value = [${fieldData.value}]")
+                        logger.log(
+                            "$isNotUserInput: даннные в textDebouncer НЕ ПУСТЫ  -> start RECOMPOSE новые данные для " +
+                                "textValueState.value = [${fieldData.value}]",
+                        )
                         textValueState.value = fieldData.value
                     }
                 } else {
-                    logger.log("$isNotUserInput: в пустое поле вставляются данные -> start RECOMPOSE новые данные для textValueState.value = [${fieldData.value}]")
+                    logger.log(
+                        "$isNotUserInput: в пустое поле вставляются данные -> start RECOMPOSE новые данные для " +
+                            "textValueState.value = [${fieldData.value}]",
+                    )
                     textValueState.value = fieldData.value
                 }
             }
@@ -159,10 +170,22 @@ private fun OutlinedProgressTextField(
                 textDebouncer.emmit(it)
             },
             keyboardOptions = keyboardOptions,
-            label = { Text(label) },
+            label = {
+                Text(
+                    text = label,
+                    style = TangemTheme.typography.caption,
+                    color = colors.labelColor(
+                        enabled = isEnabled,
+                        error = error != null,
+                        interactionSource = interactionSource,
+                    ).value,
+                )
+            },
             placeholder = {
                 Text(
                     text = placeholder,
+                    style = TangemTheme.typography.body1,
+                    color = colors.placeholderColor(enabled = isEnabled).value,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                 )
@@ -172,21 +195,27 @@ private fun OutlinedProgressTextField(
             enabled = isEnabled,
             isError = error != null,
             visualTransformation = visualTransformation,
+            colors = colors,
+            interactionSource = interactionSource,
         )
         AnimatedVisibility(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .align(Alignment.BottomCenter)
                 .padding(start = 6.dp, top = 0.dp, end = 6.dp, bottom = 6.dp),
             visible = isLoading,
-        ) { LinearProgressIndicator() }
+        ) {
+            LinearProgressIndicator(
+                color = TangemTheme.colors.icon.primary1,
+            )
+        }
     }
 }
 
 @Composable
 private fun AnimatedErrorView(
-    error: ModuleError? = null,
     errorConverter: ModuleMessageConverter,
+    error: ModuleError? = null,
 ) {
     AnimatedVisibility(
         visible = error != null,
@@ -204,7 +233,7 @@ private fun AnimatedErrorView(
 
 @Preview
 @Composable
-fun OutlinedTextFieldWithErrorTest() {
+private fun OutlinedTextFieldWithErrorTest() {
     val context = LocalContext.current
     val converter = remember { ModuleMessageConverter(context) }
 
@@ -217,41 +246,35 @@ fun OutlinedTextFieldWithErrorTest() {
     val modifier = Modifier
         .fillMaxWidth()
         .padding(16.dp)
-    Scaffold {
-        Column {
-            OutlinedTextFieldWidget(
-                modifier = modifier,
-                fieldData = Field.Data("", false),
-                label = "First label",
-                placeholder = "1 placeholder",
-                error = null,
-                errorConverter = converter,
-            ) {}
-            OutlinedTextFieldWidget(
-                modifier = modifier,
-                fieldData = Field.Data("First", false),
-                label = "First label",
-                placeholder = "1 placeholder",
-                error = null,
-                errorConverter = converter,
-            ) {}
-            OutlinedTextFieldWidget(
-                modifier = modifier,
-                fieldData = Field.Data("First", false),
-                label = "First label",
-                placeholder = "1 placeholder",
-                isLoading = true,
-                error = null,
-                errorConverter = converter,
-            ) {}
-            OutlinedTextFieldWidget(
-                modifier = modifier,
-                fieldData = Field.Data("First", false),
-                label = "First label",
-                placeholder = "1 placeholder",
-                error = SimpleError(),
-                errorConverter = converter,
-            ) {}
-        }
+    Column {
+        OutlinedTextFieldWidget(
+            fieldData = Field.Data("", false),
+            label = "First label",
+            placeholder = "1 placeholder",
+            error = null,
+            errorConverter = converter,
+        ) {}
+        OutlinedTextFieldWidget(
+            fieldData = Field.Data("First", false),
+            label = "First label",
+            placeholder = "1 placeholder",
+            error = null,
+            errorConverter = converter,
+        ) {}
+        OutlinedTextFieldWidget(
+            fieldData = Field.Data("First", false),
+            label = "First label",
+            placeholder = "1 placeholder",
+            isLoading = true,
+            error = null,
+            errorConverter = converter,
+        ) {}
+        OutlinedTextFieldWidget(
+            fieldData = Field.Data("First", false),
+            label = "First label",
+            placeholder = "1 placeholder",
+            error = SimpleError(),
+            errorConverter = converter,
+        ) {}
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/PinCodeWidget.kt b/app/src/main/java/com/tangem/tap/common/compose/PinCodeWidget.kt
index ad7bbe794b..f742bb5731 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/PinCodeWidget.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/PinCodeWidget.kt
@@ -50,7 +50,7 @@ import androidx.core.text.isDigitsOnly
 @Composable
 fun PinCodeWidget(
     config: PinViewConfig = tangemPinConfig,
-    onPinChanged: (String, Boolean) -> Unit = { pin, isLastSymbolEntered -> },
+    onPinChange: (String, Boolean) -> Unit = { pin, isLastSymbolEntered -> },
 ) {
     val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
@@ -65,7 +65,7 @@ fun PinCodeWidget(
 
         if (value.text.length <= config.pinsCount) {
             rTextFieldValue.value = value
-            onPinChanged(value.text, isLastSymbolEntered())
+            onPinChange(value.text, isLastSymbolEntered())
         }
     }
 
@@ -125,10 +125,6 @@ private fun PinElement(
     }
 }
 
-@Composable
-private fun HiddenInputField() {
-}
-
 private fun createPinSymbolsList(size: Int, text: String): List<String?> = List(size) {
     try {
         text[it].toString()
@@ -165,7 +161,7 @@ private val tangemPinConfig = PinViewConfig(
 
 @Preview
 @Composable
-fun PinCodeWidgetPreview() {
+private fun PinCodeWidgetPreview() {
     Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
         PinCodeWidget(tangemPinConfig)
     }
diff --git a/app/src/main/java/com/tangem/tap/common/compose/TangemTextFieldsDefault.kt b/app/src/main/java/com/tangem/tap/common/compose/TangemTextFieldsDefault.kt
new file mode 100644
index 0000000000..694fd8c376
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/compose/TangemTextFieldsDefault.kt
@@ -0,0 +1,156 @@
+package com.tangem.tap.common.compose
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.interaction.InteractionSource
+import androidx.compose.foundation.interaction.collectIsFocusedAsState
+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.rememberUpdatedState
+import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.res.TangemTheme
+
+// Copy from com.tangem.core.ui.components
+// TODO: Delete this after fields has been moved to core-ui module
+internal 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
+internal 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)
+    }
+}
\ 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/Undefined.kt b/app/src/main/java/com/tangem/tap/common/compose/Undefined.kt
index 6cd0b70d72..10e2ec9956 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/Undefined.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/Undefined.kt
@@ -16,7 +16,7 @@ fun TitleSubtitle(
     title: String,
     subtitle: String
 ) {
-    Column() {
+    Column {
         Text(text = title)
         Text(
             text = subtitle,
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..ea4d150e51 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
 
@@ -21,9 +22,9 @@ import com.tangem.wallet.R
  */
 @Composable
 fun AddCustomTokenWarning(
-    modifier: Modifier = Modifier,
     warning: ModuleMessage,
-    converter: ModuleMessageConverter
+    converter: ModuleMessageConverter,
+    modifier: Modifier = Modifier,
 ) {
     Surface(
         modifier = modifier,
@@ -48,6 +49,5 @@ fun AddCustomTokenWarning(
                 lineHeight = 18.sp
             )
         }
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/extensions/Color.kt b/app/src/main/java/com/tangem/tap/common/compose/extensions/Color.kt
deleted file mode 100644
index d25bc9e26b..0000000000
--- a/app/src/main/java/com/tangem/tap/common/compose/extensions/Color.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.tangem.tap.common.compose.extensions
-
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.core.graphics.alpha
-import androidx.core.graphics.blue
-import androidx.core.graphics.green
-import androidx.core.graphics.red
-
-/**
-[REDACTED_AUTHOR]
- */
-fun Color.toAndroidGraphicsColor(): Int {
-    val argb = this.toArgb()
-    return android.graphics.Color.argb(argb.alpha, argb.red, argb.green, argb.blue)
-}
-
-fun Color.parse(hexColor: String): Color {
-    return Color(hexColor.removePrefix("#").toInt(16))
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/extensions/Context.kt b/app/src/main/java/com/tangem/tap/common/compose/extensions/Context.kt
index 25ae94623c..719c80d0d4 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/extensions/Context.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/extensions/Context.kt
@@ -8,11 +8,13 @@ import com.tangem.tap.common.extensions.getFromClipboard
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("ComposableFunctionName")
 @Composable
 fun copyToClipboard(value: Any, label: String = "") {
     LocalContext.current.copyToClipboard(value, label)
 }
 
+@Suppress("ComposableFunctionName")
 @Composable
 fun getFromClipboard(default: CharSequence? = null): CharSequence? {
     return LocalContext.current.getFromClipboard(default)
diff --git a/app/src/main/java/com/tangem/tap/common/compose/extensions/ImageBitmap.kt b/app/src/main/java/com/tangem/tap/common/compose/extensions/ImageBitmap.kt
index 1692b4c51f..99911d9e6f 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/extensions/ImageBitmap.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/extensions/ImageBitmap.kt
@@ -13,7 +13,8 @@ import androidx.core.graphics.drawable.toBitmap
  */
 @Composable
 fun asImageBitmap(@DrawableRes drawableId: Int): ImageBitmap {
-    val drawable = AppCompatResources.getDrawable(LocalContext.current, drawableId)
-        ?: throw NullPointerException()
+    val drawable = requireNotNull(AppCompatResources.getDrawable(LocalContext.current, drawableId)) {
+        "drawable is null"
+    }
     return drawable.toBitmap().asImageBitmap()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt b/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt
index f05044368f..dab9b8f654 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt
@@ -1,12 +1,16 @@
 package com.tangem.tap.common.compose.extensions
 
 import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalView
 import com.tangem.tap.common.extensions.hideKeyboard
 
 @Composable
-fun LazyListState.OnBottomReached(loadMoreThreshold: Int, loadMore: () -> Unit) {
+fun LazyListState.OnBottomReached(loadMoreThreshold: Int, onLoadMore: () -> Unit) {
     require(loadMoreThreshold >= 0)
     val shouldLoadMore by remember {
         derivedStateOf {
@@ -17,7 +21,7 @@ fun LazyListState.OnBottomReached(loadMoreThreshold: Int, loadMore: () -> Unit)
     }
 
     LaunchedEffect(shouldLoadMore) {
-        if (shouldLoadMore) loadMore()
+        if (shouldLoadMore) onLoadMore()
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/common/entities/Button.kt b/app/src/main/java/com/tangem/tap/common/entities/Button.kt
index a2d4127c8f..d9ff2b27f8 100644
--- a/app/src/main/java/com/tangem/tap/common/entities/Button.kt
+++ b/app/src/main/java/com/tangem/tap/common/entities/Button.kt
@@ -6,7 +6,7 @@ import com.tangem.tap.features.wallet.redux.ProgressState
 open class Button(val enabled: Boolean)
 
 open class IndeterminateProgressButton(
-        val state: ButtonState
+    val state: ButtonState
 ) : Button(state != ButtonState.DISABLED) {
 
     val progressState: ProgressState
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Activity.kt b/app/src/main/java/com/tangem/tap/common/extensions/Activity.kt
index 8ed146440b..5f531a9bc8 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Activity.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Activity.kt
@@ -26,11 +26,11 @@ fun Activity.sendEmail(
 ) {
     fun createEmailShareIntent(recipient: String, subject: String, text: String, file: File? = null): Intent {
         val builder = ShareCompat.IntentBuilder.from(this)
-                .setType("message/rfc822")
-                .setEmailTo(arrayOf(recipient))
-                .setSubject(subject)
-                .setText(text)
-        file?.let { builder.setStream(FileProvider.getUriForFile(this, "${packageName}.provider", it)) }
+            .setType("message/rfc822")
+            .setEmailTo(arrayOf(recipient))
+            .setSubject(subject)
+            .setText(text)
+        file?.let { builder.setStream(FileProvider.getUriForFile(this, "$packageName.provider", it)) }
         return builder.intent
     }
 
@@ -41,17 +41,17 @@ fun Activity.sendEmail(
     val emailFilterIntentResults = packageManager.queryIntentActivities(emailFilterIntent, 0)
 
     val targetedIntents = originalIntentResults
-            .filter { originalResult ->
-                emailFilterIntentResults.any {
-                    originalResult.activityInfo.packageName == it.activityInfo.packageName
-                }
+        .filter { originalResult ->
+            emailFilterIntentResults.any {
+                originalResult.activityInfo.packageName == it.activityInfo.packageName
             }
-            .map {
-                createEmailShareIntent(email, subject, message, file).apply {
-                    setPackage(it.activityInfo.packageName)
-                }
+        }
+        .map {
+            createEmailShareIntent(email, subject, message, file).apply {
+                setPackage(it.activityInfo.packageName)
             }
-            .toMutableList()
+        }
+        .toMutableList()
     try {
         val chooserIntent = Intent.createChooser(targetedIntents.removeAt(0), "Send mail...")
         chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, targetedIntents.toTypedArray())
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/AssetManager.kt b/app/src/main/java/com/tangem/tap/common/extensions/AssetManager.kt
index b2905ec473..9130b6c91d 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/AssetManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/AssetManager.kt
@@ -3,4 +3,4 @@ package com.tangem.tap.common.extensions
 import android.content.res.AssetManager
 
 fun AssetManager.readJsonFileToString(fileName: String): String =
-        this.open("$fileName.json").bufferedReader().readText()
\ No newline at end of file
+    this.open("$fileName.json").bufferedReader().readText()
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/BackupService.kt b/app/src/main/java/com/tangem/tap/common/extensions/BackupService.kt
index abe1863c6d..140f0946b4 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/BackupService.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/BackupService.kt
@@ -6,8 +6,7 @@ import com.tangem.operations.backup.BackupService
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("MagicNumber")
 fun BackupService.primaryCardIsSaltPayVisa(): Boolean {
-    return primaryCardId?.slice(0..3)?.let {
-        SaltPayWorkaround.isVisaBatchId(it)
-    } ?: false
+    return primaryCardId?.slice(0..3)?.let(SaltPayWorkaround::isVisaBatchId) ?: false
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Bitmap.kt b/app/src/main/java/com/tangem/tap/common/extensions/Bitmap.kt
index e8b3891ce9..80e756c21c 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Bitmap.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Bitmap.kt
@@ -4,12 +4,14 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import java.io.ByteArrayOutputStream
 
+@Suppress("MagicNumber")
 fun Bitmap.toByteArray(): ByteArray {
     val stream = ByteArrayOutputStream()
     this.compress(Bitmap.CompressFormat.JPEG, 20, stream)
     return stream.toByteArray()
 }
 
+@Suppress("MagicNumber")
 fun ByteArray.toBitmap(): Bitmap {
     return BitmapFactory.decodeByteArray(this, 0, this.size)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
index e53e1effbe..133869ee22 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
@@ -5,49 +5,17 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.extensions.remove
 import com.tangem.wallet.R
 
-@DrawableRes
-fun Blockchain.getRoundIconRes(): Int {
-    return when (this) {
-        Blockchain.Arbitrum, Blockchain.ArbitrumTestnet -> R.drawable.ic_arbitrum_round
-        Blockchain.Ducatus -> R.drawable.ic_ducatus
-        Blockchain.Bitcoin, Blockchain.BitcoinTestnet,-> R.drawable.ic_bitcoin_round
-        Blockchain.BitcoinCash -> R.drawable.ic_bitcoin_cash_round
-        Blockchain.Litecoin -> R.drawable.ic_litecoin_round
-        Blockchain.Ethereum, Blockchain.EthereumTestnet, -> R.drawable.ic_eth_round
-        Blockchain.EthereumClassic, Blockchain.EthereumClassicTestnet ->  R.drawable.ic_eth_round
-        Blockchain.RSK -> R.drawable.ic_rsk_round
-        Blockchain.Cardano, Blockchain.CardanoShelley -> R.drawable.ic_cardano_round
-        Blockchain.Tezos -> R.drawable.ic_tezos_round
-        Blockchain.XRP -> R.drawable.ic_xrp_round
-        Blockchain.Stellar -> R.drawable.ic_stellar_round
-        Blockchain.Avalanche, Blockchain.AvalancheTestnet -> R.drawable.ic_avalanche_round
-        Blockchain.Polygon, Blockchain.PolygonTestnet -> R.drawable.ic_polygon_round
-        Blockchain.Solana, Blockchain.SolanaTestnet -> R.drawable.ic_solana_round
-        Blockchain.Fantom, Blockchain.FantomTestnet -> R.drawable.ic_fantom_round
-        Blockchain.BSC, Blockchain.BSCTestnet, Blockchain.Binance, Blockchain.BinanceTestnet -> R.drawable.ic_bsc_round
-        Blockchain.Dogecoin -> R.drawable.ic_dogecoin_round
-        Blockchain.Tron, Blockchain.TronTestnet -> R.drawable.ic_tron_round
-        Blockchain.Gnosis -> R.drawable.ic_gnosis_round
-        Blockchain.EthereumPow, Blockchain.EthereumPowTestnet -> R.drawable.ic_ethereumpow_round
-        Blockchain.EthereumFair -> R.drawable.ic_ethereumfair_round
-        Blockchain.Polkadot, Blockchain.PolkadotTestnet -> R.drawable.ic_polkadot_round
-        Blockchain.Kusama -> R.drawable.ic_kusama_round
-        Blockchain.Optimism, Blockchain.OptimismTestnet -> R.drawable.ic_optimism
-        Blockchain.Dash -> R.drawable.ic_dash
-        else -> R.drawable.ic_tangem_logo
-    }
-}
-
+@Suppress("ComplexMethod")
 @DrawableRes
 fun Blockchain.getGreyedOutIconRes(): Int {
     return when (this) {
         Blockchain.Arbitrum, Blockchain.ArbitrumTestnet -> R.drawable.ic_arbitrum_no_color
 //        Blockchain.Ducatus -> R.drawable.ic_ducatus
-        Blockchain.Bitcoin, Blockchain.BitcoinTestnet,-> R.drawable.ic_bitcoin_no_color
+        Blockchain.Bitcoin, Blockchain.BitcoinTestnet -> R.drawable.ic_bitcoin_no_color
         Blockchain.BitcoinCash -> R.drawable.ic_bitcoin_cash_no_color
         Blockchain.Litecoin -> R.drawable.ic_litecoin_no_color
-        Blockchain.Ethereum, Blockchain.EthereumTestnet, -> R.drawable.ic_eth_no_color
-        Blockchain.EthereumClassic, Blockchain.EthereumClassicTestnet, -> R.drawable.ic_eth_no_color
+        Blockchain.Ethereum, Blockchain.EthereumTestnet -> R.drawable.ic_eth_no_color
+        Blockchain.EthereumClassic, Blockchain.EthereumClassicTestnet -> R.drawable.ic_eth_no_color
         Blockchain.RSK -> R.drawable.ic_rsk_no_color
         Blockchain.Cardano, Blockchain.CardanoShelley -> R.drawable.ic_cardano_no_color
         Blockchain.Tezos -> R.drawable.ic_tezos_no_color
@@ -57,7 +25,8 @@ fun Blockchain.getGreyedOutIconRes(): Int {
         Blockchain.Polygon, Blockchain.PolygonTestnet -> R.drawable.ic_polygon_no_color
         Blockchain.Solana, Blockchain.SolanaTestnet -> R.drawable.ic_solana_no_color
         Blockchain.Fantom, Blockchain.FantomTestnet -> R.drawable.ic_fantom_no_color
-        Blockchain.BSC, Blockchain.BSCTestnet, Blockchain.Binance, Blockchain.BinanceTestnet -> R.drawable.ic_bsc_no_color
+        Blockchain.BSC, Blockchain.BSCTestnet, Blockchain.Binance, Blockchain.BinanceTestnet ->
+            R.drawable.ic_bsc_no_color
         Blockchain.Dogecoin -> R.drawable.ic_dogecoin_no_color
         Blockchain.Tron, Blockchain.TronTestnet -> R.drawable.ic_tron_no_color
         Blockchain.Gnosis -> R.drawable.ic_gnosis_no_color
@@ -82,4 +51,4 @@ fun Blockchain.getNetworkName(): String {
 }
 
 val Blockchain.fullNameWithoutTestnet
-get() = this.fullName.remove(" Testnet")
\ No newline at end of file
+    get() = this.fullName.remove(" Testnet")
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Context.kt b/app/src/main/java/com/tangem/tap/common/extensions/Context.kt
index cba31fe77c..ee68830265 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Context.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Context.kt
@@ -1,7 +1,11 @@
 package com.tangem.tap.common.extensions
 
+import android.content.ContentResolver
 import android.content.Context
 import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.net.Uri
+import androidx.annotation.AnyRes
 import androidx.core.content.ContextCompat
 
 fun Context.readFile(fileName: String): String =
@@ -19,4 +23,20 @@ fun Context.readAssetAsString(fileName: String): String {
 
 fun Context.isPermissionGranted(permission: String): Boolean {
     return ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
+}
+
+/**
+ * Get uri to any resource type via given Resource Instance
+ * @param resId - resource id
+ * @throws Resources.NotFoundException if the given ID does not exist.
+ * @return - Uri to resource by the given ID
+ */
+@Throws(Resources.NotFoundException::class)
+fun Context.resourceUri(@AnyRes resId: Int): Uri {
+    return Uri.parse(
+        ContentResolver.SCHEME_ANDROID_RESOURCE +
+            "://" + resources.getResourcePackageName(resId) +
+            '/' + resources.getResourceTypeName(resId) +
+            '/' + resources.getResourceEntryName(resId),
+    )
 }
\ No newline at end of file
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..6cb707b071 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 android.os.Bundle
+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.feature.swap.presentation.SwapFragment
 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,24 +22,27 @@ 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
+    bundle: Bundle? = null,
+    fgShareTransition: FragmentShareTransition? = null,
 ) {
     val transaction = this.supportFragmentManager.beginTransaction()
     val fragment = fragmentFactory(screen)
+    fragment.arguments = bundle
     fgShareTransition?.apply {
         fragment.sharedElementEnterTransition = enterTransitionSet
         fragment.sharedElementReturnTransition = exitTransitionSet
@@ -48,9 +53,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) {
@@ -68,21 +82,15 @@ fun FragmentActivity.getPreviousScreen(): AppScreen? {
     } else {
         0
     }
-    val tag = if (indexOfLastFragment < this.supportFragmentManager.backStackEntryCount)
+    val tag = if (indexOfLastFragment < this.supportFragmentManager.backStackEntryCount) {
         this.supportFragmentManager.getBackStackEntryAt(indexOfLastFragment).name
-    else null
+    } else {
+        null
+    }
     return tag?.let { AppScreen.valueOf(tag) }
 }
 
-fun FragmentActivity.addOnBackPressedDispatcher(
-    isEnabled: Boolean = true,
-    onBackPressed: VoidCallback
-): OnBackPressedCallback = (object : OnBackPressedCallback(isEnabled) {
-    override fun handleOnBackPressed() {
-        onBackPressed()
-    }
-}).also { this.onBackPressedDispatcher.addCallback(it) }
-
+@Suppress("ComplexMethod")
 private fun fragmentFactory(screen: AppScreen): Fragment {
     return when (screen) {
         AppScreen.Home -> HomeFragment()
@@ -104,5 +112,10 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.WalletDetails -> WalletDetailsFragment()
         AppScreen.WalletConnectSessions -> WalletConnectFragment()
         AppScreen.QrScan -> QrScanFragment()
+        AppScreen.ReferralProgram -> ReferralFragment()
+        AppScreen.Swap -> SwapFragment()
+        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/Specific.kt b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt
index 795bc8e268..ff4f898d8d 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt
@@ -11,8 +11,11 @@ import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.util.*
 
+// TODO: move extensions to utils
 fun BigDecimal.toFormattedString(
-    decimals: Int, roundingMode: RoundingMode = RoundingMode.DOWN, locale: Locale = Locale.US
+    decimals: Int,
+    roundingMode: RoundingMode = RoundingMode.DOWN,
+    locale: Locale = Locale.US,
 ): String {
     val symbols = DecimalFormatSymbols(locale)
     val df = DecimalFormat()
@@ -24,9 +27,12 @@ fun BigDecimal.toFormattedString(
     return df.format(this)
 }
 
+@Suppress("MagicNumber")
 fun BigDecimal.toFormattedCurrencyString(
-    decimals: Int, currency: String, roundingMode: RoundingMode = RoundingMode.DOWN,
-    limitNumberOfDecimals: Boolean = true
+    decimals: Int,
+    currency: String,
+    roundingMode: RoundingMode = RoundingMode.DOWN,
+    limitNumberOfDecimals: Boolean = true,
 ): String {
     val decimalsForRounding = if (limitNumberOfDecimals) {
         if (decimals > 8) 8 else decimals
@@ -34,13 +40,14 @@ fun BigDecimal.toFormattedCurrencyString(
         decimals
     }
     val formattedAmount = this.toFormattedString(
-        decimals = decimalsForRounding, roundingMode = roundingMode
+        decimals = decimalsForRounding,
+        roundingMode = roundingMode,
     )
     return "$formattedAmount $currency"
 }
 
 fun BigDecimal.toFiatRateString(
-    fiatCurrencyName: String
+    fiatCurrencyName: String,
 ): String {
     val value = this
         .setScale(2, RoundingMode.HALF_UP)
@@ -51,7 +58,7 @@ fun BigDecimal.toFiatRateString(
 fun BigDecimal.toFiatString(
     rateValue: BigDecimal,
     fiatCurrencyName: String,
-    formatWithSpaces: Boolean = false
+    formatWithSpaces: Boolean = false,
 ): String {
     val fiatValue = rateValue.multiply(this)
     return fiatValue.toFormattedFiatValue(fiatCurrencyName, formatWithSpaces)
@@ -64,11 +71,11 @@ fun BigDecimal.toFiatValue(rateValue: BigDecimal): BigDecimal {
 
 fun BigDecimal.toFormattedFiatValue(
     fiatCurrencyName: String,
-    formatWithSpaces: Boolean = false
+    formatWithSpaces: Boolean = false,
 ): String {
     val fiatValue = this.setScale(2, RoundingMode.HALF_UP)
         .let { if (formatWithSpaces) it.formatWithSpaces() else it }
-    return " ${fiatValue}  $fiatCurrencyName"
+    return " $fiatValue $fiatCurrencyName"
 }
 
 fun BigDecimal.stripZeroPlainString(): String = this.stripTrailingZeros().toPlainString()
@@ -81,9 +88,7 @@ fun BigDecimal.scaleToFiat(applyPrecision: Boolean = false): BigDecimal {
     if (this.isZero()) return this
 
     val scaledFiat = this.setScale(2, RoundingMode.DOWN)
-    return if (scaledFiat.isZero() && applyPrecision) this.setPrecision(1)
-    else scaledFiat
-
+    return if (scaledFiat.isZero() && applyPrecision) this.setPrecision(1) else scaledFiat
 }
 
 fun BigDecimal.setPrecision(precision: Int, roundingMode: RoundingMode = RoundingMode.DOWN): BigDecimal {
@@ -108,7 +113,7 @@ fun BigDecimal.isLessThanOrEqual(value: BigDecimal): Boolean {
 
 fun BigDecimal.formatAmountAsSpannedString(
     currencySymbol: String,
-    reminderPartSizeProportion: Float = 0.7f
+    reminderPartSizeProportion: Float = 0.7f,
 ): SpannedString {
     val amount = this
         .setScale(2, RoundingMode.HALF_UP)
@@ -124,11 +129,12 @@ fun BigDecimal.formatAmountAsSpannedString(
         append(
             "$reminder $currencySymbol",
             RelativeSizeSpan(reminderPartSizeProportion),
-            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
         )
     }
 }
 
+@Suppress("MagicNumber")
 fun BigDecimal.formatWithSpaces(): String {
     val str = this.toString()
     var integerStr = str.substringBefore('.')
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..3c4125d422 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
@@ -29,7 +29,7 @@ fun String.colorSegment(
     context: Context,
     color: Int,
     startIndex: Int = 0,
-    endIndex: Int = this.length
+    endIndex: Int = this.length,
 ): Spannable {
     return this.toSpannable()
         .also { spannable ->
@@ -37,11 +37,12 @@ fun String.colorSegment(
                 ForegroundColorSpan(ContextCompat.getColor(context, color)),
                 startIndex,
                 endIndex,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
             )
         }
 }
 
+@Suppress("MagicNumber")
 fun String.toQrCode(): Bitmap {
     val hintMap = Hashtable<EncodeHintType, Any>()
     hintMap[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M // H = 30% damage
@@ -62,4 +63,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/TextView.kt b/app/src/main/java/com/tangem/tap/common/extensions/TextView.kt
index 48ee67afc7..aef0701282 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/TextView.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/TextView.kt
@@ -18,13 +18,12 @@ fun EditText.update(text: String?) {
 
     val textLength = text?.length ?: 0
 
-    //prevent cursor jumping while editing a text
+    // prevent cursor jumping while editing a text
     val cursorPosition = if (selectionEnd > textLength) textLength else selectionEnd
     this.setText(text)
     if (!isFocused || textLength == 0) return
 
-    if (cursorPosition == 0) setSelection(textLength)
-    else setSelection(cursorPosition)
+    if (cursorPosition == 0) setSelection(textLength) else setSelection(cursorPosition)
 }
 
 fun EditText.setOnImeActionListener(action: Int, handler: (EditText) -> Unit) {
@@ -56,13 +55,4 @@ fun TextInputLayout.enableError(enable: Boolean, errorMessage: String? = null) {
         error = null
         isErrorEnabled = false
     }
-}
-
-fun TextView.isEllipsized(): Boolean {
-    val layout = this.layout
-    if (layout != null) {
-        val lines: Int = layout.lineCount
-        return (lines > 0) && (layout.getEllipsisCount(lines - 1) > 0)
-    }
-    return false
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Token.kt b/app/src/main/java/com/tangem/tap/common/extensions/Token.kt
index 59c918d736..7acbdfd9fb 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Token.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Token.kt
@@ -6,19 +6,23 @@ import androidx.core.graphics.luminance
 import androidx.core.graphics.toColorInt
 import com.tangem.blockchain.common.Token
 
+@Suppress("MagicNumber")
 @ColorInt
 fun Token.getColor(isTestnet: Boolean = false): Int {
     val defaultColor = "#C7C7CC".toColorInt() // equivalent to R.color.lightGray4
 
-    return if (isTestnet)
-        defaultColor
-    else try {
-        ("#" + this.contractAddress.subSequence(2..7).toString()).toColorInt()
-    } catch (exception: Exception) {
+    return if (isTestnet) {
         defaultColor
+    } else {
+        try {
+            ("#" + this.contractAddress.subSequence(2..7).toString()).toColorInt()
+        } catch (exception: Exception) {
+            defaultColor
+        }
     }
 }
 
+@Suppress("MagicNumber")
 @ColorInt
 fun Token.getTextColor(isTestnet: Boolean = false): Int = when {
     isTestnet -> Color.WHITE
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..28bfaad264 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
@@ -1,16 +1,14 @@
+@file:Suppress("TooManyFunctions")
+
 package com.tangem.tap.common.extensions
 
 import android.app.Activity
-import android.content.ActivityNotFoundException
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
-import android.content.res.Resources
 import android.graphics.drawable.Drawable
-import android.os.Build
-import android.os.Bundle
 import android.util.DisplayMetrics
 import android.util.TypedValue
 import android.view.View
@@ -19,16 +17,12 @@ 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
 import androidx.fragment.app.Fragment
 import com.google.android.material.card.MaterialCardView
-import com.tangem.common.extensions.VoidCallback
-
-fun Fragment.getDrawable(@DrawableRes drawableResId: Int): Drawable? {
-    return ContextCompat.getDrawable(requireContext(), drawableResId)
-}
 
 fun Context.getDrawableCompat(@DrawableRes drawableResId: Int): Drawable? {
     return ContextCompat.getDrawable(this, drawableResId)
@@ -57,21 +51,12 @@ 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)
 }
 
-fun View.getResourceName(): String {
-    return try {
-        resources.getResourceEntryName(id)
-    } catch (ex: Resources.NotFoundException) {
-        "Not found"
-    }
-}
-
 fun View.show(show: Boolean, invokeBeforeStateChanged: (() -> Unit)? = null) {
-    return if (show) this.show(invokeBeforeStateChanged)
-    else this.hide(invokeBeforeStateChanged)
+    return if (show) this.show(invokeBeforeStateChanged) else this.hide(invokeBeforeStateChanged)
 }
 
 fun View.show(invokeBeforeStateChanged: (() -> Unit)? = null) {
@@ -101,7 +86,9 @@ fun View.invisible(invisible: Boolean = true, invokeBeforeStateChanged: (() -> U
 
 fun Context.dpToPixels(dp: Int): Int =
     TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_DIP, dp.toFloat(), this.resources.displayMetrics,
+        TypedValue.COMPLEX_UNIT_DIP,
+        dp.toFloat(),
+        this.resources.displayMetrics,
     ).toInt()
 
 fun Context.pixelsToDp(pixels: Int): Int {
@@ -110,12 +97,6 @@ fun Context.pixelsToDp(pixels: Int): Int {
         .toInt()
 }
 
-fun Context.dpToPixels(dp: Float): Float =
-    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, this.resources.displayMetrics)
-
-fun Context.pixelsToDp(pixels: Float): Float =
-    (pixels / (resources.displayMetrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT))
-
 tailrec fun Context?.getActivity(): Activity? = this as? Activity
     ?: (this as? ContextWrapper)?.baseContext?.getActivity()
 
@@ -135,19 +116,6 @@ fun MaterialCardView.setMargins(
     this.layoutParams = params
 }
 
-fun Activity.setSystemBarTextColor(setTextDark: Boolean) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        val flags = this.window.decorView.systemUiVisibility
-        // Update the SystemUiVisibility dependening on whether we want a Light or Dark theme.
-        this.window.decorView.systemUiVisibility =
-            if (setTextDark) {
-                flags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
-            } else {
-                flags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-            }
-    }
-}
-
 fun View.hideKeyboard() {
     val inputMethodManager =
         context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? InputMethodManager
@@ -184,21 +152,6 @@ fun Fragment.shareText(text: String) {
     requireContext().shareText(text)
 }
 
-fun Context.safeStartActivity(
-    intent: Intent,
-    options: Bundle? = null,
-    fallback: ((ActivityNotFoundException) -> Unit)? = null,
-    finally: VoidCallback? = null,
-) {
-    try {
-        this.startActivity(intent, options)
-    } catch (ex: ActivityNotFoundException) {
-        fallback?.invoke(ex)
-    } finally {
-        finally?.invoke()
-    }
-}
-
 fun View.getString(resId: Int, vararg formatArgs: Any?): String {
     return context.getString(resId, *formatArgs)
 }
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Any.kt b/app/src/main/java/com/tangem/tap/common/extensions/ValueCallback.kt
similarity index 100%
rename from app/src/main/java/com/tangem/tap/common/extensions/Any.kt
rename to app/src/main/java/com/tangem/tap/common/extensions/ValueCallback.kt
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..97997ba97f 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
@@ -21,6 +21,7 @@ import timber.log.Timber
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("MagicNumber")
 suspend fun WalletManager.safeUpdate(): Result<Wallet> = try {
     val scanResponse = store.state.globalState.scanResponse
 
@@ -55,11 +56,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,
@@ -73,8 +73,7 @@ fun WalletManager?.getAddressData(): AddressData? {
     val wallet = this?.wallet ?: return null
 
     val addressDataList = wallet.createAddressesData()
-    return if (addressDataList.isEmpty()) null
-    else addressDataList[0]
+    return if (addressDataList.isEmpty()) null else addressDataList[0]
 }
 
 fun <T> WalletManager.Companion.stub(): T {
diff --git a/app/src/main/java/com/tangem/tap/common/feature/Feature.kt b/app/src/main/java/com/tangem/tap/common/feature/Feature.kt
index ce1313c772..1eb07546b4 100644
--- a/app/src/main/java/com/tangem/tap/common/feature/Feature.kt
+++ b/app/src/main/java/com/tangem/tap/common/feature/Feature.kt
@@ -4,5 +4,5 @@ package com.tangem.tap.common.feature
 [REDACTED_AUTHOR]
  */
 interface Feature {
-    fun featureIsSwitchedOn():Boolean
+    fun featureIsSwitchedOn(): Boolean
 }
\ No newline at end of file
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..c6f5bafd0a 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>()
@@ -46,12 +48,16 @@ class AdditionalFeedbackInfo {
     var fee: String = ""
     var token: String = ""
 
+    private val Address.name: String
+        get() = type.javaClass.simpleName
+
     fun setCardInfo(data: ScanResponse) {
         cardId = data.card.cardId
         cardBlockchain = data.walletData?.blockchain ?: ""
         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 +95,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}" }
     }
 
@@ -105,6 +111,7 @@ class AdditionalFeedbackInfo {
         }
     }
 
+    @Suppress("MagicNumber")
     private fun Wallet.formatAddressWith(with: String, mapAddress: (Address) -> String): String {
         return if (addresses.size == 1) {
             getExploreUrl(address)
@@ -114,7 +121,4 @@ class AdditionalFeedbackInfo {
                 .joinToString("\n")
         }
     }
-
-    private val Address.name: String
-        get() = type.javaClass.simpleName
 }
\ No newline at end of file
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..452eb173aa 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
@@ -15,6 +15,7 @@ interface FeedbackData {
 
     fun createOptionalMessage(infoHolder: AdditionalFeedbackInfo): String
 
+    @Suppress("MagicNumber")
     fun joinTogether(context: Context, infoHolder: AdditionalFeedbackInfo): String {
         return StringBuilder().apply {
             append(context.getString(mainMessageResId))
@@ -42,6 +43,7 @@ class ScanFailsEmail : FeedbackData {
     override val subjectResId: Int = R.string.feedback_subject_scan_failed
     override val mainMessageResId: Int = R.string.feedback_preface_scan_failed
 
+    @Suppress("MagicNumber")
     override fun joinTogether(context: Context, infoHolder: AdditionalFeedbackInfo): String = StringBuilder().apply {
         append(context.getString(mainMessageResId))
         breakLine(4)
@@ -96,8 +98,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/feedback/FeedbackManager.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt
index 12fe1e42e9..b44db4004b 100644
--- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.common.feedback
 
 import android.content.Context
 import android.os.Build
+import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.TapWorkarounds
 import com.tangem.tap.common.extensions.sendEmail
 import com.tangem.tap.common.log.TangemLogCollector
@@ -108,6 +109,7 @@ class FeedbackManager(
     }
 
     private fun showMessagingActivity(context: Context) {
+        Analytics.send(com.tangem.tap.common.analytics.events.Chat.ScreenOpened())
         MessagingActivity.builder()
             .withMultilineResponseOptionsEnabled(false)
             .withBotLabelStringRes(R.string.chat_bot_name)
diff --git a/app/src/main/java/com/tangem/tap/common/images/Coil.kt b/app/src/main/java/com/tangem/tap/common/images/Coil.kt
index 5224c40df0..4e5a88d6e0 100644
--- a/app/src/main/java/com/tangem/tap/common/images/Coil.kt
+++ b/app/src/main/java/com/tangem/tap/common/images/Coil.kt
@@ -30,13 +30,11 @@ fun createCoilImageLoader(
                             }
                     )
                     .build()
-
             }
         }
         .build()
 }
 
-
 private class CoilTimberLogger : Logger {
 
     override var level: Int = Log.DEBUG
diff --git a/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt b/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt
index 1999c35855..98a06327bb 100644
--- a/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt
+++ b/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt
@@ -17,13 +17,13 @@ class TestLeapfrogFragment : Fragment(R.layout.test_leapfrog_fragment) {
     private lateinit var twinsCardWidget: TwinsCardWidget
     private val binding: TestLeapfrogFragmentBinding by viewBinding(TestLeapfrogFragmentBinding::bind)
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val inflater = TransitionInflater.from(requireContext())
         exitTransition = inflater.inflateTransition(R.transition.fade)
     }
 
+    @Suppress("MagicNumber")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
diff --git a/app/src/main/java/com/tangem/tap/common/qrCodeScan/ScanQrCodeActivity.kt b/app/src/main/java/com/tangem/tap/common/qrCodeScan/ScanQrCodeActivity.kt
index da69eed9ae..4a86caa20d 100644
--- a/app/src/main/java/com/tangem/tap/common/qrCodeScan/ScanQrCodeActivity.kt
+++ b/app/src/main/java/com/tangem/tap/common/qrCodeScan/ScanQrCodeActivity.kt
@@ -16,11 +16,6 @@ import me.dm7.barcodescanner.zxing.ZXingScannerView
 [REDACTED_AUTHOR]
  */
 class ScanQrCodeActivity : AppCompatActivity(), ZXingScannerView.ResultHandler {
-    companion object {
-        val SCAN_QR_REQUEST_CODE = 1001
-        val SCAN_RESULT = "scanResult"
-    }
-
     private lateinit var mScannerView: ZXingScannerView
 
     override fun onCreate(state: Bundle?) {
@@ -29,7 +24,6 @@ class ScanQrCodeActivity : AppCompatActivity(), ZXingScannerView.ResultHandler {
         setContentView(mScannerView)
 
         if (!permissionIsGranted()) requestPermission()
-
     }
 
     override fun onResume() {
@@ -66,4 +60,9 @@ class ScanQrCodeActivity : AppCompatActivity(), ZXingScannerView.ResultHandler {
     private fun requestPermission() {
         ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), PERMISSION_REQUEST_CODE)
     }
+
+    companion object {
+        const val SCAN_QR_REQUEST_CODE = 1001
+        const val SCAN_RESULT = "scanResult"
+    }
 }
\ 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..820f5b3d3f 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,11 @@ 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 com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import org.rekotlin.Middleware
 import org.rekotlin.StateType
 
@@ -51,6 +58,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
@@ -59,10 +69,18 @@ data class AppState(
     val domainNetworks: NetworkServices
         get() = domainState.globalState.networkServices
 
+    val featureRepositoryProvider: FeatureRepositoryProvider
+        get() = FeatureRepositoryProvider(
+            tangemTechApi = domainNetworks.tangemTechService.api,
+            dispatchers = AppCoroutineDispatcherProvider(),
+        )
+
     companion object {
         fun getMiddleware(): List<Middleware<AppState>> {
             return listOf(
-                logMiddleware, navigationMiddleware, notificationsMiddleware,
+                logMiddleware,
+                navigationMiddleware,
+                notificationsMiddleware,
                 GlobalMiddleware.handler,
                 HomeMiddleware.handler,
                 OnboardingNoteMiddleware.handler,
@@ -78,8 +96,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/FeatureRepositoryProvider.kt b/app/src/main/java/com/tangem/tap/common/redux/FeatureRepositoryProvider.kt
new file mode 100644
index 0000000000..5794edffb9
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/redux/FeatureRepositoryProvider.kt
@@ -0,0 +1,15 @@
+package com.tangem.tap.common.redux
+
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.tap.features.home.data.HomeRepositoryImpl
+import com.tangem.tap.features.home.domain.HomeRepository
+import com.tangem.tap.features.wallet.data.WalletRepositoryImpl
+import com.tangem.tap.features.wallet.domain.WalletRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+
+class FeatureRepositoryProvider(tangemTechApi: TangemTechApi, dispatchers: CoroutineDispatcherProvider) {
+
+    val walletRepository: WalletRepository = WalletRepositoryImpl(tangemTechApi, dispatchers)
+
+    val homeRepository: HomeRepository = HomeRepositoryImpl(tangemTechApi, dispatchers)
+}
\ 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/NotificationsMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/NotificationsMiddleware.kt
index a32545d675..4a7cb7b8f8 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/NotificationsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/NotificationsMiddleware.kt
@@ -88,6 +88,7 @@ val notificationsMiddleware: Middleware<AppState> = { dispatch, state ->
     }
 }
 
+@Suppress("ComplexMethod")
 private fun handleNotificationAction(action: Action) {
     if (action is Debug && !BuildConfig.DEBUG) return
 
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..1417d013d1 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()
@@ -51,7 +47,7 @@ sealed class GlobalAction : Action {
          * For SaltPay cards unfinished backup resumed after scanning the card on HomeScreen through Onboarding.Start.
          * See more Onboarding.Start, CheckForUnfinishedBackup
          */
-        object StartForUnfinishedBackup : Onboarding()
+        data class StartForUnfinishedBackup(val addedBackupCardsCount: Int) : Onboarding()
         object Stop : Onboarding()
     }
 
@@ -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/GlobalMiddleware.kt
similarity index 90%
rename from app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt
rename to app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
index 6f5af6bb92..b880c71872 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/GlobalMiddleware.kt
@@ -4,7 +4,6 @@ import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.ifNotNull
-import com.tangem.common.services.Result
 import com.tangem.domain.common.LogConfig
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
@@ -31,10 +30,8 @@ import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
 import java.util.*
 
-class GlobalMiddleware {
-    companion object {
-        val handler = globalMiddlewareHandler
-    }
+object GlobalMiddleware {
+    val handler = globalMiddlewareHandler
 }
 
 private val globalMiddlewareHandler: Middleware<AppState> = { dispatch, appState ->
@@ -46,6 +43,7 @@ private val globalMiddlewareHandler: Middleware<AppState> = { dispatch, appState
     }
 }
 
+@Suppress("LongMethod", "ComplexMethod")
 private fun handleAction(action: Action, appState: () -> AppState?, dispatch: DispatchFunction) {
     when (action) {
         is GlobalAction.ScanFailsCounter.ChooseBehavior -> {
@@ -74,7 +72,7 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
             store.state.globalState.warningManager?.let {
                 if (it.hideWarning(action.warning)) {
                     if (WarningMessagesManager.isAlreadySignedHashesWarning(action.warning)) {
-                        //TODO: No appropriate warningMessage identification. Make it better later
+                        // TODO: No appropriate warningMessage identification. Make it better later
                         store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
                     }
 
@@ -101,7 +99,7 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
 
             // if config not set -> try to get it based on a scanResponse.productType
             val unsafeZendeskConfig = action.zendeskConfig ?: when {
-                scanResponse?.isSaltPay() == true -> config.saltPayConfig?.zendesk
+                scanResponse?.cardTypesResolver?.isSaltPay() == true -> config.saltPayConfig?.zendesk
                 else -> config.zendesk
             }
 
@@ -167,10 +165,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))
@@ -188,23 +185,20 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
         }
         is GlobalAction.FetchUserCountry -> {
             scope.launch {
-                val techService = store.state.domainNetworks.tangemTechService
-                when (val result = techService.userCountry()) {
-                    is Result.Success -> {
+                // TODO("After adding DI") get dependencies by DI
+                runCatching { store.state.featureRepositoryProvider.homeRepository.getUserCountryCode() }
+                    .onSuccess {
                         store.dispatchOnMain(
-                            GlobalAction.FetchUserCountry.Success(
-                                countryCode = result.data.code.lowercase(),
-                            ),
+                            GlobalAction.FetchUserCountry.Success(countryCode = it.code.lowercase()),
                         )
                     }
-                    is Result.Failure -> {
+                    .onFailure {
                         store.dispatchOnMain(
                             GlobalAction.FetchUserCountry.Success(
                                 countryCode = Locale.getDefault().country.lowercase(),
                             ),
                         )
                     }
-                }
             }
         }
     }
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..7934a195f6 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 {
-
+@Suppress("LongMethod", "ComplexMethod")
+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,11 +33,13 @@ 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)
         }
         is GlobalAction.ChangeAppCurrency -> {
+            appStateHolder.appFiatCurrency = action.appCurrency
             globalState.copy(appCurrency = action.appCurrency)
         }
         is GlobalAction.RestoreAppCurrency.Success -> {
@@ -48,15 +49,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 +82,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/FragmentShareTransition.kt b/app/src/main/java/com/tangem/tap/common/redux/navigation/FragmentShareTransition.kt
index 69547d020f..ab7aa07259 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/navigation/FragmentShareTransition.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/navigation/FragmentShareTransition.kt
@@ -10,7 +10,7 @@ import java.lang.ref.WeakReference
 data class FragmentShareTransition(
     val shareElements: List<ShareElement>,
     val enterTransitionSet: TransitionSet,
-    val exitTransitionSet: TransitionSet
+    val exitTransitionSet: TransitionSet,
 )
 
 /**
@@ -24,12 +24,12 @@ class ShareElement(view: View, name: String? = null) {
     init {
         name?.let { view.transitionName = it }
         elementName = view.transitionName
-                ?: throw UnsupportedOperationException("ShareElement require the name")
+            ?: throw UnsupportedOperationException("ShareElement require the name")
         wView = WeakReference(view)
     }
 
     companion object {
-        val imvFrontCard = "imv_front_card"
-        val imvBackCard = "imv_back_card"
+        const val imvFrontCard = "imv_front_card"
+        const val imvBackCard = "imv_back_card"
     }
 }
\ No newline at end of file
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..71f3274e4c 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
@@ -1,6 +1,7 @@
 package com.tangem.tap.common.redux.navigation
 
 import android.net.Uri
+import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import org.rekotlin.Action
 import java.lang.ref.WeakReference
@@ -10,14 +11,20 @@ sealed class NavigationAction : Action {
         val screen: AppScreen,
         val fragmentShareTransition: FragmentShareTransition? = null,
         val addToBackstack: Boolean = true,
+        val bundle: Bundle? = null,
     ) : 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..bf5df6a9a9 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,30 @@ 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,
+                            bundle = action.bundle,
                         )
                     }
                     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,
+                                -> {
+                                    if (navState?.backStack?.contains(screen) == false) {
+                                        // Pop back to activity
+                                        navState.activity?.get()?.popBackTo(screen = null, inclusive = true)
+                                        store.dispatchOnMain(NavigationAction.NavigateTo(screen))
+                                    } else {
+                                        navState?.activity?.get()?.popBackTo(screen, action.inclusive)
+                                    }
+                                }
+                                else -> {
+                                    navState?.activity?.get()?.popBackTo(screen, action.inclusive)
+                                }
+                            }
                         }
                     }
                     is NavigationAction.OpenUrl -> {
@@ -38,11 +58,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..7febcfa59c 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
@@ -4,14 +4,11 @@ import com.tangem.tap.common.extensions.getPreviousScreen
 import com.tangem.tap.common.redux.AppState
 import org.rekotlin.Action
 
-class NavigationReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): NavigationState = internalReduce(action, state)
-    }
+object NavigationReducer {
+    fun reduce(action: Action, state: AppState): NavigationState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, state: AppState): NavigationState {
-
     val navigationAction = action as? NavigationAction ?: return state.navigationState
     val navState = state.navigationState
 
@@ -20,6 +17,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..0b40b7bd8e 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,10 @@ enum class AppScreen {
     Details, DetailsSecurity, CardSettings, AppSettings, ResetToFactory,
     AddTokens, AddCustomToken,
     WalletConnectSessions,
-    QrScan
+    QrScan,
+    ReferralProgram,
+    Swap,
+    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 c8bd0a5405..8366078322 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,12 +4,13 @@ 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.core.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
 import com.tangem.tap.common.shop.data.TotalSum
+import com.tangem.tap.common.shop.googlepay.GooglePayService
 import com.tangem.tap.common.shop.shopify.ShopifyService
 import com.tangem.tap.common.shop.shopify.ShopifyShop
 import com.tangem.tap.common.shop.shopify.data.CheckoutItem
@@ -23,7 +24,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 +41,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))
@@ -85,8 +88,9 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
     fun buyWithGooglePay(productType: ProductType) {
         val totalPrice = checkouts[productType]!!.totalPriceV2.amount
         googlePayService.payWithGooglePay(
-            totalPriceCents = totalPrice, currencyCode = checkouts[productType]!!.currencyCode.name,
-            merchantID = shopifyService.shop.merchantID
+            totalPriceCents = totalPrice,
+            currencyCode = checkouts[productType]!!.currencyCode.name,
+            merchantID = shopifyService.shop.merchantID,
         )
     }
 
@@ -105,7 +109,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 +124,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 +145,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,10 +185,10 @@ 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(),
+                ),
 
             )
         }
@@ -196,16 +199,19 @@ 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 ->
+            if (checkout.order != null && checkout.lineItems != null) {
+                val event = ShopOrderToEventConverter().convert(checkout to productType)
+                Analytics.send(event)
+            }
         }
     }
 
     companion object {
-        const val TANGEM_WALLET_2_CARDS_SKU = "TG115x2"
-        const val TANGEM_WALLET_3_CARDS_SKU = "TG115x3"
+        const val TANGEM_WALLET_2_CARDS_SKU = "TG115X2-S"
+        const val TANGEM_WALLET_3_CARDS_SKU = "TG115X3-S"
         val SKUS_TO_DISPLAY = listOf(TANGEM_WALLET_2_CARDS_SKU, TANGEM_WALLET_3_CARDS_SKU)
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayService.kt b/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayService.kt
index 13c3913ebe..757b207741 100644
--- a/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayService.kt
+++ b/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayService.kt
@@ -1,4 +1,4 @@
-package com.tangem.tap.common.shop
+package com.tangem.tap.common.shop.googlepay
 
 import android.app.Activity
 import android.app.Activity.RESULT_CANCELED
@@ -6,9 +6,12 @@ import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.util.Log
 import com.google.android.gms.common.api.ApiException
-import com.google.android.gms.wallet.*
+import com.google.android.gms.wallet.AutoResolveHelper
+import com.google.android.gms.wallet.IsReadyToPayRequest
+import com.google.android.gms.wallet.PaymentData
+import com.google.android.gms.wallet.PaymentDataRequest
+import com.google.android.gms.wallet.PaymentsClient
 import com.tangem.common.core.TangemSdkError
-import com.tangem.tap.common.shop.googlepay.GooglePayUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.json.JSONException
@@ -22,7 +25,6 @@ class GooglePayService(private val paymentsClient: PaymentsClient, private val a
 //    var responseCallback: ((Result<PaymentData>) -> Unit)? = null
 
     suspend fun checkIfGooglePayAvailable(): Result<Boolean> {
-
         val isReadyToPayJson = GooglePayUtil.isReadyToPayRequest() ?: return Result.success(false)
         val request = IsReadyToPayRequest.fromJson(isReadyToPayJson.toString())
 
@@ -48,7 +50,7 @@ class GooglePayService(private val paymentsClient: PaymentsClient, private val a
             totalPriceCents,
             currencyCode = currencyCode,
             countryCode = "RU",
-            merchantID = merchantID
+            merchantID = merchantID,
         )
         if (paymentDataRequestJson == null) {
             Timber.e("RequestPayment: can't fetch payment data request")
@@ -57,7 +59,9 @@ class GooglePayService(private val paymentsClient: PaymentsClient, private val a
         val request = PaymentDataRequest.fromJson(paymentDataRequestJson.toString())
 
         AutoResolveHelper.resolveTask(
-            paymentsClient.loadPaymentData(request), activity, LOAD_PAYMENT_DATA_REQUEST_CODE
+            paymentsClient.loadPaymentData(request),
+            activity,
+            LOAD_PAYMENT_DATA_REQUEST_CODE,
         )
     }
 
@@ -81,7 +85,6 @@ class GooglePayService(private val paymentsClient: PaymentsClient, private val a
                 } else {
                     Result.failure(Exception("$statusCode"))
                 }
-
             }
             else -> Result.failure(Exception("Unknown Status"))
         }
@@ -117,7 +120,6 @@ class GooglePayService(private val paymentsClient: PaymentsClient, private val a
                 .getString("token")
 
             return GooglePayResponse(address, token)
-
         } catch (e: JSONException) {
             Log.e("handlePaymentSuccess", "Error: " + e.toString())
         }
@@ -144,5 +146,5 @@ data class Address(
     val address3: String,
     val locality: String,
     val administrativeArea: String,
-    val sortingCode: String
+    val sortingCode: String,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayUtil.kt b/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayUtil.kt
index 610ab10c9d..82509e1180 100644
--- a/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayUtil.kt
+++ b/app/src/main/java/com/tangem/tap/common/shop/googlepay/GooglePayUtil.kt
@@ -14,20 +14,7 @@ object GooglePayUtil {
         put("apiVersionMinor", 0)
     }
 
-    private fun gatewayTokenizationSpecification(merchantID: String): JSONObject {
-        return JSONObject().apply {
-            put("type", "PAYMENT_GATEWAY")
-            put(
-                "parameters", JSONObject(
-                    mapOf(
-                        "gateway" to "shopify",
-                        "gatewayMerchantId" to merchantID
-                    )
-                )
-            )
-        }
-    }
-
+    @Suppress("MagicNumber")
     private val allowedCardNetworks = JSONArray(
         listOf(
             "AMEX",
@@ -35,27 +22,46 @@ object GooglePayUtil {
             "INTERAC",
             "JCB",
             "MASTERCARD",
-            "VISA"
-        )
+            "VISA",
+        ),
     )
 
     private val allowedCardAuthMethods = JSONArray(
         listOf(
             "PAN_ONLY",
-            "CRYPTOGRAM_3DS"
-        )
+            "CRYPTOGRAM_3DS",
+        ),
     )
 
+    private val merchantInfo: JSONObject = JSONObject().put("merchantName", "Example Merchant")
+
+    private fun gatewayTokenizationSpecification(merchantID: String): JSONObject {
+        return JSONObject().apply {
+            put("type", "PAYMENT_GATEWAY")
+            put(
+                "parameters",
+                JSONObject(
+                    mapOf(
+                        "gateway" to "shopify",
+                        "gatewayMerchantId" to merchantID,
+                    ),
+                ),
+            )
+        }
+    }
+
     private fun baseCardPaymentMethod(): JSONObject {
         return JSONObject().apply {
-
             val parameters = JSONObject().apply {
                 put("allowedAuthMethods", allowedCardAuthMethods)
                 put("allowedCardNetworks", allowedCardNetworks)
                 put("billingAddressRequired", true)
-                put("billingAddressParameters", JSONObject().apply {
-                    put("format", "FULL")
-                })
+                put(
+                    "billingAddressParameters",
+                    JSONObject().apply {
+                        put("format", "FULL")
+                    },
+                )
             }
 
             put("type", "CARD")
@@ -83,7 +89,6 @@ object GooglePayUtil {
             baseRequest.apply {
                 put("allowedPaymentMethods", JSONArray().put(baseCardPaymentMethod()))
             }
-
         } catch (e: JSONException) {
             null
         }
@@ -92,7 +97,7 @@ object GooglePayUtil {
     private fun getTransactionInfo(
         price: String,
         countryCode: String,
-        currencyCode: String
+        currencyCode: String,
     ): JSONObject {
         return JSONObject().apply {
             put("totalPrice", price)
@@ -102,15 +107,11 @@ object GooglePayUtil {
         }
     }
 
-    private val merchantInfo: JSONObject =
-        JSONObject().put("merchantName", "Example Merchant")
-
-
     fun getPaymentDataRequest(
         price: String,
         countryCode: String,
         currencyCode: String,
-        merchantID: String
+        merchantID: String,
     ): JSONObject? {
         try {
             return baseRequest.apply {
@@ -133,5 +134,4 @@ object GooglePayUtil {
     }
 }
 
-
 const val PAYMENTS_ENVIRONMENT = WalletConstants.ENVIRONMENT_TEST
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt b/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt
index a33fb82b84..f51fbf0c4e 100644
--- a/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt
+++ b/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt
@@ -16,11 +16,10 @@ import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-
+@Suppress("LargeClass")
 class ShopifyService(private val application: Application, val shop: ShopifyShop) {
     val client: GraphClient by lazy { initClient() }
 
-
     suspend fun getShopName(): Result<String> {
         val query = query { rootQuery: QueryRootQuery ->
             rootQuery
@@ -40,16 +39,15 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
         }
     }
 
+    @Suppress("MagicNumber")
     suspend fun getProducts(collectionTitleFilter: String? = null): Result<List<Product>> {
         val filter = collectionTitleFilter?.let { "title:\"$it\"" }
 
         val query = query { rootQuery: QueryRootQuery ->
-            rootQuery
-                .collections(
-                    { arg -> arg.first(250).query(filter) },
-                ) { collectionConnectionQuery ->
-                    collectionConnectionQuery.collectionFieldsFragment()
-                }
+            rootQuery.collections(
+                { arg -> arg.first(250).query(filter) },
+                CollectionConnectionQuery::collectionFieldsFragment,
+            )
         }
         return when (val result = queryAsync(query)) {
             is GraphCallResult.Success -> {
@@ -66,7 +64,6 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
     }
 
     suspend fun checkout(pollUntilOrder: Boolean, checkoutID: ID): Result<Checkout> {
-
         val query = query { rootQuery: QueryRootQuery ->
             rootQuery
                 .node(checkoutID) { query ->
@@ -78,7 +75,8 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
                 }
         }
         val retryHandler = RetryHandler.build<QueryRoot>(
-            1, TimeUnit.SECONDS
+            delay = 1,
+            timeUnit = TimeUnit.SECONDS,
         ) {
             this.retryWhen { result ->
                 when (result) {
@@ -100,7 +98,6 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
                 } else {
                     Result.failure(ShopifyError.Unknown)
                 }
-
             }
             is GraphCallResult.Failure -> {
                 Result.failure(result.error)
@@ -110,10 +107,8 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
 
     suspend fun createCheckout(
         checkoutItems: List<CheckoutItem>,
-        checkoutID: ID? = null
+        checkoutID: ID? = null,
     ): Result<Checkout> {
-
-
         val storefrontLineItems: MutableList<CheckoutLineItemInput> = checkoutItems
             .map { CheckoutLineItemInput(it.quantity, it.id) }.toMutableList()
 
@@ -121,13 +116,14 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
             mutation { mutationQuery: MutationQuery ->
                 mutationQuery
                     .checkoutLineItemsReplace(
-                        storefrontLineItems, checkoutID
+                        storefrontLineItems,
+                        checkoutID,
                     ) { payloadQuery: CheckoutLineItemsReplacePayloadQuery ->
                         payloadQuery
                             .checkout { checkoutQuery: CheckoutQuery ->
                                 checkoutQuery.checkoutFieldsFragment()
                             }
-                            .userErrors() { userErrorQuery: CheckoutUserErrorQuery ->
+                            .userErrors { userErrorQuery: CheckoutUserErrorQuery ->
                                 userErrorQuery
                                     .field()
                                     .message()
@@ -137,18 +133,18 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
         } else {
             val input = CheckoutCreateInput()
                 .setLineItemsInput(
-                    Input.value(storefrontLineItems)
+                    Input.value(storefrontLineItems),
                 )
             mutation { mutationQuery: MutationQuery ->
                 mutationQuery
                     .checkoutCreate(
-                        input
+                        input,
                     ) { payloadQuery: CheckoutCreatePayloadQuery ->
                         payloadQuery
                             .checkout { checkoutQuery: CheckoutQuery ->
                                 checkoutQuery.checkoutFieldsFragment()
                             }
-                            .checkoutUserErrors() { userErrorQuery: CheckoutUserErrorQuery ->
+                            .checkoutUserErrors { userErrorQuery: CheckoutUserErrorQuery ->
                                 userErrorQuery
                                     .field()
                                     .message()
@@ -163,13 +159,14 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
         val query = mutation { mutationQuery: MutationQuery ->
             mutationQuery
                 .checkoutDiscountCodeApplyV2(
-                    discountCode, checkoutID
+                    discountCode,
+                    checkoutID,
                 ) { payloadQuery: CheckoutDiscountCodeApplyV2PayloadQuery ->
                     payloadQuery
                         .checkout { checkoutQuery: CheckoutQuery ->
                             checkoutQuery.checkoutFieldsFragment()
                         }
-                        .checkoutUserErrors() { userErrorQuery: CheckoutUserErrorQuery ->
+                        .checkoutUserErrors { userErrorQuery: CheckoutUserErrorQuery ->
                             userErrorQuery
                                 .field()
                                 .message()
@@ -183,44 +180,9 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
         val query = mutation { mutationQuery: MutationQuery ->
             mutationQuery
                 .checkoutDiscountCodeRemove(
-                    checkoutID
+                    checkoutID,
                 ) { payloadQuery: CheckoutDiscountCodeRemovePayloadQuery ->
                     payloadQuery
-                        .checkout { checkoutQuery: CheckoutQuery ->
-                            checkoutQuery.checkoutFieldsFragment()
-                        }
-                        .checkoutUserErrors() { userErrorQuery: CheckoutUserErrorQuery ->
-                            userErrorQuery
-                                .field()
-                                .message()
-                        }
-                }
-        }
-        return runCheckoutMutation(query)
-    }
-
-    suspend fun updateAddress(
-        address: MailingAddress,
-        checkoutID: ID,
-        waitForShippingRates: Boolean
-    ): Result<Checkout> {
-        val input = MailingAddressInput()
-            .setAddress1(address.address1)
-            .setAddress2(address.address2)
-            .setCity(address.city)
-            .setCountry(address.country)
-            .setFirstName(address.firstName)
-            .setLastName(address.lastName)
-            .setPhone(address.phone)
-            .setProvince(address.province)
-            .setZip(address.zip)
-
-        val query = mutation { mutationQuery: MutationQuery ->
-            mutationQuery
-                .checkoutShippingAddressUpdateV2(
-                    input, checkoutID
-                ) { shippingAddressUpdatePayloadQuery: CheckoutShippingAddressUpdateV2PayloadQuery ->
-                    shippingAddressUpdatePayloadQuery
                         .checkout { checkoutQuery: CheckoutQuery ->
                             checkoutQuery.checkoutFieldsFragment()
                         }
@@ -231,59 +193,18 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
                         }
                 }
         }
-
-        return runCheckoutMutation(query)
-    }
-
-    suspend fun updateEmail(email: String?, checkoutID: ID): Result<Checkout> {
-        val query = mutation { mutationQuery: MutationQuery ->
-            mutationQuery
-                .checkoutEmailUpdateV2(
-                    checkoutID, email
-                ) { emailUpdatePayloadQuery: CheckoutEmailUpdateV2PayloadQuery ->
-                    emailUpdatePayloadQuery
-                        .checkout { checkoutQuery: CheckoutQuery ->
-                            checkoutQuery.checkoutFieldsFragment()
-                        }
-                        .checkoutUserErrors() { userErrorQuery: CheckoutUserErrorQuery ->
-                            userErrorQuery
-                                .field()
-                                .message()
-                        }
-                }
-        }
-        return runCheckoutMutation(query)
-    }
-
-    suspend fun updateShippingRate(handle: String?, checkoutID: ID): Result<Checkout> {
-        val query = mutation { mutationQuery: MutationQuery ->
-            mutationQuery
-                .checkoutShippingLineUpdate(
-                    checkoutID, handle
-                ) { shippingLineUpdatePayloadQuery: CheckoutShippingLineUpdatePayloadQuery ->
-                    shippingLineUpdatePayloadQuery
-                        .checkout { checkoutQuery: CheckoutQuery ->
-                            checkoutQuery.checkoutFieldsFragment()
-                        }
-                        .checkoutUserErrors() { userErrorQuery: CheckoutUserErrorQuery ->
-                            userErrorQuery
-                                .field()
-                                .message()
-                        }
-                }
-        }
         return runCheckoutMutation(query)
     }
 
     suspend fun completeWithTokenizedPayment(
         payment: TokenizedPaymentInputV3,
-        checkoutID: ID
+        checkoutID: ID,
     ): Result<Checkout> {
-
         val query = mutation { mutationQuery: MutationQuery ->
             mutationQuery
                 .checkoutCompleteWithTokenizedPaymentV3(
-                    checkoutID, payment
+                    checkoutID,
+                    payment,
                 ) { payloadQuery: CheckoutCompleteWithTokenizedPaymentV3PayloadQuery ->
                     payloadQuery
                         .payment { paymentQuery: PaymentQuery ->
@@ -295,7 +216,7 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
                             checkoutQuery
                                 .ready()
                         }
-                        .checkoutUserErrors() { userErrorQuery: CheckoutUserErrorQuery ->
+                        .checkoutUserErrors { userErrorQuery: CheckoutUserErrorQuery ->
                             userErrorQuery
                                 .field()
                                 .message()
@@ -305,10 +226,6 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
         return runCheckoutMutation(query)
     }
 
-    fun startGooglePaySession() {
-//        PaySession()
-    }
-
     private suspend fun runCheckoutMutation(mutation: MutationQuery): Result<Checkout> {
         return when (val result = mutationQueryAsync(mutation)) {
             is GraphCallResult.Success -> {
@@ -322,13 +239,13 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
 
                 Result.success(checkout)
             }
-                    is GraphCallResult.Failure -> Result.failure(result.error)
+            is GraphCallResult.Failure -> Result.failure(result.error)
         }
     }
 
     private suspend fun queryAsync(
         query: QueryRootQuery,
-        retryHandler: RetryHandler<QueryRoot>
+        retryHandler: RetryHandler<QueryRoot>,
     ): GraphCallResult<QueryRoot> =
         withContext(Dispatchers.IO) {
             suspendCoroutine { continuation ->
@@ -358,12 +275,11 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
             }
         }
 
-
     private fun initClient(): GraphClient {
         return GraphClient.build(
             application,
             shop.domain,
-            shop.storefrontApiKey
+            shop.storefrontApiKey,
         ) {
 //            httpCache(application.filesDir) {
 //                cacheMaxSizeBytes = (1024 * 1024 * 10)
@@ -371,13 +287,9 @@ class ShopifyService(private val application: Application, val shop: ShopifyShop
 //                    HttpCachePolicy.Default.CACHE_FIRST.expireAfter(20, TimeUnit.MINUTES)
 //            }
         }
-
     }
 }
 
-
 sealed class ShopifyError : Throwable() {
     object Unknown : ShopifyError()
-    object GooglePayFailed : ShopifyError()
-    class UserError(val errorMessage: String)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Checkout.kt b/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Checkout.kt
index 849c1f33c3..7565db2447 100644
--- a/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Checkout.kt
+++ b/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Checkout.kt
@@ -2,23 +2,24 @@ package com.tangem.tap.common.shop.shopify.data
 
 import com.shopify.buy3.Storefront
 
+@Suppress("LongMethod", "MagicNumber")
 fun Storefront.CheckoutQuery.checkoutFieldsFragment() {
-    //                            id()
     ready()
     webUrl()
     currencyCode()
     lineItemsSubtotalPrice { it.amount() }
     totalPriceV2 {
         it.currencyCode()
-        it.amount() }
+        it.amount()
+    }
     lineItems({ arg -> arg.first(250) }) {
         it.edges {
             it.node {
 //                                        it.id()
                 it.title()
                 it.quantity()
-                it.variant() {
-                    it.priceV2() { it.amount() }
+                it.variant {
+                    it.priceV2 { it.amount() }
                 }
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Collection.kt b/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Collection.kt
index 572a7b68c7..1527fc9558 100644
--- a/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Collection.kt
+++ b/app/src/main/java/com/tangem/tap/common/shop/shopify/data/Collection.kt
@@ -2,13 +2,15 @@ package com.tangem.tap.common.shop.shopify.data
 
 import com.shopify.buy3.Storefront
 
+@Suppress("MagicNumber")
 fun Storefront.CollectionConnectionQuery.collectionFieldsFragment() {
     edges { collectionEdgeQuery ->
         collectionEdgeQuery
             .node { collectionQuery ->
                 collectionQuery
                     .title()
-                    .products({ arg -> arg.first(250) }
+                    .products(
+                        { arg -> arg.first(250) },
                     ) { productConnectionQuery ->
                         productConnectionQuery
                             .edges { productEdgeQuery ->
diff --git a/app/src/main/java/com/tangem/tap/common/snackBar/MaxAmountSnackbar.kt b/app/src/main/java/com/tangem/tap/common/snackBar/MaxAmountSnackbar.kt
index 69f2114528..d224143c98 100644
--- a/app/src/main/java/com/tangem/tap/common/snackBar/MaxAmountSnackbar.kt
+++ b/app/src/main/java/com/tangem/tap/common/snackBar/MaxAmountSnackbar.kt
@@ -17,15 +17,15 @@ import com.tangem.wallet.R
 [REDACTED_AUTHOR]
  */
 class MaxAmountSnackbar(
-        parent: ViewGroup,
-        content: MaxAmountSnackbarView
+    parent: ViewGroup,
+    content: MaxAmountSnackbarView
 ) : BaseTransientBottomBar<MaxAmountSnackbar>(parent, content, content) {
 
     companion object {
 
         fun make(view: View, onClick: () -> Unit): MaxAmountSnackbar {
             val parent = view.findSuitableParent() ?: throw IllegalArgumentException(
-                    "No suitable parent found from the given view. Please provide a valid view."
+                "No suitable parent found from the given view. Please provide a valid view."
             )
             val inflater = LayoutInflater.from(view.context)
             val customView = inflater.inflate(R.layout.view_snackbar_max_amount, parent, false) as MaxAmountSnackbarView
@@ -57,14 +57,13 @@ class MaxAmountSnackbar(
             } while (view != null)
             return fallback
         }
-
     }
 }
 
 class MaxAmountSnackbarView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ContentViewCallback {
 
     init {
@@ -72,10 +71,9 @@ class MaxAmountSnackbarView @JvmOverloads constructor(
         clipToPadding = false
     }
 
-
     override fun animateContentIn(delay: Int, duration: Int) {
     }
 
     override fun animateContentOut(delay: Int, duration: Int) {
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/text/DecimalDigitsInputFilter.kt b/app/src/main/java/com/tangem/tap/common/text/DecimalDigitsInputFilter.kt
index 689095c534..2201e794cc 100644
--- a/app/src/main/java/com/tangem/tap/common/text/DecimalDigitsInputFilter.kt
+++ b/app/src/main/java/com/tangem/tap/common/text/DecimalDigitsInputFilter.kt
@@ -8,13 +8,23 @@ import java.util.regex.Pattern
 [REDACTED_AUTHOR]
  */
 class DecimalDigitsInputFilter(
-        digitsBeforeDecimal: Int,
-        digitsAfterDecimal: Int,
-        private val decimalSeparator: String
+    digitsBeforeDecimal: Int,
+    digitsAfterDecimal: Int,
+    private val decimalSeparator: String,
 ) : InputFilter {
-    private val pattern: Pattern = Pattern.compile("(([1-9]{1}[0-9]{0,${digitsBeforeDecimal - 1}})?||[0]{1})((\\$decimalSeparator[0-9]{0,$digitsAfterDecimal})?)||(\\$decimalSeparator)?")
+    private val pattern: Pattern = Pattern.compile(
+        "(([1-9]{1}[0-9]{0,${digitsBeforeDecimal - 1}})?||[0]{1})" +
+            "((\\$decimalSeparator[0-9]{0,$digitsAfterDecimal})?)||(\\$decimalSeparator)?",
+    )
 
-    override fun filter(source: CharSequence, sourceStart: Int, sourceEnd: Int, destination: Spanned, destinationStart: Int, destinationEnd: Int): CharSequence? {
+    override fun filter(
+        source: CharSequence,
+        sourceStart: Int,
+        sourceEnd: Int,
+        destination: Spanned,
+        destinationStart: Int,
+        destinationEnd: Int,
+    ): CharSequence? {
         val destString = destination.toString()
         val prefix = destString.substring(0, destinationStart)
         val suffix = destString.substring(destinationEnd, destString.length)
@@ -47,4 +57,4 @@ class DecimalDigitsInputFilter(
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/text/Truncate.kt b/app/src/main/java/com/tangem/tap/common/text/Truncate.kt
index 3ed50ca1d2..0aeb17d6d2 100644
--- a/app/src/main/java/com/tangem/tap/common/text/Truncate.kt
+++ b/app/src/main/java/com/tangem/tap/common/text/Truncate.kt
@@ -16,9 +16,9 @@ interface Truncate {
     companion object {
         fun create(type: TruncateType): Truncate {
             return when (type) {
-              TruncateType.START -> TruncateStart()
-              TruncateType.MIDDLE -> TruncateMiddle()
-              TruncateType.END -> TruncateEnd()
+                TruncateType.START -> TruncateStart()
+                TruncateType.MIDDLE -> TruncateMiddle()
+                TruncateType.END -> TruncateEnd()
             }
         }
     }
@@ -127,10 +127,10 @@ fun TextView.truncateWith(text: String, type: TruncateType, with: String = "..."
 }
 
 fun TextView.truncateStartWith(text: String, with: String = "..."): String =
-        this.truncateWith(text, TruncateType.START, with)
+    this.truncateWith(text, TruncateType.START, with)
 
 fun TextView.truncateMiddleWith(text: String, with: String = "..."): String =
-        this.truncateWith(text, TruncateType.MIDDLE, with)
+    this.truncateWith(text, TruncateType.MIDDLE, with)
 
 fun TextView.truncateEndWith(text: String, with: String = "..."): String =
-        this.truncateWith(text, TruncateType.END, with)
\ No newline at end of file
+    this.truncateWith(text, TruncateType.END, with)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/toggleWidget/IndeterminateProgressButtonWidget.kt b/app/src/main/java/com/tangem/tap/common/toggleWidget/IndeterminateProgressButtonWidget.kt
index 4b15ee3cb5..56f80d5d78 100644
--- a/app/src/main/java/com/tangem/tap/common/toggleWidget/IndeterminateProgressButtonWidget.kt
+++ b/app/src/main/java/com/tangem/tap/common/toggleWidget/IndeterminateProgressButtonWidget.kt
@@ -38,6 +38,7 @@ open class IndeterminateProgressButtonWidget(
         when (progressState) {
             ProgressState.Done, ProgressState.Error -> switchToNone()
             ProgressState.Loading -> switchToProgress()
+            else -> {}
         }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/common/toggleWidget/RefreshBalanceWidget.kt b/app/src/main/java/com/tangem/tap/common/toggleWidget/RefreshBalanceWidget.kt
index 7bccdffc08..6a5bd17f60 100644
--- a/app/src/main/java/com/tangem/tap/common/toggleWidget/RefreshBalanceWidget.kt
+++ b/app/src/main/java/com/tangem/tap/common/toggleWidget/RefreshBalanceWidget.kt
@@ -17,6 +17,7 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("MagicNumber")
 class RefreshBalanceWidget(
     private val root: ViewGroup,
 ) : ViewStateWidget {
@@ -57,6 +58,7 @@ class RefreshBalanceWidget(
         viewSwitcher.showNext()
     }
 
+    @Suppress("MagicNumber")
     private fun animateState(state: ProgressState) {
         when (state) {
             ProgressState.Done, ProgressState.Error -> {
@@ -65,15 +67,25 @@ class RefreshBalanceWidget(
             }
             ProgressState.Loading -> {
                 progressViewAnimation = RotateAnimation(
-                    0f, 360f,
-                    Animation.RELATIVE_TO_SELF, 0.5f,
-                    Animation.RELATIVE_TO_SELF, 0.5f,
+                    /* fromDegrees = */
+                    0f,
+                    /* toDegrees = */
+                    360f,
+                    /* pivotXType = */
+                    Animation.RELATIVE_TO_SELF,
+                    /* pivotXValue = */
+                    0.5f,
+                    /* pivotYType = */
+                    Animation.RELATIVE_TO_SELF,
+                    /* pivotYValue = */
+                    0.5f,
                 )
                 progressViewAnimation?.duration = 700
                 progressViewAnimation?.interpolator = AccelerateInterpolator()
                 progressViewAnimation?.repeatCount = -1
                 progressViewAnimation?.let { arrowView.startAnimation(it) }
             }
+            else -> {}
         }
     }
 
@@ -93,14 +105,19 @@ class RefreshBalanceWidget(
     private fun getState(): ProgressState = if (isArrowRefreshActive()) ProgressState.Done else ProgressState.Loading
 }
 
+@Suppress("MagicNumber")
 class ShowAnimation : AnimationSet(true) {
     init {
         addAnimation(
             ScaleAnimation(
-                0f, 1f,
-                0f, 1f,
-                Animation.RELATIVE_TO_SELF, 0.5f,
-                Animation.RELATIVE_TO_SELF, 0.5f,
+                0f,
+                1f,
+                0f,
+                1f,
+                Animation.RELATIVE_TO_SELF,
+                0.5f,
+                Animation.RELATIVE_TO_SELF,
+                0.5f,
             ),
         )
         addAnimation(AlphaAnimation(0f, 1f))
diff --git a/app/src/main/java/com/tangem/tap/common/toggleWidget/ViewStateWidget.kt b/app/src/main/java/com/tangem/tap/common/toggleWidget/ViewStateWidget.kt
index 48ba0a7291..10b6a1f7a6 100644
--- a/app/src/main/java/com/tangem/tap/common/toggleWidget/ViewStateWidget.kt
+++ b/app/src/main/java/com/tangem/tap/common/toggleWidget/ViewStateWidget.kt
@@ -2,7 +2,6 @@ package com.tangem.tap.common.toggleWidget
 
 import android.view.View
 
-
 /**
 [REDACTED_AUTHOR]
  */
diff --git a/app/src/main/java/com/tangem/tap/common/transitions/OnboardingTransitions.kt b/app/src/main/java/com/tangem/tap/common/transitions/OnboardingTransitions.kt
index 32785f0147..e250846a42 100644
--- a/app/src/main/java/com/tangem/tap/common/transitions/OnboardingTransitions.kt
+++ b/app/src/main/java/com/tangem/tap/common/transitions/OnboardingTransitions.kt
@@ -1,33 +1,13 @@
 package com.tangem.tap.common.transitions
 
-import androidx.transition.*
-
-/**
-[REDACTED_AUTHOR]
- */
-class FrontCardEnterTransition : TransitionSet() {
-    init {
-        ordering = ORDERING_TOGETHER;
-        addTransition(Fade())
-        addTransition(ChangeImageTransform()) // изменения внутри ImageView
-        addTransition(ChangeTransform()) // изменение размеров, углов накона
-        addTransition(ChangeBounds()) // изменение положения
-    }
-}
-
-class FrontCardExitTransition : TransitionSet() {
-    init {
-        ordering = ORDERING_TOGETHER;
-        addTransition(Fade())
-        addTransition(ChangeImageTransform())
-        addTransition(ChangeTransform())
-        addTransition(ChangeBounds())
-    }
-}
+import androidx.transition.ChangeBounds
+import androidx.transition.ChangeTransform
+import androidx.transition.Fade
+import androidx.transition.TransitionSet
 
 class HomeToOnboardingTransition : TransitionSet() {
     init {
-        ordering = ORDERING_TOGETHER;
+        ordering = ORDERING_TOGETHER
         addTransition(Fade())
         addTransition(ChangeTransform())
         addTransition(ChangeBounds())
@@ -36,7 +16,7 @@ class HomeToOnboardingTransition : TransitionSet() {
 
 class InternalNoteLayoutTransition : TransitionSet() {
     init {
-        ordering = ORDERING_TOGETHER;
+        ordering = ORDERING_TOGETHER
         addTransition(ChangeTransform())
         addTransition(ChangeBounds())
         addTransition(Fade())
diff --git a/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt b/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt
index 8cd6e7e5ba..365f235f11 100644
--- a/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt
+++ b/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt
@@ -6,54 +6,49 @@ import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
-class SimpleAlertDialog {
-    companion object {
-        fun create(
-            titleRes: Int? = null,
-            messageRes: Int? = null,
-            title: String? = null,
-            message: String? = null,
-            primaryButtonRes: Int = R.string.common_ok,
-            context: Context,
-        ): AlertDialog {
-            return SimpleCancelableAlertDialog.create(
-                titleRes = titleRes,
-                messageRes = messageRes,
-                title = title,
-                message = message,
-                primaryButtonRes = primaryButtonRes,
-                secondaryButtonRes = null,
-                context = context
-            )
-        }
+object SimpleAlertDialog {
+    fun create(
+        titleRes: Int? = null,
+        messageRes: Int? = null,
+        title: String? = null,
+        message: String? = null,
+        primaryButtonRes: Int = R.string.common_ok,
+        context: Context,
+    ): AlertDialog {
+        return SimpleCancelableAlertDialog.create(
+            titleRes = titleRes,
+            messageRes = messageRes,
+            title = title,
+            message = message,
+            primaryButtonRes = primaryButtonRes,
+            secondaryButtonRes = null,
+            context = context,
+        )
     }
 }
 
-class SimpleCancelableAlertDialog {
-    companion object {
-        fun create(
-            titleRes: Int? = null,
-            messageRes: Int? = null,
-            title: String? = null,
-            message: String? = null,
-            primaryButtonRes: Int = R.string.common_ok,
-            secondaryButtonRes: Int? = R.string.common_cancel,
-            primaryButtonAction: () -> Unit = {},
-            secondaryButtonAction: () -> Unit = {},
-            context: Context,
-        ): AlertDialog {
-
-            return AlertDialog.Builder(context).apply {
-                setTitle(titleRes?.let { context.getString(it) } ?: title )
-                setMessage(messageRes?.let { context.getString(it) } ?: message)
-                setPositiveButton(context.getText(primaryButtonRes)) { _, _ -> primaryButtonAction() }
-                if (secondaryButtonRes != null) {
-                    setNegativeButton(context.getText(secondaryButtonRes)) { _, _ -> secondaryButtonAction()}
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-            }.create()
-        }
+object SimpleCancelableAlertDialog {
+    fun create(
+        titleRes: Int? = null,
+        messageRes: Int? = null,
+        title: String? = null,
+        message: String? = null,
+        primaryButtonRes: Int = R.string.common_ok,
+        secondaryButtonRes: Int? = R.string.common_cancel,
+        primaryButtonAction: () -> Unit = {},
+        secondaryButtonAction: () -> Unit = {},
+        context: Context,
+    ): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(titleRes?.let { context.getString(it) } ?: title)
+            setMessage(messageRes?.let { context.getString(it) } ?: message)
+            setPositiveButton(context.getText(primaryButtonRes)) { _, _ -> primaryButtonAction() }
+            if (secondaryButtonRes != null) {
+                setNegativeButton(context.getText(secondaryButtonRes)) { _, _ -> secondaryButtonAction() }
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+        }.create()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt b/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt
index cfd5c2b5c2..d66ac2ed73 100644
--- a/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt
@@ -10,7 +10,11 @@ import java.util.*
 
 class PayIdManager {
 
-    suspend fun verifyPayId(payId: String, blockchain: Blockchain): Result<VerifyPayIdResponse> = withContext(Dispatchers.IO) {
+    @Suppress("MagicNumber")
+    suspend fun verifyPayId(
+        payId: String,
+        blockchain: Blockchain,
+    ): Result<VerifyPayIdResponse> = withContext(Dispatchers.IO) {
         val splitPayId = payId.split("\$")
         val user = splitPayId[0]
         val baseUrl = "https://${splitPayId[1]}/"
@@ -22,25 +26,26 @@ class PayIdManager {
             Blockchain.XRP -> "XRPL"
             Blockchain.RSK -> "RSK"
             else -> this.currency
-        }.toLowerCase()
+        }.lowercase(Locale.getDefault())
     }
 
     companion object {
-        val payIdRegExp = "^[a-z0-9!#@%&*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#@%&*+/=?^_`{|}~-]+)*\\\$(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z-]*[a-z0-9])?|(?:[0-9]{1,3}\\.){3}[0-9]{1,3})\$".toRegex()
+        private val payIdRegExp = ("^[a-z0-9!#@%&*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#@%&*+/=?^_`{|}~-]+)*\\\$(?:(?:[a-z0-9]" +
+            "(?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z-]*[a-z0-9])?|(?:[0-9]{1,3}\\.){3}[0-9]{1,3})\$").toRegex()
 
         val payIdSupported: EnumSet<Blockchain> = EnumSet.of(
-                Blockchain.XRP,
-                Blockchain.Ethereum,
-                Blockchain.Bitcoin,
-                Blockchain.Litecoin,
-                Blockchain.Stellar,
-                Blockchain.Cardano,
-                Blockchain.CardanoShelley,
-                Blockchain.Ducatus,
-                Blockchain.BitcoinCash,
-                Blockchain.Binance,
-                Blockchain.RSK,
-                Blockchain.Tezos
+            Blockchain.XRP,
+            Blockchain.Ethereum,
+            Blockchain.Bitcoin,
+            Blockchain.Litecoin,
+            Blockchain.Stellar,
+            Blockchain.Cardano,
+            Blockchain.CardanoShelley,
+            Blockchain.Ducatus,
+            Blockchain.BitcoinCash,
+            Blockchain.Binance,
+            Blockchain.RSK,
+            Blockchain.Tezos,
         )
 
         fun isPayId(value: String?): Boolean = value?.contains(payIdRegExp) ?: false
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..3d2a5764e2 100644
--- a/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt
@@ -1,48 +1,49 @@
 package com.tangem.tap.domain
 
 import com.tangem.common.services.Result
+import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.domain.common.ThrottlerWithValues
-import com.tangem.network.api.tangemTech.TangemTechService
 import com.tangem.tap.features.wallet.models.Currency
-import com.tangem.tap.store
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
 import java.math.BigDecimal
 
-//TODO: refactoring: move to domain
-class RatesRepository {
-
-    private val tangemTechService: TangemTechService
-        get() = store.state.domainNetworks.tangemTechService
-
+class RatesRepository(
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
     private val throttler = ThrottlerWithValues<Currency, Result<BigDecimal>?>(60000)
 
-    suspend fun loadFiatRate(currencyId: String, coinsList: List<Currency>): Result<RatesResult> {
-//         get and submit previous result of equivalents.
-        val throttledResult = coinsList.filter { throttler.isStillThrottled(it) }.map {
-            Pair(it, throttler.geValue(it))
-        }
-
-        val currenciesToUpdate = coinsList.filter { !throttler.isStillThrottled(it) }
-        val coinIds = currenciesToUpdate.mapNotNull { it.coinId }.distinct()
-        if (coinIds.isEmpty()) return handleFiatRatesResult(throttledResult.toMap())
-
-        return when (val result = tangemTechService.rates(currencyId, coinIds)) {
-            is Result.Success -> {
-                val ratesResultList: Map<String, Result<BigDecimal>> = result.data.rates.mapValues {
-                    Result.Success(it.value.toBigDecimal())
-                }
-                val updatedCurrencies = throttledResult.toMap().toMutableMap()
-                coinsList.forEach { currency ->
-                    ratesResultList[currency.coinId]?.let {
-                        updatedCurrencies[currency] = it
-                        throttler.updateThrottlingTo(currency)
-                        throttler.setValue(currency, it)
-                    }
-                }
-                handleFiatRatesResult(updatedCurrencies)
+    suspend fun loadFiatRate(currencyId: String, coinsList: List<Currency>): Result<RatesResult> =
+        withContext(dispatchers.io) {
+            // get and submit previous result of equivalents.
+            val throttledResult = coinsList.filter { throttler.isStillThrottled(it) }.map {
+                Pair(it, throttler.geValue(it))
             }
-            is Result.Failure -> Result.Failure(result.error)
+
+            val currenciesToUpdate = coinsList.filter { !throttler.isStillThrottled(it) }
+            val coinIds = currenciesToUpdate.mapNotNull { it.coinId }.distinct()
+            if (coinIds.isEmpty()) return@withContext handleFiatRatesResult(throttledResult.toMap())
+
+            runCatching { tangemTechApi.getRates(currencyId.lowercase(), coinIds.joinToString(",")) }
+                .onSuccess { response ->
+                    val ratesResultList: Map<String, Result<BigDecimal>> = response.rates.mapValues {
+                        Result.Success(it.value.toBigDecimal())
+                    }
+                    val updatedCurrencies = throttledResult.toMap().toMutableMap()
+                    coinsList.forEach { currency ->
+                        ratesResultList[currency.coinId]?.let {
+                            updatedCurrencies[currency] = it
+                            throttler.updateThrottlingTo(currency)
+                            throttler.setValue(currency, it)
+                        }
+                    }
+                    return@withContext handleFiatRatesResult(updatedCurrencies)
+                }
+                .onFailure { Result.Failure(it) }
+
+            error("Unreachable code because runCatching must return result")
         }
-    }
 
     private fun handleFiatRatesResult(rates: Map<Currency, Result<BigDecimal>?>): Result.Success<RatesResult> {
         val success = mutableMapOf<Currency, 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..288d399817 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,21 @@ 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.core.analytics.Analytics
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.operations.CommandResponse
 import com.tangem.operations.ScanTask
@@ -26,15 +31,13 @@ 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.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,67 +47,67 @@ 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(
         scanResponse: ScanResponse,
     ): CompletionResult<CreateProductWalletTaskResponse> {
         return runTaskAsync(
-            CreateProductWalletTask(scanResponse.productType),
+            CreateProductWalletTask(scanResponse.cardTypesResolver),
             scanResponse.card.cardId,
             Message(context.getString(R.string.initial_message_create_wallet_body)),
         )
     }
 
     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,23 +203,41 @@ 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 }
     }
 
+    @Suppress("MagicNumber")
     fun changeDisplayedCardIdNumbersCount(scanResponse: ScanResponse?) {
         tangemSdk.config.cardIdDisplayFormat = when {
             scanResponse == null -> CardIdDisplayFormat.Full
-            scanResponse.isTangemTwins() -> CardIdDisplayFormat.LastLuhn(4)
-            scanResponse.isSaltPay() -> CardIdDisplayFormat.None
+            scanResponse.cardTypesResolver.isTangemTwins() -> CardIdDisplayFormat.LastLuhn(4)
+            scanResponse.cardTypesResolver.isSaltPay() -> CardIdDisplayFormat.None
             else -> CardIdDisplayFormat.Full
         }
     }
 
     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..b0ee231286 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,6 @@ 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.wallet.R
 
 interface TapErrors
@@ -18,21 +17,20 @@ interface MultiMessageError : TapErrors {
 
 sealed class TapError(
     @StringRes val messageResource: Int,
-    override val args: List<Any>? = null
+    override val args: List<Any>? = null,
 ) : Throwable(), TapErrors, ArgError {
 
     object UnknownError : TapError(R.string.send_error_unknown)
     open class CustomError(val customMessage: String) : TapError(R.string.common_custom_string, listOf(customMessage))
     object ScanCardError : TapError(R.string.scan_card_error)
-    object PayIdAlreadyCreated : TapError(R.string.wallet_create_payid_error_already_created)
-    object PayIdCreatingError : TapError(R.string.wallet_create_payid_error_message)
-    object PayIdEmptyField : TapError(R.string.wallet_create_payid_empty)
     object UnknownBlockchain : TapError(R.string.wallet_error_unsupported_blockchain_subtitle)
     object NoInternetConnection : TapError(R.string.wallet_notification_no_internet)
-    object InsufficientBalance : TapError(R.string.send_error_insufficient_balance)
     object BlockchainInternalError : TapError(R.string.send_error_blockchain_internal)
     object AmountExceedsBalance : TapError(R.string.send_validation_amount_exceeds_balance)
-    data class AmountLowerExistentialDeposit(override val args: List<Any>) : TapError(R.string.send_error_minimum_balance_format)
+    data class AmountLowerExistentialDeposit(
+        override val args: List<Any>,
+    ) : TapError(R.string.send_error_minimum_balance_format)
+
     object FeeExceedsBalance : TapError(R.string.send_validation_invalid_fee)
     object TotalExceedsBalance : TapError(R.string.send_validation_invalid_total)
     object InvalidAmountValue : TapError(R.string.send_validation_invalid_amount)
@@ -49,7 +47,6 @@ sealed class TapError(
         object CreationError : CustomError("Can't create wallet manager")
         class NoAccountError(amountToCreateAccount: String) : CustomError(amountToCreateAccount)
         class InternalError(message: String) : CustomError(message)
-        object BlockchainIsUnreachable : TapError(R.string.wallet_balance_blockchain_unreachable)
         object BlockchainIsUnreachableTryLater : TapError(R.string.wallet_balance_blockchain_unreachable_try_later)
     }
 
@@ -64,8 +61,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)
@@ -79,13 +75,4 @@ fun TapErrors.assembleErrors(): MutableList<Pair<Int, List<Any>?>> {
         is TapError -> idList.add(Pair(this.messageResource, this.args))
     }
     return idList
-}
-
-fun TangemTechError.toTapError(): TapError {
-    return when (this.code) {
-        404 -> NoDataError(this.description)
-        else -> TapError.CustomError(customMessage = this.description)
-    }
-}
-
-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..dd13b37e8d 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -6,35 +6,51 @@ 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
 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.features.wallet.redux.middlewares.handleBasicAnalyticsEvent
 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 com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 class TapWalletManager {
     val walletManagerFactory: WalletManagerFactory
         by lazy { WalletManagerFactory(blockchainSdkConfig) }
-    val rates: RatesRepository = RatesRepository()
+
+    // TODO("After adding DI") get dependencies by DI
+    val rates: RatesRepository by lazy {
+        RatesRepository(
+            tangemTechApi = store.state.domainNetworks.tangemTechService.api,
+            dispatchers = AppCoroutineDispatcherProvider(),
+        )
+    }
 
     private val blockchainSdkConfig by lazy {
         store.state.globalState.configManager?.config?.blockchainSdkConfig ?: BlockchainSdkConfig()
@@ -81,22 +97,80 @@ 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)
+                handleBasicAnalyticsEvent()
+            }
+            .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(
+                WalletAction.MultiWallet.SetIsMultiwalletAllowed(
+                    data.cardTypesResolver.isMultiwalletAllowed(),
+                ),
+            )
             store.dispatch(WalletConnectAction.RestoreSessions(data))
             store.dispatch(
                 WalletAction.MultiWallet.ShowWalletBackupWarning(
-                    show = data.card.settings.isBackupAllowed
-                        && data.card.backupStatus == Card.BackupStatus.NoBackup,
+                    show = data.card.settings.isBackupAllowed &&
+                        data.card.backupStatus == CardDTO.BackupStatus.NoBackup,
                 ),
             )
             loadData(data)
@@ -105,12 +179,12 @@ class TapWalletManager {
 
     fun updateConfigManager(data: ScanResponse) {
         val configManager = store.state.globalState.configManager
-        val blockchain = data.getBlockchain()
-        if (data.card.isStart2Coin) {
+        val blockchain = data.cardTypesResolver.getBlockchain()
+        if (data.cardTypesResolver.isStart2Coin()) {
             configManager?.turnOff(ConfigManager.isSendingToPayIdEnabled)
             configManager?.turnOff(ConfigManager.isTopUpEnabled)
-        } else if (blockchain == Blockchain.Bitcoin
-            || data.walletData?.blockchain == Blockchain.Bitcoin.id
+        } else if (blockchain == Blockchain.Bitcoin ||
+            data.walletData?.blockchain == Blockchain.Bitcoin.id
         ) {
             configManager?.resetToDefault(ConfigManager.isSendingToPayIdEnabled)
             configManager?.resetToDefault(ConfigManager.isTopUpEnabled)
@@ -127,7 +201,8 @@ class TapWalletManager {
             return
         }
 
-        if (data.card.isMultiwalletAllowed) {
+        if (data.cardTypesResolver.isMultiwalletAllowed()) {
+            dispatchOnMain(WalletAction.MultiWallet.ScheduleCheckForMissingDerivation)
             loadMultiWalletData(data)
         } else {
             loadSingleWalletData(data)
@@ -143,24 +218,22 @@ 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
             .filter {
                 it.derivationPath != null && !scanResponse.hasDerivation(it.blockchain, it.derivationPath)
             }
-        if (missingDerivations.isNotEmpty()) {
-            store.dispatch(WalletAction.MultiWallet.AddMissingDerivations(missingDerivations))
-        }
+        store.dispatch(WalletAction.MultiWallet.AddMissingDerivations(missingDerivations))
     }
 
     private suspend fun loadSingleWalletData(data: ScanResponse) {
-        val blockchain = data.getBlockchain()
+        val blockchain = data.cardTypesResolver.getBlockchain()
         val primaryWalletManager = walletManagerFactory.makePrimaryWalletManager(data)
 
         if (blockchain != Blockchain.Unknown && primaryWalletManager != null) {
-            val primaryToken = data.getPrimaryToken()
+            val primaryToken = data.cardTypesResolver.getPrimaryToken()
 
             dispatchOnMain(WalletAction.MultiWallet.SetPrimaryBlockchain(blockchain))
             if (primaryToken != null) {
@@ -171,7 +244,6 @@ class TapWalletManager {
                 WalletAction.MultiWallet.AddBlockchains(
                     blockchains = listOf(BlockchainNetwork.fromWalletManager(primaryWalletManager)),
                     walletManagers = listOf(primaryWalletManager),
-                    save = false,
                 ),
                 WalletAction.LoadFiatRate(),
             )
@@ -187,7 +259,6 @@ class TapWalletManager {
                 WalletAction.MultiWallet.AddBlockchains(
                     blockchains = blockchainNetworks,
                     walletManagers = walletManagers,
-                    save = false,
                 ),
             )
 
@@ -197,7 +268,6 @@ class TapWalletManager {
                         WalletAction.MultiWallet.AddTokens(
                             tokens = it.tokens,
                             blockchain = it,
-                            save = false,
                         ),
                     )
                 }
@@ -207,7 +277,9 @@ class TapWalletManager {
     }
 
     suspend fun reloadData(data: ScanResponse) {
-        loadUserCurrencies(data, walletManagerFactory)
+        if (data.cardTypesResolver.isMultiwalletAllowed()) {
+            loadUserCurrencies(data, walletManagerFactory)
+        }
         withContext(Dispatchers.Main) {
             getActionIfUnknownBlockchainOrEmptyWallet(data)?.let {
                 store.dispatch(it)
@@ -225,10 +297,11 @@ class TapWalletManager {
     private fun getActionIfUnknownBlockchainOrEmptyWallet(data: ScanResponse): WalletAction? {
         return when {
             // check order is important
-            data.isTangemTwins() && !data.twinsIsTwinned() -> {
+            data.cardTypesResolver.isTangemTwins() && !data.twinsIsTwinned() -> {
                 WalletAction.EmptyWallet
             }
-            data.getBlockchain() == Blockchain.Unknown && !data.card.isMultiwalletAllowed -> {
+            data.cardTypesResolver.getBlockchain() == Blockchain.Unknown &&
+                !data.cardTypesResolver.isMultiwalletAllowed() -> {
                 WalletAction.LoadData.Failure(TapError.UnknownBlockchain)
             }
             data.isDemoCard() -> {
diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt
index bd530b0796..a79f3452b0 100644
--- a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt
@@ -1,6 +1,8 @@
 package com.tangem.tap.domain.configurable.config
 
 import com.tangem.blockchain.common.BlockchainSdkConfig
+import com.tangem.blockchain.common.BlockchairCredentials
+import com.tangem.blockchain.common.QuickNodeCredentials
 import com.tangem.tap.common.shop.shopify.ShopifyShop
 import com.tangem.tap.common.zendesk.ZendeskConfig
 import com.tangem.tap.domain.configurable.Loader
@@ -37,7 +39,7 @@ class ConfigManager {
     fun load(configLoader: Loader<ConfigModel>, onComplete: ((config: Config) -> Unit)? = null) {
         configLoader.load { configModel ->
             setupFeature(configModel.features)
-            setupKey(configModel.configValues)
+            setupConfigValues(configModel.configValues)
             onComplete?.invoke(config)
         }
     }
@@ -66,53 +68,52 @@ class ConfigManager {
         config = config.copy(
             isTopUpEnabled = model.isTopUpEnabled,
             isSendingToPayIdEnabled = model.isSendingToPayIdEnabled,
-            isCreatingTwinCardsAllowed = model.isCreatingTwinCardsAllowed
+            isCreatingTwinCardsAllowed = model.isCreatingTwinCardsAllowed,
         )
         defaultConfig = defaultConfig.copy(
             isTopUpEnabled = model.isTopUpEnabled,
             isSendingToPayIdEnabled = model.isSendingToPayIdEnabled,
-            isCreatingTwinCardsAllowed = model.isCreatingTwinCardsAllowed
+            isCreatingTwinCardsAllowed = model.isCreatingTwinCardsAllowed,
         )
     }
 
-    private fun setupKey(configValues: ConfigValueModel?) {
+    private fun setupConfigValues(configValues: ConfigValueModel?) {
         val values = configValues ?: return
-        config = config.copy(
-            coinMarketCapKey = values.coinMarketCapKey,
-            moonPayApiKey = values.moonPayApiKey,
-            moonPayApiSecretKey = values.moonPayApiSecretKey,
-            mercuryoWidgetId = values.mercuryoWidgetId,
-            mercuryoSecret = values.mercuryoSecret,
+
+        config = createConfig(config, values)
+        defaultConfig = config.copy()
+    }
+
+    private fun createConfig(config: Config, configValues: ConfigValueModel): Config {
+        return config.copy(
+            coinMarketCapKey = configValues.coinMarketCapKey,
+            moonPayApiKey = configValues.moonPayApiKey,
+            moonPayApiSecretKey = configValues.moonPayApiSecretKey,
+            mercuryoWidgetId = configValues.mercuryoWidgetId,
+            mercuryoSecret = configValues.mercuryoSecret,
             blockchainSdkConfig = BlockchainSdkConfig(
-                blockchairApiKey = values.blockchairApiKey,
-                blockchairAuthorizationToken = values.blockchairAuthorizationToken,
-                blockcypherTokens = values.blockcypherTokens,
-                infuraProjectId = values.infuraProjectId,
-                tronGridApiKey = values.tronGridApiKey
+                blockchairCredentials = BlockchairCredentials(
+                    apiKey = configValues.blockchairApiKeys,
+                    authToken = configValues.blockchairAuthorizationToken,
+                ),
+                blockcypherTokens = configValues.blockcypherTokens,
+                quickNodeCredentials = QuickNodeCredentials(
+                    apiKey = configValues.quiknodeApiKey,
+                    subdomain = configValues.quiknodeSubdomain,
+                ),
+                bscQuickNodeCredentials = QuickNodeCredentials(
+                    apiKey = configValues.bscQuiknodeApiKey,
+                    subdomain = configValues.bscQuiknodeSubdomain,
+                ),
+                infuraProjectId = configValues.infuraProjectId,
+                tronGridApiKey = configValues.tronGridApiKey,
+                saltPayAuthToken = configValues.saltPay.credentials.token,
             ),
-            appsFlyerDevKey = values.appsFlyerDevKey,
-            amplitudeApiKey = values.amplitudeApiKey,
-            shopify = values.shopifyShop,
-            zendesk = values.zendesk,
-            saltPayConfig = values.saltPay,
-        )
-        defaultConfig = defaultConfig.copy(
-            coinMarketCapKey = values.coinMarketCapKey,
-            moonPayApiKey = values.moonPayApiKey,
-            moonPayApiSecretKey = values.moonPayApiSecretKey,
-            mercuryoWidgetId = values.mercuryoWidgetId,
-            mercuryoSecret = values.mercuryoSecret,
-            blockchainSdkConfig = BlockchainSdkConfig(
-                blockchairApiKey = values.blockchairApiKey,
-                blockchairAuthorizationToken = values.blockchairAuthorizationToken,
-                blockcypherTokens = values.blockcypherTokens,
-                infuraProjectId = values.infuraProjectId
-            ),
-            appsFlyerDevKey = values.appsFlyerDevKey,
-            amplitudeApiKey = values.amplitudeApiKey,
-            shopify = values.shopifyShop,
-            zendesk = values.zendesk,
-            saltPayConfig = values.saltPay,
+            appsFlyerDevKey = configValues.appsFlyer.appsFlyerDevKey,
+            amplitudeApiKey = configValues.amplitudeApiKey,
+            shopify = configValues.shopifyShop,
+            zendesk = configValues.zendesk,
+            saltPayConfig = configValues.saltPay,
         )
     }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigLoaders.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/FeaturesLocalLoader.kt
similarity index 100%
rename from app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigLoaders.kt
rename to app/src/main/java/com/tangem/tap/domain/configurable/config/FeaturesLocalLoader.kt
diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt
index 1c537e7909..586ba0c63b 100644
--- a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt
+++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt
@@ -15,17 +15,22 @@ class FeatureModel(
     val isCreatingTwinCardsAllowed: Boolean,
 )
 
+@Suppress("LongParameterList")
 class ConfigValueModel(
     val coinMarketCapKey: String,
     val mercuryoWidgetId: String,
     val mercuryoSecret: String,
     val moonPayApiKey: String,
     val moonPayApiSecretKey: String,
-    val blockchairApiKey: String?,
+    val blockchairApiKeys: List<String>,
     val blockchairAuthorizationToken: String?,
+    val quiknodeSubdomain: String,
+    val quiknodeApiKey: String,
+    val bscQuiknodeSubdomain: String,
+    val bscQuiknodeApiKey: String,
     val blockcypherTokens: Set<String>?,
     val infuraProjectId: String?,
-    val appsFlyerDevKey: String,
+    val appsFlyer: AppsFlyer,
     val shopifyShop: ShopifyShop?,
     val zendesk: ZendeskConfig?,
     val saltPay: SaltPayConfig,
@@ -33,6 +38,11 @@ class ConfigValueModel(
     val amplitudeApiKey: String,
 )
 
+data class AppsFlyer(
+    val appsFlyerDevKey: String,
+    val appsFlyerAppID: String,
+)
+
 class ConfigModel(
     val features: FeatureModel?,
     val configValues: ConfigValueModel?,
diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt
index 03c10daf6f..ddadfcfc70 100644
--- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt
+++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt
@@ -24,7 +24,6 @@ data class WarningMessage(
         blockchains?.map { Blockchain.fromId(it.uppercase()) }
     }
 
-
     var isHidden = false
 
     enum class Priority {
@@ -40,15 +39,14 @@ data class WarningMessage(
 
     enum class Type {
         @Json(name = "permanent")
-        Permanent,     // нельзя скрыть
+        Permanent, // нельзя скрыть
 
         @Json(name = "temporary")
-        Temporary,      // можно скрыть (кнопка ОК)
+        Temporary, // можно скрыть (кнопка ОК)
 
         AppRating,
 
         TestCard
-
     }
 
     enum class Location {
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..a0e382136a 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
@@ -39,8 +39,8 @@ class WarningMessagesManager {
         val foundWarning = findWarning(warning)
         return when {
             foundWarning == null -> false
-            foundWarning.type == WarningMessage.Type.Temporary
-                || foundWarning.type == WarningMessage.Type.AppRating -> {
+            foundWarning.type == WarningMessage.Type.Temporary ||
+                foundWarning.type == WarningMessage.Type.AppRating -> {
                 if (foundWarning.isHidden) {
                     false
                 } else {
@@ -70,6 +70,8 @@ class WarningMessagesManager {
     }
 
     companion object {
+        const val REMAINING_SIGNATURES_WARNING = 10
+
         fun devCardWarning(): WarningMessage = WarningMessage(
             "",
             "",
@@ -77,7 +79,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 +91,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 +144,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 +157,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,11 +169,9 @@ 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,
         )
-
-        const val REMAINING_SIGNATURES_WARNING = 10
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
index 673ef1787b..9adb6b24aa 100644
--- a/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
@@ -5,7 +5,7 @@ import com.tangem.blockchain.common.Token
 import com.tangem.common.card.EllipticCurve
 import java.math.BigDecimal
 
-
+@Suppress("MagicNumber")
 fun Blockchain.amountToCreateAccount(token: Token? = null): BigDecimal? {
     return when (this) {
         Blockchain.Stellar -> if (token?.symbol == NODL) BigDecimal(1.5) else BigDecimal.ONE
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..005f05500c 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,38 @@
 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
-    get() {
-        return !isTangemTwin() && !isStart2Coin && !isTangemNote && !isSaltPay
-            && (firmwareVersion >= FirmwareVersion.MultiWalletAvailable ||
-            getSingleWallet()?.curve == EllipticCurve.Secp256k1)
-    }
+val CardDTO.isFirmwareMultiwalletAllowed: Boolean
+    get() = firmwareVersion >= FirmwareVersion.MultiWalletAvailable && settings.maxWalletsCount > 1
 
-val Card.isHdWalletAllowedByApp: Boolean
+val CardDTO.isHdWalletAllowedByApp: Boolean
     get() = settings.isHDWalletAllowed && !isSaltPay
 
-fun Card.getSingleWallet(): CardWallet? {
-    return wallets.firstOrNull()
+@Suppress("UnnecessaryParentheses")
+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 +47,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..07e92a313f 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
@@ -38,7 +37,7 @@ fun WalletManagerFactory.makeWalletManagerForApp(
 
     val seedKey = wallet.extendedPublicKey
     return when {
-        scanResponse.isTangemTwins() && scanResponse.secondTwinPublicKey != null -> {
+        scanResponse.cardTypesResolver.isTangemTwins() && scanResponse.secondTwinPublicKey != null -> {
             makeTwinWalletManager(
                 walletPublicKey = wallet.publicKey,
                 pairPublicKey = scanResponse.secondTwinPublicKey!!.hexToBytes(),
@@ -46,7 +45,7 @@ fun WalletManagerFactory.makeWalletManagerForApp(
                 curve = wallet.curve,
             )
         }
-        scanResponse.card.isHdWalletAllowedByApp && (seedKey != null && derivationParams != null) -> {
+        scanResponse.card.isHdWalletAllowedByApp && seedKey != null && derivationParams != null -> {
             val derivedKeys = scanResponse.derivedKeys[wallet.publicKey.toMapKey()]
             val derivationPath = when (derivationParams) {
                 is DerivationParams.Default -> blockchain.derivationPath(derivationParams.style)
@@ -73,7 +72,8 @@ fun WalletManagerFactory.makeWalletManagerForApp(
 }
 
 fun WalletManagerFactory.makeWalletManagerForApp(
-    scanResponse: ScanResponse, blockchainNetwork: BlockchainNetwork,
+    scanResponse: ScanResponse,
+    blockchainNetwork: BlockchainNetwork,
 ): WalletManager? {
     return makeWalletManagerForApp(
         scanResponse,
@@ -82,7 +82,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),
@@ -120,9 +120,9 @@ fun WalletManagerFactory.makePrimaryWalletManager(
     scanResponse: ScanResponse,
 ): WalletManager? {
     val blockchain = if (scanResponse.card.isTestCard) {
-        scanResponse.getBlockchain().getTestnetVersion() ?: return null
+        scanResponse.cardTypesResolver.getBlockchain().getTestnetVersion() ?: return null
     } else {
-        scanResponse.getBlockchain()
+        scanResponse.cardTypesResolver.getBlockchain()
     }
     val derivationParams = getDerivationParams(null, scanResponse.card)
     return makeWalletManagerForApp(
@@ -132,7 +132,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]
@@ -143,13 +143,14 @@ private fun selectWallet(wallets: List<CardWallet>): CardWallet? {
 fun WalletManagerFactory.makeSaltPayWalletManager(
     scanResponse: ScanResponse,
 ): EthereumWalletManager {
-    val blockchain = scanResponse.getBlockchain()
-    if (blockchain != Blockchain.SaltPay && blockchain != Blockchain.SaltPayTestnet)
-        throw IllegalArgumentException()
+    val blockchain = scanResponse.cardTypesResolver.getBlockchain()
+    if (blockchain != Blockchain.SaltPay) {
+        error("WalletManager for the SaltPay can be created based only on Blockchain.SaltPay")
+    }
 
     val token = SaltPayWorkaround.tokenFrom(blockchain)
     val cardWallet = scanResponse.card.wallets.firstOrNull().guard {
-        throw NullPointerException("SaltPay card must have one wallet at least")
+        error("SaltPay card must have one wallet at least")
     }
 
     return makeWalletManager(
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..3429afa07c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/WalletDataModel.kt
@@ -0,0 +1,73 @@
+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
+ * @param isCardSingleToken shows that [Currency] is a card token
+ * */
+data class WalletDataModel(
+    val currency: Currency,
+    val status: Status,
+    val walletAddresses: List<AddressData>,
+    val existentialDeposit: BigDecimal?,
+    val fiatRate: BigDecimal?,
+    val isCardSingleToken: Boolean,
+) {
+
+    /**
+     * 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..7bca1028c0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt
@@ -0,0 +1,85 @@
+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 com.tangem.tap.features.wallet.models.Currency
+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
+ *
+ * @property blockchainWalletData Returns the [WalletDataModel] of the blockchain of this wallet store
+ * or throw [NoSuchElementException] if this wallet store not contains [WalletDataModel] of the blockchain
+ * */
+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?,
+) {
+
+    val blockchainWalletData: WalletDataModel
+        get() = walletsData.first { it.currency is Currency.Blockchain }
+
+    /**
+     * 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..a2c699667a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletBuilder.kt
@@ -0,0 +1,92 @@
+package com.tangem.tap.domain.model.builders
+
+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.Start2Coin -> "Start2Coin"
+            ProductType.Wallet -> when {
+                card.isBackupNotAllowed -> "Tangem card"
+                card.isStart2Coin -> "Start2Coin"
+                else -> "Wallet"
+            }
+        }
+
+    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 = cardTypesResolver.isMultiwalletAllowed(),
+                    )
+                }
+        }
+    }
+
+    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..ebe875ad66
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletIdBuilder.kt
@@ -0,0 +1,71 @@
+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,
+                    ProductType.Start2Coin,
+                    -> 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..b48ae715a2
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt
@@ -0,0 +1,155 @@
+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,
+        isCardSingleToken = false,
+    )
+}
+
+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,
+                isCardSingleToken = walletManager?.cardTokens?.contains(token) ?: false,
+            )
+        }
+}
+
+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,
+        isCardSingleToken = false,
+    )
+}
+
+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,
+        isCardSingleToken = walletManager.cardTokens.contains(this),
+    )
+}
+
+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/moduleMessage/domain/converter/AddCustomTokenErrorConverter.kt b/app/src/main/java/com/tangem/tap/domain/moduleMessage/domain/converter/AddCustomTokenErrorConverter.kt
index 66e41dc48e..daa0901b14 100644
--- a/app/src/main/java/com/tangem/tap/domain/moduleMessage/domain/converter/AddCustomTokenErrorConverter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/moduleMessage/domain/converter/AddCustomTokenErrorConverter.kt
@@ -15,8 +15,9 @@ internal class AddCustomTokenErrorConverter(
     private val context: Context,
 ) : ModuleMessageConverter<DomainModuleError, ConvertedMessage?> {
 
+    @Suppress("MagicNumber")
     override fun convert(message: DomainModuleError): ConvertedMessage? {
-        val customTokenError = (message as? AddCustomTokenError) ?: throw UnsupportedOperationException()
+        val customTokenError = message as? AddCustomTokenError ?: throw UnsupportedOperationException()
 
         val rawMessage = when (customTokenError) {
             AddCustomTokenError.Warning.PotentialScamToken -> R.string.custom_token_validation_error_not_found
diff --git a/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/SaltPayMessageConverter.kt b/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/SaltPayMessageConverter.kt
index ac8c8cd359..9db1c78996 100644
--- a/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/SaltPayMessageConverter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/SaltPayMessageConverter.kt
@@ -31,4 +31,4 @@ class SaltPayErrorConverter(
         is SaltPayActivationError -> SaltPayActivationErrorConverter(context).convert(message)
         else -> null
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayActivationErrorConverter.kt b/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayActivationErrorConverter.kt
index 65de384d44..1771a2db47 100644
--- a/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayActivationErrorConverter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayActivationErrorConverter.kt
@@ -14,7 +14,7 @@ internal class SaltPayActivationErrorConverter(
 ) : ModuleMessageConverter<SaltPayActivationError, ConvertedDialogMessage?> {
 
     override fun convert(message: SaltPayActivationError): ConvertedDialogMessage? {
-        val saltPayError = (message as? SaltPayActivationError) ?: throw UnsupportedOperationException()
+        val saltPayError = message as? SaltPayActivationError ?: throw UnsupportedOperationException()
 
         val dialogMessage = when (saltPayError) {
             SaltPayActivationError.NoGas -> {
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..222768169b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/ScanCardProcessor.kt
@@ -0,0 +1,255 @@
+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.core.analytics.Analytics
+import com.tangem.core.analytics.AnalyticsEvent
+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.paramsInterceptor.BatchIdParamsInterceptor
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.primaryCardIsSaltPayVisa
+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.DisclaimerType
+import com.tangem.tap.features.disclaimer.createDisclaimer
+import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
+import com.tangem.tap.features.disclaimer.redux.DisclaimerCallback
+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.message.SaltPayActivationError
+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 kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+// TODO: Create repository for that
+object ScanCardProcessor {
+    suspend fun scan(
+        analyticsEvent: AnalyticsEvent? = null,
+        additionalBlockchainsToDerive: Collection<Blockchain>? = null,
+        cardId: String? = null,
+        onProgressStateChange: suspend (showProgress: Boolean) -> Unit = {},
+        onScanStateChange: suspend (scanInProgress: Boolean) -> Unit = {},
+        onWalletNotCreated: suspend () -> Unit = {},
+        disclaimerWillShow: () -> 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 ->
+                onScanStateChange(false)
+                onFailure(error)
+            }
+            .doOnSuccess { scanResponse ->
+                tangemSdkManager.changeDisplayedCardIdNumbersCount(scanResponse)
+
+                onScanStateChange(false)
+                sendAnalytics(analyticsEvent, scanResponse.card.batchId)
+
+                checkForUnfinishedBackupForSaltPay(
+                    backupService = backupService,
+                    scanResponse = scanResponse,
+                    onFailure = onFailure,
+                    nextHandler = { scanResponse1 ->
+                        showDisclaimerIfNeed(
+                            scanResponse = scanResponse1,
+                            disclaimerWillShow = disclaimerWillShow,
+                            onFailure = onFailure,
+                            nextHandler = { scanResponse2 ->
+                                onScanSuccess(
+                                    scanResponse = scanResponse2,
+                                    onProgressStateChange = onProgressStateChange,
+                                    onSuccess = onSuccess,
+                                    onWalletNotCreated = onWalletNotCreated,
+                                    onFailure = onFailure,
+                                )
+                            },
+                        )
+                    },
+                )
+            }
+    }
+
+    private fun sendAnalytics(
+        analyticsEvent: AnalyticsEvent?,
+        batchId: String,
+    ) {
+        Analytics.addParamsInterceptor(BatchIdParamsInterceptor(batchId))
+        analyticsEvent?.let { Analytics.send(it) }
+    }
+
+    /**
+     * 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 suspend inline fun checkForUnfinishedBackupForSaltPay(
+        backupService: BackupService,
+        scanResponse: ScanResponse,
+        nextHandler: (ScanResponse) -> Unit,
+        onFailure: suspend (error: TangemError) -> Unit,
+    ) {
+        if (!backupService.hasIncompletedBackup || !backupService.primaryCardIsSaltPayVisa()) {
+            nextHandler(scanResponse)
+            return
+        }
+
+        val isTheSamePrimaryCard = backupService.primaryCardId
+            ?.let { it == scanResponse.card.cardId }
+            ?: false
+
+        if (scanResponse.cardTypesResolver.isSaltPayWallet() || !isTheSamePrimaryCard) {
+            val error = SaltPayActivationError.PutVisaCard
+            SaltPayExceptionHandler.handle(error)
+            onFailure(TangemSdkError.ExceptionError(error))
+        } else {
+            nextHandler(scanResponse)
+        }
+    }
+
+    private suspend inline fun showDisclaimerIfNeed(
+        scanResponse: ScanResponse,
+        crossinline disclaimerWillShow: () -> Unit = {},
+        crossinline nextHandler: suspend (ScanResponse) -> Unit,
+        crossinline onFailure: suspend (error: TangemError) -> Unit,
+    ) {
+        val disclaimer = DisclaimerType.get(scanResponse.card).createDisclaimer(scanResponse.card)
+        store.dispatchOnMain(DisclaimerAction.SetDisclaimer(disclaimer))
+
+        if (disclaimer.isAccepted()) {
+            nextHandler(scanResponse)
+        } else {
+            scope.launch {
+                delay(DELAY_SDK_DIALOG_CLOSE)
+                disclaimerWillShow()
+                dispatchOnMain(
+                    DisclaimerAction.Show(
+                        fromScreen = AppScreen.Home,
+                        callback = DisclaimerCallback(
+                            onAccept = {
+                                scope.launch(Dispatchers.Main) {
+                                    nextHandler(scanResponse)
+                                }
+                            },
+                            onDismiss = {
+                                scope.launch(Dispatchers.Main) {
+                                    onFailure(TangemSdkError.UserCancelled())
+                                }
+                            },
+                        ),
+                    ),
+                )
+            }
+        }
+    }
+
+    @Suppress("LongMethod", "MagicNumber")
+    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,
+    ) {
+        val globalState = store.state.globalState
+        val tapWalletManager = globalState.tapWalletManager
+        tapWalletManager.updateConfigManager(scanResponse)
+
+        store.dispatchOnMain(TwinCardsAction.IfTwinsPrepareState(scanResponse))
+
+        if (scanResponse.cardTypesResolver.isSaltPay()) {
+            if (scanResponse.cardTypesResolver.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)
+                            }
+                        }
+                        is Result.Failure -> {
+                            delay(DELAY_SDK_DIALOG_CLOSE)
+                            SaltPayExceptionHandler.handle(result.error)
+                            onFailure(TangemSdkError.ExceptionError(result.error))
+                        }
+                    }
+                }
+            } else {
+                delay(DELAY_SDK_DIALOG_CLOSE)
+                if (scanResponse.card.backupStatus?.isActive == false) {
+                    val error = SaltPayActivationError.PutVisaCard
+                    SaltPayExceptionHandler.handle(error)
+                    onFailure(TangemSdkError.ExceptionError(error))
+                } else {
+                    onSuccess(scanResponse)
+                }
+            }
+        } 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)
+                }
+            }
+        }
+    }
+
+    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/statePrinter/OnboardingWalletStateConverter.kt b/app/src/main/java/com/tangem/tap/domain/statePrinter/OnboardingWalletStateConverter.kt
index 858dc8b5d1..3e98a50996 100644
--- a/app/src/main/java/com/tangem/tap/domain/statePrinter/OnboardingWalletStateConverter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/statePrinter/OnboardingWalletStateConverter.kt
@@ -24,7 +24,7 @@ class OnboardingWalletStateConverter : StringStateConverter<AppState> {
             BackupStepAdapter(),
             BigIntegerAdapter(),
 
-            )
+        )
     }
 
     override fun convert(stateHolder: AppState): String {
@@ -56,6 +56,7 @@ class BackupStepAdapter {
         }
     }
 
+    @Suppress("MagicNumber")
     @FromJson
     fun fromJson(json: String): BackupStep {
         return when (json) {
diff --git a/app/src/main/java/com/tangem/tap/domain/statePrinter/ScanResponseConverter.kt b/app/src/main/java/com/tangem/tap/domain/statePrinter/ScanResponseConverter.kt
index f8597dc48b..e59536ab1e 100644
--- a/app/src/main/java/com/tangem/tap/domain/statePrinter/ScanResponseConverter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/statePrinter/ScanResponseConverter.kt
@@ -29,14 +29,12 @@ class ScanResponseConverter : StringStateConverter<AppState> {
                 )
             }
             derivedKeysMap[keyWalletPubKey.bytes.toHexString()] = exPubKeysMap
-
         }
         scanResponseMap["derivedKeys"] = derivedKeysMap
 
         val json = converter.prettyPrint(scanResponseMap)
 
         return json
-
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt
index 140a0ef72d..5c39928f88 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt
@@ -13,9 +13,9 @@ import com.tangem.operations.wallet.CreateWalletTask
 class CreateWalletsTask(curves: List<EllipticCurve>? = null) : CardSessionRunnable<Card> {
 
     private val curves = curves ?: listOf(
-            EllipticCurve.Secp256k1,
-            EllipticCurve.Ed25519,
-            EllipticCurve.Secp256r1,
+        EllipticCurve.Secp256k1,
+        EllipticCurve.Ed25519,
+        EllipticCurve.Secp256r1,
     )
 
     private var index = 0
@@ -26,10 +26,10 @@ class CreateWalletsTask(curves: List<EllipticCurve>? = null) : CardSessionRunnab
     }
 
     private fun createWallet(
-        curve: EllipticCurve, session: CardSession,
+        curve: EllipticCurve,
+        session: CardSession,
         callback: (result: CompletionResult<Card>) -> Unit
     ) {
-
         CreateWalletTask(curve).run(session) { result ->
             when (result) {
                 is CompletionResult.Success -> {
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/DerivationTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/DerivationTask.kt
deleted file mode 100644
index 3c471f4bc4..0000000000
--- a/app/src/main/java/com/tangem/tap/domain/tasks/DerivationTask.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-//package com.tangem.tap.domain.tasks
-//
-//import com.tangem.common.CompletionResult
-//import com.tangem.common.core.CardSession
-//import com.tangem.common.core.CardSessionRunnable
-//import com.tangem.common.core.CompletionCallback
-//import com.tangem.common.hdWallet.DerivationPath
-//import com.tangem.common.hdWallet.ExtendedPublicKey
-//import com.tangem.operations.CommandResponse
-//import com.tangem.operations.derivation.DeriveWalletPublicKeysTask
-//import com.tangem.tap.common.extensions.ByteArrayKey
-//
-//class ExtendedPublicKeyList(
-//    items: Collection<ExtendedPublicKey>
-//): ArrayList<ExtendedPublicKey>(items), CommandResponse
-//
-//
-//class DerivationTaskResponse(
-//    val entries: Map<ByteArrayKey, ExtendedPublicKeyList>
-//): CommandResponse
-//
-//class DerivationTask(
-//    private val derivations: Map<ByteArrayKey, List<DerivationPath>>
-//) : CardSessionRunnable<DerivationTaskResponse> {
-//
-//    val response: MutableMap<ByteArrayKey, ExtendedPublicKeyList> = mutableMapOf()
-//
-//    override fun run(session: CardSession, callback: CompletionCallback<DerivationTaskResponse>) {
-//        derive(keys = derivations.keys.toList(), index = 0, session = session, callback = callback)
-//    }
-//
-//    private fun derive(
-//        keys: List<ByteArrayKey>,
-//        index: Int,
-//        session: CardSession,
-//        callback: CompletionCallback<DerivationTaskResponse>
-//    ) {
-//        if (index == keys.count()) {
-//            callback(CompletionResult.Success(DerivationTaskResponse(response.toMap())))
-//            return
-//        }
-//
-//        val key = keys[index]
-//        val paths = derivations[key]!!
-//        DeriveWalletPublicKeysTask(key.bytes, paths).run(session) { result ->
-//            when (result) {
-//                is CompletionResult.Success -> {
-//                    response[key] = result.data[key]
-//                    derive(keys = keys, index = index + 1, session = session, callback = callback)
-//                }
-//                is CompletionResult.Failure -> callback(CompletionResult.Failure(result.error))
-//            }
-//        }
-//    }
-//}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/SignHashTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/SignHashTask.kt
index 58520125ce..3e5d37ac4b 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/SignHashTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/SignHashTask.kt
@@ -34,4 +34,4 @@ class SignHashTask(
             }
         }
     }
-}
+}
\ 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..7bbd4d1811 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,68 +11,94 @@ 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.CardTypesResolver
 import com.tangem.domain.common.KeyWalletPublicKey
-import com.tangem.domain.common.ProductType
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
-import com.tangem.domain.common.TapWorkarounds.getTangemNoteBlockchain
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.operations.CommandResponse
 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,
+    private val cardTypesResolver: CardTypesResolver,
 ) : 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")
+        val commandProcessor = when {
+            cardTypesResolver.isTangemNote() -> CreateWalletTangemNote(cardTypesResolver)
+            cardTypesResolver.isTangemTwins() ->
+                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))
             }
         }
     }
 }
 
-private class CreateWalletTangemNote : ProductCommandProcessor<CreateWalletResponse> {
+private class CreateWalletTangemNote(private val cardTypesResolver: CardTypesResolver) :
+    ProductCommandProcessor<CreateWalletResponse> {
     override fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<CreateWalletResponse>) -> Unit,
     ) {
@@ -79,8 +107,8 @@ private class CreateWalletTangemNote : ProductCommandProcessor<CreateWalletRespo
             return
         }
 
-        val curvesSupportedByBlockchain = card.getTangemNoteBlockchain()?.getSupportedCurves()
-        if (curvesSupportedByBlockchain == null || curvesSupportedByBlockchain.isEmpty()) {
+        val curvesSupportedByBlockchain = cardTypesResolver.getBlockchain().getSupportedCurves().toSet()
+        if (curvesSupportedByBlockchain.isEmpty()) {
             callback(CompletionResult.Failure(TangemSdkError.CardError()))
             return
         }
@@ -94,63 +122,77 @@ 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(
-                        CreateProductWalletTaskResponse(card = session.environment.card!!)
-                    )
+                        CreateProductWalletTaskResponse(card = session.environment.card!!),
+                    ),
                 )
             }
         }
     }
 
     private fun linkPrimaryCard(
+        card: CardDTO,
         createWalletResponse: List<CreateWalletResponse>,
         session: CardSession,
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
@@ -161,19 +203,22 @@ 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(
                                     CreateProductWalletTaskResponse(
-                                        card = session.environment.card!!, primaryCard = primaryCard
-                                    )
-                                )
+                                        card = session.environment.card!!,
+                                        primaryCard = primaryCard,
+                                    ),
+                                ),
                             )
                         }
                     }
                 }
+
                 is CompletionResult.Failure -> {
                     callback(CompletionResult.Failure(result.error))
                 }
@@ -182,13 +227,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 +256,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/CreateWalletsTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateWalletsTask.kt
index 6443b95987..da0e18e914 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateWalletsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateWalletsTask.kt
@@ -23,7 +23,7 @@ class CreateWalletsTask(
     private val createdWalletsResponses = mutableListOf<CreateWalletResponse>()
 
     override fun run(session: CardSession, callback: (result: CompletionResult<CreateWalletsResponse>) -> Unit) {
-        if (curves.isEmpty()){
+        if (curves.isEmpty()) {
             callback(CompletionResult.Failure(TangemSdkError.WalletIsNotCreated()))
             return
         }
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/ResetToFactorySettingsTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
index 444a7b3971..398f369a54 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
@@ -8,7 +8,7 @@ import com.tangem.common.extensions.guard
 import com.tangem.operations.backup.ResetBackupCommand
 import com.tangem.operations.wallet.PurgeWalletCommand
 
-class ResetToFactorySettingsTask() : CardSessionRunnable<Card> {
+class ResetToFactorySettingsTask : CardSessionRunnable<Card> {
 
     override fun run(session: CardSession, callback: (result: CompletionResult<Card>) -> Unit) {
         deleteWallets(session, callback)
@@ -18,7 +18,6 @@ class ResetToFactorySettingsTask() : CardSessionRunnable<Card> {
         session: CardSession,
         callback: (result: CompletionResult<Card>) -> Unit,
     ) {
-
         val wallet = session.environment.card?.wallets?.lastOrNull().guard {
             resetBackup(session, callback)
             return
@@ -38,7 +37,6 @@ class ResetToFactorySettingsTask() : CardSessionRunnable<Card> {
         session: CardSession,
         callback: (result: CompletionResult<Card>) -> Unit,
     ) {
-
         val backupStatus = session.environment.card?.backupStatus
         if (backupStatus == null || backupStatus == Card.BackupStatus.NoBackup) {
             callback(CompletionResult.Success(session.environment.card!!))
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 252d3585e6..6cbd5923e6 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
@@ -8,17 +8,23 @@ import com.tangem.common.core.CardSession
 import com.tangem.common.core.CardSessionRunnable
 import com.tangem.common.core.TangemError
 import com.tangem.common.core.TangemSdkError
+import com.tangem.common.deserialization.WalletDataDeserializer
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.guard
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.common.extensions.toByteArray
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvDecoder
+import com.tangem.crypto.CryptoUtils
+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
 import com.tangem.domain.common.TapWorkarounds.isNotSupportedInThatRelease
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
-import com.tangem.domain.common.TapWorkarounds.isTangemNote
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
 import com.tangem.domain.common.TwinsHelper
@@ -28,11 +34,11 @@ import com.tangem.operations.ScanTask
 import com.tangem.operations.backup.PrimaryCard
 import com.tangem.operations.backup.StartPrimaryCardLinkingTask
 import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
+import com.tangem.operations.files.ReadFilesTask
 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.extensions.isFirmwareMultiwalletAllowed
 import com.tangem.tap.domain.tokens.UserTokensRepository
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.preferencesStorage
@@ -45,6 +51,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,
@@ -53,19 +62,19 @@ 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.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) {
@@ -73,7 +82,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))
                         }
@@ -85,31 +94,13 @@ 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
     }
 }
 
-private class ScanNoteProcessor : ProductCommandProcessor<ScanResponse> {
-    override fun proceed(
-        card: Card,
-        session: CardSession,
-        callback: (result: CompletionResult<ScanResponse>) -> Unit
-    ) {
-        callback(
-            CompletionResult.Success(
-                ScanResponse(
-                    card = card,
-                    productType = ProductType.Note,
-                    walletData = session.environment.walletData,
-                ),
-            ),
-        )
-    }
-}
-
 private class ScanWalletProcessor(
     private val userTokensRepository: UserTokensRepository?,
     private val additionalBlockchainsToDerive: Collection<Blockchain>? = null,
@@ -117,19 +108,85 @@ private class ScanWalletProcessor(
 
     var primaryCard: PrimaryCard? = null
     override fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
+        @Suppress("MagicNumber")
+        if (card.firmwareVersion.doubleValue >= 4.39 && card.settings.maxWalletsCount == 1) {
+            readFile(card, session, callback)
+            return
+        }
+
         createMissingWalletsIfNeeded(card, session, callback)
     }
 
-    private fun createMissingWalletsIfNeeded(
-        card: Card,
+    private fun readFile(
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
-        if (card.wallets.isEmpty() || !card.isMultiwalletAllowed) {
+        val funToContinue = { createMissingWalletsIfNeeded(card, session, callback) }
+
+        ReadFilesTask(fileName = "blockchainInfo", walletPublicKey = null).run(session) { result ->
+
+            when (result) {
+                is CompletionResult.Success -> {
+                    val file = result.data.firstOrNull()
+                    val counter = file?.counter
+                    val signature = file?.signature
+
+                    val tlv = file?.data?.let { Tlv.deserialize(it) }
+                    val walletData = tlv?.let { WalletDataDeserializer.deserialize(TlvDecoder(tlv)) }
+
+                    if (walletData == null || counter == null || signature == null) {
+                        funToContinue()
+                        return@run
+                    }
+
+                    val dataToVerify = card.cardId.hexToBytes() + file.data + counter.toByteArray()
+                    val isVerified = CryptoUtils.verify(
+                        publicKey = card.issuer.publicKey,
+                        message = dataToVerify,
+                        signature = signature,
+                    )
+                    if (!isVerified) {
+                        funToContinue()
+                        return@run
+                    }
+
+                    if (walletData.blockchain != "ANY") {
+                        callback(
+                            CompletionResult.Success(
+                                ScanResponse(
+                                    card = card,
+                                    productType = ProductType.Note,
+                                    walletData = walletData,
+                                ),
+                            ),
+                        )
+                    } else {
+                        funToContinue()
+                    }
+                }
+                is CompletionResult.Failure -> {
+                    when (result.error) {
+                        is TangemSdkError.FileNotFound, is TangemSdkError.InsNotSupported -> {
+                            funToContinue()
+                        }
+                        else -> callback(CompletionResult.Failure(result.error))
+                    }
+                }
+            }
+        }
+    }
+
+    private fun createMissingWalletsIfNeeded(
+        card: CardDTO,
+        session: CardSession,
+        callback: (result: CompletionResult<ScanResponse>) -> Unit,
+    ) {
+        if (card.wallets.isEmpty() || !card.isFirmwareMultiwalletAllowed) {
             startLinkingForBackupIfNeeded(card, session, callback)
             return
         }
@@ -145,7 +202,7 @@ private class ScanWalletProcessor(
                 is CompletionResult.Success -> {
                     PreflightReadTask(
                         readMode = PreflightReadMode.FullCardRead,
-                        cardId = card.cardId
+                        cardId = card.cardId,
                     ).run(session) { readResult ->
                         when (readResult) {
                             is CompletionResult.Success -> startLinkingForBackupIfNeeded(card, session, callback)
@@ -157,14 +214,18 @@ 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()) {
+        @Suppress("ComplexCondition")
+        if (card.backupStatus == CardDTO.BackupStatus.NoBackup && card.wallets.isNotEmpty() &&
+            (activationInProgress || card.isSaltPay)
+        ) {
             StartPrimaryCardLinkingTask().run(session) { linkingResult ->
                 when (linkingResult) {
                     is CompletionResult.Success -> {
@@ -180,8 +241,9 @@ private class ScanWalletProcessor(
             deriveKeysIfNeeded(card, session, callback)
         }
     }
+
     private fun deriveKeysIfNeeded(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
@@ -223,25 +285,46 @@ 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(
+                        blockchain = it,
+                        card = card,
+                    )
+                },
+            )
         }
         if (!card.useOldStyleDerivation) {
             blockchainsToDerive.removeAll(
@@ -251,13 +334,18 @@ private class ScanWalletProcessor(
                     Blockchain.RSK,
                     Blockchain.Fantom, Blockchain.FantomTestnet,
                     Blockchain.Avalanche, Blockchain.AvalancheTestnet,
-                ).map { BlockchainNetwork(it, card) }
+                ).map {
+                    BlockchainNetwork(
+                        blockchain = it,
+                        card = card,
+                    )
+                },
             )
         }
         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>>()
 
@@ -281,16 +369,17 @@ private class ScanWalletProcessor(
     }
 }
 
+@Suppress("MagicNumber")
 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,
@@ -328,7 +417,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
deleted file mode 100644
index f05065bc8d..0000000000
--- a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-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
-
-/**
-[REDACTED_AUTHOR]
- */
-class CardTou {
-    private val locale: Locale =
-        ConfigurationCompat.getLocales(Resources.getSystem().configuration).get(0)!!
-
-    fun getUrl(card: Card): Uri? {
-        val issuerName = card.issuer.name
-        if (issuerName.lowercase(Locale.getDefault()) != "start2coin") return null
-
-        val baseUrl = "https://app.tangem.com/tou/"
-        val regionCode = regionCode(card.cardId) ?: "fr"
-        val filename = filename(locale.language, regionCode)
-        return Uri.parse(baseUrl + filename)
-    }
-
-    private fun filename(languageCode: String, regionCode: String): String {
-        return when {
-            languageCode == "fr" && regionCode == "ch" -> "Start2Coin-fr-ch-tangem.pdf"
-            languageCode == "de" && regionCode == "ch" -> "Start2Coin-de-ch-tangem.pdf"
-            languageCode == "en" && regionCode == "ch" -> "Start2Coin-en-ch-tangem.pdf"
-            languageCode == "it" && regionCode == "ch" -> "Start2Coin-it-ch-tangem.pdf"
-            languageCode == "fr" && regionCode == "fr" -> "Start2Coin-fr-fr-atangem.pdf"
-            languageCode == "de" && regionCode == "at" -> "Start2Coin-de-at-tangem.pdf"
-            regionCode == "fr" -> "Start2Coin-fr-fr-atangem.pdf"
-            regionCode == "ch" -> "Start2Coin-en-ch-tangem.pdf"
-            regionCode == "at" -> "Start2Coin-de-at-tangem.pdf"
-            else -> "Start2Coin-fr-fr-atangem.pdf"
-        }
-    }
-
-    private fun regionCode(cardId: String): String? = when (cardId[1]) {
-        '0' -> "fr"
-        '1' -> "ch"
-        '2' -> "at"
-        else -> null
-    }
-}
\ No newline at end of file
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..c70127f7e2 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
@@ -2,8 +2,8 @@ package com.tangem.tap.domain.tokens
 
 import com.squareup.moshi.JsonClass
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
 import com.tangem.domain.common.extensions.fromNetworkId
-import com.tangem.network.api.tangemTech.CoinsResponse
 
 @JsonClass(generateAdapter = true)
 data class CurrencyFromJson(
@@ -26,7 +26,6 @@ data class CurrenciesFromJson(
     val coins: List<CurrencyFromJson>
 )
 
-
 fun List<ContractFromJson>.toContracts(): List<Contract> {
     return mapNotNull { Contract.fromJsonObject(it) }
 }
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..90a720055c 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
@@ -1,23 +1,23 @@
 package com.tangem.tap.domain.tokens
 
 import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.Moshi
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
-import com.tangem.domain.common.extensions.getListOfCoins
+import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
 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.tap.common.AssetReader
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
 
 class LoadAvailableCoinsService(
-    private val networkService: TangemTechService,
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
     private val assetReader: AssetReader,
 ) {
-    private val moshi: Moshi by lazy { MoshiConverter.defaultMoshi() }
     private val currenciesAdapter: JsonAdapter<CurrenciesFromJson> =
-        moshi.adapter(CurrenciesFromJson::class.java)
+        MoshiConverter.networkMoshi.adapter(CurrenciesFromJson::class.java)
 
     suspend fun getSupportedTokens(
         isTestNet: Boolean = false,
@@ -43,7 +43,7 @@ class LoadAvailableCoinsService(
                     LoadedCoins(
                         currencies = data.coins.map { Currency.fromCoinResponse(it, data.imageHost) },
                         moreAvailable = data.total > offset + LOAD_PER_PAGE,
-                    )
+                    ),
                 )
             }
             is Result.Failure -> {
@@ -55,16 +55,23 @@ class LoadAvailableCoinsService(
     private suspend fun loadCoins(
         supportedBlockchains: List<Blockchain>,
         offset: Int,
-        searchInput: String? = null
+        searchInput: String? = null,
     ): Result<CoinsResponse> {
-        val networkIds = supportedBlockchains.toSet().map { it.toNetworkId() }
-        return networkService.getListOfCoins(
-            networkIds = networkIds,
-            active = true,
-            offset = offset,
-            limit = LOAD_PER_PAGE,
-            searchText = searchInput,
-        )
+        return withContext(dispatchers.io) {
+            runCatching {
+                tangemTechApi.getCoins(
+                    networkIds = supportedBlockchains.toSet().map(Blockchain::toNetworkId).joinToString(","),
+                    active = true,
+                    searchText = searchInput,
+                    offset = offset,
+                    limit = LOAD_PER_PAGE,
+                )
+            }
+                .onSuccess { return@withContext Result.Success(it) }
+                .onFailure { return@withContext Result.Failure(it) }
+
+            error("Unreachable code because runCatching must return result")
+        }
     }
 
     fun getTestnetCoins(): List<Currency> {
@@ -88,7 +95,6 @@ class LoadAvailableCoinsService(
     }
 }
 
-
 data class LoadedCoins(
     val currencies: List<Currency>,
     val moreAvailable: Boolean,
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..b9338e42a3 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
@@ -4,23 +4,23 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Types
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.DerivationStyle
-import com.tangem.common.services.Result
-import com.tangem.domain.common.extensions.getTokens
+import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.common.MoshiConverter
 import com.tangem.tap.common.FileReader
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.domain.tokens.models.TokenDao
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.withContext
 
 @Deprecated("Use this only for migration")
 class OldUserTokensRepository(
     private val fileReader: FileReader,
-    private val tangemNetworkService: TangemTechService,
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
 ) {
-    private val moshi = MoshiConverter.defaultMoshi()
+    private val moshi = MoshiConverter.networkMoshi
     private val blockchainsAdapter: JsonAdapter<List<Blockchain>> = moshi.adapter(
         Types.newParameterizedType(List::class.java, Blockchain::class.java),
     )
@@ -83,7 +83,8 @@ class OldUserTokensRepository(
     }
 
     private suspend fun loadSavedCurrenciesOldWay(
-        cardId: String, isHdWalletSupported: Boolean = false,
+        cardId: String,
+        isHdWalletSupported: Boolean = false,
     ): List<BlockchainNetwork> {
         val blockchains = loadSavedBlockchains(cardId)
         val tokens = loadSavedTokens(cardId)
@@ -104,20 +105,27 @@ class OldUserTokensRepository(
         return blockchainNetworks
     }
 
-    private suspend fun getTokensIds(tokens: List<TokenDao>): Map<String, String> = coroutineScope {
+    private suspend fun getTokensIds(tokens: List<TokenDao>): Map<String, String> = withContext(dispatchers.io) {
         tokens.map {
             async {
-                tangemNetworkService.getTokens(
+                tangemTechApi.getCoins(
                     contractAddress = it.contractAddress,
-                    networkId = it.blockchainDao.toBlockchain().toNetworkId(),
+                    networkIds = it.blockchainDao.toBlockchain().toNetworkId(),
                     active = true,
                 )
             }
-        }.map { it.await() }
-            .map { (it as? Result.Success)?.data?.coins?.firstOrNull()?.id }
+        }
+            .map {
+                runCatching { it.await() }
+                    .onSuccess { return@map it.coins.firstOrNull()?.id }
+                    .onFailure { return@map null }
+
+                error("Unreachable code because runCatching must return result")
+            }
             .mapIndexedNotNull { index, id ->
                 if (id == null) null else tokens[index].contractAddress to id
-            }.toMap()
+            }
+            .toMap()
     }
 
     companion object {
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
deleted file mode 100644
index c0b7e18155..0000000000
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensNetworkService.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-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.tap.domain.NoDataError
-
-class UserTokensNetworkService(private val tangemTechService: TangemTechService) {
-    suspend fun getUserTokens(userId: String): Result<UserTokensResponse> {
-        return when (val result = tangemTechService.getUserTokens(userId)) {
-            is Result.Success -> result
-            is Result.Failure -> {
-                val error = result.error
-                if (error is TangemSdkError.NetworkError && error.customMessage.contains("404")) {
-                    return Result.Failure(NoDataError(error.customMessage))
-                } else {
-                    return result
-                }
-            }
-        }
-    }
-
-    suspend fun saveUserTokens(userId: String, tokens: UserTokensResponse): Result<Unit> {
-        return tangemTechService.putUserTokens(userId, tokens)
-    }
-}
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..7d01846702 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,104 +2,103 @@ 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.common.core.TangemSdkError
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.models.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.converters.CurrencyConverter
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.toBlockchainNetworks
 import com.tangem.tap.features.wallet.models.toCurrencies
 import com.tangem.tap.network.NetworkConnectivity
-import com.tangem.tap.store
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
+import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
 
 class UserTokensRepository(
     private val storageService: UserTokensStorageService,
-    private val networkService: UserTokensNetworkService,
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
 ) {
-    suspend fun getUserTokens(card: Card): List<Currency> {
-        val userId = card.getUserWalletId()
+
+    // TODO("After adding DI") replace with CoroutineDispatcherProvider
+    suspend fun getUserTokens(card: CardDTO): List<Currency> = withContext(dispatchers.io) {
+        val userId = getUserWalletId(card) ?: return@withContext emptyList()
         if (DemoHelper.isDemoCardId(card.cardId)) {
-            return loadTokensOffline(card, userId).ifEmpty { loadDemoCurrencies() }
+            return@withContext loadTokensOffline(card, userId).ifEmpty(::loadDemoCurrencies)
         }
 
         if (!NetworkConnectivity.getInstance().isOnlineOrConnecting()) {
-            return loadTokensOffline(card, userId)
+            return@withContext loadTokensOffline(card, userId)
         }
 
-        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())
-                tokens.distinct()
+        runCatching { tangemTechApi.getUserTokens(userId) }
+            .onSuccess { response ->
+                return@withContext response.tokens
+                    .mapNotNull(Currency.Companion::fromTokenResponse).also {
+                        storageService.saveUserTokens(userId, it.toUserTokensResponse())
+                    }
+                    .distinct()
             }
-            is Result.Failure -> {
-                handleGetUserTokensFailure(card = card, userId = userId, error = networkResult.error)
+            .onFailure {
+                return@withContext handleGetUserTokensFailure(card = card, userId = userId, error = it)
             }
-        }
+
+        error("Unreachable code because runCatching must return result")
     }
 
-    suspend fun saveUserTokens(card: Card, tokens: List<Currency>) {
+    // TODO("After adding DI") replace with CoroutineDispatcherProvider
+    suspend fun saveUserTokens(card: CardDTO, tokens: List<Currency>) = withContext(dispatchers.io) {
+        val userId = getUserWalletId(card) ?: return@withContext
         val userTokens = tokens.toUserTokensResponse()
-        networkService.saveUserTokens(card.getUserWalletId(), userTokens)
-        storageService.saveUserTokens(card.getUserWalletId(), userTokens)
+        tangemTechApi.saveUserTokens(userId, userTokens)
+        storageService.saveUserTokens(userId, userTokens)
     }
 
-    suspend fun removeUserTokens(card: Card) {
-        val userTokens = emptyList<Currency>().toUserTokensResponse()
-        networkService.saveUserTokens(card.getUserWalletId(), userTokens)
-        storageService.saveUserTokens(card.getUserWalletId(), userTokens)
-    }
-
-    private fun List<Currency>.toUserTokensResponse(): UserTokensResponse {
-        val tokensResponse = this.map { it.toTokenResponse() }
-        return UserTokensResponse(
-            tokens = tokensResponse,
-            group = GROUP_DEFAULT_VALUE,
-            sort = SORT_DEFAULT_VALUE,
-        )
-    }
-
-    suspend fun loadBlockchainsToDerive(card: Card): List<BlockchainNetwork> {
-        val userId = card.getUserWalletId()
-        val blockchainNetworks = loadTokensOffline(card, userId).toBlockchainNetworks()
+    suspend fun loadBlockchainsToDerive(card: CardDTO): List<BlockchainNetwork> = withContext(dispatchers.io) {
+        val userId = getUserWalletId(card) ?: return@withContext emptyList()
+        val blockchainNetworks = loadTokensOffline(card = card, userId = userId).toBlockchainNetworks()
 
         if (DemoHelper.isDemoCardId(card.cardId)) {
-            return blockchainNetworks
-                .ifEmpty { loadDemoCurrencies().toBlockchainNetworks() }
+            return@withContext blockchainNetworks.ifEmpty(loadDemoCurrencies()::toBlockchainNetworks)
         }
 
-        return blockchainNetworks
+        return@withContext blockchainNetworks
+    }
+
+    private suspend fun loadTokensOffline(card: CardDTO, userId: String): List<Currency> {
+        return storageService.getUserTokens(userId) ?: storageService.getUserTokens(card)
     }
 
     private fun loadDemoCurrencies(): List<Currency> {
-        return DemoHelper.config.demoBlockchains.map {
-            BlockchainNetwork(
-                blockchain = it,
-                derivationPath = it.derivationPath(DerivationStyle.LEGACY)?.rawPath,
-                tokens = emptyList(),
-            )
-        }.flatMap { it.toCurrencies() }
+        return DemoHelper.config.demoBlockchains
+            .map { blockchain ->
+                BlockchainNetwork(
+                    blockchain = blockchain,
+                    derivationPath = blockchain.derivationPath(DerivationStyle.LEGACY)?.rawPath,
+                    tokens = emptyList(),
+                )
+            }
+            .flatMap(BlockchainNetwork::toCurrencies)
     }
 
-    private suspend fun handleGetUserTokensFailure(
-        card: Card,
-        userId: String,
-        error: Throwable,
-    ): List<Currency> {
-        return when (error) {
-            is NoDataError -> {
-                val tokens = storageService.getUserTokens(card)
-                val userTokens = tokens.toUserTokensResponse()
-                coroutineScope { launch { networkService.saveUserTokens(userId = userId, tokens = userTokens) } }
-                tokens
-            }
+    private fun List<Currency>.toUserTokensResponse() = UserTokensResponse(
+        tokens = CurrencyConverter.convertList(this),
+        group = GROUP_DEFAULT_VALUE,
+        sort = SORT_DEFAULT_VALUE,
+    )
+
+    private suspend fun handleGetUserTokensFailure(card: CardDTO, userId: String, error: Throwable): List<Currency> {
+        return when {
+            error is TangemSdkError.NetworkError && error.customMessage.contains(NOT_FOUND_HTTP_CODE) ->
+                storageService.getUserTokens(card).also {
+                    tangemTechApi.saveUserTokens(userId = userId, userTokens = it.toUserTokensResponse())
+                }
             else -> {
                 val tokens = storageService.getUserTokens(userId) ?: storageService.getUserTokens(card)
                 tokens.distinct()
@@ -107,21 +106,36 @@ class UserTokensRepository(
         }
     }
 
-    private suspend fun loadTokensOffline(card: Card, 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"
+        private const val GROUP_DEFAULT_VALUE = "none"
+        private const val SORT_DEFAULT_VALUE = "manual"
+        private const val NOT_FOUND_HTTP_CODE = "404"
+
+        // TODO("After adding DI") get dependencies by DI
         fun init(context: Context, tangemTechService: TangemTechService): UserTokensRepository {
             val fileReader = AndroidFileReader(context)
+            val dispatchers = AppCoroutineDispatcherProvider()
+
             val oldUserTokensRepository = OldUserTokensRepository(
-                fileReader, store.state.domainNetworks.tangemTechService,
+                fileReader = fileReader,
+                tangemTechApi = tangemTechService.api,
+                dispatchers = dispatchers,
+            )
+            val storageService = UserTokensStorageService(
+                oldUserTokensRepository = oldUserTokensRepository,
+                fileReader = fileReader,
+            )
+
+            return UserTokensRepository(
+                storageService = storageService,
+                tangemTechApi = tangemTechService.api,
+                dispatchers = dispatchers,
             )
-            val storageService = UserTokensStorageService(oldUserTokensRepository, fileReader)
-            val networkService = UserTokensNetworkService(tangemTechService)
-            return UserTokensRepository(storageService, networkService)
         }
     }
 }
\ No newline at end of file
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..9df51fb6f4 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.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+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
@@ -13,9 +13,8 @@ class UserTokensStorageService(
     private val oldUserTokensRepository: OldUserTokensRepository,
     private val fileReader: FileReader,
 ) {
-    private val moshi = MoshiConverter.defaultMoshi()
     private val userTokensAdapter: JsonAdapter<UserTokensResponse> =
-        moshi.adapter(UserTokensResponse::class.java)
+        MoshiConverter.networkMoshi.adapter(UserTokensResponse::class.java)
 
     fun getUserTokens(userId: String): List<Currency>? {
         return try {
@@ -28,7 +27,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/converters/CurrencyConverter.kt b/app/src/main/java/com/tangem/tap/domain/tokens/converters/CurrencyConverter.kt
new file mode 100644
index 0000000000..3ac6babc72
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/converters/CurrencyConverter.kt
@@ -0,0 +1,20 @@
+package com.tangem.tap.domain.tokens.converters
+
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.utils.converter.Converter
+
+/** Converter from domain model [Currency] to data model [UserTokensResponse.Token] */
+object CurrencyConverter : Converter<Currency, UserTokensResponse.Token> {
+
+    override fun convert(value: Currency) = UserTokensResponse.Token(
+        id = value.coinId,
+        networkId = value.blockchain.toNetworkId(),
+        derivationPath = value.derivationPath,
+        name = value.currencyName,
+        symbol = value.currencySymbol,
+        decimals = value.decimals,
+        contractAddress = if (value is Currency.Token) value.token.contractAddress else null
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainDao.kt b/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainDao.kt
index 73eef228ad..4417004531 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainDao.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainDao.kt
@@ -10,14 +10,13 @@ data class BlockchainDao(
     @Json(name = "key")
     val name: String,
     @Json(name = "testnet")
-    val isTestNet: Boolean
+    val isTestNet: Boolean,
 ) {
     @Deprecated("The method is used only for migration from older versions of the app")
     fun toBlockchain(): Blockchain {
         val blockchain = Blockchain.values().find { it.name.lowercase() == name.lowercase() }
-            ?: throw Exception("Invalid BlockchainDao")
-        return if (!isTestNet) blockchain else blockchain.getTestnetVersion()
-            ?: throw Exception("Invalid BlockchainDao")
+            ?: error("Blockchain is null")
+        return if (!isTestNet) blockchain else blockchain.getTestnetVersion() ?: error("Invalid BlockchainDao")
     }
 
     companion object {
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..8abb99b14d 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,27 +4,30 @@ 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)
 data class BlockchainNetwork(
     val blockchain: Blockchain,
     val derivationPath: String?,
-    val tokens: List<Token>
+    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()
+        derivationPath = if (card.settings.isHDWalletAllowed) {
+            blockchain.derivationPath(card.derivationStyle)?.rawPath
+        } else {
+            null
+        },
+        tokens = emptyList(),
     )
 
-
     fun updateTokens(tokens: List<Token>): BlockchainNetwork {
         return copy(
-            tokens = (this.tokens + tokens).distinct()
+            tokens = (this.tokens + tokens).distinct(),
         )
     }
 
@@ -41,7 +44,8 @@ data class BlockchainNetwork(
     }
 
     override fun hashCode(): Int = calculateHashCode(
-        blockchain.hashCode(), derivationPath?.hashCode() ?: 0
+        blockchain.hashCode(),
+        derivationPath?.hashCode() ?: 0,
     )
 
     companion object {
@@ -49,7 +53,7 @@ data class BlockchainNetwork(
             return BlockchainNetwork(
                 walletManager.wallet.blockchain,
                 walletManager.wallet.publicKey.derivationPath?.rawPath,
-                walletManager.cardTokens.toList()
+                walletManager.cardTokens.toList(),
             )
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/models/TokenDao.kt b/app/src/main/java/com/tangem/tap/domain/tokens/models/TokenDao.kt
index a8a717b1ce..ef6f541f6e 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/models/TokenDao.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/models/TokenDao.kt
@@ -26,5 +26,4 @@ data class TokenDao(
             customIconUrl?.let { this.setCustomIconUrl(it) }
         }
     }
-
 }
\ No newline at end of file
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..a011491b0e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/totalBalance/TotalFiatBalanceCalculator.kt
@@ -0,0 +1,24 @@
+package com.tangem.tap.domain.totalBalance
+
+import com.tangem.tap.domain.model.TotalFiatBalance
+import com.tangem.tap.domain.model.WalletStoreModel
+
+interface TotalFiatBalanceCalculator {
+
+    /**
+     * Calculate total fiat balance for list of [WalletStoreModel]
+     * @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(walletStores: List<WalletStoreModel>, initial: TotalFiatBalance): TotalFiatBalance
+
+    /**
+     * Same as [TotalFiatBalanceCalculator.calculate] but returns null if list of [WalletStoreModel] is empty
+     * @param walletStores List of [WalletStoreModel] to calculate fiat amount
+     * @return [TotalFiatBalance] with state found with the [WalletStoreModel] list
+     * */
+    suspend fun calculateOrNull(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..b0224afdac
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/totalBalance/implementation/DefaultTotalFiatBalanceCalculator.kt
@@ -0,0 +1,95 @@
+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(walletStores: List<WalletStoreModel>, initial: TotalFiatBalance): TotalFiatBalance {
+        return calculateOrNull(walletStores) ?: initial
+    }
+
+    override suspend fun calculateOrNull(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 -> if (walletData.fiatRate == null) {
+                    TotalFiatBalanceStatus.Error
+                } else {
+                    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..b173602e3d 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
@@ -10,9 +10,12 @@ import com.tangem.operations.PreflightReadTask
 import com.tangem.tap.domain.tasks.product.ScanProductTask
 
 class FinalizeTwinTask(
-    private val twinPublicKey: ByteArray, private val issuerKeys: KeyPair,
+    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..6b250dcef9 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)
+            return MoshiConverter.sdkMoshi.adapter(
+                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/TwinCardsWidget.kt b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsWidget.kt
index 36d3b037ff..95d1d76fdd 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsWidget.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsWidget.kt
@@ -11,14 +11,13 @@ import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapView
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapViewState
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
 
-
 /**
 [REDACTED_AUTHOR]
  */
 class TwinsCardWidget(
     val leapfrogWidget: LeapfrogWidget,
     private val deviceScaleFactor: Float = 1f,
-    val getTopOfAnchorViewForActivateState: () -> Float
+    val getTopOfAnchorViewForActivateState: () -> Float,
 ) {
 
     var state: TwinCardsWidgetState? = null
@@ -37,7 +36,7 @@ class TwinsCardWidget(
         val animator = createAnimator(animate)
         animator.playTogether(
             createAnimator(TwinCardNumber.First, createWelcomeProperties(TwinCardNumber.First)),
-            createAnimator(TwinCardNumber.Second, createWelcomeProperties(TwinCardNumber.Second))
+            createAnimator(TwinCardNumber.Second, createWelcomeProperties(TwinCardNumber.Second)),
         )
         animator.doOnEnd { onEnd() }
         leapfrogWidget.fold(animate) { animator.start() }
@@ -50,7 +49,7 @@ class TwinsCardWidget(
         val animator = createAnimator(animate)
         animator.playTogether(
             createAnimator(TwinCardNumber.First, createLeapfrogProperties(TwinCardNumber.First)),
-            createAnimator(TwinCardNumber.Second, createLeapfrogProperties(TwinCardNumber.Second))
+            createAnimator(TwinCardNumber.Second, createLeapfrogProperties(TwinCardNumber.Second)),
         )
         animator.doOnEnd {
             leapfrogWidget.initViews()
@@ -66,7 +65,7 @@ class TwinsCardWidget(
         val animator = createAnimator(animate)
         animator.playTogether(
             createAnimator(TwinCardNumber.First, createActivateProperties(TwinCardNumber.First)),
-            createAnimator(TwinCardNumber.Second, createActivateProperties(TwinCardNumber.Second))
+            createAnimator(TwinCardNumber.Second, createActivateProperties(TwinCardNumber.Second)),
         )
         animator.doOnEnd { onEnd() }
         animator.start()
@@ -85,6 +84,7 @@ class TwinsCardWidget(
         return animator
     }
 
+    @Suppress("MagicNumber")
     private fun createWelcomeProperties(cardNumber: TwinCardNumber): TwinsCardProperties {
         return when (cardNumber) {
             TwinCardNumber.First -> {
@@ -118,6 +118,7 @@ class TwinsCardWidget(
         )
     }
 
+    @Suppress("MagicNumber")
     private fun createActivateProperties(cardNumber: TwinCardNumber): TwinsCardProperties {
         val topOfAnchorView = getTopOfAnchorViewForActivateState()
         val twinProperties = TwinsCardProperties.from(getLeapViewByCardNumber(cardNumber).state)
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..2a415c6eda 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,10 +13,10 @@ 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,
+    private val twinPublicKey: ByteArray,
+    private val issuerKeys: KeyPair,
 ) : CardSessionRunnable<SuccessResponse> {
 
     override fun run(
@@ -25,7 +25,7 @@ class WriteProtectedIssuerDataTask(
     ) {
         SignHashCommand(
             twinPublicKey.calculateSha256(),
-            session.environment.card!!.getSingleWallet()!!.publicKey
+            session.environment.card!!.wallets.first().publicKey,
         )
             .run(session) { signResult ->
                 when (signResult) {
@@ -34,12 +34,19 @@ class WriteProtectedIssuerDataTask(
                             when (readResult) {
                                 is CompletionResult.Success -> {
                                     writeIssuerData(
-                                        twinPublicKey, issuerKeys, signResult.data.signature,
-                                        readResult.data, session, callback
+                                        twinPublicKey,
+                                        issuerKeys,
+                                        signResult.data.signature,
+                                        readResult.data,
+                                        session,
+                                        callback,
                                     )
                                 }
-                                is CompletionResult.Failure -> callback(CompletionResult.Failure(
-                                    readResult.error))
+                                is CompletionResult.Failure -> callback(
+                                    CompletionResult.Failure(
+                                        readResult.error,
+                                    ),
+                                )
                             }
                         }
                     }
@@ -48,8 +55,11 @@ class WriteProtectedIssuerDataTask(
             }
     }
 
+    @Suppress("LongParameterList")
     private fun writeIssuerData(
-        twinPublicKey: ByteArray, issuerKeys: KeyPair, cardSignature: ByteArray,
+        twinPublicKey: ByteArray,
+        issuerKeys: KeyPair,
+        cardSignature: ByteArray,
         readResponse: ReadIssuerDataResponse,
         session: CardSession,
         callback: (
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..91d3b8dd91
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/UserWalletsListManager.kt
@@ -0,0 +1,113 @@
+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 {
+    /**
+     * [Flow] with all saved [UserWallet]s updates
+     * */
+    val userWallets: Flow<List<UserWallet>>
+
+    /**
+     * [Flow] with selected [UserWallet] updates
+     * */
+    val selectedUserWallet: Flow<UserWallet>
+
+    /**
+     * Selected [UserWallet]
+     * */
+    val selectedUserWalletSync: UserWallet?
+
+    /**
+     * Indicates that all [UserWallet]s is unlocked
+     *
+     * @see [isLockedSync]
+     * @see [UserWallet.isLocked]
+     * */
+    val isLocked: Flow<Boolean>
+
+    /**
+     * Indicates that all [UserWallet]s is unlocked
+     *
+     * Sync version
+     *
+     * @see [isLocked]
+     * @see [UserWallet.isLocked]
+     * */
+    val isLockedSync: Boolean
+
+    val hasSavedUserWallets: Boolean
+
+    /**
+     * Receive saved [UserWallet]s, populate [userWallets] flow with it and set [isLocked] as false.
+     * Require biometric user authorization
+     *
+     * @return [CompletionResult] of operation, with selected [UserWallet]
+     * or null if there is no selected [UserWallet]
+     * */
+    suspend fun unlockWithBiometry(): CompletionResult<UserWallet?>
+
+    /**
+     * Remove [UserWallet]s from [userWallets] and set [isLocked] as true
+     * */
+    fun lock()
+
+    /**
+     * Set [UserWallet] with provided [UserWalletId] as selected
+     *
+     * @param userWalletId [UserWalletId] of [UserWallet] which must be selected
+     *
+     * @return [CompletionResult] of operation with selected [UserWallet]
+     * */
+    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>
+
+    /**
+     * Delete saved [UserWallet]s with provided [UserWalletId]s
+     *
+     * @param userWalletIds [UserWalletId]s of [UserWallet]s which must be deleted
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun delete(userWalletIds: List<UserWalletId>): CompletionResult<Unit>
+
+    /**
+     * Clear all saved [UserWallet]s and set [isLocked] as true
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun clear(): CompletionResult<Unit>
+
+    /**
+     * Get [UserWallet] with provided [UserWalletId]
+     * May terminate with [NoSuchElementException] if [UserWallet] is not found
+     *
+     * @return [CompletionResult] of operation with found [UserWallet]
+     * */
+    suspend fun get(userWalletId: UserWalletId): CompletionResult<UserWallet>
+
+    // For provider
+    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..748665ccea
--- /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 { State() }
+    }
+
+    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)
+                lock()
+            }
+    }
+
+    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(
+                                prevSelectedWalletId = prevState.selectedUserWalletId,
+                                userWallets = 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..5f72d40ab7
--- /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..8d1fdddb9f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsSensitiveInformationRepository.kt
@@ -0,0 +1,191 @@
+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.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..2738438ac1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/WalletCurrenciesManager.kt
@@ -0,0 +1,74 @@
+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 {
+    /**
+     * Update [UserWallet] currencies with same blockchain as provided [Currency] blockchain
+     * [UserWallet] currencies updates can be observed
+     * with [com.tangem.tap.domain.walletStores.WalletStoresManager.getAll]
+     * or [com.tangem.tap.domain.walletStores.WalletStoresManager.get]
+     *
+     * @param userWallet [UserWallet] which currencies will be updated
+     * @param currency [Currency] to find other currencies to update
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun update(
+        userWallet: UserWallet,
+        currency: Currency,
+    ): CompletionResult<Unit>
+
+    /**
+     * Add list of [Currency] to [UserWallet].
+     * [UserWallet] currencies updates can be observed
+     * with [com.tangem.tap.domain.walletStores.WalletStoresManager.getAll]
+     * or [com.tangem.tap.domain.walletStores.WalletStoresManager.get]
+     *
+     * @param userWallet [UserWallet] to add currencies
+     * @param currenciesToAdd list of [Currency] to add [UserWallet]
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun addCurrencies(
+        userWallet: UserWallet,
+        currenciesToAdd: List<Currency>,
+    ): CompletionResult<Unit>
+
+    /**
+     * Remove [Currency] from [UserWallet]
+     * [UserWallet] currencies updates can be observed
+     * with [com.tangem.tap.domain.walletStores.WalletStoresManager.getAll]
+     * or [com.tangem.tap.domain.walletStores.WalletStoresManager.get]
+     *
+     * @param userWallet [UserWallet] which currency will be removed
+     * @param currencyToRemove [Currency] to remove from [UserWallet]
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun removeCurrency(
+        userWallet: UserWallet,
+        currencyToRemove: Currency,
+    ): CompletionResult<Unit>
+
+    /**
+     * Remove list of [Currency] from [UserWallet]
+     * [UserWallet] currencies updates can be observed
+     * with [com.tangem.tap.domain.walletStores.WalletStoresManager.getAll]
+     * or [com.tangem.tap.domain.walletStores.WalletStoresManager.get]
+     *
+     * @param userWallet [UserWallet] which currency will be removed
+     * @param currenciesToRemove list of [Currency] to remove from [UserWallet]
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun removeCurrencies(
+        userWallet: UserWallet,
+        currenciesToRemove: List<Currency>,
+    ): CompletionResult<Unit>
+
+    // For provider
+    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..25e54b765d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/implementation/DefaultWalletCurrenciesManager.kt
@@ -0,0 +1,196 @@
+package com.tangem.tap.domain.walletCurrencies.implementation
+
+import com.tangem.blockchain.common.Blockchain
+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 newCurrencies = (getSavedCurrencies(userWallet.walletId) + currenciesToAdd)
+            .addMissingBlockchains(card)
+
+        updateWalletStores(userWallet, newCurrencies.toBlockchainNetworks())
+            .map {
+                saveUserCurrencies(card, newCurrencies)
+            }
+            .flatMap {
+                updateWalletStoresAmounts(
+                    userWallet = userWallet,
+                    updatedBlockchains = currenciesToAdd.map { it.blockchain }.distinct(),
+                )
+            }
+    }
+
+    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>()
+
+        this
+            .groupBy { it.blockchain }
+            .forEach { (blockchain, currencies) ->
+                val rawDerivationPath: String?
+                val blockchainCurrency = currencies
+                    .firstOrNull { it is Currency.Blockchain }
+                    as? Currency.Blockchain
+
+                // Add blockchain currency
+                if (blockchainCurrency != null) {
+                    rawDerivationPath = findDerivationPath(blockchainCurrency, card.derivationStyle)
+                    newCurrencies.add(blockchainCurrency.copy(derivationPath = rawDerivationPath))
+                } else {
+                    rawDerivationPath = findDerivationPath(currencies.first(), card.derivationStyle)
+                    newCurrencies.add(
+                        Currency.Blockchain(
+                            blockchain = blockchain,
+                            derivationPath = rawDerivationPath,
+                        ),
+                    )
+                }
+
+                // Add tokens currencies
+                currencies
+                    .filterIsInstance<Currency.Token>()
+                    .forEach { currency ->
+                        newCurrencies.add(currency.copy(derivationPath = rawDerivationPath))
+                    }
+            }
+
+        return newCurrencies
+    }
+
+    private fun findDerivationPath(currency: Currency, cardDerivationStyle: DerivationStyle?): String? {
+        return currency.derivationPath ?: currency.blockchain.derivationPath(cardDerivationStyle)?.rawPath
+    }
+
+    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 suspend fun updateWalletStoresAmounts(
+        userWallet: UserWallet,
+        updatedBlockchains: List<Blockchain>,
+    ): CompletionResult<Unit> {
+        val updatedWalletStores = walletStoresRepository.get(userWallet.walletId)
+            .firstOrNull()
+            ?.filter { it.blockchain in updatedBlockchains }
+            ?: return CompletionResult.Success(Unit)
+
+        return walletAmountsRepository.updateAmountsForWalletStores(
+            walletStores = updatedWalletStores,
+            userWallet = userWallet,
+            fiatCurrency = appCurrencyProvider(),
+        )
+    }
+}
\ 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..826c158a8b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresError.kt
@@ -0,0 +1,44 @@
+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
+
+    @Suppress("MagicNumber")
+    class FetchFiatRatesError(
+        currencies: List<String>,
+        override val cause: Throwable?,
+    ) : WalletStoresError(60011) {
+        override var customMessage: String = "Failed to fetch fiat rates for currencies $currencies"
+    }
+
+    @Suppress("MagicNumber")
+    class UnknownBlockchain : WalletStoresError(60012) {
+        override var customMessage: String = "Unknown blockchain"
+    }
+
+    @Suppress("MagicNumber")
+    object NoInternetConnection : WalletStoresError(60013) {
+        override var customMessage: String = "No internet connection"
+    }
+
+    @Suppress("MagicNumber")
+    class WalletManagerNotCreated(blockchain: Blockchain) : WalletStoresError(60014) {
+        override var customMessage: String = "Wallet manager can not be created for $blockchain"
+    }
+
+    @Suppress("MagicNumber")
+    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..e4bebc2c07
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresManager.kt
@@ -0,0 +1,84 @@
+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 {
+    /**
+     * Get all [WalletStoreModel]s updates
+     *
+     * @return [Flow] with map of [WalletStoreModel] list assigned by [UserWalletId]
+     * */
+    fun getAll(): Flow<Map<UserWalletId, List<WalletStoreModel>>>
+
+    /**
+     * Get [WalletStoreModel]s updates which associated with provided [UserWalletId]
+     *
+     * @param userWalletId [UserWalletId] of user wallet
+     *
+     * @return [Flow] with [WalletStoreModel] list
+     * */
+    fun get(userWalletId: UserWalletId): Flow<List<WalletStoreModel>>
+    suspend fun getSync(userWalletId: UserWalletId): List<WalletStoreModel>
+
+    /**
+     * Delete [WalletStoreModel]s associated with provided [UserWalletId]s
+     *
+     * @param userWalletsIds [UserWalletId] list
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit>
+
+    /**
+     * Clear all [WalletStoreModel]s
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun clear(): CompletionResult<Unit>
+
+    /**
+     * Fetch wallet stores associated with provided [UserWallet]. Fetched [WalletStoreModel]s updates can be observed
+     * with [get] and [getAll] methods
+     *
+     * @param userWallet [UserWallet] to fetch [WalletStoreModel]s
+
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun fetch(
+        userWallet: UserWallet,
+        refresh: Boolean = false,
+    ): CompletionResult<Unit>
+
+    /**
+     * Fetch wallet stores associated with provided [UserWallet]s. Fetched [WalletStoreModel]s updates can be observed
+     * with [get] and [getAll] methods
+     *
+     * @param userWallets [UserWallet]s list to fetch [WalletStoreModel]s
+
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun fetch(
+        userWallets: List<UserWallet>,
+        refresh: Boolean = false,
+    ): CompletionResult<Unit>
+
+    /**
+     * Update [WalletStoreModel]s amounts associated with provided [UserWallet]s
+     *
+     * @param userWallets [UserWallet]s list to update [WalletStoreModel]s amounts
+     *
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun updateAmounts(
+        userWallets: List<UserWallet>,
+    ): CompletionResult<Unit>
+
+    // For provider
+    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..22e86d2fa1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt
@@ -0,0 +1,188 @@
+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 getSync(userWalletId: UserWalletId): List<WalletStoreModel> {
+        return walletStoresRepository.getSync(userWalletId)
+    }
+
+    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..7657f2d47b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DummyWalletStoresManager.kt
@@ -0,0 +1,43 @@
+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 getSync(userWalletId: UserWalletId): List<WalletStoreModel> {
+        return emptyList()
+    }
+
+    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..d89d4ea6aa
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/di/RepositoryProvider.kt
@@ -0,0 +1,31 @@
+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
+import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
+
+fun WalletStoresRepository.Companion.provideDefaultImplementation(): WalletStoresRepository {
+    return DefaultWalletStoresRepository()
+}
+
+fun WalletManagersRepository.Companion.provideDefaultImplementation(
+    walletManagerFactory: WalletManagerFactory,
+): WalletManagersRepository {
+    return DefaultWalletManagersRepository(walletManagerFactory)
+}
+
+fun WalletAmountsRepository.Companion.provideDefaultImplementation(
+    tangemTechService: TangemTechService,
+): WalletAmountsRepository {
+    // TODO("After adding DI") get dependencies by DI
+    return DefaultWalletAmountsRepository(
+        tangemTechApi = tangemTechService.api,
+        dispatchers = AppCoroutineDispatcherProvider(),
+    )
+}
\ 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..a7dc0a853d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletAmountsRepository.kt
@@ -0,0 +1,463 @@
+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.datasource.api.tangemTech.TangemTechApi
+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.updateWithDemoAmounts
+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.demo.DemoHelper
+import com.tangem.tap.features.wallet.models.Currency
+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 com.tangem.utils.coroutines.CoroutineDispatcherProvider
+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
+
+@Suppress("LargeClass")
+internal class DefaultWalletAmountsRepository(
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : 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()
+
+        return withContext(dispatchers.io) {
+            runCatching { tangemTechApi.getRates(fiatCurrency.code.lowercase(), coinsIds.joinToString(",")) }
+                .onSuccess {
+                    updateWalletStoresWithFiatRates(walletStores = walletStoresInternal, fiatRates = it.rates)
+                    return@withContext CompletionResult.Success(Unit)
+                }
+                .onFailure {
+                    val error = WalletStoresError.FetchFiatRatesError(
+                        currencies = currencies.map(Currency::currencySymbol).toList(),
+                        cause = it,
+                    )
+
+                    Timber.e(
+                        error,
+                        """
+                        Unable to fetch fiat rates
+                        |- Coins ids: $coinsIds
+                        """.trimIndent(),
+                    )
+
+                    return@withContext CompletionResult.Failure(error)
+                }
+
+            error("Unreachable code because runCatching must return result")
+        }
+    }
+
+    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,
+                            // FIXME: move DemoHelper to Demo core module maybe
+                            isDemo = DemoHelper.isDemoCardId(scanResponse.card.cardId),
+                        )
+                    }
+                    .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,
+        isDemo: Boolean,
+    ) = withContext(Dispatchers.Default) {
+        Timber.d(
+            """
+                Fetched amounts
+                |- User wallet id: ${walletStore.userWalletId}
+                |- Blockchain: ${walletStore.blockchain}
+            """.trimIndent(),
+        )
+
+        walletStoresStorage.update { prevState ->
+            prevState.replaceWalletStore(
+                walletStoreToUpdate = walletStore,
+                update = {
+                    if (isDemo) {
+                        it.updateWithDemoAmounts(wallet = updatedWallet)
+                    } else {
+                        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..1758c2fbf9
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
@@ -0,0 +1,206 @@
+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.cardTypesResolver.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.cardTypesResolver.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..cb49fe33c1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletDataOperations.kt
@@ -0,0 +1,194 @@
+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.demo.DemoHelper
+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 WalletDataModel.updateWithDemoAmount(wallet: Wallet): WalletDataModel {
+    val amount = DemoHelper.config.getBalance(wallet.blockchain)
+    return this.copy(
+        status = WalletDataModel.VerifiedOnline(amount = amount.value ?: BigDecimal.ZERO),
+    )
+}
+
+internal fun List<WalletDataModel>.updateWithAmounts(wallet: Wallet): List<WalletDataModel> {
+    return this.map { walletData ->
+        walletData.updateWithAmount(wallet)
+    }
+}
+
+internal fun List<WalletDataModel>.updateWithDemoAmounts(wallet: Wallet): List<WalletDataModel> {
+    return this.map { walletData ->
+        walletData.updateWithDemoAmount(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(
+    newWalletsData: List<WalletDataModel>,
+): List<WalletDataModel> {
+    val oldWalletsData = this
+    val updatedWalletsData = arrayListOf<WalletDataModel>()
+
+    newWalletsData.forEach { newWalletData ->
+        val walletDataToUpdate = oldWalletsData.firstOrNull(newWalletData::isSameWalletData)
+        if (walletDataToUpdate != null) {
+            updatedWalletsData.add(walletDataToUpdate.updateWithSelf(newWalletData))
+        } else {
+            updatedWalletsData.add(newWalletData)
+        }
+    }
+
+    return updatedWalletsData
+}
+
+internal fun WalletDataModel.isSameWalletData(other: WalletDataModel): Boolean {
+    return this.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..47ef539e1f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletStoreOperations.kt
@@ -0,0 +1,133 @@
+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.updateWithDemoAmounts(
+    wallet: Wallet,
+): WalletStoreModel {
+    return this.copy(
+        walletsData = walletsData.updateWithDemoAmounts(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,
+    )
+}
+
+private inline fun List<WalletStoreModel>.replaceWalletStores(
+    walletStoresToUpdate: List<WalletStoreModel>,
+    update: (walletStore: WalletStoreModel) -> WalletStoreModel,
+): List<WalletStoreModel> {
+    val mutableStores = ArrayList<WalletStoreModel>(this)
+
+    walletStoresToUpdate.forEach { walletStoreToUpdate ->
+        val index = mutableStores.indexOfFirst(walletStoreToUpdate::isSameWalletStore)
+        // Can be possible if user hides wallet store when it's tokens is loading
+        if (index == -1) return@forEach
+
+        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
+}
+
+internal fun WalletStoreModel.isSameWalletStore(other: WalletStoreModel): Boolean {
+    return this.userWalletId == other.userWalletId &&
+        this.blockchain == other.blockchain &&
+        this.derivationPath == other.derivationPath
+}
\ 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..866711e543
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletManagerStorage.kt
@@ -0,0 +1,37 @@
+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)
+    private val mutex = Mutex()
+
+    init {
+        managers.tryEmit(hashMapOf())
+    }
+
+    fun getAll(): SharedFlow<Map<UserWalletId, List<WalletManager>>> {
+        return managers.asSharedFlow()
+    }
+
+    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..932abce88b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletStoresStorage.kt
@@ -0,0 +1,37 @@
+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)
+    private val mutex = Mutex()
+
+    init {
+        stores.tryEmit(hashMapOf())
+    }
+
+    fun getAll(): SharedFlow<Map<UserWalletId, List<WalletStoreModel>>> {
+        return stores.asSharedFlow()
+    }
+
+    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/BnbHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/BnbHelper.kt
index d35cc7c2e0..5dec1d0850 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/BnbHelper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/BnbHelper.kt
@@ -12,69 +12,65 @@ import com.trustwallet.walletconnect.models.binance.WCBinanceTransferOrder
 import com.trustwallet.walletconnect.models.binance.tradeOrderSerializer
 import timber.log.Timber
 
-class BnbHelper {
-    companion object {
+object BnbHelper {
+    fun createMessageData(order: WCBinanceTransferOrder): BinanceMessageData.Transfer {
+        val input = order.msgs.first().inputs.first()
+        val output = order.msgs.first().inputs.first()
 
-        fun createMessageData(order: WCBinanceTransferOrder): BinanceMessageData.Transfer {
-            val input = order.msgs.first().inputs.first()
-            val output = order.msgs.first().inputs.first()
+        val currency =
+            input.coins.firstOrNull()?.denom ?: Blockchain.Binance
+        val amount = input.coins
+            .mapNotNull { if (it.denom == currency) it.amount else null }
+            .sum()
+            .toBigDecimal()
+            .movePointLeft(Blockchain.Binance.decimals())
+            .stripZeroPlainString()
 
-            val currency =
-                input.coins.firstOrNull()?.denom ?: Blockchain.Binance
-            val amount = input.coins
-                .mapNotNull { if (it.denom == currency) it.amount else null }
-                .sum()
-                .toBigDecimal()
-                .movePointLeft(Blockchain.Binance.decimals())
-                .stripZeroPlainString()
-
-            val gson = GsonBuilder()
-                .registerTypeAdapter(tradeOrderSerializer)
-                .serializeNulls()
-                .create()
-
-            return BinanceMessageData.Transfer(
-                outputAddress = output.address,
-                amount = amount,
-                address = input.address,
-                data = gson.toJson(order).toByteArray().calculateSha256()
-            )
-        }
-
-        fun createMessageData(order: WCBinanceTradeOrder): BinanceMessageData.Trade {
-            val address = order.msgs.first().sender
-
-            val tradeData = order.msgs.map {
-                val price = it.price.toBigDecimal()
-                    .movePointLeft(Blockchain.Binance.decimals())
-                    .stripTrailingZeros()
-                val quantity = it.quantity.toBigDecimal()
-                    .movePointLeft(Blockchain.Binance.decimals())
-                    .stripTrailingZeros()
-
-                val amount = price * quantity
-                val symbol = it.symbol.substringBefore("-")
-
-                TradeData(
-                    price = "$price ${Blockchain.Binance.currency}",
-                    quantity = "$quantity $symbol",
-                    amount = "$amount ${Blockchain.Binance.currency}",
-                    symbol = symbol
-                )
-            }
-            val gson = GsonBuilder()
-                .registerTypeAdapter(tradeOrderSerializer)
-                .serializeNulls()
-                .create()
-            val serialized = gson.toJson(order)
-            Timber.d(serialized)
-
-            return BinanceMessageData.Trade(
-                tradeData = tradeData,
-                address = address,
-                data = serialized.toByteArray().calculateSha256()
-            )
-        }
+        val gson = GsonBuilder()
+            .registerTypeAdapter(tradeOrderSerializer)
+            .serializeNulls()
+            .create()
 
+        return BinanceMessageData.Transfer(
+            outputAddress = output.address,
+            amount = amount,
+            address = input.address,
+            data = gson.toJson(order).toByteArray().calculateSha256(),
+        )
     }
-}
+
+    fun createMessageData(order: WCBinanceTradeOrder): BinanceMessageData.Trade {
+        val address = order.msgs.first().sender
+
+        val tradeData = order.msgs.map {
+            val price = it.price.toBigDecimal()
+                .movePointLeft(Blockchain.Binance.decimals())
+                .stripTrailingZeros()
+            val quantity = it.quantity.toBigDecimal()
+                .movePointLeft(Blockchain.Binance.decimals())
+                .stripTrailingZeros()
+
+            val amount = price * quantity
+            val symbol = it.symbol.substringBefore("-")
+
+            TradeData(
+                price = "$price ${Blockchain.Binance.currency}",
+                quantity = "$quantity $symbol",
+                amount = "$amount ${Blockchain.Binance.currency}",
+                symbol = symbol,
+            )
+        }
+        val gson = GsonBuilder()
+            .registerTypeAdapter(tradeOrderSerializer)
+            .serializeNulls()
+            .create()
+        val serialized = gson.toJson(order)
+        Timber.d(serialized)
+
+        return BinanceMessageData.Trade(
+            tradeData = tradeData,
+            address = address,
+            data = serialized.toByteArray().calculateSha256(),
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/EthSignHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/EthSignHelper.kt
index b366229775..a302d44747 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/EthSignHelper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/EthSignHelper.kt
@@ -9,50 +9,28 @@ import com.google.gson.JsonParser
 import com.google.gson.annotations.SerializedName
 import com.tangem.blockchain.common.Blockchain
 import com.trustwallet.walletconnect.JSONRPC_VERSION
-import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage
 
-class EthSignHelper {
-    companion object {
-        private val gson: Gson by lazy {
-            GsonBuilder()
-                .setPrettyPrinting()
-                .serializeNulls()
-                .create()
-        }
+object EthSignHelper {
+    private val gson: Gson by lazy {
+        GsonBuilder()
+            .setPrettyPrinting()
+            .serializeNulls()
+            .create()
+    }
 
-        fun parseCustomRequest(data: String): CustomJsonRpcRequest {
-            return gson.fromJson<CustomJsonRpcRequest>(data)
-        }
-
-        fun tryToParseEthTypedMessage(request: CustomJsonRpcRequest): WCEthereumSignMessage? {
-            return if (request.method == WCMethodExtended.ETH_SIGN_TYPE_DATA_V4) {
-                WCEthereumSignMessage(
-                    listOf(
-                        request.params[0].asString,
-                        request.params[1].asString,
-                    ),
-                    WCEthereumSignMessage.WCSignType.TYPED_MESSAGE
-                )
-            } else {
-                null
-            }
-        }
-
-        fun tryToParseEthTypedMessageString(message: String): String? {
-            return try {
-                val messageString = message
-                    .replace("\\", "")
-                    .removePrefix("\"")
-                    .removeSuffix("\"")
-                val messageJson = JsonParser().parse(messageString)
-                val filteredMap = gson.fromJson<Map<*,*>>(messageJson)
-                    .filterKeys { it == "domain" || it == "message"}
-
-                gson.toJson(filteredMap)
-            } catch (exception: Exception) {
-                null
-            }
+    fun tryToParseEthTypedMessageString(message: String): String? {
+        return try {
+            val messageString = message
+                .replace("\\", "")
+                .removePrefix("\"")
+                .removeSuffix("\"")
+            val messageJson = JsonParser().parse(messageString)
+            val filteredMap = gson.fromJson<Map<*, *>>(messageJson)
+                .filterKeys { it == "domain" || it == "message" }
 
+            gson.toJson(filteredMap)
+        } catch (exception: Exception) {
+            null
         }
     }
 }
@@ -61,7 +39,7 @@ data class CustomJsonRpcRequest(
     val id: Long,
     val jsonrpc: String = JSONRPC_VERSION,
     val method: WCMethodExtended?,
-    val params: JsonArray
+    val params: JsonArray,
 ) {
 
     fun blockchainFromChainId(): Blockchain? {
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..8759dc91d4 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
@@ -3,9 +3,9 @@ package com.tangem.tap.domain.walletconnect
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.guard
+import com.tangem.core.analytics.Analytics
 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.events.WalletConnect
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
@@ -28,6 +28,7 @@ import com.trustwallet.walletconnect.models.binance.WCBinanceTransferOrder
 import com.trustwallet.walletconnect.models.binance.WCBinanceTxConfirmParam
 import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage
 import com.trustwallet.walletconnect.models.ethereum.WCEthereumTransaction
+import com.trustwallet.walletconnect.models.session.WCAddNetwork
 import com.trustwallet.walletconnect.models.session.WCSession
 import com.trustwallet.walletconnect.models.session.WCSessionUpdate
 import kotlinx.coroutines.delay
@@ -42,6 +43,7 @@ import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.collections.set
 
+@Suppress("LargeClass")
 class WalletConnectManager {
 
     private var cardId: String? = null
@@ -103,7 +105,7 @@ class WalletConnectManager {
 
     fun updateSession(session: WalletConnectSession) {
         val updatedSession = sessions[session.session]?.copy(
-            wallet = session.wallet
+            wallet = session.wallet,
         )
         if (updatedSession != null) {
             sessions[session.session] = updatedSession
@@ -114,18 +116,18 @@ class WalletConnectManager {
         sessions[session.session]?.client?.updateSession(
             accounts = listOfNotNull(session.getAddress()),
             chainId = session.wallet.blockchain?.getChainId(),
-            approved = true
+            approved = true,
         )
 
-
         val updatedSession = sessions[session.session]?.copy(
-            wallet = session.wallet
+            wallet = session.wallet,
         )
         if (updatedSession != null) {
             sessions[session.session] = updatedSession
         }
     }
 
+    @Suppress("MagicNumber")
     private fun setupConnectionTimeoutCheck(session: WCSession) {
         scope.launch {
             delay(20_000)
@@ -172,7 +174,7 @@ class WalletConnectManager {
         val accounts = listOf(blockchain.makeAddresses(key).first().value)
         val approved = activeData.client.approveSession(
             accounts = accounts,
-            chainId = blockchain.getChainId() ?: Blockchain.Ethereum.getChainId()!!
+            chainId = blockchain.getChainId() ?: Blockchain.Ethereum.getChainId()!!,
         )
         if (approved) {
             val walletConnectSession = WalletConnectSession(
@@ -180,23 +182,22 @@ class WalletConnectManager {
                 remotePeerId = activeData.remotePeerId,
                 wallet = activeData.wallet,
                 session = session,
-                peerMeta = activeData.peerMeta!!
+                peerMeta = activeData.peerMeta!!,
             )
             walletConnectRepository.saveSession(walletConnectSession)
             store.dispatchOnMain(
                 WalletConnectAction.ApproveSession.Success(
-                    walletConnectSession
-                )
+                    walletConnectSession,
+                ),
             )
-
         }
     }
 
     fun removeSimilarSessions(activeData: WalletConnectActiveData) {
         val sessionsToRemove = sessions.filter {
-            it.value.wallet.walletPublicKey?.equals(activeData.wallet.walletPublicKey) == true
-                    && it.value.peerMeta?.url == activeData.peerMeta?.url
-                    && it.value.session != activeData.session
+            it.value.wallet.walletPublicKey?.equals(activeData.wallet.walletPublicKey) == true &&
+                it.value.peerMeta?.url == activeData.peerMeta?.url &&
+                it.value.session != activeData.session
         }
         Timber.d("RemoveSimilarSessions: ${sessionsToRemove.values.map { it.client.session }}")
         sessionsToRemove.forEach { disconnect(it.value.session) }
@@ -226,11 +227,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))
@@ -248,14 +245,14 @@ class WalletConnectManager {
                 transaction = transaction,
                 session = session,
                 id = id,
-                type = type
+                type = type,
             ).guard {
                 sessions[session.session] = activeData.copy(transactionData = null)
                 store.dispatchOnMain(
                     WalletConnectAction.RejectRequest(
                         session.session,
-                        id
-                    )
+                        id,
+                    ),
                 )
                 return@launch
             }
@@ -264,9 +261,9 @@ class WalletConnectManager {
             store.dispatchOnMain(
                 GlobalAction.ShowDialog(
                     WalletConnectDialog.RequestTransaction(
-                        data.dialogData
-                    )
-                )
+                        data.dialogData,
+                    ),
+                ),
             )
         }
     }
@@ -291,7 +288,9 @@ class WalletConnectManager {
     }
 
     fun signBnb(
-        id: Long, data: ByteArray, sessionData: WCSession,
+        id: Long,
+        data: ByteArray,
+        sessionData: WCSession,
     ) {
         val activeData = sessions[sessionData] ?: return
         scope.launch {
@@ -316,15 +315,17 @@ class WalletConnectManager {
         val activeData = sessions[session.session] ?: return
         scope.launch {
             val data = WalletConnectSdkHelper().prepareDataForPersonalSign(
-                message = message, session = session, id = id
+                message = message,
+                session = session,
+                id = id,
             )
             sessions[session.session] = activeData.copy(personalSignData = data)
             store.dispatchOnMain(
                 GlobalAction.ShowDialog(
                     WalletConnectDialog.PersonalSign(
-                        data.dialogData
-                    )
-                )
+                        data.dialogData,
+                    ),
+                ),
             )
         }
     }
@@ -350,7 +351,7 @@ class WalletConnectManager {
         }
     }
 
-
+    @Suppress("LongMethod", "ComplexMethod")
     fun setListeners(client: WCClient) {
         client.onSessionRequest = { id: Long, peer: WCPeerMeta ->
             Timber.d("OnSessionRequest: $peer")
@@ -375,11 +376,7 @@ class WalletConnectManager {
                             ),
                         )
                     }
-                    store.state.globalState.analyticsHandler.logWcEvent(
-                        AnalyticsAnOld.WcAnalyticsEvent.Session(
-                            AnalyticsAnOld.WcSessionEvent.Connect, peer.url,
-                        ),
-                    )
+                    Analytics.send(WalletConnect.NewSessionEstablished())
                 }
             }
         }
@@ -390,68 +387,68 @@ 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(
                         transaction = transaction,
                         session = sessionData,
                         id = id,
-                        type = WcTransactionType.EthSendTransaction
-                    )
+                        type = WcTransactionType.EthSendTransaction,
+                    ),
                 )
             }
         }
         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(
                         transaction = transaction,
                         session = sessionData,
                         id = id,
-                        type = WcTransactionType.EthSignTransaction
-                    )
+                        type = WcTransactionType.EthSignTransaction,
+                    ),
                 )
             }
         }
         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(
                         message,
                         sessionData,
-                        id
-                    )
+                        id,
+                    ),
                 )
             }
         }
 
-
         client.onBnbCancel = { id: Long, order: WCBinanceCancelOrder ->
-
         }
         client.onBnbTrade = { id: Long, order: WCBinanceTradeOrder ->
             sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
                 store.dispatchOnMain(
                     WalletConnectAction.BinanceTransaction.Trade(
-                        id = id, order = order, sessionData = sessionData
-                    )
+                        id = id,
+                        order = order,
+                        sessionData = sessionData,
+                    ),
                 )
             }
         }
@@ -459,8 +456,10 @@ class WalletConnectManager {
             sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
                 store.dispatchOnMain(
                     WalletConnectAction.BinanceTransaction.Transfer(
-                        id = id, order = order, sessionData = sessionData
-                    )
+                        id = id,
+                        order = order,
+                        sessionData = sessionData,
+                    ),
                 )
             }
         }
@@ -475,57 +474,36 @@ class WalletConnectManager {
             }
         }
         client.onWalletChangeNetwork = { id: Long, chainId: Int ->
-            Timber.d("On WC Switch Chain")
-            val blockchain = Blockchain.fromChainId(chainId)
-            Timber.d("WC switch chainID\nNew Blockchain: $blockchain")
-            val session = sessions[client.session]?.toWalletConnectSession()
-            if (session != null) {
-                store.dispatchOnMain(WalletConnectAction.SwitchBlockchain(blockchain, session))
+            switchChain(chainId, client)
+        }
+        client.onWalletAddNetwork = { id: Long, network: WCAddNetwork ->
+            // TODO
+            // In fact this method is used to add a EVM network. It provides RPC url and chain ID.
+            // Here now it just tries to switch to a EVM network with a provided chain ID.
+            try {
+                val chainId = Integer.decode(network.chainIdHex)
+                switchChain(chainId, client)
+            } catch (exception: Exception) {
+                Timber.d("WC add network error: chain could not be parsed")
             }
         }
-        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
-                    )
-                )
-            }
+    private fun switchChain(chainId: Int, client: WCClient) {
+        val blockchain = Blockchain.fromChainId(chainId)
+        Timber.d("WC switch chainID\nNew Blockchain: $blockchain")
+        val session = sessions[client.session]?.toWalletConnectSession()
+        if (session != null) {
+            store.dispatchOnMain(WalletConnectAction.SwitchBlockchain(blockchain, session))
         }
     }
 
     companion object {
-        private val tangemPeerMeta =
-            WCPeerMeta(name = "Tangem Wallet", url = "https://tangem.com")
+        const val WC_SCHEME = "wc"
+
+        private val tangemPeerMeta = WCPeerMeta(name = "Tangem Wallet", url = "https://tangem.com")
 
         fun isCorrectWcUri(string: String): Boolean = WCSession.from(string) != null
-
-        const val WC_SCHEME = "wc"
     }
 }
 
@@ -546,11 +524,12 @@ data class WalletConnectActiveData(
             remotePeerId = remotePeerId,
             wallet = wallet,
             session = session,
-            peerMeta = peerMeta
+            peerMeta = peerMeta,
         )
     }
 }
 
+@Suppress("MagicNumber")
 class RetryInterceptor : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val request: Request = chain.request()
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectNetworkUtils.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectNetworkUtils.kt
index 6b2a457e43..19e2e44e42 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectNetworkUtils.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectNetworkUtils.kt
@@ -3,43 +3,39 @@ package com.tangem.tap.domain.walletconnect
 import com.tangem.blockchain.common.Blockchain
 import com.trustwallet.walletconnect.models.WCPeerMeta
 
-class WalletConnectNetworkUtils {
-
-    companion object {
-
-        fun parseBlockchain(
-            chainId: Int?,
-            peer: WCPeerMeta,
-        ): Blockchain? {
-            return when {
-                peer.url.contains("pancakeswap.finance") -> {
-                    Blockchain.BSC
-                }
-                chainId != null -> {
-                    Blockchain.fromChainId(chainId)
-                }
-                peer.url.contains("matic.network") || peer.name == "Polygon" -> {
-                    Blockchain.Polygon
-                }
-                peer.url.contains("binance.org") || peer.name.contains("Binance") -> {
-                    if (peer.icons.firstOrNull()?.contains("testnet") == true) {
-                        Blockchain.BinanceTestnet
-                    } else {
-                        Blockchain.Binance
-                    }
-                }
-                peer.name.contains("BSC") -> {
-                    Blockchain.BSC
-                }
-                peer.url.contains("honeyswap.1hive.eth.limo") -> {
-                    // Check if something's changed after this bug report:
-                    // https://github.com/1Hive/honeyswap-interface/issues/83
-                    Blockchain.Gnosis
-                }
-                else -> {
-                    Blockchain.Ethereum
+object WalletConnectNetworkUtils {
+    fun parseBlockchain(chainId: Int?, peer: WCPeerMeta): Blockchain? {
+        return when {
+            peer.url.contains("pancakeswap.finance") -> {
+                Blockchain.BSC
+            }
+            peer.url.contains("optimism") -> {
+                Blockchain.Optimism
+            }
+            chainId != null -> {
+                Blockchain.fromChainId(chainId)
+            }
+            peer.url.contains("matic.network") || peer.name == "Polygon" -> {
+                Blockchain.Polygon
+            }
+            peer.url.contains("binance.org") || peer.name.contains("Binance") -> {
+                if (peer.icons.firstOrNull()?.contains("testnet") == true) {
+                    Blockchain.BinanceTestnet
+                } else {
+                    Blockchain.Binance
                 }
             }
+            peer.name.contains("BSC") -> {
+                Blockchain.BSC
+            }
+            peer.url.contains("honeyswap.1hive.eth.limo") -> {
+                // Check if something's changed after this bug report:
+                // https://github.com/1Hive/honeyswap-interface/issues/83
+                Blockchain.Gnosis
+            }
+            else -> {
+                Blockchain.Ethereum
+            }
         }
     }
 }
\ No newline at end of file
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..12df7aeb8e 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
@@ -16,9 +16,8 @@ import timber.log.Timber
 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)
+    private val walletConnectAdapter: JsonAdapter<List<SessionDao>> = MoshiConverter.sdkMoshi.adapter(
+        Types.newParameterizedType(List::class.java, SessionDao::class.java),
     )
 
     fun saveSession(session: WalletConnectSession) {
@@ -76,7 +75,6 @@ class WalletConnectRepository(val context: Application) {
     }
 }
 
-
 @JsonClass(generateAdapter = true)
 data class SessionDao(
     val peerId: String,
@@ -91,7 +89,7 @@ data class SessionDao(
             remotePeerId = remotePeerId,
             wallet = wallet,
             session = session,
-            peerMeta = peerMeta
+            peerMeta = peerMeta,
         )
     }
 
@@ -102,7 +100,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..316d44de9c 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
@@ -22,9 +22,10 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toDecompressedPublicKey
 import com.tangem.common.extensions.toHexString
+import com.tangem.core.analytics.Analytics
 import com.tangem.crypto.CryptoUtils
 import com.tangem.operations.sign.SignHashCommand
-import com.tangem.tap.common.analytics.AnalyticsAnOld
+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,12 +39,16 @@ 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
 
 class WalletConnectSdkHelper {
 
+    @Suppress("MagicNumber")
     suspend fun prepareTransactionData(
         transaction: WCEthereumTransaction,
         session: WalletConnectSession,
@@ -58,7 +63,7 @@ class WalletConnectSdkHelper {
 
         val gas = transaction.gas?.hexToBigDecimal()
             ?: transaction.gasLimit?.hexToBigDecimal()
-            ?: BigDecimal(300000) //Set high gasLimit if not provided
+            ?: BigDecimal(300000) // Set high gasLimit if not provided
 
         val decimals = wallet.blockchain.decimals()
 
@@ -66,8 +71,7 @@ class WalletConnectSdkHelper {
             ?.movePointLeft(decimals) ?: return null
 
         val gasPrice = transaction.gasPrice?.hexToBigDecimal()
-            ?: when (val result =
-                (walletManager as? EthereumGasLoader)?.getGasPrice()) {
+            ?: when (val result = (walletManager as? EthereumGasLoader)?.getGasPrice()) {
                 is Result.Success -> result.data.toBigDecimal()
                 is Result.Failure -> {
                     (result.error as? Throwable)?.let { Timber.e(it) }
@@ -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,
@@ -97,10 +101,10 @@ class WalletConnectSdkHelper {
             gasAmount = fee.toFormattedString(decimals),
             totalAmount = total.toFormattedString(decimals),
             balance = balance.toFormattedString(decimals),
-            isEnoughFundsToSend = (balance - total) >= BigDecimal.ZERO,
+            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()
@@ -273,16 +270,13 @@ class WalletConnectSdkHelper {
             is CompletionResult.Success -> {
                 val hash = result.data.signature
                 return EthereumUtils.prepareSignedMessageData(
-                    hash, hashToSign, CryptoUtils.decompressPublicKey(key!!),
+                    signedHash = hash,
+                    hashToSign = hashToSign,
+                    publicKey = CryptoUtils.decompressPublicKey(key!!),
                 )
             }
             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/BaseFragment.kt b/app/src/main/java/com/tangem/tap/features/BaseFragment.kt
index f0e6016021..fe5c9a3926 100644
--- a/app/src/main/java/com/tangem/tap/features/BaseFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/BaseFragment.kt
@@ -54,7 +54,7 @@ abstract class BaseFragment(layoutId: Int) : Fragment(layoutId), FragmentOnBackP
         }
     }
 
-    protected open fun loadToolbarMenu():MenuProvider? = null
+    protected open fun loadToolbarMenu(): MenuProvider? = null
 
     fun showRetrySnackbar(message: String, action: VoidCallback) {
         val snackbar = Snackbar.make(mainView, message, Snackbar.LENGTH_INDEFINITE)
diff --git a/app/src/main/java/com/tangem/tap/features/BaseStoreFragment.kt b/app/src/main/java/com/tangem/tap/features/BaseStoreFragment.kt
index b4f486a1a2..e295c9f100 100644
--- a/app/src/main/java/com/tangem/tap/features/BaseStoreFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/BaseStoreFragment.kt
@@ -8,9 +8,10 @@ import org.rekotlin.StoreSubscriber
  */
 abstract class BaseStoreFragment(layoutId: Int) : BaseFragment(layoutId) {
 
-    abstract fun subscribeToStore()
     protected val storeSubscribersList = mutableListOf<StoreSubscriber<*>>()
 
+    abstract fun subscribeToStore()
+
     override fun onStart() {
         super.onStart()
         subscribeToStore()
diff --git a/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt b/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt
index b0d473cde0..d763e26339 100644
--- a/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.demo
 
-import com.tangem.blockchain.blockchains.bitcoin.BitcoinWalletManager
 import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.TransactionData
@@ -83,6 +82,7 @@ object DemoHelper {
     }
 }
 
+@Suppress("LargeClass")
 class DemoConfig {
 
     val demoBlockchains = listOf(
@@ -115,6 +115,7 @@ class DemoConfig {
         return (releaseDemoCardIds + testDemoCardIds).distinct()
     }
 
+    @Suppress("ClassOrdering")
     private val releaseDemoCardIds = mutableListOf(
         // === Not from the Google Sheet table ===
         "FB10000000000196", // Note BTC
@@ -477,38 +478,36 @@ class DemoConfig {
         "AB02000000058187",
     )
 
+    @Suppress("ClassOrdering")
     private val testDemoCardIds = listOf(
         "FB20000000000186", // Note ETH
         "FB10000000000196", // Note BTC
         "FB30000000000176", // Wallet
     )
 
-    private val debugTestDemoCardIds = listOf<String>(
-    )
+    @Suppress("ClassOrdering")
+    private val debugTestDemoCardIds = listOf<String>()
 }
 
-class DemoTransactionSender(
-    private val walletManager: WalletManager,
-    private val sender: TransactionSender = walletManager as TransactionSender
-) : TransactionSender {
+class DemoTransactionSender(private val walletManager: WalletManager) : TransactionSender {
 
     override suspend fun getFee(amount: Amount, destination: String): Result<List<Amount>> {
         val blockchain = walletManager.wallet.blockchain
-        return when (walletManager) {
-            is BitcoinWalletManager -> Result.Success(listOf(
+        return Result.Success(
+            listOf(
                 Amount(0.0001.toBigDecimal(), blockchain),
+                Amount(0.0002.toBigDecimal(), blockchain),
                 Amount(0.0003.toBigDecimal(), blockchain),
-                Amount(0.00055.toBigDecimal(), blockchain),
-            ))
-            else -> sender.getFee(amount, destination)
-        }
+            ),
+        )
     }
 
+    @Suppress("MagicNumber")
     override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
         val dataToSign = randomString(32).toByteArray()
         val signerResponse = signer.sign(
             hash = dataToSign,
-            publicKey = walletManager.wallet.publicKey
+            publicKey = walletManager.wallet.publicKey,
         )
         return when (signerResponse) {
             is CompletionResult.Success -> SimpleResult.Failure(Exception(ID).toBlockchainSdkError())
@@ -529,5 +528,4 @@ class DemoTransactionSender(
     companion object {
         val ID = DemoTransactionSender::class.java.simpleName
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/demo/DemoMiddlewares.kt b/app/src/main/java/com/tangem/tap/features/demo/DemoOnboardingNoteMiddleware.kt
similarity index 98%
rename from app/src/main/java/com/tangem/tap/features/demo/DemoMiddlewares.kt
rename to app/src/main/java/com/tangem/tap/features/demo/DemoOnboardingNoteMiddleware.kt
index 87af003060..9b391b22df 100644
--- a/app/src/main/java/com/tangem/tap/features/demo/DemoMiddlewares.kt
+++ b/app/src/main/java/com/tangem/tap/features/demo/DemoOnboardingNoteMiddleware.kt
@@ -39,7 +39,7 @@ internal class DemoOnboardingNoteMiddleware : DemoMiddleware {
                     currency = Currency.Blockchain(walletManager.wallet.blockchain, null),
                     state = ProgressState.Done,
                     error = null,
-                    criticalError = null
+                    criticalError = null,
                 )
                 walletManager.wallet.setAmount(balanceAmount)
 
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..6e64e29b98 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,10 +1,10 @@
 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.CardTypesResolver
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.entities.FiatCurrency
-import com.tangem.tap.domain.termsOfUse.CardTou
 import org.rekotlin.Action
 
 sealed class DetailsAction : Action {
@@ -12,10 +12,8 @@ sealed class DetailsAction : Action {
     data class PrepareScreen(
         val scanResponse: ScanResponse,
         val wallets: List<Wallet>,
-        val cardTou: CardTou,
     ) : DetailsAction()
 
-    object ShowDisclaimer : DetailsAction()
     object ReCreateTwinsWallet : DetailsAction()
 
     sealed class ResetToFactory : DetailsAction() {
@@ -30,7 +28,7 @@ sealed class DetailsAction : Action {
 
     object ScanCard : DetailsAction()
 
-    data class PrepareCardSettingsData(val card: Card) : DetailsAction()
+    data class PrepareCardSettingsData(val card: CardDTO, val cardTypesResolver: CardTypesResolver) : DetailsAction()
     object ResetCardSettingsData : DetailsAction()
 
     sealed class ManageSecurity : DetailsAction() {
@@ -45,8 +43,26 @@ 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: AppSetting,
+        ) : AppSettings() {
+            object Success : AppSettings()
+
+            data class Failure(
+                val prevState: Boolean,
+                val setting: AppSetting,
+            ) : 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..203af20870 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.core.analytics.Analytics
+import com.tangem.domain.common.ScanResponse
 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.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.ShowDisclaimer -> {
-                val uri = store.state.detailsState.cardTermsOfUseUrl
-                if (uri != null) {
-                    store.dispatch(NavigationAction.OpenDocument(uri))
-                }
-            }
+            is DetailsAction.AppSettings -> managePrivacyMiddleware.handle(state, action)
             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,
+                                        scanResponse.cardTypesResolver,
+                                    ),
+                                )
                             } else {
                                 store.dispatchDialogShow(
                                     AppDialog.SimpleOkDialogRes(
@@ -95,9 +98,6 @@ class DetailsMiddleware {
                                 )
                             }
                         }
-                        is CompletionResult.Failure -> {
-                        }
-                    }
                 }
             }
         }
@@ -118,30 +118,41 @@ 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 ->
+                                if (error is TangemSdkError && error !is TangemSdkError.UserCancelled) {
+                                    Analytics.send(Settings.CardSettings.FactoryResetFinished(error))
                                 }
-                        }
+                            }
                     }
                 }
-                else -> { /* no-op */
-                }
+                else -> Unit
             }
         }
     }
 
     class ManageSecurityMiddleware {
+        @Suppress("ComplexMethod")
         fun handle(action: DetailsAction.ManageSecurity) {
             when (action) {
                 is DetailsAction.ManageSecurity.OpenSecurity -> {
@@ -156,33 +167,25 @@ 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,
-                                        )
+                                    val error = result.error
+                                    if (error is TangemSdkError && error !is TangemSdkError.UserCancelled) {
+                                        Analytics.send(Settings.CardSettings.SecurityModeChanged(paramValue, error))
                                     }
                                     store.dispatch(DetailsAction.ManageSecurity.SaveChanges.Failure)
                                 }
-                                else -> { /* no-op */
-                                }
+                                else -> Unit
                             }
                         }
                     }
@@ -190,22 +193,201 @@ 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) {
+                        AppSetting.SaveWallets -> toggleSaveWallets(state, enable = action.enable)
+                        AppSetting.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.SwitchPrivacySetting.Failure,
+                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.appSettingsState.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 {
+            // Nothing to change
+            if (preferencesStorage.shouldSaveUserWallets == enable) {
+                store.dispatchOnMain(DetailsAction.AppSettings.SwitchPrivacySetting.Success)
+                return@launch
+            }
+
+            toggleSaveWallets(state.scanResponse, enable)
+                .doOnFailure {
+                    store.dispatchOnMain(
+                        DetailsAction.AppSettings.SwitchPrivacySetting.Failure(
+                            prevState = !enable,
+                            setting = AppSetting.SaveWallets,
+                        ),
+                    )
+                }
+                .doOnSuccess {
+                    store.dispatchOnMain(DetailsAction.AppSettings.SwitchPrivacySetting.Success)
+                }
+        }
+
+        private suspend fun toggleSaveWallets(
+            scanResponse: ScanResponse?,
+            enable: Boolean,
+        ): CompletionResult<Unit> {
+            return if (enable) {
+                saveCurrentWallet(scanResponse, enableAccessCodesSaving = false)
+            } else {
+                deleteSavedWalletsAndAccessCodes()
+            }
+        }
+
+        private fun toggleSaveAccessCodes(state: DetailsState, enable: Boolean) = scope.launch {
+            // Nothing to change
+            if (preferencesStorage.shouldSaveAccessCodes == enable) {
+                store.dispatchOnMain(DetailsAction.AppSettings.SwitchPrivacySetting.Success)
+                return@launch
+            }
+
+            toggleSaveAccessCodes(state.scanResponse, state.appSettingsState.saveWallets, enable)
+                .doOnFailure {
+                    store.dispatchOnMain(
+                        DetailsAction.AppSettings.SwitchPrivacySetting.Failure(
+                            prevState = !enable,
+                            setting = AppSetting.SaveAccessCode,
+                        ),
+                    )
+                }
+                .doOnSuccess {
+                    store.dispatchOnMain(DetailsAction.AppSettings.SwitchPrivacySetting.Success)
+                }
+        }
+
+        private suspend fun toggleSaveAccessCodes(
+            scanResponse: ScanResponse?,
+            isWalletsSavingEnabled: Boolean,
+            enable: Boolean,
+        ): CompletionResult<Unit> {
+            return if (enable) {
+                if (!isWalletsSavingEnabled) {
+                    saveCurrentWallet(scanResponse, enableAccessCodesSaving = true)
+                } else {
+                    saveAccessCodes(scanResponse)
+                }
+            } else {
+                deleteSavedAccessCodes()
+            }
+        }
+
+        private suspend fun saveCurrentWallet(
+            scanResponse: ScanResponse?,
+            enableAccessCodesSaving: Boolean,
+        ): CompletionResult<Unit> {
+            val userWallet = scanResponse?.let { UserWalletBuilder(it).build() }
+                ?: return CompletionResult.Failure(
+                    TangemSdkError.ExceptionError(IllegalStateException("scanResponse is null")),
+                )
+
+            return userWalletsListManager.save(userWallet)
+                .flatMap {
+                    if (enableAccessCodesSaving) {
+                        saveAccessCodes(scanResponse)
+                    } else {
+                        CompletionResult.Success(Unit)
+                    }
+                }
+                .doOnSuccess {
+                    Analytics.send(Settings.AppSettings.SaveWalletSwitcherChanged(AnalyticsParam.OnOffState.On))
+
+                    preferencesStorage.shouldShowSaveUserWalletScreen = false
+                    preferencesStorage.shouldSaveUserWallets = true
+
+                    store.onUserWalletSelected(userWallet)
+                }
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to save user wallet")
+                }
+        }
+
+        private suspend fun deleteSavedWalletsAndAccessCodes(): CompletionResult<Unit> {
+            return userWalletsListManager.clear()
+                .flatMap { walletStoresManager.clear() }
+                .doOnSuccess {
+                    Analytics.send(Settings.AppSettings.SaveWalletSwitcherChanged(AnalyticsParam.OnOffState.Off))
+                    deleteSavedAccessCodes()
+                    preferencesStorage.shouldSaveUserWallets = false
+
+                    store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
+                }
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to delete saved wallets")
+                }
+        }
+
+        private fun saveAccessCodes(scanResponse: ScanResponse?): CompletionResult<Unit> {
+            Analytics.send(Settings.AppSettings.SaveAccessCodeSwitcherChanged(AnalyticsParam.OnOffState.On))
+
+            preferencesStorage.shouldSaveAccessCodes = true
+            tangemSdkManager.setAccessCodeRequestPolicy(
+                useBiometricsForAccessCode = scanResponse?.card?.isAccessCodeSet == true,
+            )
+
+            return CompletionResult.Success(Unit)
+        }
+
+        private suspend fun deleteSavedAccessCodes(): CompletionResult<Unit> {
+            return tangemSdkManager.clearSavedUserCodes()
+                .doOnSuccess {
+                    Analytics.send(Settings.AppSettings.SaveAccessCodeSwitcherChanged(AnalyticsParam.OnOffState.Off))
+
+                    preferencesStorage.shouldSaveAccessCodes = false
+                    tangemSdkManager.setAccessCodeRequestPolicy(
+                        useBiometricsForAccessCode = 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..cd51367536 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,21 +1,19 @@
 package com.tangem.tap.features.details.redux
 
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.CardTypesResolver
 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.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.*
 
-class DetailsReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): DetailsState = internalReduce(action, state)
-    }
+object DetailsReducer {
+    fun reduce(action: Action, state: AppState): DetailsState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, state: AppState): DetailsState {
@@ -26,7 +24,11 @@ private fun internalReduce(action: Action, state: AppState): DetailsState {
             handlePrepareScreen(action)
         }
         is DetailsAction.PrepareCardSettingsData -> {
-            handlePrepareCardSettingsScreen(action.card, detailsState)
+            handlePrepareCardSettingsScreen(
+                card = action.card,
+                cardTypesResolver = action.cardTypesResolver,
+                state = detailsState,
+            )
         }
         is DetailsAction.ResetCardSettingsData -> detailsState.copy(cardSettingsState = null)
         is DetailsAction.ResetToFactory -> {
@@ -50,42 +52,54 @@ private fun handlePrepareScreen(
     return DetailsState(
         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,
+        appSettingsState = AppSettingsState(
+            isBiometricsAvailable = tangemSdkManager.canUseBiometry,
+            saveWallets = preferencesStorage.shouldSaveUserWallets,
+            saveAccessCodes = preferencesStorage.shouldSaveAccessCodes,
+        ),
     )
 }
 
-private fun handlePrepareCardSettingsScreen(card: Card, state: DetailsState): DetailsState {
+private fun handlePrepareCardSettingsScreen(
+    card: CardDTO,
+    cardTypesResolver: CardTypesResolver,
+    state: DetailsState,
+):
+    DetailsState {
     val cardSettingsState = CardSettingsState(
-        cardInfo = card.toCardInfo(),
-        manageSecurityState = prepareSecurityOptions(card),
+        cardInfo = card.toCardInfo(cardTypesResolver),
+        manageSecurityState = prepareSecurityOptions(card, cardTypesResolver),
         card = card,
-        resetCardAllowed = isResetToFactoryAllowedByCard(card),
+        resetCardAllowed = isResetToFactoryAllowedByCard(card, cardTypesResolver),
     )
     return state.copy(cardSettingsState = cardSettingsState)
 }
 
-private fun prepareSecurityOptions(card: Card): ManageSecurityState {
+private fun prepareSecurityOptions(card: CardDTO, cardTypesResolver: CardTypesResolver): ManageSecurityState {
     val securityOption = when {
         card.isAccessCodeSet -> {
             SecurityOption.AccessCode
         }
+
         card.isPasscodeSet == true -> {
             SecurityOption.PassCode
         }
+
         else -> {
             SecurityOption.LongTap
         }
     }
     val allowedSecurityOptions = when {
-        card.isStart2Coin || card.isTangemNote || card.isSaltPay -> {
+        cardTypesResolver.isStart2Coin() || cardTypesResolver.isTangemNote() || cardTypesResolver.isSaltPay() -> {
             EnumSet.of(SecurityOption.LongTap)
         }
         card.settings.isBackupAllowed -> {
             EnumSet.of(securityOption)
         }
-        else -> prepareAllowedSecurityOptions(card, securityOption)
+        else ->
+            prepareAllowedSecurityOptions(cardTypesResolver = cardTypesResolver, currentSecurityOption = securityOption)
     }
     return ManageSecurityState(
         currentOption = securityOption,
@@ -94,10 +108,10 @@ private fun prepareSecurityOptions(card: Card): ManageSecurityState {
     )
 }
 
-private fun isResetToFactoryAllowedByCard(card: Card): Boolean {
+private fun isResetToFactoryAllowedByCard(card: CardDTO, cardTypesResolver: CardTypesResolver): Boolean {
     val notAllowedByAnyWallet = card.wallets.any { it.settings.isPermanent }
     val notAllowedByCard = notAllowedByAnyWallet ||
-        (card.isWalletDataSupported && (!card.isTangemNote && !card.settings.isBackupAllowed)) ||
+        card.isWalletDataSupported && !cardTypesResolver.isTangemNote() && !card.settings.isBackupAllowed ||
         card.isSaltPay
     return !notAllowedByCard
 }
@@ -114,7 +128,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 -> {
@@ -127,9 +142,10 @@ private fun handleSecurityAction(
             // Setting options to show only LongTap from now on for non-twins
             val manageSecurityState = state.cardSettingsState?.manageSecurityState?.copy(
                 currentOption = state.cardSettingsState.manageSecurityState.selectedOption,
-                allowedOptions = state.scanResponse?.card?.let {
+                allowedOptions = state.scanResponse?.cardTypesResolver?.let {
                     prepareAllowedSecurityOptions(
-                        it, state.cardSettingsState.manageSecurityState.selectedOption,
+                        cardTypesResolver = it,
+                        currentSecurityOption = state.cardSettingsState.manageSecurityState.selectedOption,
                     )
                 } ?: EnumSet.of(SecurityOption.LongTap),
             )
@@ -144,24 +160,58 @@ 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 -> state.copy(
+            appSettingsState = when (action.setting) {
+                AppSetting.SaveWallets -> state.appSettingsState.copy(
+                    isInProgress = true,
+                    saveWallets = action.enable,
+                )
+                AppSetting.SaveAccessCode -> state.appSettingsState.copy(
+                    isInProgress = true,
+                    saveWallets = true, // User can't enable access codes saving without wallets saving
+                    saveAccessCodes = action.enable,
+                )
+            },
+        )
+        is DetailsAction.AppSettings.SwitchPrivacySetting.Success -> state.copy(
+            appSettingsState = state.appSettingsState.copy(
+                isInProgress = false,
+            ),
+        )
+        is DetailsAction.AppSettings.SwitchPrivacySetting.Failure -> state.copy(
+            appSettingsState = when (action.setting) {
+                AppSetting.SaveWallets -> state.appSettingsState.copy(
+                    isInProgress = false,
+                    saveWallets = action.prevState,
+                )
+                AppSetting.SaveAccessCode -> state.appSettingsState.copy(
+                    isInProgress = false,
+                    saveAccessCodes = action.prevState,
+                )
+            },
+        )
+        is DetailsAction.AppSettings.BiometricsStatusChanged -> state.copy(
+            appSettingsState = state.appSettingsState.copy(
+                needEnrollBiometrics = action.needEnrollBiometrics,
+            ),
+        )
+        is DetailsAction.AppSettings.EnrollBiometrics,
+        is DetailsAction.AppSettings.CheckBiometricsStatus,
+        -> state
     }
 }
 
 private fun prepareAllowedSecurityOptions(
-    card: Card?, currentSecurityOption: SecurityOption?,
+    cardTypesResolver: CardTypesResolver,
+    currentSecurityOption: SecurityOption?,
 ): EnumSet<SecurityOption> {
     val allowedSecurityOptions = EnumSet.of(SecurityOption.LongTap)
 
-    if (card?.isTangemTwin() == true) {
+    if (cardTypesResolver.isTangemTwins()) {
         allowedSecurityOptions.add(SecurityOption.PassCode)
     }
     if (currentSecurityOption == SecurityOption.AccessCode) {
@@ -173,9 +223,17 @@ private fun prepareAllowedSecurityOptions(
     return allowedSecurityOptions
 }
 
-private fun Card.toCardInfo(): CardInfo {
+@Suppress("MagicNumber")
+private fun CardDTO.toCardInfo(cardTypesResolver: CardTypesResolver): CardInfo {
     val cardId = this.cardId.chunked(4).joinToString(separator = " ")
     val issuer = this.issuer.name
     val signedHashes = this.signedHashesCount()
-    return CardInfo(cardId, issuer, signedHashes)
+
+    return CardInfo(
+        cardId = cardId,
+        issuer = issuer,
+        signedHashes = signedHashes,
+        isTwin = cardTypesResolver.isTangemTwins(),
+        hasBackup = backupStatus?.isActive == true,
+    )
 }
\ No newline at end of file
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..dd560af176 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
@@ -1,8 +1,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
@@ -16,33 +15,30 @@ data class DetailsState(
     val scanResponse: ScanResponse? = null,
     val wallets: List<Wallet> = emptyList(),
     val cardSettingsState: CardSettingsState? = null,
-    val cardTermsOfUseUrl: Uri? = null,
     val privacyPolicyUrl: String? = null,
     val createBackupAllowed: Boolean = false,
     val appCurrency: FiatCurrency = FiatCurrency.Default,
-    val saveWallets: Boolean = true,
-    val saveAccessCodes: Boolean = true,
+    val appSettingsState: AppSettingsState = AppSettingsState(),
 ) : 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
     }
-
-    val isTangemTwins: Boolean
-        get() = store.state.globalState.scanResponse?.isTangemTwins() == true
 }
 
 data class CardInfo(
     val cardId: String,
     val issuer: String,
     val signedHashes: Int,
+    val isTwin: Boolean,
+    val hasBackup: Boolean,
 )
 
 data class CardSettingsState(
     val cardInfo: CardInfo,
-    val card: Card,
+    val card: CardDTO,
     val manageSecurityState: ManageSecurityState?,
     val resetCardAllowed: Boolean,
     val resetConfirmed: Boolean = false,
@@ -55,8 +51,16 @@ data class ManageSecurityState(
     val buttonProceed: Button = Button(true),
 )
 
+data class AppSettingsState(
+    val saveWallets: Boolean = false,
+    val saveAccessCodes: Boolean = false,
+    val isBiometricsAvailable: Boolean = false,
+    val needEnrollBiometrics: Boolean = false,
+    val isInProgress: Boolean = false,
+)
+
 enum class SecurityOption { LongTap, PassCode, AccessCode }
 
-enum class PrivacySetting {
+enum class AppSetting {
     SaveWallets, SaveAccessCode
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt
index 67b215dd51..a383235538 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt
@@ -33,7 +33,8 @@ sealed class WalletConnectAction : Action {
     object RefuseOpeningSession : WalletConnectAction()
     data class OpeningSessionTimeout(val session: WCSession) : WalletConnectAction()
     data class ScanCard(
-        val session: WalletConnectSession, val chainId: Int?,
+        val session: WalletConnectSession,
+        val chainId: Int?,
     ) : WalletConnectAction()
 
     data class ApproveSession(
@@ -93,17 +94,21 @@ sealed class WalletConnectAction : Action {
 
     object BinanceTransaction : WalletConnectAction() {
         data class Trade(
-            val id: Long, val order: WCBinanceTradeOrder,
+            val id: Long,
+            val order: WCBinanceTradeOrder,
             val sessionData: WalletConnectSession,
         ) : WalletConnectAction()
 
         data class Transfer(
-            val id: Long, val order: WCBinanceTransferOrder,
+            val id: Long,
+            val order: WCBinanceTransferOrder,
             val sessionData: WalletConnectSession,
         ) : WalletConnectAction()
 
         data class Sign(
-            val id: Long, val data: ByteArray, val sessionData: WCSession,
+            val id: Long,
+            val data: ByteArray,
+            val sessionData: WCSession,
         ) : WalletConnectAction()
     }
 }
\ No newline at end of file
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..0957c8f2dc 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
@@ -14,7 +14,6 @@ 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.isMultiwalletAllowed
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.domain.walletconnect.BnbHelper
 import com.tangem.tap.domain.walletconnect.WalletConnectManager
@@ -40,6 +39,7 @@ class WalletConnectMiddleware {
         }
     }
 
+    @Suppress("ComplexMethod", "LongMethod")
     private fun handle(state: () -> AppState?, action: Action) {
         if (DemoHelper.tryHandle(state, action)) return
 
@@ -49,10 +49,8 @@ class WalletConnectMiddleware {
                 walletConnectManager.restoreSessions(action.scanResponse)
             }
             is WalletConnectAction.HandleDeepLink -> {
-                if (!action.wcUri.isNullOrBlank()) {
-                    if (WalletConnectManager.isCorrectWcUri(action.wcUri)) {
-                        store.dispatchOnMain(WalletConnectAction.OpenSession(action.wcUri))
-                    }
+                if (!action.wcUri.isNullOrBlank() && WalletConnectManager.isCorrectWcUri(action.wcUri)) {
+                    store.dispatchOnMain(WalletConnectAction.OpenSession(action.wcUri))
                 }
             }
             is WalletConnectAction.StartWalletConnect -> {
@@ -189,7 +187,9 @@ class WalletConnectMiddleware {
             }
             is WalletConnectAction.BinanceTransaction.Sign -> {
                 walletConnectManager.signBnb(
-                    action.id, action.data, action.sessionData,
+                    id = action.id,
+                    data = action.data,
+                    sessionData = action.sessionData,
                 )
             }
             is WalletConnectAction.SwitchBlockchain -> {
@@ -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 }
@@ -291,7 +291,7 @@ class WalletConnectMiddleware {
         blockchain: Blockchain,
     ) {
         val card = scanResponse.card
-        if (!card.isMultiwalletAllowed) {
+        if (!scanResponse.cardTypesResolver.isMultiwalletAllowed()) {
             store.dispatchOnMain(WalletConnectAction.UnsupportedCard)
             return
         }
@@ -311,7 +311,9 @@ class WalletConnectMiddleware {
     }
 
     private fun getWalletManager(
-        wallet: WalletForSession, blockchain: Blockchain, walletState: WalletState,
+        wallet: WalletForSession,
+        blockchain: Blockchain,
+        walletState: WalletState,
     ): WalletManager? {
         val blockchainToMake = if (blockchain == Blockchain.Ethereum && wallet.isTestNet) {
             Blockchain.EthereumTestnet
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt
index e4cc76254c..a4990f5d8b 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt
@@ -2,47 +2,44 @@ package com.tangem.tap.features.details.redux.walletconnect
 
 import org.rekotlin.Action
 
-class WalletConnectReducer {
-    companion object {
-        fun reduce(
-            action: Action, state: WalletConnectState,
-        ): WalletConnectState {
-            if (action !is WalletConnectAction) return state
+object WalletConnectReducer {
+    fun reduce(
+        action: Action,
+        state: WalletConnectState,
+    ): WalletConnectState {
+        if (action !is WalletConnectAction) return state
 
-            return when (action) {
-                is WalletConnectAction.ResetState -> return WalletConnectState()
-                is WalletConnectAction.ApproveSession.Success -> {
-                    state.copy(
-                        loading = false,
-                        sessions = state.sessions + action.session,
-                    )
-                }
-                is WalletConnectAction.OpenSession -> {
-                    state.copy(loading = true)
-                }
-                is WalletConnectAction.SetNewSessionData -> {
-                    state.copy(newSessionData = action.newSession)
-                }
-                is WalletConnectAction.SetSessionsRestored ->
-                    WalletConnectState(sessions = action.sessions)
-                is WalletConnectAction.RemoveSession -> {
-                    val sessions =
-                        state.sessions.filterNot { it.session.toUri() == action.session.toUri() }
-                    state.copy(sessions = sessions)
-                }
-                is WalletConnectAction.UnsupportedCard -> state.copy(loading = false)
-                is WalletConnectAction.RefuseOpeningSession -> state.copy(loading = false)
-                is WalletConnectAction.OpeningSessionTimeout -> state.copy(loading = false)
-                is WalletConnectAction.FailureEstablishingSession -> state.copy(loading = false)
-                is WalletConnectAction.UpdateBlockchain -> state.copy(
-                    sessions = state.sessions
-                        .filterNot { it.peerId == action.updatedSession.peerId }
-                            + action.updatedSession
+        return when (action) {
+            is WalletConnectAction.ResetState -> return WalletConnectState()
+            is WalletConnectAction.ApproveSession.Success -> {
+                state.copy(
+                    loading = false,
+                    sessions = state.sessions + action.session,
                 )
-
-                else -> state
             }
-        }
+            is WalletConnectAction.OpenSession -> {
+                state.copy(loading = true)
+            }
+            is WalletConnectAction.SetNewSessionData -> {
+                state.copy(newSessionData = action.newSession)
+            }
+            is WalletConnectAction.SetSessionsRestored ->
+                WalletConnectState(sessions = action.sessions)
+            is WalletConnectAction.RemoveSession -> {
+                val sessions =
+                    state.sessions.filterNot { it.session.toUri() == action.session.toUri() }
+                state.copy(sessions = sessions)
+            }
+            is WalletConnectAction.UnsupportedCard -> state.copy(loading = false)
+            is WalletConnectAction.RefuseOpeningSession -> state.copy(loading = false)
+            is WalletConnectAction.OpeningSessionTimeout -> state.copy(loading = false)
+            is WalletConnectAction.FailureEstablishingSession -> state.copy(loading = false)
+            is WalletConnectAction.UpdateBlockchain -> state.copy(
+                sessions = state.sessions
+                    .filterNot { it.peerId == action.updatedSession.peerId } + action.updatedSession,
+            )
 
+            else -> state
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
index 97afb372a2..70e41f4f0c 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
@@ -74,7 +74,7 @@ data class WalletForSession(
     }
 
     override fun hashCode(): Int {
-        var result = (walletPublicKey?.contentHashCode() ?: 0)
+        var result = walletPublicKey?.contentHashCode() ?: 0
         result = 31 * result + (derivedPublicKey?.contentHashCode() ?: 0)
         result = 31 * result + (derivationPath?.hashCode() ?: 0)
         result = 31 * result + isTestNet.hashCode()
@@ -83,7 +83,6 @@ data class WalletForSession(
     }
 }
 
-
 sealed class WalletConnectDialog : StateDialog {
     data class ClipboardOrScanQr(val clipboardUri: String) : WalletConnectDialog()
     object UnsupportedCard : WalletConnectDialog()
@@ -133,7 +132,7 @@ data class WcPersonalSignData(
     val id: Long,
     val dialogData: PersonalSignDialogData,
 
-    )
+)
 
 sealed class BinanceMessageData(
     val address: String,
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..3302facf0b 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,10 +38,10 @@ class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     AppSettingsScreen(
                         state = screenState.value,
-                        onBackPressed = {
+                        onBackClick = {
                             store.dispatch(DetailsAction.ResetCardSettingsData)
                             store.dispatch(NavigationAction.PopBackTo())
                         },
@@ -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..84ff3c3dba 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,230 +1,237 @@
 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.tap.features.details.redux.PrivacySetting
+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.AppSetting
+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
 
 @Composable
-fun AppSettingsScreen(
-    state: AppSettingsScreenState,
-    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun AppSettingsScreen(state: AppSettingsScreenState, onBackClick: () -> Unit) {
     SettingsScreensScaffold(
-        content = {
-            AppSettings(state = state, modifier = modifier)
-        },
+        content = { AppSettings(state = state) },
         titleRes = R.string.app_settings_title,
-        onBackClick = onBackPressed,
+        onBackClick = onBackClick,
     )
 }
 
 @Composable
-private fun AppSettings(
-    state: AppSettingsScreenState,
-    modifier: Modifier = Modifier,
-) {
-    var dialogType by remember { mutableStateOf<PrivacySetting?>(null) }
-    val onDialogStateChange: (PrivacySetting?) -> Unit = { dialogType = it }
+private fun AppSettings(state: AppSettingsScreenState) {
+    var dialogType by remember { mutableStateOf<AppSetting?>(null) }
+    val onDialogStateChange: (AppSetting?) -> Unit = { dialogType = it }
 
     dialogType?.let {
         SettingsAlertDialog(
             element = it,
             onDialogStateChange = onDialogStateChange,
-            onSettingToggled = state.onSettingToggled,
-            modifier = modifier,
+            onSettingToggle = { state.onSettingToggled(it, false) },
         )
     }
 
-    Column(
-        modifier = modifier
-            .fillMaxSize(),
-    ) {
+    Column(modifier = Modifier.fillMaxSize()) {
+        if (state.showEnrollBiometricsCard) {
+            EnrollBiometricsCard(onClick = state.onEnrollBiometrics)
+            SpacerH24()
+        }
+
         AppSettingsElement(
             state = state,
-            setting = PrivacySetting.SaveWallets,
+            setting = AppSetting.SaveWallets,
             onDialogStateChange = onDialogStateChange,
-            modifier = modifier,
         )
-        Spacer(modifier = Modifier.size(32.dp))
+        SpacerH32()
         AppSettingsElement(
             state = state,
-            setting = PrivacySetting.SaveAccessCode,
+            setting = AppSetting.SaveAccessCode,
             onDialogStateChange = onDialogStateChange,
-            modifier = modifier,
         )
     }
 }
 
+@Suppress("LongMethod")
 @Composable
 private fun AppSettingsElement(
     state: AppSettingsScreenState,
-    setting: PrivacySetting,
-    onDialogStateChange: (PrivacySetting?) -> Unit,
-    modifier: Modifier = Modifier,
+    setting: AppSetting,
+    onDialogStateChange: (AppSetting?) -> Unit,
 ) {
     val titleRes = when (setting) {
-        PrivacySetting.SaveWallets -> R.string.app_settings_saved_wallet
-        PrivacySetting.SaveAccessCode -> R.string.app_settings_saved_access_codes
+        AppSetting.SaveWallets -> R.string.app_settings_saved_wallet
+        AppSetting.SaveAccessCode -> R.string.app_settings_saved_access_codes
     }
     val subtitleRes = when (setting) {
-        PrivacySetting.SaveWallets -> R.string.app_settings_saved_wallet_footer
-        PrivacySetting.SaveAccessCode -> R.string.app_settings_saved_access_codes_footer
+        AppSetting.SaveWallets -> R.string.app_settings_saved_wallet_footer
+        AppSetting.SaveAccessCode -> R.string.app_settings_saved_access_codes_footer
     }
     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
+        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,
-    onSettingToggled: (PrivacySetting, Boolean) -> Unit,
-    onDialogStateChange: (PrivacySetting?) -> Unit,
+    element: AppSetting,
+    enabled: Boolean,
+    onSettingToggled: (AppSetting, Boolean) -> Unit,
+    onDialogStateChange: (AppSetting?) -> Unit,
 ) {
-    //Show warning if user wants to disable the switch
+    // Show warning if user wants to disable the switch
     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(
+                    AppSetting.SaveWallets to true,
+                    AppSetting.SaveAccessCode to false,
+                ),
+                showEnrollBiometricsCard = false,
+                isTogglesEnabled = true,
+                onSettingToggled = { _, _ -> },
+                onEnrollBiometrics = {},
+            ),
+            onBackClick = { },
+        )
     }
-    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(
+                    AppSetting.SaveWallets to true,
+                    AppSetting.SaveAccessCode to false,
+                ),
+                showEnrollBiometricsCard = true,
+                isTogglesEnabled = false,
+                onSettingToggled = { _, _ -> },
+                onEnrollBiometrics = {},
             ),
-            onSettingToggled = { _, _ -> },
-        ),
-        onBackPressed = { },
-    )
-}
\ No newline at end of file
+            onBackClick = { },
+        )
+    }
+}
+
+@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..fbc4640e8f 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
@@ -1,10 +1,11 @@
 package com.tangem.tap.features.details.ui.appsettings
 
-import com.tangem.tap.features.details.redux.PrivacySetting
+import com.tangem.tap.features.details.redux.AppSetting
 
 data class AppSettingsScreenState(
-    val settings: Map<PrivacySetting, Boolean>,
-    val onSettingToggled: (PrivacySetting, Boolean) -> Unit,
-)
-
-
+    val settings: Map<AppSetting, Boolean> = emptyMap(),
+    val showEnrollBiometricsCard: Boolean = false,
+    val isTogglesEnabled: Boolean = false,
+    val onSettingToggled: (AppSetting, 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..38323dcc3e 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,27 +1,42 @@
 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.AppSetting
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
-import com.tangem.tap.features.details.redux.PrivacySetting
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 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) },
-        )
+        return with(state.appSettingsState) {
+            AppSettingsScreenState(
+                settings = mapOf(
+                    AppSetting.SaveWallets to saveWallets,
+                    AppSetting.SaveAccessCode to saveAccessCodes,
+                ),
+                showEnrollBiometricsCard = needEnrollBiometrics,
+                isTogglesEnabled = !needEnrollBiometrics && !isInProgress,
+                onSettingToggled = { privacySetting, enabled ->
+                    onSettingsToggled(privacySetting, enabled)
+                },
+                onEnrollBiometrics = {
+                    store.dispatchOnMain(DetailsAction.AppSettings.EnrollBiometrics)
+                },
+            )
+        }
     }
 
-    private fun onSettingsToggled(setting: PrivacySetting, enable: Boolean) {
+    private fun onSettingsToggled(setting: AppSetting, 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..b541b88894
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/EnrollBiometricsCard.kt
@@ -0,0 +1,91 @@
+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.fillMaxWidth
+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(onClick: () -> Unit) {
+    Surface(
+        modifier = Modifier
+            .padding(horizontal = TangemTheme.dimens.spacing8)
+            .fillMaxWidth(),
+        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..0ed7409abd
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
@@ -0,0 +1,99 @@
+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.AppSetting
+import com.tangem.wallet.R
+
+@Composable
+internal fun SettingsAlertDialog(
+    element: AppSetting,
+    onDialogStateChange: (AppSetting?) -> Unit,
+    onSettingToggle: () -> Unit,
+) {
+    val text = when (element) {
+        AppSetting.SaveWallets -> R.string.app_settings_off_saved_wallet_alert_message
+        AppSetting.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)
+                    onSettingToggle()
+                },
+            )
+        },
+        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,
+    )
+}
+
+// region Preview
+@Composable
+private fun SettingsAlertDialogSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        SettingsAlertDialog(
+            element = AppSetting.SaveAccessCode,
+            onDialogStateChange = {},
+            onSettingToggle = { },
+        )
+    }
+}
+
+@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..15a943d590 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,10 +39,10 @@ class CardSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     CardSettingsScreen(
                         state = screenState.value,
-                        onBackPressed = {
+                        onBackClick = {
                             store.dispatch(DetailsAction.ResetCardSettingsData)
                             store.dispatch(NavigationAction.PopBackTo())
                         },
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..be54f4a52f 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,45 +23,43 @@ 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
 import com.tangem.wallet.R
 
 @Composable
-fun CardSettingsScreen(
-    state: CardSettingsScreenState,
-    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun CardSettingsScreen(state: CardSettingsScreenState, onBackClick: () -> Unit) {
+    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)
+            } else {
+                CardSettings(state = state)
+            }
         },
         titleRes = R.string.card_settings_title,
-        onBackClick = onBackPressed,
+        backgroundColor = TangemTheme.colors.background.secondary,
+        onBackClick = onBackClick,
     )
 }
 
+@Suppress("MagicNumber")
 @Composable
-fun CardSettingsReadCard(
-    onScanCardClick: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun CardSettingsReadCard(onScanCardClick: () -> Unit) {
     Column(
-        modifier = modifier
-            .fillMaxSize(),
+        modifier = Modifier.fillMaxSize(),
     ) {
         Box(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .padding(bottom = 40.dp),
         ) {
             Image(
-                modifier = modifier
+                modifier = Modifier
                     .fillMaxWidth()
                     .padding(start = 80.dp, end = 80.dp, top = 70.dp)
                     .rotate(-15f),
@@ -70,7 +68,7 @@ fun CardSettingsReadCard(
                 contentScale = ContentScale.FillWidth,
             )
             Image(
-                modifier = modifier
+                modifier = Modifier
                     .fillMaxWidth()
                     .padding(start = 60.dp, end = 60.dp)
                     .rotate(-1f),
@@ -81,7 +79,7 @@ fun CardSettingsReadCard(
         }
         Spacer(modifier = Modifier.weight(1f))
         Column(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
         ) {
@@ -90,35 +88,31 @@ fun CardSettingsReadCard(
                 color = colorResource(id = R.color.text_primary_1),
                 style = TangemTypography.headline3,
             )
-            Spacer(modifier = modifier.size(20.dp))
+            Spacer(modifier = Modifier.size(20.dp))
             Text(
                 text = stringResource(id = R.string.scan_card_settings_message),
                 color = colorResource(id = R.color.text_secondary),
                 style = TangemTypography.body1,
-                modifier = modifier
+                modifier = Modifier
                     .verticalScroll(rememberScrollState())
                     .weight(weight = 1f, fill = false),
             )
-            Spacer(modifier = modifier.size(29.dp))
+            Spacer(modifier = Modifier.size(29.dp))
             DetailsMainButton(
                 title = stringResource(id = R.string.scan_card_settings_button),
                 onClick = onScanCardClick,
-                modifier = modifier,
             )
         }
     }
 }
 
+@Suppress("ComplexMethod")
 @Composable
-fun CardSettings(
-    state: CardSettingsScreenState,
-    modifier: Modifier = Modifier,
-) {
+fun CardSettings(state: CardSettingsScreenState) {
     if (state.cardDetails == null) return
 
     LazyColumn(
-        modifier = modifier
-            .fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth(),
     ) {
         items(state.cardDetails) {
             val paddingBottom = when (it) {
@@ -137,7 +131,7 @@ fun CardSettings(
                 is CardInfo.ResetToFactorySettings -> 16.dp
             }
             Column(
-                modifier = modifier
+                modifier = Modifier
                     .fillMaxWidth()
                     .clickable(
                         enabled = it.clickable,
@@ -145,18 +139,26 @@ fun CardSettings(
                     )
                     .padding(start = 20.dp, end = 20.dp, bottom = paddingBottom, top = paddingTop),
             ) {
-                val titleColor = if (it.clickable) R.color.text_primary_1 else R.color.text_tertiary
-                val subtitleColor = if (it.clickable) R.color.text_secondary else R.color.text_tertiary
+                val titleColor = if (it.clickable) {
+                    TangemTheme.colors.text.primary1
+                } else {
+                    TangemTheme.colors.text.tertiary
+                }
+                val subtitleColor = if (it.clickable) {
+                    TangemTheme.colors.text.secondary
+                } else {
+                    TangemTheme.colors.text.tertiary
+                }
                 Text(
                     text = it.titleRes.resolveReference(),
-                    color = colorResource(id = titleColor),
-                    style = TangemTypography.subtitle1,
+                    color = titleColor,
+                    style = TangemTheme.typography.subtitle1,
                 )
-                Spacer(modifier = modifier.size(4.dp))
+                Spacer(modifier = Modifier.size(4.dp))
                 Text(
                     text = it.subtitle.resolveReference(),
-                    color = colorResource(id = subtitleColor),
-                    style = TangemTypography.body2,
+                    color = subtitleColor,
+                    style = TangemTheme.typography.body2,
                 )
             }
         }
@@ -165,6 +167,6 @@ fun CardSettings(
 
 @Composable
 @Preview
-fun CardSettingsPreview() {
+private fun CardSettingsPreview() {
     CardSettingsScreen(state = CardSettingsScreenState(onScanCardClick = {}) {}, {})
 }
\ No newline at end of file
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..5ae42a55a9 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
@@ -6,7 +6,9 @@ import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.res.stringResource
 import com.tangem.tap.features.details.redux.SecurityOption
 import com.tangem.tap.features.details.ui.securitymode.toTitleRes
+import com.tangem.tap.features.details.ui.utils.toResetCardDescriptionText
 import com.tangem.wallet.R
+import com.tangem.tap.features.details.redux.CardInfo as ReduxCardInfo
 
 data class CardSettingsScreenState(
     val cardDetails: List<CardInfo>? = null,
@@ -15,18 +17,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 +36,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 +48,9 @@ sealed class CardInfo(
         clickable = true,
     )
 
-    object ResetToFactorySettings : CardInfo(
+    class ResetToFactorySettings(cardInfo: ReduxCardInfo) : 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 = cardInfo.toResetCardDescriptionText(),
         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..16b9836764 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
@@ -1,7 +1,10 @@
 package com.tangem.tap.features.details.ui.cardsettings
 
+import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.getTwinCardIdForUser
+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
@@ -10,7 +13,6 @@ import org.rekotlin.Store
 class CardSettingsViewModel(private val store: Store<AppState>) {
 
     fun updateState(state: CardSettingsState?): CardSettingsScreenState {
-
         return if (state?.manageSecurityState == null) {
             CardSettingsScreenState(
                 cardDetails = null,
@@ -43,7 +45,7 @@ class CardSettingsViewModel(private val store: Store<AppState>) {
                 cardDetails.add(CardInfo.ChangeAccessCode)
             }
             if (state.resetCardAllowed) {
-                cardDetails.add(CardInfo.ResetToFactorySettings)
+                cardDetails.add(CardInfo.ResetToFactorySettings(state.cardInfo))
             }
 
             CardSettingsScreenState(
@@ -59,12 +61,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..34ed64cceb 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
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 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.systemBarsPadding
@@ -25,18 +25,18 @@ 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.tap.common.compose.TangemTypography
+import com.tangem.core.ui.res.TangemTheme
 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 +58,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()
                 }
@@ -79,16 +83,15 @@ fun ScreenTitle(
     Text(
         text = stringResource(id = titleRes),
         modifier = modifier.padding(start = 20.dp, end = 20.dp),
-        style = TangemTypography.headline1,
-        color = colorResource(id = R.color.text_primary_1),
+        style = TangemTheme.typography.h1,
+        color = TangemTheme.colors.text.primary1,
     )
 }
 
 @Composable
 fun EmptyTopBarWithNavigation(
     onBackClick: () -> Unit,
-    backgroundColor: Color = colorResource(id = R.color.background_primary),
-    modifier: Modifier = Modifier,
+    backgroundColor: Color = TangemTheme.colors.background.primary,
 ) {
     TopAppBar(
         title = { },
@@ -96,8 +99,9 @@ fun EmptyTopBarWithNavigation(
         {
             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_24),
+                    contentDescription = null,
+                    tint = TangemTheme.colors.icon.primary1,
                 )
             }
         },
@@ -109,15 +113,15 @@ fun EmptyTopBarWithNavigation(
 @Composable
 fun DetailsMainButton(
     title: String,
-    enabled: Boolean = true,
-    onClick: (() -> Unit),
+    onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    enabled: Boolean = true,
 ) {
     Button(
         onClick = onClick,
         modifier = modifier
             .fillMaxWidth()
-            .height(48.dp),
+            .heightIn(48.dp),
         shape = RoundedCornerShape(12.dp),
         enabled = enabled,
         colors = ButtonDefaults.buttonColors(
@@ -128,7 +132,11 @@ fun DetailsMainButton(
         ),
     ) {
         Text(text = title)
-        Spacer(modifier = modifier.size(8.dp))
-        Icon(painter = painterResource(id = R.drawable.ic_tangem), contentDescription = "")
+        Spacer(
+            modifier = Modifier
+                .padding(start = 20.dp, end = 20.dp)
+                .size(8.dp),
+        )
+        Icon(painter = painterResource(id = R.drawable.ic_tangem_24), contentDescription = "")
     }
 }
\ No newline at end of file
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..c6c8e82cf4 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
@@ -30,14 +30,15 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.tangem.wallet.R
 
+@Suppress("MagicNumber")
 @Composable
 fun TangemSwitch(
-    modifier: Modifier = Modifier,
-    enabledColor: Color = colorResource(id = R.color.control_checked),
-    disabledColor: Color = colorResource(id = R.color.icon_informative),
+    onCheckedChange: (Boolean) -> Unit,
+    checkedColor: Color = colorResource(id = R.color.control_checked),
+    uncheckedColor: Color = colorResource(id = R.color.icon_informative),
     size: Dp = 48.dp,
     checked: Boolean = false,
-    onCheckedChange: (Boolean) -> Unit,
+    enabled: Boolean = true,
 ) {
     val transition = updateTransition(checked, label = "SwitchState")
     val color by transition.animateColor(
@@ -45,16 +46,18 @@ fun TangemSwitch(
             tween(durationMillis = 200, easing = FastOutLinearInEasing)
         },
         label = "",
-    ) { enabled ->
-        if (enabled) enabledColor else disabledColor
+    ) { isChecked ->
+        (if (isChecked) checkedColor else uncheckedColor)
+            .copy(alpha = if (enabled) 1f else .4f)
     }
     val interactionSource = remember { MutableInteractionSource() }
 
     Box(
-        modifier = modifier
+        modifier = Modifier
             .clickable(
                 interactionSource = interactionSource,
                 indication = null,
+                enabled = enabled,
             ) {
                 onCheckedChange(!checked)
             }
@@ -67,7 +70,7 @@ fun TangemSwitch(
             ),
     ) {
         BoxWithConstraints(
-            modifier = modifier
+            modifier = Modifier
                 .width(size)
                 .height(size / 2)
                 .indication(interactionSource, null)
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..c89c19485a 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.analytics.Analytics
+import com.tangem.core.ui.res.TangemTheme
+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,10 +40,10 @@ class DetailsFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     DetailsScreen(
                         state = detailsScreenState.value,
-                        onBackPressed = { store.dispatch(NavigationAction.PopBackTo()) },
+                        onBackClick = { 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..c80a04b785 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,68 +25,60 @@ 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
 import com.tangem.wallet.R
 
 @Composable
-fun DetailsScreen(
-    state: DetailsScreenState,
-    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun DetailsScreen(state: DetailsScreenState, onBackClick: () -> Unit) {
+    SystemBarsEffect {
+        setSystemBarsColor(color = TangemColorPalette.Light1)
+    }
+
     SettingsScreensScaffold(
-        content = { Content(state = state, modifier = modifier) },
-        onBackClick = onBackPressed,
+        content = { Content(state = state) },
+        onBackClick = onBackClick,
     )
 }
 
 @Composable
-fun Content(
-    state: DetailsScreenState,
-    modifier: Modifier = Modifier,
-) {
+fun Content(state: DetailsScreenState) {
     Column(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxSize()
             .verticalScroll(rememberScrollState()),
     ) {
-        ScreenTitle(titleRes = R.string.details_title, modifier.padding(bottom = 52.dp))
-        state.elements.map {
-            if (it == SettingsElement.WalletConnect) {
-                WalletConnectDetailsItem(
-                    onItemsClick = state.onItemsClick,
-                    modifier = modifier,
-                )
+        ScreenTitle(titleRes = R.string.details_title, Modifier.padding(bottom = 52.dp))
+        state.elements.map { element ->
+            if (element == SettingsElement.WalletConnect) {
+                WalletConnectDetailsItem(onItemsClick = state.onItemsClick)
             } else {
                 DetailsItem(
-                    item = it,
+                    item = element,
                     appCurrency = state.appCurrency,
-                    onItemsClick = state.onItemsClick,
-                    modifier = modifier,
+                    onItemsClick = { state.onItemsClick(element) },
                 )
             }
         }
-        Spacer(modifier = modifier.weight(1f))
+        Spacer(modifier = Modifier.weight(1f))
         TangemSocialAccounts(state.tangemLinks, state.onSocialNetworkClick)
         Spacer(modifier = Modifier.size(12.dp))
         Text(
             text = "${stringResource(id = state.appNameRes)} ${state.tangemVersion}",
             style = TangemTypography.caption,
             color = colorResource(id = R.color.text_tertiary),
-            modifier = modifier.padding(start = 16.dp, end = 16.dp, bottom = 40.dp),
+            modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 40.dp),
         )
     }
 }
 
 @Composable
-fun WalletConnectDetailsItem(
-    onItemsClick: (SettingsElement) -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun WalletConnectDetailsItem(onItemsClick: (SettingsElement) -> Unit) {
     Row(
-        modifier = modifier
+        modifier = Modifier
             .defaultMinSize(minHeight = 84.dp)
             .fillMaxWidth()
             .clickable { onItemsClick(SettingsElement.WalletConnect) },
@@ -96,23 +88,23 @@ fun WalletConnectDetailsItem(
         Icon(
             painter = painterResource(id = R.drawable.ic_walletconnect),
             contentDescription = stringResource(id = R.string.wallet_connect_title),
-            modifier = modifier.padding(start = 20.dp, end = 20.dp),
+            modifier = Modifier.padding(start = 20.dp, end = 20.dp),
             tint = colorResource(id = R.color.all_colors_azure),
         )
         Column(
-            modifier = modifier.defaultMinSize(minHeight = 56.dp),
+            modifier = Modifier.defaultMinSize(minHeight = 56.dp),
             horizontalAlignment = Alignment.Start,
             verticalArrangement = Arrangement.Center,
         ) {
             Text(
                 text = stringResource(id = R.string.wallet_connect_title),
-                modifier = modifier.padding(end = 20.dp, bottom = 4.dp),
+                modifier = Modifier.padding(end = 20.dp, bottom = 4.dp),
                 style = TangemTypography.headline3,
                 color = colorResource(id = R.color.text_primary_1),
             )
             Text(
                 text = stringResource(id = R.string.wallet_connect_subtitle),
-                modifier = modifier.padding(end = 20.dp, bottom = 4.dp),
+                modifier = Modifier.padding(end = 20.dp, bottom = 4.dp),
                 style = TangemTypography.body1,
                 color = colorResource(id = R.color.text_secondary),
             )
@@ -121,37 +113,31 @@ fun WalletConnectDetailsItem(
 }
 
 @Composable
-fun DetailsItem(
-    item: SettingsElement,
-    appCurrency: String,
-    onItemsClick: (SettingsElement) -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun DetailsItem(item: SettingsElement, appCurrency: String, onItemsClick: () -> Unit) {
     Row(
-        modifier = modifier
+        modifier = Modifier
             .height(56.dp)
             .fillMaxWidth()
-            .clickable { onItemsClick(item) },
+            .clickable(onClick = onItemsClick),
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
             painter = painterResource(id = item.iconRes),
             contentDescription = stringResource(id = item.titleRes),
-            modifier = modifier.padding(start = 20.dp, end = 20.dp),
+            modifier = Modifier.padding(start = 20.dp, end = 20.dp),
             tint = colorResource(id = R.color.icon_secondary),
         )
-        Column(modifier = modifier.padding(end = 20.dp)) {
+        Column(modifier = Modifier.padding(end = 20.dp)) {
             Text(
                 text = stringResource(id = item.titleRes),
-                modifier = modifier,
+                modifier = Modifier,
                 style = TangemTypography.subtitle1,
                 color = colorResource(id = R.color.text_primary_1),
             )
             if (item == SettingsElement.AppCurrency) {
                 Text(
                     text = appCurrency,
-                    modifier = modifier,
                     style = TangemTypography.body2,
                     color = colorResource(id = R.color.text_secondary),
                 )
@@ -162,20 +148,17 @@ fun DetailsItem(
 
 @Composable
 fun TangemSocialAccounts(
-    links: List<TangemLink>,
-    onSocialNetworkClick: (String) -> Unit,
-    modifier: Modifier = Modifier,
+    links: List<SocialNetworkLink>,
+    onSocialNetworkClick: (SocialNetworkLink) -> Unit,
 ) {
-    LazyRow(
-        modifier = modifier.padding(start = 8.dp, end = 8.dp),
-    ) {
+    LazyRow(modifier = Modifier.padding(start = 8.dp, end = 8.dp)) {
         items(links) {
             Icon(
-                painter = painterResource(id = it.iconRes),
+                painter = painterResource(id = it.network.iconRes),
                 contentDescription = "",
-                modifier = modifier
+                modifier = Modifier
                     .padding(8.dp)
-                    .clickable { onSocialNetworkClick(it.url) },
+                    .clickable { onSocialNetworkClick(it) },
                 tint = colorResource(id = R.color.icon_informative),
             )
         }
@@ -184,15 +167,16 @@ fun TangemSocialAccounts(
 
 @Composable
 @Preview
-fun Preview() {
+private fun Preview() {
     DetailsScreen(
         state = DetailsScreenState(
             elements = SettingsElement.values().toList(),
             tangemLinks = TangemSocialAccounts.accountsEn,
             tangemVersion = "Tangem 2.14.12 (343)",
             appCurrency = "Dollar",
-            onItemsClick = {}, onSocialNetworkClick = {},
+            onItemsClick = {},
+            onSocialNetworkClick = {},
         ),
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
\ No newline at end of file
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..88d83b897c 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,70 @@
 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
+    val appNameRes: Int = R.string.tangem_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..2a3c6aea7d 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
@@ -1,14 +1,13 @@
 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.core.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
 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.isMultiwalletAllowed
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
@@ -19,30 +18,34 @@ import com.tangem.wallet.BuildConfig
 import org.rekotlin.Store
 
 class DetailsViewModel(private val store: Store<AppState>) {
+
+    @Suppress("ComplexMethod")
     fun updateState(state: DetailsState): DetailsScreenState {
+        val cardTypesResolver = state.scanResponse?.cardTypesResolver
         val settings = SettingsElement.values().mapNotNull {
             when (it) {
                 SettingsElement.WalletConnect -> {
-                    if (state.scanResponse?.card?.isMultiwalletAllowed == true) it else null
+                    if (cardTypesResolver?.isMultiwalletAllowed() == true) it else null
                 }
-                SettingsElement.SendFeedback -> if (state.scanResponse?.card?.isSaltPay != true) it else null
+                SettingsElement.SendFeedback ->
+                    if (cardTypesResolver?.isSaltPay() != true) it else null
                 SettingsElement.LinkMoreCards -> {
                     // if (state.createBackupAllowed) it else null
                     // TODO: SaltPay: temporary excluding backup process for Visa cards
-                    if (state.createBackupAllowed && state.scanResponse?.card?.isSaltPay != true) it else null
+                    if (state.createBackupAllowed && cardTypesResolver?.isSaltPay() != true) it else null
                 }
                 SettingsElement.PrivacyPolicy -> {
                     if (state.privacyPolicyUrl != null) it else null
                 }
-                SettingsElement.AppSettings -> null // TODO: until we implement settings from this screen
-                SettingsElement.AppCurrency -> if (state.scanResponse?.card?.isMultiwalletAllowed != true) it else null
-                SettingsElement.TermsOfUse -> if (state.scanResponse?.card?.isStart2Coin == true) it else null
+                SettingsElement.AppSettings -> if (state.appSettingsState.isBiometricsAvailable) it else null
+                SettingsElement.AppCurrency -> if (cardTypesResolver?.isMultiwalletAllowed() != true) it else null
+                SettingsElement.ReferralProgram -> if (cardTypesResolver?.isTangemWallet() == true) it else null
                 else -> it
             }
         }
 
         return DetailsScreenState(
-            settings,
+            elements = settings,
             tangemLinks = getSocialLinks(),
             tangemVersion = getTangemAppVersion(),
             appCurrency = state.appCurrency.name,
@@ -51,46 +54,53 @@ 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) {
         when (item) {
             SettingsElement.WalletConnect -> {
+                Analytics.send(Settings.ButtonWalletConnect())
                 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 -> {
-                store.dispatch(DisclaimerAction.Show())
-            }
-            SettingsElement.TermsOfUse -> {
-                store.dispatch(DetailsAction.ShowDisclaimer)
+                store.dispatch(DisclaimerAction.Show(AppScreen.Details))
             }
             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..8ea18c0604 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,10 +38,10 @@ class ResetCardFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     ResetCardScreen(
                         state = screenState.value,
-                        onBackPressed = { store.dispatch(NavigationAction.PopBackTo()) },
+                        onBackClick = { 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..c73f6bf836 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
@@ -21,89 +21,78 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
 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.compose.TangemTypography
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.tap.features.details.ui.cardsettings.resolveReference
 import com.tangem.tap.features.details.ui.common.DetailsMainButton
 import com.tangem.tap.features.details.ui.common.ScreenTitle
 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, onBackClick: () -> Unit) {
+    SettingsScreensScaffold(
+        content = { ResetCardView(state = state) },
+        onBackClick = onBackClick,
+        backgroundColor = Color.Transparent,
+    )
 }
 
+@Suppress("LongMethod", "MagicNumber")
 @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),
+                painter = painterResource(id = R.drawable.ill_reset_background),
+                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),
-                style = TangemTypography.headline3,
-                color = colorResource(id = R.color.text_primary_1),
+                modifier = Modifier.padding(start = 20.dp, end = 20.dp),
+                style = TangemTheme.typography.h3,
+                color = TangemTheme.colors.text.primary1,
             )
 
-            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),
-                style = TangemTypography.body1,
-                color = colorResource(id = R.color.text_secondary),
+                text = state.descriptionText.resolveReference(),
+                modifier = Modifier.padding(start = 20.dp, end = 20.dp),
+                style = TangemTheme.typography.body1,
+                color = TangemTheme.colors.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(
@@ -115,25 +104,23 @@ fun ResetCardView(
                         ),
                         contentDescription = null,
                         tint = if (state.accepted) {
-                            colorResource(id = R.color.icon_accent)
+                            TangemTheme.colors.icon.accent
                         } else {
-                            colorResource(id = R.color.icon_secondary)
+                            TangemTheme.colors.icon.secondary
                         },
                     )
                 }
                 Text(
                     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),
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.secondary,
+                    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),
@@ -145,10 +132,40 @@ fun ResetCardView(
     }
 }
 
+// region Preview
 @Composable
-@Preview
-fun ResetCardScreenPreview(
-
+private fun ResetCardScreenSample(
+    modifier: Modifier = Modifier,
 ) {
-    ResetCardScreen(state = ResetCardScreenState(onAcceptWarningToggleClick = {}, accepted = true) {}, {})
-}
\ No newline at end of file
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.secondary),
+    ) {
+        ResetCardScreen(
+            state = ResetCardScreenState(
+                accepted = true,
+                descriptionText = TextReference.Res(R.string.reset_card_with_backup_to_factory_message),
+                onAcceptWarningToggleClick = {},
+                onResetButtonClick = {},
+            ),
+            onBackClick = {},
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun ResetCardScreenPreview_Light() {
+    TangemTheme {
+        ResetCardScreenSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun ResetCardScreenPreview_Dark() {
+    TangemTheme(isDark = true) {
+        ResetCardScreenSample()
+    }
+}
+// endregion Preview
\ 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..fee3e41a5b 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,7 +1,10 @@
 package com.tangem.tap.features.details.ui.resetcard
 
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+
 data class ResetCardScreenState(
     val accepted: Boolean = false,
+    val descriptionText: TextReference,
     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..9ba899bc7d 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,13 +3,20 @@ 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.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.tap.features.details.ui.utils.toResetCardDescriptionText
 import org.rekotlin.Store
 
 class ResetCardViewModel(private val store: Store<AppState>) {
 
     fun updateState(state: CardSettingsState?): ResetCardScreenState {
+        val descriptionText = state?.cardInfo
+            ?.toResetCardDescriptionText()
+            ?: TextReference.Str(value = "")
+
         return ResetCardScreenState(
             accepted = state?.resetConfirmed ?: false,
+            descriptionText = descriptionText,
             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..dcddb62a2f 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,10 +38,10 @@ class SecurityModeFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     SecurityModeScreen(
                         state = screenState.value,
-                        onBackPressed = { store.dispatch(NavigationAction.PopBackTo()) },
+                        onBackClick = { store.dispatch(NavigationAction.PopBackTo()) },
                     )
                 }
             }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
index 66f6adcab7..383fa7b498 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
@@ -28,36 +28,27 @@ import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.wallet.R
 
 @Composable
-fun SecurityModeScreen(
-    state: SecurityModeScreenState,
-    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun SecurityModeScreen(state: SecurityModeScreenState, onBackClick: () -> Unit) {
     SettingsScreensScaffold(
-        content = { SecurityModeOptions(state = state, modifier = modifier) },
+        content = { SecurityModeOptions(state = state) },
         // titleRes = R.string.card_settings_security_mode,
-        onBackClick = onBackPressed,
+        onBackClick = onBackClick,
     )
 }
 
 @Composable
-fun SecurityModeOptions(
-    state: SecurityModeScreenState,
-    modifier: Modifier = Modifier,
-) {
-
+fun SecurityModeOptions(state: SecurityModeScreenState) {
     Column(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
             .padding(bottom = 28.dp),
         verticalArrangement = Arrangement.SpaceBetween,
     ) {
-        ScreenTitle(titleRes = R.string.card_settings_security_mode, modifier.padding(bottom = 36.dp))
-
+        ScreenTitle(titleRes = R.string.card_settings_security_mode, Modifier.padding(bottom = 36.dp))
 
         state.availableOptions.map {
-            SecurityOption(option = it, state = state, modifier = modifier)
+            SecurityOption(option = it, state = state)
         }
 
         Spacer(modifier = Modifier.weight(1f))
@@ -66,17 +57,13 @@ fun SecurityModeOptions(
             title = stringResource(id = R.string.common_save_changes),
             enabled = state.isSaveChangesEnabled,
             onClick = state.onSaveChangesClicked,
-            modifier = modifier
-                .padding(start = 20.dp, end = 20.dp),
+            modifier = Modifier.padding(start = 20.dp, end = 20.dp),
         )
     }
 }
 
 @Composable
-fun SecurityOption(
-    option: SecurityOption, state: SecurityModeScreenState,
-    modifier: Modifier,
-) {
+fun SecurityOption(option: SecurityOption, state: SecurityModeScreenState) {
     val selected = option == state.selectedSecurityMode
 
     val title = option.toTitleRes()
@@ -88,17 +75,18 @@ fun SecurityOption(
     }
 
     Row(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxWidth()
             .selectable(
-                selected = selected, onClick = { state.onNewModeSelected(option) },
+                selected = selected,
+                onClick = { state.onNewModeSelected(option) },
             )
             .padding(start = 20.dp, end = 20.dp, top = 16.dp, bottom = 16.dp),
     ) {
-
         RadioButton(
-            selected = selected, onClick = null,
-            modifier = modifier.padding(end = 20.dp),
+            selected = selected,
+            onClick = null,
+            modifier = Modifier.padding(end = 20.dp),
             colors = RadioButtonDefaults.colors(
                 unselectedColor = colorResource(id = R.color.icon_secondary),
                 selectedColor = colorResource(id = R.color.icon_accent),
@@ -111,7 +99,7 @@ fun SecurityOption(
                 style = TangemTypography.subtitle1,
                 color = colorResource(id = R.color.text_primary_1),
             )
-            Spacer(modifier = modifier.size(4.dp))
+            Spacer(modifier = Modifier.size(4.dp))
             Text(
                 text = stringResource(id = subtitle),
                 style = TangemTypography.body2,
@@ -123,7 +111,7 @@ fun SecurityOption(
 
 @Preview
 @Composable
-fun SecurityModeScreenPreview() {
+private fun SecurityModeScreenPreview() {
     SecurityModeScreen(
         state = SecurityModeScreenState(
             availableOptions = SecurityOption.values().toList(),
@@ -132,6 +120,6 @@ fun SecurityModeScreenPreview() {
             onNewModeSelected = {},
             onSaveChangesClicked = {},
         ),
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt
index b25277864d..a0666ff19d 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt
@@ -9,13 +9,15 @@ import org.rekotlin.Store
 class SecurityModeViewModel(val store: Store<AppState>) {
 
     fun updateState(state: ManageSecurityState?): SecurityModeScreenState {
-        if (state == null) return SecurityModeScreenState(
-            availableOptions = emptyList(),
-            selectedSecurityMode = SecurityOption.LongTap,
-            isSaveChangesEnabled = false,
-            onNewModeSelected = {},
-            onSaveChangesClicked = {},
-        )
+        if (state == null) {
+            return SecurityModeScreenState(
+                availableOptions = emptyList(),
+                selectedSecurityMode = SecurityOption.LongTap,
+                isSaveChangesEnabled = false,
+                onNewModeSelected = {},
+                onSaveChangesClicked = {},
+            )
+        }
         return SecurityModeScreenState(
             availableOptions = state.allowedOptions.toList(),
             selectedSecurityMode = state.selectedOption,
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/utils/Mappers.kt b/app/src/main/java/com/tangem/tap/features/details/ui/utils/Mappers.kt
new file mode 100644
index 0000000000..459e5ba49a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/utils/Mappers.kt
@@ -0,0 +1,13 @@
+package com.tangem.tap.features.details.ui.utils
+
+import com.tangem.tap.features.details.redux.CardInfo
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.wallet.R
+
+internal fun CardInfo.toResetCardDescriptionText(): TextReference {
+    return if (!this.hasBackup || this.isTwin) {
+        TextReference.Res(R.string.reset_card_without_backup_to_factory_message)
+    } else {
+        TextReference.Res(R.string.reset_card_with_backup_to_factory_message)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/QrScanFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/QrScanFragment.kt
index 0ee7263879..927adfe845 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/QrScanFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/QrScanFragment.kt
@@ -88,5 +88,4 @@ class QrScanFragment : Fragment(0), ZXingScannerView.ResultHandler {
     private fun requestPermission() {
         requestPermissions(arrayOf(Manifest.permission.CAMERA), CameraView.PERMISSION_REQUEST_CODE)
     }
-
 }
\ No newline at end of file
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..3ed76fdee2 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,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.analytics.Analytics
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.common.analytics.events.WalletConnect
 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
@@ -23,6 +25,7 @@ class WalletConnectFragment : Fragment(), StoreSubscriber<WalletConnectState> {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Analytics.send(WalletConnect.ScreenOpened())
         val inflater = TransitionInflater.from(requireContext())
         enterTransition = inflater.inflateTransition(android.R.transition.fade)
         exitTransition = inflater.inflateTransition(android.R.transition.fade)
@@ -36,10 +39,10 @@ class WalletConnectFragment : Fragment(), StoreSubscriber<WalletConnectState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     WalletConnectScreen(
                         state = screenState.value,
-                        onBackPressed = {
+                        onBackClick = {
                             if (screenState.value.isLoading) {
                                 store.dispatch(
                                     WalletConnectAction.FailureEstablishingSession(
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..caefb4546a 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,34 +30,37 @@ 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.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
 import com.tangem.wallet.R
 
 @Composable
-fun WalletConnectScreen(
-    state: WalletConnectScreenState,
-    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
+fun WalletConnectScreen(state: WalletConnectScreenState, onBackClick: () -> Unit) {
     val context = LocalContext.current
 
     SettingsScreensScaffold(
         content = {
             if (state.sessions.isEmpty()) {
-                EmptyScreen(state, modifier)
+                EmptyScreen(state)
             } else {
-                WalletConnectSessions(state, modifier)
+                WalletConnectSessions(state)
             }
         },
         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,
-        onBackClick = onBackPressed,
+        onBackClick = onBackClick,
     )
 }
 
@@ -74,22 +77,22 @@ private fun AddSessionFab(
         modifier = modifier,
     ) {
         Icon(
-            painter = painterResource(id = R.drawable.ic_plus),
+            painter = painterResource(id = R.drawable.ic_plus_24),
             contentDescription = "",
         )
     }
 }
 
 @Composable
-private fun EmptyScreen(state: WalletConnectScreenState, modifier: Modifier = Modifier) {
+private fun EmptyScreen(state: WalletConnectScreenState) {
     if (state.isLoading) {
         LinearProgressIndicator(
-            modifier = modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth(),
             color = colorResource(id = R.color.icon_accent),
         )
     }
     Column(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxSize()
             .padding(bottom = 64.dp),
         verticalArrangement = Arrangement.Center,
@@ -100,10 +103,9 @@ private fun EmptyScreen(state: WalletConnectScreenState, modifier: Modifier = Mo
             contentDescription = "",
             colorFilter = ColorFilter.tint(colorResource(id = R.color.icon_inactive)),
             contentScale = ContentScale.FillWidth,
-            modifier = modifier
-                .width(width = 100.dp),
+            modifier = Modifier.width(width = 100.dp),
         )
-        Spacer(modifier = modifier.size(24.dp))
+        Spacer(modifier = Modifier.size(24.dp))
         Text(
             text = stringResource(id = R.string.wallet_connect_subtitle),
             style = TangemTypography.body2,
@@ -113,28 +115,25 @@ private fun EmptyScreen(state: WalletConnectScreenState, modifier: Modifier = Mo
 }
 
 @Composable
-private fun WalletConnectSessions(
-    state: WalletConnectScreenState,
-    modifier: Modifier = Modifier,
-) {
+private fun WalletConnectSessions(state: WalletConnectScreenState) {
     if (state.isLoading) {
         LinearProgressIndicator(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .height(2.dp),
             color = colorResource(id = R.color.icon_accent),
         )
     } else {
-        Spacer(modifier = modifier.height(2.dp))
+        Spacer(modifier = Modifier.height(2.dp))
     }
 
     LazyColumn(
-        modifier = modifier.fillMaxSize(),
+        modifier = Modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         items(state.sessions) { session ->
             Row(
-                modifier = modifier
+                modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 20.dp, vertical = 16.dp),
                 horizontalArrangement = Arrangement.SpaceBetween,
@@ -144,10 +143,13 @@ private fun WalletConnectSessions(
                     text = session.description,
                     style = TangemTypography.subtitle1,
                     color = colorResource(id = R.color.text_primary_1),
-                    modifier = modifier.weight(1f),
+                    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),
@@ -162,7 +164,7 @@ private fun WalletConnectSessions(
 
 @Composable
 @Preview
-fun WalletConnectScreenPreview() {
+private fun WalletConnectScreenPreview() {
     WalletConnectScreen(
         state = WalletConnectScreenState(
             sessions = listOf(
@@ -175,4 +177,4 @@ fun WalletConnectScreenPreview() {
         ),
         {},
     )
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt
index e1d915dc5b..e61b4c22e6 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt
@@ -21,5 +21,4 @@ data class WcSessionForScreen(
             )
         }
     }
-}
-
+}
\ No newline at end of file
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..aba68641df 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
@@ -9,36 +9,36 @@ import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
-class ApproveWcSessionDialog {
-    companion object {
-        fun create(session: WalletConnectSession, networks: List<Blockchain>, context: Context): AlertDialog {
-            val message = context.getString(
-                R.string.wallet_connect_request_session_start,
-                session.peerMeta.name,
-                session.peerMeta.url,
-            )
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
-                setMessage(message)
-                setPositiveButton(context.getText(R.string.common_start)) { _, _ ->
+object ApproveWcSessionDialog {
+    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_title))
+            setMessage(message)
+            setPositiveButton(context.getText(R.string.common_start)) { _, _ ->
+                store.dispatch(GlobalAction.HideDialog)
+                store.dispatch(WalletConnectAction.ChooseNetwork(sessionBlockchain))
+            }
+            if (networks.size > 1) {
+                setNeutralButton(context.getText(R.string.wallet_connect_select_network)) { _, _ ->
                     store.dispatch(GlobalAction.HideDialog)
-                    store.dispatch(WalletConnectAction.ChooseNetwork(session.wallet.blockchain!!))
+                    store.dispatch(WalletConnectAction.SelectNetwork(session = session, networks = networks))
                 }
-                if (networks.size > 1) {
-                    setNeutralButton(context.getText(R.string.wallet_connect_select_network)) { _, _ ->
-                        store.dispatch(GlobalAction.HideDialog)
-                        store.dispatch(WalletConnectAction.SelectNetwork(session = session, networks = networks))
-                    }
-                }
-                setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
-                    store.dispatch(GlobalAction.HideDialog)
-                    store.dispatch(WalletConnectAction.FailureEstablishingSession(session.session))
-                }
-                setOnCancelListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                    store.dispatch(WalletConnectAction.FailureEstablishingSession(session.session))
-                }
-            }.create()
-        }
+            }
+            setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
+                store.dispatch(GlobalAction.HideDialog)
+                store.dispatch(WalletConnectAction.FailureEstablishingSession(session.session))
+            }
+            setOnCancelListener {
+                store.dispatch(GlobalAction.HideDialog)
+                store.dispatch(WalletConnectAction.FailureEstablishingSession(session.session))
+            }
+        }.create()
     }
 }
\ No newline at end of file
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..3d8c70a937 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
@@ -9,57 +9,57 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.trustwallet.walletconnect.models.session.WCSession
 
-class BnbTransactionDialog {
-    companion object {
-        fun create(
-            data: BinanceMessageData,
-            session: WCSession,
-            sessionId: Long,
-            dAppName: String,
-            context: Context,
-        ): AlertDialog {
+object BnbTransactionDialog {
+    fun create(
+        data: BinanceMessageData,
+        session: WCSession,
+        sessionId: Long,
+        dAppName: String,
+        context: Context,
+    ): AlertDialog {
+        val message = when (data) {
+            is BinanceMessageData.Trade -> data.tradeData.map {
+                context.getString(
+                    R.string.wallet_connect_bnb_trade_order_message,
+                    it.symbol,
+                    it.price,
+                    it.quantity,
+                    it.amount,
+                )
+            }.joinToString(separator = "\n\n")
+            is BinanceMessageData.Transfer -> context.getString(
+                R.string.wallet_connect_bnb_transaction_message,
+                data.address,
+                data.outputAddress,
+                data.amount,
+            )
+        }
 
-            val message = when (data) {
-                is BinanceMessageData.Trade -> data.tradeData.map {
-                    context.getString(
-                        R.string.wallet_connect_bnb_trade_order_message,
-                        it.symbol,
-                        it.price,
-                        it.quantity,
-                        it.amount
-                    )
-                }.joinToString ( "\n\n" )
-                is BinanceMessageData.Transfer -> context.getString(
-                    R.string.wallet_connect_bnb_transaction_message,
-                    data.address,
-                    data.outputAddress,
-                    data.amount
+        val fullMessage = context.getString(
+            R.string.wallet_connect_bnb_sign_message,
+            dAppName,
+            message,
+        )
+        val positiveButtonTitle = context.getText(R.string.common_sign)
+
+        return AlertDialog.Builder(context).apply {
+            setTitle(context.getString(R.string.wallet_connect_title))
+            setMessage(fullMessage)
+            setPositiveButton(positiveButtonTitle) { _, _ ->
+                store.dispatch(
+                    WalletConnectAction.BinanceTransaction.Sign(
+                        id = sessionId,
+                        data = data.data,
+                        sessionData = session,
+                    ),
                 )
             }
-
-            val fullMessage = context.getString(
-                R.string.wallet_connect_bnb_sign_message,
-                dAppName, message,
-            )
-            val positiveButtonTitle = context.getText(R.string.common_sign)
-
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
-                setMessage(fullMessage)
-                setPositiveButton(positiveButtonTitle) { _, _ ->
-                        store.dispatch(WalletConnectAction.BinanceTransaction.Sign(
-                            id = sessionId,
-                            data = data.data,
-                            sessionData = session
-                        ))
-                }
-                setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
-                    store.dispatch(WalletConnectAction.RejectRequest(session, sessionId))
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-            }.create()
-        }
+            setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
+                store.dispatch(WalletConnectAction.RejectRequest(session, sessionId))
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+        }.create()
     }
 }
\ No newline at end of file
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..d1962be5e4 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
@@ -9,22 +9,20 @@ import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
-class ClipboardOrScanQrDialog {
-    companion object {
-        fun create(wcUri: String, context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
-                setMessage(context.getText(R.string.wallet_connect_clipboard_alert))
-                setPositiveButton(context.getText(R.string.wallet_connect_paste_from_clipboard)) { _, _ ->
-                    store.dispatch(WalletConnectAction.OpenSession(wcUri))
-                }
-                setNegativeButton(context.getText(R.string.wallet_connect_scan_new_code)) { _, _ ->
-                    store.dispatch(NavigationAction.NavigateTo(AppScreen.QrScan))
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-            }.create()
-        }
+object ClipboardOrScanQrDialog {
+    fun create(wcUri: String, context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            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))
+            }
+            setNegativeButton(context.getText(R.string.wallet_connect_scan_new_code)) { _, _ ->
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.QrScan))
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+        }.create()
     }
 }
\ No newline at end of file
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..5f6bf384ed 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
@@ -8,33 +8,22 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 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,
-                    )
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
-                setMessage(message)
-                setPositiveButton(context.getText(R.string.common_sign)) { _, _ ->
-                    store.dispatch(WalletConnectAction.SignMessage(data.session))
-                }
-                setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
-                    store.dispatch(WalletConnectAction.RejectRequest(data.session, data.id))
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-            }.create()
-        }
+object PersonalSignDialog {
+    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_title))
+            setMessage(message)
+            setPositiveButton(context.getText(R.string.common_sign)) { _, _ ->
+                store.dispatch(WalletConnectAction.SignMessage(data.session))
+            }
+            setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
+                store.dispatch(WalletConnectAction.RejectRequest(data.session, data.id))
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+        }.create()
     }
 }
 
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..4d502f7275 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
@@ -9,45 +9,40 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.trustwallet.walletconnect.models.session.WCSession
 
-class TransactionDialog {
-    companion object {
-        fun create(
-            data: TransactionRequestDialogData,
-            context: Context,
-        ): AlertDialog {
-            val message = context.getString(
-                R.string.wallet_connect_create_tx_message,
-                data.dAppName,
-                data.dAppUrl,
-                data.amount,
-                data.gasAmount,
-                data.totalAmount,
-                data.balance
-            )
+object TransactionDialog {
+    fun create(data: TransactionRequestDialogData, context: Context): AlertDialog {
+        val message = context.getString(
+            R.string.wallet_connect_create_tx_message,
+            data.dAppName,
+            data.dAppUrl,
+            data.amount,
+            data.gasAmount,
+            data.totalAmount,
+            data.balance,
+        )
 
-            val positiveButtonTitle = when (data.type) {
-                WcTransactionType.EthSignTransaction -> context.getText(R.string.common_sign)
-                WcTransactionType.EthSendTransaction -> context.getText(R.string.common_sign_and_send)
-            }
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
-                setMessage(message)
-                setPositiveButton(positiveButtonTitle) { _, _ ->
-                    if (data.isEnoughFundsToSend) {
-                        store.dispatch(WalletConnectAction.SendTransaction(data.session))
-                    } else {
-                        store.dispatch(WalletConnectAction.RejectRequest(data.session, data.id))
-                        store.dispatch(WalletConnectAction.NotEnoughFunds)
-                    }
-                }
-                setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
-                    store.dispatch(WalletConnectAction.RejectRequest(data.session, data.id))
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-            }.create()
+        val positiveButtonTitle = when (data.type) {
+            WcTransactionType.EthSignTransaction -> context.getText(R.string.common_sign)
+            WcTransactionType.EthSendTransaction -> context.getText(R.string.common_sign_and_send)
         }
+        return AlertDialog.Builder(context).apply {
+            setTitle(context.getString(R.string.wallet_connect_title))
+            setMessage(message)
+            setPositiveButton(positiveButtonTitle) { _, _ ->
+                if (data.isEnoughFundsToSend) {
+                    store.dispatch(WalletConnectAction.SendTransaction(data.session))
+                } else {
+                    store.dispatch(WalletConnectAction.RejectRequest(data.session, data.id))
+                    store.dispatch(WalletConnectAction.NotEnoughFunds)
+                }
+            }
+            setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
+                store.dispatch(WalletConnectAction.RejectRequest(data.session, data.id))
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+        }.create()
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/WcDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/WcDialog.kt
deleted file mode 100644
index f71c14a348..0000000000
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/WcDialog.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.tangem.tap.features.details.ui.walletconnect.dialogs
-
-import android.content.Context
-import androidx.appcompat.app.AlertDialog
-
-class WcDialog {
-    companion object {
-        fun create(dialogData: DialogData, context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(dialogData.title)
-                setMessage(dialogData.message)
-                setPositiveButton(dialogData.positiveButton.title) { _, _ ->
-                    dialogData.positiveButton.action()
-                }
-                setNegativeButton(dialogData.negativeButton.title) { _, _ ->
-                    dialogData.negativeButton.action()
-                }
-                setOnDismissListener { dialogData.onDismissAction() }
-            }.create()
-        }
-    }
-}
-
-data class DialogData(
-    val title: String,
-    val message: String,
-    val positiveButton: ButtonData,
-    val negativeButton: ButtonData,
-    val onDismissAction: () -> Unit,
-)
-
-data class ButtonData(
-    val title: String,
-    val action: () -> Unit,
-)
-
-//class WcDialogMessageBuilder(val messageRes: Int, val data: DialogMessageData? = null) {
-//    fun build(context: Context): String {
-//        when (data) {
-//            null -> context.getString(messageRes)
-//        }
-//    }
-//}
-
-interface DialogMessageData
-
-data class WcTransactionDialogMessageData(
-    val dAppName: String,
-    val dAppUrl: String,
-    val amount: String,
-    val gasAmount: String,
-    val totalAmount: String,
-    val balance: String,
-    val isEnoughFundsToSend: Boolean,
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/Disclaimer.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/Disclaimer.kt
new file mode 100644
index 0000000000..27dd88ee13
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/Disclaimer.kt
@@ -0,0 +1,81 @@
+package com.tangem.tap.features.disclaimer
+
+import android.net.Uri
+
+/**
+[REDACTED_AUTHOR]
+ */
+interface Disclaimer {
+    fun type(): DisclaimerType
+    fun getUri(): Uri
+    fun accept()
+    fun isAccepted(): Boolean
+}
+
+abstract class BaseDisclaimer(
+    protected val dataProvider: DisclaimerDataProvider,
+) : Disclaimer {
+
+    val baseUrl = "https://tangem.com"
+
+    override fun accept() {
+        dataProvider.storage().accept(getPreferenceKey())
+    }
+
+    override fun isAccepted(): Boolean = dataProvider.storage().isAccepted(getPreferenceKey())
+
+    protected open fun getPreferenceKey(): String = type().name
+}
+
+class DummyDisclaimer : Disclaimer {
+    override fun type(): DisclaimerType = DisclaimerType.Tangem
+    override fun getUri(): Uri = Uri.parse("https://tangem.com/tangem_tos.html")
+    override fun accept() {}
+    override fun isAccepted(): Boolean = false
+}
+
+class TangemDisclaimer(dataProvider: DisclaimerDataProvider) : BaseDisclaimer(dataProvider) {
+    override fun type(): DisclaimerType = DisclaimerType.Tangem
+    override fun getUri(): Uri = Uri.parse("$baseUrl/tangem_tos.html")
+    override fun getPreferenceKey(): String = "tangem_tos_accepted"
+}
+
+class SaltPayDisclaimer(dataProvider: DisclaimerDataProvider) : BaseDisclaimer(dataProvider) {
+    override fun type(): DisclaimerType = DisclaimerType.SaltPay
+    override fun getUri(): Uri = Uri.parse("$baseUrl/soltpay_tos.html")
+    override fun getPreferenceKey(): String = "saltPay_tos_accepted"
+}
+
+class Start2CoinDisclaimer(dataProvider: DisclaimerDataProvider) : BaseDisclaimer(dataProvider) {
+    override fun type(): DisclaimerType = DisclaimerType.Start2Coin
+    override fun getUri(): Uri = Uri.parse("$baseUrl/" + filename(dataProvider.getLanguage(), getRegion()))
+    override fun getPreferenceKey(): String = "start2Coin_tos_accepted_${getRegion()}"
+
+    @Suppress("ComplexMethod")
+    private fun filename(languageCode: String, regionCode: String?): String {
+        return when {
+            languageCode == "fr" && regionCode == "ch" -> "start2coin-fr-ch-tangem.html"
+            languageCode == "de" && regionCode == "ch" -> "start2coin-de-ch-tangem.html"
+            languageCode == "en" && regionCode == "ch" -> "start2coin-en-ch-tangem.html"
+            languageCode == "it" && regionCode == "ch" -> "start2coin-it-ch-tangem.html"
+            languageCode == "fr" && regionCode == "fr" -> "start2coin-fr-fr-tangem.html"
+            languageCode == "de" && regionCode == "at" -> "start2coin-de-at-tangem.html"
+            regionCode == "fr" -> "start2coin-fr-fr-tangem.html"
+            regionCode == "ch" -> "start2coin-en-ch-tangem.html"
+            regionCode == "at" -> "start2coin-de-at-tangem.html"
+            else -> "start2coin-fr-fr-tangem.html"
+        }
+    }
+
+    private fun getRegion(): String? {
+        val cardId = dataProvider.getCardId()
+        if (cardId.isEmpty()) return null
+
+        return when (cardId[1]) {
+            '0' -> "fr"
+            '1' -> "ch"
+            '2' -> "at"
+            else -> null
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerDataProvider.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerDataProvider.kt
new file mode 100644
index 0000000000..0097f34142
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerDataProvider.kt
@@ -0,0 +1,12 @@
+package com.tangem.tap.features.disclaimer
+
+import com.tangem.tap.persistence.DisclaimerPrefStorage
+
+/**
+[REDACTED_AUTHOR]
+ */
+interface DisclaimerDataProvider {
+    fun getLanguage(): String
+    fun getCardId(): String
+    fun storage(): DisclaimerPrefStorage
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerType.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerType.kt
new file mode 100644
index 0000000000..d6af0e0596
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerType.kt
@@ -0,0 +1,44 @@
+package com.tangem.tap.features.disclaimer
+
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.TapWorkarounds.isSaltPay
+import com.tangem.domain.common.TapWorkarounds.isStart2Coin
+import com.tangem.tap.persistence.DisclaimerPrefStorage
+import com.tangem.tap.preferencesStorage
+import java.util.*
+
+/**
+[REDACTED_AUTHOR]
+ */
+enum class DisclaimerType {
+    Tangem,
+    SaltPay,
+    Start2Coin;
+
+    companion object {
+        fun get(cardDTO: CardDTO): DisclaimerType {
+            return when {
+                cardDTO.isSaltPay -> SaltPay
+                cardDTO.isStart2Coin -> Start2Coin
+                else -> Tangem
+            }
+        }
+    }
+}
+
+fun DisclaimerType.createDisclaimer(cardDTO: CardDTO): Disclaimer {
+    val dataProvider = provideDisclaimerDataProvider(cardDTO.cardId)
+    return when (this) {
+        DisclaimerType.Tangem -> TangemDisclaimer(dataProvider)
+        DisclaimerType.SaltPay -> SaltPayDisclaimer(dataProvider)
+        DisclaimerType.Start2Coin -> Start2CoinDisclaimer(dataProvider)
+    }
+}
+
+private fun provideDisclaimerDataProvider(cardId: String): DisclaimerDataProvider {
+    return object : DisclaimerDataProvider {
+        override fun getLanguage(): String = Locale.getDefault().language
+        override fun getCardId(): String = cardId
+        override fun storage(): DisclaimerPrefStorage = preferencesStorage.disclaimerPrefStorage
+    }
+}
\ No newline at end of file
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..1a712e1c49 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
@@ -1,17 +1,21 @@
 package com.tangem.tap.features.disclaimer.redux
 
-import com.tangem.common.extensions.VoidCallback
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.features.disclaimer.Disclaimer
+import com.tangem.tap.features.wallet.redux.ProgressState
 import org.rekotlin.Action
 
 sealed class DisclaimerAction : Action {
 
-    data class SetDisclaimerType(
-        val type: DisclaimerType,
+    data class SetDisclaimer(val disclaimer: Disclaimer) : DisclaimerAction()
+
+    data class Show(
+        val fromScreen: AppScreen,
+        val callback: DisclaimerCallback? = null,
     ) : DisclaimerAction()
 
-    data class Show(val onAcceptCallback: VoidCallback? = null) : DisclaimerAction()
-    data class AcceptDisclaimer(val type: DisclaimerType) : DisclaimerAction()
+    object AcceptDisclaimer : DisclaimerAction()
+    object OnBackPressed : DisclaimerAction()
 
-    internal data class UpdateState(val type: DisclaimerType, val accepted: Boolean) : DisclaimerAction()
-    internal data class SetOnAcceptCallback(val onAcceptCallback: VoidCallback? = null) : DisclaimerAction()
+    data class OnProgressStateChanged(val state: ProgressState?) : 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..ca71193f2a 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
@@ -3,7 +3,6 @@ package com.tangem.tap.features.disclaimer.redux
 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.preferencesStorage
 import com.tangem.tap.store
 import org.rekotlin.Action
 import org.rekotlin.Middleware
@@ -23,43 +22,17 @@ private fun handleDisclaimerMiddleware(action: Action, appState: AppState) {
     val state = appState.disclaimerState
 
     when (action) {
-        is DisclaimerAction.SetDisclaimerType -> {
-            handleUpdateState = action.type.createUpdateState()
-        }
         is DisclaimerAction.Show -> {
-            handleUpdateState = state.type.createUpdateState()
-            store.dispatch(DisclaimerAction.SetOnAcceptCallback(action.onAcceptCallback))
             store.dispatch(NavigationAction.NavigateTo(AppScreen.Disclaimer))
         }
         is DisclaimerAction.AcceptDisclaimer -> {
-            action.type.accept()
-            handleUpdateState = action.type.createUpdateState()
+            state.disclaimer.accept()
             store.dispatch(NavigationAction.PopBackTo())
-            state.onAcceptCallback?.invoke()
-            store.dispatch(DisclaimerAction.SetOnAcceptCallback(null))
+            state.callback?.onAccept?.invoke()
+        }
+        is DisclaimerAction.OnBackPressed -> {
+            store.dispatch(NavigationAction.PopBackTo())
+            state.callback?.onDismiss?.invoke()
         }
     }
-}
-
-private fun DisclaimerType.accept() = when (this) {
-    DisclaimerType.SaltPay -> preferencesStorage.disclaimerPrefStorage.hasSaltPayTosAccepted = true
-    DisclaimerType.Tangem -> preferencesStorage.disclaimerPrefStorage.hasTangemTosAccepted = true
-}
-
-fun DisclaimerType.isAccepted(): Boolean = when (this) {
-    DisclaimerType.SaltPay -> preferencesStorage.disclaimerPrefStorage.hasSaltPayTosAccepted
-    DisclaimerType.Tangem -> preferencesStorage.disclaimerPrefStorage.hasTangemTosAccepted
-}
-
-private fun DisclaimerType.createUpdateState(): DisclaimerAction.UpdateState {
-    return DisclaimerAction.UpdateState(this, this.isAccepted())
-}
-
-private var handleUpdateState: DisclaimerAction.UpdateState = DisclaimerAction.UpdateState(
-    type = DisclaimerType.Tangem,
-    accepted = false,
-)
-    set(value) {
-        field = value
-        store.dispatch(value)
-    }
\ No newline at end of file
+}
\ No newline at end of file
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..bef592e97e 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
@@ -3,10 +3,8 @@ package com.tangem.tap.features.disclaimer.redux
 import com.tangem.tap.common.redux.AppState
 import org.rekotlin.Action
 
-class DisclaimerReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): DisclaimerState = internalReduce(action, state)
-    }
+object DisclaimerReducer {
+    fun reduce(action: Action, state: AppState): DisclaimerState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, state: AppState): DisclaimerState {
@@ -15,12 +13,19 @@ private fun internalReduce(action: Action, state: AppState): DisclaimerState {
     val disclaimerState = state.disclaimerState
 
     return when (action) {
-        is DisclaimerAction.UpdateState -> disclaimerState.copy(
-            type = action.type,
-            accepted = action.accepted,
+        is DisclaimerAction.SetDisclaimer -> disclaimerState.copy(
+            disclaimer = action.disclaimer,
         )
-        is DisclaimerAction.SetOnAcceptCallback -> disclaimerState.copy(
-            onAcceptCallback = action.onAcceptCallback,
+        is DisclaimerAction.Show -> disclaimerState.copy(
+            showedFromScreen = action.fromScreen,
+            callback = action.callback,
+        )
+        is DisclaimerAction.AcceptDisclaimer, is DisclaimerAction.OnBackPressed -> disclaimerState.copy(
+            callback = null,
+            progressState = null,
+        )
+        is DisclaimerAction.OnProgressStateChanged -> disclaimerState.copy(
+            progressState = action.state,
         )
         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..b610475974 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,30 +1,20 @@
 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.ScanResponse
-import com.tangem.domain.common.TapWorkarounds.isSaltPay
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.features.disclaimer.Disclaimer
+import com.tangem.tap.features.disclaimer.DummyDisclaimer
+import com.tangem.tap.features.wallet.redux.ProgressState
 import org.rekotlin.StateType
 
 data class DisclaimerState(
-    val accepted: Boolean = false,
-    val type: DisclaimerType = DisclaimerType.Tangem,
-    val onAcceptCallback: VoidCallback? = null,
+    val disclaimer: Disclaimer = DummyDisclaimer(),
+    val showedFromScreen: AppScreen = AppScreen.Home,
+    val callback: DisclaimerCallback? = null,
+    val progressState: ProgressState? = null,
 ) : StateType
 
-sealed class DisclaimerType(
-    val uri: Uri,
-) {
-    object Tangem : DisclaimerType(Uri.parse("https://tangem.com/tangem_tos.html"))
-    object SaltPay : DisclaimerType(Uri.parse("https://tangem.com/soltpay_tos.html"))
-
-    companion object {
-        fun get(scanResponse: ScanResponse): DisclaimerType = get(scanResponse.card)
-
-        fun get(card: Card): DisclaimerType = when {
-            card.isSaltPay -> SaltPay
-            else -> Tangem
-        }
-    }
-}
\ No newline at end of file
+data class DisclaimerCallback(
+    val onAccept: VoidCallback? = null,
+    val onDismiss: VoidCallback? = null,
+)
\ No newline at end of file
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..e19be8e926 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,78 +2,123 @@ 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.tap.common.extensions.configureSettings
+import com.tangem.core.ui.fragments.setStatusBarColor
+import com.tangem.tap.common.extensions.beginDelayedTransition
 import com.tangem.tap.common.extensions.hide
-import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.common.extensions.show
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.features.BaseFragment
+import com.tangem.tap.features.addBackPressHandler
+import com.tangem.tap.features.disclaimer.Disclaimer
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
 import com.tangem.tap.features.disclaimer.redux.DisclaimerState
+import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.store
 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)
+    private val webViewClient = DisclaimerWebViewClient()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        activity?.onBackPressedDispatcher?.addCallback(
-            this,
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    store.dispatch(NavigationAction.PopBackTo())
-                }
-            },
-        )
+    override fun configureTransitions() {
         val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(android.R.transition.slide_bottom)
-        exitTransition = inflater.inflateTransition(android.R.transition.slide_top)
-    }
-
-    override fun onStart() {
-        super.onStart()
-        store.subscribe(this) { state ->
-            state.skipRepeats { oldState, newState ->
-                oldState.disclaimerState == newState.disclaimerState
-            }.select { it.disclaimerState }
+        when (store.state.disclaimerState.showedFromScreen) {
+            AppScreen.Home -> {
+                enterTransition = inflater.inflateTransition(android.R.transition.slide_bottom)
+                exitTransition = inflater.inflateTransition(android.R.transition.slide_top)
+            }
+            AppScreen.Details -> {
+                enterTransition = inflater.inflateTransition(android.R.transition.fade)
+                exitTransition = inflater.inflateTransition(android.R.transition.fade)
+            }
+            else -> {}
         }
     }
 
-    override fun onStop() {
-        super.onStop()
-        store.unsubscribe(this)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.toolbar.setNavigationOnClickListener {
-            store.dispatch(NavigationAction.PopBackTo())
+        addBackPressHandler(handler = this)
+
+        binding.apply {
+            toolbar.setNavigationOnClickListener { handleOnBackPressed() }
+            webView.apply {
+                settings.allowFileAccess = false
+                settings.javaScriptEnabled = false
+                webViewClient = this@DisclaimerFragment.webViewClient
+            }
+            webView.hide()
+            groupError.hide()
+            groupAccept.hide()
+            groupLoading.hide()
+
+            btnAccept.setOnClickListener {
+                store.dispatch(DisclaimerAction.AcceptDisclaimer)
+            }
+            btnRepeat.setOnClickListener {
+                webViewClient.reset()
+            }
         }
-        initViews()
     }
 
-    private fun initViews() {
-        binding.webView.configureSettings()
+    override fun onStart() {
+        super.onStart()
+        setStatusBarColor(R.color.backgroundLightGray)
+
+        webViewClient.onProgressStateChanged = { store.dispatch(DisclaimerAction.OnProgressStateChanged(it)) }
+        store.subscribe(subscriber = this) { state ->
+            state
+                .skipRepeats { oldState, newState -> oldState.disclaimerState == newState.disclaimerState }
+                .select(AppState::disclaimerState)
+        }
+    }
+
+    override fun onStop() {
+        webViewClient.onProgressStateChanged = null
+        store.unsubscribe(this)
+        super.onStop()
     }
 
     override fun newState(state: DisclaimerState) = with(binding) {
         if (activity == null || view == null) return
 
-        if (state.accepted) {
-            halfTransparentOverlay.hide()
-            btnAccept.hide()
-        }
+        updateUiVisibility(state.disclaimer, state.progressState)
+        binding.webView.loadUrl(state.disclaimer.getUri().toString())
+    }
 
-        btnAccept.setOnClickListener {
-            store.dispatch(DisclaimerAction.AcceptDisclaimer(state.type))
+    private fun updateUiVisibility(disclaimer: Disclaimer, progressState: ProgressState?) = with(binding) {
+        when (progressState) {
+            ProgressState.Loading -> {
+                root.beginDelayedTransition()
+                webView.hide()
+                groupError.hide()
+                groupAccept.hide()
+                groupLoading.show()
+            }
+            ProgressState.Done -> {
+                root.beginDelayedTransition()
+                groupError.hide()
+                groupLoading.hide()
+                webView.show()
+                groupAccept.show(!disclaimer.isAccepted())
+            }
+            ProgressState.Error -> {
+                root.beginDelayedTransition()
+                webView.hide()
+                groupAccept.hide()
+                groupLoading.hide()
+                groupError.show()
+            }
+            else -> {}
         }
+    }
 
-        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/disclaimer/ui/DisclaimerWebViewClient.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerWebViewClient.kt
new file mode 100644
index 0000000000..4e07832feb
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerWebViewClient.kt
@@ -0,0 +1,72 @@
+package com.tangem.tap.features.disclaimer.ui
+
+import android.graphics.Bitmap
+import android.webkit.WebResourceError
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import com.tangem.common.extensions.ifNotNull
+import com.tangem.tap.features.wallet.redux.ProgressState
+
+class DisclaimerWebViewClient : WebViewClient() {
+
+    var onProgressStateChanged: ((ProgressState) -> Unit)? = null
+
+    private var loadingUrl: String? = null
+    private var loadedUrl: String? = null
+
+    private var progressState: ProgressState = ProgressState.Loading
+        set(value) {
+            field = value
+            onProgressStateChanged?.invoke(value)
+        }
+
+    fun reset() {
+        loadingUrl = null
+        loadedUrl = null
+        progressState = ProgressState.Loading
+    }
+
+    override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+        super.onPageStarted(view, url, favicon)
+
+        if (loadingUrl != url) progressState = ProgressState.Loading
+        loadingUrl = url
+    }
+
+    override fun onPageFinished(view: WebView?, url: String?) {
+        super.onPageFinished(view, url)
+
+        if (loadedUrl != url) progressState = ProgressState.Done
+        loadedUrl = url
+    }
+
+    override fun onReceivedError(
+        view: WebView?,
+        resourceRequest: WebResourceRequest?,
+        error: WebResourceError?,
+    ) {
+        super.onReceivedError(view, resourceRequest, error)
+        error?.let { progressState = ProgressState.Error }
+    }
+
+    override fun onReceivedHttpError(
+        view: WebView?,
+        resourceRequest: WebResourceRequest?,
+        errorResponse: WebResourceResponse?,
+    ) {
+        super.onReceivedHttpError(view, resourceRequest, errorResponse)
+
+        ifNotNull(resourceRequest, errorResponse) { request, response ->
+            if (request.url?.toString() != loadingUrl || response.statusCode < RESPONSE_USER_ERROR_STATUS_CODE) return
+            if (progressState != ProgressState.Done) return
+
+            progressState = ProgressState.Error
+        }
+    }
+
+    companion object {
+        private const val RESPONSE_USER_ERROR_STATUS_CODE = 400
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/feedback/FeedbackManager.kt b/app/src/main/java/com/tangem/tap/features/feedback/FeedbackManager.kt
deleted file mode 100644
index e69de29bb2..0000000000
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..f01fdaeb7c 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,12 +12,13 @@ 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.core.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
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.home.redux.HomeState
-import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.features.tokens.redux.TokensAction
 import com.tangem.tap.store
 import org.rekotlin.StoreSubscriber
@@ -24,10 +26,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 +37,18 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        val context = container?.context ?: return null
-
-        store.dispatch(BackupAction.CheckForUnfinishedBackup)
-
-        composeView = ComposeView(context).apply {
+    ): View {
+        return ComposeView(inflater.context).apply {
             setContent {
+                BackHandler {
+                    requireActivity().finish()
+                }
+
                 AppCompatTheme {
                     ScreenContent()
                 }
             }
         }
-
-        return composeView
     }
 
     override fun onStart() {
@@ -68,7 +68,6 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
     override fun onDestroyView() {
         super.onDestroyView()
         rollbackStatusBarIconsColor()
-        composeView = null
     }
 
     override fun newState(state: HomeState) {
@@ -77,13 +76,21 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
         homeState.value = state
     }
 
+    @Suppress("TopLevelComposableFunctions")
     @Composable
     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())
@@ -92,9 +99,9 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
     }
 
     /*
-    * !!! Workaround !!!
-    * Used to roll back the color of icons in the system bars after the stories screen
-    * */
+     * !!! Workaround !!!
+     * Used to roll back the color of icons in the system bars after the stories screen
+     */
     private fun rollbackStatusBarIconsColor() {
         val windowInsetsController = WindowInsetsControllerCompat(
             activity?.window ?: return,
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt
index 58f9356349..76ef1a643e 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt
@@ -22,6 +22,9 @@ import androidx.compose.ui.unit.dp
 import com.tangem.tap.common.compose.extensions.AnimatedValue
 import com.tangem.tap.common.compose.extensions.toAnimatable
 
+private const val SCALE_SWITCH_BARRIER = 1.15f
+
+@Suppress("LongParameterList")
 @Composable
 fun HorizontalSlidingImage(
     painter: Painter,
@@ -39,7 +42,7 @@ fun HorizontalSlidingImage(
             .requiredWidth(itemSize.width)
             .requiredHeight(itemSize.height)
             .graphicsLayer(
-                translationX = translateX.toAnimatable(isPaused = paused, duration = duration).value
+                translationX = translateX.toAnimatable(isPaused = paused, duration = duration).value,
             ),
         alignment = Alignment.TopStart,
         contentScale = ContentScale.FillBounds,
@@ -54,7 +57,7 @@ fun StoriesTextAnimation(
     slideInDelay: Int = 200,
     slideDistance: Dp = 60.dp,
     label: String = "",
-    content: @Composable (Modifier) -> Unit
+    content: @Composable (Modifier) -> Unit,
 ) {
     val isLaunched = remember { mutableStateOf(false) }
     val transition = updateTransition(targetState = isLaunched.value, label = label)
@@ -64,10 +67,10 @@ fun StoriesTextAnimation(
             tween(
                 durationMillis = slideInDuration,
                 delayMillis = slideInDelay,
-                easing = FastOutSlowInEasing
+                easing = FastOutSlowInEasing,
             )
         },
-        label = "Slide in"
+        label = "Slide in",
     ) { value -> if (value) 0.dp else slideDistance }
 
     val alpha = transition.animateFloat(
@@ -75,16 +78,16 @@ fun StoriesTextAnimation(
             tween(
                 durationMillis = slideInDuration * 2,
                 delayMillis = slideInDelay,
-                easing = FastOutSlowInEasing
+                easing = FastOutSlowInEasing,
             )
         },
-        label = "Visibility"
+        label = "Visibility",
     ) { value -> if (value) 1f else 0f }
 
     content(
         Modifier
             .absoluteOffset(y = offsetY.value)
-            .alpha(alpha.value)
+            .alpha(alpha.value),
     )
 
     LaunchedEffect(Unit) { isLaunched.value = true }
@@ -95,9 +98,8 @@ fun StoriesBottomImageAnimation(
     initialScale: Float = 2.5f,
     firstStepDuration: Int,
     totalDuration: Int,
-    content: @Composable (Modifier) -> Unit
+    content: @Composable (Modifier) -> Unit,
 ) {
-    val scaleSwitchBarrier = 1.15f
     val secondStepDuration = totalDuration - firstStepDuration
 
     val isFirstStepLaunched = remember { mutableStateOf(false) }
@@ -105,7 +107,7 @@ fun StoriesBottomImageAnimation(
 
     val firstTransition = updateTransition(
         targetState = isFirstStepLaunched.value,
-        label = "Image appearing"
+        label = "Image appearing",
     )
     val firstScaleStep = firstTransition.animateFloat(
         transitionSpec = {
@@ -114,12 +116,12 @@ fun StoriesBottomImageAnimation(
                 easing = FastOutLinearInEasing,
             )
         },
-        label = "Appearing scale"
-    ) { value -> if (value) scaleSwitchBarrier else initialScale }
+        label = "Appearing scale",
+    ) { value -> if (value) SCALE_SWITCH_BARRIER else initialScale }
 
     val secondTransition = updateTransition(
         targetState = isSecondStepLaunched.value,
-        label = "Image slow outgoing"
+        label = "Image slow outgoing",
     )
     val secondScaleStep = secondTransition.animateFloat(
         transitionSpec = {
@@ -128,15 +130,15 @@ fun StoriesBottomImageAnimation(
                 easing = LinearEasing,
             )
         },
-        label = "Outgoing scale"
-    ) { value -> if (value) 1f else scaleSwitchBarrier }
+        label = "Outgoing scale",
+    ) { value -> if (value) 1f else SCALE_SWITCH_BARRIER }
 
     val fadeIn = firstTransition.animateFloat(
         transitionSpec = { tween(durationMillis = 400) },
-        label = "Fade in on start"
+        label = "Fade in on start",
     ) { value -> if (value) 1f else 0f }
 
-    if (firstScaleStep.value == scaleSwitchBarrier) {
+    if (firstScaleStep.value == SCALE_SWITCH_BARRIER) {
         isSecondStepLaunched.value = true
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
index a459a4d701..ef40d850f6 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
@@ -1,3 +1,5 @@
+@file:Suppress("MagicNumber")
+
 package com.tangem.tap.features.home.compose
 
 import androidx.compose.foundation.Image
@@ -12,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBars
@@ -52,14 +55,16 @@ import com.tangem.tap.features.home.redux.HomeState
 import com.tangem.wallet.R
 import kotlin.math.max
 
+private const val STEPS = 6
+
+@Suppress("LongMethod", "ComplexMethod")
 @Composable
 fun StoriesScreen(
-    homeState: MutableState<HomeState> = mutableStateOf(HomeState()),
+    homeState: MutableState<HomeState>,
     onScanButtonClick: () -> Unit,
     onShopButtonClick: () -> Unit,
     onSearchTokensClick: () -> Unit,
 ) {
-    val steps = 6
     val currentStep = remember { mutableStateOf(1) }
     val systemUiController = rememberSystemUiController()
 
@@ -69,7 +74,7 @@ fun StoriesScreen(
         currentStep.value = max(1, currentStep.value - 1)
     }
     val goToNextScreen = {
-        currentStep.value = if (currentStep.value < steps) currentStep.value + 1 else 1
+        currentStep.value = if (currentStep.value < STEPS) currentStep.value + 1 else 1
     }
 
     val isPressed = remember { mutableStateOf(false) }
@@ -149,11 +154,11 @@ fun StoriesScreen(
             verticalArrangement = Arrangement.Center,
         ) {
             StoriesProgressBar(
-                steps = steps,
+                steps = STEPS,
                 currentStep = currentStep.value,
                 stepDuration = currentStep.duration(),
                 paused = isPaused,
-                onStepFinished = goToNextScreen,
+                onStepFinish = goToNextScreen,
             )
             Image(
                 painter = painterResource(id = R.drawable.ic_tangem_logo),
@@ -181,27 +186,29 @@ fun StoriesScreen(
                 .align(Alignment.BottomCenter)
                 .fillMaxWidth(),
         ) {
-            if (currentStep.value == 4) Button(
-                onClick = onSearchTokensClick,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
-                    .height(48.dp),
-                colors = ButtonDefaults.textButtonColors(
-                    backgroundColor = Color.White,
-                    contentColor = Color(0xFF080C10),
-                ),
-            ) {
-                Image(
-                    painter = painterResource(id = R.drawable.ic_search),
-                    contentDescription = null,
-                )
-                Text(
-                    text = stringResource(id = R.string.search_tokens_title),
-                    fontWeight = FontWeight.Medium,
-                    fontSize = 16.sp,
-                    textAlign = TextAlign.Center,
-                )
+            if (currentStep.value == 4) {
+                Button(
+                    onClick = onSearchTokensClick,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
+                        .heightIn(48.dp),
+                    colors = ButtonDefaults.textButtonColors(
+                        backgroundColor = Color.White,
+                        contentColor = Color(0xFF080C10),
+                    ),
+                ) {
+                    Image(
+                        painter = painterResource(id = R.drawable.ic_search),
+                        contentDescription = null,
+                    )
+                    Text(
+                        text = stringResource(id = R.string.search_tokens_title),
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 16.sp,
+                        textAlign = TextAlign.Center,
+                    )
+                }
             }
             HomeButtons(
                 modifier = Modifier
@@ -216,6 +223,7 @@ fun StoriesScreen(
     }
 }
 
+@Suppress("MagicNumber")
 private fun MutableState<Int>.duration(): Int = when (this.value) {
     1 -> 8000
     else -> 6000
@@ -223,6 +231,11 @@ private fun MutableState<Int>.duration(): Int = when (this.value) {
 
 @Preview
 @Composable
-fun StoriesScreenPreview() {
-    StoriesScreen(onScanButtonClick = {}, onShopButtonClick = {}, onSearchTokensClick = {})
+private fun StoriesScreenPreview() {
+    StoriesScreen(
+        onScanButtonClick = {},
+        onShopButtonClick = {},
+        onSearchTokensClick = {},
+        homeState = remember { mutableStateOf(HomeState()) },
+    )
 }
\ No newline at end of file
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..2a545e623b 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
@@ -47,7 +51,7 @@ fun StoriesRevolutionaryWallet(stepDuration: Int) {
                     isDarkBackground = true,
                 )
             }
-        }
+        },
     )
 }
 
@@ -72,7 +76,7 @@ fun StoriesUltraSecureBackup(isPaused: Boolean, stepDuration: Int) {
         },
         bottomContent = {
             FloatingCardsContent(isPaused, stepDuration)
-        }
+        },
     )
 }
 
@@ -88,7 +92,7 @@ fun StoriesCurrencies(isPaused: Boolean, stepDuration: Int) {
         },
         bottomContent = {
             StoriesCurrenciesContent(paused = isPaused, duration = stepDuration)
-        }
+        },
     )
 }
 
@@ -104,7 +108,7 @@ fun StoriesWeb3(isPaused: Boolean, stepDuration: Int) {
         },
         bottomContent = {
             StoriesWeb3Content(paused = isPaused, duration = stepDuration)
-        }
+        },
     )
 }
 
@@ -129,7 +133,7 @@ fun StoriesWalletForEveryone(stepDuration: Int) {
                     isDarkBackground = true,
                 )
             }
-        }
+        },
     )
 }
 
@@ -142,7 +146,7 @@ private fun SplitContent(
         modifier = Modifier
             .fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Top
+        verticalArrangement = Arrangement.Top,
     ) {
         topContent()
         bottomContent()
@@ -167,6 +171,7 @@ private fun TopContent(
     SpacerH32()
 }
 
+@Suppress("MagicNumber")
 @Composable
 private fun StoriesTitleText(
     text: String,
@@ -183,15 +188,14 @@ private fun StoriesTitleText(
             fontSize = 32.sp,
             fontWeight = FontWeight.SemiBold,
             color = if (isDarkBackground) Color.White else Color(0xFF090E13),
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
     }
 }
 
+@Suppress("MagicNumber")
 @Composable
-private fun StoriesSubtitleText(
-    subtitleText: AnnotatedString,
-) {
+private fun StoriesSubtitleText(subtitleText: AnnotatedString) {
     val color = Color(0xFFA6AAAD)
 
     StoriesTextAnimation(
@@ -205,22 +209,22 @@ private fun StoriesSubtitleText(
             text = subtitleText,
             fontSize = 20.sp,
             color = color,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
     }
 }
 
 @Composable
 private fun StoriesImage(
-    modifier: Modifier = Modifier,
     @DrawableRes drawableResId: Int,
     isDarkBackground: Boolean,
+    modifier: Modifier = Modifier,
 ) {
     Image(
         painter = painterResource(id = drawableResId),
         contentDescription = null,
         contentScale = if (isDarkBackground) ContentScale.Inside else ContentScale.FillWidth,
-        modifier = modifier.fillMaxWidth()
+        modifier = modifier.fillMaxWidth(),
     )
 }
 
@@ -229,7 +233,6 @@ private fun String.annotated(): AnnotatedString {
     return buildAnnotatedString { append(source) }
 }
 
-
 @Preview
 @Composable
 private fun RevolutionaryWalletPreview() {
@@ -248,14 +251,12 @@ private fun CurrenciesPreview() {
     StoriesCurrencies(false, 6000)
 }
 
-
 @Preview
 @Composable
 private fun Web3Preview() {
     StoriesWeb3(false, 6000)
 }
 
-
 @Preview
 @Composable
 private fun WalletForEveryonePreview() {
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..87cee39eb4 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
@@ -53,7 +53,7 @@ fun StoriesCurrenciesContent(
 
                 val chessOffset = if (index.isEven()) 0.dp else scaledItemSize.halfHeight()
                 val animateFrom = chessOffset - moveItemToStartOfScreen
-                val animateTo = 50.dp - (50.dp * index * decreaseRate)
+                val animateTo = 50.dp - 50.dp * index * decreaseRate
 
                 HorizontalSlidingImage(
                     paused = paused,
@@ -64,12 +64,13 @@ fun StoriesCurrenciesContent(
                     targetOffset = animateTo.toPx(),
                     contentDescription = "Currency row",
                 )
-                SpacerH(12.dp)
+                SpacerH12()
             }
         }
     }
 }
 
+@Suppress("MagicNumber")
 @Composable
 fun StoriesWeb3Content(
     paused: Boolean,
@@ -99,7 +100,7 @@ fun StoriesWeb3Content(
 
                 val chessOffset = if (index.isEven()) 0.dp else scaledItemSize.width / 3
                 val animateFrom = chessOffset - moveItemToStartOfScreen
-                val animateTo = 70.dp - (70.dp * index * decreaseRate)
+                val animateTo = 70.dp - 70.dp * index * decreaseRate
 
                 HorizontalSlidingImage(
                     paused = paused,
@@ -112,13 +113,12 @@ 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/content/FirstStoriesContent.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt
index 393642f976..5dcfbb5f1f 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt
@@ -5,8 +5,17 @@ import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Box
+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.foundation.layout.wrapContentSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -25,10 +34,12 @@ import com.tangem.tap.features.home.compose.StoriesBottomImageAnimation
 import com.tangem.tap.features.home.compose.StoriesTextAnimation
 import com.tangem.wallet.R
 
+@Suppress("LongMethod", "ComplexMethod", "MagicNumber")
 @Composable
 fun FirstStoriesContent(
-    isPaused: Boolean, duration: Int = 8_000,
-    hideContent: (Boolean) -> Unit
+    isPaused: Boolean,
+    duration: Int,
+    onHideContent: (Boolean) -> Unit,
 ) {
     val screenState = remember { mutableStateOf(StartingScreenState.INIT) }
     val progress = remember { Animatable(0f) }
@@ -41,8 +52,8 @@ fun FirstStoriesContent(
                 targetValue = 2f,
                 animationSpec = tween(
                     durationMillis = duration,
-                    easing = LinearEasing
-                )
+                    easing = LinearEasing,
+                ),
             )
         }
     }
@@ -60,8 +71,8 @@ fun FirstStoriesContent(
         in 1.2f..2f -> screenState.value = StartingScreenState.MEET_TANGEM
     }
 
-    if (screenState.value == StartingScreenState.INIT) hideContent(true)
-    if (screenState.value == StartingScreenState.BUY) hideContent(false)
+    if (screenState.value == StartingScreenState.INIT) onHideContent(true)
+    if (screenState.value == StartingScreenState.BUY) onHideContent(false)
 
     val style = TextStyle(
         fontSize = 60.sp,
@@ -72,7 +83,6 @@ fun FirstStoriesContent(
     val textId = screenState.textId()
 
     Box(modifier = Modifier.fillMaxSize()) {
-
         if (screenState.isSplashingTextDisplaying()) {
             TextAutoSize(
                 modifier = Modifier
@@ -80,7 +90,7 @@ fun FirstStoriesContent(
                     .padding(start = 20.dp, end = 20.dp, bottom = 100.dp),
                 text = textId?.let { stringResource(textId) } ?: "",
                 textStyle = style,
-                fontSizeRange = FontSizeRange(20.sp, 60.sp)
+                fontSizeRange = FontSizeRange(20.sp, 60.sp),
             )
         } else {
             Column(
@@ -88,7 +98,7 @@ fun FirstStoriesContent(
             ) {
                 Box(
                     modifier = Modifier
-                        .weight(0.7f)
+                        .weight(0.7f),
                 ) {
                     if (screenState.isMeetTangemDisplaying()) {
                         StoriesTextAnimation(
@@ -100,10 +110,9 @@ fun FirstStoriesContent(
                                     .alpha(if (screenState.value == StartingScreenState.SHOW_CARD) 0f else 1f),
                                 text = textId?.let { stringResource(textId) } ?: "",
                                 textStyle = style,
-                                fontSizeRange = FontSizeRange(30.sp, 50.sp)
+                                fontSizeRange = FontSizeRange(30.sp, 50.sp),
                             )
                         }
-
                     }
                 }
                 Box(
@@ -155,9 +164,8 @@ private fun MutableState<StartingScreenState>.isMeetTangemDisplaying(): Boolean
     return this.value == StartingScreenState.MEET_TANGEM
 }
 
-
 @Preview
 @Composable
-fun FirstStoriesPreview() {
+private fun FirstStoriesPreview() {
     FirstStoriesContent(false, 8000) {}
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt
index 8528982857..fcb0fce154 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt
@@ -19,14 +19,13 @@ fun FloatingCardsContent(
     isPaused: Boolean,
     stepDuration: Int,
 ) {
-
     val imageBitmap = asImageBitmap(R.drawable.card_placeholder_wallet)
     val cards = listOf(
         FloatingCard.first(),
         FloatingCard.second(),
         FloatingCard.third(),
     )
-    Box() {
+    Box {
         cards.forEach { floatingCard ->
             FloatingCard.Item(
                 isPaused = isPaused,
@@ -47,57 +46,59 @@ private data class CardValues(
     val scale: AnimatedValue = AnimatedValue(1f, 1f),
 )
 
-private class FloatingCard {
-    companion object {
+private object FloatingCard {
 
-        @Composable
-        fun Item(
-            isPaused: Boolean,
-            stepDuration: Int,
-            imageBitmap: ImageBitmap,
-            cardValues: CardValues,
-        ) {
-            Image(
-                bitmap = imageBitmap,
-                contentDescription = "Floating Tangem card",
-                modifier = Modifier
-                    .graphicsLayer(
-                        translationX = cardValues.translateX.toAnimatable(isPaused, stepDuration).value,
-                        translationY = cardValues.translateY.toAnimatable(isPaused, stepDuration).value,
-                        rotationX = cardValues.rotationX.toAnimatable(isPaused, stepDuration).value,
-                        rotationY = cardValues.rotationY.toAnimatable(isPaused, stepDuration).value,
-                        rotationZ = cardValues.rotationZ.toAnimatable(isPaused, stepDuration).value,
-                        scaleX = cardValues.scale.toAnimatable(isPaused, stepDuration).value,
-                        scaleY = cardValues.scale.toAnimatable(isPaused, stepDuration).value,
-                    ),
-            )
-        }
-
-        fun first(): CardValues = CardValues(
-            translateX = -400f to -350f,
-            translateY = 30f to 32f,
-            rotationX = 10f to 15f,
-            rotationY = 15f to 15f,
-            rotationZ = 40f to 27f,
-            scale = 0.6f to 0.6f,
-        )
-
-        fun second(): CardValues = CardValues(
-            translateX = 350f to 300f,
-            translateY = -70f to 0f,
-            rotationX = 30f to 48f,
-            rotationY = 0f to 5f,
-            rotationZ = -34f to -42f,
-            scale = 0.47f to 0.35f,
-        )
-
-        fun third(): CardValues = CardValues(
-            translateX = 320f to 250f,
-            translateY = 500f to 500f,
-            rotationX = 0f to 3f,
-            rotationY = 10f to 10f,
-            rotationZ = -45f to -30f,
-            scale = 0.6f to 0.75f,
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    fun Item(
+        isPaused: Boolean,
+        stepDuration: Int,
+        imageBitmap: ImageBitmap,
+        cardValues: CardValues,
+    ) {
+        Image(
+            bitmap = imageBitmap,
+            contentDescription = "Floating Tangem card",
+            modifier = Modifier
+                .graphicsLayer(
+                    translationX = cardValues.translateX.toAnimatable(isPaused, stepDuration).value,
+                    translationY = cardValues.translateY.toAnimatable(isPaused, stepDuration).value,
+                    rotationX = cardValues.rotationX.toAnimatable(isPaused, stepDuration).value,
+                    rotationY = cardValues.rotationY.toAnimatable(isPaused, stepDuration).value,
+                    rotationZ = cardValues.rotationZ.toAnimatable(isPaused, stepDuration).value,
+                    scaleX = cardValues.scale.toAnimatable(isPaused, stepDuration).value,
+                    scaleY = cardValues.scale.toAnimatable(isPaused, stepDuration).value,
+                ),
         )
     }
+
+    @Suppress("MagicNumber")
+    fun first(): CardValues = CardValues(
+        translateX = -400f to -350f,
+        translateY = 30f to 32f,
+        rotationX = 10f to 15f,
+        rotationY = 15f to 15f,
+        rotationZ = 40f to 27f,
+        scale = 0.6f to 0.6f,
+    )
+
+    @Suppress("MagicNumber")
+    fun second(): CardValues = CardValues(
+        translateX = 350f to 300f,
+        translateY = -70f to 0f,
+        rotationX = 30f to 48f,
+        rotationY = 0f to 5f,
+        rotationZ = -34f to -42f,
+        scale = 0.47f to 0.35f,
+    )
+
+    @Suppress("MagicNumber")
+    fun third(): CardValues = CardValues(
+        translateX = 320f to 250f,
+        translateY = 500f to 500f,
+        rotationX = 0f to 3f,
+        rotationY = 10f to 10f,
+        rotationZ = -45f to -30f,
+        scale = 0.6f to 0.75f,
+    )
 }
\ No newline at end of file
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..95049be464 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
@@ -2,7 +2,9 @@ package com.tangem.tap.features.home.compose.views
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
@@ -16,16 +18,17 @@ 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
 
+@Suppress("MagicNumber")
 @Composable
 fun HomeButtons(
-    modifier: Modifier = Modifier,
     isDarkBackground: Boolean,
     btnScanStateInProgress: Boolean,
     onScanButtonClick: () -> Unit,
     onShopButtonClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val darkColorBackground = Color(0xFF26292E)
     val darkColorButton = Color(0xFF080C10)
@@ -35,9 +38,6 @@ fun HomeButtons(
         modifier = modifier,
     ) {
         ProgressButton(
-            modifier = Modifier
-                .weight(1f)
-                .height(48.dp),
             inProgress = btnScanStateInProgress,
             backgroundColor = if (isDarkBackground) darkColorBackground else Color.White,
             contentColor = if (isDarkBackground) Color.White else darkColorButton,
@@ -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,
@@ -63,7 +63,7 @@ fun HomeButtons(
         Button(
             modifier = Modifier
                 .weight(1f)
-                .height(48.dp),
+                .heightIn(48.dp),
             onClick = onShopButtonClick,
             enabled = !btnScanStateInProgress,
             colors = ButtonDefaults.textButtonColors(
@@ -82,9 +82,9 @@ fun HomeButtons(
     }
 }
 
+@Suppress("LongParameterList")
 @Composable
-fun ProgressButton(
-    modifier: Modifier,
+fun RowScope.ProgressButton(
     backgroundColor: Color,
     contentColor: Color,
     onClick: () -> Unit,
@@ -93,8 +93,11 @@ fun ProgressButton(
     content: @Composable () -> Unit,
 ) {
     Button(
-        modifier = modifier,
+        modifier = Modifier
+            .weight(1f)
+            .height(48.dp),
         onClick = onClick,
+        enabled = !inProgress,
         colors = ButtonDefaults.textButtonColors(
             backgroundColor = backgroundColor,
             contentColor = contentColor,
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..4692fa91aa 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(
@@ -21,7 +26,7 @@ fun StoriesProgressBar(
     currentStep: Int,
     paused: Boolean = false,
     stepDuration: Int = 8_000,
-    onStepFinished: () -> Unit = {},
+    onStepFinish: () -> Unit = {},
 ) {
     val progress = remember(currentStep) { Animatable(0f) }
 
@@ -37,9 +42,8 @@ fun StoriesProgressBar(
                 )
             )
             progress.snapTo(0f)
-            onStepFinished()
+            onStepFinish()
         }
-
     }
 
     Row(
@@ -76,6 +80,6 @@ fun StoriesProgressBar(
 
 @Preview
 @Composable
-fun StoriesProgressBarPreview() {
+private fun StoriesProgressBarPreview() {
     StoriesProgressBar(steps = 3, currentStep = 2, paused = false) { }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/data/HomeRepositoryImpl.kt b/app/src/main/java/com/tangem/tap/features/home/data/HomeRepositoryImpl.kt
new file mode 100644
index 0000000000..fed3f2e394
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/home/data/HomeRepositoryImpl.kt
@@ -0,0 +1,23 @@
+package com.tangem.tap.features.home.data
+
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.api.tangemTech.models.GeoResponse
+import com.tangem.tap.features.home.domain.HomeRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+
+/**
+ * Implementation of repository for Home feature
+ *
+ * @property tangemTechApi API for server requests
+ * @property dispatchers   coroutine dispatcher provider
+ */
+class HomeRepositoryImpl(
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : HomeRepository {
+
+    override suspend fun getUserCountryCode(): GeoResponse = withContext(dispatchers.io) {
+        tangemTechApi.getUserCountryCode()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/domain/HomeRepository.kt b/app/src/main/java/com/tangem/tap/features/home/domain/HomeRepository.kt
new file mode 100644
index 0000000000..ad489ae0fe
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/home/domain/HomeRepository.kt
@@ -0,0 +1,10 @@
+package com.tangem.tap.features.home.domain
+
+import com.tangem.datasource.api.tangemTech.models.GeoResponse
+
+/** Repository for Home feature */
+interface HomeRepository {
+
+    /** Get user's country code */
+    suspend fun getUserCountryCode(): GeoResponse
+}
\ No newline at end of file
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..59e169ee04 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
@@ -1,17 +1,20 @@
 package com.tangem.tap.features.home.redux
 
+import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.entities.IndeterminateProgressButton
 import org.rekotlin.Action
 
 sealed class HomeAction : Action {
 
     object Init : HomeAction()
-    data class ShouldScanCardOnResume(val shouldScanCard: Boolean) : HomeAction()
 
-    // from ui
-    object ReadCard : HomeAction()
+    data class ReadCard(
+        val analyticsEvent: AnalyticsEvent? = IntroductionProcess.CardWasScanned(),
+    ) : HomeAction()
+
     data class ScanInProgress(val scanInProgress: Boolean) : HomeAction()
     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..902bb0ef47 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,245 +1,122 @@
 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.core.analytics.Analytics
+import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.Shop
 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.postUiDelayBg
-import com.tangem.tap.common.redux.AppDialog
+import com.tangem.tap.common.extensions.onUserWalletSelected
 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.home.redux.HomeMiddleware.BUY_WALLET_URL
 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 {
-        val handler = homeMiddleware
+object HomeMiddleware {
+    val handler = homeMiddleware
 
-        const val BUY_WALLET_URL = "https://tangem.com/ru/resellers/"
-    }
+    const val BUY_WALLET_URL = "https://tangem.com/ru/resellers/"
 }
 
-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)
             store.dispatch(GlobalAction.ExchangeManager.Init)
             store.dispatch(GlobalAction.FetchUserCountry)
         }
-        is HomeAction.ShouldScanCardOnResume -> {
-            if (action.shouldScanCard) {
-                store.dispatch(HomeAction.ShouldScanCardOnResume(false))
-                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) }
+            readCard(action.analyticsEvent)
         }
         is HomeAction.GoToShop -> {
+            Analytics.send(Shop.ScreenOpened())
             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(analyticsEvent: AnalyticsEvent?) = scope.launch {
+    delay(timeMillis = 200)
+    tangemSdkManager.setAccessCodeRequestPolicy(
+        useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
+    )
+    ScanCardProcessor.scan(
+        analyticsEvent = analyticsEvent,
+        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 {
+                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 -> {
-                            changeButtonState(ButtonState.ENABLED)
-                            SaltPayExceptionHandler.handle(result.error)
+                        .doOnSuccess {
+                            scope.launch { store.onUserWalletSelected(userWallet) }
                         }
-                    }
+                        .doOnResult {
+                            navigateTo(AppScreen.Wallet)
+                        }
+                } else {
+                    store.onCardScanned(scanResponse)
+                    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))
+private suspend fun navigateTo(appScreen: AppScreen) {
+    store.dispatchOnMain(NavigationAction.NavigateTo(appScreen))
+    delay(timeMillis = 200)
     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))
-    }
+    store.dispatchOnMain(HomeAction.ChangeScanCardButtonState(IndeterminateProgressButton(state)))
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
index 511aea3ddc..f9f2911c32 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
@@ -3,14 +3,11 @@ package com.tangem.tap.features.home.redux
 import com.tangem.tap.common.redux.AppState
 import org.rekotlin.Action
 
-class HomeReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): HomeState = internalReduce(action, state)
-    }
+object HomeReducer {
+    fun reduce(action: Action, state: AppState): HomeState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, state: AppState): HomeState {
-
     if (action !is HomeAction) return state.homeState
 
     var state = state.homeState
@@ -18,12 +15,10 @@ private fun internalReduce(action: Action, state: AppState): HomeState {
         is HomeAction.ScanInProgress -> {
             state = state.copy(scanInProgress = action.scanInProgress)
         }
-        is HomeAction.ShouldScanCardOnResume -> {
-            state = state.copy(shouldScanCardOnResume = action.shouldScanCard)
-        }
         is HomeAction.ChangeScanCardButtonState -> {
             state = state.copy(btnScanState = action.state)
         }
+        else -> {}
     }
 
     return state
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt
index 9ef6ea2b57..618e432dec 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt
@@ -6,7 +6,6 @@ import com.tangem.tap.features.wallet.redux.ProgressState
 import org.rekotlin.StateType
 
 data class HomeState(
-    val shouldScanCardOnResume: Boolean = false,
     val scanInProgress: Boolean = false,
     val btnScanState: IndeterminateProgressButton = IndeterminateProgressButton(ButtonState.ENABLED),
 ) : StateType {
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..66e30fe595 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.core.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.Receive.ScreenOpened())
         showData(data = stateDialog.addressData)
     }
 
@@ -51,32 +54,20 @@ class AddressInfoBottomSheetDialog(
         imvQrCode.setImageBitmap(data.qrCode)
         tvAddress.text = data.address
         btnFlCopyAddress.setOnClickListener {
+            Analytics.send(Token.Receive.ButtonCopyAddress())
             context.copyToClipboard(data.address)
             store.dispatchToastNotification(R.string.copy_toast_msg)
         }
         btnFlShare.setOnClickListener {
+            Analytics.send(Token.Receive.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/OnboardingDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingDialog.kt
new file mode 100644
index 0000000000..7773489a2f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingDialog.kt
@@ -0,0 +1,12 @@
+package com.tangem.tap.features.onboarding
+
+import com.tangem.common.extensions.VoidCallback
+import com.tangem.tap.common.redux.StateDialog
+
+/**
+[REDACTED_AUTHOR]
+ */
+sealed class OnboardingDialog : StateDialog {
+    object TwinningProcessNotCompleted : OnboardingDialog()
+    data class InterruptOnboarding(val onOk: VoidCallback) : OnboardingDialog()
+}
\ 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 f2227fcc32..5ed844549d 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,42 +2,94 @@ 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]
  */
-class OnboardingHelper {
-    companion object {
-
-        fun isOnboardingCase(response: ScanResponse): Boolean {
-            val cardInfoStorage = preferencesStorage.usedCardsPrefStorage
-            return when {
-                response.isTangemTwins() -> {
-                    if (!response.twinsIsTwinned()) {
-                        true
-                    } else {
-                        cardInfoStorage.activationIsStarted(response.card.cardId)
-                    }
-                }
-                response.card.hasWallets() -> cardInfoStorage.activationIsStarted(response.card.cardId)
-                else -> true
-            }
-        }
-
-        fun whereToNavigate(scanResponse: ScanResponse): AppScreen {
-            return when (scanResponse.productType) {
-                ProductType.Note -> AppScreen.OnboardingNote
-                ProductType.Wallet -> if (scanResponse.card.settings.isBackupAllowed) {
-                    AppScreen.OnboardingWallet
+object OnboardingHelper {
+    fun isOnboardingCase(response: ScanResponse): Boolean {
+        val cardInfoStorage = preferencesStorage.usedCardsPrefStorage
+        val cardId = response.card.cardId
+        return when {
+            response.cardTypesResolver.isTangemTwins() -> {
+                if (!response.twinsIsTwinned()) {
+                    true
                 } else {
-                    AppScreen.OnboardingOther
+                    cardInfoStorage.isActivationInProgress(cardId)
                 }
-                ProductType.Twins -> AppScreen.OnboardingTwins
-                ProductType.SaltPay -> AppScreen.OnboardingWallet
             }
+            response.card.wallets.isNotEmpty() -> cardInfoStorage.isActivationInProgress(cardId)
+            else -> true
         }
     }
+
+    fun whereToNavigate(scanResponse: ScanResponse): AppScreen {
+        return when (scanResponse.productType) {
+            ProductType.Note -> AppScreen.OnboardingNote
+            ProductType.Wallet -> if (scanResponse.card.settings.isBackupAllowed) {
+                AppScreen.OnboardingWallet
+            } else {
+                AppScreen.OnboardingOther
+            }
+            ProductType.Twins -> AppScreen.OnboardingTwins
+            ProductType.SaltPay -> AppScreen.OnboardingWallet
+            ProductType.Start2Coin -> throw java.lang.UnsupportedOperationException(
+                "Onboarding for Start2Coin cards is not supported",
+            )
+        }
+    }
+
+    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..47caa1b85c 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
@@ -55,7 +55,7 @@ class OnboardingManager(
                 }
             }
             is Result.Failure -> {
-                val error = (result.error as? TapError) ?: TapError.UnknownError
+                val error = result.error as? TapError ?: TapError.UnknownError
                 when (error) {
                     is TapError.WalletManager.NoAccountError -> OnboardingWalletBalance.error(error)
                     // NoInternetConnection, WalletManager.InternalError
@@ -67,8 +67,11 @@ class OnboardingManager(
             }
         }
 
-        return balance.copy(currency = Currency.Blockchain(
-            walletManager.wallet.blockchain, walletManager.wallet.publicKey.derivationPath?.rawPath)
+        return balance.copy(
+            currency = Currency.Blockchain(
+                blockchain = walletManager.wallet.blockchain,
+                derivationPath = walletManager.wallet.publicKey.derivationPath?.rawPath,
+            ),
         )
     }
 
@@ -79,6 +82,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(
@@ -90,31 +101,31 @@ data class OnboardingWalletBalance(
     val criticalError: TapError? = null,
 ) {
 
-    fun balanceIsToppedUp(): Boolean = value.isPositive() || hasIncomingTransaction
-
     val amountToCreateAccount: String?
         get() = if (error is TapError.WalletManager.NoAccountError) error.customMessage else null
 
+    fun balanceIsToppedUp(): Boolean = value.isPositive() || hasIncomingTransaction
+
     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/OnboardingMenuProvider.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
index 2fff1d0fab..4af057eb58 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
@@ -4,6 +4,8 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
+import com.tangem.core.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.feedback.SupportInfo
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.store
@@ -19,6 +21,7 @@ class OnboardingMenuProvider : MenuProvider {
 
     override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
         R.id.menu_item_chat_support -> {
+            Analytics.send(Onboarding.ButtonChat())
             store.dispatch(GlobalAction.OpenChat(SupportInfo()))
             true
         }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt
index 209fc789eb..b9aa35f096 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt
@@ -12,39 +12,23 @@ import com.tangem.tap.preferencesStorage
 /**
 [REDACTED_AUTHOR]
  */
-class OnboardingSaltPayHelper {
-    companion object {
+object OnboardingSaltPayHelper {
+    suspend fun isOnboardingCase(scanResponse: ScanResponse, manager: SaltPayActivationManager): Result<Boolean> {
+        return try {
+            var updatedStep = manager.update(SaltPayActivationStep.None, null).successOr { return it }
 
-        suspend fun isOnboardingCase(
-            scanResponse: ScanResponse,
-            manager: SaltPayActivationManager,
-        ): Result<Boolean> {
-            return try {
-                var updatedStep = manager.update(SaltPayActivationStep.None, null).successOr { return it }
-
-                val cardStorage = preferencesStorage.usedCardsPrefStorage
-                val activationIsFinished = cardStorage.isActivationFinished(scanResponse.card.cardId)
-                if (updatedStep == SaltPayActivationStep.Success && activationIsFinished) {
-                    updatedStep = SaltPayActivationStep.Finished
-                }
-                val isActivationCase = updatedStep != SaltPayActivationStep.Finished
-                val isBackupCase = scanResponse.card.backupStatus?.isActive == false
-                Result.Success(isActivationCase || isBackupCase)
-            } catch (ex: Exception) {
-                Result.Failure(ex)
-            } catch (error: SaltPayActivationError) {
-                Result.Failure(error)
+            val cardStorage = preferencesStorage.usedCardsPrefStorage
+            val activationIsFinished = cardStorage.isActivationFinished(scanResponse.card.cardId)
+            if (updatedStep == SaltPayActivationStep.Success && activationIsFinished) {
+                updatedStep = SaltPayActivationStep.Finished
             }
+            val isActivationCase = updatedStep != SaltPayActivationStep.Finished
+            val isBackupCase = scanResponse.card.backupStatus?.isActive == false
+            Result.Success(isActivationCase || isBackupCase)
+        } catch (ex: Exception) {
+            Result.Failure(ex)
+        } catch (error: SaltPayActivationError) {
+            Result.Failure(error)
         }
-
-        fun testProceedToOnboarding(
-            scanResponse: ScanResponse,
-            manager: SaltPayActivationManager,
-        ): Result<Boolean> = Result.Success(true)
-
-        fun testProceedToMainScreen(
-            scanResponse: ScanResponse,
-            manager: SaltPayActivationManager,
-        ): Result<Boolean> = Result.Success(false)
     }
 }
\ 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..3549ea11ab 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.core.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 { }
 
@@ -153,7 +159,8 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
             state.walletBalance.amountToCreateAccount?.let { amount ->
                 val tvBodyMessage = getString(
                     R.string.onboarding_top_up_body_no_account_error,
-                    amount, state.walletBalance.currency.currencySymbol,
+                    amount,
+                    state.walletBalance.currency.currencySymbol,
                 )
                 tvBody.text = tvBodyMessage
             }
@@ -172,7 +179,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)
@@ -204,4 +211,8 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
             TransitionManager.beginDelayedTransition(onboardingWalletContainer, transition)
         }
     }
+
+    override fun handleOnBackPressed() {
+        store.dispatch(OnboardingNoteAction.OnBackPressed)
+    }
 }
\ No newline at end of file
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..ebdf31becb 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,10 +10,12 @@ import org.rekotlin.Action
  */
 sealed class OnboardingNoteAction : Action {
     // from user, ui
+    object Init : OnboardingNoteAction()
     object LoadCardArtwork : OnboardingNoteAction()
     object CreateWallet : OnboardingNoteAction()
     object TopUp : OnboardingNoteAction()
     object ShowAddressInfoDialog : OnboardingNoteAction()
+    object OnBackPressed : OnboardingNoteAction()
 
     // from redux
     class SetArtworkUrl(val artworkUrl: String) : 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..169e5dfb7f 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
@@ -2,29 +2,33 @@ package com.tangem.tap.features.onboarding.products.note.redux
 
 import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.guard
+import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
+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.OnboardingDialog
+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
@@ -34,10 +38,8 @@ import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
 
-class OnboardingNoteMiddleware {
-    companion object {
-        val handler = onboardingNoteMiddleware
-    }
+object OnboardingNoteMiddleware {
+    val handler = onboardingNoteMiddleware
 }
 
 private val onboardingNoteMiddleware: Middleware<AppState> = { dispatch, state ->
@@ -49,6 +51,7 @@ private val onboardingNoteMiddleware: Middleware<AppState> = { dispatch, state -
     }
 }
 
+@Suppress("LongMethod", "ComplexMethod", "MagicNumber")
 private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch: DispatchFunction) {
     if (action !is OnboardingNoteAction) return
     if (DemoHelper.tryHandle(appState, action)) return
@@ -61,6 +64,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,21 +77,27 @@ 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
             }
-            store.dispatch((OnboardingNoteAction.SetStepOfScreen(step)))
+            store.dispatch(OnboardingNoteAction.SetStepOfScreen(step))
         }
         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) }
                 }
+                else -> {}
             }
         }
         is OnboardingNoteAction.CreateWallet -> {
@@ -92,6 +106,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 +165,42 @@ 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
             }
-            store.dispatchOpenUrl(topUpUrl)
-        }
-        OnboardingNoteAction.Done -> {
-            store.dispatch(GlobalAction.Onboarding.Stop)
-            scope.launch {
-                store.onCardScanned(scanResponse)
-                withMainContext { store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet)) }
+
+            val topUpUrl = walletManager.getTopUpUrl() ?: return
+            val blockchain = walletManager.wallet.blockchain
+
+            val currencyType = AnalyticsParam.CurrencyType.Blockchain(blockchain)
+            Analytics.send(Onboarding.Topup.ButtonBuyCrypto(currencyType))
+
+            if (globalState.userCountryCode == RUSSIA_COUNTRY_CODE) {
+                val dialogData = WalletDialog.RussianCardholdersWarningDialog.Data(topUpUrl)
+                store.dispatchOnMain(WalletAction.DialogAction.RussianCardholdersWarningDialog(dialogData))
+            } else {
+                store.dispatchOpenUrl(topUpUrl)
             }
         }
+        is OnboardingNoteAction.Done -> {
+            store.dispatch(GlobalAction.Onboarding.Stop)
+            OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
+        }
+        is OnboardingNoteAction.OnBackPressed -> {
+            store.dispatchDialogShow(
+                OnboardingDialog.InterruptOnboarding(
+                    onOk = {
+                        store.dispatch(NavigationAction.PopBackTo())
+                    },
+                ),
+            )
+        }
+        else -> Unit
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteReducer.kt
index 7626922560..5552fc8b50 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteReducer.kt
@@ -4,10 +4,8 @@ import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import org.rekotlin.Action
 
-class OnboardingNoteReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): OnboardingNoteState = internalReduce(action, state)
-    }
+object OnboardingNoteReducer {
+    fun reduce(action: Action, state: AppState): OnboardingNoteState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, appState: AppState): OnboardingNoteState {
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..a0a6b8b76b 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.core.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)
     }
@@ -62,13 +65,17 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
         when (state.currentStep) {
             OnboardingOtherCardsStep.CreateWallet -> setupCreateWalletState()
             OnboardingOtherCardsStep.Done -> setupDoneState()
+            else -> {}
         }
         showConfetti(state.showConfetti)
     }
 
     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 { }
 
@@ -81,24 +88,23 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
             requireContext().getDrawableCompat(R.drawable.shape_circle),
         )
         updateConstraints(R.layout.lp_onboarding_create_wallet)
-
     }
 
     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..8711eaadad 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
@@ -2,16 +2,15 @@ package com.tangem.tap.features.onboarding.products.otherCards.redux
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CompletionResult
+import com.tangem.core.analytics.Analytics
 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.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,25 +18,23 @@ 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 {
-    companion object {
-        val handler = onboardingOtherCardsMiddleware
-    }
+object OnboardingOtherCardsMiddleware {
+    val handler = 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) {
+@Suppress("LongMethod", "ComplexMethod", "MagicNumber")
+private fun handleOtherCardsAction(action: Action) {
     if (action !is OnboardingOtherCardsAction) return
     val globalState = store.state.globalState
     val onboardingManager = globalState.onboardingState.onboardingManager ?: return
@@ -45,6 +42,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 +55,22 @@ 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)))
+            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) }
+                }
+                else -> Unit
             }
         }
         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 primaryBlockchain = updatedResponse.cardTypesResolver.getBlockchain()
                             val blockchainNetworks = if (primaryBlockchain != Blockchain.Unknown) {
-                                val primaryToken = updatedResponse.getPrimaryToken()
+                                val primaryToken = updatedResponse.cardTypesResolver.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/otherCards/redux/OnboardingOtherCardsReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsReducer.kt
index e8dc2ae111..3dae886ef6 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsReducer.kt
@@ -4,10 +4,8 @@ import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import org.rekotlin.Action
 
-class OnboardingOtherCardsReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): OnboardingOtherCardsState = internalReduce(action, state)
-    }
+object OnboardingOtherCardsReducer {
+    fun reduce(action: Action, state: AppState): OnboardingOtherCardsState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, appState: AppState): OnboardingOtherCardsState {
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..bdd6ac9917 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
@@ -5,7 +5,6 @@ import com.tangem.blockchain.common.WalletManager
 import com.tangem.common.extensions.VoidCallback
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.AssetReader
-import com.tangem.tap.common.redux.StateDialog
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.twins.TwinCardsManager
 import com.tangem.tap.features.onboarding.OnboardingWalletBalance
@@ -28,13 +27,6 @@ sealed class TwinCardsAction : Action {
     }
 
     sealed class Wallet : TwinCardsAction() {
-        data class HandleOnBackPressed(
-            // this is necessary for the correct animation of the return of cards to the Home screen
-            val shouldResetTwinCardsWidget: (should: Boolean, popAction: VoidCallback) -> Unit
-        ) : TwinCardsAction()
-
-        data class ShowInterruptDialog(val onOk: VoidCallback) : TwinCardsAction(), StateDialog
-
         data class LaunchFirstStep(val initialMessage: Message, val reader: AssetReader) : TwinCardsAction()
         data class LaunchSecondStep(
             val initialMessage: Message,
@@ -45,7 +37,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 +44,15 @@ sealed class TwinCardsAction : Action {
     data class SetWalletManager(val walletManager: WalletManager) : TwinCardsAction()
     object Done : TwinCardsAction()
 
+    data class OnBackPressed(
+        // this is necessary for the correct animation of the return of cards to the Home screen
+        val shouldResetTwinCardsWidget: (should: Boolean, popAction: VoidCallback) -> Unit,
+    ) : 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..df7d042f2b 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
@@ -3,15 +3,19 @@ package com.tangem.tap.features.onboarding.products.twins.redux
 import com.tangem.blockchain.extensions.Result
 import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.guard
+import com.tangem.core.analytics.Analytics
 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.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
@@ -20,22 +24,27 @@ 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.home.RUSSIA_COUNTRY_CODE
+import com.tangem.tap.features.onboarding.OnboardingDialog
+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.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
 import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
 
-class TwinCardsMiddleware {
-    companion object {
-        val handler = twinsWalletMiddleware
-    }
+object TwinCardsMiddleware {
+    val handler = twinsWalletMiddleware
 }
 
 private val twinsWalletMiddleware: Middleware<AppState> = { dispatch, state ->
@@ -47,6 +56,7 @@ private val twinsWalletMiddleware: Middleware<AppState> = { dispatch, state ->
     }
 }
 
+@Suppress("LongMethod", "ComplexMethod", "MagicNumber")
 private fun handle(action: Action, dispatch: DispatchFunction) {
     val action = action as? TwinCardsAction ?: return
 
@@ -64,7 +74,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 +86,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,17 +94,24 @@ 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() -> TwinCardsStep.CreateFirstWallet
                             twinCardsState.walletBalance.balanceIsToppedUp() -> TwinCardsStep.Done
                             else -> TwinCardsStep.TopUpWallet
                         }
-                        store.dispatch((TwinCardsAction.SetStepOfScreen(step)))
+                        store.dispatch(TwinCardsAction.SetStepOfScreen(step))
                     } else {
                         store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.Welcome))
                     }
@@ -103,49 +121,47 @@ 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
-
-            if (twinCardsState.showAlert) {
-                val onInterruptPrompt = {
-                    store.dispatch(TwinCardsAction.CardsManager.Release)
-                    action.shouldResetTwinCardsWidget(shouldReturnCardBack) {
-                        store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
-                    }
-                }
-                val stateDialog = TwinCardsAction.Wallet.ShowInterruptDialog(onInterruptPrompt)
-                store.dispatchDialogShow(stateDialog)
-            } else {
-                store.dispatch(TwinCardsAction.CardsManager.Release)
-                action.shouldResetTwinCardsWidget(shouldReturnCardBack) {
-                    store.dispatch(NavigationAction.PopBackTo())
-                }
-            }
-        }
         is TwinCardsAction.SetStepOfScreen -> {
             when (action.step) {
-                TwinCardsStep.WelcomeOnly -> preferencesStorage.saveTwinsOnboardingShown()
-                TwinCardsStep.Welcome -> preferencesStorage.saveTwinsOnboardingShown()
-                TwinCardsStep.TopUpWallet -> store.dispatch(TwinCardsAction.Balance.Update)
+                is TwinCardsStep.WelcomeOnly, TwinCardsStep.Welcome -> {
+                    Analytics.send(Onboarding.Twins.ScreenOpened())
+                    preferencesStorage.saveTwinsOnboardingShown()
+                }
+                TwinCardsStep.CreateFirstWallet -> {
+                    Analytics.send(Onboarding.CreateWallet.ScreenOpened())
+                    Analytics.send(Onboarding.Twins.SetupStarted())
+                    scope.launch {
+                        userWalletsListManager.delete(
+                            listOfNotNull(UserWalletIdBuilder.scanResponse(getScanResponse()).build()),
+                        )
+                    }
+                }
+                TwinCardsStep.TopUpWallet -> {
+                    Analytics.send(Onboarding.Topup.ScreenOpened())
+                    store.dispatch(TwinCardsAction.Balance.Update)
+                }
                 TwinCardsStep.Done -> {
                     finishCardActivation()
                     postUi(500) { store.dispatch(TwinCardsAction.Confetti.Show) }
                 }
+                TwinCardsStep.None,
+                TwinCardsStep.Warning,
+                TwinCardsStep.CreateSecondWallet,
+                TwinCardsStep.CreateThirdWallet,
+                -> Unit
             }
         }
         is TwinCardsAction.Wallet.LaunchFirstStep -> {
             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 +180,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 +202,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,17 +239,17 @@ 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))
 
             scope.launch {
                 val loadedBalance = onboardingManager?.updateBalance(walletManager) ?: return@launch
-                loadedBalance.criticalError?.let { store.dispatchErrorNotification(it) }
+                loadedBalance.criticalError?.let(store::dispatchErrorNotification)
                 delay(if (isLoadedBefore) 0 else 300)
                 withMainContext {
                     store.dispatch(TwinCardsAction.Balance.Set(loadedBalance))
@@ -240,7 +257,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 +272,62 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
             store.dispatchDialogShow(appDialog)
         }
         is TwinCardsAction.TopUp -> {
-            val topUpUrl = twinCardsState.walletManager?.getToUpUrl() ?: return
-            store.dispatchOpenUrl(topUpUrl)
+            val walletManager = twinCardsState.walletManager.guard {
+                store.dispatchDebugErrorNotification("NPE: WalletManager")
+                return
+            }
+
+            val topUpUrl = walletManager.getTopUpUrl() ?: return
+            val blockchain = walletManager.wallet.blockchain
+
+            val currencyType = AnalyticsParam.CurrencyType.Blockchain(blockchain)
+            Analytics.send(Onboarding.Topup.ButtonBuyCrypto(currencyType))
+
+            if (globalState.userCountryCode == RUSSIA_COUNTRY_CODE) {
+                val dialogData = WalletDialog.RussianCardholdersWarningDialog.Data(topUpUrl)
+                store.dispatchOnMain(WalletAction.DialogAction.RussianCardholdersWarningDialog(dialogData))
+            } else {
+                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,
+            )
+        }
+        is TwinCardsAction.OnBackPressed -> {
+            if (twinCardsState.twinningInProgress) {
+                store.dispatchDialogShow(OnboardingDialog.TwinningProcessNotCompleted)
+            } else {
+                val onOkCallback = {
+                    val shouldReturnCardBack = twinCardsState.mode == CreateTwinWalletMode.CreateWallet &&
+                        twinCardsState.currentStep != TwinCardsStep.TopUpWallet &&
+                        twinCardsState.currentStep != TwinCardsStep.Done
+
+                    store.dispatch(TwinCardsAction.CardsManager.Release)
+                    action.shouldResetTwinCardsWidget(shouldReturnCardBack) {
+                        store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
+                    }
+                }
+                store.dispatchDialogShow(OnboardingDialog.InterruptOnboarding(onOkCallback))
+            }
+        }
+        else -> Unit
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsReducer.kt
index d482a5a647..9902cd2ce5 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsReducer.kt
@@ -4,12 +4,11 @@ import com.tangem.domain.common.getTwinCardNumber
 import com.tangem.tap.common.redux.AppState
 import org.rekotlin.Action
 
-class TwinCardsReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): TwinCardsState = internalReduce(action, state)
-    }
+object TwinCardsReducer {
+    fun reduce(action: Action, state: AppState): TwinCardsState = internalReduce(action, state)
 }
 
+@Suppress("ComplexMethod")
 private fun internalReduce(action: Action, state: AppState): TwinCardsState {
     if (action !is TwinCardsAction) return state.twinCardsState
 
@@ -17,7 +16,7 @@ private fun internalReduce(action: Action, state: AppState): TwinCardsState {
 
     when (action) {
         is TwinCardsAction.IfTwinsPrepareState -> {
-            state = if (action.scanResponse.isTangemTwins()) {
+            state = if (action.scanResponse.cardTypesResolver.isTangemTwins()) {
                 val cardNumber = action.scanResponse.card.getTwinCardNumber() ?: return state
 
                 TwinCardsState(
@@ -67,6 +66,7 @@ private fun internalReduce(action: Action, state: AppState): TwinCardsState {
         is TwinCardsAction.Confetti.Hide -> {
             state = state.copy(showConfetti = false)
         }
+        else -> {}
     }
 
     return state
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..88f9e5d82d 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
@@ -38,21 +39,21 @@ data class TwinCardsState(
                 TwinCardsStep.CreateSecondWallet,
                 TwinCardsStep.CreateThirdWallet,
                 TwinCardsStep.TopUpWallet,
-                TwinCardsStep.Done
+                TwinCardsStep.Done,
             )
             CreateTwinWalletMode.RecreateWallet -> listOf(
                 TwinCardsStep.None,
                 TwinCardsStep.CreateFirstWallet,
                 TwinCardsStep.CreateSecondWallet,
                 TwinCardsStep.CreateThirdWallet,
-                TwinCardsStep.Done
+                TwinCardsStep.Done,
             )
         }
 
     val progress: Int
         get() = steps.indexOf(currentStep)
 
-    val showAlert: Boolean
+    val twinningInProgress: Boolean
         get() = currentStep == TwinCardsStep.CreateSecondWallet || currentStep == TwinCardsStep.CreateThirdWallet
 
     val isBuyAllowed: Boolean by ReadOnlyProperty<Any, Boolean> { _, _ ->
@@ -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..56f0d949ce 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.analytics.Analytics
+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.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
@@ -38,10 +40,11 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.LayoutOnboardingContainerTopBinding
 
+@Suppress("LargeClass")
 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
@@ -62,6 +65,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         }
     }
 
+    @Suppress("MagicNumber")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         addBackPressHandler(this)
@@ -96,6 +100,11 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        setStatusBarColor(R.color.backgroundWhite)
+    }
+
     private fun reconfigureLayoutForTwins(containerBinding: LayoutOnboardingContainerTopBinding) =
         with(containerBinding) {
             imvFrontCard.hide()
@@ -125,14 +134,15 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         pbBinding.pbState.progress = state.progress
 
         when (state.currentStep) {
-            TwinCardsStep.WelcomeOnly -> setupWelcomeOnlyState(state)
-            TwinCardsStep.Welcome -> setupWelcomeState(state)
-            TwinCardsStep.Warning -> setupWarningState(state)
-            TwinCardsStep.CreateFirstWallet -> setupCreateFirstWalletState(state)
-            TwinCardsStep.CreateSecondWallet -> setupCreateSecondWalletState(state)
-            TwinCardsStep.CreateThirdWallet -> setupCreateThirdWalletState(state)
-            TwinCardsStep.TopUpWallet -> setupTopUpWalletState(state)
-            TwinCardsStep.Done -> setupDoneState(state)
+            is TwinCardsStep.WelcomeOnly -> setupWelcomeOnlyState(state, state.currentStep.scanResponse)
+            is TwinCardsStep.Welcome -> setupWelcomeState(state)
+            is TwinCardsStep.Warning -> setupWarningState(state)
+            is TwinCardsStep.CreateFirstWallet -> setupCreateFirstWalletState(state)
+            is TwinCardsStep.CreateSecondWallet -> setupCreateSecondWalletState(state)
+            is TwinCardsStep.CreateThirdWallet -> setupCreateThirdWalletState(state)
+            is TwinCardsStep.TopUpWallet -> setupTopUpWalletState(state)
+            is TwinCardsStep.Done -> setupDoneState(state)
+            else -> {}
         }
 
         setBalance(state)
@@ -155,9 +165,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))
         }
     }
@@ -224,12 +234,14 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
                                 false,
                             )
                         }
+                        else -> {}
                     }
                 }
             }
             TwinCardsStep.Welcome, TwinCardsStep.Warning -> {
                 twinsWidget.toLeapfrog(onEnd = { switchToCard(state.cardNumber) })
             }
+            else -> {}
         }
 
         val twinIndexNumber = state.cardNumber?.indexNumber()
@@ -238,6 +250,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)),
@@ -306,11 +319,13 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
                             twinsWidget.toActivate(false)
                         }
                     }
+                    else -> {}
                 }
             }
             TwinCardsStep.CreateThirdWallet -> {
                 twinsWidget.toActivate()
             }
+            else -> {}
         }
 
         if (state.isBuyAllowed) {
@@ -349,7 +364,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)
@@ -393,11 +408,10 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
     override fun handleOnBackPressed() {
         store.dispatch(
-            TwinCardsAction.Wallet.HandleOnBackPressed { should, popAction ->
+            TwinCardsAction.OnBackPressed { should, popAction ->
                 store.dispatch(TwinCardsAction.Confetti.Hide)
                 showConfetti(false)
-                if (should) switchToCard(TwinCardNumber.First, true, popAction)
-                else popAction()
+                if (should) switchToCard(TwinCardNumber.First, true, popAction) else popAction()
             },
         )
     }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/CreateWalletInterruptDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/CreateWalletInterruptDialog.kt
deleted file mode 100644
index 62d98c1f69..0000000000
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/CreateWalletInterruptDialog.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.tangem.tap.features.onboarding.products.twins.ui.dialog
-
-import android.content.Context
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.tangem.tap.common.extensions.dispatchDialogHide
-import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
-import com.tangem.tap.store
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-class CreateWalletInterruptDialog {
-    companion object {
-        fun create(state: TwinCardsAction.Wallet.ShowInterruptDialog, context: Context): AlertDialog {
-            return MaterialAlertDialogBuilder(context)
-                    .setMessage(R.string.onboarding_twin_exit_warning)
-                    .setPositiveButton(R.string.warning_button_ok) { _, _ -> }
-                    .setOnDismissListener { store.dispatchDialogHide() }
-                    .create()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/TwinningProcessNotCompletedDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/TwinningProcessNotCompletedDialog.kt
new file mode 100644
index 0000000000..2a074debb7
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/TwinningProcessNotCompletedDialog.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.features.onboarding.products.twins.ui.dialog
+
+import android.content.Context
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.tangem.tap.common.extensions.dispatchDialogHide
+import com.tangem.tap.store
+import com.tangem.wallet.R
+
+/**
+[REDACTED_AUTHOR]
+ */
+object TwinningProcessNotCompletedDialog {
+    fun create(context: Context): AlertDialog {
+        return MaterialAlertDialogBuilder(context)
+            .setMessage(R.string.onboarding_twin_exit_warning)
+            .setPositiveButton(R.string.warning_button_ok) { _, _ -> }
+            .setOnDismissListener { store.dispatchDialogHide() }
+            .create()
+    }
+}
\ No newline at end of file
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..eabcd70384 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
@@ -1,11 +1,11 @@
 package com.tangem.tap.features.onboarding.products.wallet.redux
 
 import android.graphics.Bitmap
+import android.net.Uri
 import org.rekotlin.Action
 
 sealed class OnboardingWalletAction : Action {
     object Init : OnboardingWalletAction()
-    object StartSaltPayCardActivation : OnboardingWalletAction()
     object GetToCreateWalletStep : OnboardingWalletAction()
     object GetToSaltPayStep : OnboardingWalletAction()
     object CreateWallet : OnboardingWalletAction()
@@ -14,8 +14,8 @@ sealed class OnboardingWalletAction : Action {
 
     object ResumeBackup : OnboardingWalletAction()
 
-    object LoadArtwork : OnboardingWalletAction()
-    class SetArtworkUrl(val artworkUrl: String?) : OnboardingWalletAction()
+    data class LoadArtwork(val cardArtworkUriForUnfinishedBackup: Uri? = null) : OnboardingWalletAction()
+    class SetArtworkUrl(val artworkUri: Uri?) : OnboardingWalletAction()
 
     object OnBackPressed : 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..e240879094 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
@@ -1,12 +1,17 @@
 package com.tangem.tap.features.onboarding.products.wallet.redux
 
+import android.net.Uri
 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.core.analytics.Analytics
+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.events.Onboarding
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.primaryCardIsSaltPayVisa
@@ -14,11 +19,11 @@ 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.products.wallet.saltPay.dialog.SaltPayDialog
+import com.tangem.tap.features.onboarding.OnboardingDialog
+import com.tangem.tap.features.onboarding.OnboardingHelper
 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.wallet.redux.Artwork
@@ -33,10 +38,8 @@ import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
 
-class OnboardingWalletMiddleware {
-    companion object {
-        val handler = onboardingWalletMiddleware
-    }
+object OnboardingWalletMiddleware {
+    val handler = onboardingWalletMiddleware
 }
 
 private val onboardingWalletMiddleware: Middleware<AppState> = { dispatch, state ->
@@ -48,6 +51,7 @@ private val onboardingWalletMiddleware: Middleware<AppState> = { dispatch, state
     }
 }
 
+@Suppress("LongMethod", "ComplexMethod")
 private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch: DispatchFunction) {
     if (action !is OnboardingWalletAction) return
 
@@ -61,46 +65,47 @@ 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 -> {
+                        scanResponse.cardTypesResolver.isSaltPay() && backupService.hasIncompletedBackup -> {
                             store.dispatch(OnboardingWalletAction.ResumeBackup)
                         }
-                        scanResponse.isSaltPay() -> {
+
+                        scanResponse.cardTypesResolver.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()
-                val cardArtwork = if (artwork == Artwork.DEFAULT_IMG_URL) {
-                    null
-                } else {
-                    artwork
+                val cardArtwork = when (onboardingManager) {
+                    null -> action.cardArtworkUriForUnfinishedBackup
+                    else -> onboardingManager.loadArtworkUrl()
+                        .takeIf { it != Artwork.DEFAULT_IMG_URL }
+                        ?.let { Uri.parse(it) }
                 }
                 store.dispatchOnMain(OnboardingWalletAction.SetArtworkUrl(cardArtwork))
             }
@@ -112,17 +117,23 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
                 withMainContext {
                     when (result) {
                         is CompletionResult.Success -> {
-                            //here we must use updated scanResponse after createWallet & derivation
+                            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,
                                 derivedKeys = result.data.derivedKeys,
                                 primaryCard = result.data.primaryCard,
                             )
                             onboardingManager.scanResponse = updatedResponse
-                            val blockchainNetworks = listOf(
-                                BlockchainNetwork(Blockchain.Bitcoin, result.data.card),
-                                BlockchainNetwork(Blockchain.Ethereum, result.data.card),
-                            )
+
+                            val blockchainNetworks = if (DemoHelper.isDemoCardId(result.data.card.cardId)) {
+                                DemoHelper.config.demoBlockchains
+                            } else {
+                                listOf(Blockchain.Bitcoin, Blockchain.Ethereum)
+                            }.map { blockchain ->
+                                BlockchainNetwork(blockchain, result.data.card)
+                            }
+
                             store.dispatch(
                                 WalletAction.MultiWallet.SaveCurrencies(
                                     blockchainNetworks = blockchainNetworks,
@@ -144,15 +155,15 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
 
             if (scanResponse == null) {
                 store.dispatch(NavigationAction.PopBackTo())
-                store.dispatch(HomeAction.ReadCard)
+                store.dispatch(HomeAction.ReadCard())
             } 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 +177,7 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
                         if (onboardingWalletState.isSaltPay) {
                             BackupAction.StartBackup
                         } else {
+                            Analytics.send(Onboarding.Backup.ScreenOpened())
                             BackupAction.IntroduceBackup
                         }
                     } else {
@@ -175,22 +187,19 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
             }
             newAction?.let { store.dispatch(it) }
         }
-        OnboardingWalletAction.OnBackPressed -> {
-            when {
-                onboardingWalletState.isSaltPay -> handleOnBackPressedSaltPay(onboardingWalletState)
-                else -> handleOnBackPressed(onboardingWalletState)
-            }
-        }
+        OnboardingWalletAction.OnBackPressed -> handleOnBackPressed(onboardingWalletState)
+        else -> {}
     }
 }
 
 private fun updateScanResponseAfterBackup(
-    scanResponse: ScanResponse, backupState: BackupState,
+    scanResponse: ScanResponse,
+    backupState: BackupState,
 ): ScanResponse {
     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 {
@@ -210,6 +219,7 @@ class BackupMiddleware {
     }
 }
 
+@Suppress("LongMethod", "ComplexMethod", "MagicNumber")
 private fun handleBackupAction(appState: () -> AppState?, action: BackupAction) {
     if (DemoHelper.tryHandle(appState, action)) return
     val globalState = appState()?.globalState ?: return
@@ -221,6 +231,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 +277,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 +290,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 +328,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 +338,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 -> {
@@ -329,13 +350,15 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             }
         }
         is BackupAction.ResumeFoundUnfinishedBackup -> {
-            store.dispatch(GlobalAction.Onboarding.StartForUnfinishedBackup)
+            store.dispatch(GlobalAction.Onboarding.StartForUnfinishedBackup(backupService.addedBackupCardsCount))
             store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
         }
         is BackupAction.DismissBackup -> {
+            Analytics.send(Onboarding.Backup.Skipped())
             if (onboardingWalletState.isSaltPay) throw UnsupportedOperationException()
             store.dispatch(BackupAction.FinishBackup)
         }
+        else -> {}
     }
 }
 
@@ -351,9 +374,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)
         }
@@ -374,38 +398,41 @@ private fun initSaltPayOnBackupFinishedIfNeeded(
     onboardingWalletState: OnboardingWalletState,
 ) {
     if (onboardingWalletState.isSaltPay && onboardingWalletState.onboardingSaltPayState == null) {
-        if (scanResponse == null) throw IllegalArgumentException()
+        if (scanResponse == null) error("scanning response is null")
 
         val (manager, config) = OnboardingSaltPayState.initDependency(scanResponse)
-        store.dispatchOnMain(OnboardingSaltPayAction.Init.SetDependencies(manager, config))
+        store.dispatchOnMain(OnboardingSaltPayAction.SetDependencies(manager, config))
         store.dispatchOnMain(OnboardingSaltPayAction.Update)
     }
 }
 
-private fun handleOnBackPressedSaltPay(state: OnboardingWalletState) {
-    when (state.backupState.backupStep) {
-        BackupStep.Finished -> {
-            store.dispatchDialogShow(
-                SaltPayDialog.Activation.TryToInterrupt(
-                    onOk = { store.dispatch(NavigationAction.PopBackTo()) },
-                    onCancel = { /* do nothing */ },
-                ),
-            )
-        }
-        else -> handleOnBackPressed(state)
-    }
-}
-
 private fun handleOnBackPressed(state: OnboardingWalletState) {
     when (state.backupState.backupStep) {
-        BackupStep.InitBackup, BackupStep.Finished -> store.dispatch(NavigationAction.PopBackTo())
-        BackupStep.ScanOriginCard, BackupStep.AddBackupCards, BackupStep.EnterAccessCode,
+        BackupStep.InitBackup, BackupStep.ScanOriginCard, BackupStep.AddBackupCards, BackupStep.EnterAccessCode,
         BackupStep.ReenterAccessCode, BackupStep.SetAccessCode, BackupStep.WritePrimaryCard,
         -> {
-            store.dispatch(BackupAction.DiscardBackup)
-            store.dispatch(NavigationAction.PopBackTo())
+            showInterruptOnboardingDialog()
         }
-        is BackupStep.WriteBackupCard ->
+        is BackupStep.WriteBackupCard -> {
             store.dispatch(GlobalAction.ShowDialog(BackupDialog.BackupInProgress))
+        }
+        BackupStep.Finished -> {
+            if (state.isSaltPay) {
+                showInterruptOnboardingDialog()
+            } else {
+                store.dispatch(NavigationAction.PopBackTo())
+            }
+        }
     }
+}
+
+private fun showInterruptOnboardingDialog() {
+    store.dispatchDialogShow(
+        OnboardingDialog.InterruptOnboarding(
+            onOk = {
+                store.dispatch(BackupAction.DiscardBackup)
+                store.dispatch(NavigationAction.PopBackTo())
+            },
+        ),
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
index 8cca79e9dd..68099fff3f 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
@@ -7,10 +7,8 @@ import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.Onboardi
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayReducer
 import org.rekotlin.Action
 
-class OnboardingWalletReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): OnboardingWalletState = internalReduce(action, state)
-    }
+object OnboardingWalletReducer {
+    fun reduce(action: Action, state: AppState): OnboardingWalletState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, appState: AppState): OnboardingWalletState {
@@ -29,110 +27,86 @@ private fun internalReduce(action: Action, appState: AppState): OnboardingWallet
         )
         is OnboardingWalletAction.ResumeBackup -> state.copy(step = OnboardingWalletStep.Backup)
         is OnboardingWalletAction.SetArtworkUrl -> {
-            state.copy(cardArtworkUrl = action.artworkUrl)
+            state.copy(cardArtworkUri = action.artworkUri)
         }
         is OnboardingWalletAction.Done -> state.copy(step = OnboardingWalletStep.Done)
         else -> state
     }
 }
 
-private class ReducerForGlobalAction {
-    companion object {
-        fun reduce(action: GlobalAction.Onboarding, state: OnboardingWalletState): OnboardingWalletState {
-            return when (action) {
-                is GlobalAction.Onboarding.Start -> {
-                    OnboardingWalletState(
-                        backupState = state.backupState.copy(
-                            maxBackupCards = if (action.scanResponse.isSaltPay()) 1 else 2,
-                            canSkipBackup = if (action.scanResponse.isSaltPay()) false else action.canSkipBackup,
-                        ),
-                        isSaltPay = action.scanResponse.isSaltPay(),
-                    )
-                }
-                is GlobalAction.Onboarding.StartForUnfinishedBackup -> {
-                    OnboardingWalletState(
-                        backupState = state.backupState.copy(
-                            maxBackupCards = 2,
-                            canSkipBackup = false,
-                        ),
-                        isSaltPay = false,
-                    )
-                }
-                else -> state
+private object ReducerForGlobalAction {
+    fun reduce(action: GlobalAction.Onboarding, state: OnboardingWalletState): OnboardingWalletState {
+        return when (action) {
+            is GlobalAction.Onboarding.Start -> {
+                OnboardingWalletState(
+                    backupState = state.backupState.copy(
+                        maxBackupCards = if (action.scanResponse.cardTypesResolver.isSaltPay()) 1 else 2,
+                        canSkipBackup =
+                        if (action.scanResponse.cardTypesResolver.isSaltPay()) false else action.canSkipBackup,
+                    ),
+                    isSaltPay = action.scanResponse.cardTypesResolver.isSaltPay(),
+                )
             }
+            is GlobalAction.Onboarding.StartForUnfinishedBackup -> {
+                OnboardingWalletState(
+                    backupState = state.backupState.copy(
+                        maxBackupCards = action.addedBackupCardsCount,
+                        canSkipBackup = false,
+                    ),
+                    isSaltPay = false,
+                )
+            }
+            else -> state
         }
     }
 }
 
-private class BackupReducer {
-    companion object {
-        fun reduce(
-            action: BackupAction,
-            state: BackupState,
-            isSaltPay: Boolean,
-        ): BackupState {
-
-            return when (action) {
-                is BackupAction.IntroduceBackup -> BackupState(
-                    backupStep = BackupStep.InitBackup,
-                    maxBackupCards = if (isSaltPay) 1 else 2,
-                    canSkipBackup = state.canSkipBackup,
+private object BackupReducer {
+    @Suppress("ComplexMethod")
+    fun reduce(action: BackupAction, state: BackupState, isSaltPay: Boolean): BackupState {
+        return when (action) {
+            is BackupAction.IntroduceBackup -> BackupState(
+                backupStep = BackupStep.InitBackup,
+                maxBackupCards = if (isSaltPay) 1 else 2,
+                canSkipBackup = state.canSkipBackup,
+            )
+            BackupAction.StartAddingPrimaryCard -> state.copy(backupStep = BackupStep.ScanOriginCard)
+            BackupAction.StartAddingBackupCards -> state.copy(backupStep = BackupStep.AddBackupCards)
+            BackupAction.AddBackupCard.Success -> state.copy(backupCardsNumber = state.backupCardsNumber + 1)
+            BackupAction.ShowAccessCodeInfoScreen -> state.copy(backupStep = BackupStep.SetAccessCode)
+            BackupAction.ShowEnterAccessCodeScreen -> state.copy(
+                backupStep = BackupStep.EnterAccessCode,
+                accessCodeError = null,
+            )
+            is BackupAction.SaveFirstAccessCode -> state.copy(
+                backupStep = BackupStep.ReenterAccessCode,
+                accessCode = action.accessCode,
+            )
+            is BackupAction.SetAccessCodeError -> state.copy(accessCodeError = action.error)
+            is BackupAction.PrepareToWritePrimaryCard -> if (state.primaryCardId == null) {
+                state.copy(
+                    primaryCardId = backupService.primaryCardId,
+                    backupCardIds = backupService.backupCardIds,
+                    backupCardsNumber = backupService.backupCardIds.size,
+                    backupStep = BackupStep.WritePrimaryCard,
                 )
-                BackupAction.StartAddingPrimaryCard -> state.copy(backupStep = BackupStep.ScanOriginCard)
-                BackupAction.StartAddingBackupCards -> {
-                    state.copy(backupStep = BackupStep.AddBackupCards)
-                }
-                BackupAction.AddBackupCard.Success -> {
-                    state.copy(backupCardsNumber = state.backupCardsNumber + 1)
-                }
-                BackupAction.ShowAccessCodeInfoScreen -> {
-                    state.copy(backupStep = BackupStep.SetAccessCode)
-                }
-                BackupAction.ShowEnterAccessCodeScreen -> {
-                    state.copy(backupStep = BackupStep.EnterAccessCode, accessCodeError = null)
-                }
-                is BackupAction.SaveFirstAccessCode -> {
-                    state.copy(
-                        backupStep = BackupStep.ReenterAccessCode,
-                        accessCode = action.accessCode,
-                    )
-                }
-                is BackupAction.SetAccessCodeError -> {
-                    state.copy(accessCodeError = action.error)
-                }
-                is BackupAction.PrepareToWritePrimaryCard -> {
-                    if (state.primaryCardId == null) {
-                        state.copy(
-                            primaryCardId = backupService.primaryCardId,
-                            backupCardIds = backupService.backupCardIds,
-                            backupCardsNumber = backupService.backupCardIds.size,
-                            backupStep = BackupStep.WritePrimaryCard,
-                        )
-                    } else {
-                        state.copy(backupStep = BackupStep.WritePrimaryCard)
-                    }
-                }
-                is BackupAction.PrepareToWriteBackupCard -> {
-                    if (state.primaryCardId == null) {
-                        state.copy(
-                            primaryCardId = backupService.primaryCardId,
-                            backupCardIds = backupService.backupCardIds,
-                            backupCardsNumber = backupService.backupCardIds.size,
-                            backupStep = BackupStep.WriteBackupCard(action.cardNumber),
-                        )
-                    } else {
-                        state.copy(backupStep = BackupStep.WriteBackupCard(action.cardNumber))
-                    }
-                }
-                is BackupAction.FinishBackup -> {
-                    state.copy(backupStep = BackupStep.Finished)
-                }
-                BackupAction.OnAccessCodeDialogClosed -> {
-                    state.copy(backupStep = BackupStep.AddBackupCards)
-                }
-                BackupAction.DiscardBackup -> BackupState()
-                else -> state
+            } else {
+                state.copy(backupStep = BackupStep.WritePrimaryCard)
             }
+            is BackupAction.PrepareToWriteBackupCard -> if (state.primaryCardId == null) {
+                state.copy(
+                    primaryCardId = backupService.primaryCardId,
+                    backupCardIds = backupService.backupCardIds,
+                    backupCardsNumber = backupService.backupCardIds.size,
+                    backupStep = BackupStep.WriteBackupCard(action.cardNumber),
+                )
+            } else {
+                state.copy(backupStep = BackupStep.WriteBackupCard(action.cardNumber))
+            }
+            is BackupAction.FinishBackup -> state.copy(backupStep = BackupStep.Finished)
+            BackupAction.OnAccessCodeDialogClosed -> state.copy(backupStep = BackupStep.AddBackupCards)
+            BackupAction.DiscardBackup -> BackupState()
+            else -> state
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
index 6fc233d092..64af52ecac 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
@@ -1,6 +1,7 @@
 package com.tangem.tap.features.onboarding.products.wallet.redux
 
 import android.graphics.Bitmap
+import android.net.Uri
 import com.tangem.common.CardFilter
 import com.tangem.domain.common.SaltPayWorkaround
 import com.tangem.tap.common.redux.StateDialog
@@ -16,7 +17,7 @@ data class OnboardingWalletState(
     val backupState: BackupState = BackupState(),
     val onboardingSaltPayState: OnboardingSaltPayState? = null,
     val isSaltPay: Boolean = false,
-    val cardArtworkUrl: String? = null,
+    val cardArtworkUri: Uri? = null,
     val showConfetti: Boolean = false,
 ) : StateType {
 
@@ -29,11 +30,13 @@ data class OnboardingWalletState(
             else -> null
         }
 
+    @Suppress("MagicNumber")
     fun getMaxProgress(): Int = when {
         isSaltPay -> 12
         else -> 6
     }
 
+    @Suppress("ComplexMethod", "MagicNumber")
     fun getProgressStep(): Int {
         return when {
             step == OnboardingWalletStep.CreateWallet -> 1
@@ -105,8 +108,8 @@ sealed class BackupStep {
 }
 
 sealed class BackupDialog : StateDialog {
-    object AddMoreBackupCards : StateDialog
-    object BackupInProgress : StateDialog
-    object UnfinishedBackupFound : StateDialog
-    object ConfirmDiscardingBackup : StateDialog
+    object AddMoreBackupCards : BackupDialog()
+    object BackupInProgress : BackupDialog()
+    object UnfinishedBackupFound : BackupDialog()
+    object ConfirmDiscardingBackup : BackupDialog()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt
index 771fca7d4b..8921be37f3 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt
@@ -38,12 +38,11 @@ class GnosisRegistrator(
     }
 
     private val otpProcessorContractAddress: String = when (walletManager.wallet.blockchain) {
-        Blockchain.SaltPay -> "0x3B4397C817A26521Df8bD01a949AFDE2251d91C2"
-        Blockchain.SaltPayTestnet -> "0x710BF23486b549836509a08c184cE0188830f197"
+        Blockchain.SaltPay -> "0xc659f4FEd7A84a188F54cBA4A7a49D77c1a20522"
         else -> throw IllegalArgumentException("GnosisRegistrator supports only the SaltPay blockchain")
     }
 
-    private val addressTreasureSafe = "0x8e9260a049d3Aa9ac60D0d4F27017320E0e2396B"
+    private val addressTreasureSafe = "0x24A3c2382497075b6D93258f5938f7B661c06318"
 
     private val atomicNonce = AtomicLong()
 
@@ -160,11 +159,15 @@ class GnosisRegistrator(
         return Result.Success(Unit)
     }
 
+    @Suppress("MagicNumber")
     private fun Result<List<Amount>>.extractFeeAmount(): Result<Amount> {
         return when (this) {
             is Result.Success -> {
-                if (this.data.size != 3) Result.Failure(BlockchainSdkError.FailedToLoadFee)
-                else Result.Success(this.data[1])
+                if (this.data.size != 3) {
+                    Result.Failure(BlockchainSdkError.FailedToLoadFee)
+                } else {
+                    Result.Success(this.data[1])
+                }
             }
             is Result.Failure -> this
         }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/PinFilters.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/PinFilters.kt
index 15a4137ec0..fd359c25a4 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/PinFilters.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/PinFilters.kt
@@ -5,9 +5,9 @@ import com.tangem.common.Filter
 /**
 [REDACTED_AUTHOR]
  */
-abstract class PinFilter : Filter<String>
+interface PinFilter : Filter<String>
 
-class AllSymbolsTheSameFilter : PinFilter() {
+class AllSymbolsTheSameFilter : PinFilter {
     override fun filter(value: String): Boolean {
         if (value.isEmpty()) return false
 
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..2e75c77dce 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
@@ -9,21 +9,27 @@ import com.tangem.blockchain.common.TransactionSigner
 import com.tangem.blockchain.extensions.successOr
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.isZero
+import com.tangem.common.extensions.toHexString
 import com.tangem.common.services.Result
+import com.tangem.common.services.performRequest
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
+import com.tangem.datasource.api.paymentology.models.request.CheckRegistrationRequests
+import com.tangem.datasource.api.paymentology.models.request.RegisterKYCRequest
+import com.tangem.datasource.api.paymentology.models.request.RegisterWalletRequest
+import com.tangem.datasource.api.paymentology.models.response.AttestationResponse
+import com.tangem.datasource.api.paymentology.models.response.RegisterWalletResponse
+import com.tangem.datasource.api.paymentology.models.response.RegistrationResponse
+import com.tangem.datasource.api.paymentology.models.response.tryExtractError
 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.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 kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.math.BigDecimal
+import com.tangem.blockchain.extensions.Result as BlockchainResult
 
 /**
 [REDACTED_AUTHOR]
@@ -45,24 +51,40 @@ class SaltPayActivationManager(
 
     suspend fun checkHasGas(): Result<Unit> {
         return when (val hasGasResult = gnosisRegistrator.checkHasGas()) {
-            is com.tangem.blockchain.extensions.Result.Success -> if (hasGasResult.data) {
+            is BlockchainResult.Success -> if (hasGasResult.data) {
                 Result.Success(Unit)
             } else {
                 Result.Failure(SaltPayActivationError.NoGas)
             }
-            is com.tangem.blockchain.extensions.Result.Failure -> Result.Failure(hasGasResult.error as BlockchainSdkError)
+            is BlockchainResult.Failure -> Result.Failure(hasGasResult.error as BlockchainSdkError)
         }
     }
 
     suspend fun registerKYC(): Result<Unit> {
-        return when (val result = paymentologyService.registerKYC(makeRegisterKYCRequest())) {
+        val result = withContext(Dispatchers.IO) {
+            performRequest { paymentologyService.api.registerKYC(makeRegisterKYCRequest()) }
+        }
+        return when (result) {
             is Result.Success -> Result.Success(Unit)
             is Result.Failure -> result
         }
     }
 
     suspend fun checkRegistration(): Result<RegistrationResponse.Item> {
-        val response: RegistrationResponse = paymentologyService.checkRegistration(cardId, cardPublicKey)
+        val response: RegistrationResponse = withContext(Dispatchers.IO) {
+            performRequest {
+                paymentologyService.api.checkRegistration(
+                    request = CheckRegistrationRequests(
+                        requests = listOf(
+                            CheckRegistrationRequests.Item(
+                                cardId = cardId,
+                                publicKey = cardPublicKey.toHexString(),
+                            ),
+                        ),
+                    ),
+                )
+            }
+        }
             .successOr { return it }
             .tryExtractError<RegistrationResponse>()
             .successOr { return it }
@@ -71,7 +93,7 @@ class SaltPayActivationManager(
             if (response.results.isEmpty()) throw SaltPayActivationError.EmptyResponse
 
             val item = response.results[0]
-            if (item.error != null) throw Exception(response.makeErrorMessage())
+            if (item.error != null) throw IllegalStateException(response.makeErrorMessage())
 
             Result.Success(item)
         } catch (ex: Exception) {
@@ -80,14 +102,23 @@ class SaltPayActivationManager(
     }
 
     suspend fun requestAttestationChallenge(): Result<AttestationResponse> {
-        return paymentologyService.requestAttestationChallenge(cardId, cardPublicKey)
+        return withContext(Dispatchers.IO) {
+            performRequest {
+                paymentologyService.api.requestAttestationChallenge(
+                    request = CheckRegistrationRequests.Item(
+                        cardId = cardId,
+                        publicKey = cardPublicKey.toHexString(),
+                    ),
+                )
+            }
+        }
             .successOr { return it }
             .tryExtractError()
     }
 
     suspend fun sendTransactions(
         signedTransactions: List<SignedEthereumTransaction>,
-    ): com.tangem.blockchain.extensions.Result<List<String>> {
+    ): BlockchainResult<List<String>> {
         return gnosisRegistrator.sendTransactions(signedTransactions)
     }
 
@@ -105,7 +136,9 @@ class SaltPayActivationManager(
             cardSignature = attestResponse.cardSignature ?: byteArrayOf(),
             pin = pinCode,
         )
-        return paymentologyService.registerWallet(request)
+        return withContext(Dispatchers.IO) {
+            performRequest { paymentologyService.api.registerWallet(request) }
+        }
             .successOr { return it }
             .tryExtractError()
     }
@@ -123,7 +156,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,17 +185,18 @@ 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(
             kycProvider = SaltPayConfig.stub().kycProvider,
-            paymentologyService = PaymentologyApiService.stub(),
+            paymentologyService = PaymentologyApiService,
             gnosisRegistrator = GnosisRegistrator.stub(),
             cardId = "",
             cardPublicKey = byteArrayOf(),
@@ -192,4 +226,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/SaltPayConfig.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayConfig.kt
index d853819a57..19048168de 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayConfig.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayConfig.kt
@@ -1,6 +1,7 @@
 package com.tangem.tap.features.onboarding.products.wallet.saltPay
 
 import com.tangem.tap.common.zendesk.ZendeskConfig
+import org.spongycastle.util.encoders.Base64.toBase64String
 
 /**
 [REDACTED_AUTHOR]
@@ -8,12 +9,14 @@ import com.tangem.tap.common.zendesk.ZendeskConfig
 data class SaltPayConfig(
     val zendesk: ZendeskConfig,
     val kycProvider: KYCProvider,
+    val credentials: Credentials,
 ) {
     companion object {
         fun stub(): SaltPayConfig {
             return SaltPayConfig(
                 zendesk = ZendeskConfig("", "", "", "", ""),
                 kycProvider = KYCProvider("", "", "", ""),
+                credentials = Credentials("", ""),
             )
         }
     }
@@ -24,4 +27,11 @@ data class KYCProvider(
     val externalIdParameterKey: String,
     val sidParameterKey: String,
     val sidValue: String,
-)
\ No newline at end of file
+)
+
+data class Credentials(
+    val user: String,
+    val password: String,
+) {
+    val token: String by lazy { "Basic ${toBase64String("$user:$password".toByteArray())}" }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayExceptionHandler.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayExceptionHandler.kt
index 3b4ed41a05..6236bf847e 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayExceptionHandler.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayExceptionHandler.kt
@@ -11,36 +11,33 @@ import com.tangem.tap.store
 /**
 [REDACTED_AUTHOR]
  */
-class SaltPayExceptionHandler {
-    companion object {
-        fun handle(throwable: Throwable) {
-            when (throwable) {
-                is SaltPayActivationError -> {
-                    val dialog = when (throwable) {
-                        is SaltPayActivationError.NoGas -> SaltPayDialog.Activation.NoGas
-                        else -> SaltPayDialog.Activation.OnError(throwable)
+object SaltPayExceptionHandler {
+    fun handle(throwable: Throwable) {
+        when (throwable) {
+            is SaltPayActivationError -> {
+                val dialog = when (throwable) {
+                    is SaltPayActivationError.NoGas -> SaltPayDialog.Activation.NoGas
+                    is SaltPayActivationError.PutVisaCard -> SaltPayDialog.Activation.PutVisaCard
+                    else -> SaltPayDialog.Activation.OnError(throwable)
+                }
+                store.dispatchDialogShow(dialog)
+            }
+            is TangemSdkError -> {
+                when (throwable) {
+                    is TangemSdkError.NetworkError -> {
+                        val message = throwable.customMessage
+                        store.dispatchDialogShow(AppDialog.SimpleOkErrorDialog(message))
                     }
-                    store.dispatchDialogShow(dialog)
-                }
-                is TangemSdkError -> {
-                    when (throwable) {
-                        is TangemSdkError.NetworkError -> {
-                            val message = (throwable).customMessage
-                            store.dispatchDialogShow(AppDialog.SimpleOkErrorDialog(message))
-                        }
-                        else -> {
-                            // do nothing
-                        }
-                    }
-                }
-                is BlockchainSdkError -> {
-                    store.dispatchDialogShow(AppDialog.SimpleOkErrorDialog(throwable.customMessage))
-                }
-                else -> {
-                    val message = throwable.localizedMessage ?: "SaltPay unknown error"
-                    store.dispatchDialogShow(AppDialog.SimpleOkErrorDialog(message))
+                    else -> Unit
                 }
             }
+            is BlockchainSdkError -> {
+                store.dispatchDialogShow(AppDialog.SimpleOkErrorDialog(throwable.customMessage))
+            }
+            else -> {
+                val message = throwable.localizedMessage ?: "SaltPay unknown error"
+                store.dispatchDialogShow(AppDialog.SimpleOkErrorDialog(message))
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/UtorgWebView.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/UtorgWebView.kt
index b773adcb70..2a33de86f4 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/UtorgWebView.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/UtorgWebView.kt
@@ -64,7 +64,9 @@ class UtorgWebChromeClient(
         if (!readyToShowFileChooser()) return false
 
         val type: String
-        if (fileChooserParams != null && fileChooserParams.acceptTypes != null && fileChooserParams.acceptTypes.isNotEmpty()) {
+        if (fileChooserParams != null && fileChooserParams.acceptTypes != null &&
+            fileChooserParams.acceptTypes.isNotEmpty()
+        ) {
             type = if (!TextUtils.isEmpty(fileChooserParams.acceptTypes[0])) fileChooserParams.acceptTypes[0] else "*/*"
             this.filePathCallback = filePathCallback
         } else {
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/InterruptOnboardingDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/InterruptOnboardingDialog.kt
new file mode 100644
index 0000000000..36827b96a4
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/InterruptOnboardingDialog.kt
@@ -0,0 +1,25 @@
+package com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog
+
+import android.app.Dialog
+import android.content.Context
+import androidx.appcompat.app.AlertDialog
+import com.tangem.tap.common.extensions.dispatchDialogHide
+import com.tangem.tap.features.onboarding.OnboardingDialog
+import com.tangem.tap.store
+import com.tangem.wallet.R
+
+/**
+[REDACTED_AUTHOR]
+ */
+object InterruptOnboardingDialog {
+    fun create(context: Context, dialog: OnboardingDialog.InterruptOnboarding): Dialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(context.getString(R.string.onboarding_exit_alert_title))
+            setMessage(context.getString(R.string.onboarding_exit_alert_message))
+            setPositiveButton(R.string.common_ok) { _, _ -> dialog.onOk() }
+            setNegativeButton(R.string.common_cancel) { _, _ -> }
+            setOnDismissListener { store.dispatchDialogHide() }
+            setCancelable(false)
+        }.create()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/NoFundsForActivationDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/NoFundsForActivationDialog.kt
index 579f34d614..ace8913879 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/NoFundsForActivationDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/NoFundsForActivationDialog.kt
@@ -13,27 +13,25 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
-class NoFundsForActivationDialog {
-    companion object {
-        fun create(context: Context): Dialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(R.string.saltpay_error_no_gas_title)
-                setMessage(R.string.saltpay_error_no_gas_message)
-                //TODO: SaltPay: change onboarding_supplement_button_kyc_waiting -> to appropriate string
-                setPositiveButton(R.string.onboarding_supplement_button_kyc_waiting) { _, _ ->
-                    val config = store.state.globalState.configManager?.config?.saltPayConfig?.zendesk.guard {
-                        store.dispatchDebugErrorNotification("SaltPayConfig not initialized")
-                        return@setPositiveButton
-                    }
-                    store.dispatch(GlobalAction.OpenChat(SupportInfo(), config))
+object NoFundsForActivationDialog {
+    fun create(context: Context): Dialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(R.string.saltpay_error_no_gas_title)
+            setMessage(R.string.saltpay_error_no_gas_message)
+            // TODO: SaltPay: change onboarding_supplement_button_kyc_waiting -> to appropriate string
+            setPositiveButton(R.string.onboarding_supplement_button_kyc_waiting) { _, _ ->
+                val config = store.state.globalState.configManager?.config?.saltPayConfig?.zendesk.guard {
+                    store.dispatchDebugErrorNotification("SaltPayConfig not initialized")
+                    return@setPositiveButton
                 }
-                setNegativeButton(R.string.common_cancel) { _, _ ->
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-                setCancelable(false)
-            }.create()
-        }
+                store.dispatch(GlobalAction.OpenChat(SupportInfo(), config))
+            }
+            setNegativeButton(R.string.common_cancel) { _, _ ->
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+            setCancelable(false)
+        }.create()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/PutVisaCardDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/PutVisaCardDialog.kt
new file mode 100644
index 0000000000..d3daf798fe
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/PutVisaCardDialog.kt
@@ -0,0 +1,25 @@
+package com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog
+
+import android.app.Dialog
+import android.content.Context
+import androidx.appcompat.app.AlertDialog
+import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.store
+import com.tangem.wallet.R
+
+/**
+[REDACTED_AUTHOR]
+ */
+object PutVisaCardDialog {
+    fun create(context: Context): Dialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(R.string.saltpay_error_empty_backup_title)
+            setMessage(R.string.saltpay_error_empty_backup_message)
+            setPositiveButton(R.string.common_ok) { _, _ -> }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+            setCancelable(false)
+        }.create()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/RegistrationErrorDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/RegistrationErrorDialog.kt
index 831d097783..f3c184157f 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/RegistrationErrorDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/RegistrationErrorDialog.kt
@@ -12,22 +12,20 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
-class RegistrationErrorDialog {
-    companion object {
-        fun create(context: Context, dialog: SaltPayDialog.Activation.OnError): Dialog {
-            val convertedMessage = SaltPayErrorConverter(context).convert(dialog.error) as ConvertedDialogMessage
+object RegistrationErrorDialog {
+    fun create(context: Context, dialog: SaltPayDialog.Activation.OnError): Dialog {
+        val convertedMessage = SaltPayErrorConverter(context).convert(dialog.error) as ConvertedDialogMessage
 
-            return AlertDialog.Builder(context).apply {
-                setTitle(convertedMessage.title)
-                setMessage(convertedMessage.message)
-                setPositiveButton(R.string.common_ok) { _, _ ->
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-                setCancelable(false)
-            }.create()
-        }
+        return AlertDialog.Builder(context).apply {
+            setTitle(convertedMessage.title)
+            setMessage(convertedMessage.message)
+            setPositiveButton(R.string.common_ok) { _, _ ->
+                store.dispatch(GlobalAction.HideDialog)
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+            setCancelable(false)
+        }.create()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/SaltPayDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/SaltPayDialog.kt
index fda1331a37..26228ba27f 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/SaltPayDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/SaltPayDialog.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog
 
-import com.tangem.common.extensions.VoidCallback
 import com.tangem.tap.common.redux.StateDialog
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.message.SaltPayActivationError
 
@@ -10,7 +9,7 @@ import com.tangem.tap.features.onboarding.products.wallet.saltPay.message.SaltPa
 sealed class SaltPayDialog : StateDialog {
     sealed class Activation : SaltPayDialog() {
         object NoGas : SaltPayDialog()
+        object PutVisaCard : SaltPayDialog()
         data class OnError(val error: SaltPayActivationError) : SaltPayDialog()
-        data class TryToInterrupt(val onOk: VoidCallback, val onCancel: VoidCallback) : SaltPayDialog()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/TryToInterruptRegistrationDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/TryToInterruptRegistrationDialog.kt
deleted file mode 100644
index 6f02df9120..0000000000
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/dialog/TryToInterruptRegistrationDialog.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog
-
-import android.app.Dialog
-import android.content.Context
-import androidx.appcompat.app.AlertDialog
-import com.tangem.tap.common.extensions.dispatchDialogHide
-import com.tangem.tap.store
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-class TryToInterruptRegistrationDialog {
-    companion object {
-        fun create(context: Context, dialog: SaltPayDialog.Activation.TryToInterrupt): Dialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.onboarding_exit_alert_title))
-                setMessage(context.getString(R.string.onboarding_exit_alert_message))
-                setPositiveButton(R.string.common_ok) { _, _ -> dialog.onOk() }
-                setNegativeButton(R.string.common_cancel) { _, _ -> dialog.onCancel() }
-                setOnDismissListener { store.dispatchDialogHide() }
-                setCancelable(false)
-            }.create()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt
index 6f2a5de7ad..c6e8d9526e 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt
@@ -28,27 +28,27 @@ sealed class SaltPayActivationError(
     subCode = ERROR_CODE_REGISTRATION + subCode,
     message = message ?: EMPTY_MESSAGE,
 ) {
-    object Unknown : SaltPayActivationError(4)
-    object Empty : SaltPayActivationError(4)
+    object Unknown : SaltPayActivationError(subCode = 4)
+    object Empty : SaltPayActivationError(subCode = 4)
 
     // gnosis
-    object FailedToMakeTxData : SaltPayActivationError(1)
-    object FailedToSendTx : SaltPayActivationError(2)
+    object FailedToMakeTxData : SaltPayActivationError(subCode = 1)
+    object FailedToSendTx : SaltPayActivationError(subCode = 2)
 
-    object NeedPin : SaltPayActivationError(3)
-    object NoGas : SaltPayActivationError(5) //
-    object EmptyResponse : SaltPayActivationError(6)
-    object CardNotFound : SaltPayActivationError(8)
-    class CardDisabled(message: String?) : SaltPayActivationError(9, message)
-    class CardNotPassed(message: String?) : SaltPayActivationError(10, message)
-    object EmptyDynamicAttestResponse : SaltPayActivationError(11)
-    object EmptyBackupCardScanned : SaltPayActivationError(12)
-    object WeakPin : SaltPayActivationError(13)
+    object NeedPin : SaltPayActivationError(subCode = 3)
+    object NoGas : SaltPayActivationError(subCode = 5)
+    object EmptyResponse : SaltPayActivationError(subCode = 6)
+    object CardNotFound : SaltPayActivationError(subCode = 8)
+    class CardDisabled(message: String?) : SaltPayActivationError(subCode = 9, message = message)
+    class CardNotPassed(message: String?) : SaltPayActivationError(subCode = 10, message = message)
+    object EmptyDynamicAttestResponse : SaltPayActivationError(subCode = 11)
+    object EmptyBackupCardScanned : SaltPayActivationError(subCode = 12)
+    object WeakPin : SaltPayActivationError(subCode = 13)
 
-    object FailedToGetFundsToClaim : SaltPayActivationError(14)
-    object NoFundsToClaim : SaltPayActivationError(15)
-    object ClaimTransactionFailed : SaltPayActivationError(16)
-    object NotClaimed : SaltPayActivationError(17)
+    object FailedToGetFundsToClaim : SaltPayActivationError(subCode = 14)
+    object NoFundsToClaim : SaltPayActivationError(subCode = 15)
+    object ClaimTransactionFailed : SaltPayActivationError(subCode = 16)
+    object PutVisaCard : SaltPayActivationError(subCode = 18)
 
     companion object {
         const val EMPTY_MESSAGE = ""
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..a8894ae74e 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()
@@ -36,4 +36,4 @@ sealed class OnboardingSaltPayAction : Action {
     data class SetStep(val newStep: SaltPayActivationStep) : OnboardingSaltPayAction()
     data class SetAmountToClaim(val amount: Amount?) : OnboardingSaltPayAction()
     data class SetTokenBalance(val balanceValue: BigDecimal) : OnboardingSaltPayAction()
-}
+}
\ No newline at end of file
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..e25117369f 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
@@ -6,19 +6,22 @@ import com.tangem.blockchain.extensions.successOr
 import com.tangem.common.Filter
 import com.tangem.common.extensions.guard
 import com.tangem.common.services.Result
+import com.tangem.core.analytics.Analytics
+import com.tangem.datasource.api.paymentology.models.response.KYCStatus
+import com.tangem.datasource.api.paymentology.models.response.RegistrationResponse
 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.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
@@ -36,10 +39,8 @@ import timber.log.Timber
 /**
 [REDACTED_AUTHOR]
  */
-class OnboardingSaltPayMiddleware {
-    companion object {
-        val handler = onboardingSaltPayMiddleware
-    }
+object OnboardingSaltPayMiddleware {
+    val handler = onboardingSaltPayMiddleware
 }
 
 private val onboardingSaltPayMiddleware: Middleware<AppState> = { dispatch, state ->
@@ -51,6 +52,7 @@ private val onboardingSaltPayMiddleware: Middleware<AppState> = { dispatch, stat
     }
 }
 
+@Suppress("LongMethod", "ComplexMethod")
 private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> AppState?) {
     if (DemoHelper.tryHandle(appState, anyAction)) return
     val action = anyAction as? OnboardingSaltPayAction ?: return
@@ -58,10 +60,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 +92,6 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
             }
         }
         is OnboardingSaltPayAction.RegisterCard -> {
-            analyticsHandler.handleAnalyticsEvent(Onboarding.ButtonConnect())
-
             handleInProgress = true
             val state = getState()
 
@@ -151,7 +164,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 +172,6 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
             }
         }
         is OnboardingSaltPayAction.Claim -> {
-            analyticsHandler.handleAnalyticsEvent(Onboarding.ButtonClaim())
             val state = getState()
             handleInProgress = true
 
@@ -192,7 +204,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 +245,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?,
@@ -271,6 +291,7 @@ suspend fun SaltPayActivationManager.update(
     return Result.Success(newStep)
 }
 
+@Suppress("ComplexMethod")
 private fun determineStep(
     currentStep: SaltPayActivationStep,
     amountToClaim: Amount?,
@@ -391,34 +412,6 @@ private suspend fun checkGasIfNeeded(
     return result
 }
 
-@Throws(SaltPayActivationError::class)
-fun RegistrationResponse.Item.toSaltPayStep(currentStep: SaltPayActivationStep): SaltPayActivationStep {
-    return when {
-        passed != true -> throw SaltPayActivationError.CardNotPassed(this.error)
-        disabledByAdmin == true -> throw SaltPayActivationError.CardDisabled(this.error)
-
-        // go to claim screen
-        active == true -> SaltPayActivationStep.Claim
-
-        // pinSet is false, go toPin screen
-        pinSet == false -> SaltPayActivationStep.NeedPin
-
-        kycStatus != null -> {
-            when (kycStatus) {
-                KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
-                KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
-                KYCStatus.CORRECTION_REQUESTED, KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
-                KYCStatus.APPROVED -> SaltPayActivationStep.Claim
-                null -> throw UnsupportedOperationException()
-            }
-        }
-        // kycDate is set, go to kyc waiting screen
-        kycDate != null -> SaltPayActivationStep.KycWaiting
-
-        else -> SaltPayActivationStep.KycIntro
-    }
-}
-
 @Throws(SaltPayActivationError::class)
 private fun assertPinValid(pin: String, pinLength: Int) {
     val array = pin.toCharArray()
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..9d4e8774c0 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
@@ -6,18 +6,17 @@ import org.rekotlin.Action
 /**
 [REDACTED_AUTHOR]
  */
-class OnboardingSaltPayReducer {
-    companion object {
-        fun reduce(action: Action, state: OnboardingWalletState): OnboardingWalletState {
-            return internalReduce(action, state)
-        }
+object OnboardingSaltPayReducer {
+    fun reduce(action: Action, state: OnboardingWalletState): OnboardingWalletState {
+        return internalReduce(action, state)
     }
 }
 
+@Suppress("ComplexMethod")
 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..d62c679e37 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
@@ -4,9 +4,9 @@ import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.common.extensions.guard
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
 import com.tangem.domain.common.SaltPayWorkaround
 import com.tangem.domain.common.ScanResponse
-import com.tangem.network.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
@@ -37,8 +37,6 @@ data class OnboardingSaltPayState(
     val mainButtonState: WidgetState
         get() = if (inProgress) ProgressState.Loading else ProgressState.Done
 
-    fun readyToClaim(): Boolean = amountToClaim != null
-
     val pinLength: Int = 4
 
     companion object {
@@ -66,7 +64,7 @@ data class OnboardingSaltPayState(
             paymentologyService: PaymentologyApiService,
             kycProvider: KYCProvider,
         ): SaltPayActivationManager {
-            if (!scanResponse.isSaltPay()) {
+            if (!scanResponse.cardTypesResolver.isSaltPay()) {
                 throw IllegalArgumentException("Can't initialize the OnboardingSaltPayMiddleware if card is not SalPay")
             }
             val saltPaySingleWallet = scanResponse.card.wallets.firstOrNull().guard {
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..8614da5fd0 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
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.onboarding.products.wallet.saltPay.ui
 
+import android.net.Uri
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.OvershootInterpolator
@@ -14,6 +15,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.core.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
@@ -60,7 +63,9 @@ internal class OnboardingSaltPayView(
     private val toolbar: MaterialToolbar by lazy { walletFragment.binding.toolbar }
     private val claimBinding: LayoutOnboardingMainBinding by lazy { walletFragment.bindingSaltPay.claim }
     private val topContainer: LayoutOnboardingContainerTopBinding by lazy { claimBinding.onboardingTopContainer }
-    private val actionContainer: LayoutOnboardingContainerBottomBinding by lazy { claimBinding.onboardingActionContainer }
+    private val actionContainer: LayoutOnboardingContainerBottomBinding by lazy {
+        claimBinding.onboardingActionContainer
+    }
 
     private val btnRefreshBalanceWidget by lazy {
         RefreshBalanceWidget(claimBinding.onboardingTopContainer.onboardingWalletContainer)
@@ -88,14 +93,15 @@ internal class OnboardingSaltPayView(
     }
 
     private fun handleCardArtworks(state: OnboardingWalletState) = with(walletFragment.binding) {
-        //TODO: SaltPay: remove hardCode
+        // TODO: SaltPay: remove hardCode
         if (state.onboardingSaltPayState?.saltPayCardArtworkUrl == null) {
             imvFrontCard.load(R.drawable.img_salt_pay_visa) {
                 scale(Scale.FILL)
                 crossfade(enable = true)
             }
         } else {
-            walletFragment.loadImageIntoImageView(state.onboardingSaltPayState.saltPayCardArtworkUrl, imvFrontCard)
+            val uri = Uri.parse(state.onboardingSaltPayState.saltPayCardArtworkUrl)
+            walletFragment.loadImageIntoImageView(uri, imvFrontCard)
         }
         imvFirstBackupCard.load(R.drawable.card_placeholder_wallet)
 
@@ -143,7 +149,8 @@ internal class OnboardingSaltPayView(
             SaltPayActivationStep.Claim -> handleClaim(state)
             SaltPayActivationStep.ClaimInProgress -> handleClaim(state)
             SaltPayActivationStep.ClaimSuccess -> handleClaim(state)
-            SaltPayActivationStep.Success -> handleSuccess(state)
+            SaltPayActivationStep.Success -> handleSuccess()
+            else -> Unit
         }
         progressButton?.changeState(state.mainButtonState)
     }
@@ -178,6 +185,7 @@ internal class OnboardingSaltPayView(
         showOnlyView(connectCard.root) {
             progressButton = SaltPayProgressButton(connectCard.root)
             connectCard.btnConnect.setOnClickListener {
+                Analytics.send(Onboarding.ButtonConnect())
                 store.dispatch(OnboardingSaltPayAction.RegisterCard)
             }
         }
@@ -246,8 +254,9 @@ internal class OnboardingSaltPayView(
         progressButton = SaltPayProgressButton(root)
     }
 
+    @Suppress("LongMethod")
     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 +295,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)
@@ -318,7 +328,7 @@ internal class OnboardingSaltPayView(
         }
     }
 
-    private fun handleSuccess(state: OnboardingSaltPayState) = with(walletFragment.binding) {
+    private fun handleSuccess() = with(walletFragment.binding) {
         walletFragment.bindingSaltPay.onboardingSaltpayContainer.hide()
         onboardingWalletContainer.show()
         walletFragment.showSuccess()
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..368cb6a3a3 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
@@ -34,6 +34,8 @@ class WalletBackupAnimator(
     }
 
     private var currentStep = -1
+    private var firstBackupCardAnimated = false
+    private var secondBackupCardAnimated = false
 
     override fun updateBackupState(backupState: BackupState) {
     }
@@ -64,11 +66,12 @@ class WalletBackupAnimator(
         cardsWidget.toFolded()
     }
 
+    @Suppress("MagicNumber")
     override fun showAddBackupCards(state: BackupState, backupCardsCounts: Int) {
         when (backupCardsCounts) {
             0 -> {
                 when (currentStep) {
-                    STEP_CREATE_WALLET -> {
+                    UNDEFINED, STEP_CREATE_WALLET -> {
                         cardsWidget.toFolded(false) { cardsWidget.toFan() }
 
                         FIRST_BACKUP.animateAlpha(0.6f, 0)
@@ -101,6 +104,7 @@ class WalletBackupAnimator(
         currentStep = STEP_ADD_BACKUP_CARDS
     }
 
+    @Suppress("MagicNumber")
     override fun showWritePrimaryCard(state: BackupState) {
         currentStep = STEP_WRITE_PRIMARY_CARD
 
@@ -112,9 +116,7 @@ class WalletBackupAnimator(
         )
     }
 
-    private var firstBackupCardAnimated = false
-    private var secondBackupCardAnimated = false
-
+    @Suppress("MagicNumber")
     override fun showWriteBackupCard(state: BackupState, backupCard: Int) {
         when (viewState) {
             State.TwoCards -> {
@@ -134,6 +136,7 @@ class WalletBackupAnimator(
                     1 -> {
                         if (firstBackupCardAnimated) return
                         firstBackupCardAnimated = true
+
                         FIRST_BACKUP.alpha(1f)
                         cardsWidget.leapfrogWidget.leap {
                             SECOND_BACKUP.alpha(0.4f)
@@ -143,6 +146,7 @@ class WalletBackupAnimator(
                     2 -> {
                         if (secondBackupCardAnimated) return
                         secondBackupCardAnimated = true
+
                         SECOND_BACKUP.alpha(1f)
                         cardsWidget.leapfrogWidget.leap {
                             ORIGIN.alpha(0.4f)
@@ -242,6 +246,7 @@ class TestBackupAnimation(
         init(binding, this)
     }
 
+    @Suppress("MagicNumber")
     fun setStep(step: Int, onStepUpdate: (Int) -> Unit = {}) {
         steps = step
         when (steps) {
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupInfoAdapter.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupInfoAdapter.kt
index 3388e72a96..5b62611410 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupInfoAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupInfoAdapter.kt
@@ -15,7 +15,9 @@ class BackupInfoAdapter : RecyclerView.Adapter<BackupInfoViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BackupInfoViewHolder =
         BackupInfoViewHolder(
             ItemBackupInfoAdapterBinding.inflate(
-                LayoutInflater.from(parent.context), parent, false
+                LayoutInflater.from(parent.context),
+                parent,
+                false
             )
         )
 
@@ -51,7 +53,7 @@ private val backupInfoSnippets = listOf(
         R.string.onboarding_wallet_info_subtitle_fourth
     ),
 
-    )
+)
 
 class BackupInfoViewHolder(val binding: ItemBackupInfoAdapterBinding) :
     RecyclerView.ViewHolder(binding.root)
\ No newline at end of file
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..611c9d8bc4 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
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.onboarding.products.wallet.ui
 
+import android.net.Uri
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
@@ -17,10 +18,13 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.tabs.TabLayoutMediator
 import com.tangem.common.CardIdFormatter
 import com.tangem.common.core.CardIdDisplayFormat
+import com.tangem.core.analytics.Analytics
 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.events.Onboarding
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.inflate
+import com.tangem.tap.common.extensions.resourceUri
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.features.BaseFragment
 import com.tangem.tap.features.FragmentOnBackPressedHandler
@@ -32,6 +36,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
@@ -41,6 +46,7 @@ import com.tangem.wallet.databinding.LayoutOnboardingSaltpayBinding
 import com.tangem.wallet.databinding.ViewOnboardingProgressBinding
 import org.rekotlin.StoreSubscriber
 
+@Suppress("LargeClass", "MagicNumber")
 class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_wallet),
     StoreSubscriber<OnboardingWalletState>, FragmentOnBackPressedHandler {
 
@@ -72,7 +78,7 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
             binding.tabLayoutBackupInfo,
             binding.viewPagerBackupInfo,
         ) { tab, position ->
-            //Some implementation
+            // Some implementation
         }.attach()
 
         (activity as? AppCompatActivity)?.setSupportActionBar(binding.toolbar)
@@ -81,13 +87,17 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
         addBackPressHandler(this)
 
         store.dispatch(OnboardingWalletAction.Init)
-        store.dispatch(OnboardingWalletAction.StartSaltPayCardActivation)
-        store.dispatch(OnboardingWalletAction.LoadArtwork)
+        store.dispatch(OnboardingSaltPayAction.Init)
+        store.dispatch(
+            OnboardingWalletAction.LoadArtwork(
+                cardArtworkUriForUnfinishedBackup = requireContext().resourceUri(R.drawable.card_placeholder_wallet),
+            ),
+        )
     }
 
     override fun loadToolbarMenu(): MenuProvider? = OnboardingMenuProvider()
 
-    private fun reInitCardsWidget(backupCardsCounts: Int) = with(binding) {
+    private fun reInitCardsWidgetIfNeeded(backupCardsCounts: Int) = with(binding) {
         val viewBackupCount = flCardsContainer.childCount - 1
         if (viewBackupCount <= 0) return@with
         if (viewBackupCount == backupCardsCounts) return@with
@@ -134,7 +144,7 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
 
     override fun newState(state: OnboardingWalletState) {
         if (activity == null || view == null) return
-        if (state.isSaltPay) reInitCardsWidget(1)
+        if (state.isSaltPay) reInitCardsWidgetIfNeeded(1)
 
         animator.updateBackupState(state.backupState)
         requireActivity().invalidateOptionsMenu()
@@ -145,15 +155,15 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
         if (state.isSaltPay) {
             onboardingSaltPayView.newState(state)
         } else {
-            loadImageIntoImageView(state.cardArtworkUrl, binding.imvFrontCard)
-            loadImageIntoImageView(state.cardArtworkUrl, binding.imvFirstBackupCard)
-            loadImageIntoImageView(state.cardArtworkUrl, binding.imvSecondBackupCard)
+            loadImageIntoImageView(state.cardArtworkUri, binding.imvFrontCard)
+            loadImageIntoImageView(state.cardArtworkUri, binding.imvFirstBackupCard)
+            loadImageIntoImageView(state.cardArtworkUri, binding.imvSecondBackupCard)
             handleOnboardingStep(state)
         }
     }
 
-    internal fun loadImageIntoImageView(url: String?, view: ImageView) {
-        view.load(url) {
+    internal fun loadImageIntoImageView(uri: Uri?, view: ImageView) {
+        view.load(uri) {
             placeholder(R.drawable.card_placeholder_black)
             error(R.drawable.card_placeholder_black)
             fallback(R.drawable.card_placeholder_black)
@@ -170,7 +180,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)
@@ -316,7 +329,7 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
     private fun showWritePrimaryCard(state: BackupState, isSaltPay: Boolean) = with(binding) {
         accessCodeDialog?.dismiss()
 
-        reInitCardsWidget(state.backupCardsNumber)
+        reInitCardsWidgetIfNeeded(state.backupCardsNumber)
         prepareViewForFinalizeStep()
 
         val cardIdFormatter = CardIdFormatter(CardIdDisplayFormat.LastMasked(4))
@@ -325,7 +338,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) },
@@ -352,6 +365,7 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
     private fun showWriteBackupCard(state: BackupState, isSaltPay: Boolean) = with(binding) {
         prepareViewForFinalizeStep()
 
+        reInitCardsWidgetIfNeeded(state.backupCardsNumber)
         val cardNumber = (state.backupStep as? BackupStep.WriteBackupCard)?.cardNumber ?: 1
         if (isSaltPay) {
             tvHeader.text = getString(R.string.onboarding_saltpay_title_backup_card)
@@ -422,4 +436,4 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
         resources.getValue(R.dimen.device_scale_factor_for_twins_welcome, typedValue, true)
         return typedValue.float
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt
index 7d4831c434..7385c4d025 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt
@@ -88,6 +88,7 @@ class WalletCardsWidget(
         return getCardTypesTypes().map { createCardAnimator(it, propertyFactory(it)) }
     }
 
+    @Suppress("MagicNumber")
     private fun getCardTypesTypes(): List<BackupCardType> = when (leapfrogWidget.getViewsCount()) {
         2 -> listOf(BackupCardType.ORIGIN, BackupCardType.FIRST_BACKUP)
         3 -> listOf(BackupCardType.ORIGIN, BackupCardType.FIRST_BACKUP, BackupCardType.SECOND_BACKUP)
@@ -114,6 +115,7 @@ class WalletCardsWidget(
         return animator
     }
 
+    @Suppress("MagicNumber")
     private fun createWelcomeProperties(cardType: BackupCardType): CardProperties {
         return when (cardType) {
             BackupCardType.ORIGIN -> CardProperties(
@@ -140,6 +142,7 @@ class WalletCardsWidget(
         }
     }
 
+    @Suppress("MagicNumber")
     private fun createFanProperties(cardType: BackupCardType): CardProperties {
         return when (cardType) {
             BackupCardType.ORIGIN -> CardProperties(
@@ -166,6 +169,7 @@ class WalletCardsWidget(
         }
     }
 
+    @Suppress("MagicNumber")
     private fun createLeapfrogProperties(cardType: BackupCardType): CardProperties {
         return when (cardType) {
             BackupCardType.ORIGIN -> CardProperties(
@@ -192,17 +196,6 @@ class WalletCardsWidget(
         }
     }
 
-    private fun createActivateProperties(cardType: BackupCardType): CardProperties {
-        val topOfAnchorView = getTopOfAnchorViewForActivateState()
-        val twinProperties = CardProperties.from(getLeapViewByCard(cardType).state)
-        return twinProperties.copy(
-            xTranslation = twinProperties.xTranslation,
-            yTranslation = twinProperties.yTranslation - topOfAnchorView,
-            rotation = 0f,
-            scale = twinProperties.scale - 0.4f,
-        )
-    }
-
     @Throws(UnsupportedOperationException::class)
     fun getOriginCardView(): ImageView {
         return getLeapViewByCard(BackupCardType.ORIGIN).view as ImageView
@@ -218,6 +211,7 @@ class WalletCardsWidget(
         return getLeapViewByCard(BackupCardType.SECOND_BACKUP).view as ImageView
     }
 
+    @Suppress("MagicNumber")
     @Throws(UnsupportedOperationException::class)
     private fun getLeapViewByCard(cardType: BackupCardType): LeapView {
         fun getByIndex(index: Int): LeapView {
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AccessCodeDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AccessCodeDialog.kt
index c8b5e3ccb0..9244b75bb8 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AccessCodeDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AccessCodeDialog.kt
@@ -65,7 +65,6 @@ class AccessCodeDialog(context: Context) : BottomSheetDialog(context) {
                 store.dispatch(BackupAction.SaveAccessCodeConfirmation(etAccessCode.text.toString()))
             }
         }
-
     }
 
     fun showError(error: AccessCodeError?) = with(binding!!.layoutBackupAccessCodeSubmit) {
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..f8b2c0bf66 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
@@ -7,22 +7,19 @@ import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 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) { _, _ ->
-
-                    }
-                    setOnDismissListener {
-                        store.dispatch(GlobalAction.HideDialog)
-                    }
-                }.create()
+object AddMoreBackupCardsDialog {
+    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()
+    }
 }
\ 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..ed4e32a0a4 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
@@ -6,19 +6,17 @@ import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
-class BackupInProgressDialog {
-    companion object {
-        fun create(context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(R.string.alert_title)
-                setMessage(R.string.onboarding_backup_exit_warning)
-                setPositiveButton(R.string.warning_button_ok) { _, _ ->
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-            }.create()
-        }
+object BackupInProgressDialog {
+    fun create(context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(R.string.common_warning)
+            setMessage(R.string.onboarding_backup_exit_warning)
+            setPositiveButton(R.string.warning_button_ok) { _, _ ->
+                store.dispatch(GlobalAction.HideDialog)
+            }
+            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/ConfirmDiscardingBackupDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
index 4d35050937..557c955bb1 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
@@ -7,23 +7,21 @@ import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
-class ConfirmDiscardingBackupDialog {
-    companion object {
-        fun create(context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(R.string.welcome_interrupted_backup_discard_title)
-                setMessage(R.string.welcome_interrupted_backup_discard_message)
-                setPositiveButton(R.string.welcome_interrupted_backup_discard_resume) { _, _ ->
-                    store.dispatch(BackupAction.ResumeFoundUnfinishedBackup)
-                }
-                setNegativeButton(R.string.welcome_interrupted_backup_discard_discard) { _, _ ->
-                    store.dispatch(BackupAction.DiscardSavedBackup)
-                }
-                setOnDismissListener {
-                    store.dispatch(GlobalAction.HideDialog)
-                }
-                setCancelable(false)
-            }.create()
-        }
+object ConfirmDiscardingBackupDialog {
+    fun create(context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(R.string.welcome_interrupted_backup_discard_title)
+            setMessage(R.string.welcome_interrupted_backup_discard_message)
+            setPositiveButton(R.string.welcome_interrupted_backup_discard_resume) { _, _ ->
+                store.dispatch(BackupAction.ResumeFoundUnfinishedBackup)
+            }
+            setNegativeButton(R.string.welcome_interrupted_backup_discard_discard) { _, _ ->
+                store.dispatch(BackupAction.DiscardSavedBackup)
+            }
+            setOnDismissListener {
+                store.dispatch(GlobalAction.HideDialog)
+            }
+            setCancelable(false)
+        }.create()
     }
 }
\ No newline at end of file
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..6576a36fce 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
@@ -8,22 +8,20 @@ import com.tangem.tap.features.onboarding.products.wallet.redux.BackupDialog
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
-class UnfinishedBackupFoundDialog {
-    companion object {
-        fun create(context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(R.string.alert_title)
-                setMessage(R.string.welcome_interrupted_backup_alert_message)
-                setPositiveButton(R.string.welcome_interrupted_backup_alert_resume) { _, _ ->
-                    store.dispatch(GlobalAction.HideDialog)
-                    store.dispatch(BackupAction.ResumeFoundUnfinishedBackup)
-                }
-                setNegativeButton(R.string.welcome_interrupted_backup_alert_discard) { _, _ ->
-                    store.dispatch(GlobalAction.HideDialog)
-                    store.dispatch(GlobalAction.ShowDialog(BackupDialog.ConfirmDiscardingBackup))
-                }
-                setCancelable(false)
-            }.create()
-        }
+object UnfinishedBackupFoundDialog {
+    fun create(context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            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)
+                store.dispatch(BackupAction.ResumeFoundUnfinishedBackup)
+            }
+            setNegativeButton(R.string.welcome_interrupted_backup_alert_discard) { _, _ ->
+                store.dispatch(GlobalAction.HideDialog)
+                store.dispatch(GlobalAction.ShowDialog(BackupDialog.ConfirmDiscardingBackup))
+            }
+            setCancelable(false)
+        }.create()
     }
 }
\ No newline at end of file
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..2dfa79cb24
--- /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.core.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..3f0f4f77c4
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt
@@ -0,0 +1,85 @@
+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 onCancel(dialog: DialogInterface) {
+        viewModel.cancelOrClose()
+        super.onCancel(dialog)
+    }
+
+    @Composable
+    override fun provideState(): State<SaveWalletScreenState> {
+        return viewModel.state.collectAsState()
+    }
+
+    @Composable
+    override fun ScreenContent(
+        state: SaveWalletScreenState,
+        modifier: Modifier,
+    ) {
+        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 = {
+                    viewModel.cancelOrClose()
+                    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()
+            }
+        }
+    }
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    private fun EnrollBiometricsDialog(dialog: EnrollBiometricsDialog?) {
+        if (dialog == null) return
+        EnrollBiometricsDialogContent(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..ae186c4912
--- /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 cancelOrClose() {
+        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..c401e1e40b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/EnrollBiometricsDialogConent.kt
@@ -0,0 +1,59 @@
+package com.tangem.tap.features.saveWallet.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+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.R
+import com.tangem.core.ui.components.BasicDialog
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog
+
+@Composable
+fun EnrollBiometricsDialogContent(dialog: EnrollBiometricsDialog) {
+    BasicDialog(
+        title = stringResource(R.string.save_user_wallet_agreement_enroll_biometrics_title),
+        message = stringResource(R.string.save_user_wallet_agreement_enroll_biometrics_description),
+        confirmButton = DialogButton(
+            title = stringResource(R.string.common_enable),
+            onClick = dialog.onEnroll,
+        ),
+        dismissButton = DialogButton(
+            onClick = dialog.onCancel,
+        ),
+        onDismissDialog = dialog.onCancel,
+    )
+}
+
+// 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..1a0c640c1a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt
@@ -0,0 +1,230 @@
+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.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(
+    showProgress: Boolean,
+    onSaveWalletClick: () -> Unit,
+    onCloseClick: () -> Unit,
+) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Header(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(
+            showProgress = showProgress,
+            onSaveWalletClick = onSaveWalletClick,
+        )
+        SpacerH16()
+    }
+}
+
+@Composable
+private fun Header(onCloseClick: () -> Unit) {
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        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_24),
+                    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(
+    showProgress: Boolean,
+    onSaveWalletClick: () -> Unit,
+) {
+    Column(
+        modifier = Modifier
+            .padding(horizontal = TangemTheme.dimens.spacing16)
+            .fillMaxWidth(),
+        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(
+    iconPainter: Painter,
+    title: String,
+    description: String,
+) {
+    Row(
+        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(
+            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/SendScreenAction.kt b/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt
index 41b3f9d34a..64a01578f1 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt
@@ -26,11 +26,11 @@ interface SendScreenActionUi : SendScreenAction
 object ReleaseSendState : Action
 
 data class PrepareSendScreen(
-        val coinAmount: Amount?,
-        val coinRate: BigDecimal?,
-        val walletManager: WalletManager?,
-        val tokenAmount: Amount? = null,
-        val tokenRate: BigDecimal? = null
+    val coinAmount: Amount?,
+    val coinRate: BigDecimal?,
+    val walletManager: WalletManager?,
+    val tokenAmount: Amount? = null,
+    val tokenRate: BigDecimal? = null,
 ) : SendScreenAction
 
 // Address or PayId
@@ -44,18 +44,17 @@ sealed class AddressPayIdActionUi : SendScreenActionUi {
     data class ChangePayIdState(val sendingToPayIdEnabled: Boolean) : AddressPayIdActionUi()
 }
 
-
 sealed class TransactionExtrasAction : SendScreenActionUi {
     data class Prepare(
-            val blockchain: Blockchain,
-            val walletAddress: String,
-            val xrpTag: String?,
+        val blockchain: Blockchain,
+        val walletAddress: String,
+        val xrpTag: String?,
     ) : TransactionExtrasAction()
 
     object Release : TransactionExtrasAction()
 
     sealed class XlmMemo : TransactionExtrasAction() {
-  //        data class ChangeSelectedMemo(val memoType: XlmMemoType) : XlmMemo()
+        //        data class ChangeSelectedMemo(val memoType: XlmMemoType) : XlmMemo()
         data class HandleUserInput(val data: String) : XlmMemo()
     }
 
@@ -81,7 +80,11 @@ sealed class AddressPayIdVerifyAction : SendScreenAction {
 
     sealed class PayIdVerification : AddressPayIdVerifyAction() {
         data class SetPayIdError(val error: Error?) : PayIdVerification()
-        data class SetPayIdWalletAddress(val payId: String, val payIdWalletAddress: String, val isUserInput: Boolean) : PayIdVerification()
+        data class SetPayIdWalletAddress(
+            val payId: String,
+            val payIdWalletAddress: String,
+            val isUserInput: Boolean,
+        ) : PayIdVerification()
     }
 
     sealed class AddressVerification : AddressPayIdVerifyAction() {
@@ -121,9 +124,9 @@ sealed class FeeAction : SendScreenAction {
     }
 
     data class ChangeLayoutVisibility(
-            val main: Boolean? = null,
-            val controls: Boolean? = null,
-            val chipGroup: Boolean? = null,
+        val main: Boolean? = null,
+        val controls: Boolean? = null,
+        val chipGroup: Boolean? = null,
     ) : FeeAction()
 }
 
@@ -147,14 +150,14 @@ sealed class SendAction : SendScreenAction {
 
     sealed class Dialog : SendAction(), StateDialog {
         data class TezosWarningDialog(
-                val reduceCallback: () -> Unit,
-                val sendAllCallback: () -> Unit,
-                val reduceAmount: BigDecimal,
+            val reduceCallback: () -> Unit,
+            val sendAllCallback: () -> Unit,
+            val reduceAmount: BigDecimal,
         ) : Dialog()
 
         sealed class SendTransactionFails : Dialog() {
-            data class CardSdkError(val error: TangemSdkError): Dialog()
-            data class BlockchainSdkError(val error: com.tangem.blockchain.common.BlockchainSdkError): Dialog()
+            data class CardSdkError(val error: TangemSdkError) : Dialog()
+            data class BlockchainSdkError(val error: com.tangem.blockchain.common.BlockchainSdkError) : Dialog()
         }
 
         data class RequestFeeError(
@@ -173,7 +176,6 @@ sealed class SendAction : SendScreenAction {
     data class SendSpecificTransaction(
         val sendAmount: String,
         val destinationAddress: String,
-        val transactionId: String
+        val transactionId: String,
     ) : SendAction()
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt
index 33a7313b5d..7a94dce2a8 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt
@@ -6,12 +6,17 @@ import com.tangem.common.services.Result
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.PayIdManager
 import com.tangem.tap.domain.isPayIdSupported
-import com.tangem.tap.features.send.redux.*
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi
+import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.AddressVerification.SetAddressError
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.AddressVerification.SetWalletAddress
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.Error
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.PayIdVerification.SetPayIdError
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.PayIdVerification.SetPayIdWalletAddress
+import com.tangem.tap.features.send.redux.AmountAction
+import com.tangem.tap.features.send.redux.AmountActionUi
+import com.tangem.tap.features.send.redux.FeeAction
+import com.tangem.tap.features.send.redux.TransactionExtrasAction
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import kotlinx.coroutines.Dispatchers
@@ -129,7 +134,7 @@ internal class AddressPayIdMiddleware {
             }
         }
 
-        val supposedAddress = noSchemeAddress.removeShareUriQuery() //TODO: parse query?
+        val supposedAddress = noSchemeAddress.removeShareUriQuery() // TODO: parse query?
 
         val failReason = isValidBlockchainAddressAndNotTheSameAsWallet(wallet, supposedAddress)
         if (failReason == null) {
@@ -167,7 +172,6 @@ internal class AddressPayIdMiddleware {
         val addressPayId = input ?: return
         val wallet = appState?.sendState?.walletManager?.wallet ?: return
 
-
         val internalDispatcher: (Action) -> Unit = {
             when (it) {
                 is SetWalletAddress, is SetPayIdWalletAddress -> {
@@ -193,7 +197,7 @@ internal class AddressPayIdMiddleware {
 
 fun String.splitToMap(firstDelimiter: String, secondDelimiter: String): Map<String, String> {
     return this.split(firstDelimiter)
-            .map { it.split(secondDelimiter) }
-            .map { it.first() to it.last().toString() }
-            .toMap()
+        .map { it.split(secondDelimiter) }
+        .map { it.first() to it.last().toString() }
+        .toMap()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt
index f73c2c3241..8a0b096c4c 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt
@@ -1,7 +1,6 @@
 package com.tangem.tap.features.send.redux.middlewares
 
 import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.BlockchainSdkError
 import com.tangem.blockchain.common.TransactionSender
 import com.tangem.blockchain.extensions.Result
@@ -82,33 +81,4 @@ class RequestFeeMiddleware {
             }
         }
     }
-}
-
-class FeeMock {
-    companion object {
-        suspend fun getFee(blockchain: Blockchain): List<Amount> {
-            return feeStandard(blockchain)
-//            return feeSingle(blockchain)
-//            return feeStellar(blockchain)
-//            return feeZero(blockchain)
-        }
-
-        suspend fun feeStellar(blockchain: Blockchain): List<Amount> = listOf(Amount(0.0001.toBigDecimal(), blockchain))
-
-        suspend fun feeZero(blockchain: Blockchain): List<Amount> = listOf(Amount(BigDecimal.ZERO, blockchain))
-
-        suspend fun feeStandard(blockchain: Blockchain): List<Amount> = listOf(
-            Amount(0.001500.toBigDecimal(), blockchain),
-            Amount(0.0030.toBigDecimal(), blockchain),
-            Amount(0.0045001.toBigDecimal(), blockchain),
-        )
-
-        suspend fun feeStandardBig(blockchain: Blockchain): List<Amount> = listOf(
-            Amount(1.76.toBigDecimal(), blockchain),
-            Amount(2.30.toBigDecimal(), blockchain),
-            Amount(3.45.toBigDecimal(), blockchain),
-        )
-
-        suspend fun feeSingle(blockchain: Blockchain): List<Amount> = listOf(Amount(0.0015.toBigDecimal(), blockchain))
-    }
 }
\ 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..c3431d6d45 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.core.analytics.Analytics
+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.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.*
@@ -81,7 +83,8 @@ class SendMiddleware {
                         if (transactionData != null) {
                             store.dispatchOnMain(
                                 AddressPayIdVerifyAction.AddressVerification.SetWalletAddress(
-                                    transactionData.destinationAddress, false,
+                                    address = transactionData.destinationAddress,
+                                    isUserInput = false,
                                 ),
                             )
                             store.dispatchOnMain(AmountActionUi.SetMainCurrency(MainCurrencyType.CRYPTO))
@@ -102,7 +105,9 @@ class SendMiddleware {
 }
 
 private fun verifyAndSendTransaction(
-    action: SendActionUi.SendAmountToRecipient, appState: AppState?, dispatch: (Action) -> Unit,
+    action: SendActionUi.SendAmountToRecipient,
+    appState: AppState?,
+    dispatch: (Action) -> Unit,
 ) {
     val sendState = appState?.sendState ?: return
     val walletManager = sendState.walletManager ?: return
@@ -143,6 +148,7 @@ private fun verifyAndSendTransaction(
     }
 }
 
+@Suppress("LongParameterList", "LongMethod", "ComplexMethod")
 private fun sendTransaction(
     action: SendActionUi.SendAmountToRecipient,
     walletManager: WalletManager,
@@ -150,7 +156,7 @@ private fun sendTransaction(
     feeAmount: Amount,
     destinationAddress: String,
     transactionExtras: TransactionExtrasState,
-    card: Card,
+    card: CardDTO,
     externalTransactionData: ExternalTransactionData?,
     dispatch: (Action) -> Unit,
 ) {
@@ -181,7 +187,7 @@ private fun sendTransaction(
             return@launch
         }
 
-        val isLinkedTerminal = tangemSdk.config.linkedTerminal
+        val linkedTerminalState = tangemSdk.config.linkedTerminal
         if (card.isStart2Coin) {
             tangemSdk.config.linkedTerminal = false
         }
@@ -209,6 +215,7 @@ private fun sendTransaction(
             FirebaseCrashlytics.getInstance().recordException(ex)
             delay(DELAY_SDK_DIALOG_CLOSE)
             withMainContext {
+                tangemSdk.config.linkedTerminal = linkedTerminalState
                 dispatch(SendAction.ChangeSendButtonState(ButtonState.ENABLED))
                 store.dispatchErrorNotification(TapError.CustomError(ex.localizedMessage ?: "Unknown error"))
             }
@@ -217,15 +224,12 @@ private fun sendTransaction(
 
         withMainContext {
             dispatch(SendAction.ChangeSendButtonState(ButtonState.ENABLED))
-            tangemSdk.config.linkedTerminal = isLinkedTerminal
+            tangemSdk.config.linkedTerminal = linkedTerminalState
 
+            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 +238,9 @@ private fun sendTransaction(
                         dispatch(NavigationAction.PopBackTo())
                     }
                     scope.launch(Dispatchers.IO) {
-                        withContext(Dispatchers.Main) {
-                            dispatch(WalletAction.LoadWallet(BlockchainNetwork.fromWalletManager(walletManager)))
-                        }
-                        delay(11000) // more than 10000 to avoid throttling
-                        withContext(Dispatchers.Main) {
-                            dispatch(WalletAction.LoadWallet(BlockchainNetwork.fromWalletManager(walletManager)))
-                        }
+                        updateWallet(walletManager)
+                        delay(timeMillis = 11000) // more than 10000 to avoid throttling
+                        updateWallet(walletManager)
                     }
                 }
                 is SimpleResult.Failure -> {
@@ -250,18 +250,13 @@ 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
 
-                    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
+                            val tangemSdkError = error.tangemError as? TangemSdkError ?: return@withMainContext
                             if (tangemSdkError is TangemSdkError.UserCancelled) return@withMainContext
 
                             dispatch(SendAction.Dialog.SendTransactionFails.CardSdkError(tangemSdkError))
@@ -335,4 +330,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/redux/reducers/AddressPayIdReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt
index faf6f1b4b0..ddacac0df8 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt
@@ -19,7 +19,11 @@ class AddressPayIdReducer : SendInternalReducer {
         else -> sendState
     }
 
-    private fun handleUiAction(action: AddressPayIdActionUi, sendState: SendState, state: AddressPayIdState): SendState {
+    private fun handleUiAction(
+        action: AddressPayIdActionUi,
+        sendState: SendState,
+        state: AddressPayIdState,
+    ): SendState {
         val result = when (action) {
             is AddressPayIdActionUi.HandleUserInput -> state
             is AddressPayIdActionUi.SetTruncateHandler -> state.copy(truncateHandler = action.handler)
@@ -35,24 +39,28 @@ class AddressPayIdReducer : SendInternalReducer {
         return updateLastState(sendState.copy(addressPayIdState = result), result)
     }
 
-    private fun handleAction(action: AddressPayIdVerifyAction, sendState: SendState, state: AddressPayIdState): SendState {
+    private fun handleAction(
+        action: AddressPayIdVerifyAction,
+        sendState: SendState,
+        state: AddressPayIdState,
+    ): SendState {
         val result = when (action) {
             is PayIdVerification.SetPayIdWalletAddress -> {
                 state.copy(
-                        viewFieldValue = InputViewValue(action.payId, action.isUserInput),
-                        normalFieldValue = action.payId,
-                        truncatedFieldValue = state.truncate(action.payId),
-                        destinationWalletAddress = action.payIdWalletAddress,
-                        error = null
+                    viewFieldValue = InputViewValue(action.payId, action.isUserInput),
+                    normalFieldValue = action.payId,
+                    truncatedFieldValue = state.truncate(action.payId),
+                    destinationWalletAddress = action.payIdWalletAddress,
+                    error = null,
                 )
             }
             is AddressVerification.SetWalletAddress -> {
                 state.copy(
-                        viewFieldValue = InputViewValue(action.address, action.isUserInput),
-                        normalFieldValue = action.address,
-                        truncatedFieldValue = state.truncate(action.address),
-                        destinationWalletAddress = action.address,
-                        error = null
+                    viewFieldValue = InputViewValue(action.address, action.isUserInput),
+                    normalFieldValue = action.address,
+                    truncatedFieldValue = state.truncate(action.address),
+                    destinationWalletAddress = action.address,
+                    error = null,
                 )
             }
             is AddressPayIdVerifyAction.ChangePasteBtnEnableState -> state.copy(pasteIsEnabled = action.isEnabled)
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt
index 7429910244..727964e0c4 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt
@@ -37,21 +37,21 @@ class AmountReducer : SendInternalReducer {
                         val rescaledBalance = sendState.convertExtractCryptoToFiat(state.balanceCrypto, true)
                         val viewValue = state.restoreDecimalSeparator(fiatToSend.stripZeroPlainString())
                         state.copy(
-                                viewAmountValue = InputViewValue(viewValue),
-                                viewBalanceValue = rescaledBalance.stripZeroPlainString(),
-                                mainCurrency = state.createMainCurrency(currency, currencyCanBeSwitched),
-                                maxLengthOfAmount = sendState.getDecimals(currency),
-                                cursorAtTheSamePosition = false
+                            viewAmountValue = InputViewValue(viewValue),
+                            viewBalanceValue = rescaledBalance.stripZeroPlainString(),
+                            mainCurrency = state.createMainCurrency(currency, currencyCanBeSwitched),
+                            maxLengthOfAmount = sendState.getDecimals(currency),
+                            cursorAtTheSamePosition = false
                         )
                     }
                     MainCurrencyType.CRYPTO -> {
                         val viewValue = state.restoreDecimalSeparator(state.amountToSendCrypto.stripZeroPlainString())
                         state.copy(
-                                viewAmountValue = InputViewValue(viewValue),
-                                viewBalanceValue = state.balanceCrypto.stripZeroPlainString(),
-                                mainCurrency = state.createMainCurrency(currency, currencyCanBeSwitched),
-                                maxLengthOfAmount = sendState.getDecimals(currency),
-                                cursorAtTheSamePosition = false
+                            viewAmountValue = InputViewValue(viewValue),
+                            viewBalanceValue = state.balanceCrypto.stripZeroPlainString(),
+                            mainCurrency = state.createMainCurrency(currency, currencyCanBeSwitched),
+                            maxLengthOfAmount = sendState.getDecimals(currency),
+                            cursorAtTheSamePosition = false
                         )
                     }
                 }
@@ -72,10 +72,10 @@ class AmountReducer : SendInternalReducer {
                 }
                 val viewValue = state.restoreDecimalSeparator(amount.stripZeroPlainString())
                 state.copy(
-                        viewAmountValue = InputViewValue(viewValue, action.isUserInput),
-                        amountToSendCrypto = action.amountCrypto,
-                        cursorAtTheSamePosition = true,
-                        error = null
+                    viewAmountValue = InputViewValue(viewValue, action.isUserInput),
+                    amountToSendCrypto = action.amountCrypto,
+                    cursorAtTheSamePosition = true,
+                    error = null
                 )
             }
             is AmountAction.SetAmountError -> state.copy(error = action.error)
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
index 3238c3b372..d0548132b9 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
@@ -21,7 +21,9 @@ class FeeReducer : SendInternalReducer {
 
     private fun handleUiAction(action: FeeActionUi, sendState: SendState, state: FeeState): SendState {
         val result = when (action) {
-            is FeeActionUi.ToggleControlsVisibility -> state.copy(controlsLayoutIsVisible = !state.controlsLayoutIsVisible)
+            is FeeActionUi.ToggleControlsVisibility -> {
+                state.copy(controlsLayoutIsVisible = !state.controlsLayoutIsVisible)
+            }
             is FeeActionUi.ChangeSelectedFee -> {
                 val currentFee = createValueOfFeeAmount(action.feeType, state.feeList)
                 state.copy(
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
index 4d4154218c..3f403ea92c 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
@@ -37,13 +37,12 @@ class ReceiptReducer : SendInternalReducer {
         this.feeState = sendState.feeState
 
         return when (action) {
-            is RefreshReceipt -> handleRefresh(action, sendState.receiptState)
+            is RefreshReceipt -> handleRefresh(sendState.receiptState)
             else -> sendState
         }
     }
 
-
-    private fun handleRefresh(action: RefreshReceipt, state: ReceiptState): SendState {
+    private fun handleRefresh(state: ReceiptState): SendState {
         val wallet = sendState.walletManager?.wallet ?: return sendState
 
         val layoutType = determineLayoutType(amountState.mainCurrency.type, amountState.typeOfAmount)
@@ -55,7 +54,7 @@ class ReceiptReducer : SendInternalReducer {
             fiat = createFiatType(symbols, showBlank),
             crypto = createCryptoType(symbols, showBlank),
             tokenFiat = createTokenFiatType(symbols, showBlank),
-            tokenCrypto = createTokenCryptoType(symbols, showBlank)
+            tokenCrypto = createTokenCryptoType(symbols, showBlank),
         )
         return updateLastState(sendState.copy(receiptState = result), result)
     }
@@ -76,7 +75,7 @@ class ReceiptReducer : SendInternalReducer {
                 feeFiat = feeFiat,
                 totalFiat = totalFiat,
                 willSentCrypto = amountState.amountToSendCrypto.stripZeroPlainString(),
-                symbols = symbols
+                symbols = symbols,
             )
         } else {
             val totalAmountCrypto = amountState.amountToSendCrypto.plus(feeCrypto)
@@ -87,7 +86,7 @@ class ReceiptReducer : SendInternalReducer {
                 feeFiat = feeFiat,
                 totalFiat = totalFiat,
                 willSentCrypto = totalAmountCrypto.stripZeroPlainString(),
-                symbols = symbols
+                symbols = symbols,
             )
         }
     }
@@ -106,7 +105,7 @@ class ReceiptReducer : SendInternalReducer {
                 totalCrypto = amountState.amountToSendCrypto.stripZeroPlainString(),
                 feeFiat = feeFiat,
                 willSentFiat = convertToFiatPrecision(amountState.amountToSendCrypto),
-                symbols = symbols
+                symbols = symbols,
             )
         } else {
             val totalCrypto = amountState.amountToSendCrypto.plus(feeCrypto)
@@ -116,7 +115,7 @@ class ReceiptReducer : SendInternalReducer {
                 totalCrypto = totalCrypto.stripZeroPlainString(),
                 feeFiat = feeFiat,
                 willSentFiat = convertToFiatPrecision(totalCrypto),
-                symbols = symbols
+                symbols = symbols,
             )
         }
     }
@@ -140,7 +139,7 @@ class ReceiptReducer : SendInternalReducer {
                 totalFiat = totalFiat.scaleToFiat(true).stripZeroPlainString(),
                 willSentToken = tokensToSend.stripZeroPlainString(),
                 willSentFeeCoin = feeCoin.stripZeroPlainString(),
-                symbols = symbols
+                symbols = symbols,
             )
         } else {
             ReceiptTokenFiat(
@@ -149,7 +148,7 @@ class ReceiptReducer : SendInternalReducer {
                 totalFiat = UNKNOWN_AMOUNT_SIGN,
                 willSentToken = tokensToSend.stripZeroPlainString(),
                 willSentFeeCoin = feeCoin.stripZeroPlainString(),
-                symbols = symbols
+                symbols = symbols,
             )
         }
     }
@@ -170,17 +169,16 @@ class ReceiptReducer : SendInternalReducer {
                 amountToken = tokensToSend.stripZeroPlainString(),
                 feeCoin = feeCoin.stripZeroPlainString().addPrecisionSign(),
                 totalFiat = totalFiat.scaleToFiat(true).stripZeroPlainString(),
-                symbols = symbols
+                symbols = symbols,
             )
         } else {
             ReceiptTokenCrypto(
                 amountToken = tokensToSend.stripZeroPlainString(),
                 feeCoin = feeCoin.stripZeroPlainString().addPrecisionSign(),
                 totalFiat = UNKNOWN_AMOUNT_SIGN,
-                symbols = symbols
+                symbols = symbols,
             )
         }
-
     }
 
     private fun determineSymbols(wallet: Wallet, amountType: AmountType): ReceiptSymbols {
@@ -190,7 +188,7 @@ class ReceiptReducer : SendInternalReducer {
             token = when (amountType) {
                 is AmountType.Token -> amountType.token.symbol
                 else -> null
-            }
+            },
         )
     }
 
@@ -211,9 +209,15 @@ class ReceiptReducer : SendInternalReducer {
 
     private fun convertToFiatPrecision(value: BigDecimal, isToken: Boolean = false): String {
         return when {
-            !isToken && sendState.coinIsConvertible() -> sendState.coinConverter!!.toFiatWithPrecision(value).stripZeroPlainString()
-            isToken && sendState.tokenIsConvertible() -> sendState.tokenConverter!!.toFiatWithPrecision(value).stripZeroPlainString()
-            else -> UNKNOWN_AMOUNT_SIGN
+            !isToken && sendState.coinIsConvertible() -> {
+                sendState.coinConverter!!.toFiatWithPrecision(value).stripZeroPlainString()
+            }
+            isToken && sendState.tokenIsConvertible() -> {
+                sendState.tokenConverter!!.toFiatWithPrecision(value).stripZeroPlainString()
+            }
+            else -> {
+                UNKNOWN_AMOUNT_SIGN
+            }
         }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt
index d44a27f0d1..a0d911ccc8 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt
@@ -28,25 +28,23 @@ interface SendInternalReducer {
     fun handle(action: SendScreenAction, sendState: SendState): SendState
 }
 
-class SendScreenReducer {
-    companion object {
-        fun reduce(incomingAction: Action, sendState: SendState): SendState {
-            if (incomingAction is ReleaseSendState) return SendState()
-            val action = incomingAction as? SendScreenAction ?: return sendState
+object SendScreenReducer {
+    fun reduce(incomingAction: Action, sendState: SendState): SendState {
+        if (incomingAction is ReleaseSendState) return SendState()
+        val action = incomingAction as? SendScreenAction ?: return sendState
 
-            val reducer: SendInternalReducer = when (action) {
-                is PrepareSendScreen -> PrepareSendScreenStatesReducer()
-                is AddressPayIdActionUi, is AddressPayIdVerifyAction -> AddressPayIdReducer()
-                is TransactionExtrasAction -> TransactionExtrasReducer()
-                is AmountActionUi, is AmountAction -> AmountReducer()
-                is FeeActionUi, is FeeAction -> FeeReducer()
-                is ReceiptAction -> ReceiptReducer()
-                is SendAction -> SendReducer()
-                else -> EmptyReducer()
-            }
-
-            return reducer.handle(action, sendState)
+        val reducer: SendInternalReducer = when (action) {
+            is PrepareSendScreen -> PrepareSendScreenStatesReducer()
+            is AddressPayIdActionUi, is AddressPayIdVerifyAction -> AddressPayIdReducer()
+            is TransactionExtrasAction -> TransactionExtrasReducer()
+            is AmountActionUi, is AmountAction -> AmountReducer()
+            is FeeActionUi, is FeeAction -> FeeReducer()
+            is ReceiptAction -> ReceiptReducer()
+            is SendAction -> SendReducer()
+            else -> EmptyReducer()
         }
+
+        return reducer.handle(action, sendState)
     }
 }
 
@@ -70,19 +68,20 @@ private class SendReducer : SendInternalReducer {
     }
 
     private fun handleSendSpecificTransactionAction(
-        action: SendAction.SendSpecificTransaction, state: SendState
+        action: SendAction.SendSpecificTransaction,
+        state: SendState,
     ): SendState {
         return state.copy(
             externalTransactionData =
             ExternalTransactionData(action.sendAmount, action.destinationAddress, action.transactionId),
             feeState = state.feeState.copy(
-                includeFeeSwitcherIsEnabled = false
+                includeFeeSwitcherIsEnabled = false,
             ),
             amountState = state.amountState.copy(
-                inputIsEnabled = false
+                inputIsEnabled = false,
             ),
             addressPayIdState = state.addressPayIdState.copy(
-                inputIsEnabled = false
+                inputIsEnabled = false,
             ),
         )
     }
@@ -100,17 +99,17 @@ private class PrepareSendScreenStatesReducer : SendInternalReducer {
         val decimals = amountToExtract.decimals
 
         return sendState.copy(
-                walletManager = walletManager,
-                coinConverter = action.coinRate?.let { CurrencyConverter(it, decimals) },
-                tokenConverter = action.tokenRate?.let { CurrencyConverter(it, decimals) },
-                amountState = sendState.amountState.copy(
-                        amountToExtract = amountToExtract,
-                        typeOfAmount = amountToExtract.type,
-                        balanceCrypto = amountToExtract.value ?: BigDecimal.ZERO
-                ),
-                feeState = sendState.feeState.copy(
-                        includeFeeSwitcherIsEnabled = amountToExtract.type == AmountType.Coin
-                )
+            walletManager = walletManager,
+            coinConverter = action.coinRate?.let { CurrencyConverter(it, decimals) },
+            tokenConverter = action.tokenRate?.let { CurrencyConverter(it, decimals) },
+            amountState = sendState.amountState.copy(
+                amountToExtract = amountToExtract,
+                typeOfAmount = amountToExtract.type,
+                balanceCrypto = amountToExtract.value ?: BigDecimal.ZERO,
+            ),
+            feeState = sendState.feeState.copy(
+                includeFeeSwitcherIsEnabled = amountToExtract.type == AmountType.Coin,
+            ),
         )
     }
 }
@@ -118,4 +117,4 @@ private class PrepareSendScreenStatesReducer : SendInternalReducer {
 internal fun updateLastState(sendState: SendState, lastChangedState: IdStateHolder): SendState {
     sendState.lastChangedStates.add(lastChangedState.stateId)
     return sendState
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt
index 71000abec1..b59ed31979 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt
@@ -24,7 +24,7 @@ class TransactionExtrasReducer : SendInternalReducer {
     override fun handle(action: SendScreenAction, sendState: SendState): SendState {
         return when (action) {
             is Prepare -> handleInitialization(action, sendState)
-            Release -> handleRelease(action, sendState)
+            Release -> handleRelease(sendState)
             is XlmMemo -> handleXlmMemo(action, sendState, sendState.transactionExtrasState)
             is BinanceMemo -> handleBinanceMemo(action, sendState, sendState.transactionExtrasState)
             is XrpDestinationTag -> handleXrpTag(action, sendState, sendState.transactionExtrasState)
@@ -43,8 +43,11 @@ class TransactionExtrasReducer : SendInternalReducer {
                     if (tag == null) {
                         TransactionExtrasState(xrpDestinationTag = XrpDestinationTagState())
                     } else {
-                        TransactionExtrasState(xrpDestinationTag = XrpDestinationTagState(
-                                InputViewValue("$tag", false), tag)
+                        TransactionExtrasState(
+                            xrpDestinationTag = XrpDestinationTagState(
+                                viewFieldValue = InputViewValue("$tag", false),
+                                tag = tag,
+                            ),
                         )
                     }
                 } else {
@@ -58,7 +61,7 @@ class TransactionExtrasReducer : SendInternalReducer {
         return updateLastState(sendState.copy(transactionExtrasState = result), result)
     }
 
-    private fun handleRelease(action: SendScreenAction, sendState: SendState): SendState {
+    private fun handleRelease(sendState: SendState): SendState {
         val result = TransactionExtrasState()
         return updateLastState(sendState.copy(transactionExtrasState = result), result)
     }
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt
index 30fe37f60a..6d0b9bee8a 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt
@@ -59,6 +59,7 @@ data class XlmMemoState(
             else -> XlmMemoType.TEXT
         }
 
+        @Suppress("MagicNumber")
         fun isAssignableValue(value: String): Boolean = when (determineMemoType(value)) {
             XlmMemoType.TEXT -> {
                 // from org.stellar.sdk.MemoText
@@ -67,7 +68,7 @@ data class XlmMemoState(
             XlmMemoType.ID -> {
                 try {
                     // from com.tangem.blockchain.blockchains.stellar.StellarMemo.toStellarSdkMemo
-                    value.toBigInteger() in BigInteger.ZERO..(Long.MAX_VALUE.toBigInteger() * 2.toBigInteger())
+                    value.toBigInteger() in BigInteger.ZERO..Long.MAX_VALUE.toBigInteger() * 2.toBigInteger()
                 } catch (ex: NumberFormatException) {
                     false
                 }
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/states/ReceiptState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/states/ReceiptState.kt
index 90e22a0e9e..29a6b2e210 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/states/ReceiptState.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/ReceiptState.kt
@@ -6,51 +6,51 @@ enum class ReceiptLayoutType {
 }
 
 data class ReceiptState(
-        val visibleTypeOfReceipt: ReceiptLayoutType? = null,
-        val fiat: ReceiptFiat? = null,
-        val crypto: ReceiptCrypto? = null,
-        val tokenFiat: ReceiptTokenFiat? = null,
-        val tokenCrypto: ReceiptTokenCrypto? = null,
-        val mainCurrency: MainCurrency? = null
+    val visibleTypeOfReceipt: ReceiptLayoutType? = null,
+    val fiat: ReceiptFiat? = null,
+    val crypto: ReceiptCrypto? = null,
+    val tokenFiat: ReceiptTokenFiat? = null,
+    val tokenCrypto: ReceiptTokenCrypto? = null,
+    val mainCurrency: MainCurrency? = null
 ) : SendScreenState {
     override val stateId: StateId = StateId.RECEIPT
 }
 
 data class ReceiptSymbols(
-        val fiat: String,
-        val crypto: String,
-        val token: String? = null
+    val fiat: String,
+    val crypto: String,
+    val token: String? = null
 )
 
 data class ReceiptFiat(
-        val amountFiat: String,
-        val feeFiat: String,
-        val totalFiat: String,
-        val willSentCrypto: String,
-        val symbols: ReceiptSymbols
+    val amountFiat: String,
+    val feeFiat: String,
+    val totalFiat: String,
+    val willSentCrypto: String,
+    val symbols: ReceiptSymbols
 )
 
 data class ReceiptCrypto(
-        val amountCrypto: String,
-        val feeCrypto: String,
-        val totalCrypto: String,
-        val feeFiat: String,
-        val willSentFiat: String,
-        val symbols: ReceiptSymbols
+    val amountCrypto: String,
+    val feeCrypto: String,
+    val totalCrypto: String,
+    val feeFiat: String,
+    val willSentFiat: String,
+    val symbols: ReceiptSymbols
 )
 
 data class ReceiptTokenCrypto(
-        val amountToken: String,
-        val feeCoin: String,
-        val totalFiat: String,
-        val symbols: ReceiptSymbols
+    val amountToken: String,
+    val feeCoin: String,
+    val totalFiat: String,
+    val symbols: ReceiptSymbols
 )
 
 data class ReceiptTokenFiat(
-        val amountFiat: String,
-        val feeFiat: String,
-        val totalFiat: String,
-        val willSentToken: String,
-        val willSentFeeCoin: String,
-        val symbols: ReceiptSymbols
+    val amountFiat: String,
+    val feeFiat: String,
+    val totalFiat: String,
+    val willSentToken: String,
+    val willSentFeeCoin: String,
+    val symbols: ReceiptSymbols
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
index 98fbfa47e1..6e7d3596d6 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
@@ -30,19 +30,19 @@ enum class StateId {
 interface SendScreenState : StateType, IdStateHolder
 
 data class SendState(
-        val walletManager: WalletManager? = null,
-        val coinConverter: CurrencyConverter? = null,
-        val tokenConverter: CurrencyConverter? = null,
-        val lastChangedStates: LinkedHashSet<StateId> = linkedSetOf(),
-        val addressPayIdState: AddressPayIdState = AddressPayIdState(),
-        val transactionExtrasState: TransactionExtrasState = TransactionExtrasState(),
-        val amountState: AmountState = AmountState(),
-        val feeState: FeeState = FeeState(),
-        val receiptState: ReceiptState = ReceiptState(),
-        val sendWarningsList: List<WarningMessage> = listOf(),
-        val sendButtonState: IndeterminateProgressButton = IndeterminateProgressButton(ButtonState.DISABLED),
-        val dialog: StateDialog? = null,
-        val externalTransactionData: ExternalTransactionData? = null
+    val walletManager: WalletManager? = null,
+    val coinConverter: CurrencyConverter? = null,
+    val tokenConverter: CurrencyConverter? = null,
+    val lastChangedStates: LinkedHashSet<StateId> = linkedSetOf(),
+    val addressPayIdState: AddressPayIdState = AddressPayIdState(),
+    val transactionExtrasState: TransactionExtrasState = TransactionExtrasState(),
+    val amountState: AmountState = AmountState(),
+    val feeState: FeeState = FeeState(),
+    val receiptState: ReceiptState = ReceiptState(),
+    val sendWarningsList: List<WarningMessage> = listOf(),
+    val sendButtonState: IndeterminateProgressButton = IndeterminateProgressButton(ButtonState.DISABLED),
+    val dialog: StateDialog? = null,
+    val externalTransactionData: ExternalTransactionData? = null,
 ) : SendScreenState {
 
     override val stateId: StateId = StateId.SEND_SCREEN
@@ -114,7 +114,7 @@ data class SendState(
         fun isReadyToRequestFee(): Boolean = addressPayIdIsReady() && amountIsReady()
 
         fun isReadyToSend(): Boolean = addressPayIdIsReady() && amountIsReady() &&
-                store.state.sendState.feeState.isReady()
+            store.state.sendState.feeState.isReady()
     }
 }
 
@@ -144,10 +144,13 @@ data class AmountState(
     fun isCoinAmount(): Boolean = typeOfAmount == AmountType.Coin
 
     fun createMainCurrency(type: MainCurrencyType, canSwitched: Boolean): MainCurrency {
-        return if (!canSwitched) MainCurrency(type, amountToExtract?.currencySymbol ?: "NONE", false)
-        else when (type) {
-            MainCurrencyType.FIAT -> MainCurrency(type, store.state.globalState.appCurrency.code)
-            MainCurrencyType.CRYPTO -> MainCurrency(type, amountToExtract?.currencySymbol ?: "NONE")
+        return if (!canSwitched) {
+            MainCurrency(type, amountToExtract?.currencySymbol ?: "NONE", false)
+        } else {
+            when (type) {
+                MainCurrencyType.FIAT -> MainCurrency(type, store.state.globalState.appCurrency.code)
+                MainCurrencyType.CRYPTO -> MainCurrency(type, amountToExtract?.currencySymbol ?: "NONE")
+            }
         }
     }
 
@@ -166,9 +169,9 @@ enum class MainCurrencyType {
 }
 
 data class MainCurrency(
-        val type: MainCurrencyType,
-        val currencySymbol: String,
-        val isEnabled: Boolean = true
+    val type: MainCurrencyType,
+    val currencySymbol: String,
+    val isEnabled: Boolean = true,
 )
 
 data class ExternalTransactionData(
@@ -176,5 +179,5 @@ data class ExternalTransactionData(
     val destinationAddress: String,
     val transactionId: String,
     val canAmountBeModified: Boolean = false,
-    val canDestinationAddressBeModified: Boolean = false
+    val canDestinationAddressBeModified: Boolean = false,
 )
\ 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..55b1211cfb 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
@@ -1,3 +1,5 @@
+@file:Suppress("MagicNumber")
+
 package com.tangem.tap.features.send.ui
 
 import android.content.Context
@@ -14,8 +16,10 @@ import androidx.recyclerview.widget.RecyclerView
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.textfield.TextInputEditText
 import com.tangem.Message
+import com.tangem.core.analytics.Analytics
 import com.tangem.tangem_sdk_new.extensions.hideSoftKeyboard
 import com.tangem.tap.common.KeyboardObserver
+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
@@ -28,10 +32,25 @@ import com.tangem.tap.common.toggleWidget.IndeterminateProgressButtonWidget
 import com.tangem.tap.common.toggleWidget.ViewStateWidget
 import com.tangem.tap.features.BaseStoreFragment
 import com.tangem.tap.features.addBackPressHandler
-import com.tangem.tap.features.send.redux.*
-import com.tangem.tap.features.send.redux.AddressPayIdActionUi.*
-import com.tangem.tap.features.send.redux.AmountActionUi.*
-import com.tangem.tap.features.send.redux.FeeActionUi.*
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi.CheckClipboard
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi.PasteAddressPayId
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi.SetTruncateHandler
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi.TruncateOrRestore
+import com.tangem.tap.features.send.redux.AmountAction
+import com.tangem.tap.features.send.redux.AmountActionUi
+import com.tangem.tap.features.send.redux.AmountActionUi.CheckAmountToSend
+import com.tangem.tap.features.send.redux.AmountActionUi.SetMainCurrency
+import com.tangem.tap.features.send.redux.AmountActionUi.SetMaxAmount
+import com.tangem.tap.features.send.redux.AmountActionUi.ToggleMainCurrency
+import com.tangem.tap.features.send.redux.FeeActionUi.ChangeIncludeFee
+import com.tangem.tap.features.send.redux.FeeActionUi.ChangeSelectedFee
+import com.tangem.tap.features.send.redux.FeeActionUi.ToggleControlsVisibility
+import com.tangem.tap.features.send.redux.ReceiptAction
+import com.tangem.tap.features.send.redux.ReleaseSendState
+import com.tangem.tap.features.send.redux.SendAction
+import com.tangem.tap.features.send.redux.SendActionUi
+import com.tangem.tap.features.send.redux.TransactionExtrasAction
 import com.tangem.tap.features.send.redux.states.FeeType
 import com.tangem.tap.features.send.redux.states.MainCurrencyType
 import com.tangem.tap.features.send.ui.stateSubscribers.SendStateSubscriber
@@ -43,7 +62,12 @@ import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentSendBinding
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import java.text.DecimalFormatSymbols
 
 /**
@@ -61,6 +85,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)
@@ -78,13 +107,16 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
 
     private fun initSendButtonStates() = with(binding) {
         btnSend.setOnClickListener {
-            store.dispatch(SendActionUi.SendAmountToRecipient(
-                Message(getString(R.string.initial_message_sign_header))
-            ))
+            store.dispatch(
+                SendActionUi.SendAmountToRecipient(
+                    Message(getString(R.string.initial_message_sign_header)),
+                ),
+            )
         }
         sendBtn = IndeterminateProgressButtonWidget(btnSend, progress)
     }
 
+    @Suppress("MagicNumber")
     private fun setupAddressOrPayIdLayout() = with(binding.lSendAddressPayid) {
         store.dispatch(SetTruncateHandler { etAddressOrPayId.truncateMiddleWith(it, "...") })
         store.dispatch(CheckClipboard(requireContext().getFromClipboard()?.toString()))
@@ -93,43 +125,45 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
             store.dispatch(TruncateOrRestore(!hasFocus))
         }
         etAddressOrPayId.inputtedTextAsFlow()
-                .debounce(400)
-                .filter { store.state.sendState.addressPayIdState.viewFieldValue.value != it }
-                .onEach {
-                    store.dispatch(AddressPayIdActionUi.HandleUserInput(it))
-                }
-                .launchIn(mainScope)
+            .debounce(400)
+            .filter { store.state.sendState.addressPayIdState.viewFieldValue.value != it }
+            .onEach {
+                store.dispatch(AddressPayIdActionUi.HandleUserInput(it))
+            }
+            .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
+                ScanQrCodeActivity.SCAN_QR_REQUEST_CODE,
             )
         }
     }
 
     private fun setupTransactionExtrasLayout() = with(binding.lSendAddressPayid) {
         etXlmMemo.inputtedTextAsFlow()
-                .debounce(400)
-                .filter {
-                    val info = store.state.sendState.transactionExtrasState
-                    info.xlmMemo?.viewFieldValue?.value != it
-                }
-                .onEach { store.dispatch(TransactionExtrasAction.XlmMemo.HandleUserInput(it)) }
-                .launchIn(mainScope)
+            .debounce(400)
+            .filter {
+                val info = store.state.sendState.transactionExtrasState
+                info.xlmMemo?.viewFieldValue?.value != it
+            }
+            .onEach { store.dispatch(TransactionExtrasAction.XlmMemo.HandleUserInput(it)) }
+            .launchIn(mainScope)
 
         etDestinationTag.inputtedTextAsFlow()
-                .debounce(400)
-                .filter {
-                    val info = store.state.sendState.transactionExtrasState
-                    info.xrpDestinationTag?.viewFieldValue?.value != it
-                }
-                .onEach { store.dispatch(TransactionExtrasAction.XrpDestinationTag.HandleUserInput(it)) }
-                .launchIn(mainScope)
+            .debounce(400)
+            .filter {
+                val info = store.state.sendState.transactionExtrasState
+                info.xrpDestinationTag?.viewFieldValue?.value != it
+            }
+            .onEach { store.dispatch(TransactionExtrasAction.XrpDestinationTag.HandleUserInput(it)) }
+            .launchIn(mainScope)
 
         etBinanceMemo.inputtedTextAsFlow()
             .debounce(400)
@@ -150,10 +184,13 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
         // Delayed launch is needed in order for the UI to be drawn and to process the sent events.
         // If do not use the delay, then etAmount error field is not displayed when
         // inserting an incorrect amount by shareUri
-        binding.lSendAddressPayid.imvQrCode.postDelayed({
-            store.dispatch(PasteAddressPayId(scannedCode))
-            store.dispatch(TruncateOrRestore(!binding.lSendAddressPayid.etAddressOrPayId.isFocused))
-        }, 200)
+        binding.lSendAddressPayid.imvQrCode.postDelayed(
+            {
+                store.dispatch(PasteAddressPayId(scannedCode))
+                store.dispatch(TruncateOrRestore(!binding.lSendAddressPayid.etAddressOrPayId.isFocused))
+            },
+            200,
+        )
     }
 
     private fun setupAmountLayout() {
@@ -165,6 +202,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()))
@@ -211,10 +249,10 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
         }
 
         etAmountToSend.inputtedTextAsFlow()
-                .debounce(400)
-                .filter { store.state.sendState.amountState.viewAmountValue.value != it && it.isNotEmpty() }
-                .onEach { store.dispatch(AmountActionUi.HandleUserInput(it)) }
-                .launchIn(mainScope)
+            .debounce(400)
+            .filter { store.state.sendState.amountState.viewAmountValue.value != it && it.isNotEmpty() }
+            .onEach { store.dispatch(AmountActionUi.HandleUserInput(it)) }
+            .launchIn(mainScope)
 
         etAmountToSend.setOnImeActionListener(EditorInfo.IME_ACTION_DONE) {
             it.hideSoftKeyboard()
@@ -277,7 +315,7 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
             store.dispatch(NavigationAction.PopBackTo())
         } else {
             store.dispatch(
-                WalletAction.TradeCryptoAction.FinishSelling(externalTransactionData.transactionId)
+                WalletAction.TradeCryptoAction.FinishSelling(externalTransactionData.transactionId),
             )
         }
     }
@@ -299,24 +337,22 @@ fun EditText.inputtedTextAsFlow(): Flow<String> = callbackFlow {
     awaitClose { removeTextChangedListener(watcher) }
 }
 
-class FeeUiHelper {
-    companion object {
-        fun toId(fee: FeeType): Int {
-            return when (fee) {
-                FeeType.SINGLE -> View.NO_ID
-                FeeType.LOW -> R.id.chipLow
-                FeeType.NORMAL -> R.id.chipNormal
-                FeeType.PRIORITY -> R.id.chipPriority
-            }
+object FeeUiHelper {
+    fun toId(fee: FeeType): Int {
+        return when (fee) {
+            FeeType.SINGLE -> View.NO_ID
+            FeeType.LOW -> R.id.chipLow
+            FeeType.NORMAL -> R.id.chipNormal
+            FeeType.PRIORITY -> R.id.chipPriority
         }
+    }
 
-        fun toType(id: Int): FeeType {
-            return when (id) {
-                R.id.chipLow -> FeeType.LOW
-                R.id.chipNormal -> FeeType.NORMAL
-                R.id.chipPriority -> FeeType.PRIORITY
-                else -> FeeType.NORMAL
-            }
+    fun toType(id: Int): FeeType {
+        return when (id) {
+            R.id.chipLow -> FeeType.LOW
+            R.id.chipNormal -> FeeType.NORMAL
+            R.id.chipPriority -> FeeType.PRIORITY
+            else -> FeeType.NORMAL
         }
     }
 }
\ No newline at end of file
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..8da2d25445 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
@@ -11,22 +11,19 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
-class RequestFeeErrorDialog {
+object RequestFeeErrorDialog {
+    fun create(context: Context, dialog: SendAction.Dialog.RequestFeeError): AlertDialog {
+        val errorMessage = dialog.error.customMessage
 
-    companion object {
-        fun create(context: Context, dialog: SendAction.Dialog.RequestFeeError): AlertDialog {
-            val errorMessage = dialog.error.customMessage
-
-            return AlertDialog.Builder(context).apply {
-                setTitle(R.string.send_error_fee_request_failed)
-                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)))
-                }
-                setPositiveButton(R.string.common_retry) { _, _ -> dialog.onRetry() }
-                setNeutralButton(R.string.common_cancel) { _, _ -> }
-                setOnDismissListener { store.dispatch(SendAction.Dialog.Hide) }
-            }.create()
-        }
+        return AlertDialog.Builder(context).apply {
+            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)))
+            }
+            setPositiveButton(R.string.common_retry) { _, _ -> dialog.onRetry() }
+            setNeutralButton(R.string.common_cancel) { _, _ -> }
+            setOnDismissListener { store.dispatch(SendAction.Dialog.Hide) }
+        }.create()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt
index 0e35552e43..600e7a99d7 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt
@@ -16,28 +16,26 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
-class SendTransactionFailsDialog {
-    companion object {
-        fun create(context: Context, dialog: SendAction.Dialog.SendTransactionFails.CardSdkError): AlertDialog {
-            return create(context, dialog.error.localizedDescription(context))
-        }
+object SendTransactionFailsDialog {
+    fun create(context: Context, dialog: SendAction.Dialog.SendTransactionFails.CardSdkError): AlertDialog {
+        return create(context, dialog.error.localizedDescription(context))
+    }
 
-        fun create(context: Context, dialog: SendAction.Dialog.SendTransactionFails.BlockchainSdkError): AlertDialog {
-            val errorConverter = BlockchainSdkErrorConverter(context)
-            return create(context, errorConverter.convert(dialog.error))
-        }
+    fun create(context: Context, dialog: SendAction.Dialog.SendTransactionFails.BlockchainSdkError): AlertDialog {
+        val errorConverter = BlockchainSdkErrorConverter(context)
+        return create(context, errorConverter.convert(dialog.error))
+    }
 
-        private fun create(context: Context, errorMessage: String): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(R.string.alert_failed_to_send_transaction_title)
-                setMessage(context.getString(R.string.alert_failed_to_send_transaction_message, errorMessage))
-                setNeutralButton(R.string.alert_button_send_feedback) { _, _ ->
-                    store.dispatch(GlobalAction.SendEmail(SendTransactionFailedEmail(errorMessage)))
-                }
-                setPositiveButton(R.string.common_cancel) { _, _ -> }
-                setOnDismissListener { store.dispatch(SendAction.Dialog.Hide) }
-            }.create()
-        }
+    private fun create(context: Context, errorMessage: String): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(R.string.alert_failed_to_send_transaction_title)
+            setMessage(context.getString(R.string.alert_failed_to_send_transaction_message, errorMessage))
+            setNeutralButton(R.string.alert_button_send_feedback) { _, _ ->
+                store.dispatch(GlobalAction.SendEmail(SendTransactionFailedEmail(errorMessage)))
+            }
+            setPositiveButton(R.string.common_cancel) { _, _ -> }
+            setOnDismissListener { store.dispatch(SendAction.Dialog.Hide) }
+        }.create()
     }
 }
 
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..ac418ad22c 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
@@ -69,9 +69,9 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
         }
     }
 
+    @Suppress("ComplexMethod")
     private fun handleTransactionExtrasState(fg: SendFragment, infoState: TransactionExtrasState) =
         with(fg.binding.lSendAddressPayid) {
-
             fun showView(view: View, info: Any?) {
                 view.show(info != null)
             }
@@ -220,7 +220,11 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
             tilAmountToSend.enableError(false)
         }
 
-        val filter = DecimalDigitsInputFilter(12, state.maxLengthOfAmount, state.decimalSeparator)
+        val filter = DecimalDigitsInputFilter(
+            digitsBeforeDecimal = 12,
+            digitsAfterDecimal = state.maxLengthOfAmount,
+            decimalSeparator = state.decimalSeparator,
+        )
         etAmountToSend.filters = arrayOf(filter)
         val amountToSend = state.viewAmountValue
         if (!amountToSend.isFromUserInput) etAmountToSend.update(amountToSend.value)
@@ -230,12 +234,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}",
             )
         }
 
@@ -249,8 +253,8 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
         tvAmountCurrency.setTextColor(fg.getColor(textColor))
     }
 
+    @Suppress("MagicNumber")
     private fun handleFeeState(fg: SendFragment, state: FeeState) = with(fg.binding.clNetworkFee) {
-//        chipGroup.fitChipsByGroupWidth()
         fg.view?.findViewById<ViewGroup>(R.id.clNetworkFee)?.show(state.mainLayoutIsVisible)
         flExpandCollapse.imvExpandCollapse.rotation = if (state.controlsLayoutIsVisible) 0f else 180f
         llFeeControlsContainer.show(state.controlsLayoutIsVisible)
@@ -265,6 +269,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
         if (chipGroup.checkedChipId != chipId && chipId != View.NO_ID) chipGroup.check(chipId)
     }
 
+    @Suppress("LongMethod", "ComplexMethod")
     private fun handleReceiptState(
         fg: SendFragment,
         state: ReceiptState,
@@ -289,9 +294,9 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
                 pbReceiptFee.hide()
                 tvReceiptFeeValue.show()
             }
+            else -> {}
         }
 
-
         when (state.visibleTypeOfReceipt) {
             ReceiptLayoutType.FIAT -> {
                 val receipt = state.fiat ?: return
@@ -304,7 +309,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)
             }
@@ -317,14 +322,18 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
                 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())
+                if (receipt.willSentFiat == UNKNOWN_AMOUNT_SIGN) {
+                    llTotalContainer.tvWillBeSentValue.hide()
+                } else {
+                    llTotalContainer.tvWillBeSentValue.show()
+                    llTotalContainer.tvWillBeSentValue.update(
+                        getString(
+                            R.string.send_total_subtitle_fiat_format,
+                            "${receipt.willSentFiat} ${receipt.symbols.fiat}",
+                            "${receipt.feeFiat} ${receipt.symbols.fiat}",
+                        ),
+                    )
+                }
             }
             ReceiptLayoutType.TOKEN_FIAT -> {
                 val receipt = state.tokenFiat ?: return
@@ -337,8 +346,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)
             }
@@ -358,6 +367,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
                     }
                 llTotalContainer.tvTotalTokenCryptoValue.update(willSent.toString())
             }
+            else -> {}
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopAction.kt b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopAction.kt
index 27a4a5b9e5..219753c469 100644
--- a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopAction.kt
@@ -2,9 +2,9 @@ package com.tangem.tap.features.shop.redux
 
 import android.content.Intent
 import com.tangem.tap.common.redux.NotificationAction
-import com.tangem.tap.common.shop.GooglePayService
 import com.tangem.tap.common.shop.data.ProductType
 import com.tangem.tap.common.shop.data.TangemProduct
+import com.tangem.tap.common.shop.googlepay.GooglePayService
 import com.tangem.wallet.R
 import org.rekotlin.Action
 
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..3af546cab6 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
@@ -1,5 +1,7 @@
 package com.tangem.tap.features.shop.redux
 
+import com.tangem.core.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Shop
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.redux.AppState
@@ -25,8 +27,8 @@ class ShopMiddleware {
     }
 }
 
+@Suppress("LongMethod", "ComplexMethod")
 private fun handle(action: Action) {
-
     val shopState = store.state.shopState
 
     if (action is NavigationAction.NavigateTo && action.screen == AppScreen.Shop) {
@@ -49,8 +51,8 @@ private fun handle(action: Action) {
                     store.dispatchOnMain(
                         ShopAction.ApplyPromoCode.Success(
                             promoCode = products.first { it.type == shopState.selectedProduct }.appliedDiscount,
-                            products = products
-                        )
+                            products = products,
+                        ),
                     )
                 }
                 result.onFailure { store.dispatchOnMain(ShopAction.ApplyPromoCode.InvalidPromoCode) }
@@ -76,7 +78,7 @@ private fun handle(action: Action) {
                 val result = shopService.handleGooglePayResult(
                     action.resultCode,
                     action.data,
-                    shopState.selectedProduct
+                    shopState.selectedProduct,
                 )
                 result.onSuccess {
                     store.dispatchOnMain(ShopAction.BuyWithGooglePay.Success)
@@ -85,7 +87,6 @@ private fun handle(action: Action) {
                     store.dispatchOnMain(ShopAction.BuyWithGooglePay.Failure(it))
                 }
             }
-
         }
         ShopAction.LoadProducts -> {
             scope.launch {
@@ -94,7 +95,7 @@ private fun handle(action: Action) {
                     onFailure = {
                         Timber.e(it)
                         store.dispatchOnMain(ShopAction.LoadProducts.Failure)
-                    }
+                    },
                 )
             }
         }
@@ -109,23 +110,19 @@ private fun handle(action: Action) {
                     ShopAction.CheckIfGooglePayAvailable.Failure
                 }
                 store.dispatchOnMain(newAction)
-
             }
         }
         ShopAction.StartWebCheckout -> {
+            Analytics.send(Shop.Redirected(null))
             store.dispatchOpenUrl(shopService.getCheckoutUrl(shopState.selectedProduct))
             store.dispatch(ShopAction.FinishSuccessfulOrder)
         }
 
         is ShopAction.FinishSuccessfulOrder -> {
             scope.launch {
-                shopService.waitForCheckout(
-                    productType = shopState.selectedProduct,
-                    analyticsHandler = store.state.globalState.analyticsHandler
-                )
+                shopService.waitForCheckout(shopState.selectedProduct)
             }
         }
-
+        else -> {}
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopReducer.kt b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopReducer.kt
index 001c48a46f..8a97a1a58c 100644
--- a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopReducer.kt
@@ -2,20 +2,18 @@ package com.tangem.tap.features.shop.redux
 
 import org.rekotlin.Action
 
-class ShopReducer {
-    companion object {
-        fun reduce(action: Action, state: ShopState): ShopState = internalReduce(action, state)
-    }
+object ShopReducer {
+    fun reduce(action: Action, state: ShopState): ShopState = internalReduce(action, state)
 }
 
+@Suppress("ComplexMethod")
 private fun internalReduce(action: Action, state: ShopState): ShopState {
-
     if (action !is ShopAction) return state
 
     return when (action) {
         is ShopAction.ApplyPromoCode -> state.copy(
             promoCode = action.promoCode,
-            promoCodeLoading = true
+            promoCodeLoading = true,
         )
         ShopAction.BuyWithGooglePay -> state
         ShopAction.LoadProducts -> state
@@ -26,13 +24,14 @@ private fun internalReduce(action: Action, state: ShopState): ShopState {
         }
         ShopAction.StartWebCheckout -> state
         ShopAction.ApplyPromoCode.InvalidPromoCode -> state.copy(
-            promoCode = null, promoCodeLoading = false
+            promoCode = null,
+            promoCodeLoading = false,
         )
         is ShopAction.ApplyPromoCode.Success -> {
             state.copy(
                 promoCode = action.promoCode,
                 availableProducts = action.products,
-                promoCodeLoading = false
+                promoCodeLoading = false,
 
             )
         }
@@ -49,7 +48,6 @@ private fun internalReduce(action: Action, state: ShopState): ShopState {
         }
         ShopAction.CheckIfGooglePayAvailable.Success -> {
             state.copy(isGooglePayAvailable = false) // TODO: change when we add support for GPay
-
         }
         is ShopAction.BuyWithGooglePay.Failure -> {
             state
diff --git a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopState.kt b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopState.kt
index a4ead917a3..ebbbb7cb79 100644
--- a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopState.kt
+++ b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopState.kt
@@ -15,11 +15,11 @@ data class ShopState(
         get() = availableProducts.firstOrNull { it.type == selectedProduct }?.totalSum?.finalValue
 
     val priceBeforeDiscount: String?
-    get() {
-        val totalSum = availableProducts.firstOrNull { it.type == selectedProduct }?.totalSum
-        if (totalSum?.finalValue != totalSum?.beforeDiscount) {
-            return totalSum?.beforeDiscount
+        get() {
+            val totalSum = availableProducts.firstOrNull { it.type == selectedProduct }?.totalSum
+            if (totalSum?.finalValue != totalSum?.beforeDiscount) {
+                return totalSum?.beforeDiscount
+            }
+            return null
         }
-        return null
-    }
-}
+}
\ 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..dccbe4d7b7 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,7 @@ 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.extensions.getQuantityString
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.common.shop.data.ProductType
@@ -23,12 +24,12 @@ import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentShopBinding
 import org.rekotlin.StoreSubscriber
 
-
 class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<ShopState> {
 
     private val binding: FragmentShopBinding by viewBinding(FragmentShopBinding::bind)
+    private var cardTranslationY = 70f
 
-    lateinit var keyboardObserver: KeyboardObserver
+    private lateinit var keyboardObserver: KeyboardObserver
 
     override fun subscribeToStore() {
         store.subscribe(this) { state ->
@@ -41,12 +42,16 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        activity?.onBackPressedDispatcher?.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                store.dispatch(NavigationAction.PopBackTo())
-                store.dispatch(ShopAction.ResetState)
-            }
-        })
+
+        activity?.onBackPressedDispatcher?.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    store.dispatch(NavigationAction.PopBackTo())
+                    store.dispatch(ShopAction.ResetState)
+                }
+            },
+        )
     }
 
     override fun onDestroyView() {
@@ -72,7 +77,7 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
         }
     }
 
-    private var cardTranslationY = 70f
+    @Suppress("MagicNumber")
     private fun setupCardsImages() {
         GlobalLayoutStateHandler(binding.imvSecond).apply {
             onStateChanged = {
@@ -90,7 +95,6 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
                 detach()
             }
         }
-
     }
 
     private fun setupProductSelection() = with(binding) {
@@ -100,6 +104,8 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
         chipProduct2.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) store.dispatch(ShopAction.SelectProduct(ProductType.WALLET_2_CARDS))
         }
+        chipProduct1.text = chipProduct1.getQuantityString(R.plurals.card_label_card_count, quantity = 3)
+        chipProduct2.text = chipProduct2.getQuantityString(R.plurals.card_label_card_count, quantity = 2)
     }
 
     private fun setupPromoCodeEditText() = with(binding) {
@@ -143,12 +149,14 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
         if (show) imvThird.show()
         imvThird.animate()
             .translationY(translationY)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    super.onAnimationEnd(animation)
-                    imvThird.show(show)
-                }
-            })
+            .setListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        super.onAnimationEnd(animation)
+                        imvThird.show(show)
+                    }
+                },
+            )
     }
 
     private fun handlePriceState(state: ShopState) = with(binding) {
@@ -156,7 +164,6 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
         tvTotalBeforeDiscount.text = state.priceBeforeDiscount
 
         pbPrice.show(state.total == null)
-
     }
 
     private fun handlePromoCodeState(state: ShopState) = with(binding) {
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..2a41a990b6 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
@@ -10,9 +10,11 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
-import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.core.analytics.Analytics
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
 import com.tangem.domain.redux.domainStore
+import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.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,28 @@ 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()
+            TangemTheme {
+                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/AddCustomTokenScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/AddCustomTokenScreen.kt
index 93066fc926..1d57e7472d 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/AddCustomTokenScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/AddCustomTokenScreen.kt
@@ -6,23 +6,16 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.BottomSheetScaffold
 import androidx.compose.material.BottomSheetScaffoldState
 import androidx.compose.material.BottomSheetState
 import androidx.compose.material.BottomSheetValue
 import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.ExtendedFloatingActionButton
 import androidx.compose.material.FabPosition
-import androidx.compose.material.FloatingActionButtonDefaults
-import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.rememberBottomSheetScaffoldState
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
@@ -33,11 +26,14 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 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.components.PrimaryButtonIconLeft
+import com.tangem.core.ui.components.keyboardAsState
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.AddCustomTokenError
 import com.tangem.domain.common.form.DataField
 import com.tangem.domain.common.form.FieldId
@@ -55,19 +51,12 @@ import com.tangem.domain.redux.domainStore
 import com.tangem.tap.common.compose.AddCustomTokenWarning
 import com.tangem.tap.common.compose.ClosePopupTrigger
 import com.tangem.tap.common.compose.ComposeDialogManager
-import com.tangem.tap.common.compose.ToggledRippleTheme
-import com.tangem.tap.common.compose.keyboardAsState
 import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
 import com.tangem.tap.features.tokens.addCustomToken.compose.test.TestCase
 import com.tangem.tap.features.tokens.addCustomToken.compose.test.TestCasesList
 import com.tangem.wallet.R
 import kotlinx.coroutines.launch
 
-/**
-[REDACTED_AUTHOR]
- */
-private class AddCustomTokenScreen {} // for simple search
-
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun AddCustomTokenScreen(
@@ -77,7 +66,7 @@ fun AddCustomTokenScreen(
     val selectedTestCase = remember { mutableStateOf(TestCase.ContractAddress) }
 
     val bottomSheetScaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed)
+        bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed),
     )
     val coroutineScope = rememberCoroutineScope()
     val toggleBottomSheet = { coroutineScope.launch { bottomSheetScaffoldState.toggle() } }
@@ -91,11 +80,13 @@ fun AddCustomTokenScreen(
         },
         sheetPeekHeight = 0.dp,
     ) {
-        Column() {
-            TestCasesList(onItemClick = {
-                selectedTestCase.value = it
-                toggleBottomSheet()
-            })
+        Column {
+            TestCasesList(
+                onItemClick = {
+                    selectedTestCase.value = it
+                    toggleBottomSheet()
+                },
+            )
             ScreenContent(state, closePopupTrigger)
         }
     }
@@ -130,8 +121,12 @@ private fun ScreenContent(
             }
         },
         floatingActionButtonPosition = FabPosition.Center,
-    ) {
-        Box(Modifier.fillMaxSize()) {
+    ) { paddings ->
+        Box(
+            modifier = Modifier
+                .padding(paddings)
+                .fillMaxSize(),
+        ) {
             LazyColumn(
                 contentPadding = PaddingValues(bottom = 90.dp),
             ) {
@@ -144,7 +139,7 @@ private fun ScreenContent(
                         Column(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .padding(16.dp)
+                                .padding(16.dp),
                         ) {
                             FormFields(state, closePopupTrigger)
                         }
@@ -195,7 +190,7 @@ fun Warnings(warnings: List<AddCustomTokenError.Warning>) {
             AddCustomTokenWarning(
                 modifier = modifier.fillMaxWidth(),
                 warning = item,
-                converter = warningConverter
+                converter = warningConverter,
             )
         }
     }
@@ -203,67 +198,34 @@ fun Warnings(warnings: List<AddCustomTokenError.Warning>) {
 
 @Composable
 private fun AddButton(state: MutableState<AddCustomTokenState>) {
-    AddCustomTokenFab(
+    PrimaryButtonIconLeft(
         modifier = Modifier
-            .widthIn(210.dp, 280.dp),
-        isEnabled = state.value.screenState.addButton.isEnabled
-    ) { domainStore.dispatch(AddCustomTokenAction.OnAddCustomTokenClicked) }
-}
-
-@Composable
-private fun AddCustomTokenFab(
-    modifier: Modifier = Modifier,
-    isEnabled: Boolean = true,
-    onClick: () -> Unit
-) {
-    val contentColor = Color.White
-    val backgroundColor = if (isEnabled) {
-        Color(0xFF1ACE80)
-    } else {
-        Color(0xFFB9E6D3)
-    }
-    val elevation = if (!isEnabled) {
-        FloatingActionButtonDefaults.elevation(0.dp, 0.dp)
-    } else {
-        FloatingActionButtonDefaults.elevation()
-    }
-
-    ToggledRippleTheme(isEnabled) {
-        ExtendedFloatingActionButton(
-            modifier = modifier,
-            icon = {
-                Icon(
-                    imageVector = Icons.Filled.Add,
-                    tint = contentColor,
-                    contentDescription = "Add",
-                )
-            },
-            text = { Text(text = stringResource(id = R.string.common_add)) },
-            onClick = { if (isEnabled) onClick() },
-            backgroundColor = backgroundColor,
-            contentColor = contentColor,
-            elevation = elevation,
-        )
-    }
+            .padding(horizontal = TangemTheme.dimens.spacing16)
+            .fillMaxWidth(),
+        text = stringResource(id = R.string.common_add),
+        icon = painterResource(id = R.drawable.ic_plus_24),
+        enabled = state.value.screenState.addButton.isEnabled,
+        onClick = { domainStore.dispatch(AddCustomTokenAction.OnAddCustomTokenClicked) },
+    )
 }
 
 data class ScreenFieldData(
     val field: DataField<*>,
     val error: AddCustomTokenError?,
     val errorConverter: ModuleMessageConverter,
-    val viewState: ViewStates.TokenField
+    val viewState: ViewStates.TokenField,
 ) {
     companion object {
         fun fromState(
             field: DataField<*>,
             state: AddCustomTokenState,
-            errorConverter: ModuleMessageConverter
+            errorConverter: ModuleMessageConverter,
         ): ScreenFieldData {
             return ScreenFieldData(
                 field = field,
                 error = state.getError(field.id),
                 errorConverter = errorConverter,
-                viewState = selectField(field.id, state.screenState)
+                viewState = selectField(field.id, state.screenState),
             )
         }
 
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..7a14ca2d85 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
@@ -2,19 +2,25 @@ package com.tangem.tap.features.tokens.addCustomToken.compose
 
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.runtime.Composable
-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.extensions.getFromClipboard
+import com.tangem.tap.common.compose.BlockchainSpinner
+import com.tangem.tap.common.compose.ClosePopupTrigger
+import com.tangem.tap.common.compose.OutlinedTextFieldWidget
+import com.tangem.tap.common.compose.TitleSubtitle
 import com.tangem.wallet.R
 
 /**
@@ -41,31 +47,6 @@ fun TokenContractAddressView(screenFieldData: ScreenFieldData) {
     SpacerH8()
 }
 
-@Composable
-private fun PasteClearButton(
-    showFirst: Boolean,
-) {
-    if (showFirst) {
-        val context = LocalContext.current
-        PasteButton(
-            onClick = {
-                context.getFromClipboard()?.let {
-                    val fieldData = Field.Data(it.toString(), false)
-                    domainStore.dispatch(OnTokenContractAddressChanged(fieldData))
-                }
-
-            }
-        )
-    } else {
-        ClearButton(
-            onClick = {
-                val fieldData = Field.Data("", false)
-                domainStore.dispatch(OnTokenContractAddressChanged(fieldData))
-            }
-        )
-    }
-}
-
 @Composable
 fun TokenNameView(screenFieldData: ScreenFieldData) {
     if (!screenFieldData.viewState.isVisible) return
@@ -167,10 +148,4 @@ fun TokenDerivationPathView(
         closePopupTrigger = closePopupTrigger,
     ) { domainStore.dispatch(OnTokenDerivationPathChanged(Field.Data(it, true))) }
     SpacerH8()
-}
-
-@Preview
-@Composable
-fun TestTokenContractAddressView() {
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/HangingOverKeyboardView.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/HangingOverKeyboardView.kt
index 46e31151a8..ceae8063fa 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/HangingOverKeyboardView.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/HangingOverKeyboardView.kt
@@ -9,8 +9,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.Keyboard
 import com.tangem.tangem_sdk_new.extensions.pxToDp
-import com.tangem.tap.common.compose.Keyboard
 
 /**
 [REDACTED_AUTHOR]
@@ -20,9 +20,8 @@ fun HangingOverKeyboardView(
     modifier: Modifier = Modifier,
     keyboardState: State<Keyboard>,
     spaceBetweenKeyboard: Dp = 0.dp,
-    content: @Composable() (BoxScope.() -> Unit)
+    content: @Composable (BoxScope.() -> Unit)
 ) {
-
     val context = LocalContext.current
     val padding = when (keyboardState.value) {
         Keyboard.Closed -> 0.dp
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/addCustomToken/compose/test/ContractAddressTests.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/ContractAddressTests.kt
index 25494b3627..2eb3b4923b 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/ContractAddressTests.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/ContractAddressTests.kt
@@ -22,7 +22,7 @@ import com.tangem.domain.redux.domainStore
  */
 @Composable
 fun ContractAddressTests(
-    onItemClick: VoidCallback
+    onItemClick: VoidCallback,
 ) {
     val casesInfo = listOf(
         "USDC on ETH" to "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
@@ -38,7 +38,7 @@ fun ContractAddressTests(
 
 @Composable
 fun SolanaAddressTests(
-    onItemClick: VoidCallback
+    onItemClick: VoidCallback,
 ) {
     val casesInfo = listOf(
         "USDT (full)" to "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
@@ -54,70 +54,84 @@ private fun CasesListContent(
     casesList: List<Pair<String, String>>,
     onItemClick: VoidCallback,
 ) {
-    LazyColumn(content = {
-        item {
-            Row() {
-                ResetContractAddressButton(onItemClick)
-                Text("", modifier = Modifier.weight(1f))
-                ResetAllFieldsButton(onItemClick)
+    LazyColumn(
+        content = {
+            item {
+                Row {
+                    ResetContractAddressButton(onItemClick)
+                    Text("", modifier = Modifier.weight(1f))
+                    ResetAllFieldsButton(onItemClick)
+                }
+                Divider()
             }
-            Divider()
-        }
-        items(casesList.size) {
-            val (info, address) = casesList[it]
-            ContractAddressButton(info, address, onItemClick)
-        }
-    })
+            items(casesList.size) {
+                val (info, address) = casesList[it]
+                ContractAddressButton(info, address, onItemClick)
+            }
+        },
+    )
 }
 
 @Composable
-fun ResetAllFieldsButton(
-    onItemClick: VoidCallback
-) {
-    ActionButton(name = "Reset") {
-        onItemClick()
-        domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
-        domainStore.dispatch(AddCustomTokenAction.OnTokenNetworkChanged(Field.Data(Blockchain.Unknown, false)))
-        domainStore.dispatch(AddCustomTokenAction.OnTokenNameChanged(Field.Data("", false)))
-        domainStore.dispatch(AddCustomTokenAction.OnTokenSymbolChanged(Field.Data("", false)))
-        domainStore.dispatch(AddCustomTokenAction.OnTokenDecimalsChanged(Field.Data("", false)))
-        domainStore.dispatch(AddCustomTokenAction.OnTokenDerivationPathChanged(Field.Data(Blockchain.Unknown, false)))
-    }
+fun ResetAllFieldsButton(onItemClick: VoidCallback) {
+    ActionButton(
+        name = "Reset",
+        onClick = {
+            onItemClick()
+            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
+            domainStore.dispatch(AddCustomTokenAction.OnTokenNetworkChanged(Field.Data(Blockchain.Unknown, false)))
+            domainStore.dispatch(AddCustomTokenAction.OnTokenNameChanged(Field.Data("", false)))
+            domainStore.dispatch(AddCustomTokenAction.OnTokenSymbolChanged(Field.Data("", false)))
+            domainStore.dispatch(AddCustomTokenAction.OnTokenDecimalsChanged(Field.Data("", false)))
+            domainStore.dispatch(
+                AddCustomTokenAction.OnTokenDerivationPathChanged(
+                    Field.Data(
+                        Blockchain.Unknown,
+                        false,
+                    ),
+                ),
+            )
+        },
+    )
 }
 
 @Composable
 fun ResetContractAddressButton(
-    onItemClick: VoidCallback
+    onItemClick: VoidCallback,
 ) {
-    ActionButton(name = "Set empty address") {
-        onItemClick()
-        domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
-    }
+    ActionButton(
+        name = "Set empty address",
+        onClick = {
+            onItemClick()
+            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
+        },
+    )
 }
 
 @Composable
 private fun ContractAddressButton(
     name: String,
     address: String,
-    onItemClick: VoidCallback
+    onItemClick: VoidCallback,
 ) {
     ActionButton(
         modifier = Modifier.fillMaxWidth(),
         name = name,
-    ) {
-        onItemClick()
-        domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data(address, false)))
-    }
+        onClick = {
+            onItemClick()
+            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data(address, false)))
+        },
+    )
 }
 
 @Composable
 fun ActionButton(
-    modifier: Modifier = Modifier,
     name: String,
     onClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Button(
         modifier = modifier.padding(horizontal = 8.dp),
-        onClick = onClick
+        onClick = onClick,
     ) { Text(name, fontSize = 12.sp) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/TestCasesList.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/TestCasesList.kt
index ecdc68bd8c..ef6a3bc4cd 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/TestCasesList.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/test/TestCasesList.kt
@@ -19,30 +19,19 @@ import com.tangem.wallet.R
 [REDACTED_AUTHOR]
  */
 @Composable
-fun TestCasesList(
-    onItemClick: (TestCase) -> Unit
-) {
+fun TestCasesList(onItemClick: (TestCase) -> Unit) {
     if (!BuildConfig.TEST_ACTION_ENABLED) return
 
-    Surface(
-        color = colorResource(id = R.color.lightGray5)
-    ) {
-        Column(
-            Modifier.padding(horizontal = 16.dp)
-        ) {
-            listOf(
-                TestCase.ContractAddress,
-                TestCase.SolanaTokens,
-            ).map { TestCaseListItem(it, onItemClick) }
+    Surface(color = colorResource(id = R.color.lightGray5)) {
+        Column(Modifier.padding(horizontal = 16.dp)) {
+            listOf(TestCase.ContractAddress, TestCase.SolanaTokens)
+                .map { case -> TestCaseListItem(testCase = case, onItemClick = { onItemClick(case) }) }
         }
     }
 }
 
 @Composable
-fun TestCaseListItem(
-    testCase: TestCase,
-    onItemClick: (TestCase) -> Unit,
-) {
+fun TestCaseListItem(testCase: TestCase, onItemClick: () -> Unit) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -51,7 +40,7 @@ fun TestCaseListItem(
             text = testCase.description,
         )
         Button(
-            onClick = { onItemClick(testCase) }
+            onClick = onItemClick,
         ) { Text("Start") }
     }
 }
@@ -59,5 +48,6 @@ fun TestCaseListItem(
 enum class TestCase(val description: String, val content: @Composable (VoidCallback) -> Unit) {
     ContractAddress("Test contract address field", { ContractAddressTests(it) }),
     Auto("Test contract address field", { ContractAddressTests(it) }),
-    SolanaTokens("Test Solana contract addresses", { SolanaAddressTests(it) }), ;
+    SolanaTokens("Test Solana contract addresses", { SolanaAddressTests(it) }),
+    ;
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt
index 79f171b03f..39ac838653 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt
@@ -21,11 +21,13 @@ sealed class TokensAction : Action {
         object Failure : TokensAction()
     }
 
-    data class LoadMore(val scanResponse: ScanResponse? = null
+    data class LoadMore(
+        val scanResponse: ScanResponse? = null
     ) : TokensAction()
 
     data class SetAddedCurrencies(
-        val wallets: List<WalletData>, val derivationStyle: DerivationStyle?
+        val wallets: List<WalletData>,
+        val derivationStyle: DerivationStyle?
     ) : TokensAction()
 
     data class SaveChanges(
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..606ee227cc 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,8 +7,10 @@ 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.core.analytics.Analytics
 import com.tangem.domain.DomainWrapped
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
@@ -20,6 +22,7 @@ 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.events.ManageTokens
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
@@ -35,10 +38,14 @@ 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 com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
 
+@Suppress("LargeClass")
 class TokensMiddleware {
 
     val tokensMiddleware: Middleware<AppState> = { _, _ ->
@@ -47,18 +54,17 @@ 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 -> {
-                        if (store.state.tokensState.needToLoadMore
-                            && store.state.tokensState.currencies.isNotEmpty()
+                        if (store.state.tokensState.needToLoadMore &&
+                            store.state.tokensState.currencies.isNotEmpty()
                         ) {
                             handleLoadCurrencies(action.scanResponse)
                         }
@@ -79,22 +85,25 @@ class TokensMiddleware {
                 .filter { !it.isTestnet() }
 
         val loadCoinsService = LoadAvailableCoinsService(
-            store.state.domainNetworks.tangemTechService,
-            assetReader,
+            tangemTechApi = store.state.domainNetworks.tangemTechService.api,
+            dispatchers = AppCoroutineDispatcherProvider(),
+            assetReader = assetReader,
         )
 
         scope.launch {
-
             val loadCoinsResult = if (newSearchInput == null) {
                 loadCoinsService.getSupportedTokens(
                     isTestcard,
                     supportedBlockchains,
                     tokensState.pageToLoad,
-                    tokensState.searchInput
+                    tokensState.searchInput,
                 )
             } else {
                 loadCoinsService.getSupportedTokens(
-                    isTestcard, supportedBlockchains, 0, newSearchInput.ifBlank { null }
+                    isTestNet = isTestcard,
+                    supportedBlockchains = supportedBlockchains,
+                    page = 0,
+                    searchInput = newSearchInput.ifBlank { null },
                 )
             }
             when (loadCoinsResult) {
@@ -103,24 +112,24 @@ 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)
             }
-
         }
     }
 
-    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) }
@@ -137,22 +146,23 @@ class TokensMiddleware {
             convertToCurrencies(
                 blockchains = blockchainsToRemove,
                 tokens = tokensToRemove,
-                derivationStyle = derivationStyle
-            )
+                derivationStyle = derivationStyle,
+            ),
         )
 
-        if (tokensToAdd.isEmpty() && tokensToRemove.isEmpty()
-            && blockchainsToAdd.isEmpty() && blockchainsToRemove.isEmpty()
+        @Suppress("ComplexCondition")
+        if (tokensToAdd.isEmpty() && tokensToRemove.isEmpty() &&
+            blockchainsToAdd.isEmpty() && blockchainsToRemove.isEmpty()
         ) {
             store.dispatchDebugErrorNotification("Nothing to save")
-            store.dispatch(NavigationAction.PopBackTo())
-            return
+            store.dispatchOnMain(NavigationAction.PopBackTo())
+            return@launch
         }
 
         val currencyList = convertToCurrencies(
             blockchains = blockchainsToAdd,
             tokens = tokensToAdd,
-            derivationStyle = derivationStyle
+            derivationStyle = derivationStyle,
         )
         if (scanResponse.supportsHdWallet()) {
             deriveMissingBlockchains(scanResponse, currencyList) {
@@ -168,7 +178,7 @@ class TokensMiddleware {
     private fun convertToCurrencies(
         blockchains: List<Blockchain>,
         tokens: List<TokenWithBlockchain>,
-        derivationStyle: DerivationStyle?
+        derivationStyle: DerivationStyle?,
     ): List<Currency> {
         return blockchains.map {
             Currency.Blockchain(it, it.derivationPath(derivationStyle)?.rawPath)
@@ -176,19 +186,19 @@ class TokensMiddleware {
             Currency.Token(
                 it.token,
                 it.blockchain,
-                it.blockchain.derivationPath(derivationStyle)?.rawPath
+                it.blockchain.derivationPath(derivationStyle)?.rawPath,
             )
         }
     }
 
-    private fun deriveMissingBlockchains(
+    fun deriveMissingBlockchains(
         scanResponse: ScanResponse,
         currencyList: List<Currency>,
         onSuccess: (ScanResponse) -> Unit,
     ) {
         val derivationDataList = listOfNotNull(
             getDerivations(EllipticCurve.Secp256k1, scanResponse, currencyList),
-            getDerivations(EllipticCurve.Ed25519, scanResponse, currencyList)
+            getDerivations(EllipticCurve.Ed25519, scanResponse, currencyList),
         )
         val derivations = derivationDataList.associate { it.derivations }
         if (derivations.isEmpty()) {
@@ -197,9 +207,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 +227,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"))
                 }
@@ -258,64 +271,88 @@ class TokensMiddleware {
         return DerivationData(
             derivations = mapKeyOfWalletPublicKey to toDerive,
             alreadyDerivedKeys = alreadyDerivedKeys,
-            mapKeyOfWalletPublicKey = mapKeyOfWalletPublicKey
+            mapKeyOfWalletPublicKey = mapKeyOfWalletPublicKey,
         )
     }
 
     private class DerivationData(
         val derivations: Pair<ByteArrayKey, List<DerivationPath>>,
         val alreadyDerivedKeys: ExtendedPublicKeysMap,
-        val mapKeyOfWalletPublicKey: ByteArrayKey
+        val mapKeyOfWalletPublicKey: ByteArrayKey,
     )
 
-    private fun submitAdd(
-        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)
-                        }
+    private fun submitAdd(scanResponse: ScanResponse, currencyList: List<Currency>) {
+        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
+                        WalletAction.MultiWallet.AddBlockchain(
+                            blockchain = BlockchainNetwork.fromWalletManager(walletManager),
+                            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 +361,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 +372,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,18 +385,18 @@ 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) {
                 is Currency.Blockchain -> DomainWrapped.Currency.Blockchain(
                     it.blockchain,
-                    it.derivationPath
+                    it.derivationPath,
                 )
                 is Currency.Token -> DomainWrapped.Currency.Token(
                     it.token,
                     it.blockchain,
-                    it.derivationPath
+                    it.derivationPath,
                 )
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt
index 007a1e9711..e8ab2383d8 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt
@@ -3,10 +3,8 @@ package com.tangem.tap.features.tokens.redux
 import com.tangem.tap.common.redux.AppState
 import org.rekotlin.Action
 
-class TokensReducer {
-    companion object {
-        fun reduce(action: Action, state: AppState): TokensState = internalReduce(action, state)
-    }
+object TokensReducer {
+    fun reduce(action: Action, state: AppState): TokensState = internalReduce(action, state)
 }
 
 private fun internalReduce(action: Action, state: AppState): TokensState {
@@ -23,7 +21,7 @@ private fun internalReduce(action: Action, state: AppState): TokensState {
             }
             tokensState.copy(
                 scanResponse = action.scanResponse,
-                loadCoinsState = loadingState
+                loadCoinsState = loadingState,
             )
         }
         is TokensAction.LoadCurrencies.Success -> {
@@ -31,16 +29,15 @@ private fun internalReduce(action: Action, state: AppState): TokensState {
                 currencies = tokensState.currencies + action.currencies,
                 needToLoadMore = action.loadMore,
                 pageToLoad = tokensState.pageToLoad + 1,
-                loadCoinsState = LoadCoinsState.LOADED
+                loadCoinsState = LoadCoinsState.LOADED,
             )
         }
         is TokensAction.SetAddedCurrencies -> {
-
             tokensState.copy(
                 addedBlockchains = action.wallets.toNonCustomBlockchains(action.derivationStyle),
                 addedTokens = action.wallets.toNonCustomTokensWithBlockchains(action.derivationStyle),
                 addedWallets = action.wallets,
-                derivationStyle = action.derivationStyle
+                derivationStyle = action.derivationStyle,
             )
         }
         is TokensAction.AllowToAddTokens -> {
@@ -52,7 +49,7 @@ private fun internalReduce(action: Action, state: AppState): TokensState {
                 needToLoadMore = true,
                 currencies = emptyList(),
                 pageToLoad = 0,
-                loadCoinsState = LoadCoinsState.LOADING
+                loadCoinsState = LoadCoinsState.LOADING,
             )
         }
         else -> tokensState
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt
index ab1b3731a5..5c4f723467 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt
@@ -9,6 +9,7 @@ import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.tap.domain.tokens.Currency
 import com.tangem.tap.features.wallet.redux.WalletData
 import org.rekotlin.StateType
+import com.tangem.tap.features.wallet.models.Currency.Token as CurrencyToken
 
 data class TokensState(
     val addedWallets: List<WalletData> = emptyList(),
@@ -32,18 +33,18 @@ data class TokensState(
 typealias ContractAddress = String
 
 fun List<WalletData>.toTokensContractAddresses(): List<ContractAddress> {
-    return mapNotNull { (it.currency as? com.tangem.tap.features.wallet.models.Currency.Token)?.token?.contractAddress }.distinct()
+    return mapNotNull { (it.currency as? CurrencyToken)?.token?.contractAddress }.distinct()
 }
 
 fun List<WalletData>.toNonCustomTokens(derivationStyle: DerivationStyle?): List<Token> {
     return filter { !it.currency.isCustomCurrency(derivationStyle) }
-        .mapNotNull { (it.currency as? com.tangem.tap.features.wallet.models.Currency.Token)?.token }
+        .mapNotNull { (it.currency as? CurrencyToken)?.token }
         .distinct()
 }
 
 fun List<WalletData>.toNonCustomTokensWithBlockchains(derivationStyle: DerivationStyle?): List<TokenWithBlockchain> {
     return mapNotNull {
-        if (it.currency !is com.tangem.tap.features.wallet.models.Currency.Token) return@mapNotNull null
+        if (it.currency !is CurrencyToken) return@mapNotNull null
         if (it.currency.isCustomCurrency(derivationStyle)) return@mapNotNull null
         TokenWithBlockchain(it.currency.token, it.currency.blockchain)
     }.distinct()
@@ -61,17 +62,18 @@ fun List<WalletData>.toNonCustomBlockchains(derivationStyle: DerivationStyle?):
 
 data class TokenWithBlockchain(
     val token: Token,
-    val blockchain: Blockchain
+    val blockchain: Blockchain,
 )
 
 fun List<Currency>.filter(supportedBlockchains: Set<Blockchain>?): List<Currency> {
     if (supportedBlockchains == null) return this
     return map {
-        it.copy(contracts =
-        it.contracts.filter {
-            supportedBlockchains.contains(it.blockchain) &&
-                (it.blockchain.canHandleTokens() || it.address == null)
-        }
+        it.copy(
+            contracts =
+            it.contracts.filter {
+                supportedBlockchains.contains(it.blockchain) &&
+                    (it.blockchain.canHandleTokens() || it.address == null)
+            },
         )
     }.filterNot {
         it.contracts.isNullOrEmpty() && !supportedBlockchains.contains(Blockchain.fromNetworkId(it.id))
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..955d0e73fd 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.core.analytics.Analytics
+import com.tangem.core.ui.res.TangemTheme
+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,17 @@ 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)
+        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,44 +68,41 @@ 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 {
-            AppCompatTheme {
+            TangemTheme {
                 CurrenciesScreen(
                     tokensState = tokensState,
                     onSaveChanges = onSaveChanges,
-                    onNetworkItemClicked = onNetworkItemClicked,
-                    onLoadMore = onLoadMore
+                    onNetworkItemClick = onNetworkItemClicked,
+                    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 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 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)
+    }
+
+    override fun onDestroy() {
+        store.dispatch(TokensAction.ResetState)
+        super.onDestroy()
+    }
+
+    @Suppress("MagicNumber")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_popular_tokens, menu)
 
@@ -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
-        }
-    })
-    awaitClose { (watcher) }
+            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..88cc970852 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
@@ -1,3 +1,5 @@
+@file:Suppress("MagicNumber")
+
 package com.tangem.tap.features.tokens.ui.compose
 
 import androidx.compose.animation.AnimatedVisibility
@@ -7,9 +9,16 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
 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.*
-import androidx.compose.runtime.*
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.FabPosition
+import androidx.compose.material.Scaffold
+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,12 +27,18 @@ 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.analytics.Analytics
+import com.tangem.core.ui.components.Keyboard
+import com.tangem.core.ui.components.PrimaryButton
+import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.components.keyboardAsState
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
 import com.tangem.domain.common.extensions.fromNetworkId
-import com.tangem.tap.common.compose.Keyboard
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.common.compose.extensions.addAndNotify
 import com.tangem.tap.common.compose.extensions.removeAndNotify
-import com.tangem.tap.common.compose.keyboardAsState
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.pixelsToDp
 import com.tangem.tap.common.redux.AppDialog
@@ -36,12 +51,13 @@ import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
+@Suppress("LongMethod")
 @Composable
 fun CurrenciesScreen(
-    tokensState: MutableState<TokensState> = mutableStateOf(store.state.tokensState),
+    tokensState: MutableState<TokensState>,
     onSaveChanges: (List<TokenWithBlockchain>, List<Blockchain>) -> Unit,
-    onNetworkItemClicked: (ContractAddress) -> Unit,
-    onLoadMore: () -> Unit
+    onNetworkItemClick: (ContractAddress) -> Unit,
+    onLoadMore: () -> Unit,
 ) {
     val tokensAddedOnMainScreen = remember { tokensState.value.addedTokens }
     val blockchainsAddedOnMainScreen = remember { tokensState.value.addedBlockchains }
@@ -70,33 +86,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
@@ -106,15 +123,14 @@ fun CurrenciesScreen(
                     addedTokens = addedTokensState.value,
                     addedBlockchains = addedBlockchainsState.value,
                     allowToAdd = tokensState.value.allowToAdd,
-                    onAddCurrencyToggled = { currency, token ->
+                    onAddCurrencyToggle = { currency, token ->
                         onAddCurrencyToggleClick(currency, token)
                     },
-                    onNetworkItemClicked = onNetworkItemClicked,
-                    onLoadMore = onLoadMore
+                    onNetworkItemClick = onNetworkItemClick,
+                    onLoadMore = onLoadMore,
                 )
             }
         }
-
     }
 }
 
@@ -122,29 +138,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,46 +182,60 @@ 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) {
-
     val padding = if (keyboardState is Keyboard.Opened) {
         LocalContext.current.pixelsToDp(keyboardState.height)
     } else {
         0
     }
 
-    ExtendedFloatingActionButton(
-        text = {
-            Text(
-                text = stringResource(id = R.string.common_save_changes),
-            )
-        },
+    PrimaryButton(
+        modifier = Modifier
+            .padding(bottom = padding.dp)
+            .padding(horizontal = TangemTheme.dimens.spacing16)
+            .fillMaxWidth(),
+        text = stringResource(id = R.string.common_save_changes),
         onClick = onSaveChanges,
-        backgroundColor = colorResource(id = R.color.accent),
-        contentColor = Color.White,
-        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/CurrenciesWarning.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesWarning.kt
index b5c11c60b8..bfd230a1c7 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesWarning.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesWarning.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.tangem.wallet.R
 
+@Suppress("MagicNumber")
 @Composable
 fun CurrenciesWarning() {
     Box(
@@ -28,8 +29,7 @@ fun CurrenciesWarning() {
                 color = Color(0xFFF2F2F2),
                 shape = RoundedCornerShape(10.dp),
             ),
-    )
-    {
+    ) {
         val warning = stringResource(id = R.string.alert_manage_tokens_addresses_message)
         val end = warning.indexOf(" ")
         val spanStyles = listOf(
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrencyPlaceholderIcon.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrencyPlaceholderIcon.kt
index cb00117ffa..c62f31075e 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrencyPlaceholderIcon.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrencyPlaceholderIcon.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.unit.sp
 
 @Composable
 fun CurrencyPlaceholderIcon(id: String) {
-
     val letterColor: Color = Color.White
     val circleColor: Color = Color.Black
 
@@ -24,8 +23,7 @@ fun CurrencyPlaceholderIcon(id: String) {
         contentAlignment = Alignment.Center,
         modifier = Modifier
             .background(circleColor, shape = CircleShape)
-    )
-    {
+    ) {
         Text(
             text = id.firstOrNull()?.titlecase() ?: "",
             textAlign = TextAlign.Center,
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ExpandedCurrencyItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ExpandedCurrencyItem.kt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
index 613f741c55..1c5ba31d04 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
@@ -19,6 +19,7 @@ import com.tangem.tap.features.tokens.redux.ContractAddress
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
 import com.tangem.tap.features.tokens.ui.compose.currencyItem.CurrencyItem
 
+@Suppress("LongParameterList")
 @Composable
 fun ListOfCurrencies(
     header: @Composable () -> Unit,
@@ -26,11 +27,10 @@ fun ListOfCurrencies(
     addedTokens: List<TokenWithBlockchain>,
     addedBlockchains: List<Blockchain>,
     allowToAdd: Boolean,
-    onAddCurrencyToggled: (Currency, TokenWithBlockchain?) -> Unit,
-    onNetworkItemClicked: (ContractAddress) -> Unit,
+    onAddCurrencyToggle: (Currency, TokenWithBlockchain?) -> Unit,
+    onNetworkItemClick: (ContractAddress) -> Unit,
     onLoadMore: () -> Unit,
 ) {
-
     val expandedCurrencies = remember { mutableStateOf(listOf("")) }
 
     val onCurrencyClick = { currencyId: String ->
@@ -55,16 +55,16 @@ fun ListOfCurrencies(
         verticalArrangement = Arrangement.spacedBy(12.dp),
     ) {
         item { header() }
-        itemsIndexed(currencies) { index, currency ->
+        itemsIndexed(currencies) { _, currency ->
             CurrencyItem(
                 currency = currency,
                 addedTokens = addedTokens,
                 addedBlockchains = addedBlockchains,
                 allowToAdd = allowToAdd,
                 isExpanded = expandedCurrencies.value.contains(currency.id),
-                onCurrencyClick = onCurrencyClick,
-                onAddCurrencyToggled = onAddCurrencyToggled,
-                onNetworkItemClicked = onNetworkItemClicked,
+                onCurrencyClick = { onCurrencyClick(currency.id) },
+                onAddCurrencyToggle = onAddCurrencyToggle,
+                onNetworkItemClick = onNetworkItemClick,
             )
         }
     }
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..4783c5ac67 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,10 +10,12 @@ 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
 
+@Suppress("LongParameterList")
 @Composable
 fun CurrencyExpandedContent(
     currency: Currency,
@@ -21,8 +23,8 @@ fun CurrencyExpandedContent(
     addedBlockchains: List<Blockchain>,
     allowToAdd: Boolean,
     isExpanded: Boolean,
-    onAddCurrencyToggled: (Currency, TokenWithBlockchain?) -> Unit,
-    onNetworkItemClicked: (ContractAddress) -> Unit,
+    onAddCurrencyToggle: (Currency, TokenWithBlockchain?) -> Unit,
+    onNetworkItemClick: (ContractAddress) -> Unit,
 ) {
     AnimatedVisibility(
         visible = isExpanded,
@@ -30,31 +32,32 @@ 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,
                     index = index,
                     size = blockchains.size,
-                    onAddCurrencyToggled = onAddCurrencyToggled,
-                    onNetworkItemClicked = onNetworkItemClicked,
+                    onAddCurrencyToggle = onAddCurrencyToggle,
+                    onNetworkItemClick = onNetworkItemClick,
                 )
             }
         }
     }
-}
\ 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/tokens/ui/compose/currencyItem/CurrencyItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItem.kt
index 6758c71e82..c2aa9f238f 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItem.kt
@@ -7,6 +7,7 @@ import com.tangem.tap.domain.tokens.Currency
 import com.tangem.tap.features.tokens.redux.ContractAddress
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
 
+@Suppress("LongParameterList")
 @Composable
 fun CurrencyItem(
     currency: Currency,
@@ -14,9 +15,9 @@ fun CurrencyItem(
     addedBlockchains: List<Blockchain>,
     allowToAdd: Boolean,
     isExpanded: Boolean,
-    onCurrencyClick: (String) -> Unit,
-    onAddCurrencyToggled: (Currency, TokenWithBlockchain?) -> Unit,
-    onNetworkItemClicked: (ContractAddress) -> Unit,
+    onCurrencyClick: () -> Unit,
+    onAddCurrencyToggle: (Currency, TokenWithBlockchain?) -> Unit,
+    onNetworkItemClick: (ContractAddress) -> Unit,
 ) {
     Column {
         CurrencyItemHeader(
@@ -32,8 +33,8 @@ fun CurrencyItem(
             addedBlockchains = addedBlockchains,
             allowToAdd = allowToAdd,
             isExpanded = isExpanded,
-            onAddCurrencyToggled = onAddCurrencyToggled,
-            onNetworkItemClicked = onNetworkItemClicked,
+            onAddCurrencyToggle = onAddCurrencyToggle,
+            onNetworkItemClick = onNetworkItemClick,
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemArrow.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemArrow.kt
index 4be02043d5..3c0c5655cc 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemArrow.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemArrow.kt
@@ -36,6 +36,7 @@ fun CurrencyItemArrow(
     }
 }
 
+@Suppress("MagicNumber")
 @Composable
 private fun MiddleArrowView(rowHeight: Dp) {
     Box {
@@ -67,11 +68,8 @@ private fun LastArrowView(rowHeight: Dp) {
 
 @Preview
 @Composable
-fun ArrowViewPreview() {
-    Box(
-        Modifier
-            .background(color = Color.White),
-    ) {
+private fun ArrowViewPreview() {
+    Box(Modifier.background(color = Color.White)) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt
index b029341439..bcc681addb 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt
@@ -31,22 +31,24 @@ import androidx.compose.ui.unit.sp
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.core.ui.extensions.getActiveIconRes
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.tap.common.extensions.getGreyedOutIconRes
-import com.tangem.tap.common.extensions.getRoundIconRes
+import com.tangem.tap.domain.tokens.Contract
 import com.tangem.tap.domain.tokens.Currency
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
 import com.tangem.tap.features.tokens.ui.compose.CurrencyPlaceholderIcon
 import com.tangem.tap.features.tokens.ui.compose.fullName
 import com.tangem.wallet.R
 
+@Suppress("LongMethod", "MagicNumber")
 @Composable
 fun CurrencyItemHeader(
     currency: Currency,
     addedTokens: List<TokenWithBlockchain>,
     addedBlockchains: List<Blockchain>,
     isExpanded: Boolean,
-    onCurrencyClick: (String) -> Unit,
+    onCurrencyClick: () -> Unit,
 ) {
     Row(
         modifier = Modifier
@@ -55,7 +57,7 @@ fun CurrencyItemHeader(
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
                 indication = null,
-                onClick = { onCurrencyClick(currency.id) },
+                onClick = onCurrencyClick,
             ),
     ) {
         Box(
@@ -140,9 +142,9 @@ private fun NetworksRow(
                         addedBlockchains = addedBlockchains,
                     )
                 } else {
-                    val isAdded = addedTokens.map { it.token.contractAddress }.contains(contract.address)
+                    val isAdded = addedTokens.any(contract::isInclude)
                     val iconResId = if (isAdded) {
-                        contract.blockchain.getRoundIconRes()
+                        getActiveIconRes(contract.blockchain.id)
                     } else {
                         contract.blockchain.getGreyedOutIconRes()
                     }
@@ -154,7 +156,6 @@ private fun NetworksRow(
                     )
                     Spacer(Modifier.size(5.dp))
                 }
-
             }
         } else {
             BlockchainNetworkItem(
@@ -166,6 +167,7 @@ private fun NetworksRow(
     }
 }
 
+@Suppress("MagicNumber")
 @Composable
 private fun BlockchainNetworkItem(
     blockchain: Blockchain?,
@@ -173,7 +175,7 @@ private fun BlockchainNetworkItem(
     addedBlockchains: List<Blockchain>,
 ) {
     val added = addedBlockchains.contains(blockchain)
-    val icon = if (added) blockchain?.getRoundIconRes() else blockchain?.getGreyedOutIconRes()
+    val icon = if (added) blockchain?.let { getActiveIconRes(it.id) } else blockchain?.getGreyedOutIconRes()
     if (icon != null) {
         Box(
             Modifier
@@ -205,4 +207,7 @@ private fun BlockchainNetworkItem(
         }
         Spacer(modifier = Modifier.size(5.dp))
     }
-}
\ 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/tokens/ui/compose/currencyItem/NetworkItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/NetworkItem.kt
index 2928ace0d8..cf744085ba 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/NetworkItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/NetworkItem.kt
@@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 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
@@ -31,16 +31,17 @@ import androidx.compose.ui.unit.sp
 import coil.compose.SubcomposeAsyncImage
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
+import com.tangem.core.ui.extensions.getActiveIconRes
 import com.tangem.tap.common.extensions.fullNameWithoutTestnet
 import com.tangem.tap.common.extensions.getGreyedOutIconRes
 import com.tangem.tap.common.extensions.getNetworkName
-import com.tangem.tap.common.extensions.getRoundIconRes
 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
 import com.tangem.tap.features.tokens.ui.compose.CurrencyPlaceholderIcon
 
+@Suppress("LongParameterList", "LongMethod", "MagicNumber")
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun NetworkItem(
@@ -51,19 +52,19 @@ fun NetworkItem(
     added: Boolean,
     index: Int,
     size: Int,
-    onAddCurrencyToggled: (Currency, TokenWithBlockchain?) -> Unit,
-    onNetworkItemClicked: (ContractAddress) -> Unit,
+    onAddCurrencyToggle: (Currency, TokenWithBlockchain?) -> Unit,
+    onNetworkItemClick: (ContractAddress) -> Unit,
 ) {
     val rowHeight = 53.dp
 
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .height(rowHeight)
+            .heightIn(rowHeight)
             .combinedClickable(
                 enabled = allowToAdd,
                 onLongClick = {
-                    contract.address?.let { onNetworkItemClicked(it) }
+                    contract.address?.let { onNetworkItemClick(it) }
                 },
                 onClick = {},
                 indication = null,
@@ -85,7 +86,7 @@ fun NetworkItem(
                 .align(Alignment.CenterVertically),
         ) {
             SubcomposeAsyncImage(
-                model = if (added) blockchain.getRoundIconRes() else blockchain.getGreyedOutIconRes(),
+                model = if (added) getActiveIconRes(blockchain.id) else blockchain.getGreyedOutIconRes(),
                 contentDescription = blockchain.fullName,
                 loading = { CurrencyPlaceholderIcon(blockchain.id) },
                 error = { CurrencyPlaceholderIcon(blockchain.id) },
@@ -149,7 +150,7 @@ fun NetworkItem(
                     .fillMaxHeight()
                     .padding(start = 16.dp, end = 16.dp),
                 checked = added,
-                onCheckedChange = { onAddCurrencyToggled(currencyToSave, tokenWithBlockchain) },
+                onCheckedChange = { onAddCurrencyToggle(currencyToSave, tokenWithBlockchain) },
                 colors = SwitchDefaults.colors(
                     checkedThumbColor = Color(0xFF1ACE80),
                 ),
@@ -158,12 +159,12 @@ fun NetworkItem(
     }
 }
 
+@Suppress("MagicNumber")
 @Composable
 private fun prepareNetworkNameSpannableText(
     blockchain: Blockchain,
     contractAddress: String?,
 ): AnnotatedString {
-
     val blockchainName = blockchain.fullNameWithoutTestnet.uppercase()
     val additionalText =
         if (contractAddress == null) "MAIN" else blockchain.getNetworkName().uppercase()
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/data/WalletRepositoryImpl.kt b/app/src/main/java/com/tangem/tap/features/wallet/data/WalletRepositoryImpl.kt
new file mode 100644
index 0000000000..e610e03389
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/data/WalletRepositoryImpl.kt
@@ -0,0 +1,23 @@
+package com.tangem.tap.features.wallet.data
+
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
+import com.tangem.tap.features.wallet.domain.WalletRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+
+/**
+ * Implementation of repository for Wallet feature
+ *
+ * @property tangemTechApi API for server requests
+ * @property dispatchers   coroutine dispatcher provider
+ */
+class WalletRepositoryImpl(
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : WalletRepository {
+
+    override suspend fun getCurrencyList(): CurrenciesResponse = withContext(dispatchers.io) {
+        tangemTechApi.getCurrencyList()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/domain/WalletRepository.kt b/app/src/main/java/com/tangem/tap/features/wallet/domain/WalletRepository.kt
new file mode 100644
index 0000000000..c3ba927d31
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/domain/WalletRepository.kt
@@ -0,0 +1,10 @@
+package com.tangem.tap.features.wallet.domain
+
+import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
+
+/** Repository for Wallet feature */
+interface WalletRepository {
+
+    /** Get list of currency */
+    suspend fun getCurrencyList(): CurrenciesResponse
+}
\ 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..c67c02d950 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,15 @@
 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.datasource.api.tangemTech.models.UserTokensResponse
 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.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 +17,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 +32,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
@@ -57,22 +56,11 @@ sealed interface Currency {
 
     fun isBlockchain(): Boolean = this is Blockchain
     fun isToken(): Boolean = this is Token
-    fun toTokenResponse(): TokenResponse {
-        return TokenResponse(
-            id = coinId,
-            networkId = blockchain.toNetworkId(),
-            derivationPath = derivationPath,
-            name = currencyName,
-            symbol = currencySymbol,
-            decimals = decimals,
-            contractAddress = if (this is Token) token.contractAddress else null,
-        )
-    }
 
     companion object {
         fun fromBlockchainNetwork(
             blockchainNetwork: BlockchainNetwork,
-            token: com.tangem.blockchain.common.Token? = null,
+            token: SdkToken? = null,
         ): Currency {
             return if (token != null) {
                 Token(
@@ -110,24 +98,24 @@ sealed interface Currency {
             )
         }
 
-        fun fromTokenResponse(tokenResponse: TokenResponse): Currency? {
-            val blockchain = com.tangem.blockchain.common.Blockchain.fromNetworkId(tokenResponse.networkId)
+        fun fromTokenResponse(tokenBody: UserTokensResponse.Token): Currency? {
+            val blockchain = com.tangem.blockchain.common.Blockchain.fromNetworkId(tokenBody.networkId)
                 ?: return null
             return when {
-                tokenResponse.contractAddress != null -> Token(
-                    com.tangem.blockchain.common.Token(
-                        name = tokenResponse.name,
-                        symbol = tokenResponse.symbol,
-                        contractAddress = tokenResponse.contractAddress!!,
-                        decimals = tokenResponse.decimals,
-                        id = tokenResponse.id,
+                tokenBody.contractAddress != null -> Token(
+                    token = SdkToken(
+                        name = tokenBody.name,
+                        symbol = tokenBody.symbol,
+                        contractAddress = tokenBody.contractAddress!!,
+                        decimals = tokenBody.decimals,
+                        id = tokenBody.id,
                     ),
                     blockchain = blockchain,
-                    derivationPath = tokenResponse.derivationPath,
+                    derivationPath = tokenBody.derivationPath,
                 )
                 else -> Blockchain(
                     blockchain = blockchain,
-                    derivationPath = tokenResponse.derivationPath,
+                    derivationPath = tokenBody.derivationPath,
                 )
             }
         }
@@ -148,8 +136,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/PendingTransaction.kt b/app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt
index f2cd8d24b1..0e3aea8db6 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt
@@ -26,7 +26,7 @@ data class PendingTransaction(
 
     val currency: String = transactionData.amount.currencySymbol
 
-    fun nullIfUnknown(address: String):String? = if (address == "unknown") null else address
+    fun nullIfUnknown(address: String): String? = if (address == "unknown") null else address
 }
 
 enum class PendingTransactionType { Incoming, Outgoing, Unknown }
@@ -99,7 +99,6 @@ fun Wallet.hasSendableAmountsOrPendingTransactions(): Boolean {
 
 fun Wallet.isSendableAmount(type: AmountType): Boolean {
     return amounts[type]?.isAboveZero() == true
-
 }
 
 fun Wallet.isSendableAmount(token: Token): Boolean {
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..951d4f1e10 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
@@ -1,24 +1,23 @@
 package com.tangem.tap.features.wallet.models
 
-sealed class WalletWarning(
-    val showingPosition: Int,
-) {
+sealed class WalletWarning(val showingPosition: Int) {
+
     data class ExistentialDeposit(
         val currencyName: String,
         val edStringValueWithSymbol: String,
     ) : WalletWarning(1)
 
-    object TransactionInProgress : WalletWarning(10)
-    data class BalanceNotEnoughForFee(val blockchainFullName: String) : WalletWarning(30)
-    data class Rent(val walletRent: WalletRent) : WalletWarning(40)
+    data class TransactionInProgress(val currencyName: String) : WalletWarning(showingPosition = 10)
+
+    data class BalanceNotEnoughForFee(
+        val currencyName: String,
+        val blockchainFullName: String,
+        val blockchainSymbol: String,
+    ) : WalletWarning(showingPosition = 30)
+
+    data class Rent(val walletRent: WalletRent) : WalletWarning(showingPosition = 40)
 }
 
-data class WalletWarningDescription(
-    val title: String,
-    val message: String,
-)
+data class WalletWarningDescription(val title: String, val message: String)
 
-data class WalletRent(
-    val minRentValue: String,
-    val rentExemptValue: String,
-)
\ No newline at end of file
+data class WalletRent(val minRentValue: String, val rentExemptValue: String)
\ No newline at end of file
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..ab67ba0579 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,37 @@ 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.core.analytics.AnalyticsEvent
+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 +59,31 @@ 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 +92,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()
@@ -88,6 +103,7 @@ sealed class WalletAction : Action {
         data class SetPrimaryToken(val token: Token) : MultiWallet()
         data class ShowWalletBackupWarning(val show: Boolean) : MultiWallet()
         object BackupWallet : MultiWallet()
+        object ScheduleCheckForMissingDerivation : MultiWallet()
         data class AddMissingDerivations(val blockchains: List<BlockchainNetwork>) : MultiWallet()
         object ScanToGetDerivations : MultiWallet()
     }
@@ -113,30 +129,27 @@ sealed class WalletAction : Action {
     }
 
     data class LoadFiatRate(
-        val wallet: Wallet? = null, val coinsList: List<Currency>? = null,
+        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()
     }
 
-    object Scan : WalletAction()
+    data class Scan(val onScanSuccessEvent: AnalyticsEvent?) : WalletAction()
 
     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
@@ -152,9 +165,16 @@ sealed class WalletAction : Action {
         ) : DialogAction()
 
         object SignedHashesMultiWalletDialog : DialogAction()
-        object ChooseTradeActionDialog : DialogAction()
+        data class ChooseTradeActionDialog(
+            val buyAllowed: Boolean,
+            val sellAllowed: Boolean,
+            val swapAllowed: Boolean,
+        ) : 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,19 +183,24 @@ 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()
+
+        object Swap : TradeCryptoAction()
     }
 
     data class ChangeSelectedAddress(val type: AddressType) : WalletAction()
@@ -183,7 +208,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 +217,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/WalletData.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletData.kt
new file mode 100644
index 0000000000..f74cd8b564
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletData.kt
@@ -0,0 +1,116 @@
+package com.tangem.tap.features.wallet.redux
+
+import com.tangem.common.extensions.isZero
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.feature.swap.domain.SwapInteractor
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.features.wallet.models.PendingTransaction
+import com.tangem.tap.features.wallet.models.WalletRent
+import com.tangem.tap.features.wallet.models.WalletWarning
+import com.tangem.tap.features.wallet.ui.BalanceStatus
+import com.tangem.tap.features.wallet.ui.BalanceWidgetData
+import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
+import java.math.BigDecimal
+
+data class WalletData(
+    val pendingTransactions: List<PendingTransaction> = emptyList(),
+    val hashesCountVerified: Boolean? = null,
+    val walletAddresses: WalletAddresses? = null,
+    val currencyData: BalanceWidgetData = BalanceWidgetData(),
+    val updatingWallet: Boolean = false,
+    val fiatRateString: String? = null,
+    val fiatRate: BigDecimal? = null,
+    val mainButton: WalletMainButton = WalletMainButton.SendButton(false),
+    val currency: Currency,
+    val walletRent: WalletRent? = null,
+    val existentialDepositString: String? = null,
+) {
+    fun isAvailableToBuy(exchangeManager: CurrencyExchangeManager): Boolean {
+        return exchangeManager.availableForBuy(currency)
+    }
+
+    fun isAvailableToSell(exchangeManager: CurrencyExchangeManager): Boolean {
+        return exchangeManager.availableForSell(currency)
+    }
+
+    fun isAvailableToSwap(swapInteractor: SwapInteractor, isExchangeFeatureOn: Boolean): Boolean {
+        return swapInteractor.isAvailableToSwap(currency.blockchain.toNetworkId()) && isExchangeFeatureOn
+    }
+
+    fun getAvailableActions(
+        swapInteractor: SwapInteractor,
+        exchangeManager: CurrencyExchangeManager,
+        isExchangeFeatureOn: Boolean,
+    ): Set<CurrencyAction> {
+        return setOfNotNull(
+            if (isAvailableToBuy(exchangeManager)) CurrencyAction.Buy else null,
+            if (isAvailableToSell(exchangeManager)) CurrencyAction.Sell else null,
+            if (isAvailableToSwap(swapInteractor, isExchangeFeatureOn)) CurrencyAction.Swap else null,
+        )
+    }
+
+    fun shouldShowMultipleAddress(): Boolean {
+        val listOfAddresses = walletAddresses?.list ?: return false
+        return listOfAddresses.size > 1
+    }
+
+    fun shouldEnableTokenSendButton(): Boolean = if (blockchainAmountIsEmpty()) {
+        false
+    } else {
+        !tokenAmountIsEmpty()
+    }
+
+    fun assembleWarnings(): List<WalletWarning> {
+        val walletWarnings = mutableListOf<WalletWarning>()
+        assembleNonTypedWarnings(walletWarnings)
+        assembleBlockchainWarnings(walletWarnings)
+        assembleTokenWarnings(walletWarnings)
+
+        return walletWarnings.sortedBy { it.showingPosition }
+    }
+
+    private fun assembleNonTypedWarnings(walletWarnings: MutableList<WalletWarning>) {
+        if (currencyData.status == BalanceStatus.SameCurrencyTransactionInProgress) {
+            walletWarnings.add(WalletWarning.TransactionInProgress(currency.currencyName))
+        }
+    }
+
+    private fun assembleBlockchainWarnings(walletWarnings: MutableList<WalletWarning>) {
+        if (!currency.isBlockchain()) return
+
+        if (existentialDepositString != null) {
+            val warning = WalletWarning.ExistentialDeposit(
+                currencyName = currency.currencyName,
+                edStringValueWithSymbol = "$existentialDepositString ${currency.currencySymbol}",
+            )
+            walletWarnings.add(warning)
+        }
+        if (walletRent != null) {
+            walletWarnings.add(WalletWarning.Rent(walletRent))
+        }
+    }
+
+    private fun assembleTokenWarnings(walletWarnings: MutableList<WalletWarning>) {
+        with(currency) {
+            if (!isToken()) return
+
+            if (blockchainAmountIsEmpty() && !tokenAmountIsEmpty()) {
+                walletWarnings.add(
+                    WalletWarning.BalanceNotEnoughForFee(
+                        currencyName = currencyName,
+                        blockchainFullName = blockchain.fullName,
+                        blockchainSymbol = blockchain.currency,
+                    ),
+                )
+            }
+        }
+    }
+
+    private fun blockchainAmountIsEmpty(): Boolean = currencyData.blockchainAmount?.isZero() == true
+
+    private fun tokenAmountIsEmpty(): Boolean = currencyData.amount?.isZero() == true
+}
+
+enum class CurrencyAction {
+    Buy, Sell, Swap
+}
\ 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..0ce5693a7d 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
@@ -6,7 +6,6 @@ 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.extensions.isZero
 import com.tangem.tap.common.entities.Button
 import com.tangem.tap.common.extensions.toQrCode
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
@@ -15,19 +14,18 @@ import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState
 import com.tangem.tap.features.wallet.models.Currency
-import com.tangem.tap.features.wallet.models.PendingTransaction
 import com.tangem.tap.features.wallet.models.TotalBalance
-import com.tangem.tap.features.wallet.models.WalletRent
-import com.tangem.tap.features.wallet.models.WalletWarning
 import com.tangem.tap.features.wallet.redux.reducers.calculateTotalFiatAmount
 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
 
+/**
+ * @property derivationsCheckIsScheduled - used only for analytics
+ */
 data class WalletState(
     val cardId: String = "",
     val state: ProgressState = ProgressState.Done,
@@ -35,7 +33,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,
@@ -45,9 +43,17 @@ data class WalletState(
     val totalBalance: TotalBalance? = null,
     val showBackupWarning: Boolean = false,
     val missingDerivations: List<BlockchainNetwork> = emptyList(),
+    val derivationsCheckIsScheduled: Boolean = false,
     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> { _, _ ->
@@ -55,43 +61,43 @@ data class WalletState(
     }
 
     val isTangemTwins: Boolean
-        get() = store.state.globalState.scanResponse?.isTangemTwins() == true
+        get() = store.state.globalState.scanResponse?.cardTypesResolver?.isTangemTwins() == true
 
     val isExchangeServiceFeatureOn: Boolean
         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,9 +106,9 @@ 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)
+                it.blockchainNetwork.blockchain == currency.blockchain
         }
     }
 
@@ -115,9 +121,9 @@ 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)
+                it.blockchainNetwork.blockchain == blockchainNetwork.blockchain
         }
     }
 
@@ -126,21 +132,10 @@ 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)
-            || (walletData.currency is Currency.Token &&
-            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 +143,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 +151,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 +178,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 {
-                    it.blockchainNetwork.blockchain == currency.blockchain
-                        && it.blockchainNetwork.derivationPath == currency.derivationPath
+                val walletStores = walletsStores.filterNot {
+                    it.blockchainNetwork.blockchain == currency.blockchain &&
+                        it.blockchainNetwork.derivationPath == currency.derivationPath
                 }
-                copy(wallets = walletStores)
+                copy(walletsStores = walletStores)
                     .updateTotalBalance()
                     .updateProgressState()
             }
@@ -218,23 +210,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 +219,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
-        )
+        } else {
+            this.copy(totalBalance = null)
+        }
     }
 
     private fun updateProgressState(): WalletState {
-        val walletsData = this.wallets
+        val walletsData = this.walletsStores
             .flatMap(WalletStore::walletsData)
 
         return if (walletsData.isNotEmpty()) {
@@ -259,7 +236,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 +248,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 +274,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 +288,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"
@@ -309,84 +301,10 @@ data class Artwork(
     }
 }
 
-data class WalletData(
-    val pendingTransactions: List<PendingTransaction> = emptyList(),
-    val hashesCountVerified: Boolean? = null,
-    val walletAddresses: WalletAddresses? = null,
-    val currencyData: BalanceWidgetData = BalanceWidgetData(),
-    val updatingWallet: Boolean = false,
-    val fiatRateString: String? = null,
-    val fiatRate: BigDecimal? = null,
-    val mainButton: WalletMainButton = WalletMainButton.SendButton(false),
-    val currency: Currency,
-    val walletRent: WalletRent? = null,
-    val existentialDepositString: String? = null,
-) {
-    val isAvailableToBuy: Boolean
-        get() = store.state.globalState.exchangeManager.availableForBuy(currency)
-
-    val isAvailableToSell: Boolean
-        get() = store.state.globalState.exchangeManager.availableForSell(currency)
-
-    fun shouldShowMultipleAddress(): Boolean {
-        val listOfAddresses = walletAddresses?.list ?: return false
-        return listOfAddresses.size > 1
-    }
-
-    fun shouldEnableTokenSendButton(): Boolean = if (blockchainAmountIsEmpty()) {
-        false
-    } else {
-        !tokenAmountIsEmpty()
-    }
-
-    fun assembleWarnings(): List<WalletWarning> {
-        val walletWarnings = mutableListOf<WalletWarning>()
-        assembleNonTypedWarnings(walletWarnings)
-        assembleBlockchainWarnings(walletWarnings)
-        assembleTokenWarnings(walletWarnings)
-
-        return walletWarnings.sortedBy { it.showingPosition }
-    }
-
-    private fun assembleNonTypedWarnings(walletWarnings: MutableList<WalletWarning>) {
-        if (currencyData.status == BalanceStatus.SameCurrencyTransactionInProgress) {
-            walletWarnings.add(WalletWarning.TransactionInProgress)
-        }
-    }
-
-    private fun assembleBlockchainWarnings(walletWarnings: MutableList<WalletWarning>) {
-        if (!currency.isBlockchain()) return
-
-        if (existentialDepositString != null) {
-            val warning = WalletWarning.ExistentialDeposit(
-                currencyName = currency.currencyName,
-                edStringValueWithSymbol = "$existentialDepositString ${currency.currencySymbol}",
-            )
-            walletWarnings.add(warning)
-        }
-        if (walletRent != null) {
-            walletWarnings.add(WalletWarning.Rent(walletRent))
-        }
-    }
-
-    private fun assembleTokenWarnings(walletWarnings: MutableList<WalletWarning>){
-        if (!currency.isToken()) return
-
-        val blockchainFullName = currency.blockchain.fullName
-        if ((blockchainAmountIsEmpty() && !tokenAmountIsEmpty())) {
-            walletWarnings.add(WalletWarning.BalanceNotEnoughForFee(blockchainFullName))
-        }
-    }
-
-    private fun blockchainAmountIsEmpty(): Boolean = currencyData.blockchainAmount?.isZero() == true
-
-    private fun tokenAmountIsEmpty(): Boolean = currencyData.amount?.isZero() == true
-}
-
 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..a2b7aa110e 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,22 +1,26 @@
 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.models.CurrenciesResponse
+import com.tangem.core.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
 import com.tangem.tap.domain.TapWalletManager
 import com.tangem.tap.features.details.redux.DetailsAction
+import com.tangem.tap.features.wallet.domain.WalletRepository
 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(
-    private val tangemTechService: TangemTechService,
+    private val walletRepository: WalletRepository,
     private val tapWalletManager: TapWalletManager,
     private val fiatCurrenciesPrefStorage: FiatCurrenciesPrefStorage,
     private val appCurrencyProvider: () -> FiatCurrency,
@@ -34,38 +38,43 @@ class AppCurrencyMiddleware(
             store.dispatchDialogShow(
                 WalletDialog.CurrencySelectionDialog(
                     currenciesList = storedFiatCurrencies.mapToUiModel(),
-                    currentAppCurrency = appCurrencyProvider.invoke()
+                    currentAppCurrency = appCurrencyProvider.invoke(),
                 )
             )
         }
 
         scope.launch {
-            when (val result = tangemTechService.currencies()) {
-                is Result.Success -> {
-                    val currenciesList = result.data.currencies
-                    if (currenciesList.isNotEmpty() &&
-                        currenciesList.toSet() != storedFiatCurrencies.toSet()
-                    ) {
+            runCatching { walletRepository.getCurrencyList() }
+                .onSuccess {
+                    val currenciesList = it.currencies
+                    if (currenciesList.isNotEmpty() && !currenciesList.toSet().equals(storedFiatCurrencies.toSet())) {
                         fiatCurrenciesPrefStorage.save(currenciesList)
                         store.dispatchDialogShow(
                             WalletDialog.CurrencySelectionDialog(
                                 currenciesList = currenciesList.mapToUiModel(),
-                                currentAppCurrency = appCurrencyProvider.invoke()
+                                currentAppCurrency = appCurrencyProvider.invoke(),
                             )
                         )
                     }
                 }
-                is Result.Failure -> {}
-            }
         }
     }
 
     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..34ad6fc335
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt
@@ -0,0 +1,191 @@
+package com.tangem.tap.features.wallet.redux.middlewares
+
+import com.tangem.blockchain.common.Blockchain
+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.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
+import java.math.BigDecimal
+
+internal fun List<WalletStoreModel>.mapToReduxModels(): List<WalletStore> {
+    return this.map { walletStoreModel ->
+        walletStoreModel.mapToReduxModel()
+    }
+}
+
+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(): WalletStore {
+    val appCurrencySymbol = store.state.globalState.appCurrency.symbol
+    return WalletStore(
+        walletManager = walletManager,
+        blockchainNetwork = blockchainNetwork,
+        walletsData = walletsData.mapToReduxModels(walletRent, appCurrencySymbol),
+    )
+        .updateTokenModels(blockchainWalletData.status.amount)
+        .setupIfHadCardSingleToken(
+            blockchain = blockchain,
+            walletsDataModel = walletsData,
+            appCurrencySymbol = appCurrencySymbol,
+            blockchainWalletData = blockchainWalletData.mapToReduxModel(
+                walletRent = walletRent,
+                appCurrencySymbol = appCurrencySymbol,
+            ),
+        )
+}
+
+@Suppress("LongMethod", "ComplexMethod")
+private fun List<WalletDataModel>.mapToReduxModels(
+    walletRent: WalletStoreModel.WalletRent?,
+    appCurrencySymbol: String,
+): List<WalletData> {
+    return this.map { walletDataModel ->
+        walletDataModel.mapToReduxModel(walletRent, appCurrencySymbol)
+    }
+}
+
+private fun WalletDataModel.mapToReduxModel(
+    walletRent: WalletStoreModel.WalletRent?,
+    appCurrencySymbol: String,
+): WalletData {
+    val amount = status.amount
+    val amountFormatted = amount.toFormattedCurrencyString(
+        decimals = currency.decimals,
+        currency = currency.currencySymbol,
+    )
+    val fiatAmount = fiatRate?.let { status.amount.toFiatValue(it) }
+    val fiatAmountFormatted = fiatAmount
+        ?.takeIf { !status.isErrorStatus }
+        ?.toFormattedFiatValue(appCurrencySymbol)
+    val fiatRateFormatted = fiatRate?.toFiatRateString(appCurrencySymbol)
+
+    return 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 = BigDecimal.ZERO,
+            amount = amount,
+            amountFormatted = amountFormatted,
+            fiatAmount = fiatAmount,
+            fiatAmountFormatted = fiatAmountFormatted,
+            token = null,
+            amountToCreateAccount = (status as? WalletDataModel.NoAccount)
+                ?.amountToCreateAccount
+                ?.toString(),
+            errorMessage = status.errorMessage,
+        ),
+    )
+}
+
+private fun WalletStore.updateTokenModels(blockchainAmount: BigDecimal): WalletStore {
+    val updatedTokensWalletData = walletsData.filter { it.currency.isToken() }.map {
+        it.copy(
+            mainButton = when (it.mainButton) {
+                is WalletMainButton.SendButton -> {
+                    WalletMainButton.SendButton(it.mainButton.enabled && !blockchainAmount.isZero())
+                }
+                is WalletMainButton.CreateWalletButton -> it.mainButton
+            },
+            currencyData = it.currencyData.copy(
+                blockchainAmount = blockchainAmount,
+            ),
+        )
+    }
+    return updateWallets(updatedTokensWalletData)
+}
+
+private fun WalletStore.setupIfHadCardSingleToken(
+    blockchain: Blockchain,
+    walletsDataModel: List<WalletDataModel>,
+    appCurrencySymbol: String,
+    blockchainWalletData: WalletData,
+): WalletStore {
+    // Card with single token contains only 2 model - blockchain and token
+    if (walletsData.size != 2) return this
+
+    val cardSingleTokenWalletData = walletsDataModel.firstOrNull {
+        it.currency.isToken() && it.currency.blockchain == blockchain && it.isCardSingleToken
+    } ?: return this
+
+    val blockchainWalletDataWithSingleToken = blockchainWalletData.copy(
+        currencyData = blockchainWalletData.currencyData.copy(
+            token = cardSingleTokenWalletData.toTokenData(appCurrencySymbol),
+        ),
+    )
+    return updateWallets(listOf(blockchainWalletDataWithSingleToken))
+}
+
+private fun WalletDataModel.toTokenData(appCurrencySymbol: String): TokenData {
+    val amount = status.amount
+    val fiatAmount = fiatRate?.let { status.amount.toFiatValue(it) }
+
+    return TokenData(
+        amount = amount,
+        amountFormatted = amount.toFormattedCurrencyString(
+            decimals = currency.decimals,
+            currency = currency.currencySymbol,
+        ),
+        fiatAmount = fiatAmount,
+        fiatAmountFormatted = fiatAmount
+            ?.takeIf { !status.isErrorStatus }
+            ?.toFormattedFiatValue(appCurrencySymbol),
+        tokenSymbol = currency.currencySymbol,
+        fiatRate = fiatRate,
+        fiatRateString = fiatRate?.toFiatRateString(appCurrencySymbol),
+    )
+}
\ 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..1f322a6152 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,15 @@ 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.core.analytics.Analytics
 import com.tangem.domain.common.extensions.withMainContext
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+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 +19,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,14 +33,19 @@ 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
 import java.math.BigDecimal
 
 class MultiWalletMiddleware {
+    @Suppress("LongMethod", "ComplexMethod")
     fun handle(
-        action: WalletAction.MultiWallet, walletState: WalletState?, globalState: GlobalState?,
+        action: WalletAction.MultiWallet,
+        walletState: WalletState?,
+        globalState: GlobalState?,
     ) {
         val globalState = globalState ?: return
 
@@ -42,7 +54,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 +62,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 {
@@ -59,7 +71,6 @@ class MultiWalletMiddleware {
                 val currencies: List<Currency> =
                     (walletState?.currencies ?: emptyList()) + action.blockchain.toCurrencies()
 
-
                 if (action.save && globalState.scanResponse != null) {
                     scope.launch {
                         userTokensRepository.saveUserTokens(
@@ -81,7 +92,8 @@ class MultiWalletMiddleware {
                 )
                 store.dispatch(
                     WalletAction.LoadWallet(
-                        action.blockchain, action.walletManager,
+                        blockchain = action.blockchain,
+                        walletManager = action.walletManager,
                     ),
                 )
             }
@@ -109,6 +121,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 +130,30 @@ 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 {
@@ -149,9 +173,43 @@ class MultiWalletMiddleware {
                     store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
                 }
             }
-            is WalletAction.MultiWallet.ScanToGetDerivations -> {
-                store.dispatch(WalletAction.Scan)
+            is WalletAction.MultiWallet.AddMissingDerivations -> {
+                scope.launch { handleBasicAnalyticsEvent() }
             }
+            is WalletAction.MultiWallet.ScanToGetDerivations -> {
+                val selectedWallet = userWalletsListManager.selectedUserWalletSync
+                if (selectedWallet != null) {
+                    scanAndUpdateCard(selectedWallet, walletState)
+                } else {
+                    store.dispatch(WalletAction.Scan(onScanSuccessEvent = null))
+                }
+            }
+            else -> {}
+        }
+    }
+
+    private fun scanAndUpdateCard(
+        selectedUserWallet: UserWallet,
+        state: WalletState?,
+    ) = scope.launch(Dispatchers.Default) {
+        dispatchOnMain(WalletAction.MultiWallet.ScheduleCheckForMissingDerivation)
+        ScanCardProcessor.scan(
+            analyticsEvent = null,
+            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)
+                }
         }
     }
 
@@ -174,8 +232,10 @@ class MultiWalletMiddleware {
     }
 
     private fun addTokens(
-        tokens: List<Token>, blockchainNetwork: BlockchainNetwork,
-        walletState: WalletState?, globalState: GlobalState?,
+        tokens: List<Token>,
+        blockchainNetwork: BlockchainNetwork,
+        walletState: WalletState?,
+        globalState: GlobalState?,
         save: Boolean,
     ) {
         if (tokens.isEmpty()) return
@@ -196,7 +256,9 @@ class MultiWalletMiddleware {
             WalletAction.LoadFiatRate(
                 coinsList = tokens.map { token ->
                     Currency.Token(
-                        token, blockchainNetwork.blockchain, blockchainNetwork.derivationPath,
+                        token,
+                        blockchainNetwork.blockchain,
+                        blockchainNetwork.derivationPath,
                     )
                 },
             ),
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..1afc0422ec 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
@@ -1,12 +1,21 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
+import androidx.core.os.bundleOf
 import com.tangem.blockchain.blockchains.ethereum.EthereumWalletManager
 import com.tangem.blockchain.common.AmountType
+import com.tangem.core.analytics.Analytics
+import com.tangem.domain.common.extensions.toCoinId
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.feature.swap.presentation.SwapFragment
+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
+import com.tangem.tap.domain.tokens.getIconUrl
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
 import com.tangem.tap.features.send.redux.PrepareSendScreen
@@ -18,7 +27,9 @@ import com.tangem.tap.network.exchangeServices.buyErc20TestnetTokens
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import kotlinx.coroutines.launch
-
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import com.tangem.feature.swap.domain.models.domain.Currency as SwapCurrency
 
 class TradeCryptoMiddleware {
     fun handle(state: () -> AppState?, action: WalletAction.TradeCryptoAction) {
@@ -29,6 +40,7 @@ class TradeCryptoMiddleware {
             is WalletAction.TradeCryptoAction.Sell -> proceedSellAction()
             is WalletAction.TradeCryptoAction.SendCrypto -> preconfigureAndOpenSendScreen(action)
             is WalletAction.TradeCryptoAction.FinishSelling -> openReceiptUrl(action.transactionId)
+            is WalletAction.TradeCryptoAction.Swap -> openSwap()
         }
     }
 
@@ -36,20 +48,22 @@ class TradeCryptoMiddleware {
         state: () -> AppState?,
         action: WalletAction.TradeCryptoAction.Buy,
     ) {
+        val selectedWalletData = store.state.walletState.selectedWalletData ?: return
+
+        val currency = selectedWalletData.currency
+        Analytics.send(Token.ButtonBuy(AnalyticsParam.CurrencyType.Currency(currency)))
+
         if (action.checkUserLocation && state()?.globalState?.userCountryCode == RUSSIA_COUNTRY_CODE) {
             store.dispatchOnMain(WalletAction.DialogAction.RussianCardholdersWarningDialog())
             return
         }
 
-        val selectedWalletData = store.state.walletState.getSelectedWalletData() ?: return
         val card = store.state.globalState.scanResponse?.card ?: return
-
         val addresses = selectedWalletData.walletAddresses?.list.orEmpty()
         if (addresses.isEmpty()) return
 
         val exchangeManager = store.state.globalState.exchangeManager
         val appCurrency = store.state.globalState.appCurrency
-        val currency = selectedWalletData.currency
 
         if (currency is Currency.Token && currency.blockchain.isTestnet()) {
             val walletManager = store.state.walletState.getWalletManager(currency)
@@ -62,7 +76,7 @@ class TradeCryptoMiddleware {
                 exchangeManager.buyErc20TestnetTokens(
                     card = card,
                     walletManager = walletManager,
-                    token = currency.token
+                    token = currency.token,
                 )
             }
             return
@@ -73,41 +87,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 +144,35 @@ class TradeCryptoMiddleware {
         store.state.globalState.exchangeManager.getSellCryptoReceiptUrl(
             action = CurrencyExchangeManager.Action.Sell,
             transactionId = transactionId,
-        )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) }
+        )?.let { store.dispatchOpenUrl(it) }
+    }
+
+    private fun openSwap() {
+        val currency = store.state.walletState.selectedWalletData?.currency?.toSwapCurrency()
+        val bundle = bundleOf(SwapFragment.CURRENCY_BUNDLE_KEY to Json.encodeToString(currency))
+        store.dispatchOnMain(NavigationAction.NavigateTo(screen = AppScreen.Swap, bundle = bundle))
+    }
+
+    private fun Currency.toSwapCurrency(): SwapCurrency {
+        return when (this) {
+            is Currency.Blockchain -> {
+                SwapCurrency.NativeToken(
+                    id = blockchain.toCoinId(),
+                    name = this.currencyName,
+                    symbol = this.currencySymbol,
+                    networkId = this.blockchain.toNetworkId(),
+                    logoUrl = getIconUrl(this.blockchain.toCoinId()),
+                )
+            }
+            is Currency.Token -> SwapCurrency.NonNativeToken(
+                id = this.token.id ?: "",
+                name = this.currencyName,
+                symbol = this.currencySymbol,
+                networkId = this.blockchain.toNetworkId(),
+                logoUrl = getIconUrl(this.token.id ?: ""),
+                contractAddress = this.token.contractAddress,
+                decimalCount = decimals,
+            )
+        }
     }
 }
\ 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..c21a15ce98 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.core.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,25 +17,34 @@ class WalletDialogsMiddleware {
                 store.dispatchDialogShow(WalletDialog.SignedHashesMultiWalletDialog)
             }
             is WalletAction.DialogAction.ChooseTradeActionDialog -> {
-                store.dispatchDialogShow(WalletDialog.ChooseTradeActionDialog)
+                store.state.walletState.selectedWalletData?.let {
+                    Analytics.send(Token.ButtonExchange(AnalyticsParam.CurrencyType.Currency(it.currency)))
+                }
+                store.dispatchDialogShow(
+                    WalletDialog.ChooseTradeActionDialog(
+                        buyAllowed = action.buyAllowed,
+                        sellAllowed = action.sellAllowed,
+                        swapAllowed = action.swapAllowed,
+                    ),
+                )
             }
             is WalletAction.DialogAction.QrCode -> {
                 store.dispatchDialogShow(
                     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..ce9f8287dd 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,24 @@ 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.core.analytics.Analytics
 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.converters.BasicEventsPreChecker
+import com.tangem.tap.common.analytics.converters.BasicEventsSourceData
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+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 +34,9 @@ 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.domain.model.builders.UserWalletIdBuilder
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.send.redux.PrepareSendScreen
@@ -47,16 +55,22 @@ 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.tap.walletStoresManager
 import com.tangem.wallet.R
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
-import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
 import timber.log.Timber
 import java.math.BigDecimal
 
+@Suppress("LargeClass")
 class WalletMiddleware {
     private val tradeCryptoMiddleware = TradeCryptoMiddleware()
     private val warningsMiddleware = WarningsMiddleware()
@@ -64,23 +78,25 @@ class WalletMiddleware {
     private val walletDialogMiddleware = WalletDialogsMiddleware()
     private val appCurrencyMiddleware by lazy(mode = LazyThreadSafetyMode.NONE) {
         AppCurrencyMiddleware(
-            tangemTechService = store.state.domainNetworks.tangemTechService,
+            // TODO("After adding DI") get dependencies by DI
+            walletRepository = store.state.featureRepositoryProvider.walletRepository,
             tapWalletManager = store.state.globalState.tapWalletManager,
             fiatCurrenciesPrefStorage = preferencesStorage.fiatCurrenciesPrefStorage,
             appCurrencyProvider = { store.state.globalState.appCurrency },
         )
     }
 
-    val walletMiddleware: Middleware<AppState> = { dispatch, state ->
+    val walletMiddleware: Middleware<AppState> = { _, state ->
         { next ->
             { action ->
-                handleAction(state, action, dispatch)
+                handleAction(state, action)
                 next(action)
             }
         }
     }
 
-    private fun handleAction(state: () -> AppState?, action: Action, dispatch: DispatchFunction) {
+    @Suppress("LongMethod", "ComplexMethod")
+    private fun handleAction(state: () -> AppState?, action: Action) {
         if (DemoHelper.tryHandle(state, action)) return
 
         val globalState = store.state.globalState
@@ -89,11 +105,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 -> {
@@ -102,6 +114,7 @@ class WalletMiddleware {
                         walletState.walletManagers.map { walletManager ->
                             async { globalState.tapWalletManager.loadWalletData(walletManager) }
                         }.awaitAll()
+                        handleBasicAnalyticsEvent()
                     } else {
                         val walletManager = walletState.getWalletManager(action.blockchain)
                             ?: action.walletManager
@@ -112,19 +125,15 @@ class WalletMiddleware {
             is WalletAction.LoadWallet.Success -> {
                 checkForRentWarning(walletState.getWalletManager(action.blockchain))
                 val coinAmount = action.wallet.amounts[AmountType.Coin]?.value
-                if (coinAmount != null && !coinAmount.isZero()) {
-                    if (walletState.getWalletData(action.blockchain) == null) {
-                        store.dispatch(
-                            WalletAction.MultiWallet.AddBlockchain(
-                                action.blockchain,
-                                null,
-                                true,
-                            ),
-                        )
-                        store.dispatch(
-                            action = WalletAction.LoadWallet.Success(action.wallet, action.blockchain)
-                        )
-                    }
+                if (coinAmount?.isZero() == false && walletState.getWalletData(action.blockchain) == null) {
+                    store.dispatch(
+                        WalletAction.MultiWallet.AddBlockchain(
+                            blockchain = action.blockchain,
+                            walletManager = null,
+                            save = true,
+                        ),
+                    )
+                    store.dispatch(WalletAction.LoadWallet.Success(action.wallet, action.blockchain))
                 }
                 store.dispatch(WalletAction.Warnings.CheckHashesCount.CheckHashesCountOnline)
                 warningsMiddleware.tryToShowAppRatingWarning(action.wallet)
@@ -142,7 +151,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 +176,7 @@ class WalletMiddleware {
                                 Timber.e(
                                     throwable,
                                     "Loading rates failed for [%s]",
-                                    currency.currencySymbol
+                                    currency.currencySymbol,
                                 )
                             }
                         }
@@ -180,39 +189,29 @@ 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 -> {}
                     }
                 }
             }
             is WalletAction.Scan -> {
-                store.dispatch(HomeAction.ShouldScanCardOnResume(true))
                 store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
+                scope.launch {
+                    delay(timeMillis = 700)
+                    store.dispatchOnMain(HomeAction.ReadCard(action.onScanSuccessEvent))
+                }
             }
             is WalletAction.LoadCardInfo -> {
                 val attestationFailed = action.card.attestation.status == Attestation.Status.Failed
                 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,30 +226,48 @@ 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 -> {
+                Analytics.send(Token.Receive.ButtonCopyAddress())
                 action.context.copyToClipboard(action.address)
                 store.dispatch(WalletAction.CopyAddress.Success)
             }
             is WalletAction.ShareAddress -> {
+                Analytics.send(Token.Receive.ButtonShareAddress())
                 action.context.shareText(action.address)
             }
             is WalletAction.ExploreAddress -> {
+                Analytics.send(Token.ButtonExplore())
                 store.dispatchOpenUrl(action.exploreUrl)
             }
             is WalletAction.Send -> {
@@ -262,21 +279,110 @@ 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 {
                     store.dispatch(newAction)
                     if (newAction is PrepareSendScreen) {
+                        store.state.walletState.selectedWalletData?.currency?.let { currency ->
+                            Analytics.send(Token.ButtonSend(AnalyticsParam.CurrencyType.Currency(currency)))
+                        }
                         store.dispatch(NavigationAction.NavigateTo(AppScreen.Send))
                     }
                 }
             }
+            is WalletAction.ShowSaveWalletIfNeeded -> {
+                showSaveWalletIfNeeded()
+            }
+            is WalletAction.ChangeWallet -> {
+                changeWallet()
+            }
+            is WalletAction.UserWalletChanged -> Unit
+            is WalletAction.WalletStoresChanged -> {
+                store.dispatchOnMain(WalletAction.MultiWallet.ScheduleCheckForMissingDerivation)
+                updateWalletStores(action.walletStores, walletState)
+                fetchTotalFiatBalance(action.walletStores)
+                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()
+            store.dispatchOnMain(
+                WalletAction.WalletStoresChanged.UpdateWalletStores(
+                    reduxWalletStores = reduxWalletStores,
+                ),
+            )
+        }
+    }
+
+    private fun fetchTotalFiatBalance(walletStores: List<WalletStoreModel>) {
+        scope.launch(Dispatchers.Default) {
+            val totalFiatBalance = totalFiatBalanceCalculator.calculateOrNull(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(WalletStoreModel::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(MainScreen.CardWasScanned()))
+            }
         }
     }
 
     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 +397,35 @@ 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) {
+                val amountsSize = amounts?.size ?: 0
+                if (amountsSize > 1) {
                     WalletAction.DialogAction.ChooseCurrency(amounts)
                 } else {
                     val amountToSend = amounts?.first()
                     PrepareSendScreen(
                         coinAmount = amountToSend,
                         coinRate = selectedWalletData?.fiatRate,
-                        walletManager = walletStore?.walletManager
+                        walletManager = walletStore?.walletManager,
                     )
                 }
             }
@@ -331,7 +436,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 +451,7 @@ class WalletMiddleware {
             coinRate = coinRate,
             walletManager = walletStore?.walletManager,
             tokenAmount = amount,
-            tokenRate = tokenRate
+            tokenRate = tokenRate,
         )
     }
 
@@ -362,7 +467,7 @@ class WalletMiddleware {
 
                     val balance = walletManager.wallet.fundsAvailable(AmountType.Coin)
                     val outgoingTxs = walletManager.wallet.getPendingTransactions(
-                        PendingTransactionType.Outgoing
+                        PendingTransactionType.Outgoing,
                     ).filterByCoin()
 
                     val rentExempt = result.data
@@ -379,9 +484,9 @@ class WalletMiddleware {
                         dispatchOnMain(
                             WalletAction.SetWalletRent(
                                 wallet = walletManager.wallet,
-                                minRent = ("${rentProvider.rentAmount().stripZeroPlainString()} $currency"),
-                                rentExempt = ("${rentExempt.stripZeroPlainString()} $currency")
-                            )
+                                minRent = "${rentProvider.rentAmount().stripZeroPlainString()} $currency",
+                                rentExempt = "${rentExempt.stripZeroPlainString()} $currency",
+                            ),
                         )
                     } else {
                         dispatchOnMain(WalletAction.RemoveWalletRent(walletManager.wallet))
@@ -391,4 +496,19 @@ class WalletMiddleware {
             }
         }
     }
+}
+
+suspend fun handleBasicAnalyticsEvent() {
+    val scanResponse = store.state.globalState.scanResponse ?: return
+
+    val biometricsWalletDataModels = if (preferencesStorage.shouldSaveUserWallets) {
+        UserWalletIdBuilder.scanResponse(scanResponse).build()?.let { userWalletId ->
+            walletStoresManager.getSync(userWalletId).map { it.walletsData }.flatten()
+        }
+    } else {
+        null
+    }
+
+    val converterData = BasicEventsSourceData(scanResponse, store.state.walletState, biometricsWalletDataModels)
+    BasicEventsPreChecker().tryToSend(converterData)
 }
\ No newline at end of file
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..d9a40e965d 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,16 @@ 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 +50,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 +61,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 +79,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?) {
@@ -101,10 +97,8 @@ class WarningsMiddleware {
             } else if (!preferencesStorage.usedCardsPrefStorage.wasScanned(card.cardId)) {
                 checkIfWarningNeeded(scanResponse)?.let { warning -> addWarningMessage(warning) }
             }
-            if (card.firmwareVersion.type == FirmwareVersion.FirmwareType.Release) {
-                if (!globalState.cardVerifiedOnline) {
-                    addWarningMessage(WarningMessagesManager.onlineVerificationFailed())
-                }
+            if (card.firmwareVersion.type == FirmwareVersion.FirmwareType.Release && !globalState.cardVerifiedOnline) {
+                addWarningMessage(WarningMessagesManager.onlineVerificationFailed())
             }
             if (scanResponse.isDemoCard()) {
                 addWarningMessage(WarningMessagesManager.demoCardWarning())
@@ -113,26 +107,23 @@ 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))
         }
     }
 
     private fun checkIfWarningNeeded(
         scanResponse: ScanResponse,
     ): WarningMessage? {
-        if (scanResponse.isTangemTwins() || scanResponse.isDemoCard()) return null
+        if (scanResponse.cardTypesResolver.isTangemTwins() || scanResponse.isDemoCard()) return null
 
-        if (scanResponse.card.isMultiwalletAllowed) {
-            return if (scanResponse.card.hasSignedHashes()) {
+        if (scanResponse.cardTypesResolver.isMultiwalletAllowed()) {
+            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 +131,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()
@@ -163,12 +153,14 @@ class WarningsMiddleware {
         val card = scanResponse?.card
         if (card == null || preferencesStorage.usedCardsPrefStorage.wasScanned(card.cardId)) return
 
-        if (scanResponse.isTangemTwins() || card.isMultiwalletAllowed) return
+        if (scanResponse.cardTypesResolver.isTangemTwins() || scanResponse.cardTypesResolver.isMultiwalletAllowed()) {
+            return
+        }
 
         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 +170,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 +193,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..c772684c48 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
@@ -8,7 +8,12 @@ import com.tangem.wallet.R
 sealed interface WalletDialog : StateDialog {
     data class SelectAmountToSendDialog(val amounts: List<Amount>?) : WalletDialog
     object SignedHashesMultiWalletDialog : WalletDialog
-    object ChooseTradeActionDialog : WalletDialog
+    data class ChooseTradeActionDialog(
+        val buyAllowed: Boolean,
+        val sellAllowed: Boolean,
+        val swapAllowed: Boolean,
+    ) : WalletDialog
+
     data class CurrencySelectionDialog(
         val currenciesList: List<FiatCurrency>,
         val currentAppCurrency: FiatCurrency,
@@ -16,7 +21,7 @@ sealed interface WalletDialog : StateDialog {
 
     data class RemoveWalletDialog(
         val currencyTitle: String,
-        val onOk: () -> Unit
+        val onOk: () -> Unit,
     ) : WalletDialog {
         val messageRes: Int = R.string.token_details_hide_alert_message
         val titleRes: Int = R.string.token_details_hide_alert_title
@@ -25,11 +30,13 @@ sealed interface WalletDialog : StateDialog {
 
     data class TokensAreLinkedDialog(
         val currencyTitle: String,
-        val currencySymbol: String
+        val currencySymbol: String,
     ) : WalletDialog {
         val messageRes: Int = R.string.token_details_unable_hide_alert_message
         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)
+    }
 }
\ 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..3553809ffb 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,16 +28,19 @@ 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 {
+    @Suppress("LongMethod", "ComplexMethod")
     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)
+                            it.wallet.publicKey.derivationPath?.rawPath == blockchain.derivationPath
                     }
                     val wallet = walletManager?.wallet
                     val cardToken = if (!state.isMultiwalletAllowed) {
@@ -46,13 +53,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 +67,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 +95,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 +112,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()
@@ -125,77 +138,79 @@ class MultiWalletReducer {
                     else -> BalanceStatus.VerifiedOnline
                 }
                 val tokenWalletData = state.getWalletData(currency)
-                val isTokenSendButtonEnabled = tokenWalletData?.shouldEnableTokenSendButton() == true
-                    && pendingTransactions.isEmpty()
+                val isTokenSendButtonEnabled = tokenWalletData?.shouldEnableTokenSendButton() == true &&
+                    pendingTransactions.isEmpty()
 
                 val newTokenWalletData = tokenWalletData?.copy(
                     currencyData = tokenWalletData.currencyData.copy(
                         status = tokenBalanceStatus,
                         amount = action.amount.value,
                         amountFormatted = action.amount.value?.toFormattedCurrencyString(
-                            action.amount.decimals, action.amount.currencySymbol
+                            decimals = action.amount.decimals,
+                            currency = 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.ScheduleCheckForMissingDerivation -> state.copy(
+                derivationsCheckIsScheduled = true,
+            )
+            is WalletAction.MultiWallet.AddMissingDerivations -> state.copy(
+                missingDerivations = action.blockchains,
+                derivationsCheckIsScheduled = false
             )
-            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 +225,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..fe44bbbdaf 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
@@ -33,10 +34,11 @@ class OnWalletLoadedReducer {
         }
     }
 
+    @Suppress("LongMethod")
     private fun onMultiWalletLoaded(
         wallet: Wallet,
         blockchainNetwork: BlockchainNetwork,
-        walletState: WalletState
+        walletState: WalletState,
     ): WalletState {
         val walletData = walletState.getWalletData(blockchainNetwork) ?: return walletState
 
@@ -44,7 +46,7 @@ class OnWalletLoadedReducer {
         val coinAmountValue = wallet.amounts[AmountType.Coin]?.value
         val formattedAmount = coinAmountValue?.toFormattedCurrencyString(
             wallet.blockchain.decimals(),
-            wallet.blockchain.currency
+            wallet.blockchain.currency,
         )
 
         val pendingTransactions = wallet.getPendingTransactions()
@@ -88,8 +90,8 @@ class OnWalletLoadedReducer {
             val tokenFiatAmountFormatted = tokenFiatAmount?.toFormattedFiatValue(fiatCurrency.symbol)
                 ?: UNKNOWN_AMOUNT_SIGN
 
-            val isTokenSendButtonEnabled = tokenWalletData?.shouldEnableTokenSendButton() == true
-                && pendingTransactions.isEmpty()
+            val isTokenSendButtonEnabled = tokenWalletData?.shouldEnableTokenSendButton() == true &&
+                pendingTransactions.isEmpty()
             tokenWalletData?.copy(
                 currencyData = tokenWalletData.currencyData.copy(
                     status = tokenBalanceStatus,
@@ -97,7 +99,7 @@ class OnWalletLoadedReducer {
                     amount = tokenAmountValue,
                     amountFormatted = tokenAmountValue?.toFormattedCurrencyString(
                         token.decimals,
-                        token.symbol
+                        token.symbol,
                     ),
                     fiatAmount = tokenFiatAmount,
                     fiatAmountFormatted = tokenFiatAmountFormatted,
@@ -106,33 +108,27 @@ 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) {
             val tokenAmount = wallet.getTokenAmount(token)
             if (tokenAmount != null) {
                 val tokenFiatRate = walletState.primaryWallet?.currencyData?.token?.fiatRate
-                val tokenFiatAmount =
-                    tokenFiatRate?.let { tokenAmount.value?.toFiatString(it, fiatCurrencyName) }
+                val tokenFiatAmount = tokenFiatRate?.let { tokenAmount.value?.toFiatString(it, fiatCurrencyName) }
                 TokenData(
                     amount = tokenAmount.value ?: BigDecimal.ZERO,
-                    tokenSymbol = tokenAmount.currencySymbol, fiatAmountFormatted = tokenFiatAmount,
+                    tokenSymbol = tokenAmount.currencySymbol,
+                    fiatAmountFormatted = tokenFiatAmount,
                     fiatAmount = tokenFiatRate?.let { tokenAmount.value?.toFiatValue(tokenFiatRate) },
-                    amountFormatted = tokenAmount.value?.toFormattedCurrencyString(
-                        token.decimals, token.symbol,
-                    ) ?: "",
+                    amountFormatted = tokenAmount.value?.toFormattedCurrencyString(token.decimals, token.symbol) ?: "",
                 )
             } else {
                 null
@@ -143,7 +139,7 @@ class OnWalletLoadedReducer {
         val amount = wallet.amounts[AmountType.Coin]?.value
         val formattedAmount = amount?.toFormattedCurrencyString(
             wallet.blockchain.decimals(),
-            wallet.blockchain.currency
+            wallet.blockchain.currency,
         )
         val fiatAmount = walletState.primaryWallet?.fiatRate?.let { amount?.toFiatValue(it) }
         val fiatAmountFormatted = fiatAmount?.toFormattedFiatValue(fiatCurrencyName) ?: UNKNOWN_AMOUNT_SIGN
@@ -164,7 +160,7 @@ class OnWalletLoadedReducer {
                 amount = amount,
                 amountFormatted = formattedAmount,
                 fiatAmount = fiatAmount,
-                fiatAmountFormatted = fiatAmountFormatted
+                fiatAmountFormatted = fiatAmountFormatted,
             ),
             pendingTransactions = pendingTransactions.removeUnknownTransactions(),
             mainButton = WalletMainButton.SendButton(sendButtonEnabled),
@@ -173,7 +169,8 @@ class OnWalletLoadedReducer {
         val updatedStore = walletState.getWalletStore(walletData?.currency)?.updateWallets(wallets)
 
         return walletState.updateWalletStore(updatedStore).copy(
-            state = ProgressState.Done, error = null
+            state = ProgressState.Done,
+            error = null,
         )
     }
 }
\ No newline at end of file
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..1e15f2460a 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,20 +17,33 @@ 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
-        else when (wallet.currencyData.status) {
-            BalanceStatus.Refreshing -> ProgressState.Refreshing
-            BalanceStatus.VerifiedOnline,
-            BalanceStatus.SameCurrencyTransactionInProgress,
-            BalanceStatus.TransactionInProgress,
-            BalanceStatus.NoAccount -> ProgressState.Done
-            BalanceStatus.Unreachable,
-            BalanceStatus.EmptyCard,
-            BalanceStatus.UnknownBlockchain -> ProgressState.Error
-            BalanceStatus.Loading,
-            null -> ProgressState.Loading
+        if (wallet.fiatRate == null) {
+            ProgressState.Error
+        } else {
+            when (wallet.currencyData.status) {
+                BalanceStatus.Refreshing -> ProgressState.Refreshing
+                BalanceStatus.VerifiedOnline,
+                BalanceStatus.SameCurrencyTransactionInProgress,
+                BalanceStatus.TransactionInProgress,
+                BalanceStatus.NoAccount,
+                -> ProgressState.Done
+                BalanceStatus.Unreachable,
+                BalanceStatus.EmptyCard,
+                BalanceStatus.UnknownBlockchain,
+                BalanceStatus.MissedDerivation,
+                -> ProgressState.Error
+                BalanceStatus.Loading,
+                null,
+                -> ProgressState.Loading
+            }
         }
     }
 }
@@ -41,20 +54,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..b99614de7b 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
@@ -28,20 +30,21 @@ 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)
-    }
+object WalletReducer {
+    fun reduce(action: Action, state: AppState, appStateHolder: AppStateHolder): WalletState =
+        internalReduce(action, state, appStateHolder)
 }
 
-private fun internalReduce(action: Action, state: AppState): WalletState {
-
+@Suppress("LongMethod", "ComplexMethod")
+private fun internalReduce(action: Action, state: AppState, appStateHolder: AppStateHolder): WalletState {
     val multiWalletReducer = MultiWalletReducer()
     val onWalletLoadedReducer = OnWalletLoadedReducer()
     val appCurrencyReducer = AppCurrencyReducer()
@@ -54,75 +57,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 +156,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 +173,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 +181,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 +192,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 +219,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 +242,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 +254,9 @@ 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 +264,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 +296,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 +326,63 @@ 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()
+}
+
 fun createAddressList(wallet: Wallet?, walletAddresses: WalletAddresses? = null): WalletAddresses? {
     if (wallet == null) return null
 
@@ -345,7 +405,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 +418,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 +446,7 @@ private fun setNewFiatRate(
             fiatRates = fiatRates.mapNotNullValues { it.value },
             rateFormatter = rateFormatter,
             appCurrency = appCurrency,
-            state = state
+            state = state,
         )
     } else {
         setSingleWalletFiatRates(
@@ -403,7 +462,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 +547,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..45e23edca6 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(
@@ -30,11 +31,11 @@ data class BalanceWidgetData(
     val fiatAmountFormatted: String? = null,
     val token: TokenData? = null,
     val amountToCreateAccount: String? = null,
-    val errorMessage: String? = null
+    val errorMessage: String? = null,
 )
 
 data class TokenData(
-    val amountFormatted: String,
+    val amountFormatted: String?,
     val amount: BigDecimal? = null,
     val tokenSymbol: String,
     val fiatAmountFormatted: String? = null,
@@ -43,7 +44,6 @@ data class TokenData(
     val fiatRate: BigDecimal? = null,
 )
 
-
 class BalanceWidget(
     private val binding: CardBalanceBinding,
     private val fragment: WalletFragment,
@@ -51,8 +51,8 @@ class BalanceWidget(
     private val isTwinCard: Boolean,
 ) {
 
+    @Suppress("LongMethod", "ComplexMethod")
     fun setup() {
-
         when (data.status) {
             BalanceStatus.Loading -> {
                 with(binding) {
@@ -64,7 +64,6 @@ class BalanceWidget(
                     lBalance.tvAmount.text = ""
                 }
 
-
                 showStatus(R.id.tv_status_loading)
 
                 if (data.token != null) {
@@ -128,8 +127,9 @@ class BalanceWidget(
                 tvErrorTitle.text = fragment.getText(R.string.wallet_error_no_account)
                 tvErrorDescriptions.text =
                     fragment.getString(
-                        R.string.wallet_error_no_account_subtitle_format,
-                        data.amountToCreateAccount, data.currencySymbol
+                        R.string.no_account_generic,
+                        data.amountToCreateAccount,
+                        data.currencySymbol,
                     )
             }
             BalanceStatus.UnknownBlockchain -> with(binding.lBalanceError) {
@@ -140,6 +140,7 @@ class BalanceWidget(
                 tvErrorDescriptions.text =
                     fragment.getString(R.string.wallet_error_unsupported_blockchain_subtitle)
             }
+            else -> {}
         }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt
index ecbad2650a..67e10ca9a6 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt
@@ -7,36 +7,34 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.address.AddressType
 import com.tangem.wallet.R
 
-class MultipleAddressUiHelper {
-    companion object {
-        fun typeToId(type: AddressType): Int {
-            return when (type) {
-                is BitcoinAddressType.Legacy -> R.id.chip_legacy
-                is BitcoinAddressType.Segwit -> R.id.chip_default
-                is CardanoAddressType.Byron -> R.id.chip_legacy
-                is CardanoAddressType.Shelley -> R.id.chip_default
-                else -> View.NO_ID
-            }
+object MultipleAddressUiHelper {
+    fun typeToId(type: AddressType): Int {
+        return when (type) {
+            is BitcoinAddressType.Legacy -> R.id.chip_legacy
+            is BitcoinAddressType.Segwit -> R.id.chip_default
+            is CardanoAddressType.Byron -> R.id.chip_legacy
+            is CardanoAddressType.Shelley -> R.id.chip_default
+            else -> View.NO_ID
         }
+    }
 
-        fun idToType(id: Int, blockchain: Blockchain?): AddressType? {
-            return when (id) {
-                R.id.chip_default -> {
-                    when (blockchain) {
-                        Blockchain.Bitcoin, Blockchain.BitcoinTestnet, Blockchain.Litecoin -> BitcoinAddressType.Segwit
-                        Blockchain.CardanoShelley -> CardanoAddressType.Shelley
-                        else -> null
-                    }
+    fun idToType(id: Int, blockchain: Blockchain?): AddressType? {
+        return when (id) {
+            R.id.chip_default -> {
+                when (blockchain) {
+                    Blockchain.Bitcoin, Blockchain.BitcoinTestnet, Blockchain.Litecoin -> BitcoinAddressType.Segwit
+                    Blockchain.CardanoShelley -> CardanoAddressType.Shelley
+                    else -> null
                 }
-                R.id.chip_legacy -> {
-                    when (blockchain) {
-                        Blockchain.Bitcoin, Blockchain.BitcoinTestnet, Blockchain.Litecoin -> BitcoinAddressType.Legacy
-                        Blockchain.CardanoShelley -> CardanoAddressType.Byron
-                        else -> null
-                    }
-                }
-                else -> null
             }
+            R.id.chip_legacy -> {
+                when (blockchain) {
+                    Blockchain.Bitcoin, Blockchain.BitcoinTestnet, Blockchain.Litecoin -> BitcoinAddressType.Legacy
+                    Blockchain.CardanoShelley -> CardanoAddressType.Byron
+                    else -> null
+                }
+            }
+            else -> null
         }
     }
 }
\ No newline at end of file
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..45b6f7140a 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,15 +12,25 @@ 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.DiffStrategy
+import com.badoo.mvicore.ModelWatcher
+import com.badoo.mvicore.modelWatcher
+import com.tangem.common.doOnResult
+import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
+import com.tangem.feature.swap.domain.SwapInteractor
 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.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.dispatchOnMain
 import com.tangem.tap.common.extensions.fitChipsByGroupWidth
 import com.tangem.tap.common.extensions.getColor
 import com.tangem.tap.common.extensions.getString
@@ -30,9 +40,10 @@ 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.models.WalletWarning
+import com.tangem.tap.features.wallet.redux.AddressData
 import com.tangem.tap.features.wallet.redux.ErrorType
 import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.WalletAction
@@ -44,27 +55,96 @@ 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 dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
 
+@Suppress("LargeClass", "MagicNumber")
+@AndroidEntryPoint
 class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
     StoreSubscriber<WalletState> {
 
+    @Inject
+    lateinit var swapInteractor: SwapInteractor
+
     private lateinit var pendingTransactionAdapter: PendingTransactionsAdapter
     private lateinit var warningMessagesAdapter: WalletDetailWarningMessagesAdapter
 
     private val binding: FragmentWalletDetailsBinding by viewBinding(FragmentWalletDetailsBinding::bind)
 
+    private val walletDataWatcher: ModelWatcher<WalletData> = modelWatcher {
+        val addressCardStrategy: DiffStrategy<WalletData> = { old, new ->
+            old.currency != new.currency ||
+                old.walletAddresses?.selectedAddress != new.walletAddresses?.selectedAddress ||
+                old.shouldShowMultipleAddress() != new.shouldShowMultipleAddress()
+        }
+
+        WalletData::pendingTransactions {
+            showPendingTransactionsIfPresent(it)
+        }
+        WalletData::currency {
+            handleCurrencyIcon(it)
+        }
+        WalletData::currencyData {
+            setupBalanceData(it)
+        }
+        WalletData::walletAddresses { walletAddresses ->
+            setupCopyAndShareButtons(walletAddresses?.selectedAddress?.address)
+        }
+        WalletData::assembleWarnings { warnings ->
+            handleWarnings(warnings)
+        }
+        (WalletData::currencyData or WalletData::currency) { walletData ->
+            setupCurrency(walletData.currencyData, walletData.currency)
+            setupSwipeRefresh(walletData.currencyData, walletData.currency)
+        }
+        watch({ it }, addressCardStrategy) { walletData ->
+            setupAddressCard(
+                shouldShowMultipleAddress = walletData.shouldShowMultipleAddress(),
+                selectedAddress = walletData.walletAddresses?.selectedAddress,
+                currency = walletData.currency,
+            )
+        }
+    }
+
+    private val walletStateWatcher: ModelWatcher<WalletState> = modelWatcher {
+        WalletState::selectedWalletData { selectedWallet ->
+            if (selectedWallet != null) {
+                walletDataWatcher.invoke(selectedWallet)
+            }
+        }
+        (WalletState::selectedWalletData or WalletState::isExchangeServiceFeatureOn) { state ->
+            val selectedWallet = state.selectedWalletData
+            if (selectedWallet != null) {
+                setupButtonsRow(selectedWallet, 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)
@@ -93,6 +173,11 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
         setupTestActionButton()
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        clearWatchers()
+    }
+
     private fun setupTransactionsRecyclerView() = with(binding) {
         pendingTransactionAdapter = PendingTransactionsAdapter()
         rvPendingTransaction.layoutManager = LinearLayoutManager(requireContext())
@@ -107,15 +192,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
     }
 
     private fun setupButtons() = with(binding) {
-        rowButtons.onBuyClick = {
-            store.dispatch(WalletAction.TradeCryptoAction.Buy())
-        }
-        rowButtons.onSellClick = {
-            store.dispatch(WalletAction.TradeCryptoAction.Sell)
-        }
-        rowButtons.onTradeClick = {
-            store.dispatch(WalletAction.DialogAction.ChooseTradeActionDialog)
-        }
         rowButtons.onSendClick = {
             store.dispatch(WalletAction.Send())
         }
@@ -125,46 +201,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,43 +230,101 @@ 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 setupButtons(selectedWallet: WalletData, isExchangeServiceFeatureOn: Boolean) = with(binding) {
-        lWalletDetails.btnCopy.setOnClickListener {
-            selectedWallet.walletAddresses?.selectedAddress?.address?.let { addressString ->
-                store.dispatch(WalletAction.CopyAddress(addressString, requireContext()))
-            }
-        }
-        lWalletDetails.btnShare.setOnClickListener {
-            selectedWallet.walletAddresses?.selectedAddress?.address?.let { addressString ->
-                store.dispatch(WalletAction.ShareAddress(addressString, requireContext()))
+    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.dispatchOnMain(WalletAction.LoadWallet(blockchainNetwork))
+                        store.dispatchOnMain(WalletAction.LoadFiatRate(coinsList = listOf(currency)))
+                    }
+                }
             }
         }
 
-        rowButtons.updateButtonsVisibility(
+        binding.srlWalletDetails.isRefreshing = currencyData.status == BalanceStatus.Loading ||
+            currencyData.status == BalanceStatus.Refreshing
+    }
+
+    private fun setupCopyAndShareButtons(walletAddress: String?) {
+        binding.lWalletDetails.btnCopy.setOnClickListener {
+            if (walletAddress != null) {
+                store.dispatch(WalletAction.CopyAddress(walletAddress, requireContext()))
+            }
+        }
+        binding.lWalletDetails.btnShare.setOnClickListener {
+            if (walletAddress != null) {
+                store.dispatch(WalletAction.ShareAddress(walletAddress, requireContext()))
+            }
+        }
+    }
+
+    private fun setupButtonsRow(selectedWallet: WalletData, isExchangeServiceFeatureOn: Boolean) {
+        val exchangeManager = store.state.globalState.exchangeManager
+        binding.rowButtons.apply {
+            onBuyClick = { store.dispatch(WalletAction.TradeCryptoAction.Buy()) }
+            onSellClick = { store.dispatch(WalletAction.TradeCryptoAction.Sell) }
+            onSwapClick = { store.dispatch(WalletAction.TradeCryptoAction.Swap) }
+            onTradeClick = {
+                store.dispatch(
+                    WalletAction.DialogAction.ChooseTradeActionDialog(
+                        buyAllowed = selectedWallet.isAvailableToBuy(exchangeManager),
+                        sellAllowed = selectedWallet.isAvailableToSell(exchangeManager),
+                        swapAllowed = selectedWallet.isAvailableToSwap(swapInteractor, isExchangeServiceFeatureOn),
+                    ),
+                )
+            }
+        }
+        val actions = selectedWallet.getAvailableActions(
+            swapInteractor = swapInteractor,
+            exchangeManager = exchangeManager,
+            isExchangeFeatureOn = isExchangeServiceFeatureOn,
+        )
+        binding.rowButtons.updateButtonsVisibility(
+            actions = actions,
             exchangeServiceFeatureOn = isExchangeServiceFeatureOn,
-            buyAllowed = selectedWallet.isAvailableToBuy,
-            sellAllowed = selectedWallet.isAvailableToSell,
             sendAllowed = selectedWallet.mainButton.enabled,
         )
     }
 
-    private fun handleWarnings(selectedWallet: WalletData) = with(binding) {
+    private fun handleWarnings(warnings: List<WalletWarning>) = with(binding) {
         val converter = WalletWarningConverter(requireContext())
-        val warningDetails = selectedWallet.assembleWarnings().map { converter.convert(it) }
+        val warningDetails = warnings.map { converter.convert(it) }
 
         warningMessagesAdapter.submitList(warningDetails)
         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,54 +332,74 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
         )
     }
 
-
     private fun showPendingTransactionsIfPresent(pendingTransactions: List<PendingTransaction>) {
         pendingTransactionAdapter.submitList(pendingTransactions)
         binding.rvPendingTransaction.show(pendingTransactions.isNotEmpty())
     }
 
-    private fun setupAddressCard(state: WalletData) = with(binding.lWalletDetails) {
-        if (state.walletAddresses != null) {
-            if (state.shouldShowMultipleAddress() && state.currency is Currency.Blockchain) {
-                (cardBalance as? ViewGroup)?.beginDelayedTransition()
-                chipGroupAddressType.show()
-                chipGroupAddressType.fitChipsByGroupWidth()
+    private fun setupAddressCard(
+        shouldShowMultipleAddress: Boolean,
+        selectedAddress: AddressData?,
+        currency: Currency,
+    ) = with(binding.lWalletDetails) {
+        if (selectedAddress == null) return@with
 
-                val checkedId =
-                    MultipleAddressUiHelper.typeToId(state.walletAddresses.selectedAddress.type)
-                if (checkedId != View.NO_ID) chipGroupAddressType.check(checkedId)
+        setupAddressTypeChips(shouldShowMultipleAddress, selectedAddress, currency)
 
-                chipGroupAddressType.setOnCheckedChangeListener { group, checkedId ->
-                    if (checkedId == -1) return@setOnCheckedChangeListener
-                    val type =
-                        MultipleAddressUiHelper.idToType(checkedId, state.currency.blockchain)
-                    type?.let { store.dispatch(WalletAction.ChangeSelectedAddress(type)) }
-                }
-            } else {
-                chipGroupAddressType.hide()
-            }
-            tvAddress.text = state.walletAddresses.selectedAddress.address
-            tvExplore.setOnClickListener {
-                store.dispatch(
-                    WalletAction.ExploreAddress(
-                        state.walletAddresses.selectedAddress.exploreUrl,
-                        requireContext()
-                    )
-                )
-            }
-            ivQrCode.setImageBitmap(state.walletAddresses.selectedAddress.shareUrl.toQrCode())
-            tvReceiveMessage.text =
-                getQRReceiveMessage(tvReceiveMessage.context, state.currency)
+        tvAddress.text = selectedAddress.address
+        tvExplore.setOnClickListener {
+            store.dispatch(WalletAction.ExploreAddress(selectedAddress.exploreUrl, requireContext()))
+        }
+        ivQrCode.setImageBitmap(selectedAddress.shareUrl.toQrCode())
+
+        tvReceiveMessage.text = when (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 setupAddressTypeChips(
+        shouldShowMultipleAddress: Boolean,
+        selectedAddress: AddressData,
+        currency: Currency,
+    ) = with(binding.lWalletDetails) {
+        if (shouldShowMultipleAddress && currency is Currency.Blockchain) {
+            (cardBalance as? ViewGroup)?.beginDelayedTransition()
+            chipGroupAddressType.show()
+            chipGroupAddressType.fitChipsByGroupWidth()
+
+            val checkedId =
+                MultipleAddressUiHelper.typeToId(selectedAddress.type)
+            if (checkedId != View.NO_ID) chipGroupAddressType.check(checkedId)
+
+            chipGroupAddressType.setOnCheckedChangeListener { _, checkedId ->
+                if (checkedId == -1) return@setOnCheckedChangeListener
+                val type =
+                    MultipleAddressUiHelper.idToType(checkedId, currency.blockchain)
+                type?.let { store.dispatch(WalletAction.ChangeSelectedAddress(type)) }
+            }
+        } else {
+            chipGroupAddressType.hide()
+        }
+    }
+
+    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 {
@@ -290,17 +415,18 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
                 lBalance.groupBalance.show()
                 lBalance.tvError.hide()
                 lBalance.tvAmount.text = data.amountFormatted
-                lBalance.tvFiatAmount.text = data.fiatAmountFormatted
+                lBalance.tvFiatAmount.text = data.fiatAmountFormatted ?: UNKNOWN_AMOUNT_SIGN
                 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()
                 lBalance.tvError.hide()
                 lBalance.tvAmount.text = data.amountFormatted
-                lBalance.tvFiatAmount.text = data.fiatAmountFormatted
+                lBalance.tvFiatAmount.text = data.fiatAmountFormatted ?: UNKNOWN_AMOUNT_SIGN
                 when (data.status) {
                     BalanceStatus.VerifiedOnline, BalanceStatus.SameCurrencyTransactionInProgress -> {
                         lBalance.tvStatus.setVerifiedBalanceStatus(R.string.wallet_balance_verified)
@@ -317,7 +443,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,17 +452,19 @@ 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,
                     )
             }
+            else -> {}
         }
     }
 
     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
                 }
@@ -350,6 +478,11 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
         inflater.inflate(R.menu.menu_wallet_details, menu)
     }
 
+    private fun clearWatchers() {
+        walletDataWatcher.clear()
+        walletStateWatcher.clear()
+    }
+
     private fun TextView.setWarningStatus(mainMessage: Int, error: String? = null) {
         val text = getString(mainMessage).appendIfNotNull(error, "\nError: ")
         setStatus(text, R.color.warning, R.drawable.ic_warning_small)
@@ -366,7 +499,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..51aa99bbbe 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,22 @@ 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.analytics.Analytics
+import com.tangem.core.ui.fragments.setStatusBarColor
+import com.tangem.core.ui.utils.OneTouchClickListener
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
+import com.tangem.feature.swap.domain.SwapInteractor
 import com.tangem.tap.MainActivity
+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
@@ -24,7 +33,6 @@ import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.domain.statePrinter.printScanResponseState
 import com.tangem.tap.domain.statePrinter.printWalletState
-import com.tangem.tap.domain.termsOfUse.CardTou
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.wallet.redux.ErrorType
 import com.tangem.tap.features.wallet.redux.ProgressState
@@ -36,27 +44,51 @@ 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
+import dagger.hilt.android.AndroidEntryPoint
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<WalletState> {
 
+    @Inject
+    lateinit var swapInteractor: SwapInteractor
+
     private lateinit var warningsAdapter: WarningMessagesAdapter
 
     private val binding: FragmentWalletBinding by viewBinding(FragmentWalletBinding::bind)
 
-    private var walletView: WalletView = SingleWalletView()
+    private var walletView: WalletView = MultiWalletView()
+
+    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 +99,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 +114,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()
@@ -102,6 +140,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
         }
     }
 
+    @Suppress("MagicNumber")
     private fun setupWarningsRecyclerView() {
         warningsAdapter = WarningMessagesAdapter()
         val layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
@@ -112,13 +151,14 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
         }
     }
 
+    @Suppress("ComplexMethod")
     override fun newState(state: WalletState) {
         if (activity == null || view == null) return
 
         val isSaltPay = store.state.globalState.scanResponse?.card?.isSaltPay == true
 
         when {
-            isSaltPay && (walletView !is SaltPaySingleWalletView) -> {
+            isSaltPay && walletView !is SaltPaySingleWalletView -> {
                 walletView = SaltPaySingleWalletView()
                 walletView.changeWalletView(this, binding)
             }
@@ -134,6 +174,8 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
             else -> {} // we keep the same view unless we scan a card that requires a different view
         }
 
+        walletView.swapInteractor = swapInteractor
+
         walletView.onNewState(state)
 
         if (!state.shouldShowDetails) {
@@ -149,12 +191,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>) {
@@ -177,8 +223,8 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     }
 
     private fun setupCardImage(state: WalletState) {
-        //TODO: SaltPay: remove hardCode
-        if (store.state.globalState.scanResponse?.isSaltPay() == true) {
+        // TODO: SaltPay: remove hardCode
+        if (store.state.globalState.scanResponse?.cardTypesResolver?.isSaltPay() == true) {
             binding.ivCard.load(R.drawable.img_salt_pay_visa) {
                 scale(Scale.FIT)
                 crossfade(enable = true)
@@ -204,9 +250,8 @@ 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 },
                         ),
                     )
                     store.dispatch(NavigationAction.NavigateTo(AppScreen.Details))
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..8e9e9c6219 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
@@ -18,22 +18,31 @@ class WalletWarningConverter(
             is WalletWarning.ExistentialDeposit -> {
                 context.getString(
                     R.string.warning_existential_deposit_message,
-                    message.currencyName, message.edStringValueWithSymbol,
+                    message.currencyName,
+                    message.edStringValueWithSymbol,
                 )
             }
             is WalletWarning.BalanceNotEnoughForFee -> {
                 context.getString(
                     R.string.token_details_send_blocked_fee_format,
-                    message.blockchainFullName, message.blockchainFullName,
+                    message.currencyName,
+                    message.blockchainFullName,
+                    message.currencyName,
+                    message.blockchainFullName,
+                    message.blockchainSymbol,
                 )
             }
-            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(
                     R.string.solana_rent_warning,
-                    message.walletRent.minRentValue, message.walletRent.rentExemptValue,
+                    message.walletRent.minRentValue,
+                    message.walletRent.rentExemptValue,
                 )
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/PendingTransactionsAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/PendingTransactionsAdapter.kt
index bafc35673b..6d50e30035 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/PendingTransactionsAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/PendingTransactionsAdapter.kt
@@ -13,12 +13,14 @@ import com.tangem.tap.features.wallet.models.PendingTransactionType
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ItemPendingTransactionBinding
 
-class PendingTransactionsAdapter
-    : ListAdapter<PendingTransaction, PendingTransactionsAdapter.TransactionsViewHolder>(DiffUtilCallback) {
+class PendingTransactionsAdapter :
+    ListAdapter<PendingTransaction, PendingTransactionsAdapter.TransactionsViewHolder>(DiffUtilCallback) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TransactionsViewHolder {
         val binding = ItemPendingTransactionBinding.inflate(
-            LayoutInflater.from(parent.context), parent, false
+            LayoutInflater.from(parent.context),
+            parent,
+            false
         )
         return TransactionsViewHolder(binding)
     }
@@ -29,19 +31,20 @@ class PendingTransactionsAdapter
 
     object DiffUtilCallback : DiffUtil.ItemCallback<PendingTransaction>() {
         override fun areContentsTheSame(
-                oldItem: PendingTransaction, newItem: PendingTransaction
+            oldItem: PendingTransaction,
+            newItem: PendingTransaction
         ) = oldItem == newItem
 
         override fun areItemsTheSame(
-                oldItem: PendingTransaction, newItem: PendingTransaction
+            oldItem: PendingTransaction,
+            newItem: PendingTransaction
         ) = oldItem == newItem
     }
 
     class TransactionsViewHolder(val binding: ItemPendingTransactionBinding) :
-            RecyclerView.ViewHolder(binding.root) {
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(transaction: PendingTransaction) {
-
             if (transaction.type == PendingTransactionType.Unknown) {
                 binding.root.hide()
             }
@@ -69,7 +72,7 @@ class PendingTransactionsAdapter
 
             if (transaction.address != null) {
                 binding.tvPendingTransactionAddress.text =
-                        binding.root.getString(transactionAddressRes, transaction.address)
+                    binding.root.getString(transactionAddressRes, transaction.address)
             }
             binding.ivPendingTransaction.setImageDrawable(binding.root.context.getDrawableCompat(image))
         }
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..60c0d65fbc 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.core.analytics.Analytics
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
+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,17 @@ 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 +41,13 @@ 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 +66,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 +89,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 +101,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/WalletDetailWarningMessagesAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletDetailWarningMessagesAdapter.kt
index 5164928569..a96101b35a 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletDetailWarningMessagesAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletDetailWarningMessagesAdapter.kt
@@ -13,8 +13,8 @@ import com.tangem.wallet.databinding.LayoutWarningCardBinding
 /**
 [REDACTED_AUTHOR]
  */
-class WalletDetailWarningMessagesAdapter
-    : ListAdapter<WalletWarningDescription, WalletDetailsWarningMessageVH>(DiffUtilCallback()) {
+class WalletDetailWarningMessagesAdapter :
+    ListAdapter<WalletWarningDescription, WalletDetailsWarningMessageVH>(DiffUtilCallback()) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WalletDetailsWarningMessageVH {
         val inflater = LayoutInflater.from(parent.context)
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..090a503220 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.core.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,9 @@ 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 +64,7 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
         tvMessage.text = getString(
             resId = warning.messageResId,
             default = warning.message,
-            formatArgs = warning.messageFormatArg
+            formatArgs = warning.messageFormatArg,
         )
     }
 
@@ -73,6 +77,7 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
         binding.warningCardAction.setCardBackgroundColor(binding.root.getColor(color))
     }
 
+    @Suppress("LongMethod")
     private fun setupControlButtons(warning: WarningMessage) = when (warning.type) {
         WarningMessage.Type.Permanent, WarningMessage.Type.TestCard -> {
             binding.groupControlsTemporary.hide()
@@ -98,7 +103,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 +112,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 +126,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/AmountToSendBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendBottomSheetDialog.kt
index ff82942f2b..db783afc52 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendBottomSheetDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendBottomSheetDialog.kt
@@ -5,7 +5,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.appcompat.view.ContextThemeWrapper
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.tangem.blockchain.common.Amount
 import com.tangem.tap.common.extensions.toFormattedString
@@ -51,13 +55,13 @@ class AmountToSendBottomSheetDialog(
     }
 }
 
-
-class ChooseAmountAdapter
-    : ListAdapter<Amount, ChooseAmountAdapter.AmountViewHolder>(DiffUtilCallback) {
+class ChooseAmountAdapter : ListAdapter<Amount, ChooseAmountAdapter.AmountViewHolder>(DiffUtilCallback) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AmountViewHolder {
         val binding = ItemWalletAmountToSendBinding.inflate(
-            LayoutInflater.from(parent.context), parent, false
+            LayoutInflater.from(parent.context),
+            parent,
+            false
         )
         return AmountViewHolder(binding)
     }
@@ -68,11 +72,13 @@ class ChooseAmountAdapter
 
     object DiffUtilCallback : DiffUtil.ItemCallback<Amount>() {
         override fun areContentsTheSame(
-            oldItem: Amount, newItem: Amount
+            oldItem: Amount,
+            newItem: Amount
         ) = oldItem.currencySymbol == newItem.currencySymbol
 
         override fun areItemsTheSame(
-            oldItem: Amount, newItem: Amount
+            oldItem: Amount,
+            newItem: Amount
         ) = oldItem == newItem
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt
index 3fc5905990..1495219c54 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt
@@ -4,11 +4,16 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.tangem.tap.common.extensions.show
 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.DialogWalletTradeBinding
 
-class ChooseTradeActionBottomSheetDialog(context: Context) : BottomSheetDialog(context) {
+class ChooseTradeActionBottomSheetDialog(
+    context: Context,
+    private val dialogData: WalletDialog.ChooseTradeActionDialog,
+) : BottomSheetDialog(context) {
 
     var binding: DialogWalletTradeBinding? = null
 
@@ -26,13 +31,25 @@ class ChooseTradeActionBottomSheetDialog(context: Context) : BottomSheetDialog(c
             store.dispatch(WalletAction.DialogAction.Hide)
         }
 
-        binding!!.dialogBtnBuy.setOnClickListener {
-            dismiss()
-            store.dispatch(WalletAction.TradeCryptoAction.Buy())
-        }
-        binding!!.dialogBtnSell.setOnClickListener {
-            dismiss()
-            store.dispatch(WalletAction.TradeCryptoAction.Sell)
+        binding?.let {
+            with(it) {
+                dialogBtnBuy.show(dialogData.buyAllowed)
+                dialogBtnSell.show(dialogData.sellAllowed)
+                dialogBtnSwap.show(dialogData.swapAllowed)
+
+                dialogBtnBuy.setOnClickListener {
+                    dismiss()
+                    store.dispatch(WalletAction.TradeCryptoAction.Buy())
+                }
+                dialogBtnSell.setOnClickListener {
+                    dismiss()
+                    store.dispatch(WalletAction.TradeCryptoAction.Sell)
+                }
+                dialogBtnSwap.setOnClickListener {
+                    dismiss()
+                    store.dispatch(WalletAction.TradeCryptoAction.Swap)
+                }
+            }
         }
     }
 }
\ No newline at end of file
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..9c8d5997b9 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,22 +4,27 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.tangem.core.analytics.Analytics
+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) {
+(context) {
 
     private var binding: DialogRussiansCardholdersWarningBinding? = null
 
     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 +38,8 @@ class RussianCardholdersWarningBottomSheetDialog(
         }
 
         binding?.btnYes?.setOnClickListener {
-            if (topUpUrl != null) {
-                store.dispatchOpenUrl(topUpUrl)
+            if (dialogData != null) {
+                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..f1081006c2 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.core.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
@@ -11,20 +13,17 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
-class ScanFailsDialog {
-
-    companion object {
-        fun create(context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.common_warning))
-                setMessage(R.string.alert_troubleshooting_scan_card_title)
-                setPositiveButton(R.string.alert_button_request_support) { _, _ ->
-                    store.dispatch(GlobalAction.SendEmail(ScanFailsEmail()))
-                }
-                setNeutralButton(R.string.alert_troubleshooting_scan_card_ok) { _, _ -> }
-                setOnDismissListener { store.dispatchDialogHide() }
-            }.create()
-        }
+object ScanFailsDialog {
+    fun create(context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            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.common_cancel) { _, _ -> }
+            setOnDismissListener { store.dispatchDialogHide() }
+        }.create()
     }
-
 }
\ No newline at end of file
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..b419a42b81 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
@@ -8,26 +8,23 @@ import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
-class SignedHashesWarningDialog {
-    companion object {
-        fun create(context: Context): AlertDialog {
-            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) { _, _ ->
-                    store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
-                    store.dispatch(
-                        GlobalAction.HideWarningMessage(
-                            WarningMessagesManager.signedHashesMultiWalletWarning()
-                        )
-                    )
-                }
-                setNegativeButton(R.string.common_cancel) { _, _ -> }
-                setOnDismissListener {
-                    store.dispatch(WalletAction.DialogAction.Hide)
-                }
-            }.create()
-        }
+object SignedHashesWarningDialog {
+    fun create(context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(context.getString(R.string.warning_important_security_info))
+            setMessage(R.string.alert_signed_hashes_message)
+            setPositiveButton(R.string.common_understand) { _, _ ->
+                store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
+                store.dispatch(
+                    GlobalAction.HideWarningMessage(
+                        WarningMessagesManager.signedHashesMultiWalletWarning(),
+                    ),
+                )
+            }
+            setNegativeButton(R.string.common_cancel) { _, _ -> }
+            setOnDismissListener {
+                store.dispatch(WalletAction.DialogAction.Hide)
+            }
+        }.create()
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
index d52c26763e..dc44583536 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
@@ -10,49 +10,47 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
-class SimpleOkDialog {
+object SimpleOkDialog {
 
-    companion object {
-        fun create(dialog: AppDialog.SimpleOkDialog, context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(dialog.header)
-                setMessage(dialog.message)
-                setPositiveButton(R.string.common_ok) { _, _ -> }
-                setOnDismissListener {
-                    store.dispatchDialogHide()
-                    dialog.onOk?.invoke()
-                }
-            }.create()
-        }
-
-        fun create(dialog: AppDialog.SimpleOkDialogRes, context: Context): AlertDialog {
-            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(dialog.headerId))
-                setMessage(dialog.messageId)
-                setPositiveButton(R.string.common_ok) { _, _ -> }
-                setOnDismissListener {
-                    store.dispatchDialogHide()
-                    dialog.onOk?.invoke()
-                }
-            }.create()
-        }
-
-        fun create(dialog: AppDialog.SimpleOkErrorDialog, context: Context): AlertDialog = create(
-            dialog = AppDialog.SimpleOkDialog(
-                header = context.getString(R.string.common_error),
-                message = dialog.message,
-                onOk = dialog.onOk,
-            ),
-            context = context,
-        )
-
-        fun create(dialog: AppDialog.SimpleOkWarningDialog, context: Context): AlertDialog = create(
-            dialog = AppDialog.SimpleOkDialog(
-                header = context.getString(R.string.common_warning),
-                message = dialog.message,
-                onOk = dialog.onOk,
-            ),
-            context = context,
-        )
+    fun create(dialog: AppDialog.SimpleOkDialog, context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(dialog.header)
+            setMessage(dialog.message)
+            setPositiveButton(R.string.common_ok) { _, _ -> }
+            setOnDismissListener {
+                store.dispatchDialogHide()
+                dialog.onOk?.invoke()
+            }
+        }.create()
     }
+
+    fun create(dialog: AppDialog.SimpleOkDialogRes, context: Context): AlertDialog {
+        return AlertDialog.Builder(context).apply {
+            setTitle(context.getString(dialog.headerId))
+            setMessage(dialog.messageId)
+            setPositiveButton(R.string.common_ok) { _, _ -> }
+            setOnDismissListener {
+                store.dispatchDialogHide()
+                dialog.onOk?.invoke()
+            }
+        }.create()
+    }
+
+    fun create(dialog: AppDialog.SimpleOkErrorDialog, context: Context): AlertDialog = create(
+        dialog = AppDialog.SimpleOkDialog(
+            header = context.getString(R.string.common_error),
+            message = dialog.message,
+            onOk = dialog.onOk,
+        ),
+        context = context,
+    )
+
+    fun create(dialog: AppDialog.SimpleOkWarningDialog, context: Context): AlertDialog = create(
+        dialog = AppDialog.SimpleOkDialog(
+            header = context.getString(R.string.common_warning),
+            message = dialog.message,
+            onOk = dialog.onOk,
+        ),
+        context = context,
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt
index 729bfe3fcc..b02511017c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt
@@ -8,9 +8,9 @@ import coil.request.ImageRequest
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.IconsUtil
 import com.tangem.blockchain.common.Token
+import com.tangem.core.ui.extensions.getActiveIconRes
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.tap.common.extensions.getColor
-import com.tangem.tap.common.extensions.getRoundIconRes
 import com.tangem.tap.common.extensions.getTextColor
 import com.tangem.tap.domain.extensions.getCustomIconUrl
 import com.tangem.tap.domain.tokens.getIconUrl
@@ -85,8 +85,8 @@ class CurrencyIconRequest(
         crossinline onError: (Blockchain) -> Unit = {},
     ) {
         currencyImageView.loadIcon(
-            data = if (getLocalImage) blockchain.getRoundIconRes() else getIconUrl(blockchain.toNetworkId()),
-            placeholderRes = blockchain.getRoundIconRes(),
+            data = if (getLocalImage) getActiveIconRes(blockchain.id) else getIconUrl(blockchain.toNetworkId()),
+            placeholderRes = getActiveIconRes(blockchain.id),
             onStart = { onStart(blockchain) },
             onSuccess = { onSuccess(blockchain) },
             onError = { onError(blockchain) },
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..d05ac08cc9 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
@@ -13,6 +13,7 @@ import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.wallet.databinding.ViewCurrencyIconBinding
 import kotlin.math.roundToInt
 
+@Suppress("MagicNumber")
 class CurrencyIconView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
@@ -70,5 +71,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/images/RoundedCornersCropTransformation.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/RoundedCornersCropTransformation.kt
deleted file mode 100644
index 7a9b0a3015..0000000000
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/RoundedCornersCropTransformation.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.tangem.tap.features.wallet.ui.images
-
-import android.graphics.Bitmap
-import android.graphics.BitmapShader
-import android.graphics.Matrix
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.Shader
-import androidx.annotation.Px
-import androidx.core.graphics.applyCanvas
-import coil.size.Size
-import coil.size.pxOrElse
-import coil.transform.Transformation
-
-class RoundedCornersCropTransformation(
-    @Px val radiusPx: Float,
-) : Transformation {
-    override val cacheKey: String = "${javaClass.name}-$radiusPx"
-
-    override suspend fun transform(input: Bitmap, size: Size): Bitmap {
-        val outputWidth = size.width.pxOrElse { Int.MAX_VALUE }
-        val outputHeight = size.height.pxOrElse { Int.MAX_VALUE }
-        val outputSize = minOf(outputWidth, outputHeight)
-        val output = Bitmap.createBitmap(outputSize, outputSize, Bitmap.Config.ARGB_8888)
-
-        val rect = RectF(
-            /* left = */ 0f,
-            /* top = */ 0f,
-            /* right = */ outputWidth.toFloat(),
-            /* bottom = */ outputHeight.toFloat()
-        )
-        val matrix = Matrix().apply {
-            setTranslate(
-                /* dx = */ (outputWidth - input.width) * .5f,
-                /* dy = */ (outputHeight - input.height) * .5f
-            )
-        }
-        val bitmapShader = BitmapShader(
-            /* bitmap = */ input,
-            /* tileX = */ Shader.TileMode.DECAL,
-            /* tileY = */ Shader.TileMode.DECAL
-        ).apply {
-            setLocalMatrix(matrix)
-        }
-        val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG).apply {
-            shader = bitmapShader
-        }
-
-        return output.applyCanvas {
-            drawRoundRect(
-                /* rect = */ rect,
-                /* rx = */ radiusPx,
-                /* ry = */ radiusPx,
-                /* paint = */ paint
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWallet.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWallet.kt
new file mode 100644
index 0000000000..5b3dab3e8b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWallet.kt
@@ -0,0 +1,160 @@
+package com.tangem.tap.features.wallet.ui.test
+
+import com.tangem.blockchain.common.Amount
+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.TestAction
+import com.tangem.tap.common.TestActions
+import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.store
+import java.math.BigDecimal
+import kotlin.random.Random
+
+/**
+[REDACTED_AUTHOR]
+ */
+object TestWallet {
+    fun solanaRentExemptWarning(): List<TestAction> {
+        val checker = SolanaRentWarningActionEmitter()
+        return listOf(
+            "BALANCE = 0.0" to { checker.setZeroBalance() },
+            "BALANCE < 0.00089088" to { checker.setLessThanRentExempt() },
+            "BALANCE > 0.00089088" to { checker.setMoreThanRentExempt() },
+            "BALANCE = 0.00089087" to { checker.setLessThanRentExemptByOne() },
+            "BALANCE = 0.00089088 (rent exempt)" to { checker.setForRentExemptBarrier() },
+            "BALANCE = 0.00089089" to { checker.setMoreThanRentExemptByOne() },
+        )
+    }
+
+    fun getBlockchainBalanceActions(blockchainNetwork: BlockchainNetwork): List<TestAction> {
+        return getBlockchainBalanceActions(
+            getWalletManager(blockchainNetwork),
+            blockchainNetwork.blockchain.decimals(),
+        )
+    }
+
+    fun getTokenBalanceAction(blockchainNetwork: BlockchainNetwork, token: Token): List<TestAction> {
+        return getTokenBalanceAction(getWalletManager(blockchainNetwork), token)
+    }
+
+    fun getBlockchainBalanceActions(walletManager: WalletManager?, decimals: Int): List<TestAction> {
+        val minValue = BigDecimal.ONE.movePointLeft(decimals)
+        val averageValue = BigDecimal.ONE.movePointRight(decimals)
+            .divide(BigDecimal(2)).movePointLeft(decimals)
+        val maxValue = BigDecimal(2).pow(32)
+
+        return listOf(
+            "0.0" to { setBalance(walletManager, BigDecimal.ZERO) },
+            "Min value" to { setBalance(walletManager, minValue) },
+            "Average value" to { setBalance(walletManager, averageValue) },
+            "Max value" to { setBalance(walletManager, maxValue) },
+            "1234567890123.01234567890123" to { setBalance(walletManager, BigDecimal.ZERO) },
+        )
+    }
+
+    fun getTokenBalanceAction(walletManager: WalletManager?, token: Token): List<TestAction> {
+        val minValue = BigDecimal.ONE.movePointLeft(token.decimals)
+        val averageValue = BigDecimal.ONE.movePointRight(token.decimals)
+            .divide(BigDecimal(2)).movePointLeft(token.decimals)
+        val maxValue = BigDecimal(2).pow(32)
+
+        return listOf(
+            "0.0" to { setTokenBalance(walletManager, BigDecimal.ZERO, token) },
+            "Min value" to { setTokenBalance(walletManager, minValue, token) },
+            "Average value" to { setTokenBalance(walletManager, averageValue, token) },
+            "Max value" to { setTokenBalance(walletManager, maxValue, token) },
+            "1234567890123.01234567890123" to { setTokenBalance(walletManager, BigDecimal.ZERO, token) },
+        )
+    }
+
+    fun setBalance(walletManager: WalletManager?, value: BigDecimal) {
+        val manager = walletManager.guard {
+            store.dispatchDebugErrorNotification("WalletManager not found")
+            return
+        }
+        val amount = manager.wallet.amounts[AmountType.Coin] ?: Amount(manager.wallet.blockchain)
+        setBalance(manager, amount, value)
+    }
+
+    private fun setTokenBalance(walletManager: WalletManager?, value: BigDecimal, token: Token? = null) {
+        val manager = walletManager.guard {
+            store.dispatchDebugErrorNotification("WalletManager not found")
+            return
+        }
+        val token = token.guard {
+            store.dispatchDebugErrorNotification("Token not found")
+            return
+        }
+
+        val amount = manager.wallet.amounts[AmountType.Token(token)] ?: Amount(token)
+        setBalance(manager, amount, value)
+    }
+
+    private fun setBalance(walletManager: WalletManager, amount: Amount, value: BigDecimal) {
+        TestActions.testAmountInjectionForWalletManagerEnabled = true
+        walletManager.wallet.setAmount(amount.copy(value = value))
+        store.dispatch(WalletAction.LoadData)
+    }
+
+    private fun getWalletManager(blockchainNetwork: BlockchainNetwork): WalletManager? {
+        return store.state.walletState.getWalletManager(blockchainNetwork)
+    }
+}
+
+private class SolanaRentWarningActionEmitter {
+
+    private val zero = BigDecimal.ZERO
+    private val one = BigDecimal(0.00000001)
+    private val rentExemptBarrier = BigDecimal(0.00089088)
+    private val lessThanRentExemptByOne = rentExemptBarrier.minus(one)
+    private val moreThanRentExemptByOne = rentExemptBarrier.plus(one)
+    private val moreThanRentExempt = rentExemptBarrier.plus(Random.nextDouble().toBigDecimal())
+    private val lessThanRentExempt = rentExemptBarrier
+        .minus(Random.nextDouble(0.0, rentExemptBarrier.minus(one).toDouble()).toBigDecimal())
+
+    fun setZeroBalance() {
+        setBalance(zero)
+    }
+
+    fun setForRentExemptBarrier() {
+        setBalance(rentExemptBarrier)
+    }
+
+    fun setLessThanRentExemptByOne() {
+        setBalance(lessThanRentExemptByOne)
+    }
+
+    fun setMoreThanRentExemptByOne() {
+        setBalance(moreThanRentExemptByOne)
+    }
+
+    fun setMoreThanRentExempt() {
+        setBalance(moreThanRentExempt)
+    }
+
+    fun setLessThanRentExempt() {
+        setBalance(lessThanRentExempt)
+    }
+
+    private fun setBalance(value: BigDecimal) {
+        val amount = Amount(getBlockchainNetwork().blockchain).copy(value = value)
+        getWalletManager().apply {
+            TestActions.testAmountInjectionForWalletManagerEnabled = true
+            wallet.setAmount(amount)
+        }
+        store.dispatch(WalletAction.LoadData)
+    }
+
+    private fun getWalletManager(): WalletManager {
+        return store.state.walletState.getWalletManager(getBlockchainNetwork())!!
+    }
+
+    private fun getBlockchainNetwork(): BlockchainNetwork {
+        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/test/TestWalletDetailsActions.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWalletDetailsActions.kt
deleted file mode 100644
index 4f384d33f7..0000000000
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWalletDetailsActions.kt
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.tangem.tap.features.wallet.ui.test
-
-import com.tangem.blockchain.common.Amount
-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.TestAction
-import com.tangem.tap.common.TestActions
-import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
-import com.tangem.tap.domain.tokens.models.BlockchainNetwork
-import com.tangem.tap.features.wallet.redux.WalletAction
-import com.tangem.tap.store
-import java.math.BigDecimal
-import kotlin.random.Random
-
-/**
-[REDACTED_AUTHOR]
- */
-class TestWallet {
-    companion object {
-        fun solanaRentExemptWarning(): List<TestAction> {
-            val checker = SolanaRentWarningActionEmitter()
-            return listOf(
-                "BALANCE = 0.0" to { checker.setZeroBalance() },
-                "BALANCE < 0.00089088" to { checker.setLessThanRentExempt() },
-                "BALANCE > 0.00089088" to { checker.setMoreThanRentExempt() },
-                "BALANCE = 0.00089087" to { checker.setLessThanRentExemptByOne() },
-                "BALANCE = 0.00089088 (rent exempt)" to { checker.setForRentExemptBarrier() },
-                "BALANCE = 0.00089089" to { checker.setMoreThanRentExemptByOne() },
-            )
-        }
-
-        fun getBlockchainBalanceActions(blockchainNetwork: BlockchainNetwork): List<TestAction> {
-            return getBlockchainBalanceActions(
-                getWalletManager(blockchainNetwork),
-                blockchainNetwork.blockchain.decimals(),
-            )
-        }
-
-        fun getTokenBalanceAction(blockchainNetwork: BlockchainNetwork, token: Token): List<TestAction> {
-            return getTokenBalanceAction(getWalletManager(blockchainNetwork), token)
-        }
-
-        fun getBlockchainBalanceActions(walletManager: WalletManager?, decimals: Int): List<TestAction> {
-            val minValue = BigDecimal.ONE.movePointLeft(decimals)
-            val averageValue = BigDecimal.ONE.movePointRight(decimals)
-                .divide(BigDecimal(2)).movePointLeft(decimals)
-            val maxValue = BigDecimal(2).pow(32)
-
-            return listOf(
-                "0.0" to { setBalance(walletManager, BigDecimal.ZERO) },
-                "Min value" to { setBalance(walletManager, minValue) },
-                "Average value" to { setBalance(walletManager, averageValue) },
-                "Max value" to { setBalance(walletManager, maxValue) },
-                "1234567890123.01234567890123" to { setBalance(walletManager, BigDecimal.ZERO) },
-            )
-        }
-
-        fun getTokenBalanceAction(walletManager: WalletManager?, token: Token): List<TestAction> {
-            val minValue = BigDecimal.ONE.movePointLeft(token.decimals)
-            val averageValue = BigDecimal.ONE.movePointRight(token.decimals)
-                .divide(BigDecimal(2)).movePointLeft(token.decimals)
-            val maxValue = BigDecimal(2).pow(32)
-
-            return listOf(
-                "0.0" to { setTokenBalance(walletManager, BigDecimal.ZERO, token) },
-                "Min value" to { setTokenBalance(walletManager, minValue, token) },
-                "Average value" to { setTokenBalance(walletManager, averageValue, token) },
-                "Max value" to { setTokenBalance(walletManager, maxValue, token) },
-                "1234567890123.01234567890123" to { setTokenBalance(walletManager, BigDecimal.ZERO, token) },
-            )
-        }
-
-        fun setBalance(walletManager: WalletManager?, value: BigDecimal) {
-            val manager = walletManager.guard {
-                store.dispatchDebugErrorNotification("WalletManager not found")
-                return
-            }
-            val amount = manager.wallet.amounts[AmountType.Coin] ?: Amount(manager.wallet.blockchain)
-            setBalance(manager, amount, value)
-        }
-
-        private fun setTokenBalance(walletManager: WalletManager?, value: BigDecimal, token: Token? = null) {
-            val manager = walletManager.guard {
-                store.dispatchDebugErrorNotification("WalletManager not found")
-                return
-            }
-            val token = token.guard {
-                store.dispatchDebugErrorNotification("Token not found")
-                return
-            }
-
-            val amount = manager.wallet.amounts[AmountType.Token(token)] ?: Amount(token)
-            setBalance(manager, amount, value)
-        }
-
-        private fun setBalance(walletManager: WalletManager, amount: Amount, value: BigDecimal) {
-            TestActions.testAmountInjectionForWalletManagerEnabled = true
-            walletManager.wallet.setAmount(amount.copy(value = value))
-            store.dispatch(WalletAction.LoadData)
-        }
-
-        private fun getWalletManager(blockchainNetwork: BlockchainNetwork): WalletManager? {
-            return store.state.walletState.getWalletManager(blockchainNetwork)
-        }
-    }
-}
-
-private class SolanaRentWarningActionEmitter {
-
-    private val zero = BigDecimal.ZERO
-    private val one = BigDecimal(0.00000001)
-    private val rentExemptBarrier = BigDecimal(0.00089088)
-    private val lessThanRentExemptByOne = rentExemptBarrier.minus(one)
-    private val moreThanRentExemptByOne = rentExemptBarrier.plus(one)
-    private val moreThanRentExempt = rentExemptBarrier.plus(Random.nextDouble().toBigDecimal())
-    private val lessThanRentExempt = rentExemptBarrier
-        .minus(Random.nextDouble(0.0, rentExemptBarrier.minus(one).toDouble()).toBigDecimal())
-
-    fun setZeroBalance() {
-        setBalance(zero)
-    }
-
-    fun setForRentExemptBarrier() {
-        setBalance(rentExemptBarrier)
-    }
-
-    fun setLessThanRentExemptByOne() {
-        setBalance(lessThanRentExemptByOne)
-    }
-
-    fun setMoreThanRentExemptByOne() {
-        setBalance(moreThanRentExemptByOne)
-    }
-
-    fun setMoreThanRentExempt() {
-        setBalance(moreThanRentExempt)
-    }
-
-    fun setLessThanRentExempt() {
-        setBalance(lessThanRentExempt)
-    }
-
-    private fun setBalance(value: BigDecimal) {
-        val amount = Amount(getBlockchainNetwork().blockchain).copy(value = value)
-        getWalletManager().apply {
-            TestActions.testAmountInjectionForWalletManagerEnabled = true
-            wallet.setAmount(amount)
-        }
-        store.dispatch(WalletAction.LoadData)
-    }
-
-    private fun getWalletManager(): WalletManager {
-        return store.state.walletState.getWalletManager(getBlockchainNetwork())!!
-    }
-
-    private fun getBlockchainNetwork(): BlockchainNetwork {
-        val currency = store.state.walletState.getSelectedWalletData()!!.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/view/WalletDetailsButtonsRow.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt
index 582b5f178c..30d48309a8 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt
@@ -2,9 +2,14 @@ package com.tangem.tap.features.wallet.ui.view
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import androidx.core.view.isVisible
+import com.google.android.material.button.MaterialButton
+import com.tangem.tap.common.extensions.hide
+import com.tangem.tap.common.extensions.show
+import com.tangem.tap.features.wallet.redux.CurrencyAction
 import com.tangem.wallet.databinding.ViewWalletDetailsButtonsRowBinding
 
 internal class WalletDetailsButtonsRow @JvmOverloads constructor(
@@ -19,6 +24,7 @@ internal class WalletDetailsButtonsRow @JvmOverloads constructor(
     var onBuyClick: (() -> Unit)? = null
     var onSellClick: (() -> Unit)? = null
     var onTradeClick: (() -> Unit)? = null
+    var onSwapClick: (() -> Unit)? = null
     var onSendClick: (() -> Unit)? = null
 
     init {
@@ -27,23 +33,45 @@ internal class WalletDetailsButtonsRow @JvmOverloads constructor(
         with(binding) {
             btnBuy.setOnClickListener { onBuyClick?.invoke() }
             btnSell.setOnClickListener { onSellClick?.invoke() }
+            btnSwap.setOnClickListener { onSwapClick?.invoke() }
             btnTrade.setOnClickListener { onTradeClick?.invoke() }
             btnSend.setOnClickListener { onSendClick?.invoke() }
         }
     }
 
     fun updateButtonsVisibility(
+        actions: Set<CurrencyAction>,
         exchangeServiceFeatureOn: Boolean,
-        buyAllowed: Boolean,
-        sellAllowed: Boolean,
-        sendAllowed: Boolean,
+        sendAllowed: Boolean
     ) = with(binding) {
-        containerExchangeButtons.isVisible = exchangeServiceFeatureOn
+        containerActionButtons.isVisible = exchangeServiceFeatureOn
 
-        btnBuy.isVisible = (buyAllowed && !sellAllowed) || (!buyAllowed && !sellAllowed)
-        btnBuy.isEnabled = buyAllowed
-        btnSell.isVisible = !buyAllowed && sellAllowed
-        btnTrade.isVisible = buyAllowed && sellAllowed
+        when {
+            actions.isEmpty() -> {
+                containerActionButtons.hide()
+            }
+            actions.size == 1 -> {
+                val action = actions.first()
+                btnTrade.hide()
+                btnBuy.show(action == CurrencyAction.Buy)
+                btnSell.show(action == CurrencyAction.Sell)
+                btnSwap.show(action == CurrencyAction.Swap)
+            }
+            else -> {
+                btnBuy.hide()
+                btnSell.hide()
+                btnSwap.hide()
+                btnTrade.show()
+            }
+        }
+
+        if (containerActionButtons.isVisible) {
+            btnSend.gravity = Gravity.START or Gravity.CENTER_VERTICAL
+            btnSend.iconGravity = MaterialButton.ICON_GRAVITY_END
+        } else {
+            btnSend.gravity = Gravity.CENTER
+            btnSend.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_END
+        }
         btnSend.isEnabled = sendAllowed
     }
 }
\ 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..00bd560d80 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,14 @@ 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.core.analytics.Analytics
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.tap.common.analytics.events.MainScreen
+import com.tangem.tap.common.analytics.events.ManageTokens
+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 +36,50 @@ 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(
+                    binding = it,
+                    totalBalance = walletState.totalBalance,
+                    progressState = walletState.state,
+                    walletsCount = walletState.walletsDataFromStores.size,
+                )
+            }
+        }
+    }
+
     override fun changeWalletView(fragment: WalletFragment, binding: FragmentWalletBinding) {
         setFragment(fragment, binding)
         onViewCreated()
@@ -38,26 +87,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 +109,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,21 +133,34 @@ class MultiWalletView : WalletView() {
             store.dispatch(TokensAction.AllowToAddTokens(true))
             store.dispatch(
                 TokensAction.SetAddedCurrencies(
-                    wallets = state.walletsData,
+                    wallets = state.walletsDataFromStores,
                     derivationStyle = card.derivationStyle,
                 ),
             )
+
+            Analytics.send(ManageTokens.ScreenOpened())
             store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
         }
         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 +171,7 @@ class MultiWalletView : WalletView() {
     ) = with(binding.lWalletRescanWarning) {
         root.isVisible = showRescanWarning
         root.setOnClickListener {
+            Analytics.send(MainScreen.NoticeScanYourCardTapped())
             store.dispatch(WalletAction.MultiWallet.ScanToGetDerivations)
         }
     }
@@ -129,28 +179,38 @@ 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()
+        if (walletsCount == 0) {
+            root.isVisible = false
+        } else {
+            if (totalBalance == null) {
+                if (progressState != ProgressState.Loading) {
+                    root.isVisible = false
+                }
             } else {
-                veilBalance.unVeil()
-            }
-            tvProcessing.animateVisibility(
-                show = totalBalance.state == ProgressState.Error,
-            )
+                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)
+                }
             }
         }
     }
@@ -182,7 +242,9 @@ class MultiWalletView : WalletView() {
     }
 
     private fun showErrorState(
-        binding: FragmentWalletBinding, errorTitle: CharSequence, errorDescription: CharSequence,
+        binding: FragmentWalletBinding,
+        errorTitle: CharSequence,
+        errorDescription: CharSequence,
     ) = with(binding) {
         lCardBalance.root.show()
         with(lCardBalance) {
@@ -205,6 +267,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/SaltPayBalanceWidget.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPayBalanceWidget.kt
index 49fcb89c16..33a0923029 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPayBalanceWidget.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPayBalanceWidget.kt
@@ -24,7 +24,7 @@ class SaltPayBalanceWidget(
     private val binding: LayoutSingleWalletBalanceBinding,
     private val data: SaltPayBalanceWidgetData,
 ) {
-    fun setup(): Unit = with(binding) {
+    fun setup() = with(binding) {
         if (data.state == ProgressState.Loading) {
             veilBalance.veil()
             veilBalanceCrypto.veil()
@@ -39,13 +39,13 @@ class SaltPayBalanceWidget(
             show = data.state != ProgressState.Error,
         )
         if (data.fiatAmount == null) {
-            //TODO: SaltPay: A tricky solution to the problem with displaying rates
+            // TODO: SaltPay: A tricky solution to the problem with displaying rates
             // If the rates are loaded after the walletManager.update() is completely updated,
             // then this problem can be avoided
             actionDebouncer(WalletAction.LoadFiatRate())
         } else {
             veilBalance.unVeil()
-            tvBalance.text = data.fiatAmount?.formatAmountAsSpannedString(
+            tvBalance.text = data.fiatAmount.formatAmountAsSpannedString(
                 currencySymbol = data.fiatCurrency?.symbol ?: "",
             )
         }
@@ -60,5 +60,4 @@ class SaltPayBalanceWidget(
     }
 }
 
-private val actionDebouncer = debounce<Action>(500, mainScope) { store.dispatch(it) }
-
+private val actionDebouncer = debounce<Action>(500, mainScope) { store.dispatch(it) }
\ No newline at end of file
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..729d32c279 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,15 +3,16 @@ 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
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.PendingTransaction
+import com.tangem.tap.features.wallet.models.PendingTransactionType
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletData
 import com.tangem.tap.features.wallet.redux.WalletMainButton
@@ -34,13 +35,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,14 +67,17 @@ 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)
     }
 
     private fun showPendingTransactionsIfPresent(pendingTransactions: List<PendingTransaction>) {
-        pendingTransactionAdapter.submitList(pendingTransactions)
-        binding?.rvPendingTransaction?.show(pendingTransactions.isNotEmpty())
+        val knownTransactions = pendingTransactions.filterNot {
+            it.type == PendingTransactionType.Unknown
+        }
+        pendingTransactionAdapter.submitList(knownTransactions)
+        binding?.rvPendingTransaction?.show(knownTransactions.isNotEmpty())
     }
 
     private fun setupBalance(state: WalletState, primaryWallet: WalletData) {
@@ -123,17 +132,34 @@ class SingleWalletView : WalletView() {
         rowButtons: WalletDetailsButtonsRow,
         isExchangeServiceFeatureEnabled: Boolean,
     ) {
-        rowButtons.updateButtonsVisibility(
+        val swapInteractor = this.swapInteractor ?: return
+
+        val exchangeManager = store.state.globalState.exchangeManager
+        binding?.rowButtons?.apply {
+            onBuyClick = { store.dispatch(WalletAction.TradeCryptoAction.Buy()) }
+            onSellClick = { store.dispatch(WalletAction.TradeCryptoAction.Sell) }
+            onSwapClick = { store.dispatch(WalletAction.TradeCryptoAction.Swap) }
+            onTradeClick = {
+                store.dispatch(
+                    WalletAction.DialogAction.ChooseTradeActionDialog(
+                        buyAllowed = walletData.isAvailableToBuy(exchangeManager),
+                        sellAllowed = walletData.isAvailableToSell(exchangeManager),
+                        swapAllowed = walletData.isAvailableToSwap(swapInteractor, isExchangeServiceFeatureEnabled),
+                    ),
+                )
+            }
+        }
+        val actions = walletData.getAvailableActions(
+            swapInteractor = swapInteractor,
+            exchangeManager = exchangeManager,
+            isExchangeFeatureOn = isExchangeServiceFeatureEnabled,
+        )
+        binding?.rowButtons?.updateButtonsVisibility(
+            actions = actions,
             exchangeServiceFeatureOn = isExchangeServiceFeatureEnabled,
-            buyAllowed = walletData.isAvailableToBuy,
-            sellAllowed = walletData.isAvailableToSell,
             sendAllowed = walletData.mainButton.enabled,
         )
 
-        rowButtons.onBuyClick = { store.dispatch(WalletAction.TradeCryptoAction.Buy()) }
-        rowButtons.onSendClick = { store.dispatch(WalletAction.TradeCryptoAction.Sell) }
-        rowButtons.onTradeClick = { store.dispatch(WalletAction.DialogAction.ChooseTradeActionDialog) }
-
         rowButtons.onSendClick = {
             when (walletData.mainButton) {
                 is WalletMainButton.SendButton -> store.dispatch(WalletAction.Send())
@@ -142,37 +168,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..393f1ea97d 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
@@ -1,10 +1,13 @@
 package com.tangem.tap.features.wallet.ui.wallet
 
+import com.tangem.feature.swap.domain.SwapInteractor
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.features.wallet.ui.WalletFragment
 import com.tangem.wallet.databinding.FragmentWalletBinding
 
 abstract class WalletView {
+    var swapInteractor: SwapInteractor? = null
+
     protected var fragment: WalletFragment? = null
     protected var binding: FragmentWalletBinding? = null
     fun setFragment(fragment: WalletFragment, binding: FragmentWalletBinding) {
@@ -17,6 +20,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..4e8b5ec2d6
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorAction.kt
@@ -0,0 +1,59 @@
+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 BalancesLoaded(
+        val userWalletModels: List<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
+
+    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..33e8bcae4b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
@@ -0,0 +1,386 @@
+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.core.analytics.Analytics
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.analytics.events.MyWallets
+import com.tangem.tap.common.analytics.paramsInterceptor.BatchIdParamsInterceptor
+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.model.builders.UserWalletIdBuilder
+import com.tangem.tap.domain.scanCard.ScanCardProcessor
+import com.tangem.tap.features.onboarding.products.wallet.saltPay.message.SaltPayActivationError
+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.userTokensRepository
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletStoresManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import org.rekotlin.Middleware
+import timber.log.Timber
+
+// Refactoring is coming
+@Suppress("LargeClass")
+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.BalancesLoaded,
+            is WalletSelectorAction.IsLockedChanged,
+            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")
+                }
+        }
+    }
+
+    private fun updateBalances(
+        updatedWalletStores: Map<UserWalletId, List<WalletStoreModel>>,
+        state: WalletSelectorState,
+    ) {
+        if (updatedWalletStores.isNotEmpty()) {
+            scope.launch(Dispatchers.Default) {
+                val updatedWallets = state.wallets.updateWalletStoresAndCalculateFiatBalance(updatedWalletStores)
+                if (updatedWallets != state.wallets) {
+                    store.dispatchOnMain(WalletSelectorAction.BalancesLoaded(updatedWallets))
+                }
+            }
+        }
+    }
+
+    private fun unlockWalletsWithBiometry() {
+        Analytics.send(MyWallets.Button.UnlockWithBiometrics())
+
+        scope.launch {
+            userWalletsListManager.unlockWithBiometry()
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to unlock all user wallets")
+                    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(
+            analyticsEvent = MyWallets.CardWasScanned(),
+            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))
+            },
+            disclaimerWillShow = {
+                store.dispatchOnMain(NavigationAction.PopBackTo())
+            },
+            onSuccess = { scanResponse ->
+                saveUserWalletAndPopBackToWalletScreen(scanResponse)
+                    .doOnFailure { error ->
+                        // Rollback policy if card saving was failed
+                        tangemSdkManager.setAccessCodeRequestPolicy(prevUseBiometricsForAccessCode)
+                        Timber.e(error, "Unable to save user wallet")
+                        store.dispatchOnMain(WalletSelectorAction.AddWallet.Error(error))
+                    }
+            },
+            onFailure = { error ->
+                // Rollback policy if card scanning was failed
+                tangemSdkManager.setAccessCodeRequestPolicy(prevUseBiometricsForAccessCode)
+                when {
+                    error is TangemSdkError.ExceptionError && error.cause is SaltPayActivationError -> {
+                        store.dispatchOnMain(WalletSelectorAction.AddWallet.Success)
+                        store.dispatchOnMain(NavigationAction.PopBackTo())
+                    }
+                    else -> {
+                        Timber.e(error, "Unable to scan card")
+                        store.dispatchOnMain(WalletSelectorAction.AddWallet.Error(error))
+                    }
+                }
+            },
+        )
+    }
+
+    private suspend fun saveUserWalletAndPopBackToWalletScreen(scanResponse: ScanResponse): CompletionResult<Unit> {
+        val userWallet = UserWalletBuilder(scanResponse).build()
+            ?: return CompletionResult.Failure(TangemSdkError.WalletIsNotCreated())
+
+        return userWalletsListManager.save(userWallet)
+            .doOnSuccess {
+                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 ->
+                    Timber.e(
+                        error,
+                        """
+                            Unable to select user wallet
+                            |- Wallet ID to select: $userWalletId
+                        """.trimIndent(),
+                    )
+                }
+                .doOnSuccess {
+                    val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+                    if (selectedUserWallet != null) {
+                        val batchId = selectedUserWallet.scanResponse.card.batchId
+                        Analytics.addParamsInterceptor(BatchIdParamsInterceptor(batchId))
+
+                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                        store.onUserWalletSelected(selectedUserWallet)
+                    }
+                }
+        }
+    }
+
+    private suspend fun unlockUserWalletWithScannedCard(userWallet: UserWallet): CompletionResult<Unit> {
+        Analytics.send(MyWallets.Button.WalletUnlockTapped())
+        tangemSdkManager.changeDisplayedCardIdNumbersCount(userWallet.scanResponse)
+        return tangemSdkManager.scanProduct(userTokensRepository)
+            .map { scanResponse ->
+                val scannedUserWalletId = UserWalletIdBuilder.scanResponse(scanResponse).build()
+                if (scannedUserWalletId == userWallet.walletId) {
+                    userWallet.updateCardWallets(scanResponse)
+                } else {
+                    // TODO: Display error
+                    Timber.e(
+                        """
+                            Unable to unlock and select user wallet
+                            |- Excepted ID: ${userWallet.walletId}
+                            |- Received ID: $scannedUserWalletId
+                        """.trimIndent(),
+                    )
+                    error("Wrong card")
+                }
+            }
+            .flatMap { updatedUserWallet ->
+                userWalletsListManager.save(updatedUserWallet, canOverride = true)
+            }
+            .doOnFailure {
+                tangemSdkManager.changeDisplayedCardIdNumbersCount(
+                    scanResponse = userWalletsListManager.selectedUserWalletSync?.scanResponse,
+                )
+            }
+    }
+
+    private fun UserWallet.updateCardWallets(scanResponse: ScanResponse): UserWallet {
+        return this.copy(
+            scanResponse = this.scanResponse.copy(
+                card = this.scanResponse.card.copy(
+                    wallets = scanResponse.card.wallets,
+                ),
+            ),
+        )
+    }
+
+    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 ->
+                    Timber.e(
+                        error,
+                        """
+                            Unable to delete user wallets
+                            |- Wallets IDs to delete: $userWalletsIds
+                            |- Current wallets IDs: ${state.wallets.map { it.id }}
+                        """.trimIndent(),
+                    )
+                }
+        }
+    }
+
+    private fun renameWallet(userWalletId: UserWalletId, newName: String) {
+        scope.launch {
+            userWalletsListManager.update(userWalletId) { it.copy(name = newName) }
+                .doOnFailure { error ->
+                    Timber.e(
+                        error,
+                        """
+                            Unable to rename user wallet
+                            |- Wallet ID: $userWalletId
+                            |- New name: $newName
+                        """.trimIndent(),
+                    )
+                }
+        }
+    }
+
+    private fun refreshUserWalletsAmounts() {
+        scope.launch {
+            walletStoresManager.updateAmounts(
+                userWallets = userWalletsListManager.userWallets.firstOrNull().orEmpty(),
+            )
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to refresh user wallets amounts")
+                }
+        }
+    }
+
+    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 List<UserWalletModel>.updateWalletStoresAndCalculateFiatBalance(
+        walletStores: Map<UserWalletId, List<WalletStoreModel>>,
+    ): List<UserWalletModel> {
+        return this
+            .associateWith { walletStores[it.id] }
+            .map { (wallet, walletStores) ->
+                wallet.updateWalletStoresAndCalculateFiatBalance(walletStores)
+            }
+    }
+
+    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 ?: 0,
+                )
+                is UserWalletModel.Type.SingleCurrency -> type
+            },
+            fiatBalance = totalFiatBalanceCalculator.calculate(
+                walletStores = walletStores.orEmpty(),
+                initial = TotalFiatBalance.Loading,
+            ),
+        )
+    }
+}
\ 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..e965a29794
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt
@@ -0,0 +1,102 @@
+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
+    }
+
+    @Suppress("ComplexMethod")
+    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.BalancesLoaded -> state.copy(
+                wallets = action.userWalletModels,
+            )
+            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 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.cardTypesResolver.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..5d18c5baa9
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/Mapper.kt
@@ -0,0 +1,83 @@
+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
+import java.math.BigDecimal
+
+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 formatAmount = { amount: BigDecimal ->
+                amount.toFormattedFiatValue(appCurrency.symbol)
+            }
+            val balance = when (fiatBalance) {
+                is TotalFiatBalance.Error -> UserWalletItem.Balance.Error(formatAmount(fiatBalance.amount))
+                is TotalFiatBalance.Loaded -> UserWalletItem.Balance.Loaded(formatAmount(fiatBalance.amount))
+                is TotalFiatBalance.Loading -> UserWalletItem.Balance.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..30eb4cb1fb
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorBottomSheetFragment.kt
@@ -0,0 +1,94 @@
+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.analytics.Analytics
+import com.tangem.core.ui.fragments.ComposeBottomSheetFragment
+import com.tangem.core.ui.res.TangemTheme
+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.RemoveWalletDialogContent
+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.DialogModel
+
+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(state: WalletSelectorScreenState, modifier: Modifier) {
+        val snackbarHostState = remember { SnackbarHostState() }
+        val errorMessage by rememberUpdatedState(newValue = state.error?.resolveReference())
+        val dialog by rememberUpdatedState(newValue = state.dialog)
+
+        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,
+            )
+        }
+
+        Dialog(dialog = dialog)
+
+        LaunchedEffect(key1 = errorMessage) {
+            errorMessage?.let {
+                snackbarHostState.showSnackbar(it)
+                viewModel.closeError()
+            }
+        }
+    }
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    private fun Dialog(dialog: DialogModel?) {
+        if (dialog == null) return
+        when (dialog) {
+            is DialogModel.RemoveWalletDialog -> RemoveWalletDialogContent(dialog)
+            is DialogModel.RenameWalletDialog -> RenameWalletDialogContent(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..b2da2e5b5f
--- /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.DialogModel
+import com.tangem.tap.features.walletSelector.ui.model.MultiCurrencyUserWalletItem
+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 dialog: DialogModel? = 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..21313550f3
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorViewModel.kt
@@ -0,0 +1,207 @@
+package com.tangem.tap.features.walletSelector.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tangem.core.analytics.Analytics
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.analytics.events.MyWallets
+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.DialogModel
+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() && dialog == null) {
+            val editedUserWalletId = editingUserWalletsIds.first()
+            val editedUserWallet = (multiCurrencyWallets + singleCurrencyWallets)
+                .find { it.id == editedUserWalletId }
+
+            if (editedUserWallet != null) {
+                Analytics.send(MyWallets.Button.EditWalletTapped())
+                val dialog = DialogModel.RenameWalletDialog(
+                    currentName = editedUserWallet.name,
+                    onConfirm = { newName ->
+                        store.dispatch(WalletSelectorAction.RenameWallet(editedUserWalletId, newName))
+                        stateInternal.update { prevState ->
+                            prevState.copy(
+                                dialog = null,
+                                editingUserWalletsIds = emptyList(),
+                            )
+                        }
+                    },
+                    onDismiss = {
+                        stateInternal.update { prevState ->
+                            prevState.copy(
+                                dialog = null,
+                            )
+                        }
+                    },
+                )
+
+                stateInternal.update { prevState ->
+                    prevState.copy(
+                        dialog = dialog,
+                    )
+                }
+            }
+        }
+    }
+
+    fun deleteWallets() = with(state.value) {
+        if (editingUserWalletsIds.isNotEmpty()) {
+            val dialog = DialogModel.RemoveWalletDialog(
+                onConfirm = {
+                    store.dispatch(WalletSelectorAction.RemoveWallets(editingUserWalletsIds))
+                    stateInternal.update { prevState ->
+                        prevState.copy(
+                            dialog = null,
+                            editingUserWalletsIds = emptyList(),
+                        )
+                    }
+                },
+                onDismiss = {
+                    stateInternal.update { prevState ->
+                        prevState.copy(
+                            dialog = null,
+                        )
+                    }
+                },
+            )
+
+            stateInternal.update { prevState ->
+                prevState.copy(
+                    dialog = dialog,
+                )
+            }
+        }
+    }
+
+    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..db09868d03
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/MockData.kt
@@ -0,0 +1,43 @@
+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.Loaded(
+            amount = "6781.05 $",
+        ),
+        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.Loaded(
+            amount = "6781.05 $",
+        ),
+        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/RemoveWalletDialogContent.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/RemoveWalletDialogContent.kt
new file mode 100644
index 0000000000..cedbb48278
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/RemoveWalletDialogContent.kt
@@ -0,0 +1,24 @@
+package com.tangem.tap.features.walletSelector.ui.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import com.tangem.core.ui.components.BasicDialog
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.tap.features.walletSelector.ui.model.DialogModel
+import com.tangem.wallet.R
+
+@Composable
+internal fun RemoveWalletDialogContent(dialog: DialogModel.RemoveWalletDialog) {
+    BasicDialog(
+        message = stringResource(id = R.string.user_wallet_list_delete_prompt),
+        confirmButton = DialogButton(
+            title = stringResource(id = R.string.common_delete),
+            warning = true,
+            onClick = dialog.onConfirm,
+        ),
+        dismissButton = DialogButton(
+            onClick = dialog.onDismiss,
+        ),
+        onDismissDialog = dialog.onDismiss,
+    )
+}
\ 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..97d465df54
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/RenameWalletDialogContent.kt
@@ -0,0 +1,75 @@
+package com.tangem.tap.features.walletSelector.ui.components
+
+import androidx.compose.foundation.layout.Column
+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 com.tangem.core.ui.components.AdditionalTextInputDialogParams
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.core.ui.components.TextInputDialog
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.walletSelector.ui.model.DialogModel
+import com.tangem.wallet.R
+
+@Composable
+internal fun RenameWalletDialogContent(dialog: DialogModel.RenameWalletDialog) {
+    var value by remember {
+        mutableStateOf(TextFieldValue(text = dialog.currentName))
+    }
+
+    TextInputDialog(
+        fieldValue = value,
+        confirmButton = DialogButton(
+            title = stringResource(id = R.string.common_save),
+            enabled = value.text.isNotEmpty() && value.text != dialog.currentName,
+            onClick = { dialog.onConfirm(value.text) },
+        ),
+        onDismissDialog = dialog.onDismiss,
+        onValueChange = { newValue ->
+            value = newValue
+        },
+        title = stringResource(R.string.user_wallet_list_rename_popup_title),
+        dismissButton = DialogButton(
+            title = stringResource(id = R.string.common_cancel),
+            onClick = dialog.onDismiss,
+        ),
+        textFieldParams = AdditionalTextInputDialogParams(
+            label = stringResource(R.string.user_wallet_list_rename_popup_placeholder),
+        ),
+    )
+}
+
+// region Preview
+@Composable
+private fun RenameWalletDialogContentSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+    ) {
+        RenameWalletDialogContent(dialog = DialogModel.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..d10ed293f0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt
@@ -0,0 +1,342 @@
+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
+
+@Suppress("LongParameterList")
+@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(wallet.id) },
+                onWalletLongClick = { onWalletLongClick(wallet.id) },
+            )
+        }
+
+        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(wallet.id) },
+                onWalletLongClick = { onWalletLongClick(wallet.id) },
+            )
+        }
+
+        item {
+            Footer(
+                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(
+                    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(
+    isLocked: Boolean,
+    showUnlockProgress: Boolean,
+    showAddCardProgress: Boolean,
+    onUnlockClick: () -> Unit,
+    onAddCardClick: () -> Unit,
+) {
+    Column(
+        modifier = Modifier
+            .padding(
+                top = dimensionResource(id = R.dimen.spacing24),
+                bottom = dimensionResource(id = R.dimen.spacing16),
+            )
+            .padding(horizontal = TangemTheme.dimens.spacing16)
+            .fillMaxWidth(),
+        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_24),
+            onClick = onAddCardClick,
+        )
+    }
+}
+
+@Composable
+private fun EditWalletsBar(
+    editingWalletsSize: Int,
+    onClearSelectedClick: () -> Unit,
+    onEditSelectedWalletClick: () -> Unit,
+    onDeleteSelectedWalletsClick: () -> Unit,
+) {
+    val showEditAction by remember(editingWalletsSize) {
+        derivedStateOf { editingWalletsSize in 1 until 2 }
+    }
+
+    Row(
+        modifier = Modifier
+            .padding(horizontal = TangemTheme.dimens.spacing16)
+            .fillMaxWidth(),
+        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_24),
+                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..2ce322509d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt
@@ -0,0 +1,363 @@
+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.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: () -> Unit,
+    onWalletLongClick: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .combinedClickable(
+                onClick = onWalletClick,
+                onLongClick = onWalletLongClick,
+            )
+            .heightIn(min = TangemTheme.dimens.size72)
+            .padding(all = TangemTheme.dimens.spacing16),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        WalletCardImage(
+            cardImageUrl = wallet.imageUrl,
+            isChecked = isChecked,
+            isSelected = isSelected,
+        )
+        SpacerW8()
+        WalletInfo(wallet = wallet, isSelected = isSelected)
+        SpacerW6()
+        TokensInfo(
+            isLocked = wallet.isLocked,
+            balance = wallet.balance,
+            tokensCount = (wallet as? MultiCurrencyUserWalletItem)?.tokensCount,
+        )
+    }
+}
+
+@Composable
+private fun WalletCardImage(
+    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 RowScope.WalletInfo(
+    wallet: UserWalletItem,
+    isSelected: Boolean,
+) {
+    Column(
+        modifier = Modifier.weight(weight = .6f),
+        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 RowScope.TokensInfo(
+    isLocked: Boolean,
+    balance: UserWalletItem.Balance,
+    tokensCount: Int?,
+) {
+    Column(
+        modifier = Modifier.weight(weight = .4f),
+        verticalArrangement = Arrangement.SpaceAround,
+        horizontalAlignment = Alignment.End,
+    ) {
+        if (isLocked) {
+            LockedPlaceholder()
+        } else {
+            when (balance) {
+                is UserWalletItem.Balance.Error -> {
+                    LoadedTokensInfo(
+                        balanceAmount = balance.amount,
+                        tokensCount = tokensCount,
+                        showWarning = true,
+                    )
+                }
+                is UserWalletItem.Balance.Loaded -> {
+                    LoadedTokensInfo(
+                        balanceAmount = balance.amount,
+                        tokensCount = tokensCount,
+                        showWarning = false,
+                    )
+                }
+                is UserWalletItem.Balance.Loading -> {
+                    LoadingTokensInfo(isMultiCurrencyWallet = tokensCount != null)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LoadingTokensInfo(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(
+    balanceAmount: String,
+    tokensCount: Int?,
+    showWarning: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.End,
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing4),
+        ) {
+            Text(
+                text = balanceAmount,
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+                textAlign = TextAlign.End,
+            )
+            if (showWarning) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size16),
+                    painter = painterResource(id = R.drawable.ic_alert_24),
+                    tint = TangemTheme.colors.icon.attention,
+                    contentDescription = null,
+                )
+            }
+        }
+        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/DialogModel.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/DialogModel.kt
new file mode 100644
index 0000000000..1dcfb1a2a5
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/DialogModel.kt
@@ -0,0 +1,14 @@
+package com.tangem.tap.features.walletSelector.ui.model
+
+internal sealed interface DialogModel {
+    data class RenameWalletDialog(
+        val currentName: String,
+        val onConfirm: (newName: String) -> Unit,
+        val onDismiss: () -> Unit,
+    ) : DialogModel
+
+    data class RemoveWalletDialog(
+        val onConfirm: () -> Unit,
+        val onDismiss: () -> Unit,
+    ) : DialogModel
+}
\ 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..eeca9d7611
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/UserWalletItem.kt
@@ -0,0 +1,38 @@
+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
+
+    sealed interface Balance {
+        object Loading : Balance
+
+        data class Error(val amount: String) : Balance
+
+        data class Loaded(val amount: String) : Balance
+    }
+}
+
+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..0d248ec7af
--- /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 HandleIntentIfNeeded(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..4c91a6da7c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -0,0 +1,129 @@
+package com.tangem.tap.features.welcome.redux
+
+import android.content.Intent
+import com.tangem.common.core.TangemSdkError
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
+import com.tangem.domain.common.ScanResponse
+import com.tangem.tap.common.analytics.events.SignIn
+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.features.onboarding.products.wallet.saltPay.message.SaltPayActivationError
+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 -> {
+                proceedWithBiometrics(state)
+            }
+            is WelcomeAction.ProceedWithCard -> {
+                proceedWithCard(state)
+            }
+            is WelcomeAction.HandleIntentIfNeeded -> {
+                handleInitialIntent(action.intent)
+            }
+            is WelcomeAction.ProceedWithBiometrics.Error,
+            is WelcomeAction.ProceedWithCard.Error,
+            is WelcomeAction.ProceedWithBiometrics.Success,
+            is WelcomeAction.ProceedWithCard.Success,
+            is WelcomeAction.CloseError,
+            -> Unit
+        }
+    }
+
+    private fun proceedWithBiometrics(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)
+
+                        intentHandler.handleWalletConnectLink(state.intent)
+                    }
+                }
+        }
+    }
+
+    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)
+
+                    intentHandler.handleWalletConnectLink(state.intent)
+                }
+        }
+    }
+
+    private fun handleInitialIntent(intent: Intent?) {
+        val isBackgroundScanWasHandled = intentHandler.handleBackgroundScan(intent, hasSavedUserWallets = true)
+
+        if (!isBackgroundScanWasHandled) {
+            store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics)
+        }
+    }
+
+    private suspend inline fun scanCardInternal(
+        crossinline onCardScanned: suspend (ScanResponse) -> Unit,
+    ) {
+        tangemSdkManager.setAccessCodeRequestPolicy(
+            useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
+        )
+        ScanCardProcessor.scan(
+            analyticsEvent = SignIn.CardWasScanned(),
+            onSuccess = { scanResponse ->
+                scope.launch { onCardScanned(scanResponse) }
+            },
+            onFailure = {
+                when {
+                    it is TangemSdkError.ExceptionError && it.cause is SaltPayActivationError -> {
+                        store.dispatchOnMain(WelcomeAction.ProceedWithCard.Success)
+                    }
+                    else -> {
+                        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..d7d71b7ce0
--- /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.HandleIntentIfNeeded -> state.copy(intent = 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..a8a55d3984
--- /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 intent: 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..7cebf15891
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt
@@ -0,0 +1,85 @@
+package com.tangem.tap.features.welcome.ui
+
+import android.os.Bundle
+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.analytics.Analytics
+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.common.analytics.events.SignIn
+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>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Analytics.send(SignIn.ScreenOpened())
+    }
+
+    @Composable
+    override fun provideState(): State<WelcomeScreenState> {
+        return viewModel.state.collectAsState()
+    }
+
+    @Composable
+    override fun ScreenContent(state: WelcomeScreenState, modifier: Modifier) {
+        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..b810503287
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt
@@ -0,0 +1,70 @@
+package com.tangem.tap.features.welcome.ui
+
+import androidx.lifecycle.ViewModel
+import com.tangem.core.analytics.Analytics
+import com.tangem.tap.common.analytics.events.SignIn
+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() {
+        Analytics.send(SignIn.ButtonBiometricSignIn())
+        store.dispatch(WelcomeAction.ProceedWithBiometrics)
+    }
+
+    fun scanCard() {
+        Analytics.send(SignIn.ButtonCardSignIn())
+        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..4cf55f6bcd
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt
@@ -0,0 +1,125 @@
+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
+
+@Suppress("LongMethod")
+@Composable
+internal fun WelcomeScreenContent(
+    showUnlockProgress: Boolean,
+    showScanCardProgress: Boolean,
+    onUnlockClick: () -> Unit,
+    onScanCardClick: () -> Unit,
+) {
+    Column(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_24),
+            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/NetworkConnectivity.kt b/app/src/main/java/com/tangem/tap/network/NetworkConnectivity.kt
index 00c2f87e19..71d0ed9206 100644
--- a/app/src/main/java/com/tangem/tap/network/NetworkConnectivity.kt
+++ b/app/src/main/java/com/tangem/tap/network/NetworkConnectivity.kt
@@ -15,8 +15,8 @@ import java.lang.ref.WeakReference
 [REDACTED_AUTHOR]
  */
 class NetworkConnectivity(
-        private val store: Store<*>,
-        context: Context
+    private val store: Store<*>,
+    context: Context,
 ) {
 
     private val wContext: WeakReference<Context> = WeakReference(context)
@@ -34,19 +34,16 @@ class NetworkConnectivity(
         store.dispatch(NetworkStateChanged(isOnlineOrConnecting()))
     }
 
-
     fun isOnlineOrConnecting(): Boolean {
         val connectivityManager = getConnectivityManager() ?: return false
 
-        return if (Build.VERSION.SDK_INT >= 23) {
-            val capabilities =
-                    connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
-            (capabilities != null) &&
-                    (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
-                            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
-                            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) ||
-                            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET))
-
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
+            capabilities != null &&
+                (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
+                    capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
+                    capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) ||
+                    capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET))
         } else {
             val networkInfo = connectivityManager.activeNetworkInfo
             networkInfo != null && networkInfo.isConnectedOrConnecting
@@ -55,7 +52,7 @@ class NetworkConnectivity(
 
     private fun getConnectivityManager(): ConnectivityManager? {
         return wContext.get()?.applicationContext
-                ?.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager
+            ?.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager
     }
 
     companion object {
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..671c45af11 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
@@ -59,7 +59,7 @@ class CurrencyExchangeManager(
             blockchain,
             cryptoCurrencyName,
             fiatCurrencyName,
-            walletAddress
+            walletAddress,
         )
     }
 
@@ -87,7 +87,7 @@ class CurrencyExchangeManager(
 }
 
 suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(
-    card: Card,
+    card: CardDTO,
     walletManager: EthereumWalletManager,
     token: Token,
 ) {
@@ -96,13 +96,15 @@ suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(
     val amountToSend = Amount(walletManager.wallet.blockchain)
     val destinationAddress = token.contractAddress
 
-    val feeResult = walletManager.getFee(amountToSend,
-        destinationAddress) as? Result.Success ?: return
+    val feeResult =
+        walletManager.getFee(
+            amountToSend,
+            destinationAddress,
+        ) as? Result.Success ?: return
     val fee = feeResult.data[0]
 
-    if ((walletManager.wallet.amounts[AmountType.Coin]?.value ?: BigDecimal.ZERO) < fee.value) {
-        return
-    }
+    val coinValue = walletManager.wallet.amounts[AmountType.Coin]?.value ?: BigDecimal.ZERO
+    if (coinValue < fee.value) return
 
     val transaction = walletManager.createTransaction(amountToSend, fee, destinationAddress)
 
@@ -115,8 +117,8 @@ suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(
             GlobalAction.UpdateWalletSignedHashes(
                 walletSignedHashes = signResponse.totalSignedHashes,
                 walletPublicKey = walletManager.wallet.publicKey.seedKey,
-                remainingSignatures = signResponse.remainingSignatures
-            )
+                remainingSignatures = signResponse.remainingSignatures,
+            ),
         )
     }
     walletManager.send(transaction, signer)
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
index 8d6e8e2187..0309ce9ee9 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
@@ -7,11 +7,11 @@ import com.tangem.tap.features.wallet.models.Currency
 interface Exchanger {
     fun isBuyAllowed(): Boolean
     fun isSellAllowed(): Boolean
-    fun availableForBuy(currency: Currency):Boolean
-    fun availableForSell(currency: Currency):Boolean
+    fun availableForBuy(currency: Currency): Boolean
+    fun availableForSell(currency: Currency): Boolean
 }
 
-interface ExchangeService: Feature, Exchanger {
+interface ExchangeService : Feature, Exchanger {
     suspend fun update()
 
     companion object {
@@ -26,7 +26,7 @@ interface ExchangeService: Feature, Exchanger {
     }
 }
 
-interface ExchangeRules: Feature, Exchanger {
+interface ExchangeRules : Feature, Exchanger {
 
     companion object {
         fun dummy(): ExchangeRules = object : ExchangeRules {
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..48700b18ea 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
@@ -33,11 +33,12 @@ class MercuryoService(
 
     override fun featureIsSwitchedOn(): Boolean = true
 
+    @Suppress("NestedBlockDepth")
     override suspend fun update() {
         when (val result = performRequest { api.currencies(apiVersion) }) {
             is Result.Success -> {
                 val response = result.data
-                if (response.status == 200) {
+                if (response.status == RESPONSE_SUCCESS_STATUS_CODE) {
                     // all currencies which can be bought
                     val currenciesAvailableToBy = response.data.crypto
                     // tokens which can be bought only from specific blockchain network
@@ -108,7 +109,7 @@ class MercuryoService(
         blockchain: Blockchain,
         cryptoCurrencyName: CryptoCurrencyName,
         fiatCurrencyName: String,
-        walletAddress: String
+        walletAddress: String,
     ): String {
         if (action == CurrencyExchangeManager.Action.Sell) throw UnsupportedOperationException()
 
@@ -131,10 +132,9 @@ class MercuryoService(
         return (address + secret).calculateSha512().toHexString().lowercase()
     }
 
-
     override fun getSellCryptoReceiptUrl(
         action: CurrencyExchangeManager.Action,
-        transactionId: String
+        transactionId: String,
     ): String? = null
 
     private fun blockchainFromCurrencyName(currencyName: String): Blockchain? = when (currencyName) {
@@ -143,4 +143,8 @@ class MercuryoService(
         "ADA" -> Blockchain.CardanoShelley
         else -> Blockchain.values().find { it.currency.lowercase() == currencyName.lowercase() }
     }
-}
+
+    companion object {
+        private const val RESPONSE_SUCCESS_STATUS_CODE = 200
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
index 37dbe6185a..27dc8d0c3b 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
@@ -17,7 +17,6 @@ interface MoonPayApi {
         @Query("apiKey") moonPayApiKey: String,
     ): List<MoonPayCurrencies>
 
-
     companion object {
         const val MOOONPAY_BASE_URL = "https://api.moonpay.com/"
         const val MOOONPAY_IP_ADDRESS_REQUEST_URL = "v4/ip_address/"
@@ -25,7 +24,6 @@ interface MoonPayApi {
     }
 }
 
-
 @JsonClass(generateAdapter = true)
 data class MoonPayUserStatus(
     val isBuyAllowed: Boolean,
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..e6752f1272 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
@@ -5,8 +5,8 @@ import android.util.Base64
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
+import com.tangem.datasource.api.common.createRetrofitInstance
 import com.tangem.domain.common.extensions.withIOContext
-import com.tangem.network.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
@@ -130,7 +130,6 @@ class MoonPayService(
             .appendPath("transaction_receipt")
             .appendQueryParameter("transactionId", transactionId).build().toString()
         return url
-
     }
 
     private fun createSignature(data: String): String {
diff --git a/app/src/main/java/com/tangem/tap/network/payid/PayIdApi.kt b/app/src/main/java/com/tangem/tap/network/payid/PayIdApi.kt
deleted file mode 100644
index 8b00ecefd7..0000000000
--- a/app/src/main/java/com/tangem/tap/network/payid/PayIdApi.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.tangem.tap.network.payid
-
-import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Query
-
-interface PayIdApi {
-    @GET(API_PAY_ID_TANGEM)
-    suspend fun getPayId(
-            @Query("cid") cardId: String,
-            @Query("key") publicKey: String
-    ): PayIdResponse
-
-    @POST(API_PAY_ID_TANGEM)
-    suspend fun setPayId(
-            @Query("cid") cardId: String,
-            @Query("key") publicKey: String,
-            @Query("payid") payId: String,
-            @Query("address") address: String,
-            @Query("network") network: String
-    ): SetPayIdResponse
-
-    companion object {
-        const val API_PAY_ID_TANGEM = "https://payid.tangem.com/"
-    }
-}
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
deleted file mode 100644
index f4612643d3..0000000000
--- a/app/src/main/java/com/tangem/tap/network/payid/PayIdService.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-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 retrofit2.Retrofit
-
-class PayIdService {
-
-    private val payIdApi: PayIdApi by lazy {
-        provideRetrofit()
-                .create(PayIdApi::class.java)
-    }
-
-    suspend fun getPayId(cardId: String, publicKey: String): Result<PayIdResponse> {
-        return performRequest { payIdApi.getPayId(cardId, publicKey) }
-    }
-
-    suspend fun setPayId(
-            cardId: String, publicKey: String, payId: String, address: String, network: String
-    ): Result<SetPayIdResponse> {
-        return performRequest { payIdApi.setPayId(cardId, publicKey, payId, address, network) }
-    }
-
-    private fun provideRetrofit(): Retrofit = createRetrofitInstance(
-        baseUrl = "https://tangem.com/",
-        logEnabled = false,
-    )
-
-}
-
-@JsonClass(generateAdapter = true)
-data class PayIdResponse(
-        val payId: String
-)
-
-@JsonClass(generateAdapter = true)
-data class SetPayIdResponse(
-        val success: Boolean
-)
diff --git a/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyApi.kt b/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyApi.kt
index a40231aaf5..8566c89a86 100644
--- a/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyApi.kt
+++ b/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyApi.kt
@@ -11,34 +11,31 @@ import retrofit2.http.Path
 interface PayIdVerifyApi {
     @GET("{user}")
     suspend fun verifyAddress(
-            @Path("user") user: String,
-            @Header("Accept") acceptNetworkHeader: String,
-            @Header("PayID-Version") payIdVersion: String = "1.0"
+        @Path("user") user: String,
+        @Header("Accept") acceptNetworkHeader: String,
+        @Header("PayID-Version") payIdVersion: String = "1.0",
     ): VerifyPayIdResponse
 }
 
-
 @JsonClass(generateAdapter = true)
 data class VerifyPayIdResponse(
-        val addresses: List<PayIdAddress> = mutableListOf(),
-        val payId: String? = null,
+    val addresses: List<PayIdAddress> = mutableListOf(),
+    val payId: String? = null,
 ) {
-    fun getAddressDetails(): PayIdAddressDetails? {
-        return if (addresses.isEmpty()) null
-        else addresses[0].addressDetails
-    }
+    fun getAddressDetails(): PayIdAddressDetails? =
+        if (addresses.isNotEmpty()) addresses[0].addressDetails else null
 }
 
 @JsonClass(generateAdapter = true)
 data class PayIdAddress(
-        var paymentNetwork: String,
-        var environment: String,
-        var addressDetailsType: String,
-        var addressDetails: PayIdAddressDetails
+    var paymentNetwork: String,
+    var environment: String,
+    var addressDetailsType: String,
+    var addressDetails: PayIdAddressDetails,
 )
 
 @JsonClass(generateAdapter = true)
 data class PayIdAddressDetails(
-        var address: String,
-        var tag: String? = null
+    var address: String,
+    var tag: String? = null,
 )
\ No newline at end of file
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/CardBalanceStateAdapter.kt b/app/src/main/java/com/tangem/tap/persistence/CardBalanceStateAdapter.kt
new file mode 100644
index 0000000000..0385071ff3
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/persistence/CardBalanceStateAdapter.kt
@@ -0,0 +1,20 @@
+package com.tangem.tap.persistence
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+
+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 -> error("CardBalanceState not found")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/persistence/DisclaimerPrefStorage.kt b/app/src/main/java/com/tangem/tap/persistence/DisclaimerPrefStorage.kt
index 7c016eaa5d..34dbf530a3 100644
--- a/app/src/main/java/com/tangem/tap/persistence/DisclaimerPrefStorage.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/DisclaimerPrefStorage.kt
@@ -10,16 +10,11 @@ class DisclaimerPrefStorage(
     private val preferences: SharedPreferences,
 ) {
 
-    var hasTangemTosAccepted: Boolean
-        get() = preferences.getBoolean(KEY_TANGEM_TOS, false)
-        set(value) = preferences.edit { putBoolean(KEY_TANGEM_TOS, value) }
+    fun accept(disclaimerKey: String) {
+        preferences.edit { putBoolean(disclaimerKey, true) }
+    }
 
-    var hasSaltPayTosAccepted: Boolean
-        get() = preferences.getBoolean(KEY_SALT_PAY_TOS, false)
-        set(value) = preferences.edit { putBoolean(KEY_SALT_PAY_TOS, value) }
-
-    companion object {
-        private const val KEY_TANGEM_TOS = "tangem_tos_accepted"
-        private const val KEY_SALT_PAY_TOS = "saltPay_tos_accepted"
+    fun isAccepted(disclaimerKey: String): Boolean {
+        return preferences.getBoolean(disclaimerKey, false)
     }
 }
\ No newline at end of file
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..a52f38f854 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.models.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..a6ff52c139 100644
--- a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt
@@ -5,38 +5,71 @@ 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.BigDecimalAdapter
 import java.util.*
 
 class PreferencesStorage(applicationContext: Application) {
 
-    private val preferences: SharedPreferences =
-        applicationContext.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
-
     val appRatingLaunchObserver: AppRatingLaunchObserver
     val usedCardsPrefStorage: UsedCardsPrefStorage
     val fiatCurrenciesPrefStorage: FiatCurrenciesPrefStorage
     val disclaimerPrefStorage: DisclaimerPrefStorage
+    val toppedUpWalletStorage: ToppedUpWalletStorage
+
+    private val preferences: SharedPreferences =
+        applicationContext.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
+
+    private val moshiConverter = MoshiJsonConverter(
+        adapters = listOf(BigDecimalAdapter(), CardBalanceStateAdapter()) + MoshiJsonConverter.getTangemSdkAdapters(),
+        typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
+    )
 
     init {
         incrementLaunchCounter()
         appRatingLaunchObserver = AppRatingLaunchObserver(preferences, getCountOfLaunches())
-        usedCardsPrefStorage = UsedCardsPrefStorage(preferences, MoshiJsonConverter.INSTANCE)
+        usedCardsPrefStorage = UsedCardsPrefStorage(preferences, moshiConverter)
         usedCardsPrefStorage.migrate()
-        fiatCurrenciesPrefStorage = FiatCurrenciesPrefStorage(preferences, MoshiJsonConverter.INSTANCE)
+        fiatCurrenciesPrefStorage = FiatCurrenciesPrefStorage(preferences, moshiConverter)
         fiatCurrenciesPrefStorage.migrate()
         disclaimerPrefStorage = DisclaimerPrefStorage(preferences)
+        toppedUpWalletStorage = ToppedUpWalletStorage(preferences, moshiConverter)
     }
 
     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 +89,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"
     }
 }
 
@@ -63,11 +101,7 @@ class AppRatingLaunchObserver(
     private val preferences: SharedPreferences,
     private val launchCounts: Int,
 ) {
-    private val K_SHOW_RATING_AT_LAUNCH_COUNT = "showRatingDialogAtLaunchCount"
-    private val K_FUNDS_FOUND_DATE = "fundsFoundDate"
-    private val K_USER_WAS_INTERACT_WITH_RATING = "userWasInteractWithRating"
 
-    private val FUNDS_FOUND_DATE_UNDEFINED = -1L
     private val deferShowing = 20
     private val firstShowing = 3
     private var fundsFoundDate: Calendar? = null
@@ -89,6 +123,7 @@ class AppRatingLaunchObserver(
         }
     }
 
+    @Suppress("MagicNumber")
     fun isReadyToShow(): Boolean {
         val fundsDate = fundsFoundDate ?: return false
 
@@ -106,6 +141,7 @@ class AppRatingLaunchObserver(
         updateNextShowing(launchCounts + deferShowing)
     }
 
+    @Suppress("MagicNumber")
     fun setNeverToShow() {
         updateNextShowing(999999999)
     }
@@ -117,6 +153,16 @@ class AppRatingLaunchObserver(
         editor.apply()
     }
 
-    private fun userWasInteractWithRating(): Boolean = preferences.getBoolean(K_USER_WAS_INTERACT_WITH_RATING, false)
-    private fun getCounterOfNextShowing(): Int = preferences.getInt(K_SHOW_RATING_AT_LAUNCH_COUNT, firstShowing)
+    private fun userWasInteractWithRating(): Boolean =
+        preferences.getBoolean(K_USER_WAS_INTERACT_WITH_RATING, false)
+
+    private fun getCounterOfNextShowing(): Int =
+        preferences.getInt(K_SHOW_RATING_AT_LAUNCH_COUNT, firstShowing)
+
+    companion object {
+        private const val K_SHOW_RATING_AT_LAUNCH_COUNT = "showRatingDialogAtLaunchCount"
+        private const val K_FUNDS_FOUND_DATE = "fundsFoundDate"
+        private const val K_USER_WAS_INTERACT_WITH_RATING = "userWasInteractWithRating"
+        private const val FUNDS_FOUND_DATE_UNDEFINED = -1L
+    }
 }
\ No newline at end of file
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..75759b8d75
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/persistence/ToppedUpWalletStorage.kt
@@ -0,0 +1,59 @@
+package com.tangem.tap.persistence
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import com.tangem.common.json.MoshiJsonConverter
+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"
+    }
+}
\ 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..ed21a083df
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
@@ -0,0 +1,35 @@
+package com.tangem.tap.proxy
+
+import com.tangem.TangemSdk
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.ScanResponse
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.domain.TangemSdkManager
+import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.domain.userWalletList.UserWalletsListManager
+import com.tangem.tap.domain.walletStores.WalletStoresManager
+import com.tangem.tap.features.wallet.redux.WalletState
+import org.rekotlin.Store
+import javax.inject.Inject
+
+/**
+ * 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 @Inject constructor() {
+
+    var scanResponse: ScanResponse? = null
+    var walletState: WalletState? = null
+    var userTokensRepository: UserTokensRepository? = null
+    var mainStore: Store<AppState>? = null
+    var tangemSdkManager: TangemSdkManager? = null
+    var tangemSdk: TangemSdk? = null
+    var walletStoresManager: WalletStoresManager? = null
+    var userWalletsListManager: UserWalletsListManager? = null
+    var appFiatCurrency: FiatCurrency = FiatCurrency.Default
+
+    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..246d1ac726
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
@@ -0,0 +1,179 @@
+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.Currency.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 selectedWallet = appStateHolder.userWalletsListManager?.selectedUserWalletSync
+
+            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,
+                    )
+                    if (selectedWallet != null) {
+                        val userWallet = selectedWallet.copy(
+                            scanResponse = updatedScanResponse,
+                        )
+
+                        appStateHolder.userWalletsListManager?.save(userWallet, canOverride = true)
+                        appStateHolder.walletStoresManager?.fetch(userWallet, true)
+                    }
+                    appStateHolder.mainStore?.dispatchOnMain(GlobalAction.SaveScanResponse(updatedScanResponse))
+                    delay(DELAY_SDK_DIALOG_CLOSE)
+                    onSuccess(updatedScanResponse)
+                }
+                is CompletionResult.Failure -> {
+                    appStateHolder.mainStore?.dispatchDebugErrorNotification(
+                        TapError.CustomError(
+                            "Error derivation",
+                        ),
+                    )
+                }
+                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/TransactionManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
new file mode 100644
index 0000000000..9ad9faf3a0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
@@ -0,0 +1,294 @@
+package com.tangem.tap.proxy
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.tangem.Message
+import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
+import com.tangem.blockchain.blockchains.ethereum.EthereumWalletManager
+import com.tangem.blockchain.common.Amount
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.BlockchainSdkError
+import com.tangem.blockchain.common.Token
+import com.tangem.blockchain.common.TransactionExtras
+import com.tangem.blockchain.common.TransactionSender
+import com.tangem.blockchain.common.TransactionSigner
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.extensions.Result
+import com.tangem.blockchain.extensions.SimpleResult
+import com.tangem.common.core.TangemSdkError
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.lib.crypto.TransactionManager
+import com.tangem.lib.crypto.models.Currency
+import com.tangem.lib.crypto.models.ProxyAmount
+import com.tangem.lib.crypto.models.ProxyNetworkInfo
+import com.tangem.lib.crypto.models.transactions.SendTxResult
+import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.domain.TangemSigner
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.store
+import com.tangem.tap.tangemSdk
+import java.math.BigDecimal
+
+class TransactionManagerImpl(
+    private val appStateHolder: AppStateHolder,
+) : TransactionManager {
+
+    override suspend fun sendApproveTransaction(
+        networkId: String,
+        feeAmount: BigDecimal,
+        estimatedGas: Int,
+        destinationAddress: String,
+        dataToSign: String,
+    ): SendTxResult {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val walletManager = getActualWalletManager(blockchain)
+        walletManager.update()
+        val amount = Amount(value = BigDecimal.ZERO, blockchain = blockchain)
+        return sendTransactionInternal(
+            walletManager = walletManager,
+            amount = amount,
+            blockchain = blockchain,
+            feeAmount = feeAmount,
+            estimatedGas = estimatedGas,
+            destinationAddress = destinationAddress,
+            dataToSign = dataToSign,
+        )
+    }
+
+    override suspend fun sendTransaction(
+        networkId: String,
+        amountToSend: BigDecimal,
+        feeAmount: BigDecimal,
+        estimatedGas: Int,
+        destinationAddress: String,
+        dataToSign: String,
+        isSwap: Boolean,
+        currencyToSend: Currency,
+    ): SendTxResult {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val walletManager = getActualWalletManager(blockchain)
+        walletManager.update()
+        val amount = if (isSwap) {
+            createAmountForSwap(amountToSend, currencyToSend, blockchain)
+        } else {
+            createAmount(amountToSend, currencyToSend, blockchain)
+        }
+        return sendTransactionInternal(
+            walletManager = walletManager,
+            amount = amount,
+            blockchain = blockchain,
+            feeAmount = feeAmount,
+            estimatedGas = estimatedGas,
+            destinationAddress = destinationAddress,
+            dataToSign = dataToSign,
+        )
+    }
+
+    @Suppress("LongParameterList")
+    private suspend fun sendTransactionInternal(
+        walletManager: WalletManager,
+        amount: Amount,
+        blockchain: Blockchain,
+        feeAmount: BigDecimal,
+        estimatedGas: Int,
+        destinationAddress: String,
+        dataToSign: String,
+    ): SendTxResult {
+        val txData = walletManager.createTransaction(
+            amount = amount,
+            fee = Amount(value = feeAmount, blockchain = blockchain),
+            destination = destinationAddress,
+        ).copy(hash = dataToSign, extras = createExtras(walletManager, estimatedGas, dataToSign))
+
+        val signer = transactionSigner(walletManager)
+
+        val sendResult = try {
+            (walletManager as TransactionSender).send(txData, signer)
+        } catch (ex: Exception) {
+            FirebaseCrashlytics.getInstance().recordException(ex)
+            return SendTxResult.UnknownError(ex)
+        }
+        return handleSendResult(sendResult)
+    }
+
+    override fun getExplorerTransactionLink(networkId: String, txAddress: String): String {
+        val blockchain = Blockchain.fromNetworkId(networkId) ?: error("blockchain not found")
+        return blockchain.getExploreTxUrl(txAddress)
+    }
+
+    override fun getNativeTokenDecimals(networkId: String): Int {
+        return Blockchain.fromNetworkId(networkId)?.decimals() ?: error("blockchain not found")
+    }
+
+    override suspend fun updateWalletManager(networkId: String) {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        getActualWalletManager(blockchain).update()
+    }
+
+    override fun calculateFee(networkId: String, gasPrice: String, estimatedGas: Int): BigDecimal {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val gasPriceValue = requireNotNull(gasPrice.toLongOrNull()) { "gasprice should be Long" }
+        return (gasPriceValue * estimatedGas).toBigDecimal().movePointLeft(blockchain.decimals())
+    }
+
+    @Throws(IllegalStateException::class)
+    override suspend fun getFee(
+        networkId: String,
+        amountToSend: BigDecimal,
+        currencyToSend: Currency,
+        destinationAddress: String,
+    ): ProxyAmount {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val walletManager = getActualWalletManager(blockchain)
+        val fee = (walletManager as TransactionSender).getFee(
+            amount = createAmount(amountToSend, currencyToSend, blockchain),
+            destination = destinationAddress,
+        )
+        when (fee) {
+            is Result.Success -> {
+                return convertToProxyAmount(fee.data.firstOrNull() ?: error("no fee found"))
+            }
+            is Result.Failure -> {
+                error(fee.error.message ?: fee.error.customMessage)
+            }
+        }
+    }
+
+    override fun getBlockchainInfo(networkId: String): ProxyNetworkInfo {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        return ProxyNetworkInfo(
+            name = blockchain.fullName,
+            blockchainId = blockchain.id,
+            blockchainCurrency = blockchain.currency,
+        )
+    }
+
+    private fun handleSendResult(result: SimpleResult): SendTxResult {
+        when (result) {
+            is SimpleResult.Success -> return SendTxResult.Success
+            is SimpleResult.Failure -> {
+                val error = result.error as? BlockchainSdkError ?: return SendTxResult.UnknownError()
+                when (error) {
+                    is BlockchainSdkError.WrappedTangemError -> {
+                        val tangemSdkError = error.tangemError as? TangemSdkError ?: return SendTxResult.UnknownError()
+                        if (tangemSdkError is TangemSdkError.UserCancelled) return SendTxResult.UserCancelledError
+                        return SendTxResult.TangemSdkError(tangemSdkError.code, tangemSdkError.cause)
+                    }
+                    else -> {
+                        return SendTxResult.TangemSdkError(error.code, error.cause)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun transactionSigner(walletManager: WalletManager): TransactionSigner {
+        val actualCard = requireNotNull(appStateHolder.getActualCard()) { "no card found" }
+        return TangemSigner(
+            card = actualCard,
+            tangemSdk = tangemSdk,
+            initialMessage = Message(),
+        ) { signResponse ->
+            store.dispatch(
+                GlobalAction.UpdateWalletSignedHashes(
+                    walletSignedHashes = signResponse.totalSignedHashes,
+                    walletPublicKey = walletManager.wallet.publicKey.seedKey,
+                    remainingSignatures = signResponse.remainingSignatures,
+                ),
+            )
+        }
+    }
+
+    private fun getActualWalletManager(blockchain: Blockchain): WalletManager {
+        val card = appStateHolder.getActualCard()
+        if (card != null) {
+            val blockchainNetwork = BlockchainNetwork(blockchain, card)
+            val walletManager = appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+            if (walletManager != null) {
+                return walletManager
+            } else {
+                error("no wallet manager found")
+            }
+        } else {
+            error("card not found")
+        }
+    }
+
+    private fun createExtras(
+        walletManager: WalletManager,
+        estimatedGas: Int,
+        transactionHash: String,
+    ): TransactionExtras? {
+        return when (walletManager) {
+            is EthereumWalletManager -> {
+                return EthereumTransactionExtras(
+                    data = transactionHash.removePrefix(HEX_PREFIX).hexToBytes(),
+                    gasLimit = estimatedGas.toBigInteger(),
+                )
+            }
+            else -> {
+                null
+            }
+        }
+    }
+
+    private fun createAmount(
+        amount: BigDecimal,
+        currency: Currency,
+        blockchain: Blockchain,
+    ): Amount {
+        return when (currency) {
+            is Currency.NativeToken -> {
+                Amount(value = amount, blockchain = blockchain)
+            }
+            is Currency.NonNativeToken -> {
+                Amount(convertNonNativeToken(currency), amount)
+            }
+        }
+    }
+
+    private fun createAmountForSwap(
+        amount: BigDecimal,
+        currency: Currency?,
+        blockchain: Blockchain,
+    ): Amount {
+        return when (currency) {
+            is Currency.NativeToken,
+            null,
+            -> {
+                Amount(value = amount, blockchain = blockchain)
+            }
+            is Currency.NonNativeToken -> {
+                // 1. when creates swap amount for NonNativeToken, amount should be ZERO
+                // 2. Amount has .Coin type, as workaround to use destinationAddress in bsdk, not contractAddress
+                Amount(
+                    currencySymbol = currency.symbol,
+                    value = BigDecimal.ZERO,
+                    decimals = currency.decimalCount,
+                )
+            }
+        }
+    }
+
+    private fun convertNonNativeToken(token: Currency.NonNativeToken): Token {
+        return Token(
+            name = token.name,
+            symbol = token.symbol,
+            contractAddress = token.contractAddress,
+            decimals = token.decimalCount,
+            id = token.id,
+        )
+    }
+
+    private fun convertToProxyAmount(amount: Amount): ProxyAmount {
+        return ProxyAmount(
+            currencySymbol = amount.currencySymbol,
+            value = amount.value ?: BigDecimal.ZERO,
+            decimals = amount.decimals,
+        )
+    }
+
+    companion object {
+        private const val HEX_PREFIX = "0x"
+    }
+}
\ 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..76a34f2d5f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
@@ -0,0 +1,218 @@
+package com.tangem.tap.proxy
+
+import com.tangem.blockchain.common.AmountType
+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.domain.common.CardDTO
+import com.tangem.domain.common.TapWorkarounds.derivationStyle
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.domain.common.extensions.toCoinId
+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.Currency.NativeToken
+import com.tangem.lib.crypto.models.Currency.NonNativeToken
+import com.tangem.lib.crypto.models.ProxyAmount
+import com.tangem.lib.crypto.models.ProxyFiatCurrency
+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
+import java.math.BigDecimal
+
+class UserWalletManagerImpl(
+    private val appStateHolder: AppStateHolder,
+    private val walletManagerFactory: WalletManagerFactory,
+) : UserWalletManager {
+
+    override suspend fun getUserTokens(networkId: String): List<Currency> {
+        val card = appStateHolder.getActualCard()
+        val userTokensRepository =
+            requireNotNull(appStateHolder.userTokensRepository) { "userTokensRepository is null" }
+        return if (card != null) {
+            userTokensRepository.getUserTokens(card)
+                .filter { it.blockchain.toNetworkId() == networkId }
+                .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(),
+                        )
+                    }
+                }
+        } else {
+            emptyList()
+        }
+    }
+
+    override fun getNativeTokenForNetwork(networkId: String): Currency {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        return NativeToken(
+            id = blockchain.toCoinId(),
+            name = blockchain.fullName,
+            symbol = blockchain.currency,
+            networkId = networkId,
+        )
+    }
+
+    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 card = requireNotNull(appStateHolder.getActualCard()) { "card not found" }
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(currency.networkId)) { "blockchain not found" }
+        val action = if (currency is NativeToken) {
+            addNativeTokenToWalletAction(card, blockchain)
+        } else {
+            addNonNativeTokenToWalletAction(currency as NonNativeToken, card, blockchain)
+        }
+        val mainStore = requireNotNull(appStateHolder.mainStore) { "mainStore is null" }
+        mainStore.dispatch(action)
+    }
+
+    override fun getWalletAddress(networkId: String): String {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val card = requireNotNull(appStateHolder.getActualCard()) { "card not found" }
+        val blockchainNetwork = BlockchainNetwork(blockchain, card)
+        val walletManager = appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+        if (walletManager != null) {
+            return walletManager.wallet.address
+        } else {
+            error("no wallet manager found")
+        }
+    }
+
+    override fun getLastTransactionHash(networkId: String): String? {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val card = requireNotNull(appStateHolder.getActualCard()) { "card not found" }
+        val blockchainNetwork = BlockchainNetwork(blockchain, card)
+        val walletManager = appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+        return walletManager?.wallet?.recentTransactions?.lastOrNull()?.hash?.let { HEX_PREFIX + it }
+    }
+
+    override fun getCurrentWalletTokensBalance(networkId: String): Map<String, ProxyAmount> {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val walletManager = getActualWalletManager(blockchain)
+        return walletManager.wallet.amounts.map { entry ->
+            val amount = entry.value
+            amount.currencySymbol to ProxyAmount(
+                amount.currencySymbol,
+                amount.value ?: BigDecimal.ZERO,
+                amount.decimals,
+            )
+        }.toMap()
+    }
+
+    override fun getNativeTokenBalance(networkId: String): ProxyAmount? {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val walletManager = getActualWalletManager(blockchain)
+        return walletManager.wallet.amounts.firstNotNullOfOrNull {
+            it.takeIf { it.key is AmountType.Coin }
+        }?.value?.let {
+            ProxyAmount(
+                it.currencySymbol,
+                it.value ?: BigDecimal.ZERO,
+                it.decimals,
+            )
+        }
+    }
+
+    override fun getNetworkCurrency(networkId: String): String {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        return blockchain.currency
+    }
+
+    override fun getUserAppCurrency(): ProxyFiatCurrency {
+        val appCurrency = appStateHolder.appFiatCurrency
+        return ProxyFiatCurrency(
+            code = appCurrency.code,
+            name = appCurrency.name,
+            symbol = appCurrency.symbol,
+        )
+    }
+
+    private fun addNativeTokenToWalletAction(card: CardDTO, blockchain: Blockchain): Action {
+        val scanResponse = requireNotNull(appStateHolder.scanResponse) { "scanResponse not found" }
+        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,
+        )
+    }
+
+    private fun addNonNativeTokenToWalletAction(token: NonNativeToken, card: CardDTO, blockchain: Blockchain): Action {
+        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,
+        )
+    }
+
+    private fun createDerivationParams(derivationStyle: DerivationStyle?): DerivationParams? {
+        // todo clarify if its need to add Custom
+        return derivationStyle?.let { DerivationParams.Default(derivationStyle) }
+    }
+
+    private fun getActualWalletManager(blockchain: Blockchain): WalletManager {
+        val card = requireNotNull(appStateHolder.getActualCard()) { "card not found" }
+        val blockchainNetwork = BlockchainNetwork(blockchain, card)
+        return requireNotNull(appStateHolder.walletState?.getWalletManager(blockchainNetwork)) {
+            "No wallet manager found"
+        }
+    }
+
+    companion object {
+        private const val HEX_PREFIX = "0x"
+    }
+}
\ 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..1a65b1ddd0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
@@ -0,0 +1,49 @@
+package com.tangem.tap.proxy.di
+
+import com.tangem.blockchain.common.WalletManagerFactory
+import com.tangem.lib.crypto.DerivationManager
+import com.tangem.lib.crypto.TransactionManager
+import com.tangem.lib.crypto.UserWalletManager
+import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.tap.proxy.DerivationManagerImpl
+import com.tangem.tap.proxy.TransactionManagerImpl
+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 provideTransactionManager(appStateHolder: AppStateHolder): TransactionManager {
+        return TransactionManagerImpl(appStateHolder)
+    }
+
+    @Provides
+    @Singleton
+    fun provideDerivationManager(appStateHolder: AppStateHolder): DerivationManager {
+        return DerivationManagerImpl(
+            appStateHolder = appStateHolder,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/color/btn_tap_text_color.xml b/app/src/main/res/color/btn_tap_text_color.xml
deleted file mode 100644
index 01e0752f01..0000000000
--- a/app/src/main/res/color/btn_tap_text_color.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:color="#66FFFFFF"
-        android:textColor="#66FFFFFF"/>
-    <item android:color="#FFFFFF"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_btn_green.xml b/app/src/main/res/color/selector_btn_green.xml
index 32bd8b9847..0af5088cd4 100644
--- a/app/src/main/res/color/selector_btn_green.xml
+++ b/app/src/main/res/color/selector_btn_green.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:color="@color/tapButtonDisabled"/>
-    <item android:color="@color/tapButtonColor"/>
+    <item android:color="@color/button_positive_disabled" android:state_enabled="false" />
+    <item android:color="@color/button_positive" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_btn_primary.xml b/app/src/main/res/color/selector_btn_primary.xml
new file mode 100644
index 0000000000..6e8aab4c79
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/button_disabled" android:state_enabled="false" />
+    <item android:color="@color/button_primary" />
+</selector>
diff --git a/app/src/main/res/color/selector_btn_secondary.xml b/app/src/main/res/color/selector_btn_secondary.xml
new file mode 100644
index 0000000000..47a88e3645
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_secondary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/button_disabled" android:state_enabled="false" />
+    <item android:color="@color/button_secondary" />
+</selector>
diff --git a/app/src/main/res/color/selector_btn_text_primary.xml b/app/src/main/res/color/selector_btn_text_primary.xml
new file mode 100644
index 0000000000..70f6aded83
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_text_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/text_disabled" android:state_enabled="false" android:textColor="@color/text_disabled" />
+    <item android:color="@color/text_primary_2" android:textColor="@color/text_primary_2" />
+</selector>
diff --git a/app/src/main/res/color/selector_btn_text_secondary.xml b/app/src/main/res/color/selector_btn_text_secondary.xml
new file mode 100644
index 0000000000..41aa7c843c
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_text_secondary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/text_disabled" android:state_enabled="false" android:textColor="@color/text_disabled" />
+    <item android:color="@color/text_primary_1" android:textColor="@color/text_primary_1" />
+</selector>
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_arbitrum_round.xml b/app/src/main/res/drawable/ic_arbitrum_round.xml
deleted file mode 100644
index 632ea33dae..0000000000
--- a/app/src/main/res/drawable/ic_arbitrum_round.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector android:autoMirrored="true" android:height="22dp"
-    android:viewportHeight="22" android:viewportWidth="22"
-    android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group>
-        <clip-path android:pathData="M0,0h22v22h-22z"/>
-        <path android:fillColor="#2C374B" android:pathData="M11,22C17.1327,22 22,17.0354 22,11C22,4.8673 17.0354,0 11,0C4.8673,0 0,4.9646 0,11C0,17.0354 4.9646,22 11,22Z"/>
-        <path android:fillColor="#24A2EE" android:pathData="M16.5486,12.9469L13.6283,8.469L12.5575,10.2212L15.3805,14.7964L16.646,14.2124L16.5486,12.9469Z"/>
-        <path android:fillColor="#24A2EE" android:pathData="M15.186,15.3805L12.2656,10.9026L11.0001,12.8495L13.3364,16.5486L14.7966,15.9645L15.186,15.3805Z"/>
-        <path android:fillColor="#98BCDC" android:fillType="evenOdd" android:pathData="M5.6461,7.8851L11.0001,4.7701L16.3541,7.8851V14.1152L11.0001,17.2303L7.0089,14.9913L7,16L10.9028,18.3984C11.0001,18.4958 11.0974,18.4958 11.1948,18.3984L17.3275,14.894C17.4249,14.7966 17.5222,14.6993 17.5222,14.602V7.5931C17.5222,7.4958 17.4249,7.3984 17.3275,7.3011L11.1948,3.7966C11.0974,3.6993 11.0001,3.6993 10.9028,3.7966L4.77,7.2037C4.6727,7.3011 4.5753,7.3984 4.5753,7.4958V14.5046C4.5753,14.602 4.6727,14.6993 4.77,14.7966L6,15.5L6.5,14.5L5.7435,14.1152V7.8851H5.6461Z"/>
-        <path android:fillColor="#ffffff" android:pathData="M13.3364,7.96H11.2921L6.5222,15.7476L8.1771,16.721L13.3364,7.96Z"/>
-        <path android:fillColor="#ffffff" android:pathData="M8.1771,8.6636C8.6638,7.8849 10.0266,7.8849 10.6107,7.9822L6,15.5C5.8053,15.4027 5.3541,15.1857 5.062,14.9911C4.6727,14.7964 4.5753,14.7964 4.5753,14.5043V14.1149C5.6461,12.5574 7.6904,9.4424 8.1771,8.6636Z"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_avalanche_round.xml b/app/src/main/res/drawable/ic_avalanche_round.xml
deleted file mode 100644
index ac2c5623a1..0000000000
--- a/app/src/main/res/drawable/ic_avalanche_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#E74142" android:fillType="evenOdd" android:pathData="M16,8C16,12.4183 12.4183,16 8,16C3.5817,16 0,12.4183 0,8C0,3.5817 3.5817,0 8,0C12.4183,0 16,3.5817 16,8ZM5.733,11.1836H4.1804C3.8542,11.1836 3.6931,11.1836 3.5948,11.1207C3.4887,11.0519 3.4238,10.9379 3.416,10.8121C3.4101,10.6962 3.4906,10.5547 3.6518,10.2717L7.4853,3.5146C7.6484,3.2277 7.7309,3.0842 7.8351,3.0312C7.9471,2.9742 8.0808,2.9742 8.1928,3.0312C8.297,3.0842 8.3795,3.2277 8.5426,3.5146L9.3307,4.8903L9.3347,4.8973C9.5109,5.2052 9.6002,5.3613 9.6392,5.5251C9.6825,5.7039 9.6825,5.8926 9.6392,6.0715C9.5999,6.2365 9.5115,6.3938 9.3327,6.7063L7.319,10.2658L7.3138,10.2749C7.1365,10.5853 7.0466,10.7426 6.922,10.8613C6.7864,10.991 6.6233,11.0853 6.4445,11.1384C6.2813,11.1836 6.0986,11.1836 5.733,11.1836ZM9.6538,11.1836H11.8785C12.2067,11.1836 12.3718,11.1836 12.4701,11.1188C12.5762,11.05 12.643,10.934 12.6489,10.8083C12.6546,10.6961 12.5758,10.5601 12.4213,10.2935C12.416,10.2845 12.4107,10.2752 12.4052,10.2658L11.2909,8.3595L11.2782,8.3381C11.1216,8.0733 11.0426,7.9395 10.941,7.8878C10.8291,7.8309 10.6973,7.8309 10.5853,7.8878C10.4831,7.9409 10.4006,8.0805 10.2375,8.3615L9.1271,10.2678L9.1233,10.2744C8.9607,10.555 8.8795,10.6952 8.8854,10.8102C8.8932,10.936 8.9581,11.0519 9.0642,11.1207C9.1605,11.1836 9.3256,11.1836 9.6538,11.1836Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_binance_round.xml b/app/src/main/res/drawable/ic_binance_round.xml
deleted file mode 100644
index 6b399342e0..0000000000
--- a/app/src/main/res/drawable/ic_binance_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F3BA2F" android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"/>
-    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M6.0578,7.202L8.0002,5.2604L9.9434,7.2036L11.073,6.0733L8.0002,2.9998L4.9275,6.0725L6.0578,7.202ZM2.999,8.0005L4.129,6.8706L5.259,8.0005L4.129,9.1304L2.999,8.0005ZM8.0002,10.7408L6.0578,8.7985L4.9258,9.9272L4.9274,9.9288L8.0002,13.0007L11.073,9.9272L11.0738,9.9264L9.9434,8.7977L8.0002,10.7408ZM10.74,8.0009L11.87,6.871L12.9999,8.0009L11.87,9.1308L10.74,8.0009ZM8.0004,6.8526L9.1466,7.9995H9.1473L9.1466,8.0003L8.0004,9.1472L6.8542,8.0019L6.8526,7.9995L6.8542,7.9979L7.0549,7.7973L7.1528,7.7001L8.0004,6.8526Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_bitcoin_cash_round.xml b/app/src/main/res/drawable/ic_bitcoin_cash_round.xml
deleted file mode 100644
index 704b9c7c96..0000000000
--- a/app/src/main/res/drawable/ic_bitcoin_cash_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#0AC18E" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M10.6797,5.3445C10.272,4.4259 9.3351,4.2295 8.1882,4.4198L7.8196,3L6.9507,3.223L7.3131,4.6387C7.0845,4.696 6.8498,4.7451 6.6171,4.8106L6.2547,3.403L5.3858,3.626L5.7543,5.0458C5.567,5.099 4,5.498 4,5.498L4.2389,6.4227C4.2389,6.4227 4.8772,6.2447 4.871,6.259C5.2252,6.1669 5.3919,6.3429 5.4702,6.5086L6.4833,10.3998C6.4956,10.5123 6.475,10.7046 6.232,10.77C6.2465,10.7782 5.5999,10.9317 5.5999,10.9317L5.6946,12.0098C5.6946,12.0098 7.2472,11.615 7.451,11.5638L7.8237,13L8.6927,12.777L8.32,11.3306C8.5588,11.2754 8.7915,11.2181 9.018,11.1588L9.3886,12.597L10.2576,12.374L9.8849,10.9399C11.2233,10.6166 12.1684,9.7778 11.9748,8.4951C11.8513,7.7218 11.0009,7.0876 10.2946,7.016C10.7291,6.6334 10.9494,6.0749 10.6797,5.3445ZM10.2617,8.7304C10.4346,10.0008 8.6577,10.1563 8.0708,10.3097L7.5602,8.4092C8.1491,8.2557 9.9693,7.6113 10.2617,8.7304ZM9.191,6.1424C9.3742,7.2717 7.8546,7.4026 7.3646,7.5274L6.8992,5.8028C7.3913,5.6821 8.8183,5.097 9.191,6.1424Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_bitcoin_round.xml b/app/src/main/res/drawable/ic_bitcoin_round.xml
deleted file mode 100644
index ab0c448c23..0000000000
--- a/app/src/main/res/drawable/ic_bitcoin_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F7931A" android:pathData="M15.7605,9.9353C14.6919,14.221 10.3507,16.8292 6.064,15.7605C1.7791,14.692 -0.8295,10.351 0.2396,6.0656C1.3077,1.7794 5.649,-0.8291 9.9344,0.2394C14.2209,1.3079 16.8292,5.6493 15.7605,9.9353Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M11.5275,6.8603C11.6868,5.7958 10.8762,5.2236 9.7678,4.8418L10.1273,3.3998L9.2495,3.1811L8.8995,4.5851C8.6687,4.5276 8.4317,4.4733 8.1961,4.4196L8.5487,3.0064L7.6713,2.7876L7.3116,4.2291C7.1205,4.1856 6.933,4.1426 6.751,4.0973L6.752,4.0928L5.5414,3.7906L5.3078,4.7281C5.3078,4.7281 5.9592,4.8773 5.9454,4.8866C6.301,4.9753 6.3652,5.2106 6.3545,5.3971L5.9449,7.0398C5.9694,7.0461 6.0012,7.0551 6.0362,7.0691C6.0069,7.0618 5.9757,7.0538 5.9434,7.0461L5.3693,9.3473C5.3258,9.4553 5.2156,9.6173 4.9671,9.5558C4.9758,9.5685 4.329,9.3965 4.329,9.3965L3.8932,10.4013L5.0356,10.686C5.2481,10.7393 5.4563,10.795 5.6614,10.8475L5.2981,12.306L6.1749,12.5248L6.5347,11.0818C6.7742,11.1468 7.0068,11.2068 7.2343,11.2633L6.8758,12.6995L7.7536,12.9182L8.1169,11.4625C9.6138,11.7458 10.7394,11.6315 11.2132,10.2778C11.595,9.1878 11.1942,8.559 10.4066,8.149C10.9802,8.0168 11.4122,7.6396 11.5275,6.8603ZM9.5218,9.6725C9.2505,10.7625 7.4151,10.1733 6.82,10.0255L7.3021,8.0933C7.8971,8.2418 9.8053,8.5358 9.5218,9.6725ZM9.7933,6.8446C9.5458,7.8361 8.0181,7.3323 7.5226,7.2088L7.9596,5.4563C8.4552,5.5798 10.0511,5.8103 9.7933,6.8446Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_bsc_round.xml b/app/src/main/res/drawable/ic_bsc_round.xml
deleted file mode 100644
index cca406ef7b..0000000000
--- a/app/src/main/res/drawable/ic_bsc_round.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M8,0C12.4186,0 16,3.5814 16,8C16,12.4186 12.4186,16 8,16C3.5814,16 0,12.4186 0,8C0,3.5814 3.5814,0 8,0Z"/>
-    <path android:fillColor="#F0B90B" android:pathData="M4.3968,8.0001L4.4025,10.1154L6.2,11.1731V12.4116L3.3506,10.7404V7.3815L4.3968,8.0001ZM4.3968,5.8847V7.1174L3.35,6.4981V5.2655L4.3968,4.6462L5.4487,5.2655L4.3968,5.8847ZM6.9506,5.2655L7.9974,4.6462L9.0493,5.2655L7.9974,5.8847L6.9506,5.2655Z"/>
-    <path android:fillColor="#F0B90B" android:pathData="M5.1532,9.677V8.4385L6.2,9.0577V10.2904L5.1532,9.677ZM6.9506,11.6167L7.9974,12.2359L9.0493,11.6167V12.8494L7.9974,13.4686L6.9506,12.8494V11.6167ZM10.5505,5.2655L11.5973,4.6462L12.6492,5.2655V6.4981L11.5973,7.1174V5.8847L10.5505,5.2655ZM11.5973,10.1154L11.6031,8.0001L12.6499,7.3808V10.7398L9.8006,12.4109V11.1725L11.5973,10.1154Z"/>
-    <path android:fillColor="#F0B90B" android:pathData="M10.8468,9.6769L9.8,10.2903V9.0577L10.8468,8.4385V9.6769Z"/>
-    <path android:fillColor="#F0B90B" android:pathData="M10.8468,6.3232L10.8526,7.5616L9.05,8.6193V10.7398L8.0032,11.3533L6.9564,10.7398V8.6193L5.1538,7.5616V6.3232L6.2051,5.7039L7.9968,6.7667L9.7993,5.7039L10.8513,6.3232H10.8468ZM5.1532,4.2084L7.9974,2.5315L10.8468,4.2084L9.8,4.8276L7.9974,3.7648L6.2,4.8276L5.1532,4.2084Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_cardano_round.xml b/app/src/main/res/drawable/ic_cardano_round.xml
deleted file mode 100644
index 6764bbb9e8..0000000000
--- a/app/src/main/res/drawable/ic_cardano_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#0033AD" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#ffffff" android:pathData="M7.8738,3.2662C8.098,3.1493 8.3717,3.4204 8.2526,3.6444C8.1834,3.827 7.9211,3.8755 7.7871,3.7364C7.6452,3.6028 7.6915,3.3388 7.8738,3.2662ZM5.4626,3.5261C5.5988,3.47 5.7712,3.5948 5.7573,3.7432C5.7718,3.9043 5.5747,4.0229 5.4359,3.9464C5.252,3.8751 5.273,3.5766 5.4626,3.5261ZM10.4011,3.9509C10.1883,3.9252 10.1546,3.5906 10.3595,3.5232C10.5184,3.4457 10.6642,3.591 10.6875,3.7417C10.6541,3.8703 10.5465,3.9881 10.4011,3.9509ZM6.0113,4.5523C6.2389,4.4083 6.5638,4.6228 6.5288,4.8872C6.517,5.1543 6.1623,5.309 5.9622,5.1284C5.7687,4.9867 5.798,4.6614 6.0113,4.5523ZM9.4869,4.7051C9.5884,4.4434 10,4.4354 10.1156,4.6903C10.2299,4.8886 10.0894,5.1342 9.8857,5.2016C9.616,5.2519 9.3599,4.9604 9.4869,4.7051ZM7.5835,5.1867C7.5813,4.9617 7.7862,4.7941 8.0001,4.7787C8.1419,4.8072 8.2965,4.8676 8.3573,5.0107C8.4707,5.2082 8.37,5.48 8.1651,5.5706C8.0714,5.6231 7.9607,5.6034 7.8586,5.5973C7.7027,5.5208 7.5713,5.3706 7.5835,5.1867ZM3.9976,5.5146C4.2056,5.3867 4.4862,5.62 4.4075,5.846C4.3641,6.0414 4.1014,6.1209 3.9512,5.9962C3.7909,5.8793 3.8163,5.5982 3.9976,5.5146ZM11.6978,5.5142C11.8742,5.3772 12.1654,5.5343 12.1444,5.7571C12.1562,5.9603 11.9045,6.1135 11.7293,6.0089C11.5364,5.9222 11.5167,5.6253 11.6978,5.5142ZM8.5919,5.9187C8.8831,5.814 9.2289,5.9392 9.3949,6.1988C9.6138,6.5162 9.4974,6.9995 9.1576,7.1816C8.8056,7.397 8.2916,7.2144 8.1615,6.8213C8.014,6.4694 8.229,6.029 8.5919,5.9187ZM6.8834,5.9533C7.2062,5.8009 7.6405,5.9287 7.7964,6.2589C7.9798,6.5802 7.838,7.0276 7.51,7.1935C7.1816,7.38 6.7183,7.2386 6.5594,6.8936C6.3812,6.56 6.5395,6.1069 6.8834,5.9533ZM5.1728,6.5381C5.1973,6.3302 5.3934,6.1949 5.5913,6.1809C5.8046,6.2066 5.9749,6.3722 5.9981,6.588C5.9841,6.8016 5.819,7.0104 5.5926,7.0091C5.3436,7.0306 5.1252,6.7828 5.1728,6.5381ZM10.2255,6.2261C10.4812,6.0773 10.8363,6.2939 10.8249,6.5877C10.8425,6.8989 10.4495,7.1183 10.1949,6.9357C9.9304,6.7837 9.951,6.3555 10.2255,6.2261ZM6.1882,7.3231C6.4872,7.2408 6.8292,7.3818 6.9759,7.6566C7.1365,7.9333 7.0708,8.3177 6.8213,8.5206C6.5013,8.8183 5.911,8.6988 5.7407,8.2926C5.545,7.9201 5.7827,7.4211 6.1882,7.3231ZM9.4286,7.3215C9.7194,7.2384 10.0609,7.3504 10.2172,7.6153C10.4238,7.9182 10.3252,8.37 10.0176,8.5653C9.6953,8.792 9.1961,8.673 9.0188,8.3184C8.8038,7.9517 9.0202,7.4334 9.4286,7.3215ZM4.2647,7.6671C4.523,7.5694 4.8094,7.8545 4.7047,8.1106C4.6408,8.3439 4.312,8.4302 4.1421,8.2581C3.9433,8.0966 4.0169,7.7372 4.2647,7.6671ZM11.2667,8.0388C11.2593,7.8247 11.4159,7.6352 11.6354,7.6234C11.8123,7.6514 11.9843,7.7941 11.9703,7.9867C11.9865,8.2411 11.68,8.414 11.4633,8.2944C11.3617,8.2428 11.3096,8.1386 11.2667,8.0388ZM2.9945,7.7928C3.1499,7.7249 3.3422,7.8596 3.3067,8.0322C3.2983,8.2276 3.0098,8.3028 2.9038,8.1395C2.8102,8.0261 2.8662,7.8512 2.9945,7.7928ZM12.7939,7.7889C12.9033,7.7109 13.0789,7.767 13.1223,7.8948C13.1958,8.0344 13.061,8.2257 12.9038,8.2021C12.6832,8.2222 12.6118,7.886 12.7939,7.7889ZM7.0323,8.727C7.4413,8.6206 7.8809,8.9616 7.8835,9.3827C7.9102,9.8083 7.4772,10.1856 7.0585,10.0873C6.735,10.0352 6.4811,9.7235 6.4915,9.3965C6.4907,9.0838 6.7267,8.7931 7.0323,8.727ZM8.6519,8.7261C9.067,8.6101 9.5197,8.9572 9.5131,9.388C9.5351,9.8057 9.1156,10.1703 8.7057,10.0875C8.32,10.0376 8.0354,9.6138 8.1431,9.2395C8.1974,8.9901 8.4058,8.7872 8.6519,8.7261ZM5.5292,8.9853C5.8165,8.9363 6.0857,9.2567 5.9692,9.5295C5.8843,9.8201 5.4613,9.8989 5.2743,9.6615C5.055,9.4335 5.2187,9.0168 5.5292,8.9853ZM10.2789,8.9981C10.535,8.8908 10.8494,9.1124 10.8297,9.3904C10.84,9.6964 10.4519,9.9074 10.2014,9.7288C9.9177,9.5684 9.9694,9.0965 10.2789,8.9981ZM11.6065,10.3297C11.5062,10.1427 11.6884,9.895 11.8959,9.9296C11.9993,9.9278 12.0715,10.0092 12.1377,10.0775C12.1512,10.1883 12.174,10.3205 12.0821,10.4059C11.9572,10.5639 11.6743,10.5188 11.6065,10.3297ZM3.9968,9.9816C4.1907,9.8525 4.4699,10.0451 4.4263,10.2719C4.4031,10.4725 4.1504,10.5871 3.984,10.4733C3.8054,10.37 3.812,10.0758 3.9968,9.9816ZM7.8292,10.4015C8.0832,10.2894 8.4067,10.5105 8.3826,10.7902C8.4015,11.0993 8.0013,11.3134 7.753,11.1278C7.4772,10.9684 7.5232,10.4995 7.8292,10.4015ZM6.0542,10.8156C6.2705,10.7018 6.5607,10.8983 6.541,11.1404C6.5476,11.3392 6.3536,11.5086 6.1575,11.4792C5.995,11.4757 5.8891,11.3301 5.837,11.1916C5.8396,11.0406 5.9018,10.8725 6.0542,10.8156ZM9.6497,10.8191C9.8722,10.6816 10.1883,10.8791 10.1673,11.1379C10.173,11.4085 9.8157,11.5818 9.6086,11.4041C9.4081,11.2648 9.4326,10.9299 9.6497,10.8191ZM10.275,12.3649C10.1761,12.2152 10.2925,12.0348 10.4532,12.0007C10.5824,12.0269 10.719,12.1241 10.6918,12.2739C10.673,12.4765 10.3766,12.5387 10.275,12.3649ZM5.3116,12.2349C5.351,12.1162 5.4464,11.9983 5.5861,12.0292C5.7897,12.0436 5.8501,12.3505 5.6719,12.4451C5.5117,12.5531 5.3258,12.4051 5.3116,12.2349ZM7.7062,12.371C7.7451,12.1955 7.9723,12.1101 8.1221,12.2033C8.2211,12.2458 8.25,12.3565 8.2754,12.4507C8.2618,12.4997 8.2496,12.5487 8.2377,12.5978C8.1764,12.6704 8.0976,12.7431 7.9956,12.7405C7.806,12.7627 7.6349,12.5483 7.7062,12.371Z"/>
-</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_close.xml b/app/src/main/res/drawable/ic_close.xml
deleted file mode 100644
index d276f8584c..0000000000
--- a/app/src/main/res/drawable/ic_close.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <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/app/src/main/res/drawable/ic_dogecoin_round.xml b/app/src/main/res/drawable/ic_dogecoin_round.xml
deleted file mode 100644
index 8a89a70dcf..0000000000
--- a/app/src/main/res/drawable/ic_dogecoin_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#C2A633" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M5.3545,12.185H8.1164H8.1165C8.1165,12.185 11.9999,12.5157 11.9999,8.0674C11.9999,3.7917 8.4536,3.8068 7.7682,3.8098C7.7521,3.8098 7.7376,3.8099 7.7248,3.8099H5.3544V7.5406H4.3809V8.4545H5.3545V12.185ZM6.9101,5.3579H7.9998C8.4074,5.3579 10.4578,5.5245 10.4611,8.0975C10.4643,10.6399 8.397,10.6373 8.0645,10.6368C8.0604,10.6368 8.0567,10.6368 8.0532,10.6368H6.9101V8.4544H8.6245V7.5405H6.9101V5.3579Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_eth_round.xml b/app/src/main/res/drawable/ic_eth_round.xml
deleted file mode 100644
index b62152ede8..0000000000
--- a/app/src/main/res/drawable/ic_eth_round.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector android:autoMirrored="true" android:height="22dp"
-    android:viewportHeight="22" android:viewportWidth="22"
-    android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M11,22C17.0751,22 22,17.0751 22,11C22,4.9249 17.0751,0 11,0C4.9249,0 0,4.9249 0,11C0,17.0751 4.9249,22 11,22Z"/>
-    <group>
-        <clip-path android:pathData="M11.0001,3.8501L11.0001,3.8501A4.4,4.4 0,0 1,15.4001 8.2501L15.4001,13.7501A4.4,4.4 0,0 1,11.0001 18.1501L11.0001,18.1501A4.4,4.4 0,0 1,6.6001 13.7501L6.6001,8.2501A4.4,4.4 0,0 1,11.0001 3.8501z"/>
-        <path android:fillColor="#343434" android:pathData="M10.999,3.8501L10.903,4.1759V13.6292L10.999,13.7249L15.3977,11.1311L10.999,3.8501Z"/>
-        <path android:fillColor="#8C8C8C" android:pathData="M10.9988,3.8501L6.6001,11.1311L10.9988,13.725V9.1366V3.8501Z"/>
-        <path android:fillColor="#3C3C3B" android:pathData="M10.9987,14.5559L10.9446,14.6217V17.9892L10.9987,18.147L15.4001,11.9634L10.9987,14.5559Z"/>
-        <path android:fillColor="#8C8C8C" android:pathData="M10.9988,18.147V14.5559L6.6001,11.9634L10.9988,18.147Z"/>
-        <path android:fillColor="#141414" android:pathData="M10.9987,13.725L15.3973,11.1312L10.9987,9.1367V13.725Z"/>
-        <path android:fillColor="#393939" android:pathData="M6.6001,11.1312L10.9987,13.7251V9.1367L6.6001,11.1312Z"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_ethc_round.xml b/app/src/main/res/drawable/ic_ethc_round.xml
deleted file mode 100644
index 31f3dbacd8..0000000000
--- a/app/src/main/res/drawable/ic_ethc_round.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:autoMirrored="true" android:height="22dp"
-    android:viewportHeight="22" android:viewportWidth="22"
-    android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.12" android:fillColor="#3AB83A" android:pathData="M11,22C17.0751,22 22,17.0751 22,11C22,4.9249 17.0751,0 11,0C4.9249,0 0,4.9249 0,11C0,17.0751 4.9249,22 11,22Z"/>
-    <path android:fillColor="#3AB83A" android:pathData="M7,11.6243C8.4096,12.4331 9.8804,13.2797 11.0164,13.9348L15,11.6243C13.5576,13.9395 12.3558,15.8669 11.0164,18C9.6747,15.8716 8.1929,13.523 7,11.6243ZM7.1532,10.9857L11.0208,8.7559L14.838,10.9694L11.023,13.2017L7.1532,10.9857ZM11.0164,8.0415L7,10.326L10.9989,4L15,10.3402L11.0164,8.0415Z"/>
-    <path android:fillColor="#0B8311" android:pathData="M11.0164,13.9348L15,11.6243C13.5576,13.9395 11.0164,18 11.0164,18V13.9348ZM11.0208,8.7559L14.838,10.9694L11.023,13.2017L11.0208,8.7559ZM11.0164,8.0417L10.9989,4L15,10.3402L11.0164,8.0417Z"/>
-    <path android:fillColor="#0B8311" android:pathData="M7.1532,10.9859L11.021,11.3288L14.8382,10.9717L11.023,13.2041L7.1532,10.9859Z"/>
-    <path android:fillColor="#146714" android:pathData="M11.0208,11.3288L14.838,10.9717L11.0229,13.2041L11.0208,11.3288Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_fantom_round.xml b/app/src/main/res/drawable/ic_fantom_round.xml
deleted file mode 100644
index e970acee86..0000000000
--- a/app/src/main/res/drawable/ic_fantom_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="22dp"
-    android:viewportHeight="22" android:viewportWidth="22"
-    android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#13B5EC" android:pathData="M11,22C17.0751,22 22,17.0751 22,11C22,4.9249 17.0751,0 11,0C4.9249,0 0,4.9249 0,11C0,17.0751 4.9249,22 11,22Z"/>
-    <path android:fillColor="#F8F9F9" android:fillType="evenOdd" android:pathData="M11.825,8.8687L14.3,7.425V10.3125L11.825,8.8687ZM14.3,15.0562L11,16.9813L7.7,15.0562V11.6875L11,13.6125L14.3,11.6875V15.0562ZM7.7,7.425L10.175,8.8687L7.7,10.3125V7.425ZM11.4125,9.5562L13.8875,11L11.4125,12.4438V9.5562ZM10.5875,12.4438L8.1125,11L10.5875,9.5562V12.4438ZM13.8875,6.7375L11,8.3875L8.1125,6.7375L11,5.0188L13.8875,6.7375ZM6.875,6.4625V15.4688L11,17.8062L15.125,15.4688V6.4625L11,4.125L6.875,6.4625Z"/>
-</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_gnosis_round.xml b/app/src/main/res/drawable/ic_gnosis_round.xml
deleted file mode 100644
index 8734b7177b..0000000000
--- a/app/src/main/res/drawable/ic_gnosis_round.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:height="22dp" android:viewportHeight="22"
-    android:viewportWidth="22" android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3A775B" android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
-    <path android:fillColor="#ffffff" android:pathData="M7.703,12.11C8.163,12.11 8.612,11.957 8.974,11.677L6.058,8.761C5.356,9.669 5.524,10.978 6.432,11.68C6.799,11.957 7.243,12.11 7.703,12.11Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M16.376,10.028C16.376,9.568 16.223,9.12 15.942,8.757L13.026,11.673C13.935,12.376 15.24,12.208 15.942,11.299C16.223,10.936 16.376,10.488 16.376,10.028Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M17.845,6.854L16.555,8.144C17.594,9.389 17.43,11.243 16.185,12.282C15.094,13.194 13.508,13.194 12.417,12.282L11,13.699L9.587,12.286C8.342,13.325 6.488,13.161 5.449,11.916C4.536,10.824 4.536,9.239 5.449,8.148L4.787,7.486L4.159,6.854C3.4,8.103 3,9.538 3,11C3,15.419 6.581,19 11,19C15.419,19 19,15.419 19,11C19.004,9.538 18.6,8.103 17.845,6.854Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M16.787,5.478C13.74,2.282 8.679,2.163 5.482,5.209C5.389,5.299 5.299,5.389 5.213,5.478C5.015,5.688 4.828,5.905 4.652,6.133L11,12.484L17.348,6.133C17.176,5.905 16.985,5.688 16.787,5.478ZM11,4.047C12.869,4.047 14.611,4.768 15.92,6.084L11,11.004L6.08,6.084C7.389,4.768 9.131,4.047 11,4.047Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_kusama_round.xml b/app/src/main/res/drawable/ic_kusama_round.xml
deleted file mode 100644
index f620ae3130..0000000000
--- a/app/src/main/res/drawable/ic_kusama_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#ffffff" android:pathData="M12.4155,5.3206C12.265,5.2041 12.0856,5.0449 11.7587,5.0051C11.452,4.9653 11.1395,5.1671 10.9282,5.3007C10.717,5.4343 10.3177,5.8266 10.1528,5.946C9.9879,6.0654 9.5654,6.1762 8.8854,6.577C8.2054,6.9778 5.5376,8.6606 5.5376,8.6606L6.2321,8.6691L3.136,10.2354H3.4456L3,10.5679C3,10.5679 3.3935,10.6703 3.7234,10.4656V10.5594C3.7234,10.5594 7.4097,9.1325 8.1215,9.502L7.6875,9.6271C7.7251,9.6271 8.4254,9.6725 8.4254,9.6725C8.4423,9.815 8.4911,9.952 8.5681,10.0738C8.6451,10.1957 8.7485,10.2994 8.8709,10.3775C9.2934,10.6504 9.3021,10.801 9.3021,10.801C9.3021,10.801 9.0822,10.8891 9.0822,11C9.0822,11 9.4063,10.9034 9.7072,10.9119C9.8982,10.919 10.0876,10.9486 10.2714,11C10.2714,11 10.2483,10.8806 9.956,10.801C9.6638,10.7214 9.3744,10.4088 9.2326,10.2382C9.1458,10.1296 9.0892,10.0008 9.0684,9.8642C9.0476,9.7276 9.0633,9.5881 9.114,9.4593C9.2153,9.2007 9.5683,9.0585 10.2975,8.689C11.1568,8.2513 11.3536,7.9272 11.4751,7.6742C11.5966,7.4212 11.776,6.9181 11.8773,6.6822C12.0046,6.378 12.1609,6.216 12.2911,6.1194C12.4213,6.0227 13,5.8095 13,5.8095C13,5.8095 12.5573,5.4315 12.4155,5.3206Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_litecoin_round.xml b/app/src/main/res/drawable/ic_litecoin_round.xml
deleted file mode 100644
index 018f6f35bc..0000000000
--- a/app/src/main/res/drawable/ic_litecoin_round.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group>
-        <clip-path android:pathData="M0,0h16v16h-16z"/>
-        <path android:fillColor="#ffffff" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
-        <path android:fillColor="#345D9D" android:pathData="M8,0C6.4177,0 4.871,0.4692 3.5554,1.3482C2.2399,2.2273 1.2145,3.4767 0.609,4.9385C0.0035,6.4003 -0.155,8.0089 0.1537,9.5607C0.4624,11.1126 1.2243,12.538 2.3431,13.6569C3.462,14.7757 4.8874,15.5376 6.4393,15.8463C7.9911,16.155 9.5997,15.9965 11.0615,15.391C12.5233,14.7855 13.7727,13.7602 14.6518,12.4446C15.5308,11.129 16,9.5822 16,8C16.0031,6.9525 15.7998,5.9146 15.4017,4.9457C15.0037,3.9767 14.4187,3.0956 13.6801,2.3528C12.9416,1.6099 12.0639,1.0198 11.0973,0.6161C10.1307,0.2124 9.094,0.003 8.0465,0H8ZM8.1356,8.2712L7.3027,11.0799H11.7579C11.7874,11.0789 11.8168,11.0837 11.8445,11.094C11.8721,11.1044 11.8975,11.12 11.9191,11.1402C11.9407,11.1603 11.9581,11.1846 11.9703,11.2114C11.9825,11.2383 11.9893,11.2673 11.9903,11.2969V11.3705L11.6029,12.707C11.5858,12.7702 11.5478,12.8257 11.495,12.8645C11.4422,12.9032 11.3778,12.9228 11.3124,12.9201H4.4939L5.6368,9.0266L4.3584,9.414L4.6489,8.523L5.9274,8.1356L7.5351,2.6731C7.5528,2.6103 7.591,2.5552 7.6437,2.5165C7.6963,2.4779 7.7604,2.458 7.8257,2.4601H9.5496C9.5792,2.459 9.6086,2.4638 9.6362,2.4741C9.6639,2.4845 9.6892,2.5002 9.7108,2.5203C9.7324,2.5405 9.7498,2.5647 9.762,2.5916C9.7743,2.6185 9.7811,2.6475 9.7821,2.677V2.7506L8.4262,7.3608L9.7046,6.9734L9.4334,7.9032L8.1356,8.2712Z"/>
-    </group>
-</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.xml b/app/src/main/res/drawable/ic_more.xml
deleted file mode 100644
index 2ea52e3dbc..0000000000
--- a/app/src/main/res/drawable/ic_more.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M12,16C12.53,16 13.039,16.211 13.414,16.586C13.789,16.961 14,17.47 14,18C14,18.53 13.789,19.039 13.414,19.414C13.039,19.789 12.53,20 12,20C11.47,20 10.961,19.789 10.586,19.414C10.211,19.039 10,18.53 10,18C10,17.47 10.211,16.961 10.586,16.586C10.961,16.211 11.47,16 12,16ZM12,10C12.53,10 13.039,10.211 13.414,10.586C13.789,10.961 14,11.47 14,12C14,12.53 13.789,13.039 13.414,13.414C13.039,13.789 12.53,14 12,14C11.47,14 10.961,13.789 10.586,13.414C10.211,13.039 10,12.53 10,12C10,11.47 10.211,10.961 10.586,10.586C10.961,10.211 11.47,10 12,10ZM12,4C12.53,4 13.039,4.211 13.414,4.586C13.789,4.961 14,5.47 14,6C14,6.53 13.789,7.039 13.414,7.414C13.039,7.789 12.53,8 12,8C11.47,8 10.961,7.789 10.586,7.414C10.211,7.039 10,6.53 10,6C10,5.47 10.211,4.961 10.586,4.586C10.961,4.211 11.47,4 12,4Z"/>
-</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_optimism.xml b/app/src/main/res/drawable/ic_optimism.xml
deleted file mode 100644
index fb8ce845a1..0000000000
--- a/app/src/main/res/drawable/ic_optimism.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-    <group>
-        <clip-path android:pathData="M0,0h22v22h-22z" />
-        <path
-            android:fillColor="#FF0420"
-            android:pathData="M11,22C17.075,22 22,17.075 22,11C22,4.925 17.075,0 11,0C4.925,0 0,4.925 0,11C0,17.075 4.925,22 11,22Z" />
-        <path
-            android:fillColor="#ffffff"
-            android:fillType="evenOdd"
-            android:pathData="M4.244,14.356C4.814,14.777 5.546,14.987 6.439,14.987C7.52,14.987 8.383,14.735 9.029,14.233C9.674,13.722 10.128,12.953 10.391,11.925C10.548,11.294 10.684,10.645 10.796,9.977C10.834,9.737 10.852,9.538 10.852,9.38C10.852,8.855 10.721,8.404 10.458,8.029C10.196,7.646 9.835,7.361 9.378,7.174C8.92,6.978 8.402,6.881 7.824,6.881C5.7,6.881 4.383,7.913 3.872,9.977C3.692,10.735 3.553,11.384 3.456,11.925C3.418,12.165 3.399,12.367 3.399,12.533C3.399,13.321 3.681,13.929 4.244,14.356ZM7.666,12.994C7.374,13.242 7.017,13.366 6.597,13.366C5.876,13.366 5.516,13.02 5.516,12.33C5.516,12.165 5.531,12.007 5.561,11.857C5.696,11.129 5.831,10.514 5.966,10.011C6.094,9.5 6.304,9.121 6.597,8.874C6.897,8.626 7.257,8.502 7.678,8.502C8.391,8.502 8.747,8.844 8.747,9.526C8.747,9.692 8.732,9.853 8.702,10.011C8.612,10.536 8.481,11.151 8.308,11.857C8.18,12.367 7.967,12.746 7.666,12.994ZM11.178,14.795C11.223,14.848 11.287,14.874 11.369,14.874H12.9C12.975,14.874 13.047,14.848 13.114,14.795C13.182,14.743 13.223,14.675 13.238,14.593L13.756,12.127H15.276C16.259,12.127 17.032,11.921 17.595,11.508C18.166,11.095 18.545,10.457 18.732,9.594C18.777,9.391 18.8,9.196 18.8,9.009C18.8,8.356 18.545,7.857 18.034,7.511C17.531,7.166 16.863,6.993 16.03,6.993H13.035C12.96,6.993 12.889,7.02 12.822,7.072C12.754,7.125 12.713,7.192 12.698,7.275L11.144,14.593C11.129,14.668 11.14,14.735 11.178,14.795ZM16.177,10.315C15.944,10.487 15.67,10.573 15.355,10.573H14.06L14.488,8.558H15.839C16.147,8.558 16.364,8.618 16.492,8.738C16.619,8.851 16.683,9.016 16.683,9.234C16.683,9.331 16.672,9.444 16.649,9.572C16.574,9.894 16.417,10.142 16.177,10.315Z" />
-    </group>
-</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_polkadot_round.xml b/app/src/main/res/drawable/ic_polkadot_round.xml
deleted file mode 100644
index 346f130d82..0000000000
--- a/app/src/main/res/drawable/ic_polkadot_round.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FEF2F8" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#E6007A" android:pathData="M7.9994,4.5169C9.2703,4.5169 10.3006,3.9535 10.3006,3.2585C10.3006,2.5634 9.2703,2 7.9994,2C6.7285,2 5.6982,2.5634 5.6982,3.2585C5.6982,3.9535 6.7285,4.5169 7.9994,4.5169Z"/>
-    <path android:fillColor="#E6007A" android:pathData="M7.9994,13.9991C9.2703,13.9991 10.3006,13.4357 10.3006,12.7406C10.3006,12.0456 9.2703,11.4822 7.9994,11.4822C6.7285,11.4822 5.6982,12.0456 5.6982,12.7406C5.6982,13.4357 6.7285,13.9991 7.9994,13.9991Z"/>
-    <path android:fillColor="#E6007A" android:pathData="M4.7927,6.259C5.4282,5.2241 5.424,4.1032 4.7835,3.7555C4.1429,3.4077 3.1086,3.9648 2.4731,4.9997C1.8376,6.0346 1.8418,7.1554 2.4823,7.5032C3.1228,7.8509 4.1572,7.2939 4.7927,6.259Z"/>
-    <path android:fillColor="#E6007A" android:pathData="M13.5251,10.9994C14.1605,9.9645 14.1567,8.8438 13.5166,8.4963C12.8765,8.1488 11.8425,8.706 11.207,9.7409C10.5715,10.7758 10.5753,11.8965 11.2154,12.244C11.8555,12.5915 12.8896,12.0343 13.5251,10.9994Z"/>
-    <path android:fillColor="#E6007A" android:pathData="M4.7837,12.2438C5.4243,11.896 5.4284,10.7752 4.793,9.7403C4.1575,8.7054 3.1231,8.1483 2.4826,8.4961C1.842,8.8438 1.8379,9.9647 2.4733,10.9996C3.1088,12.0345 4.1432,12.5915 4.7837,12.2438Z"/>
-    <path android:fillColor="#E6007A" android:pathData="M13.517,7.5035C14.1571,7.156 14.1609,6.0353 13.5255,5.0004C12.89,3.9655 11.856,3.4083 11.2159,3.7558C10.5758,4.1033 10.572,5.224 11.2075,6.2589C11.8429,7.2938 12.8769,7.851 13.517,7.5035Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_polygon_round.xml b/app/src/main/res/drawable/ic_polygon_round.xml
deleted file mode 100644
index d8e57f8f97..0000000000
--- a/app/src/main/res/drawable/ic_polygon_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#8247E5" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M10.6283,6.3937C10.4378,6.2889 10.1902,6.2889 9.9808,6.3937L8.4952,7.1968L7.4858,7.7205L6.0003,8.5237C5.8098,8.6284 5.5622,8.6284 5.3527,8.5237L4.1719,7.8951C3.9815,7.7904 3.8482,7.5983 3.8482,7.3888V6.1492C3.8482,5.9397 3.9624,5.7477 4.1719,5.6429L5.3337,5.0319C5.5241,4.9271 5.7717,4.9271 5.9812,5.0319L7.143,5.6429C7.3335,5.7477 7.4668,5.9397 7.4668,6.1492V6.9524L8.4762,6.4111V5.608C8.4762,5.3985 8.3619,5.2064 8.1524,5.1017L6.0003,3.9494C5.8098,3.8447 5.5622,3.8447 5.3527,3.9494L3.1625,5.1017C2.953,5.2064 2.8387,5.3985 2.8387,5.608V7.93C2.8387,8.1395 2.953,8.3316 3.1625,8.4363L5.3527,9.5886C5.5432,9.6934 5.7908,9.6934 6.0003,9.5886L7.4858,8.803L8.4952,8.2618L9.9808,7.4761C10.1712,7.3714 10.4188,7.3714 10.6283,7.4761L11.7901,8.0872C11.9805,8.1919 12.1138,8.384 12.1138,8.5935V9.8331C12.1138,10.0426 11.9996,10.2346 11.7901,10.3394L10.6283,10.9679C10.4378,11.0727 10.1902,11.0727 9.9808,10.9679L8.819,10.3568C8.6285,10.2521 8.4952,10.06 8.4952,9.8505V9.0474L7.4858,9.5886V10.3917C7.4858,10.6013 7.6001,10.7933 7.8096,10.8981L9.9998,12.0504C10.1902,12.1551 10.4378,12.1551 10.6473,12.0504L12.8376,10.8981C13.028,10.7933 13.1613,10.6013 13.1613,10.3917V8.0697C13.1613,7.8602 13.0471,7.6682 12.8376,7.5634L10.6283,6.3937Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_rsk_round.xml b/app/src/main/res/drawable/ic_rsk_round.xml
deleted file mode 100644
index f4a6e92bde..0000000000
--- a/app/src/main/res/drawable/ic_rsk_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M12.9332,7.4093C12.9029,7.3959 12.1254,6.9819 11.469,7.3588C10.9473,7.6617 10.8363,8.271 10.8228,8.52L10.5805,8.6614C10.4627,8.5436 10.2944,8.4695 10.1093,8.4695C9.9242,8.4695 9.7626,8.5436 9.6448,8.6614L8.5341,8.0219C8.5475,7.9714 8.5576,7.9176 8.5576,7.8603C8.5576,7.5507 8.3523,7.2949 8.073,7.2141V6.8169C8.3961,6.6116 9.426,5.8543 9.426,4.646C9.426,3.2627 8.0427,2.3943 7.9854,2.3573L7.8912,2.3001L7.7869,2.3573C7.7297,2.3943 6.3531,3.2627 6.3531,4.6527C6.3531,5.8577 7.383,6.6083 7.7061,6.8237V7.2141C7.4267,7.2949 7.2214,7.554 7.2214,7.8603C7.2214,7.9176 7.2281,7.9714 7.245,8.0219L6.1343,8.6614C6.0165,8.5436 5.8482,8.4695 5.6698,8.4695C5.3029,8.4695 5,8.7725 5,9.1393C5,9.4423 5.2053,9.7048 5.4847,9.7856V11.1184C5.2053,11.1992 5,11.4584 5,11.7646C5,12.1315 5.3029,12.4344 5.6698,12.4344C5.8684,12.4344 6.0434,12.3537 6.1612,12.2123L7.2416,12.8383C7.2281,12.8888 7.2181,12.9427 7.2181,12.9999C7.2181,13.3668 7.521,13.6697 7.8878,13.6697C8.2547,13.6697 8.5576,13.3668 8.5576,12.9999C8.5576,12.9427 8.5509,12.8888 8.5341,12.8383L9.6145,12.2123C9.739,12.3436 9.9174,12.4344 10.1059,12.4344C10.4728,12.4344 10.7757,12.1315 10.7757,11.7646C10.7757,11.4617 10.5704,11.1992 10.291,11.1184V9.7856C10.5704,9.7048 10.7757,9.4456 10.7757,9.1393C10.7757,9.0888 10.769,9.0283 10.7622,8.9845L11.0046,8.8431C11.1459,8.9105 11.4253,9.0182 11.7417,9.0182C11.9335,9.0182 12.1388,8.9744 12.3441,8.8633C13.0005,8.4897 13.0341,7.6045 13.0341,7.5742V7.4598L12.9332,7.4093ZM10.2977,9.3783C10.2473,9.4221 10.1799,9.4456 10.1126,9.4456C10.0756,9.4456 10.0386,9.4389 10.0083,9.4221C9.978,9.4153 9.9511,9.3985 9.9275,9.3783C9.8703,9.3345 9.8232,9.2605 9.8164,9.1865C9.8164,9.173 9.8164,9.1562 9.8164,9.1427C9.8164,9.1292 9.8164,9.1191 9.8164,9.1057C9.8299,8.9946 9.9039,8.9071 10.0016,8.8633C10.0386,8.8499 10.0756,8.8398 10.1126,8.8398C10.1564,8.8398 10.1934,8.8465 10.2304,8.8633C10.3415,8.9071 10.4156,9.0182 10.4156,9.1427C10.4156,9.1562 10.4156,9.173 10.4088,9.1932C10.3954,9.2706 10.3516,9.3345 10.2977,9.3783ZM10.4088,11.7613C10.4088,11.9228 10.2776,12.0642 10.1059,12.0642C10.0487,12.0642 9.9948,12.0507 9.9511,12.0204C9.8636,11.97 9.8097,11.8723 9.8097,11.7613V11.7545C9.8097,11.7243 9.8164,11.6872 9.8232,11.667C9.8467,11.6165 9.8737,11.5627 9.9174,11.5358C9.9544,11.5055 9.9982,11.4853 10.0487,11.4786C10.0621,11.4786 10.0857,11.4718 10.0992,11.4718C10.1732,11.4718 10.2304,11.4954 10.2843,11.5391C10.3651,11.5863 10.4088,11.667 10.4088,11.7613ZM9.9242,11.1218C9.8366,11.1521 9.7491,11.1958 9.6818,11.253L8.5408,10.59C8.5475,10.5462 8.5543,10.5025 8.5543,10.4587C8.5543,10.3914 8.5475,10.3342 8.524,10.2736L9.6414,9.6274C9.7155,9.7014 9.8097,9.7586 9.9208,9.7889V11.1218H9.9242ZM7.8878,13.2994C7.7397,13.2994 7.6152,13.1884 7.595,13.0403C7.595,13.0268 7.595,13.01 7.595,12.9965C7.595,12.872 7.6758,12.7609 7.7801,12.7172C7.8172,12.7037 7.8542,12.6936 7.8912,12.6936C7.9282,12.6936 7.972,12.7003 8.0023,12.7172C8.1133,12.7609 8.1874,12.872 8.1874,12.9965C8.1874,13.01 8.1874,13.0268 8.1874,13.0403C8.1571,13.1917 8.0326,13.2994 7.8878,13.2994ZM7.2248,10.5933L6.0838,11.2497C6.0097,11.1925 5.929,11.1453 5.8415,11.1184V9.7856C5.9525,9.7553 6.04,9.698 6.1208,9.624L7.2382,10.2702C7.2248,10.3275 7.208,10.3948 7.208,10.4621C7.208,10.5058 7.2181,10.5496 7.2248,10.5933ZM5.9592,11.7613C5.9592,11.8723 5.902,11.9666 5.8179,12.0204C5.7741,12.0507 5.7236,12.0642 5.6631,12.0642C5.5015,12.0642 5.3601,11.9329 5.3601,11.7613C5.3601,11.667 5.4039,11.5762 5.4712,11.5257C5.5217,11.4819 5.589,11.4584 5.6563,11.4584C5.6698,11.4584 5.6933,11.4584 5.7068,11.4651C5.7573,11.4718 5.8011,11.4954 5.8381,11.5223C5.8818,11.5593 5.9189,11.6031 5.9323,11.6536C5.9391,11.6839 5.9458,11.7108 5.9458,11.7478C5.9592,11.7545 5.9592,11.7613 5.9592,11.7613ZM5.3568,9.1427C5.3568,8.9811 5.488,8.8398 5.6597,8.8398C5.6967,8.8398 5.7337,8.8465 5.7708,8.8633C5.865,8.9004 5.9391,8.9879 5.9559,9.0989C5.9559,9.1124 5.9559,9.1292 5.9559,9.1427C5.9559,9.1562 5.9559,9.173 5.9559,9.1865C5.9492,9.2672 5.9054,9.3345 5.8448,9.3783C5.8212,9.3918 5.8011,9.4086 5.7708,9.4221C5.7337,9.4355 5.6967,9.4456 5.6597,9.4456C5.5856,9.4456 5.5284,9.4221 5.4746,9.3783C5.4005,9.3211 5.3568,9.2403 5.3568,9.1427ZM7.696,7.6214C7.7465,7.5843 7.8138,7.554 7.8811,7.554C7.9484,7.554 8.0124,7.5776 8.0662,7.6214C8.1235,7.6651 8.1605,7.7392 8.1773,7.8132C8.1773,7.8267 8.1773,7.8435 8.1773,7.857C8.1773,7.9512 8.1335,8.0421 8.0595,8.0926C8.0359,8.106 8.009,8.1229 7.9854,8.1363C7.9484,8.1498 7.9114,8.1599 7.8744,8.1599C7.8374,8.1599 7.8003,8.1531 7.7633,8.1363C7.733,8.1296 7.7128,8.1128 7.6893,8.0926C7.622,8.0421 7.5715,7.9512 7.5715,7.857C7.5715,7.8435 7.5715,7.8267 7.5715,7.8132C7.5984,7.7324 7.6354,7.6651 7.696,7.6214ZM8.1807,10.4755C8.1807,10.5631 8.1369,10.6438 8.0696,10.6977C8.0561,10.7044 8.0393,10.7212 8.0258,10.728C7.9821,10.7515 7.9383,10.765 7.8845,10.765C7.834,10.765 7.7902,10.7515 7.7431,10.728C7.7297,10.7212 7.7128,10.7145 7.6994,10.6977C7.632,10.6472 7.5883,10.5664 7.5883,10.4688V10.4621C7.5883,10.4318 7.5883,10.4116 7.595,10.3813C7.6085,10.314 7.6455,10.2635 7.6994,10.2265C7.7297,10.2029 7.7734,10.1827 7.8104,10.176C7.834,10.1693 7.8609,10.1693 7.8845,10.1693C7.9148,10.1693 7.935,10.1693 7.9653,10.176C8.0023,10.1827 8.0393,10.2063 8.0763,10.2265C8.1268,10.2635 8.1638,10.3207 8.1807,10.3813C8.1874,10.4049 8.1941,10.4318 8.1941,10.4621C8.1807,10.4688 8.1807,10.4688 8.1807,10.4755ZM9.4597,8.9811C9.4462,9.0316 9.4361,9.0855 9.4361,9.1427C9.4361,9.1999 9.4428,9.2538 9.4597,9.311L8.3254,9.9673C8.2514,9.9 8.1638,9.8495 8.0662,9.8192V8.5032C8.1773,8.4729 8.2648,8.4157 8.3456,8.3416L9.4597,8.9811ZM6.7165,4.6494C6.7165,3.6632 7.5849,2.9497 7.8878,2.7376C8.1807,2.9497 9.0591,3.6632 9.0591,4.6494C9.0591,5.474 8.4499,6.0765 8.0797,6.3558V4.8042C8.0797,4.6999 7.9989,4.6191 7.8946,4.6191C7.7902,4.6191 7.7095,4.6999 7.7095,4.8042V6.3625C7.3258,6.0765 6.7165,5.4807 6.7165,4.6494ZM7.4166,8.3416C7.4974,8.4157 7.5849,8.4729 7.696,8.5032V9.8192C7.6017,9.8495 7.5109,9.8933 7.4368,9.9606L6.3026,9.3042C6.316,9.2538 6.3261,9.1999 6.3261,9.1427C6.3261,9.0855 6.3194,9.0316 6.3026,8.9811L7.4166,8.3416ZM6.3194,11.8791C6.3261,11.8421 6.3261,11.7983 6.3261,11.7613C6.3261,11.6872 6.3127,11.6199 6.2958,11.556L7.3998,10.9232C7.4806,11.004 7.5849,11.0713 7.7027,11.1083V12.3604C7.5917,12.3907 7.4974,12.4479 7.4234,12.5219L6.3194,11.8791ZM8.349,12.5219C8.2682,12.4479 8.1739,12.3907 8.0696,12.3604V11.1083C8.1874,11.078 8.2917,11.0141 8.3725,10.9232L9.4765,11.556C9.4529,11.6233 9.4462,11.6872 9.4462,11.7613C9.4462,11.7983 9.4462,11.8421 9.4529,11.8791L8.349,12.5219ZM12.159,8.547C11.91,8.6883 11.6373,8.6648 11.4219,8.6042L11.7888,8.3921C11.8763,8.3416 11.9066,8.2306 11.8561,8.1431C11.8056,8.0555 11.6945,8.0253 11.5969,8.0757L11.2301,8.2878C11.2873,8.0825 11.4051,7.8233 11.6508,7.6853C12.0042,7.48 12.4451,7.6113 12.6437,7.692C12.6168,7.9007 12.5124,8.3416 12.159,8.547Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_solana_round.xml b/app/src/main/res/drawable/ic_solana_round.xml
deleted file mode 100644
index 49659278ae..0000000000
--- a/app/src/main/res/drawable/ic_solana_round.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"/>
-    <path android:pathData="M12.3419,10.4366L10.8935,12.0202C10.862,12.0546 10.8239,12.082 10.7816,12.1008C10.7392,12.1195 10.6936,12.1292 10.6474,12.1292H3.7811C3.7483,12.1292 3.7163,12.1194 3.6889,12.1011C3.6615,12.0828 3.6399,12.0567 3.6268,12.0261C3.6138,11.9954 3.6098,11.9616 3.6154,11.9287C3.6209,11.8957 3.6358,11.8652 3.6581,11.8408L5.1077,10.2572C5.1391,10.2228 5.177,10.1955 5.2192,10.1767C5.2614,10.158 5.307,10.1483 5.353,10.1482H12.219C12.2517,10.1482 12.2838,10.158 12.3112,10.1763C12.3385,10.1946 12.3601,10.2207 12.3732,10.2513C12.3862,10.2819 12.3902,10.3158 12.3847,10.3487C12.3791,10.3816 12.3643,10.4122 12.3419,10.4366ZM10.8935,7.2476C10.862,7.2132 10.8239,7.1858 10.7816,7.167C10.7392,7.1483 10.6936,7.1386 10.6474,7.1387H3.7811C3.7483,7.1387 3.7163,7.1484 3.6889,7.1667C3.6615,7.1851 3.6399,7.2111 3.6268,7.2418C3.6138,7.2724 3.6098,7.3063 3.6154,7.3392C3.6209,7.3721 3.6358,7.4026 3.6581,7.4271L5.1077,9.0107C5.1391,9.045 5.177,9.0723 5.2192,9.0911C5.2614,9.1098 5.307,9.1195 5.353,9.1196H12.219C12.2517,9.1196 12.2838,9.1099 12.3112,9.0915C12.3385,9.0732 12.3601,9.0472 12.3732,9.0165C12.3862,8.9859 12.3902,8.952 12.3847,8.9191C12.3791,8.8862 12.3643,8.8557 12.3419,8.8312L10.8935,7.2476ZM3.7811,6.1101H10.6474C10.6936,6.1101 10.7392,6.1005 10.7816,6.0817C10.8239,6.063 10.862,6.0356 10.8935,6.0012L12.3419,4.4175C12.3643,4.3931 12.3791,4.3626 12.3847,4.3296C12.3902,4.2967 12.3862,4.2629 12.3732,4.2323C12.3601,4.2016 12.3385,4.1755 12.3112,4.1572C12.2838,4.1389 12.2517,4.1291 12.219,4.1291H5.353C5.307,4.1292 5.2614,4.1389 5.2192,4.1577C5.177,4.1764 5.1391,4.2038 5.1077,4.2381L3.6585,5.8217C3.6362,5.8461 3.6213,5.8766 3.6157,5.9095C3.6102,5.9424 3.6141,5.9762 3.6272,6.0068C3.6402,6.0374 3.6617,6.0635 3.689,6.0819C3.7163,6.1002 3.7483,6.11 3.7811,6.1101Z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endX="11.7097" android:endY="4.18558"
-                android:startX="4.35356" android:startY="12.3198" android:type="linear">
-                <item android:color="#FF9945FF" android:offset="0.08"/>
-                <item android:color="#FF8752F3" android:offset="0.3"/>
-                <item android:color="#FF5497D5" android:offset="0.5"/>
-                <item android:color="#FF43B4CA" android:offset="0.6"/>
-                <item android:color="#FF28E0B9" android:offset="0.72"/>
-                <item android:color="#FF19FB9B" android:offset="0.97"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
diff --git a/app/src/main/res/drawable/ic_stellar_round.xml b/app/src/main/res/drawable/ic_stellar_round.xml
deleted file mode 100644
index f7ae98231f..0000000000
--- a/app/src/main/res/drawable/ic_stellar_round.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group>
-        <clip-path android:pathData="M0,0h16v16h-16z"/>
-        <path android:fillColor="#000000" android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"/>
-        <group>
-            <clip-path android:pathData="M7.871,2.8386L7.871,2.8386A5.0322,5.0322 0,0 1,12.9032 7.8709L12.9032,7.8709A5.0322,5.0322 0,0 1,7.871 12.9031L7.871,12.9031A5.0322,5.0322 0,0 1,2.8387 7.8709L2.8387,7.8709A5.0322,5.0322 0,0 1,7.871 2.8386z"/>
-            <path android:fillColor="#ffffff" android:pathData="M7.9897,3.6149C7.4207,3.5991 6.8543,3.6974 6.324,3.9042C5.7937,4.111 5.3102,4.4221 4.9022,4.8189C4.4941,5.2158 4.1698,5.6904 3.9483,6.2148C3.7269,6.7392 3.6128,7.3026 3.6129,7.8718C3.6129,7.9804 3.6171,8.0882 3.6254,8.196C3.637,8.3484 3.6031,8.5007 3.5282,8.6339C3.4533,8.7671 3.3406,8.8752 3.2044,8.9445L2.8387,9.1311V10.0009L3.9156,9.4519L4.2646,9.2741L4.6084,9.0993L10.7771,5.9558L11.4703,5.6027L12.9033,4.8726V4.0028L11.4829,4.7275L10.271,5.3452L4.4189,8.326C4.3992,8.175 4.3894,8.0228 4.3895,7.8706C4.3903,7.2632 4.5498,6.6667 4.8521,6.1399C5.1544,5.6132 5.589,5.1746 6.113,4.8675C6.637,4.5605 7.2321,4.3956 7.8393,4.3893C8.4466,4.3829 9.045,4.5354 9.5753,4.8315L10.2689,4.478L10.3725,4.4251C9.678,3.9211 8.8474,3.6388 7.9897,3.6149ZM12.9033,5.7427L4.9586,9.7878L4.2654,10.1418L2.8387,10.8694V11.7383L4.2553,11.0161L5.4673,10.3984L11.3256,7.4139C11.3453,7.5657 11.3551,7.7187 11.355,7.8718C11.3546,8.4798 11.1952,9.0771 10.8926,9.6045C10.59,10.1319 10.1548,10.5709 9.6301,10.8781C9.1054,11.1853 8.5094,11.3498 7.9015,11.3555C7.2935,11.3612 6.6946,11.2078 6.1642,10.9105L6.1219,10.9331L5.37,11.3164C6.0053,11.7776 6.7557,12.0541 7.5383,12.1155C8.3209,12.177 9.1053,12.0208 9.8048,11.6644C10.5042,11.308 11.0915,10.7651 11.5018,10.0958C11.912,9.4265 12.1293,8.6568 12.1296,7.8718C12.1296,7.7628 12.1254,7.6529 12.117,7.5447C12.1055,7.3924 12.1393,7.24 12.2141,7.1069C12.289,6.9737 12.4015,6.8656 12.5376,6.7962L12.9033,6.6095V5.7427Z"/>
-        </group>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_tangem.xml b/app/src/main/res/drawable/ic_tangem.xml
deleted file mode 100644
index 93f8741777..0000000000
--- a/app/src/main/res/drawable/ic_tangem.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="21dp"
-    android:height="20dp"
-    android:viewportWidth="21"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M3.833,3.25C3.833,2.836 4.184,2.5 4.618,2.5H16.382C16.815,2.5 17.167,2.836 17.167,3.25V7H3.833V3.25Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M3.833,10H8.539V17.5H4.618C4.184,17.5 3.833,17.164 3.833,16.75V10Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M17.167,10H12.461V17.5H16.382C16.815,17.5 17.167,17.164 17.167,16.75V10Z"
-      android:fillColor="#ffffff"/>
-</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/ic_tezos_round.xml b/app/src/main/res/drawable/ic_tezos_round.xml
deleted file mode 100644
index 4976e634e3..0000000000
--- a/app/src/main/res/drawable/ic_tezos_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#2D7DF8" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#ffffff" android:pathData="M8.5216,13C7.8414,13 7.345,12.8281 7.0322,12.4844C6.7425,12.1934 6.5744,11.7939 6.5646,11.3732C6.5611,11.2455 6.5893,11.1189 6.6465,11.006C6.6999,10.9085 6.777,10.8275 6.8699,10.7715C6.9779,10.715 7.097,10.6856 7.2177,10.6856C7.3384,10.6856 7.4574,10.715 7.5654,10.7715C7.6582,10.8273 7.7349,10.9083 7.7875,11.006C7.8464,11.1184 7.8757,11.2451 7.8724,11.3732C7.8784,11.5263 7.8366,11.6772 7.7532,11.8029C7.6838,11.9056 7.5844,11.9818 7.4702,12.0203C7.5819,12.1695 7.74,12.2729 7.917,12.3125C8.1149,12.3728 8.3199,12.4038 8.5261,12.4046C8.799,12.4071 9.0663,12.3233 9.2931,12.164C9.5284,11.9896 9.7038,11.7403 9.7935,11.4531C9.9071,11.1112 9.9626,10.7511 9.9573,10.3891C9.9665,10.0117 9.9058,9.636 9.7786,9.2828C9.6829,9.0003 9.5013,8.7587 9.2618,8.5953C9.0392,8.4475 8.7807,8.3699 8.5173,8.3719C8.2877,8.3923 8.0663,8.4711 7.8724,8.6016L7.3942,8.8531V8.6016L9.5433,5.5769H6.5646V8.7156C6.5562,8.9421 6.6133,9.166 6.7284,9.3578C6.7842,9.4414 6.8595,9.5085 6.9472,9.5525C7.0348,9.5966 7.1319,9.6162 7.2288,9.6093C7.4081,9.6055 7.5814,9.5415 7.7233,9.4265C7.8841,9.3029 8.0241,9.1518 8.1373,8.9796C8.1475,8.9495 8.1663,8.9233 8.1912,8.9047C8.2111,8.8866 8.2366,8.8766 8.263,8.8766C8.3147,8.8815 8.3637,8.9034 8.403,8.939C8.4528,8.9974 8.4798,9.0732 8.4789,9.1515C8.4732,9.2042 8.4642,9.2563 8.4521,9.3078C8.3463,9.5765 8.1689,9.8075 7.9412,9.9732C7.7298,10.1233 7.48,10.2029 7.2247,10.2016C6.5798,10.2016 6.133,10.0682 5.8844,9.8016C5.7566,9.6542 5.6581,9.4815 5.5947,9.2937C5.5312,9.1059 5.5042,8.9067 5.515,8.7078V5.5769H4V4.9937H5.5221V3.664L5.1736,3.2982V3H6.1848L6.5646,3.2063V4.9937L10.4993,4.9812L10.8911,5.3937L8.4784,7.9372C8.6241,7.8757 8.7776,7.8368 8.9341,7.8216C9.2437,7.8358 9.5458,7.9263 9.8159,8.0857C10.1287,8.2417 10.3923,8.4885 10.5755,8.7969C10.7396,9.0579 10.8558,9.3488 10.9181,9.6547C10.9692,9.8959 10.9967,10.142 11,10.3891C11.0016,10.8607 10.8997,11.3264 10.7021,11.75C10.5148,12.1602 10.1995,12.491 9.8085,12.6876C9.4082,12.8945 8.9678,13.0014 8.5216,13Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_tron_round.xml b/app/src/main/res/drawable/ic_tron_round.xml
deleted file mode 100644
index 9eaf6cfc9b..0000000000
--- a/app/src/main/res/drawable/ic_tron_round.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:autoMirrored="true" android:height="22dp"
-    android:viewportHeight="22" android:viewportWidth="22"
-    android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF060A" android:pathData="M11,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"/>
-    <group>
-        <clip-path android:pathData="M5,6h12v12h-12z"/>
-        <path android:fillColor="#ffffff" android:pathData="M16.5405,9.6149C15.978,9.0955 15.1999,8.3024 14.5662,7.7399L14.5287,7.7137C14.4663,7.6636 14.3959,7.6243 14.3205,7.5974C12.7924,7.3124 5.6805,5.983 5.5418,5.9999C5.5029,6.0054 5.4657,6.0195 5.433,6.0412L5.3974,6.0693C5.3535,6.1138 5.3202,6.1677 5.2999,6.2268L5.2905,6.2512V6.3843V6.4049C6.0911,8.6343 9.2524,15.9374 9.8749,17.6512C9.9124,17.7674 9.9837,17.9887 10.1168,17.9999H10.1468C10.218,17.9999 10.5218,17.5987 10.5218,17.5987C10.5218,17.5987 15.9518,11.0137 16.5012,10.3124C16.5723,10.226 16.635,10.1331 16.6887,10.0349C16.7023,9.9581 16.6959,9.879 16.6699,9.8054C16.644,9.7318 16.5994,9.6662 16.5405,9.6149ZM11.9149,10.3818L14.2324,8.4599L15.5918,9.7124L11.9149,10.3818ZM11.0149,10.2562L7.0249,6.9862L13.4805,8.1768L11.0149,10.2562ZM11.3749,11.113L15.4587,10.4549L10.7899,16.0799L11.3749,11.113ZM6.483,7.3124L10.6812,10.8749L10.0737,16.0837L6.483,7.3124Z"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_xrp_round.xml b/app/src/main/res/drawable/ic_xrp_round.xml
deleted file mode 100644
index 6e29010df6..0000000000
--- a/app/src/main/res/drawable/ic_xrp_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#000000" android:pathData="M8,16C3.5815,16 0,12.4185 0,8C0,3.5815 3.5815,0 8,0C12.4185,0 16,3.5815 16,8C16,12.4185 12.4185,16 8,16ZM11.5355,4C11.5352,4 11.5349,4.0001 11.5346,4.0003L9.248,6.2615C8.9152,6.5899 8.4665,6.7741 7.999,6.7741C7.5315,6.7741 7.0827,6.5899 6.75,6.2615L4.6138,4.1472C4.5185,4.0529 4.3898,4 4.2557,4C3.8009,4 3.5743,4.551 3.8976,4.8709L6.0275,6.9785C6.5533,7.4966 7.2618,7.787 8,7.787C8.7382,7.787 9.4467,7.4966 9.9725,6.9785L11.9537,5.0167C12.331,4.6431 12.0664,4 11.5355,4ZM4.4475,12.2811C4.4475,12.2813 4.4477,12.2813 4.4478,12.2813L6.752,10C7.0848,9.6716 7.5335,9.4874 8.001,9.4874C8.4685,9.4874 8.9172,9.6716 9.25,10L11.4037,12.134C11.499,12.2285 11.6278,12.2815 11.762,12.2815C12.2168,12.2815 12.4433,11.7305 12.1201,11.4106L9.9725,9.285C9.4467,8.7669 8.7382,8.4765 8,8.4765C7.2618,8.4765 6.5533,8.7669 6.0275,9.285L3.7291,11.5595C3.4613,11.8245 3.649,12.281 4.0258,12.281H4.4474C4.4474,12.281 4.4475,12.2811 4.4475,12.2811Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reset_background.xml b/app/src/main/res/drawable/ill_reset_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_reset_background.xml
rename to app/src/main/res/drawable/ill_reset_background.xml
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..b098f5f0ae 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"
@@ -74,8 +74,8 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
-            style="@style/OnboardingButton"
-            tools:text="@string/home_button_scan" />
+            style="@style/TapPrimaryButton"
+            tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
             android:id="@+id/progress"
@@ -91,7 +91,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_alternative_action"
-        style="@style/TapButtonText"
+        style="@style/TapTextButton"
         android:layout_marginBottom="26dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -99,4 +99,4 @@
         tools:text="Atlernative action" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml b/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml
index 4eb63182f8..2d8dd33b4e 100644
--- a/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml
+++ b/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml
@@ -48,7 +48,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_open_support_chat"
-        style="@style/OnboardingButton.Alternative"
+        style="@style/TapSecondaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
@@ -68,7 +68,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_kyc_action"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_kyc_waiting" />
 
@@ -84,4 +84,4 @@
 
     </FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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_russians_cardholders_warning.xml b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
index 8f2196c2d5..29bf1c052b 100644
--- a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
+++ b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
@@ -81,7 +81,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_yes"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -97,7 +97,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_no"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
diff --git a/app/src/main/res/layout/dialog_wallet_trade.xml b/app/src/main/res/layout/dialog_wallet_trade.xml
index 062d0286d1..cc9299027f 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" />
 
@@ -27,7 +27,7 @@
         android:textColor="@color/darkGray3"
         android:textSize="14sp"
         android:textStyle="bold"
-        app:drawableStartCompat="@drawable/ic_arrow_up" />
+        app:drawableStartCompat="@drawable/ic_arrow_up_24" />
 
     <TextView
         android:id="@+id/dialog_btn_sell"
@@ -42,6 +42,21 @@
         android:textColor="@color/darkGray3"
         android:textSize="14sp"
         android:textStyle="bold"
-        app:drawableStartCompat="@drawable/ic_arrow_down" />
+        app:drawableStartCompat="@drawable/ic_arrow_down_24" />
+
+    <TextView
+        android:id="@+id/dialog_btn_swap"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:clickable="true"
+        android:drawablePadding="32dp"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:padding="16dp"
+        android:text="@string/swapping_swap"
+        android:textColor="@color/darkGray3"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:drawableStartCompat="@drawable/ic_exchange_vertical_24" />
 
 </LinearLayout>
\ No newline at end of file
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..c4daafda8d 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"
@@ -78,13 +78,13 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_confirm"
-            style="@style/TapBlackButton"
+            style="@style/TapPrimaryIconButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             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"
@@ -93,4 +93,4 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_disclaimer.xml b/app/src/main/res/layout/fragment_disclaimer.xml
index 604410e507..e243e2e94a 100644
--- a/app/src/main/res/layout/fragment_disclaimer.xml
+++ b/app/src/main/res/layout/fragment_disclaimer.xml
@@ -33,6 +33,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/nested_scroll"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginStart="16dp"
@@ -53,36 +54,84 @@
 
         </androidx.core.widget.NestedScrollView>
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintGuide_percent="0.37" />
-
         <View
             android:id="@+id/half_transparent_overlay"
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="140dp"
             android:background="@drawable/bg_half_transparent_overlay"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
+        <ProgressBar
+            android:id="@+id/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:lineSpacingExtra="5sp"
+            android:text="@string/disclaimer_error_loading"
+            android:textAlignment="center"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toTopOf="@+id/btn_repeat"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <Button
+            android:id="@+id/btn_repeat"
+            style="@style/TapSecondaryButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/common_retry"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_error" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_accept"
-            style="@style/TapButtonWithIcon"
+            style="@style/TapPrimaryButton"
             android:layout_width="0dp"
-            android:layout_marginStart="7dp"
+            android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
             android:text="@string/common_accept"
-            app:icon="@drawable/ic_send"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/guideline" />
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="btn_repeat, tv_error" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_loading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="progress" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_accept"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="btn_accept, half_transparent_overlay" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index 1026392257..fe0eebf2a3 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -112,7 +112,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/btnSend"
-                        style="@style/TapButtonWithIcon"
+                        style="@style/TapPrimaryIconButton"
                         android:layout_width="match_parent"
                         android:fontFamily="@font/saira_semi_condensed_regular"
                         android:text="@string/send_title"
@@ -135,4 +135,4 @@
 
     </ScrollView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 7ebeaa7735..c3dadcdb4b 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -145,7 +145,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="36dp"
                     android:checked="true"
-                    android:text="@string/shop_3_cards"
                     app:chipMinTouchTargetSize="0dp" />
 
                 <com.google.android.material.chip.Chip
@@ -154,10 +153,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="36dp"
                     android:checked="false"
-                    android:text="@string/shop_2_cards"
                     app:chipMinTouchTargetSize="0dp" />
-
-
             </com.google.android.material.chip.ChipGroup>
 
             <View
@@ -339,7 +335,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_main_action"
-                    style="@style/TapBlackButton"
+                    style="@style/TapPrimaryButton"
                     android:layout_width="match_parent"
                     android:layout_height="48sp"
                     android:layout_marginStart="14dp"
@@ -373,4 +369,4 @@
 
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_topup.xml b/app/src/main/res/layout/fragment_topup.xml
index 01182c0c4c..366c9faa7c 100644
--- a/app/src/main/res/layout/fragment_topup.xml
+++ b/app/src/main/res/layout/fragment_topup.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_close"
+        app:navigationIcon="@drawable/ic_close_24"
         app:title="@string/wallet_button_buy" />
 
     <WebView
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index ab388fa0cd..6d8b8d8b5a 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">
 
@@ -151,13 +151,12 @@
                     android:id="@+id/rv_pending_transaction"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="12dp"
                     android:nestedScrollingEnabled="false"
                     android:overScrollMode="never"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/l_card_total_balance"
-                    app:layout_goneMarginTop="12dp" />
+                    app:layout_constraintTop_toBottomOf="@id/rv_warning_messages" />
 
                 <include
                     android:id="@+id/l_card_balance"
@@ -173,6 +172,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
+                    android:layout_marginTop="12dp"
                     android:layout_marginEnd="16dp"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/rv_pending_transaction" />
@@ -194,7 +194,7 @@
                     android:nestedScrollingEnabled="false"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/rv_pending_transaction" />
+                    app:layout_constraintTop_toBottomOf="@id/l_card_total_balance" />
 
                 <ProgressBar
                     android:id="@+id/pb_loading_user_tokens"
@@ -206,7 +206,7 @@
                     android:nestedScrollingEnabled="false"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/rv_pending_transaction" />
+                    app:layout_constraintTop_toBottomOf="@id/rv_warning_messages" />
 
                 <androidx.constraintlayout.widget.Barrier
                     android:id="@+id/barrier_wallets"
@@ -217,21 +217,16 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_add_token"
-                    style="@style/BaseTapButton"
+                    style="@style/TapPrimaryButton"
                     android:layout_width="match_parent"
-                    android:layout_height="42dp"
-                    android:layout_marginStart="16dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:elevation="4dp"
                     android:text="@string/main_manage_tokens"
-                    android:textSize="16sp"
                     android:visibility="gone"
-                    app:cornerRadius="8dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/barrier_wallets"
-                    app:layout_constraintVertical_bias="0.0"
-                    tools:layout_editor_absoluteX="16dp" />
+                    app:layout_constraintVertical_bias="0.0" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
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..86b44d34bf 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"
@@ -86,7 +85,7 @@
         android:elevation="0dp"
         android:text="@string/common_add"
         android:textAllCaps="false"
-        android:textColor="@color/btn_tap_text_color"
+        android:textColor="@color/selector_btn_text_primary"
         app:cornerRadius="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -99,4 +98,4 @@
         app:barrierDirection="start"
         app:constraint_referenced_ids="btn_add_token" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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_backup_access_code_info.xml b/app/src/main/res/layout/layout_backup_access_code_info.xml
index 3ef7ba57fb..fe37f7cd96 100644
--- a/app/src/main/res/layout/layout_backup_access_code_info.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_info.xml
@@ -116,7 +116,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_access_code_create"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
@@ -129,4 +129,4 @@
         app:layout_constraintStart_toStartOf="parent" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_backup_access_code_submit.xml b/app/src/main/res/layout/layout_backup_access_code_submit.xml
index 7505dbcc4d..23e95aae7e 100644
--- a/app/src/main/res/layout/layout_backup_access_code_submit.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_submit.xml
@@ -47,7 +47,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_access_code_submit"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
@@ -59,4 +59,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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_buttons_add_cards.xml b/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
index 2d9ddedad7..ceff4ed673 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_add_card"
-        style="@style/OnboardingButton.Alternative"
+        style="@style/TapSecondaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
@@ -18,7 +18,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_continue"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_height="wrap_content"
         android:layout_marginBottom="32dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -26,4 +26,4 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Main Action" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_buttons_common.xml b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
index f51dffd3cb..9bc5621b26 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_common.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_wallet_main_action"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="204dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_fl_scan_card_container_margin_bottom"
@@ -18,7 +18,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_wallet_alternative_action"
-        style="@style/OnboardingButton.Borderless"
+        style="@style/TapTextButton"
         android:layout_width="204dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
@@ -27,4 +27,4 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Alternative action" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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..abd59b36c3 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"
@@ -74,8 +74,8 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
-            style="@style/OnboardingButton"
-            tools:text="@string/home_button_scan" />
+            style="@style/TapPrimaryButton"
+            tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
             android:id="@+id/progress"
@@ -91,12 +91,12 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_alternative_action"
-        style="@style/TapButtonText"
+        style="@style/TapTextButton"
         android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:text="Atlernative action" />
+        tools:text="Alternative action" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml b/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml
index 0c86022df3..5e3ff40fb1 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml
@@ -56,10 +56,10 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_connect"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_register_wallet"
-            app:icon="@drawable/ic_tangem"
+            app:icon="@drawable/ic_tangem_24"
             app:iconGravity="textEnd" />
 
         <ProgressBar
@@ -75,4 +75,4 @@
     </FrameLayout>
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml
index 580995fc6f..6c6f8a9ab2 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml
@@ -48,7 +48,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_open_support_chat"
-        style="@style/OnboardingButton.Alternative"
+        style="@style/TapSecondaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
@@ -68,7 +68,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_kyc_action"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_kyc_waiting" />
 
@@ -84,4 +84,4 @@
 
     </FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml
index f1d03e8347..4a9ef0a9e2 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml
@@ -56,7 +56,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_verify"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_kyc_start" />
 
@@ -73,4 +73,4 @@
     </FrameLayout>
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml b/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml
index 08e2bfe29b..96562a0c1f 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml
@@ -53,7 +53,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_set_pin"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_pin" />
 
@@ -69,4 +69,4 @@
 
     </FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_pseudo_toolbar.xml b/app/src/main/res/layout/layout_pseudo_toolbar.xml
index f9ae5fe2ab..c1bc683d3a 100644
--- a/app/src/main/res/layout/layout_pseudo_toolbar.xml
+++ b/app/src/main/res/layout/layout_pseudo_toolbar.xml
@@ -18,6 +18,6 @@
         android:clickable="true"
         android:focusable="true"
         android:padding="16dp"
-        android:src="@drawable/ic_close" />
+        android:src="@drawable/ic_close_24" />
 
 </FrameLayout>
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/layout/layout_wallet_long_buttons.xml b/app/src/main/res/layout/layout_wallet_long_buttons.xml
index 5fc11bef41..60ac6691fb 100644
--- a/app/src/main/res/layout/layout_wallet_long_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_long_buttons.xml
@@ -15,7 +15,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_confirm_long"
-        style="@style/TapButtonWithIcon"
+        style="@style/TapPrimaryIconButton"
         android:layout_width="0dp"
             android:text="@string/wallet_button_send"
             app:icon="@drawable/ic_send"
diff --git a/app/src/main/res/layout/layout_wallet_short_buttons.xml b/app/src/main/res/layout/layout_wallet_short_buttons.xml
index e235511583..e8c85a41d5 100644
--- a/app/src/main/res/layout/layout_wallet_short_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_short_buttons.xml
@@ -7,8 +7,8 @@
 
     <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_trade"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="0dp"
+        style="@style/TapPrimaryIconButton"
+        android:layout_width="0dp"
             android:text="@string/wallet_button_trade"
             app:icon="@drawable/ic_arrows_up_down"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -21,9 +21,9 @@
             app:layout_constraintVertical_bias="1" />
 
     <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_confirm"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="0dp"
+        android:id="@+id/btn_confirm"
+        style="@style/TapPrimaryIconButton"
+        android:layout_width="0dp"
             android:layout_marginStart="8dp"
             android:text="@string/wallet_button_send"
             app:icon="@drawable/ic_send"
diff --git a/app/src/main/res/layout/layout_warning_card_action.xml b/app/src/main/res/layout/layout_warning_card_action.xml
index 9a0aafc0d5..e85e77d3e5 100644
--- a/app/src/main/res/layout/layout_warning_card_action.xml
+++ b/app/src/main/res/layout/layout_warning_card_action.xml
@@ -22,7 +22,7 @@
             android:tint="@android:color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/warning_content_container"
-            app:srcCompat="@drawable/ic_close" />
+            app:srcCompat="@drawable/ic_close_24" />
 
         <include
             android:id="@+id/warning_content_container"
diff --git a/app/src/main/res/layout/test_shopify_fragment.xml b/app/src/main/res/layout/test_shopify_fragment.xml
index eff6a14884..b844d1b1d3 100644
--- a/app/src/main/res/layout/test_shopify_fragment.xml
+++ b/app/src/main/res/layout/test_shopify_fragment.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/btn_2_cards"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="2 cards"
         app:layout_constraintEnd_toStartOf="@+id/btn_3_cards"
         app:layout_constraintHorizontal_bias="0.5"
@@ -19,7 +19,7 @@
 
     <Button
         android:id="@+id/btn_3_cards"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="3 cards"
         android:layout_margin="16dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -62,7 +62,7 @@
 
     <Button
         android:id="@+id/pay_gpay"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="GPay"
         app:layout_constraintEnd_toStartOf="@+id/pay_web"
         app:layout_constraintHorizontal_bias="0.5"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/pay_web"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="Pay online"
         android:layout_margin="16dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -84,4 +84,4 @@
 
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_wallet_details_buttons_row.xml b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
index 0a6a51bfdd..82365317fe 100644
--- a/app/src/main/res/layout/view_wallet_details_buttons_row.xml
+++ b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
@@ -8,7 +8,7 @@
     tools:parentTag="android.widget.LinearLayout">
 
     <FrameLayout
-        android:id="@+id/container_exchange_buttons"
+        android:id="@+id/container_action_buttons"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
@@ -16,38 +16,39 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_trade"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wallet_button_trade"
+            style="@style/TapPrimaryIconButton"
+            android:text="@string/wallet_button_actions"
             android:visibility="gone"
             app:icon="@drawable/ic_arrows_up_down"
             tools:visibility="visible" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_buy"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TapPrimaryIconButton"
             android:text="@string/wallet_button_buy"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_up" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_sell"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TapPrimaryIconButton"
             android:text="@string/wallet_button_sell"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_down" />
 
-    </FrameLayout>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_swap"
+            style="@style/TapPrimaryIconButton"
+            android:text="@string/swapping_swap"
+            android:visibility="gone"
+            app:icon="@drawable/ic_arrows_up_down"
+            tools:visibility="gone" />
 
+    </FrameLayout>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_send"
-        style="@style/TapButtonWithIcon"
+        style="@style/TapPrimaryIconButton"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:text="@string/wallet_button_send"
diff --git a/app/src/main/res/menu/menu_wallet.xml b/app/src/main/res/menu/menu_wallet.xml
index edd88afb93..29dfb847b9 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_24"
+        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/colors.xml b/app/src/main/res/values/colors.xml
index b00c6603a8..a5c157e311 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,12 +4,9 @@
     <color name="colorPrimary">#0029FF</color>
     <color name="colorSecondary">#0022D4</color>
     <color name="accent">#19C878</color>
-    <color name="accent_disabled">#801ACE80</color>
 
     <color name="menu_accent_color">@color/accent</color>
 
-    <color name="tapButtonColor">@color/accent</color>
-    <color name="tapButtonDisabled">@color/accent_disabled</color>
     <color name="tapButtonColorBlack">@color/darkGray6</color>
     <color name="tapButtonBlackDisabled">#6A6A6A</color>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 63924e74c0..fdeae808a2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -31,6 +31,7 @@
 
     <dimen name="btn_corner_radius">4dp</dimen>
     <dimen name="btn_corner_radius_medium">8dp</dimen>
+    <dimen name="btn_corner_radius_large">12dp</dimen>
     <dimen name="btn_rounded_size">44dp</dimen>
 
     <dimen name="text_size_amount_to_send">32sp</dimen>
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..712bc49e76 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,69 +41,49 @@
         <item name="colorPrimary">@color/accent</item>
     </style>
 
-    <style name="BaseTapButton">
+    <style name="BaseTapButton" parent="Widget.Material3.Button">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minWidth">204dp</item>
+        <item name="android:minHeight">48dp</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
-        <item name="android:textColor">@color/btn_tap_text_color</item>
         <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:fontFamily">@font/roboto_medium</item>
         <item name="android:letterSpacing">0</item>
-        <item name="android:backgroundTint">@color/selector_btn_green</item>
+        <item name="lineHeight">24sp</item>
+        <item name="cornerRadius">@dimen/btn_corner_radius_large</item>
+    </style>
+
+    <style name="TapPrimaryButton" parent="BaseTapButton">
+        <item name="android:backgroundTint">@color/selector_btn_primary</item>
+        <item name="android:textColor">@color/selector_btn_text_primary</item>
+    </style>
+
+    <style name="TapSecondaryButton" parent="BaseTapButton">
+        <item name="android:backgroundTint">@color/selector_btn_secondary</item>
+        <item name="android:textColor">@color/selector_btn_text_secondary</item>
+    </style>
+
+    <style name="TapTextButton" parent="BaseTapButton">
+        <item name="android:minHeight">40dp</item>
         <item name="cornerRadius">@dimen/btn_corner_radius</item>
+        <item name="android:backgroundTint">@android:color/transparent</item>
+        <item name="android:textColor">@color/selector_btn_text_secondary</item>
     </style>
 
-    <style name="TapButton" parent="BaseTapButton">
-        <item name="android:layout_width">93dp</item>
-        <item name="android:minHeight">52dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">@font/saira_semi_condensed_regular</item>
-        <item name="elevation">3dp</item>
-    </style>
-
-    <style name="OnboardingButton" parent="BaseTapButton">
-        <item name="android:minWidth">204dp</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">48dp</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="elevation">2dp</item>
-    </style>
-
-    <style name="OnboardingButton.Alternative">
-        <item name="android:backgroundTint">@color/gray_button</item>
-        <item name="android:textColor">@color/selector_btn_gray_text_color</item>
-        <item name="elevation">0dp</item>
-    </style>
-
-    <style name="OnboardingButton.Borderless" parent="@style/Widget.AppCompat.Button.Borderless">
-        <item name="textAllCaps">false</item>
-        <item name="android:backgroundTint">@color/gray_button</item>
-        <item name="android:textColor">@color/tapButtonColorBlack</item>
-        <item name="elevation">0dp</item>
-    </style>
-
-
-    <style name="TapButtonText" parent="@style/Widget.MaterialComponents.Button.TextButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:minWidth">204dp</item>
-        <item name="android:layout_height">58dp</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">#060606</item>
-        <item name="cornerRadius">@dimen/btn_corner_radius</item>
-    </style>
-
-    <style name="TapButtonWithIcon" parent="TapButton">
+    <style name="TapPrimaryIconButton" parent="TapPrimaryButton">
         <item name="android:gravity">start|center_vertical</item>
-        <item name="iconTint">@color/btn_tap_text_color</item>
+        <item name="iconTint">@color/selector_btn_text_primary</item>
         <item name="iconGravity">end</item>
-        <item name="android:layout_width">200dp</item>
     </style>
 
-    <style name="TapBlackButton" parent="TapButtonWithIcon">
-        <item name="android:backgroundTint">@color/selector_btn_black</item>
+    <style name="TapPrimaryIconButtonFullLength" parent="TapPrimaryButton">
+        <item name="android:gravity">center</item>
+        <item name="iconTint">@color/selector_btn_text_primary</item>
+        <item name="iconGravity">textEnd</item>
     </style>
 
     <style name="TapChip" parent="@style/Widget.MaterialComponents.Chip.Choice">
@@ -171,6 +151,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/app/src/main/res/xml/nfc_tech_filter.xml b/app/src/main/res/xml/nfc_tech_filter.xml
index e2921c8701..6b9426b857 100644
--- a/app/src/main/res/xml/nfc_tech_filter.xml
+++ b/app/src/main/res/xml/nfc_tech_filter.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <tech-list>
         <tech>android.nfc.tech.IsoDep</tech>
-        <tech>android.nfc.tech.Ndef</tech>
+        <tech>android.nfc.tech.NfcA</tech>
         <tech>android.nfc.tech.NfcV</tech>
+        <tech>android.nfc.tech.Ndef</tech>
     </tech-list>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/tangemAccess/res/values/strings.xml b/app/src/tangemAccess/res/values/strings.xml
index 1f911a6e51..845dc9021a 100644
--- a/app/src/tangemAccess/res/values/strings.xml
+++ b/app/src/tangemAccess/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translatable="false">Tangem</string>
+    <string name="tangem_app_name" translatable="false">Tangem</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/tangem/wallet/ExampleUnitTest.kt b/app/src/test/java/com/tangem/wallet/ExampleUnitTest.kt
deleted file mode 100644
index ead7134648..0000000000
--- a/app/src/test/java/com/tangem/wallet/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.tangem.wallet
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
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..f71b201932
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,39 @@
+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
+    kotlin("plugin.serialization") version Versions.kotlin 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")
+    }
+}
+
+subprojects {
+    apply(plugin = "detekt-convention")
+}
+
+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..af3fd561b4
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.android.tools.build:gradle:7.1.3")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
+    //TODO("Upgrade version to 1.22.0 after upgrading kotlin version to 1.7.21")
+    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0")
+    implementation("com.squareup:javapoet:1.13.0")
+}
\ 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..eaf82306b2
--- /dev/null
+++ b/buildSrc/src/main/java/Dependency.kt
@@ -0,0 +1,91 @@
+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
+    const val constraintLayout = "androidx.constraintlayout:constraintlayout-compose:" + Versions.composeConstraint
+}
+
+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 accompanistWebView = "com.google.accompanist:accompanist-webview:" + 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
+    const val kotlinSerialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:" + Versions.kotlinSerialization
+}
+
+object Tangem {
+    const val blockchain = "com.tangem:blockchain:" + Versions.tangemBlockchainSdk
+    const val cardAndroid = "com.tangem.tangem-sdk-kotlin:android:" + Versions.tangemCardSdk
+    const val cardCore = "com.tangem.tangem-sdk-kotlin:core:" + Versions.tangemCardSdk
+}
+
+object Tools {
+    const val composeDetektRules = "ru.kode:detekt-rules-compose:" + Versions.composeDetektRules
+    const val formattingDetektRules = "io.gitlab.arturbosch.detekt:detekt-formatting:" + Versions.formattingDetektRules
+}
+
+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..4c2bb90b8e
--- /dev/null
+++ b/buildSrc/src/main/java/Versions.kt
@@ -0,0 +1,82 @@
+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.7.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.3.1"
+    const val composeFoundation = "1.3.1"
+    const val composeConstraint = "1.0.1"
+    // endregion Compose
+
+    // region Other libraries
+    const val accompanist = "0.27.1"
+    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"
+    const val kotlinSerialization = "1.4.1"
+    // endregion Other libraries
+
+    // region Tangem
+    const val tangemBlockchainSdk = "develop-154"
+    // const val tangemBlockchainSdk = "0.0.1" // Keep it! - used for local builds
+
+    const val tangemCardSdk = "develop-186"
+    // const val tangemCardSgk = "0.0.1" // Keep it! - used for local builds
+    // endregion Tangem
+
+    // region Tools
+    const val composeDetektRules = "1.2.2"
+    const val formattingDetektRules = "1.21.0"
+    // endregion Tools
+
+    // 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/buildSrc/src/main/java/detekt-convention.gradle.kts b/buildSrc/src/main/java/detekt-convention.gradle.kts
new file mode 100644
index 0000000000..3509e1a74c
--- /dev/null
+++ b/buildSrc/src/main/java/detekt-convention.gradle.kts
@@ -0,0 +1,29 @@
+import io.gitlab.arturbosch.detekt.Detekt
+
+plugins {
+    id("io.gitlab.arturbosch.detekt")
+}
+
+tasks.withType<Detekt> {
+    parallel = true
+    ignoreFailures = false
+    autoCorrect = true
+    buildUponDefaultConfig = true
+
+    config.setFrom(rootProject.files("config/detekt/detekt.yml"))
+    include("**/*.kt")
+    exclude("**/resources/**", "**/build/**")
+    reports {
+        txt {
+            required.set(true)
+            outputLocation.set(rootProject.file("build/reports/detekt.txt"))
+        }
+    }
+
+    jvmTarget = "1.8"
+}
+
+dependencies {
+    detektPlugins(Tools.composeDetektRules)
+    detektPlugins(Tools.formattingDetektRules)
+}
\ 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/common/src/main/java/com/tangem/common/module/ModuleMessage.kt b/common/src/main/java/com/tangem/common/module/ModuleMessage.kt
index c8632c9597..511ffa8d99 100644
--- a/common/src/main/java/com/tangem/common/module/ModuleMessage.kt
+++ b/common/src/main/java/com/tangem/common/module/ModuleMessage.kt
@@ -11,7 +11,7 @@ interface ModuleMessage
  * @property message the error description
  * @property data any data that can help in the part where this error is being handled
  */
-abstract class ModuleError() : Throwable(), ModuleMessage {
+abstract class ModuleError : Throwable(), ModuleMessage {
     abstract val code: Int
     abstract override val message: String
     abstract val data: Any?
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
new file mode 100644
index 0000000000..570cb574d9
--- /dev/null
+++ b/config/detekt/detekt.yml
@@ -0,0 +1,828 @@
+build:
+  maxIssues: 0
+
+config:
+  validation: true
+  warningsAsErrors: false
+
+processors:
+  active: true
+
+console-reports:
+  active: true
+
+output-reports:
+  active: true
+  exclude:
+    # - 'TxtOutputReport'
+    - 'XmlOutputReport'
+    - 'HtmlOutputReport'
+    - 'MdOutputReport'
+
+comments:
+  active: false
+  AbsentOrWrongFileLicense:
+    active: false
+    licenseTemplateFile: 'license.template'
+    licenseTemplateIsRegex: false
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  DeprecatedBlockTag:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
+  KDocReferencesNonPublicProperty:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+  OutdatedDocumentation:
+    active: false
+    matchTypeParameters: true
+    matchDeclarationsOrder: true
+    allowParamOnConstructorProperties: false
+  UndocumentedPublicClass:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+  UndocumentedPublicFunction:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+  UndocumentedPublicProperty:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+
+complexity:
+  active: true
+  ComplexMethod:
+    active: true
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: false
+    threshold: 10
+    includeStaticDeclarations: false
+    includePrivateDeclarations: false
+  LabeledExpression:
+    active: false
+    ignoredLabels: [ ]
+  LargeClass:
+    active: true
+    threshold: 300
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    functionThreshold: 6
+    constructorThreshold: 7
+    ignoreDefaultParameters: true
+    ignoreDataClasses: true
+    ignoreAnnotated: [ 'Provides' ]
+  MethodOverloading:
+    active: true
+    threshold: 6
+  NamedArguments:
+    active: true
+    threshold: 3
+    ignoreArgumentsMatchingNames: false
+  NestedBlockDepth:
+    active: true
+    threshold: 5
+  NestedScopeFunctions:
+    active: false
+    threshold: 1
+    functions:
+      - 'kotlin.apply'
+      - 'kotlin.run'
+      - 'kotlin.with'
+      - 'kotlin.let'
+      - 'kotlin.also'
+  ReplaceSafeCallChainWithRun:
+    active: true
+  StringLiteralDuplication:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+    thresholdInFiles: 20
+    thresholdInClasses: 20
+    thresholdInInterfaces: 20
+    thresholdInObjects: 20
+    thresholdInEnums: 20
+    ignoreDeprecated: false
+    ignorePrivate: true
+    ignoreOverridden: false
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: true
+  InjectDispatcher:
+    active: false #TODO
+    dispatcherNames:
+      - 'IO'
+      - 'Default'
+      - 'Unconfined'
+  RedundantSuspendModifier:
+    active: true
+  SleepInsteadOfDelay:
+    active: true
+  SuspendFunWithCoroutineScopeReceiver:
+    active: false
+  SuspendFunWithFlowReturnType:
+    active: true
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: true
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: true
+    methodNames:
+      - 'equals'
+      - 'finalize'
+      - 'hashCode'
+      - 'toString'
+  InstanceOfCheckForException:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+  NotImplementedDeclaration:
+    active: false
+  ObjectExtendsThrowable:
+    active: true
+  PrintStackTrace:
+    active: true
+  RethrowCaughtException:
+    active: true
+  ReturnFromFinally:
+    active: true
+    ignoreLabeled: false
+  SwallowedException:
+    active: false
+    ignoredExceptionTypes:
+      - 'InterruptedException'
+      - 'MalformedURLException'
+      - 'NumberFormatException'
+      - 'ParseException'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: true
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+    exceptions:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Exception'
+      - 'IllegalArgumentException'
+      - 'IllegalMonitorStateException'
+      - 'IllegalStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+  ThrowingNewInstanceOfSameException:
+    active: true
+  TooGenericExceptionCaught:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+    exceptionNames:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Error'
+      - 'Exception'
+      - 'IllegalMonitorStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - 'Error'
+      - 'Exception'
+      - 'RuntimeException'
+      - 'Throwable'
+
+naming:
+  active: true
+  BooleanPropertyNaming:
+    active: true
+    allowedPattern: '^(is|has|are)'
+    ignoreOverridden: true
+  ClassNaming:
+    active: true
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  EnumNaming:
+    active: true
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+    forbiddenName: [ ]
+  FunctionMaxLength:
+    active: false
+    maximumFunctionNameLength: 30
+  FunctionMinLength:
+    active: false
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+    functionPattern: '[a-z][a-zA-Z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+    ignoreAnnotated: [ 'Composable' ]
+  FunctionParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  InvalidPackageDeclaration:
+    active: true
+    rootPackage: ''
+    requireRootInDeclaration: false
+  LambdaParameterNaming:
+    active: false
+    parameterPattern: '[a-z][A-Za-z0-9]*|_'
+  MatchingDeclarationName: # Same as FileName
+    active: false
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: false
+    ignoreOverridden: true
+  NoNameShadowing:
+    active: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: true
+  ObjectPropertyNaming:
+    active: true
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
+  VariableMaxLength:
+    active: false
+    maximumVariableNameLength: 50
+  VariableMinLength:
+    active: false
+    minimumVariableNameLength: 3
+  VariableNaming:
+    active: true
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  CouldBeSequence:
+    active: false
+    threshold: 3
+  ForEachOnRange:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+  SpreadOperator:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  AvoidReferentialEquality:
+    active: true
+    forbiddenTypePatterns:
+      - 'kotlin.String'
+  CastToNullableType:
+    active: true
+  Deprecation:
+    active: false
+  DontDowncastCollectionTypes:
+    active: true
+  DoubleMutabilityForCollection:
+    active: true
+    mutableTypes:
+      - 'kotlin.collections.MutableList'
+      - 'kotlin.collections.MutableMap'
+      - 'kotlin.collections.MutableSet'
+      - 'java.util.ArrayList'
+      - 'java.util.LinkedHashSet'
+      - 'java.util.HashSet'
+      - 'java.util.LinkedHashMap'
+      - 'java.util.HashMap'
+  ElseCaseInsteadOfExhaustiveWhen:
+    active: false
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExitOutsideMain:
+    active: false
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: true
+  IgnoredReturnValue:
+    active: true
+    returnValueAnnotations:
+      - '*.CheckResult'
+      - '*.CheckReturnValue'
+    ignoreReturnValueAnnotations:
+      - '*.CanIgnoreReturnValue'
+    ignoreFunctionCall: [ ]
+  ImplicitDefaultLocale:
+    active: true
+  ImplicitUnitReturnType:
+    active: false
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+    ignoreAnnotated: [ 'Inject' ]
+    ignoreOnClassesPattern: ''
+  MapGetWithNotNullAssertionOperator:
+    active: true
+  MissingPackageDeclaration:
+    active: true
+    excludes: [ '**/*.kts' ]
+  NullCheckOnMutableProperty:
+    active: true
+  NullableToStringCall:
+    active: true
+  UnconditionalJumpStatementInLoop:
+    active: true
+  UnnecessaryNotNullOperator:
+    active: true
+  UnnecessarySafeCall:
+    active: true
+  UnreachableCatchBlock:
+    active: true
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**' ]
+  UnsafeCast:
+    active: true
+  UnusedUnaryOperator:
+    active: true
+  UselessPostfixExpression:
+    active: true
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  CanBeNonNullable:
+    active: false
+  CascadingCallWrapping:
+    active: false
+    includeElvis: true
+  ClassOrdering:
+    active: true
+  CollapsibleIfStatements:
+    active: true
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix:
+      - 'to'
+  DataClassShouldBeImmutable:
+    active: false
+  DestructuringDeclarationWithTooManyEntries:
+    active: true
+    maxDestructuringEntries: 3
+  EqualsNullCall:
+    active: false
+  EqualsOnSignatureLine:
+    active: true
+  ExplicitCollectionElementAccessMethod:
+    active: true
+  ExplicitItLambdaParameter:
+    active: true
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: true
+  ForbiddenComment:
+    active: false
+    values:
+      - 'FIXME:'
+      - 'STOPSHIP:'
+      - 'TODO:'
+    allowedPatterns: ''
+    customMessage: ''
+  ForbiddenImport:
+    active: false
+    imports: [ ]
+    forbiddenPatterns: ''
+  ForbiddenMethodCall:
+    active: false
+    methods:
+      - reason: 'print does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.print'
+      - reason: 'println does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.println'
+  ForbiddenSuppress:
+    active: false
+    rules: [ ]
+  ForbiddenVoid:
+    active: false
+    ignoreOverridden: false
+    ignoreUsageInGenerics: false
+  FunctionOnlyReturningConstant:
+    active: true
+    ignoreOverridableFunction: true
+    ignoreActualFunction: true
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 2
+  MagicNumber:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/*.kts' ]
+    ignoreNumbers:
+      - '-1'
+      - '0'
+      - '1'
+      - '2'
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: true
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: false
+    ignoreRanges: false
+    ignoreExtensionFunctions: true
+    ignoreAnnotated: [ 'Preview' ]
+  MandatoryBracesIfStatements:
+    active: true
+  MandatoryBracesLoops:
+    active: true
+  MaxChainedCallsOnSameLine:
+    active: true
+    maxChainedCalls: 5
+  MaxLineLength:
+    active: false # Same as MaximumLineLength
+    maxLineLength: 120
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: false # Same as ModifierOrdering
+  MultilineLambdaItParameter:
+    active: true
+  NestedClassesVisibility:
+    active: true
+  NewLineAtEndOfFile:
+    active: false # This rules overlaps with style>NewLineAtEndOfFile from the standard rules
+  NoTabs:
+    active: true
+  NullableBooleanCheck:
+    active: true
+  ObjectLiteralToLambda:
+    active: true
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: true
+  OptionalWhenBraces:
+    active: false
+  PreferToOverPairSyntax:
+    active: false
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: false
+  RedundantHigherOrderMapUsage:
+    active: true
+  RedundantVisibilityModifierRule:
+    active: true
+  ReturnCount:
+    active: false
+    max: 2
+    excludedFunctions:
+      - 'equals'
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+    excludeGuardClauses: false
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: true
+  SpacingBetweenPackageAndImports:
+    active: true
+  ThrowsCount:
+    active: false
+    max: 2
+    excludeGuardClauses: false
+  TrailingWhitespace:
+    active: false
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableLength: 4
+    allowNonStandardGrouping: false
+  UnnecessaryAbstractClass:
+    active: true
+  UnnecessaryAnnotationUseSiteTarget:
+    active: false
+  UnnecessaryApply:
+    active: true
+  UnnecessaryBackticks:
+    active: true
+  UnnecessaryFilter:
+    active: true
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryInnerClass:
+    active: false
+  UnnecessaryLet:
+    active: true
+  UnnecessaryParentheses:
+    active: true
+  UntilInsteadOfRangeTo:
+    active: true
+  UnusedImports:
+    active: true
+  UnusedPrivateClass:
+    active: true
+    ignoreAnnotated: [ 'UnusedRequiredComponent' ]
+  UnusedPrivateMember:
+    active: true
+    allowedNames: '(_|ignored|expected|serialVersionUID)'
+    ignoreAnnotated: [ 'Preview', 'UnusedRequiredComponent' ]
+  UseAnyOrNoneInsteadOfFind:
+    active: true
+  UseArrayLiteralsInAnnotations:
+    active: true
+  UseCheckNotNull:
+    active: true
+  UseCheckOrError:
+    active: true
+  UseDataClass:
+    active: false
+    allowVars: false
+  UseEmptyCounterpart:
+    active: true
+  UseIfEmptyOrIfBlank:
+    active: true
+  UseIfInsteadOfWhen:
+    active: false
+  UseIsNullOrEmpty:
+    active: true
+  UseOrEmpty:
+    active: true
+  UseRequire:
+    active: true
+  UseRequireNotNull:
+    active: true
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: true
+    ignoreLateinitVar: false
+  WildcardImport:
+    active: false
+    excludeImports:
+      - 'java.util.*'
+
+formatting:
+  active: true
+  android: true
+  AnnotationOnSeparateLine:
+    active: false
+  AnnotationSpacing:
+    active: true
+  ArgumentListWrapping:
+    active: true
+    indentSize: 4
+    maxLineLength: 120
+  BlockCommentInitialStarAlignment:
+    active: true
+  ChainWrapping:
+    active: true
+  CommentSpacing:
+    active: true
+  CommentWrapping:
+    active: false
+    indentSize: 4
+  DiscouragedCommentLocation:
+    active: true
+  EnumEntryNameCase:
+    active: true
+  Filename:
+    active: true # This rules overlaps with naming>MatchingDeclarationName from the standard rules
+    mustBeFirst: true
+  FinalNewline:
+    active: false
+    insertFinalNewLine: true
+  FunKeywordSpacing:
+    active: true
+  FunctionReturnTypeSpacing:
+    active: true
+  FunctionSignature:
+    active: true
+    forceMultilineWhenParameterCountGreaterOrEqualThan: 2147483647
+    functionBodyExpressionWrapping: 'default'
+    maxLineLength: 120
+    indentSize: 4
+  FunctionStartOfBodySpacing:
+    active: true
+  FunctionTypeReferenceSpacing:
+    active: true
+  ImportOrdering:
+    active: false
+    layout: 'java.**,javax.**,kotlin.**,kotlinx.**,android.**,androidx.**,*,^'
+  Indentation:
+    active: true
+    indentSize: 4
+  KdocWrapping:
+    active: true
+    indentSize: 4
+  MaximumLineLength:
+    excludes: [ "**/assets/**" ]
+    active: true # This rules overlaps with style>MaxLineLength from the standard rules
+    maxLineLength: 120
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+  ModifierListSpacing:
+    active: true
+  ModifierOrdering:
+    active: true # This rules overlaps with style>ModifierOrder from the standard rules
+  MultiLineIfElse:
+    active: true
+  NoBlankLineBeforeRbrace:
+    active: true
+  NoBlankLinesInChainedMethodCalls:
+    active: true
+  NoConsecutiveBlankLines:
+    active: true
+  NoEmptyClassBody:
+    active: true
+  NoEmptyFirstLineInMethodBlock:
+    active: true
+  NoLineBreakAfterElse:
+    active: true
+  NoLineBreakBeforeAssignment:
+    active: true
+  NoMultipleSpaces:
+    active: true
+  NoSemicolons:
+    active: true
+  NoTrailingSpaces:
+    active: true
+  NoUnitReturn:
+    active: true
+  NoUnusedImports:
+    active: true
+  NoWildcardImports:
+    active: false
+    packagesToUseImportOnDemandProperty: 'java.util.*,kotlinx.android.synthetic.**'
+  NullableTypeSpacing:
+    active: true
+  PackageName:
+    active: true
+  ParameterListSpacing:
+    active: true
+  ParameterListWrapping:
+    active: true
+    maxLineLength: 120
+  SpacingAroundAngleBrackets:
+    active: true
+  SpacingAroundColon:
+    active: true
+  SpacingAroundComma:
+    active: true
+  SpacingAroundCurly:
+    active: true
+  SpacingAroundDot:
+    active: true
+  SpacingAroundDoubleColon:
+    active: true
+  SpacingAroundKeyword:
+    active: true
+  SpacingAroundOperators:
+    active: true
+  SpacingAroundParens:
+    active: true
+  SpacingAroundRangeOperator:
+    active: true
+  SpacingAroundUnaryOperator:
+    active: true
+  SpacingBetweenDeclarationsWithAnnotations:
+    active: true
+  SpacingBetweenDeclarationsWithComments:
+    active: false
+  SpacingBetweenFunctionNameAndOpeningParenthesis:
+    active: true
+  StringTemplate:
+    active: true
+  TrailingCommaOnCallSite:
+    active: true
+    useTrailingCommaOnCallSite: false
+  TrailingCommaOnDeclarationSite:
+    active: true
+    useTrailingCommaOnCallSite: false
+  TypeArgumentListSpacing:
+    active: true
+  TypeParameterListSpacing:
+    active: true
+  UnnecessaryParenthesesBeforeTrailingLambda:
+    active: true
+  Wrapping:
+    active: false
+    indentSize: 4
+
+compose:
+  ReusedModifierInstance:
+    active: true
+  UnnecessaryEventHandlerParameter:
+    active: true
+  ComposableEventParameterNaming:
+    active: true
+  ComposableParametersOrdering:
+    active: true
+  ModifierDefaultValue:
+    active: true
+  MissingModifierDefaultValue:
+    active: true
+  ModifierHeightWithText:
+    active: true
+  ModifierParameterPosition:
+    active: true
+  PublicComposablePreview:
+    active: true
+  TopLevelComposableFunctions:
+    active: true
+  ComposeFunctionName:
+    active: true
diff --git a/network/.gitignore b/core/analytics/.gitignore
similarity index 100%
rename from network/.gitignore
rename to core/analytics/.gitignore
diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts
new file mode 100644
index 0000000000..639fbbc622
--- /dev/null
+++ b/core/analytics/build.gradle.kts
@@ -0,0 +1,48 @@
+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 {
+
+    /** DI */
+    implementation(Library.hilt)
+    kapt(Library.hiltKapt)
+
+    /** Core shouldn't depends on core, but in case with utils and logging its necessary */
+    implementation(project(":core:utils"))
+}
\ No newline at end of file
diff --git a/core/analytics/src/main/AndroidManifest.xml b/core/analytics/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..9270c6ee97
--- /dev/null
+++ b/core/analytics/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.core.analytics" />
\ No newline at end of file
diff --git a/core/analytics/src/main/java/com/tangem/core/analytics/Analytics.kt b/core/analytics/src/main/java/com/tangem/core/analytics/Analytics.kt
new file mode 100644
index 0000000000..20fcb92c92
--- /dev/null
+++ b/core/analytics/src/main/java/com/tangem/core/analytics/Analytics.kt
@@ -0,0 +1,92 @@
+package com.tangem.core.analytics
+
+import com.tangem.core.analytics.api.AnalyticsEventFilter
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.analytics.api.AnalyticsFilterHolder
+import com.tangem.core.analytics.api.AnalyticsHandler
+import com.tangem.core.analytics.api.AnalyticsHandlerHolder
+import com.tangem.core.analytics.api.ParamsInterceptor
+import com.tangem.core.analytics.api.ParamsInterceptorHolder
+import com.tangem.utils.coroutines.FeatureCoroutineExceptionHandler
+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/core/analytics/src/main/java/com/tangem/core/analytics/AnalyticsEvent.kt b/core/analytics/src/main/java/com/tangem/core/analytics/AnalyticsEvent.kt
new file mode 100644
index 0000000000..e23a503460
--- /dev/null
+++ b/core/analytics/src/main/java/com/tangem/core/analytics/AnalyticsEvent.kt
@@ -0,0 +1,12 @@
+package com.tangem.core.analytics
+
+/**
+[REDACTED_AUTHOR]
+ */
+open class AnalyticsEvent(
+    val category: String,
+    val event: String,
+    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/api/ClientApi.kt b/core/analytics/src/main/java/com/tangem/core/analytics/api/ClientApi.kt
similarity index 86%
rename from app/src/main/java/com/tangem/tap/common/analytics/api/ClientApi.kt
rename to core/analytics/src/main/java/com/tangem/core/analytics/api/ClientApi.kt
index 3b5b0720f2..0989dfaad4 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/api/ClientApi.kt
+++ b/core/analytics/src/main/java/com/tangem/core/analytics/api/ClientApi.kt
@@ -1,4 +1,4 @@
-package com.tangem.tap.common.analytics.api
+package com.tangem.core.analytics.api
 
 /**
 [REDACTED_AUTHOR]
diff --git a/core/analytics/src/main/java/com/tangem/core/analytics/api/EventFilterApi.kt b/core/analytics/src/main/java/com/tangem/core/analytics/api/EventFilterApi.kt
new file mode 100644
index 0000000000..8381b2b983
--- /dev/null
+++ b/core/analytics/src/main/java/com/tangem/core/analytics/api/EventFilterApi.kt
@@ -0,0 +1,30 @@
+package com.tangem.core.analytics.api
+
+import com.tangem.core.analytics.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/core/analytics/src/main/java/com/tangem/core/analytics/api/EventHandlerApi.kt b/core/analytics/src/main/java/com/tangem/core/analytics/api/EventHandlerApi.kt
new file mode 100644
index 0000000000..ca6721037c
--- /dev/null
+++ b/core/analytics/src/main/java/com/tangem/core/analytics/api/EventHandlerApi.kt
@@ -0,0 +1,34 @@
+package com.tangem.core.analytics.api
+
+import com.tangem.core.analytics.AnalyticsEvent
+
+/**
+[REDACTED_AUTHOR]
+ */
+interface AnalyticsEventHandler {
+    fun send(event: AnalyticsEvent)
+}
+
+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)
+    }
+
+    fun prepareEventString(event: AnalyticsEvent): String = "[${event.category}] ${event.event}"
+}
+
+interface ErrorEventHandler {
+    fun send(
+        error: Throwable,
+        params: Map<String, String> = emptyMap(),
+    )
+}
+
+interface AnalyticsHandlerHolder {
+    fun addHandler(name: String, handler: AnalyticsHandler)
+    fun removeHandler(name: String): AnalyticsHandler?
+}
\ No newline at end of file
diff --git a/core/analytics/src/main/java/com/tangem/core/analytics/api/ParamsInterceptorApi.kt b/core/analytics/src/main/java/com/tangem/core/analytics/api/ParamsInterceptorApi.kt
new file mode 100644
index 0000000000..e2f9dd5860
--- /dev/null
+++ b/core/analytics/src/main/java/com/tangem/core/analytics/api/ParamsInterceptorApi.kt
@@ -0,0 +1,17 @@
+package com.tangem.core.analytics.api
+
+import com.tangem.core.analytics.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/core/analytics/src/main/java/com/tangem/core/analytics/di/AnalyticsModule.kt b/core/analytics/src/main/java/com/tangem/core/analytics/di/AnalyticsModule.kt
new file mode 100644
index 0000000000..3b12478c96
--- /dev/null
+++ b/core/analytics/src/main/java/com/tangem/core/analytics/di/AnalyticsModule.kt
@@ -0,0 +1,20 @@
+package com.tangem.core.analytics.di
+
+import com.tangem.core.analytics.Analytics
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class AnalyticsModule {
+
+    @Singleton
+    @Provides
+    fun provideAnalyticsHandler(): AnalyticsEventHandler {
+        return Analytics // todo replace after refactoring calling Analytics in whole project
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/.gitignore b/core/datasource/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/datasource/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
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/common/BigDecimalAdapter.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/BigDecimalAdapter.kt
new file mode 100644
index 0000000000..568b042179
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/BigDecimalAdapter.kt
@@ -0,0 +1,16 @@
+package com.tangem.datasource.api.common
+
+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/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..1457807f3e
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/MoshiConverter.kt
@@ -0,0 +1,28 @@
+package com.tangem.datasource.api.common
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import com.tangem.common.json.MoshiJsonConverter
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+/**
+[REDACTED_AUTHOR]
+ */
+// TODO("Remove after removing Redux")
+@Deprecated("Provide by DI")
+object MoshiConverter {
+
+    val networkMoshi: Moshi = Moshi.Builder()
+        .add(KotlinJsonAdapterFactory())
+        .add(BigDecimalAdapter())
+        .build()
+
+    val networkMoshiConverter: MoshiConverterFactory = MoshiConverterFactory.create(networkMoshi)
+
+    val sdkMoshiConverter: MoshiJsonConverter = MoshiJsonConverter(
+        adapters = listOf(BigDecimalAdapter()) + MoshiJsonConverter.getTangemSdkAdapters(),
+        typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
+    )
+
+    val sdkMoshi: Moshi = sdkMoshiConverter.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 80%
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..166036783c 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,18 +1,17 @@
-package com.tangem.network.common
+package com.tangem.datasource.api.common
 
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Converter
 import retrofit2.Retrofit
 import java.util.concurrent.TimeUnit
 
-// TODO: refactoring: make it better through factory
+@Suppress("MagicNumber")
+@Deprecated("Create and provide by DI")
 fun createRetrofitInstance(
     baseUrl: String,
     okHttpBuilder: OkHttpClient.Builder = OkHttpClient.Builder(),
     interceptors: List<Interceptor> = emptyList(),
-    converterFactory: Converter.Factory = MoshiConverter.createFactory(),
     logEnabled: Boolean,
 ): Retrofit {
     okHttpBuilder.apply {
@@ -27,7 +26,7 @@ fun createRetrofitInstance(
 
     return Retrofit.Builder()
         .baseUrl(baseUrl)
-        .addConverterFactory(converterFactory)
+        .addConverterFactory(MoshiConverter.networkMoshiConverter)
         .client(okHttpBuilder.build())
         .build()
 }
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..651e726ad3
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchApi.kt
@@ -0,0 +1,203 @@
+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.Response
+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,
+    ): Response<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]
+     */
+    @GET("quote")
+    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,
+    ): Response<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]
+     */
+    @GET("swap")
+    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,
+    ): Response<SwapResponse>
+    //endregion Swap
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchApiFactory.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchApiFactory.kt
new file mode 100644
index 0000000000..da21f86558
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchApiFactory.kt
@@ -0,0 +1,14 @@
+package com.tangem.datasource.api.oneinch
+
+class OneInchApiFactory {
+
+    private val oneInchApiMap = mutableMapOf<String, OneInchApi>()
+
+    fun putApi(networkId: String, api: OneInchApi) {
+        oneInchApiMap[networkId] = api
+    }
+
+    fun getApi(networkId: String): OneInchApi {
+        return oneInchApiMap[networkId] ?: error("no api found for networkId $networkId")
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchErrorsHandler.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchErrorsHandler.kt
new file mode 100644
index 0000000000..4fdc784ecb
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchErrorsHandler.kt
@@ -0,0 +1,35 @@
+package com.tangem.datasource.api.oneinch
+
+import com.squareup.moshi.Moshi
+import com.tangem.datasource.api.oneinch.errors.OneIncResponseException
+import com.tangem.datasource.api.oneinch.models.SwapErrorDto
+import com.tangem.datasource.di.NetworkMoshi
+import retrofit2.HttpException
+import retrofit2.Response
+import javax.inject.Inject
+
+class OneInchErrorsHandler @Inject constructor(@NetworkMoshi moshi: Moshi) {
+
+    private val errorMoshiAdapter = moshi.adapter(SwapErrorDto::class.java)
+
+    @Throws(OneIncResponseException::class)
+    fun <T> handleOneInchResponse(response: Response<T>): T {
+        return if (response.isSuccessful) {
+            response.body() ?: error("response body is null")
+        } else {
+            when (response.code()) {
+                HTTP_CODE_400 -> {
+                    val swapErrorDto = errorMoshiAdapter.fromJson(response.errorBody()?.string() ?: "")
+                    throw OneIncResponseException(swapErrorDto ?: throw HttpException(response))
+                }
+                else -> {
+                    throw HttpException(response)
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val HTTP_CODE_400 = 400
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/errors/OneIncResponseException.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/errors/OneIncResponseException.kt
new file mode 100644
index 0000000000..94c94f6e32
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/errors/OneIncResponseException.kt
@@ -0,0 +1,5 @@
+package com.tangem.datasource.api.oneinch.errors
+
+import com.tangem.datasource.api.oneinch.models.SwapErrorDto
+
+class OneIncResponseException(val data: SwapErrorDto) : Exception()
\ 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..ecea3f4bc5
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/QuoteResponse.kt
@@ -0,0 +1,20 @@
+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 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 = "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..4a72fcccc5
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/SwapResponse.kt
@@ -0,0 +1,11 @@
+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 = "tx") 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/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApi.kt
new file mode 100644
index 0000000000..d3d092493f
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApi.kt
@@ -0,0 +1,38 @@
+package com.tangem.datasource.api.paymentology
+
+import com.tangem.datasource.api.paymentology.models.request.CheckRegistrationRequests
+import com.tangem.datasource.api.paymentology.models.request.RegisterKYCRequest
+import com.tangem.datasource.api.paymentology.models.request.RegisterWalletRequest
+import com.tangem.datasource.api.paymentology.models.response.AttestationResponse
+import com.tangem.datasource.api.paymentology.models.response.RegisterWalletResponse
+import com.tangem.datasource.api.paymentology.models.response.RegistrationResponse
+import retrofit2.http.Body
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+/**
+ * Interface of Paymentology Api.
+ *
+ * IMPORTANT: Cannot replace [Headers] annotations with OkHttpClient.addHeader(), because OkHttp adds encoding to
+ * content type value. But Paymentology API expects a value without the charset.
+ *
+[REDACTED_AUTHOR]
+ */
+interface PaymentologyApi {
+
+    @Headers("Content-Type: application/json")
+    @POST("card/verify")
+    suspend fun checkRegistration(@Body request: CheckRegistrationRequests): RegistrationResponse
+
+    @Headers("Content-Type: application/json")
+    @POST("card/get_challenge")
+    suspend fun requestAttestationChallenge(@Body request: CheckRegistrationRequests.Item): AttestationResponse
+
+    @Headers("Content-Type: application/json")
+    @POST("card/set_pin")
+    suspend fun registerWallet(@Body request: RegisterWalletRequest): RegisterWalletResponse
+
+    @Headers("Content-Type: application/json")
+    @POST("card/kyc")
+    suspend fun registerKYC(@Body request: RegisterKYCRequest): RegisterWalletResponse
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApiService.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApiService.kt
new file mode 100644
index 0000000000..f660c1fc47
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApiService.kt
@@ -0,0 +1,30 @@
+package com.tangem.datasource.api.paymentology
+
+import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.datasource.utils.allowLogging
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+
+/**
+[REDACTED_AUTHOR]
+ */
+// TODO("Remove after removing Redux")
+@Deprecated("Use PaymentologyApi")
+object PaymentologyApiService {
+    val api = createApi()
+
+    private const val PAYMENTOLOGY_BASE_URL: String = "https://paymentologygate.oa.r.appspot.com/"
+
+    private fun createApi(): PaymentologyApi {
+        return Retrofit.Builder()
+            .addConverterFactory(MoshiConverter.networkMoshiConverter)
+            .baseUrl(PAYMENTOLOGY_BASE_URL)
+            .client(
+                OkHttpClient.Builder()
+                    .allowLogging()
+                    .build(),
+            )
+            .build()
+            .create(PaymentologyApi::class.java)
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/CheckRegistrationRequests.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/CheckRegistrationRequests.kt
new file mode 100644
index 0000000000..e9c4152928
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/CheckRegistrationRequests.kt
@@ -0,0 +1,15 @@
+package com.tangem.datasource.api.paymentology.models.request
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+data class CheckRegistrationRequests(
+    @Json(name = "requests") val requests: List<Item>,
+) {
+
+    @JsonClass(generateAdapter = true)
+    data class Item(
+        @Json(name = "CID") val cardId: String = "",
+        @Json(name = "publicKey") val publicKey: String = "",
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/RegisterKYCRequest.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/RegisterKYCRequest.kt
new file mode 100644
index 0000000000..d22c3e74d3
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/RegisterKYCRequest.kt
@@ -0,0 +1,33 @@
+package com.tangem.datasource.api.paymentology.models.request
+
+import com.squareup.moshi.Json
+import com.tangem.common.extensions.calculateHashCode
+
+data class RegisterKYCRequest(
+    @Json(name = "CID") val cardId: String,
+    @Json(name = "publicKey") val publicKey: ByteArray,
+    @Json(name = "kycProvider") val kycProvider: String,
+    @Json(name = "kycRefId") val kycRefId: String,
+) {
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as RegisterKYCRequest
+
+        if (cardId != other.cardId) return false
+        if (!publicKey.contentEquals(other.publicKey)) return false
+        if (kycProvider != other.kycProvider) return false
+        if (kycRefId != other.kycRefId) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int = calculateHashCode(
+        cardId.hashCode(),
+        publicKey.contentHashCode(),
+        kycProvider.hashCode(),
+        kycRefId.hashCode(),
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/RegisterWalletRequest.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/RegisterWalletRequest.kt
new file mode 100644
index 0000000000..ad784d9c04
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/request/RegisterWalletRequest.kt
@@ -0,0 +1,44 @@
+package com.tangem.datasource.api.paymentology.models.request
+
+import com.squareup.moshi.Json
+import com.tangem.common.extensions.calculateHashCode
+
+data class RegisterWalletRequest(
+    @Json(name = "CID") val cardId: String,
+    @Json(name = "publicKey") val publicKey: ByteArray,
+    @Json(name = "walletPublicKey") val walletPublicKey: ByteArray,
+    @Json(name = "walletSalt") val walletSalt: ByteArray,
+    @Json(name = "walletSignature") val walletSignature: ByteArray,
+    @Json(name = "cardSalt") val cardSalt: ByteArray,
+    @Json(name = "cardSignature") val cardSignature: ByteArray,
+    @Json(name = "PIN") val pin: String,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as RegisterWalletRequest
+
+        if (cardId != other.cardId) return false
+        if (!publicKey.contentEquals(other.publicKey)) return false
+        if (!walletPublicKey.contentEquals(other.walletPublicKey)) return false
+        if (!walletSalt.contentEquals(other.walletSalt)) return false
+        if (!walletSignature.contentEquals(other.walletSignature)) return false
+        if (!cardSalt.contentEquals(other.cardSalt)) return false
+        if (!cardSignature.contentEquals(other.cardSignature)) return false
+        if (pin != other.pin) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int = calculateHashCode(
+        cardId.hashCode(),
+        publicKey.contentHashCode(),
+        walletPublicKey.contentHashCode(),
+        walletSalt.contentHashCode(),
+        walletSignature.contentHashCode(),
+        cardSalt.contentHashCode(),
+        cardSignature.contentHashCode(),
+        pin.hashCode(),
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/AttestationResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/AttestationResponse.kt
new file mode 100644
index 0000000000..170e1caf92
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/AttestationResponse.kt
@@ -0,0 +1,33 @@
+package com.tangem.datasource.api.paymentology.models.response
+
+import com.squareup.moshi.Json
+import com.tangem.common.extensions.calculateHashCode
+
+data class AttestationResponse(
+    @Json(name = "challenge") val challenge: ByteArray?,
+    @Json(name = "success") override val success: Boolean,
+    @Json(name = "error") override val error: String?,
+    @Json(name = "errorCode") override val errorCode: Int?,
+) : ResponseError {
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AttestationResponse
+
+        if (!challenge.contentEquals(other.challenge)) return false
+        if (success != other.success) return false
+        if (error != other.error) return false
+        if (errorCode != other.errorCode) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int = calculateHashCode(
+        challenge.contentHashCode(),
+        success.hashCode(),
+        error.hashCode(),
+        errorCode.hashCode(),
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/KYCStatus.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/KYCStatus.kt
new file mode 100644
index 0000000000..4ce64674d0
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/KYCStatus.kt
@@ -0,0 +1,10 @@
+package com.tangem.datasource.api.paymentology.models.response
+
+enum class KYCStatus {
+    NOT_STARTED,
+    STARTED,
+    WAITING_FOR_APPROVAL,
+    CORRECTION_REQUESTED,
+    REJECTED,
+    APPROVED,
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/RegisterWalletResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/RegisterWalletResponse.kt
new file mode 100644
index 0000000000..d2a1edac8d
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/RegisterWalletResponse.kt
@@ -0,0 +1,9 @@
+package com.tangem.datasource.api.paymentology.models.response
+
+import com.squareup.moshi.Json
+
+data class RegisterWalletResponse(
+    @Json(name = "success") override val success: Boolean,
+    @Json(name = "error") override val error: String?,
+    @Json(name = "errorCode") override val errorCode: Int?,
+) : ResponseError
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/RegistrationResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/RegistrationResponse.kt
new file mode 100644
index 0000000000..83c0a03822
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/RegistrationResponse.kt
@@ -0,0 +1,25 @@
+package com.tangem.datasource.api.paymentology.models.response
+
+import com.squareup.moshi.Json
+
+data class RegistrationResponse(
+    @Json(name = "results") val results: List<Item> = listOf(),
+    @Json(name = "success") override val success: Boolean,
+    @Json(name = "error") override val error: String?,
+    @Json(name = "errorCode") override val errorCode: Int?,
+) : ResponseError {
+
+    data class Item(
+        @Json(name = "CID") val cardId: String,
+        @Json(name = "passed") val passed: Boolean?,
+        @Json(name = "active") val active: Boolean?,
+        @Json(name = "pin_set") val pinSet: Boolean?,
+        @Json(name = "blockchain_init") val blockchainInit: Boolean?,
+        @Json(name = "kyc_passed") val kycPassed: Boolean?,
+        @Json(name = "kyc_provider") val kycProvider: String?,
+        @Json(name = "kyc_date") val kycDate: String?,
+        @Json(name = "kyc_status") val kycStatus: KYCStatus?,
+        @Json(name = "disabled_by_admin") val disabledByAdmin: Boolean?,
+        @Json(name = "error") val error: String?,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/ResponseError.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/ResponseError.kt
new file mode 100644
index 0000000000..3bead696c9
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/models/response/ResponseError.kt
@@ -0,0 +1,16 @@
+package com.tangem.datasource.api.paymentology.models.response
+
+import com.tangem.common.services.Result
+
+interface ResponseError {
+    val success: Boolean
+    val error: String?
+    val errorCode: Int?
+
+    fun makeErrorMessage(): String = error ?: "unknown error"
+}
+
+inline fun <reified T> ResponseError.tryExtractError(): Result<T> = when (success) {
+    true -> Result.Success(this as T)
+    else -> Result.Failure(Throwable(makeErrorMessage()))
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
new file mode 100644
index 0000000000..711963d504
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
@@ -0,0 +1,60 @@
+package com.tangem.datasource.api.tangemTech
+
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
+import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
+import com.tangem.datasource.api.tangemTech.models.GeoResponse
+import com.tangem.datasource.api.tangemTech.models.RatesResponse
+import com.tangem.datasource.api.tangemTech.models.ReferralResponse
+import com.tangem.datasource.api.tangemTech.models.StartReferralBody
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+/**
+ * Interface of Tangem Tech API
+ *
+[REDACTED_AUTHOR]
+ */
+interface TangemTechApi {
+
+    @GET("coins")
+    suspend fun getCoins(
+        @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,
+    ): CoinsResponse
+
+    @GET("rates")
+    suspend fun getRates(
+        @Query("currencyId") currencyId: String,
+        @Query("coinIds") coinIds: String,
+    ): RatesResponse
+
+    @GET("currencies")
+    suspend fun getCurrencyList(): CurrenciesResponse
+
+    @GET("geo")
+    suspend fun getUserCountryCode(): GeoResponse
+
+    @GET("user-tokens/{user-id}")
+    suspend fun getUserTokens(@Path(value = "user-id") userId: String): UserTokensResponse
+
+    @PUT("user-tokens/{user-id}")
+    suspend fun saveUserTokens(@Path(value = "user-id") userId: String, @Body userTokens: UserTokensResponse)
+
+    /** 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/tangemTech/TangemTechService.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
new file mode 100644
index 0000000000..50f11aa961
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
@@ -0,0 +1,42 @@
+package com.tangem.datasource.api.tangemTech
+
+import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.datasource.utils.RequestHeader
+import com.tangem.datasource.utils.RequestHeader.AuthenticationHeader
+import com.tangem.datasource.utils.RequestHeader.CacheControlHeader
+import com.tangem.datasource.utils.addHeaders
+import com.tangem.datasource.utils.allowLogging
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+
+/**
+[REDACTED_AUTHOR]
+ */
+// TODO("Remove after removing Redux")
+@Deprecated("Use TangemTechApi")
+object TangemTechService {
+
+    var api: TangemTechApi = createApi()
+        private set
+
+    private const val TANGEM_TECH_BASE_URL = "https://api.tangem-tech.com/v1/"
+
+    fun addAuthenticationHeader(header: AuthenticationHeader) {
+        api = createApi(header)
+    }
+
+    private fun createApi(header: RequestHeader? = null): TangemTechApi {
+        val headers = mutableListOf<RequestHeader>(CacheControlHeader).apply { header?.let(::add) }
+        return Retrofit.Builder()
+            .addConverterFactory(MoshiConverter.networkMoshiConverter)
+            .baseUrl(TANGEM_TECH_BASE_URL)
+            .client(
+                OkHttpClient.Builder()
+                    .addHeaders(*headers.toTypedArray())
+                    .allowLogging()
+                    .build(),
+            )
+            .build()
+            .create(TangemTechApi::class.java)
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CoinsResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CoinsResponse.kt
new file mode 100644
index 0000000000..0a19554bf0
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CoinsResponse.kt
@@ -0,0 +1,27 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+import java.math.BigDecimal
+
+data class CoinsResponse(
+    @Json(name = "imageHost") val imageHost: String?,
+    @Json(name = "coins") val coins: List<Coin>,
+    @Json(name = "total") val total: Int,
+) {
+
+    data class Coin(
+        @Json(name = "id") val id: String,
+        @Json(name = "name") val name: String,
+        @Json(name = "symbol") val symbol: String,
+        @Json(name = "active") val active: Boolean,
+        @Json(name = "networks") val networks: List<Network> = listOf(),
+    ) {
+
+        data class Network(
+            @Json(name = "networkId") val networkId: String,
+            @Json(name = "contractAddress") val contractAddress: String? = null,
+            @Json(name = "decimalCount") val decimalCount: BigDecimal? = null,
+            @Json(name = "exchangeable") val exchangeable: Boolean? = false,
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CurrenciesResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CurrenciesResponse.kt
new file mode 100644
index 0000000000..bab2e292de
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CurrenciesResponse.kt
@@ -0,0 +1,17 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+
+data class CurrenciesResponse(
+    @Json(name = "currencies") val currencies: List<Currency>,
+) {
+
+    data class Currency(
+        @Json(name = "id") val id: String,
+        @Json(name = "code") val code: String, // this is an uppercase id
+        @Json(name = "name") val name: String,
+        @Json(name = "rateBTC") val rateBTC: String,
+        @Json(name = "unit") val unit: String, // $, €, ₽
+        @Json(name = "type") val type: String,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/GeoResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/GeoResponse.kt
new file mode 100644
index 0000000000..e6cdfa4b12
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/GeoResponse.kt
@@ -0,0 +1,7 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+
+data class GeoResponse(
+    @Json(name = "code") val code: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/RatesResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/RatesResponse.kt
new file mode 100644
index 0000000000..c743ff9147
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/RatesResponse.kt
@@ -0,0 +1,8 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+
+// rates.keys = networkId's
+data class RatesResponse(
+    @Json(name = "rates") val rates: Map<String, Double>,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/ReferralResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/ReferralResponse.kt
new file mode 100644
index 0000000000..712c98c40a
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/ReferralResponse.kt
@@ -0,0 +1,48 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+
+/**
+ * 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 = "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/tangemTech/models/StartReferralBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/StartReferralBody.kt
new file mode 100644
index 0000000000..8f2c933f19
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/StartReferralBody.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.api.tangemTech.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/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/UserTokensResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/UserTokensResponse.kt
new file mode 100644
index 0000000000..180deb01a0
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/UserTokensResponse.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+
+data class UserTokensResponse(
+    @Json(name = "version") val version: Int = 0,
+    @Json(name = "group") val group: String? = null,
+    @Json(name = "sort") val sort: String? = null,
+    @Json(name = "tokens") val tokens: List<Token> = emptyList(),
+) {
+
+    data class Token(
+        @Json(name = "id") val id: String? = null,
+        @Json(name = "networkId") val networkId: String,
+        @Json(name = "derivationPath") val derivationPath: String? = null,
+        @Json(name = "name") val name: String,
+        @Json(name = "symbol") val symbol: String,
+        @Json(name = "decimals") val decimals: Int,
+        @Json(name = "contractAddress") val contractAddress: String?,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/MoshiDaggerKey.kt b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiDaggerKey.kt
new file mode 100644
index 0000000000..0bae74e68b
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiDaggerKey.kt
@@ -0,0 +1,13 @@
+package com.tangem.datasource.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class SdkMoshi
+
+@Qualifier
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class NetworkMoshi
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
new file mode 100644
index 0000000000..0ab6faea17
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
@@ -0,0 +1,42 @@
+package com.tangem.datasource.di
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.datasource.api.common.BigDecimalAdapter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class MoshiModule {
+
+    @Provides
+    @Singleton
+    @NetworkMoshi
+    fun provideNetworkMoshi(): Moshi {
+        return Moshi.Builder()
+            .add(KotlinJsonAdapterFactory())
+            .add(BigDecimalAdapter())
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    @SdkMoshi
+    fun provideSdkMoshi(sdkMoshiJsonConverter: MoshiJsonConverter): Moshi {
+        return sdkMoshiJsonConverter.moshi
+    }
+
+    @Provides
+    @Singleton
+    fun provideSdkMoshiConverter(): MoshiJsonConverter {
+        return MoshiJsonConverter(
+            adapters = listOf(BigDecimalAdapter()) + MoshiJsonConverter.getTangemSdkAdapters(),
+            typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
+        )
+    }
+}
\ No newline at end of file
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..d0a72c025c
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
@@ -0,0 +1,63 @@
+package com.tangem.datasource.di
+
+import com.squareup.moshi.Moshi
+import com.tangem.datasource.api.paymentology.PaymentologyApi
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.utils.RequestHeader.*
+import com.tangem.datasource.utils.addHeaders
+import com.tangem.datasource.utils.allowLogging
+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 retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class NetworkModule {
+
+    @Provides
+    @Singleton
+    fun provideTangemTechApi(authProvider: AuthProvider, @NetworkMoshi moshi: Moshi): TangemTechApi {
+        return Retrofit.Builder()
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .baseUrl(PROD_TANGEM_TECH_BASE_URL)
+            .client(
+                OkHttpClient.Builder()
+                    .addHeaders(
+                        CacheControlHeader,
+                        AuthenticationHeader(authProvider),
+                    )
+                    .allowLogging()
+                    .build(),
+            )
+            .build()
+            .create(TangemTechApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun providePaymentologyApi(@NetworkMoshi moshi: Moshi): PaymentologyApi {
+        return Retrofit.Builder()
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .baseUrl(PAYMENTOLOGY_BASE_URL)
+            .client(
+                OkHttpClient.Builder()
+                    .allowLogging()
+                    .build(),
+            )
+            .build()
+            .create(PaymentologyApi::class.java)
+    }
+
+    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/"
+
+        private const val PAYMENTOLOGY_BASE_URL: String = "https://paymentologygate.oa.r.appspot.com/"
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/OneInchApisModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/OneInchApisModule.kt
new file mode 100644
index 0000000000..379f312d25
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/OneInchApisModule.kt
@@ -0,0 +1,73 @@
+package com.tangem.datasource.di
+
+import com.squareup.moshi.Moshi
+import com.tangem.datasource.api.oneinch.OneInchApi
+import com.tangem.datasource.api.oneinch.OneInchApiFactory
+import com.tangem.datasource.utils.allowLogging
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class OneInchApisModule {
+
+    @Provides
+    @Singleton
+    fun provideOneInchApiFactory(@NetworkMoshi moshi: Moshi): OneInchApiFactory {
+        val apiFactory = OneInchApiFactory()
+        apiFactory.putApi(ETH_NETWORK, createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_ETH_PATH, moshi))
+        apiFactory.putApi(BSC_NETWORK, createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_BSC_PATH, moshi))
+        apiFactory.putApi(POLYGON_NETWORK, createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_POLYGON_PATH, moshi))
+        apiFactory.putApi(OPTIMISM_NETWORK, createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_OPTIMISM_PATH, moshi))
+        apiFactory.putApi(ARBITRUM_NETWORK, createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_ARBITRUM_PATH, moshi))
+        apiFactory.putApi(GNOSIS_NETWORK, createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_GNOSIS_PATH, moshi))
+        apiFactory.putApi(
+            AVALANCHE_NETWORK,
+            createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_AVALANCHE_PATH, moshi),
+        )
+        apiFactory.putApi(FANTOM_NETWORK, createOneInchApiWithUrl(ONE_INCH_BASE_URL + ONE_INCH_FANTOM_PATH, moshi))
+        return apiFactory
+    }
+
+    private fun createOneInchApiWithUrl(url: String, moshi: Moshi): OneInchApi {
+        return Retrofit.Builder()
+            .addConverterFactory(
+                MoshiConverterFactory.create(moshi),
+            )
+            .baseUrl(url)
+            .client(
+                OkHttpClient.Builder()
+                    .allowLogging()
+                    .build(),
+            )
+            .build()
+            .create(OneInchApi::class.java)
+    }
+
+    companion object {
+        private const val ONE_INCH_BASE_URL = "https://api.1inch.io/v5.0/"
+        private const val ONE_INCH_ETH_PATH = "1/"
+        private const val ONE_INCH_BSC_PATH = "56/"
+        private const val ONE_INCH_POLYGON_PATH = "137/"
+        private const val ONE_INCH_OPTIMISM_PATH = "10/"
+        private const val ONE_INCH_ARBITRUM_PATH = "42161/"
+        private const val ONE_INCH_GNOSIS_PATH = "100/"
+        private const val ONE_INCH_AVALANCHE_PATH = "43114/"
+        private const val ONE_INCH_FANTOM_PATH = "250/"
+
+        private const val ETH_NETWORK = "ethereum"
+        private const val BSC_NETWORK = "binance-smart-chain"
+        private const val POLYGON_NETWORK = "polygon-pos"
+        private const val OPTIMISM_NETWORK = "optimistic-ethereum"
+        private const val ARBITRUM_NETWORK = "arbitrum-one"
+        private const val GNOSIS_NETWORK = "xdai"
+        private const val AVALANCHE_NETWORK = "avalanche"
+        private const val FANTOM_NETWORK = "fantom"
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
new file mode 100644
index 0000000000..dffc98c05a
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
@@ -0,0 +1,30 @@
+package com.tangem.datasource.utils
+
+import com.tangem.datasource.BuildConfig
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import okhttp3.logging.HttpLoggingInterceptor.Level
+
+/** Extension for adding headers [requestHeaders] to every [OkHttpClient] request */
+internal fun OkHttpClient.Builder.addHeaders(vararg requestHeaders: RequestHeader): OkHttpClient.Builder {
+    return addInterceptor(
+        Interceptor { chain ->
+            val request = chain.request().newBuilder().apply {
+                requestHeaders
+                    .flatMap(RequestHeader::values)
+                    .forEach { addHeader(it.first, it.second) }
+            }.build()
+
+            chain.proceed(request)
+        },
+    )
+}
+
+/**
+ * Extension for logging each [OkHttpClient] request
+ *
+ * @param level logging level. By default, only the request body.
+ */
+internal fun OkHttpClient.Builder.allowLogging(level: Level = Level.BODY): OkHttpClient.Builder =
+    if (BuildConfig.DEBUG) addInterceptor(interceptor = HttpLoggingInterceptor().setLevel(level)) else this
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
new file mode 100644
index 0000000000..9e9e143cf2
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.utils
+
+import com.tangem.lib.auth.AuthProvider
+
+/**
+ * Presentation of request header
+ *
+ * @param pairs header name and header value pairs
+ */
+sealed class RequestHeader(vararg pairs: Pair<String, String>) {
+
+    /** Header list */
+    val values: List<Pair<String, String>> = pairs.toList()
+
+    object CacheControlHeader : RequestHeader("Cache-Control" to "max-age=600")
+
+    class AuthenticationHeader(authProvider: AuthProvider) : RequestHeader(
+        "card_public_key" to authProvider.getCardPublicKey(),
+        "card_id" to authProvider.getCardId()
+    )
+}
\ 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 73%
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..272b4f483c 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"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Nicht genug Geld</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
+    <string name="common_fee_error">Erhalt der Gebühr fehlgeschlagen</string>
+    <string name="no_account_generic">Laden Sie %1$s+ %2$s auf um ein Konto zu erstellen</string>
+    <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</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="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_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_insufficient_balance">Nicht genug Geld</string>
+    <string name="send_error_invalid_fee_value">Falsche Gebühr</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>
-</resources>
\ No newline at end of file
+    <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_unknown">Unbekannter Fehler</string>
+    <string name="send_validation_amount_exceeds_balance">Der Betrag geht über die Bilanz hinaus</string>
+    <string name="send_validation_invalid_amount">Ungültiger Betrag</string>
+    <string name="send_validation_invalid_fee">Die Gebühr geht über die Bilanz hinaus</string>
+    <string name="send_validation_invalid_total">Der Gesamtbetrag geht über die Bilanz hinaus</string>
+    <string name="xtz_withdrawal_message_ignore">Nein, alles senden</string>
+    <string name="xtz_withdrawal_message_reduce">Um %s XTZ reduzieren</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>
+</resources>
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..ceb6d82ea4
--- /dev/null
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="address_qr_code_message_format">Send only %1$s (%2$s) from %3$s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</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_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
+    <string name="alert_developer_card">Die von Ihnen gescannte Karte ist eine Entwicklungskarte. Akzeptieren Sie sie nicht als Zahlungsmittel.</string>
+    <string name="alert_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</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="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="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_unsupported_card">Diese Karte ist für die Zusammenarbeit mit Tangem nicht geeignet</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</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="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes from the app.</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_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_title">App Settings</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="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="common_accept">Akzeptieren</string>
+    <string name="common_add">Add</string>
+    <string name="common_attention">Attention</string>
+    <string name="common_balance">Bilanz: %s</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</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_cancel">Abbrechen</string>
+    <string name="common_close">Close</string>
+    <string name="common_continue">Continue</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_create">Create</string>
+    <string name="common_delete">Entfernen</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_done">Erledigt</string>
+    <string name="common_enable">Enable</string>
+    <string name="common_error">Fehler</string>
+    <string name="common_no">No</string>
+    <string name="common_ok">OK</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="common_reject">Reject</string>
+    <string name="common_retry">Retry</string>
+    <string name="common_save_changes">Änderungen speichern</string>
+    <string name="common_search">Search</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="common_share">Share</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_start">Start</string>
+    <string name="common_submit">Submit</string>
+    <string name="common_success">Erfolg</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_warning">Warnung</string>
+    <string name="common_yes">Yes</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="custom_token_contract_address_input_title">Contract address</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_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_required_field">Required field</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_decimals_input_title">Decimals</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</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_network_input_not_selected">Not selected</string>
+    <string name="custom_token_network_input_title">Network</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_validation_error_already_added">This token/network has already been added to your list</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="details_chat">Chat</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="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_referral_title">Referral program</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s Hasch</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="details_row_title_cid">KartenID</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="details_row_title_currency">App Währung</string>
+    <string name="details_row_title_issuer">Emittent</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="details_row_title_signed_hashes">Signiert</string>
+    <string name="details_title">Details</string>
+    <string name="disclaimer_error_loading">Check your internet connection or switch to a different network</string>
+    <string name="disclaimer_title">Nutzungsbedingungen</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="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="exchange_receive_view_header">You Receive</string>
+    <string name="exchange_send_view_header">You Send</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="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_support">Hi support team,</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</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_support">Feedback</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="home_button_order">Order</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="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_scan_header">Legen Sie die Karte zum Scannen an</string>
+    <string name="initial_message_sign_header">Tippen um zu signieren</string>
+    <string name="initial_message_tap_header">Legen Sie die Karte an</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</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_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_tokens">Tokens</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_1_title">Protect</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_2_title">Personalize</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_feature_3_title">Restore</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_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_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="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_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_balance_title">Balance</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_backup_now">Backup now</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_chat_button_title">Support</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_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</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_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</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_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</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_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</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_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</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 %1$s %2$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_top_up_header">Top up your wallet</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</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_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup 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_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="referral_button_participate">Participate</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. Error code: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Error code: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_friends_bought_title">Your friends bought</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 %1$s network address%2$s</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</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_with_backup_to_factory_message">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="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="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</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_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow 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_code_title">Access code</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="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="scan_card_settings_button">Scan Card</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_title">Get your card ready!</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="send_amount_label">Betrag</string>
+    <string name="send_destination_hint_address">Adresse</string>
+    <string name="send_destination_hint_address_payid">Adresse oder PayString</string>
+    <string name="send_error_address_same_as_wallet">Die Adresse stimmt mit der Adresse Ihrer Brieftasche überein</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_payid_unsupported_by_blockchain">PayString wird von der Blockchain nicht unterstützt</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="send_fee_include_description">inkl. Gebühr</string>
+    <string name="send_fee_label">Gebühr</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_max_amount_label">Höchstbetrag</string>
+    <string name="send_network_fee_title">Netzgebühr</string>
+    <string name="send_title">Absenden</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="send_total_label">Gesamt</string>
+    <string name="send_total_subtitle_asset_format">%1$s und %2$s werden gesendet</string>
+    <string name="send_total_subtitle_fiat_format">≈ %1$s (inkl. Gebühr: %2$s)</string>
+    <string name="send_total_subtitle_format">%s wird 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="send_validation_invalid_address">Ungültige Adresse</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_total">Total</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</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_backup_title">Ultra Secure Backup</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_currencies_title">Thousands of Currencies</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="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_title">Meet\nTangem</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_web3_title">DeFi Compatible</string>
+    <string name="swapping_generic_error">There was an error. Please try again.</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_not_enough_funds_for_fee">Not enough funds for fee in your %1$s wallet to create a transaction. Top up your %2$s wallet first.</string>
+    <string name="swapping_pending_transaction_subtitle">Transaction in progress...</string>
+    <string name="swapping_pending_transaction_title">Waiting</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="swapping_success_view_explorer_button_title">View in Explorer</string>
+    <string name="swapping_success_view_title">In progress</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_swap_of_to">Swap of %1$s to %2$s</string>
+    <string name="swapping_token_list_other_tokens">Other tokens</string>
+    <string name="swapping_token_list_title">Choose token</string>
+    <string name="swapping_token_list_your_tokens">Your tokens</string>
+    <string name="swapping_token_not_available">not available</string>
+    <string name="tangem_app_name">Tangem</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_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_send_blocked_fee_format">%1$s is a token in the %2$s network. To make a %3$s transaction you need to deposit some %4$s (%5$s) to cover the network fee.</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="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_item_no_rate">No rate</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="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="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twins_recreate_title_creating_wallet">Creating 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_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="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_delete_prompt">Are you sure you want to delete this wallet?</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="wallet_address_button_create_payid">PayString erstellen</string>
+    <string name="wallet_address_button_explore">Adresse erkunden</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="wallet_balance_loading">Die Bilanz wird aufgeladen…</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+    <string name="wallet_balance_tx_in_progress">Die Transaktion läuft…</string>
+    <string name="wallet_balance_verified">Verifizierte Bilanz</string>
+    <string name="wallet_button_actions">Actions</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_create_wallet">ein Wallet erstellen</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_send">Absenden</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %1$s, requesting to\nsign BNB transaction.\n\n%2$s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %1$s\nPrice: %2$s\nAmount to receive: %3$s\nAmount to pay: %4$s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %1$s\nTo: %2$s\nAmount: %3$s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</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_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%1$s\n\nNETWORK: %2$s\n\nURL: %3$s</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_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_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_create_payid">PayString erstellen</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_empty">Zuerst geben Sie die gewünschte PayString ein</string>
+    <string name="wallet_create_payid_error_already_created">Diese PayString existiert bereits. Versuchen Sie mit einer anderen erneut.</string>
+    <string name="wallet_create_payid_error_message">Fehlerantwort beim Erstellen der PayString</string>
+    <string name="wallet_create_payid_hint">PayString Name</string>
+    <string name="wallet_create_payid_info">PayString sind Ihre einzigartigen Identifikationsdaten wie Telefonnummer, E-Mail-Adresse oder ABN.</string>
+    <string name="wallet_currency_subtitle">%s network</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_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="wallet_error_no_account">Das Konto ist nicht erstellt</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_notification_address_copied">Die Adresse wurde erfolgreich kopiert</string>
+    <string name="wallet_notification_no_internet">Keine Internetverbindung</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_title">Tangem</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_button_ok">OK, ich hab\'s!</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_existential_deposit_message">%1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_important_security_info">Important security information \U26A0</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="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</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="welcome_interrupted_backup_alert_discard">Discard</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_discard_discard">Discard</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_title">This is an irreversible action</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Scan card</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
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..9f8b658d1c
--- /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="referral_wallets_purchased_count">
+        <item quantity="one">%d wallet</item>
+        <item quantity="other">%d wallets</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="one">%d token</item>
+        <item quantity="other">%d tokens</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 74%
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..1bfd82f0a6 100644
--- a/app/src/main/res/values-fr/strings_blockchain.xml
+++ b/core/res/src/main/res/values-fr/strings-blockchain.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Solde insuffisant</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
+    <string name="common_fee_error">Échec de réception des commissions</string>
+    <string name="no_account_generic">Pour créer un compte, téléchargez %1$s+ %2$s</string>
+    <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</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="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_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>
-    <string name="send_validation_invalid_fee">Les commissions dépassent le solde</string>
-    <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_insufficient_balance">Solde insuffisant</string>
+    <string name="send_error_invalid_fee_value">Commission non valide</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>
-</resources>
\ No newline at end of file
+    <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_unknown">Erreur inconnue</string>
+    <string name="send_validation_amount_exceeds_balance">Le montant dépasse le solde</string>
+    <string name="send_validation_invalid_amount">Somme incorrecte</string>
+    <string name="send_validation_invalid_fee">Les commissions dépassent le solde</string>
+    <string name="send_validation_invalid_total">Le total dépasse le solde</string>
+    <string name="xtz_withdrawal_message_ignore">Non, envoyer toute la somme</string>
+    <string name="xtz_withdrawal_message_reduce">Réduire de %s XTZ</string>
+    <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>
+</resources>
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..0f6bf84e10
--- /dev/null
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="address_qr_code_message_format">Send only %1$s (%2$s) from %3$s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</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_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</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_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</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="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="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_unsupported_card">Cette carte n\'est pas conçue pour fonctionner avec Tangem</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</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="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes from the app.</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_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_title">App Settings</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="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="common_accept">J\'accepte</string>
+    <string name="common_add">Add</string>
+    <string name="common_attention">Attention</string>
+    <string name="common_balance">Solde : %s</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</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_cancel">Annuler</string>
+    <string name="common_close">Close</string>
+    <string name="common_continue">Continue</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_create">Create</string>
+    <string name="common_delete">Supprimer</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_done">Exécuté</string>
+    <string name="common_enable">Enable</string>
+    <string name="common_error">Erreur</string>
+    <string name="common_no">No</string>
+    <string name="common_ok">OK</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="common_reject">Reject</string>
+    <string name="common_retry">Retry</string>
+    <string name="common_save_changes">Sauvegarder les modifications</string>
+    <string name="common_search">Search</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="common_share">Share</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_start">Start</string>
+    <string name="common_submit">Submit</string>
+    <string name="common_success">Avec succès</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_warning">Alerte</string>
+    <string name="common_yes">Yes</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="custom_token_contract_address_input_title">Contract address</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_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_required_field">Required field</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_decimals_input_title">Decimals</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</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_network_input_not_selected">Not selected</string>
+    <string name="custom_token_network_input_title">Network</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_validation_error_already_added">This token/network has already been added to your list</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="details_chat">Chat</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="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_referral_title">Referral program</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="details_row_title_cid">ID de la carte</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="details_row_title_currency">Monnaie de l\'application</string>
+    <string name="details_row_title_issuer">Emetteur</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="details_row_title_signed_hashes">Signé</string>
+    <string name="details_title">Référénces</string>
+    <string name="disclaimer_error_loading">Check your internet connection or switch to a different network</string>
+    <string name="disclaimer_title">Conditions d\'utilisation</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="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="exchange_receive_view_header">You Receive</string>
+    <string name="exchange_send_view_header">You Send</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="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_support">Hi support team,</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</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_support">Feedback</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="home_button_order">Order</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="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_scan_header">Posez pour scanner</string>
+    <string name="initial_message_sign_header">Touchez pour signer</string>
+    <string name="initial_message_tap_header">Posez la carte</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</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_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_tokens">Tokens</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_1_title">Protect</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_2_title">Personalize</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_feature_3_title">Restore</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_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_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="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_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_balance_title">Balance</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_backup_now">Backup now</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_chat_button_title">Support</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_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</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_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</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_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</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_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</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_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</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 %1$s %2$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_top_up_header">Top up your wallet</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</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_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup 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_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="referral_button_participate">Participate</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. Error code: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Error code: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_friends_bought_title">Your friends bought</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 %1$s network address%2$s</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</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_with_backup_to_factory_message">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="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="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</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_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow 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_code_title">Access code</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="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="scan_card_settings_button">Scan Card</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_title">Get your card ready!</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="send_amount_label">Somme</string>
+    <string name="send_destination_hint_address">Adresse</string>
+    <string name="send_destination_hint_address_payid">Adresse ou PayString</string>
+    <string name="send_error_address_same_as_wallet">L\'adresse est la même que celle de votre portefeuille</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_payid_unsupported_by_blockchain">PayString non pris en charge par la blockchain</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="send_fee_include_description">Inclure les commissions</string>
+    <string name="send_fee_label">Commissions</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_max_amount_label">Somme maximale</string>
+    <string name="send_network_fee_title">Commissions du réseau</string>
+    <string name="send_title">Envoyer</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="send_total_label">Total</string>
+    <string name="send_total_subtitle_asset_format">Sera envoyé %1$s et %2$s</string>
+    <string name="send_total_subtitle_fiat_format">≈ %1$s (incl. les commissions : %2$s)</string>
+    <string name="send_total_subtitle_format">Sera envoyé %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="send_validation_invalid_address">Adresse incorrecte</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_total">Total</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</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_backup_title">Ultra Secure Backup</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_currencies_title">Thousands of Currencies</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="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_title">Meet\nTangem</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_web3_title">DeFi Compatible</string>
+    <string name="swapping_generic_error">There was an error. Please try again.</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_not_enough_funds_for_fee">Not enough funds for fee in your %1$s wallet to create a transaction. Top up your %2$s wallet first.</string>
+    <string name="swapping_pending_transaction_subtitle">Transaction in progress...</string>
+    <string name="swapping_pending_transaction_title">Waiting</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="swapping_success_view_explorer_button_title">View in Explorer</string>
+    <string name="swapping_success_view_title">In progress</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_swap_of_to">Swap of %1$s to %2$s</string>
+    <string name="swapping_token_list_other_tokens">Other tokens</string>
+    <string name="swapping_token_list_title">Choose token</string>
+    <string name="swapping_token_list_your_tokens">Your tokens</string>
+    <string name="swapping_token_not_available">not available</string>
+    <string name="tangem_app_name">Tangem</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_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_send_blocked_fee_format">%1$s is a token in the %2$s network. To make a %3$s transaction you need to deposit some %4$s (%5$s) to cover the network fee.</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="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_item_no_rate">No rate</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="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="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twins_recreate_title_creating_wallet">Creating 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_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="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_delete_prompt">Are you sure you want to delete this wallet?</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="wallet_address_button_create_payid">Créer PayString</string>
+    <string name="wallet_address_button_explore">Explorer l\'adresse</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="wallet_balance_loading">Solde est en cours de téléchargement…</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+    <string name="wallet_balance_tx_in_progress">Transaction en cours…</string>
+    <string name="wallet_balance_verified">Solde confirmé</string>
+    <string name="wallet_button_actions">Actions</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_create_wallet">Créer un portefeuille</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_send">Envoyer</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %1$s, requesting to\nsign BNB transaction.\n\n%2$s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %1$s\nPrice: %2$s\nAmount to receive: %3$s\nAmount to pay: %4$s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %1$s\nTo: %2$s\nAmount: %3$s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</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_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%1$s\n\nNETWORK: %2$s\n\nURL: %3$s</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_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_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_create_payid">Créer PayString</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_empty">Saisissez d\'abord le PayString requis</string>
+    <string name="wallet_create_payid_error_already_created">Ce PayString existe déjà. Essayez une autre variante.</string>
+    <string name="wallet_create_payid_error_message">Mauvaise réponse lors de la création de PayString</string>
+    <string name="wallet_create_payid_hint">Dénomination PayString</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_currency_subtitle">%s network</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_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="wallet_error_no_account">Compte n\'est pas créé</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_notification_address_copied">L\'adresse a été copiée avec succès</string>
+    <string name="wallet_notification_no_internet">Pas de connexion internet</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_title">Tangem</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_button_ok">Ok, je l\'ai!</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_existential_deposit_message">%1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_important_security_info">Important security information \U26A0</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="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</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="welcome_interrupted_backup_alert_discard">Discard</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_discard_discard">Discard</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_title">This is an irreversible action</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Scan card</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
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..dd39d6e957
--- /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="referral_wallets_purchased_count">
+        <item quantity="one">%d wallet</item>
+        <item quantity="many">%d wallets</item>
+        <item quantity="other">%d wallets</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>
+</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 68%
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..e05f2a9a89 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"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Saldo insufficiente</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
+    <string name="common_fee_error">Impossibile ottenere la commissione</string>
+    <string name="no_account_generic">Scarica %1$s+ %2$s per creare un account</string>
+    <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</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="send_error_insufficient_balance">Saldo insufficiente</string>
+    <string name="send_error_invalid_fee_value">Commissione non valida</string>
+    <string name="send_error_minimum_balance_format">Minimum balance is %s</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_validation_invalid_amount">Importo non valido</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="send_validation_invalid_total">Il totale supera il saldo</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>
-</resources>
\ No newline at end of file
+    <string name="xtz_withdrawal_message_reduce">Riduci di %s XTZ</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>
+</resources>
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..c754f9efc9
--- /dev/null
+++ b/core/res/src/main/res/values-it/strings.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="address_qr_code_message_format">Send only %1$s (%2$s) from %3$s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</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_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</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_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</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="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="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_unsupported_card">Questa carta non è progettata per funzionare con Tangem</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</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="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes from the app.</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_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_title">App Settings</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="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="common_accept">Accetta</string>
+    <string name="common_add">Add</string>
+    <string name="common_attention">Attention</string>
+    <string name="common_balance">Saldo: %s</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</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_cancel">Annulla</string>
+    <string name="common_close">Close</string>
+    <string name="common_continue">Continue</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_create">Create</string>
+    <string name="common_delete">Rimuovere</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_done">Fatto</string>
+    <string name="common_enable">Enable</string>
+    <string name="common_error">Errore</string>
+    <string name="common_no">No</string>
+    <string name="common_ok">OK</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="common_reject">Reject</string>
+    <string name="common_retry">Retry</string>
+    <string name="common_save_changes">Mantieni le modifiche</string>
+    <string name="common_search">Search</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="common_share">Share</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_start">Start</string>
+    <string name="common_submit">Submit</string>
+    <string name="common_success">Con successo</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_warning">Avviso</string>
+    <string name="common_yes">Yes</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="custom_token_contract_address_input_title">Contract address</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_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_required_field">Required field</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_decimals_input_title">Decimals</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</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_network_input_not_selected">Not selected</string>
+    <string name="custom_token_network_input_title">Network</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_validation_error_already_added">This token/network has already been added to your list</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="details_chat">Chat</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="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_referral_title">Referral program</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="details_row_subtitle_signed_hashes_format">Hash %s</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="details_row_title_cid">ID carta</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="details_row_title_currency">Valuta dell\'applicazione</string>
+    <string name="details_row_title_issuer">Emittente</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="details_row_title_signed_hashes">Firmato</string>
+    <string name="details_title">Requisiti</string>
+    <string name="disclaimer_error_loading">Check your internet connection or switch to a different network</string>
+    <string name="disclaimer_title">Termini del servizio</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="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="exchange_receive_view_header">You Receive</string>
+    <string name="exchange_send_view_header">You Send</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="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_support">Hi support team,</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</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_support">Feedback</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="home_button_order">Order</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="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_scan_header">Avvicina per scansionare</string>
+    <string name="initial_message_sign_header">Avvicina per firmare</string>
+    <string name="initial_message_tap_header">Avvicina la carta</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</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_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_tokens">Tokens</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_1_title">Protect</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_2_title">Personalize</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_feature_3_title">Restore</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_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_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="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_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_balance_title">Balance</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_backup_now">Backup now</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_chat_button_title">Support</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_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</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_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</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_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</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_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</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_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</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 %1$s %2$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_top_up_header">Top up your wallet</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</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_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup 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_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="referral_button_participate">Participate</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. Error code: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Error code: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_friends_bought_title">Your friends bought</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 %1$s network address%2$s</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</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_with_backup_to_factory_message">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="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="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</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_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow 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_code_title">Access code</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="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="scan_card_settings_button">Scan Card</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_title">Get your card ready!</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="send_amount_label">Importo</string>
+    <string name="send_destination_hint_address">Indirizzo</string>
+    <string name="send_destination_hint_address_payid">Indirizzo o PayString</string>
+    <string name="send_error_address_same_as_wallet">L\'indirizzo corrisponde all\'indirizzo del tuo portafoglio</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_payid_unsupported_by_blockchain">PayString non supportato dalla blockchain</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="send_fee_include_description">Includi commissione</string>
+    <string name="send_fee_label">Commissione</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_max_amount_label">Importo totale</string>
+    <string name="send_network_fee_title">Costi della rete</string>
+    <string name="send_title">Invia</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="send_total_label">Totale</string>
+    <string name="send_total_subtitle_asset_format">Sarà inviato %1$s e %2$s</string>
+    <string name="send_total_subtitle_fiat_format">≈ %1$s (inc. commissione: %2$s)</string>
+    <string name="send_total_subtitle_format">Sarà inviato %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="send_validation_invalid_address">Indirizzo non valido</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_total">Total</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</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_backup_title">Ultra Secure Backup</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_currencies_title">Thousands of Currencies</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="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_title">Meet\nTangem</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_web3_title">DeFi Compatible</string>
+    <string name="swapping_generic_error">There was an error. Please try again.</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_not_enough_funds_for_fee">Not enough funds for fee in your %1$s wallet to create a transaction. Top up your %2$s wallet first.</string>
+    <string name="swapping_pending_transaction_subtitle">Transaction in progress...</string>
+    <string name="swapping_pending_transaction_title">Waiting</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="swapping_success_view_explorer_button_title">View in Explorer</string>
+    <string name="swapping_success_view_title">In progress</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_swap_of_to">Swap of %1$s to %2$s</string>
+    <string name="swapping_token_list_other_tokens">Other tokens</string>
+    <string name="swapping_token_list_title">Choose token</string>
+    <string name="swapping_token_list_your_tokens">Your tokens</string>
+    <string name="swapping_token_not_available">not available</string>
+    <string name="tangem_app_name">Tangem</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_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_send_blocked_fee_format">%1$s is a token in the %2$s network. To make a %3$s transaction you need to deposit some %4$s (%5$s) to cover the network fee.</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="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_item_no_rate">No rate</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="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="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twins_recreate_title_creating_wallet">Creating 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_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="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_delete_prompt">Are you sure you want to delete this wallet?</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="wallet_address_button_create_payid">Crea PayString</string>
+    <string name="wallet_address_button_explore">Cerca indirizzo</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="wallet_balance_loading">Il saldo sta per essere caricato…</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+    <string name="wallet_balance_tx_in_progress">Transazione in corso…</string>
+    <string name="wallet_balance_verified">Saldo verificato</string>
+    <string name="wallet_button_actions">Actions</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_create_wallet">Crea portafoglio</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_send">Invia</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %1$s, requesting to\nsign BNB transaction.\n\n%2$s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %1$s\nPrice: %2$s\nAmount to receive: %3$s\nAmount to pay: %4$s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %1$s\nTo: %2$s\nAmount: %3$s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</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_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%1$s\n\nNETWORK: %2$s\n\nURL: %3$s</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_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_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_create_payid">Crea PayString</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_empty">Inserire prima il PayString desiderato</string>
+    <string name="wallet_create_payid_error_already_created">Questo PayString esiste già. Scegline un altro.</string>
+    <string name="wallet_create_payid_error_message">Errore di risposta durante la creazione del PayString</string>
+    <string name="wallet_create_payid_hint">Nome PayString</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_currency_subtitle">%s network</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_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="wallet_error_no_account">Conto non creato</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_notification_address_copied">L\'indirizzo è stato copiato con successo</string>
+    <string name="wallet_notification_no_internet">Nessuna connessione a Internet</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_title">Tangem</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_button_ok">Ok, ho capito!</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_existential_deposit_message">%1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_important_security_info">Important security information \U26A0</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="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</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="welcome_interrupted_backup_alert_discard">Discard</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_discard_discard">Discard</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_title">This is an irreversible action</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Scan card</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
diff --git a/core/res/src/main/res/values-it/strings_plurals.xml b/core/res/src/main/res/values-it/strings_plurals.xml
new file mode 100644
index 0000000000..9f8b658d1c
--- /dev/null
+++ b/core/res/src/main/res/values-it/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="referral_wallets_purchased_count">
+        <item quantity="one">%d wallet</item>
+        <item quantity="other">%d wallets</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="one">%d token</item>
+        <item quantity="other">%d tokens</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 55%
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..74528753b1 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"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Недостаточный баланс</string>
+    <string name="address_type_default">По умолчанию</string>
+    <string name="address_type_legacy">Устаревший</string>
+    <string name="common_fee_error">Не удалось получить комиссию</string>
+    <string name="no_account_generic">Пополните счет на %1$s+ %2$s, чтобы создать аккаунт</string>
+    <string name="no_account_polkadot">Аккаунт получателя не активирован. Отправьте %s или более для активации аккаунта.</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="send_error_unknown">Неизвестная ошибка</string>
-    <string name="send_validation_invalid_address">Неверный адрес</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="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_insufficient_balance">Недостаточный баланс</string>
+    <string name="send_error_invalid_fee_value">Неверная комиссия</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>
-</resources>
\ No newline at end of file
+    <string name="send_error_no_target_account">Аккаунт получателя не создан. Сумма для отправки должна быть %s + комиссия или больше</string>
+    <string name="send_error_unknown">Неизвестная ошибка</string>
+    <string name="send_validation_amount_exceeds_balance">Сумма превышает остаток</string>
+    <string name="send_validation_invalid_amount">Недопустимая сумма</string>
+    <string name="send_validation_invalid_fee">Комиссия превышает остаток</string>
+    <string name="send_validation_invalid_total">Отправляемая сумма превышает остаток</string>
+    <string name="xtz_withdrawal_message_ignore">Нет, отправить все</string>
+    <string name="xtz_withdrawal_message_reduce">Уменьшить на %s XTZ</string>
+    <string name="xtz_withdrawal_message_warning">Чтобы не платить повышенную комиссию при следующем пополнении кошелька, уменьшите сумму на %s XTZ</string>
+</resources>
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..aaaa581539
--- /dev/null
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="add_custom_token_title">Добавить токен</string>
+    <string name="address_qr_code_message_format">Отправляйте только %1$s (%2$s) в сети %3$s на этот адрес. Использование другой сети может привести к утрате средств.</string>
+    <string name="alert_button_request_support">Обратиться в поддержку</string>
+    <string name="alert_button_send_feedback">Отправить отзыв</string>
+    <string name="alert_card_signed_transactions">Эта карта ранее пополнялась и подписывала транзакции. Выведите средства как можно быстрее, если вы получили эту карту из ненадежного источника. Если это ваша карта, то не о чем беспокоиться.</string>
+    <string name="alert_demo_feature_disabled">Эта функция недоступна в демонстрационном режиме</string>
+    <string name="alert_demo_message">Приложение работает в демонстрационном режиме. Средства на всех счетах ненастоящие.</string>
+    <string name="alert_developer_card">Карта, которую вы отсканировали, является картой разработчика. Не принимайте её в качестве оплаты.</string>
+    <string name="alert_failed_to_send_transaction_message">Причина: %s</string>
+    <string name="alert_failed_to_send_transaction_title">Не могу отправить транзакцию</string>
+    <string name="alert_manage_tokens_addresses_message">Внимание! Валюты на разных сетях имеют разные адреса. Убедитесь, что адрес соответствует сети, в которой вы отправляете средства.</string>
+    <string name="alert_manage_tokens_unsupported_message">Токены в сети Solana не поддерживаются этой картой из-за ограничений прошивки.</string>
+    <string name="alert_signed_hashes_message">Эта карта не является платежным средством. В настоящее время мы не можем сопоставить количество подписей на карте с информацией в блокчейне. Это нормально, но в редких случаях может означать, что предыдущий владелец удерживает подписанную транзакцию от публикации, что является поводом для беспокойства.\nНе принимайте эту карту в качестве физического платежа от кого-то, кому вы не доверяете.\nВо всех остальных отношениях эта карта совершенно безопасна.\nTangem — единственный аппаратный кошелек, предлагающий защиту методом подсчета подписей.</string>
+    <string name="alert_troubleshooting_scan_card_title">У вас возникли трудности со сканированием карты?</string>
+    <string name="alert_unsupported_card">Эта карта не предназначена для работы с этим приложением</string>
+    <string name="app_settings_enable_biometrics_description">Перейдите в настройки, чтобы включить биометрическую аутентификацию в приложении Tangem App</string>
+    <string name="app_settings_enable_biometrics_title">Включите биометрическую аутентификацию</string>
+    <string name="app_settings_off_saved_access_code_alert_message">Все сохраненные коды доступа будут удалены. Вам потребуется вводить код доступа при работе с кошельком.</string>
+    <string name="app_settings_off_saved_wallet_alert_message">При отключении функции сохранения кошелька все ранее сохраненные кошельки будут удалены из приложения.</string>
+    <string name="app_settings_saved_access_codes">Сохранение кода доступа</string>
+    <string name="app_settings_saved_access_codes_footer">Подключите функцию хранения кодов доступа от карт на телефоне в зашифрованном виде, и при работе с картой вместо кода доступа будет запрашиваться биометрическая аутентификация.</string>
+    <string name="app_settings_saved_wallet">Cохранение кошелька</string>
+    <string name="app_settings_saved_wallet_footer">Подключите функцию привязки карты в приложении, а также возможность биометрической аутентификации. Подпись транзакции все так же потребует карту.</string>
+    <string name="app_settings_title">Настройки приложения</string>
+    <string name="card_settings_change_access_code">Смена кода доступа</string>
+    <string name="card_settings_change_access_code_footer">Код доступа будет изменен только на данной карте</string>
+    <string name="card_settings_reset_card_to_factory">Сброс к заводским настройкам</string>
+    <string name="card_settings_security_mode">Тип безопасности</string>
+    <string name="card_settings_title">Настройки карты</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="common_accept">Принять</string>
+    <string name="common_add">Добавить</string>
+    <string name="common_attention">Внимание</string>
+    <string name="common_balance">Баланс: %s</string>
+    <string name="common_biometric_authentication">биометрическую аутентификацию</string>
+    <string name="common_biometrics">биометрией</string>
+    <string name="common_camera_denied_alert_message">Вы не предоставили доступ к камере, пожалуйста, измените настройки конфиденциальности.</string>
+    <string name="common_cancel">Отмена</string>
+    <string name="common_close">Закрыть</string>
+    <string name="common_continue">Продолжить</string>
+    <string name="common_copy">Копировать</string>
+    <string name="common_create">Создать</string>
+    <string name="common_delete">Удалить</string>
+    <string name="common_disconnect">Отключить</string>
+    <string name="common_done">Готово</string>
+    <string name="common_enable">Включить</string>
+    <string name="common_error">Ошибка</string>
+    <string name="common_no">Нет</string>
+    <string name="common_ok">Ок</string>
+    <string name="common_origin_card">Основная карта</string>
+    <string name="common_reject">Отклонить</string>
+    <string name="common_retry">Повторить</string>
+    <string name="common_save_changes">Сохранить изменения</string>
+    <string name="common_search">Искать</string>
+    <string name="common_server_unavailable">Сервер недоступен, повторите попытку позднее</string>
+    <string name="common_share">Поделиться</string>
+    <string name="common_sign">Подписать</string>
+    <string name="common_sign_and_send">Подписать и отправить</string>
+    <string name="common_start">Начать</string>
+    <string name="common_submit">Отправить</string>
+    <string name="common_success">Успешно</string>
+    <string name="common_terms_and_conditions">условия участия</string>
+    <string name="common_understand">Я понял</string>
+    <string name="common_warning">Предупреждение</string>
+    <string name="common_yes">Да</string>
+    <string name="contract_address_copied_message">Адрес контракта скопирован!</string>
+    <string name="currency_subtitle_expanded">Доступные сети</string>
+    <string name="custom_token_contract_address_input_title">Адрес контракта</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_creation_error_network_not_selected">Пожалуйста, выберите сеть</string>
+    <string name="custom_token_creation_error_required_field">Обязательное поле</string>
+    <string name="custom_token_creation_error_wrong_decimals">Количество знаков после запятой должно быть корректным числом не больше %d</string>
+    <string name="custom_token_decimals_input_title">Знаков после запятой</string>
+    <string name="custom_token_derivation_path_default">По умолчанию</string>
+    <string name="custom_token_derivation_path_input_title">Деривация по BIP44</string>
+    <string name="custom_token_name_input_placeholder">Например, USD Coin</string>
+    <string name="custom_token_name_input_title">Название токена</string>
+    <string name="custom_token_network_input_not_selected">Не выбрано</string>
+    <string name="custom_token_network_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_validation_error_already_added">Этот токен/сеть уже находится в вашем списке</string>
+    <string name="custom_token_validation_error_not_found">Токены могут быть созданы кем угодно. Остерегайтесь мошеннических токенов, они могут ничего не стоить</string>
+    <string name="details_chat">Чат</string>
+    <string name="details_manage_security_access_code">Код доступа</string>
+    <string name="details_manage_security_access_code_description">Перед сканированием карты вам нужно будет ввести правильный код доступа.</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_referral_title">Реферальная программа</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s хэшей</string>
+    <string name="details_row_title_card_tou">Условия использования карты</string>
+    <string name="details_row_title_cid">Номер карты</string>
+    <string name="details_row_title_create_backup">Добавить еще карты</string>
+    <string name="details_row_title_currency">Валюта приложения</string>
+    <string name="details_row_title_issuer">Эмитент</string>
+    <string name="details_row_title_send_feedback">Отправить отзыв</string>
+    <string name="details_row_title_signed_hashes">Подписано</string>
+    <string name="details_title">Подробности</string>
+    <string name="disclaimer_error_loading">Проверьте подключение с интернетом или переключитесь на другую сеть</string>
+    <string name="disclaimer_title">Условия использования</string>
+    <string name="error_update_app">К сожалению, текущая версия приложения не готова к работе с этой картой, проверьте наличие обновлений</string>
+    <string name="error_wrong_wallet_tapped">Вы использовали карту от другого кошелька. Приложите карту, связанную с этим кошельком.</string>
+    <string name="exchange_receive_view_header">Вы получаете</string>
+    <string name="exchange_send_view_header">Вы отправляете</string>
+    <string name="feedback_data_collection_message">Информация ниже не является обязательной. Вы можете стереть её, если хотите.</string>
+    <string name="feedback_preface_rate_negative">Расскажите, каких функций вам не хватает, и мы постараемся вам помочь.</string>
+    <string name="feedback_preface_scan_failed">Скажите, пожалуйста, какая у вас карта?</string>
+    <string name="feedback_preface_support">Привет, команда поддержки,</string>
+    <string name="feedback_preface_tx_failed">Пожалуйста, расскажите нам больше о вашей проблеме. Каждая маленькая деталь может помочь.</string>
+    <string name="feedback_subject_rate_negative">Мои предложения</string>
+    <string name="feedback_subject_scan_failed">Не могу отсканировать карту</string>
+    <string name="feedback_subject_support">Обращение в поддержку</string>
+    <string name="feedback_subject_support_tangem">Обращение в поддержку Tangem</string>
+    <string name="feedback_subject_tx_failed">Не могу отправить транзакцию</string>
+    <string name="home_button_order">Купить</string>
+    <string name="initial_message_change_access_code_body">Чтобы изменить код доступа, приложите карту как показано выше и не убирайте до окончания операции</string>
+    <string name="initial_message_change_passcode_body">Чтобы изменить пароль, приложите карту как показано выше и не убирайте до окончания операции</string>
+    <string name="initial_message_create_wallet_body">Чтобы создать кошелек, приложите карту как показано выше и не убирайте до окончания операции</string>
+    <string name="initial_message_scan_header">Приложите, чтобы отсканировать</string>
+    <string name="initial_message_sign_header">Нажмите, чтобы подписать</string>
+    <string name="initial_message_tap_header">Приложите карту</string>
+    <string name="internal_error_wallet_manager_not_found">Внутренняя ошибка: не удается найти менеджер кошельков</string>
+    <string name="main_manage_tokens">Управление токенами</string>
+    <string name="main_no_backup_warning_subtitle">Чтобы защитить свои активы, мы советуем вам выполнить эту процедуру</string>
+    <string name="main_no_backup_warning_title">Бэкап кошелька не был произведен</string>
+    <string name="main_page_balance">Баланс</string>
+    <string name="main_processing_full_amount">В сумме учтены не все монеты</string>
+    <string name="main_scan_card_warning_view_subtitle">Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту</string>
+    <string name="main_scan_card_warning_view_title">Отсканируйте карту</string>
+    <string name="main_tokens">Токены</string>
+    <string name="onboarding_access_code_feature_1_description">Вам необходимо установить единый код доступа для защиты всех ваших карт.</string>
+    <string name="onboarding_access_code_feature_1_title">Защита</string>
+    <string name="onboarding_access_code_feature_2_description">Позже вы сможете установить индивидуальный код доступа для каждой карты.</string>
+    <string name="onboarding_access_code_feature_2_title">Персонализация</string>
+    <string name="onboarding_access_code_feature_3_description">Код доступа можно восстановить с помощью привязанной карты. Не храните все карты в одном месте.</string>
+    <string name="onboarding_access_code_feature_3_title">Восстановление</string>
+    <string name="onboarding_access_code_hint">Выберите любое слово, фразу или число в качестве кода доступа.</string>
+    <string name="onboarding_access_code_intro_title">Создайте код доступа</string>
+    <string name="onboarding_access_code_repeat_code_title">Повторно введите код доступа</string>
+    <string name="onboarding_access_code_too_short">Код доступа должен состоять не менее чем из 4 символов.</string>
+    <string name="onboarding_access_codes_doesnt_match">Введенные коды доступа не совпадают</string>
+    <string name="onboarding_alert_message_not_max_backup_cards_added">Вы добавили одну резервную карту. После того, как процесс будет завершен, Вы больше не сможете добавить карт. Если у Вас есть еще одна карта, добавьте ее в резервную копию. Хотите продолжить?</string>
+    <string name="onboarding_backup_exit_warning">Процесс резервного копирования почти завершен. Вы не можете выйти из него сейчас.</string>
+    <string name="onboarding_balance_title">Баланс</string>
+    <string name="onboarding_button_add_backup_card">Добавить резервную карту</string>
+    <string name="onboarding_button_backup_card_format">Сканировать карту #%d</string>
+    <string name="onboarding_button_backup_now">Создать резервную копию</string>
+    <string name="onboarding_button_backup_origin">Сканировать основную карту</string>
+    <string name="onboarding_button_claim">Запросить</string>
+    <string name="onboarding_button_continue_wallet">Перейти к моему кошельку</string>
+    <string name="onboarding_button_finalize_backup">Завершите процесс резервного копирования</string>
+    <string name="onboarding_button_kyc_start">Верифицировать (Utorg)</string>
+    <string name="onboarding_button_kyc_waiting">Обновить</string>
+    <string name="onboarding_button_pin">Установить Код доступа</string>
+    <string name="onboarding_button_receive_crypto">Получить криптовалюту</string>
+    <string name="onboarding_button_register_wallet">Зарегистрироваться</string>
+    <string name="onboarding_button_scan_origin_card">Сканировать основную карту</string>
+    <string name="onboarding_button_skip_backup">Пропустить</string>
+    <string name="onboarding_button_what_does_it_mean">Как это работает?</string>
+    <string name="onboarding_chat_button_title">Чат</string>
+    <string name="onboarding_create_wallet_body">Давайте сгенерируем все ключи на вашей карте и создадим безопасный кошелек</string>
+    <string name="onboarding_create_wallet_button_create_wallet">Создать кошелек</string>
+    <string name="onboarding_create_wallet_header">Создать кошелек</string>
+    <string name="onboarding_done_body">Ваша карта активирована и готова к использованию</string>
+    <string name="onboarding_done_header">Успешно!</string>
+    <string name="onboarding_exit_alert_message">В этом случае вам будет необходимо начать процесс заново.</string>
+    <string name="onboarding_exit_alert_title">Вы хотите выйти из процесса активации?</string>
+    <string name="onboarding_getting_started">Подготовка</string>
+    <string name="onboarding_navbar_kyc_progress">Подтвердите свою личность</string>
+    <string name="onboarding_navbar_kyc_start">Верификация клиента</string>
+    <string name="onboarding_navbar_pin">Код доступа</string>
+    <string name="onboarding_navbar_register_wallet">Подключиться</string>
+    <string name="onboarding_navbar_title_creating_backup">Резервная копия</string>
+    <string name="onboarding_saltpay_button_backup_origin">Приложите SaltPay карту</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">Для начала процесса бэкапа вам необходимо добавить Tangem карту</string>
+    <string name="onboarding_saltpay_subtitle_one_backup_card">Завершите процесс бэкапа создав код доступа</string>
+    <string name="onboarding_saltpay_title_backup_card">Приложите Tangem карту</string>
+    <string name="onboarding_saltpay_title_no_backup_card">Бэкап карта не добавлена</string>
+    <string name="onboarding_saltpay_title_one_backup_card">Бэкап карта создана</string>
+    <string name="onboarding_saltpay_title_prepare_origin">Приготовьте SaltPay карту</string>
+    <string name="onboarding_subtitle_claim">Для начала работы просто запросите начисление wxDai на свой кошелек</string>
+    <string name="onboarding_subtitle_claim_progress">Это займет несколько секунд</string>
+    <string name="onboarding_subtitle_kyc_retry">Более подробная информация отправлена на ваш адрес электронной почты.</string>
+    <string name="onboarding_subtitle_kyc_start">Для начала работы с картой вам необходимо завершить процесс подтверждения личности</string>
+    <string name="onboarding_subtitle_kyc_waiting">Пожалуйста дождитесь завершения процесса подтверждения личности. Вы будете уведомлены через e-mail. Обычно это занимает не более часа. Вы можете закрыть приложение и вернуться позже.</string>
+    <string name="onboarding_subtitle_no_backup_cards">Чтобы начать процесс резервного копирования, добавьте одну или две резервные карты.</string>
+    <string name="onboarding_subtitle_one_backup_card">Вы можете добавить еще одну карту или завершить процесс резервного копирования</string>
+    <string name="onboarding_subtitle_pin">Установите Код доступа для вашей SaltPay карты</string>
+    <string name="onboarding_subtitle_register_wallet">Подключите вашу карту к децентрализованной платежной системе</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Подготовьте резервную карту с номером %s</string>
+    <string name="onboarding_subtitle_scan_origin_card">Подготовьте основную карту</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Подготовьте основную карту с номером %s</string>
+    <string name="onboarding_subtitle_success_claim">Поздравляем! Ваша платежная крипто карта теперь активирована!</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Ваша карта настроена и готова к использованию.</string>
+    <string name="onboarding_subtitle_two_backup_cards">Добавлено максимальное количество карт. Завершите процесс резервного копирования.</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Чат поддержки</string>
+    <string name="onboarding_title">Активация карты</string>
+    <string name="onboarding_title_backup_card_format">Резервная карта #%d</string>
+    <string name="onboarding_title_claim">Запросить %s</string>
+    <string name="onboarding_title_claim_progress">Запрашивается</string>
+    <string name="onboarding_title_kyc_retry">Что-то пошло не так</string>
+    <string name="onboarding_title_kyc_start">Подтвердите свою личность</string>
+    <string name="onboarding_title_kyc_waiting">Подтверждение личности в процессе</string>
+    <string name="onboarding_title_no_backup_cards">Нет резервных карт</string>
+    <string name="onboarding_title_one_backup_card">Добавлена ​​одна резервная карта</string>
+    <string name="onboarding_title_pin">Код доступа</string>
+    <string name="onboarding_title_register_wallet">Подключите свою карту</string>
+    <string name="onboarding_title_scan_origin_card">Подготовьте свою карту</string>
+    <string name="onboarding_title_two_backup_cards">Добавлены две резервные карты</string>
+    <string name="onboarding_top_up_body">Пополните кошелек на любую сумму, чтобы начать пользоваться картой</string>
+    <string name="onboarding_top_up_body_no_account_error">Пополните кошелек более чем на %1$s %2$s, чтобы начать пользоваться картой</string>
+    <string name="onboarding_top_up_button_but_crypto">Купить криптовалюту</string>
+    <string name="onboarding_top_up_button_show_wallet_address">Показать адрес кошелька</string>
+    <string name="onboarding_top_up_header">Пополните свой кошелек</string>
+    <string name="onboarding_twin_exit_warning">Процесс связывания карт частично завершен. Вы не можете выйти из него сейчас.</string>
+    <string name="onboarding_twins_interrupt_warning">Если процесc создания кошелька каким-либо образом прервется, вам придется начинать сначала.</string>
+    <string name="onboarding_wallet_info_subtitle_first">Вы можете сделать резервную копию своих ключей на одной или двух других пустых картах Wallet.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Код доступа можно восстановить с помощью одной из резервных карт.</string>
+    <string name="onboarding_wallet_info_subtitle_second">Все резервные карты являются полнофункциональными и содержат одинаковые ключи.</string>
+    <string name="onboarding_wallet_info_subtitle_third">Вы сможете установить код доступа для защиты своих кошельков.</string>
+    <string name="onboarding_wallet_info_title_first">Резервная копия карты</string>
+    <string name="onboarding_wallet_info_title_fourth">Восстановление кода доступа</string>
+    <string name="onboarding_wallet_info_title_second">Идентичные карты</string>
+    <string name="onboarding_wallet_info_title_third">Код доступа</string>
+    <string name="referral_button_participate">Участвовать</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_friends_bought_title">Ваши друзья купили</string>
+    <string name="referral_point_currencies_description_prefix">Получите</string>
+    <string name="referral_point_currencies_description_suffix">на ваш адрес в сети %1$s%2$s за каждый кошелек, который купит ваш друг</string>
+    <string name="referral_point_currencies_title">Вы</string>
+    <string name="referral_point_discount_description_prefix">Получит</string>
+    <string name="referral_point_discount_description_suffix">при покупке карточки на сайте tangem.com</string>
+    <string name="referral_point_discount_description_value">%s скидку</string>
+    <string name="referral_point_discount_title">Ваш друг</string>
+    <string name="referral_promo_code_copied">Персональный код скопирован!</string>
+    <string name="referral_promo_code_title">Ваш персональный код</string>
+    <string name="referral_share_link">Купи Tangem Wallet со скидкой!\n%s</string>
+    <string name="referral_title">Приведи друга в Tangem</string>
+    <string name="referral_tos_enroled_prefix">Вы приняли</string>
+    <string name="referral_tos_not_enroled_prefix">Нажимая на эту кнопку, вы принимаете</string>
+    <string name="referral_tos_suffix">в реферальной программе</string>
+    <string name="registration_task_alert_message">Пожалуйста, удерживайте карту до завершения операции</string>
+    <string name="reset_card_to_factory_button_title">Сбросить карту</string>
+    <string name="reset_card_to_factory_warning_message">Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку</string>
+    <string name="reset_card_with_backup_to_factory_message">Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек или использовать данную карту для восстановления кода доступа.</string>
+    <string name="reset_card_without_backup_to_factory_message">Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек.</string>
+    <string name="russian_bank_card_warning_subtitle">У вас есть карта банка другой страны или платежной системы UnionPay?</string>
+    <string name="russian_bank_card_warning_title">Карты банков РФ в данный момент не принимаются</string>
+    <string name="saltpay_error_empty_backup_message">Приложите карту с логотипом Visa</string>
+    <string name="saltpay_error_empty_backup_title">Внимание</string>
+    <string name="saltpay_error_no_gas_message">Пожалуйста обратитесь в службу поддержки</string>
+    <string name="saltpay_error_no_gas_title">Недостаточно средств для активации</string>
+    <string name="saltpay_error_pin_weak_message">Данный Код доступа может быть легко взломан</string>
+    <string name="saltpay_error_pin_weak_title">Ввод одинаковых цифр является не безопасным</string>
+    <string name="save_user_wallet_agreement_access_description">Войдите в приложение и следите за своим балансом без сканирования карты</string>
+    <string name="save_user_wallet_agreement_access_title">Доступ в приложение</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Использовать биометрию</string>
+    <string name="save_user_wallet_agreement_code_description_biometrics">Для операций с вашим кошельком будет запрашиваться биометрия вместо кода доступа карты</string>
+    <string name="save_user_wallet_agreement_code_title">Код доступа</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_description">Похоже, что у вас отключена биометрическая аутентификация, она необходима для сохранения кошельков</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_title">Включите биометрическую аутентификацию</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Вы хотите использовать биометрию?</string>
+    <string name="save_user_wallet_agreement_notice">Обратите внимание, что для совершения транзакции с вашими средствами по-прежнему потребуется ваша карта</string>
+    <string name="scan_card_error">Ошибка сканирования карты. Попробуй снова.</string>
+    <string name="scan_card_settings_button">Сканировать</string>
+    <string name="scan_card_settings_message">Отсканируйте карту, чтобы изменить ее настройки. Изменения затронут только ту карту, которую вы отсканировали, и не повлияют на другие карты, привязанные к вашему кошельку.</string>
+    <string name="scan_card_settings_title">Приготовьте свою карту</string>
+    <string name="search_tokens_title">Поиск валют</string>
+    <string name="send_amount_label">Сумма</string>
+    <string name="send_destination_hint_address">Адрес</string>
+    <string name="send_destination_hint_address_payid">Адрес или PayString</string>
+    <string name="send_error_address_same_as_wallet">Адрес совпадает с адресом кошелька</string>
+    <string name="send_error_payid_not_registered">PayString не зарегистрирован</string>
+    <string name="send_error_payid_request_failed">Не удалось выполнить запрос PayString</string>
+    <string name="send_error_payid_unsupported_by_blockchain">PayString не поддерживается блокчейном</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="send_fee_include_description">Включая комиссию</string>
+    <string name="send_fee_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_max_amount_label">Максимальная сумма</string>
+    <string name="send_network_fee_title">Сетевая комиссия</string>
+    <string name="send_title">Отправить</string>
+    <string name="send_title_currency_format">Отправка %s</string>
+    <string name="send_total_label">Всего</string>
+    <string name="send_total_subtitle_asset_format">%1$s и %2$s будет отправлено</string>
+    <string name="send_total_subtitle_fiat_format">≈ %1$s (вкл. комиссию: %2$s)</string>
+    <string name="send_total_subtitle_format">%s будет отправлено</string>
+    <string name="send_transaction_success">Транзакция успешно подписана и отправлена в блокчейн. Баланс будет обновлен через некоторое время</string>
+    <string name="send_validation_invalid_address">Неверный адрес</string>
+    <string name="shop_buy_now">Купить сейчас</string>
+    <string name="shop_free">Бесплатно</string>
+    <string name="shop_i_have_a_promo_code">У меня есть промо-код…</string>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_other_payment_methods">Другие способы оплаты</string>
+    <string name="shop_shipping">Доставка</string>
+    <string name="shop_total">Итого</string>
+    <string name="solana_rent_warning">Сеть Solana взимает арендную плату в размере %1$s каждые 2 дня. Аккаунты, которые не могут позволить себе арендную плату, удаляются из сети. Пополните свой счет более чем на %2$s, чтобы не платить арендную плату.</string>
+    <string name="story_awe_description">Держите свои криптосбережения в безопасности. Приватные ключи надежно хранятся на карте.</string>
+    <string name="story_awe_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_backup_title">Все ключи в безопасности</string>
+    <string name="story_currencies_description">Аппаратный кошелек для ваших биткоинов, эфира и многих других валют одновременно — все в одной карте</string>
+    <string name="story_currencies_title">Тысячи криптовалют</string>
+    <string name="story_finish_description">Используйте его на ходу, в любом месте, в любое время. Без проводов и батареек. Как только понадобится крипта, просто приложите карту к телефону.</string>
+    <string name="story_finish_title">Кошелек для каждого</string>
+    <string name="story_meet_borrow">Занимайте</string>
+    <string name="story_meet_buy">Покупайте</string>
+    <string name="story_meet_exchange">Обменивайте</string>
+    <string name="story_meet_lend">Вкладывайте</string>
+    <string name="story_meet_pay">Расплачивайтесь</string>
+    <string name="story_meet_send">Отправляйте</string>
+    <string name="story_meet_store">Храните</string>
+    <string name="story_meet_title">Встречайте\nTangem</string>
+    <string name="story_web3_description">Обменивайте, покупайте NFT, получайте займы и делайте вклады в более чем 100 различных децентрализованных сервисах</string>
+    <string name="story_web3_title">Поддержка DeFi</string>
+    <string name="swapping_generic_error">Произошла ошибка. Пожалуйста, попробуйте еще раз.</string>
+    <string name="swapping_give_permission">Дать разрешение</string>
+    <string name="swapping_insufficient_funds">Недостаточно средств</string>
+    <string name="swapping_not_enough_funds_for_fee">Недостаточно средств для оплаты на вашем %1$s кошельке для создания транзакции. Сначала пополните свой %2$s кошелек.</string>
+    <string name="swapping_pending_transaction_subtitle">Транзакция в процессе…</string>
+    <string name="swapping_pending_transaction_title">Подождите</string>
+    <string name="swapping_permission_buttons_approve">Подтвердить</string>
+    <string name="swapping_permission_header">Дать разрешение</string>
+    <string name="swapping_permission_rows_amount">Количество %s</string>
+    <string name="swapping_permission_rows_spender">Отправитель</string>
+    <string name="swapping_permission_rows_your_wallet">Ваш кошелек</string>
+    <string name="swapping_permission_subheader">Чтобы продолжить, вам нужно разрешить смарт-контракту 1inch использовать ваш %s</string>
+    <string name="swapping_permit_and_swap">Разрешить и обменять</string>
+    <string name="swapping_success_view_explorer_button_title">Открыть в обозревателе</string>
+    <string name="swapping_success_view_title">В процессе</string>
+    <string name="swapping_swap">Обмен</string>
+    <string name="swapping_swap_of_to">Обмен %1$s на %2$s</string>
+    <string name="swapping_token_list_other_tokens">Другие токены</string>
+    <string name="swapping_token_list_title">Выберите токен</string>
+    <string name="swapping_token_list_your_tokens">Ваши токены</string>
+    <string name="swapping_token_not_available">не доступен</string>
+    <string name="tangem_app_name">Tangem</string>
+    <string name="token_details_hide_alert_hide">Скрыть</string>
+    <string name="token_details_hide_alert_message">Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно через страницу управления токенами.</string>
+    <string name="token_details_hide_alert_title">Скрыть %s</string>
+    <string name="token_details_hide_token">Скрыть токен</string>
+    <string name="token_details_send_blocked_fee_format">%1$s — это токен в сети %2$s. Чтобы отправить транзакцию %3$s, необходимо пополнить баланс %4$s (%5$s) для оплаты комиссии сети.</string>
+    <string name="token_details_send_blocked_tx_format">Пожалуйста, дождитесь завершения транзакции %s, чтобы иметь возможность отправить средства</string>
+    <string name="token_details_unable_hide_alert_message">Токен %1$s является основной валютой в сети %2$s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети.</string>
+    <string name="token_details_unable_hide_alert_title">Невозможно скрыть %s</string>
+    <string name="token_item_no_rate">Нет цены</string>
+    <string name="twin_error_same_card">Вы отсканировали ту же карту. Для создания twin-кошелька вам необходимо отсканировать карту с номером %d</string>
+    <string name="twins_onboarding_description_format">Это карта, которую вы держите в руках. У парной карты номер %s.\n\nОбе карты можно использовать для вывода средств из этого кошелька.</string>
+    <string name="twins_onboarding_subtitle">Один кошелек. Две карты.</string>
+    <string name="twins_recreate_button_format">Сканировать карту #%s</string>
+    <string name="twins_recreate_title_creating_wallet">Создание кошелька</string>
+    <string name="twins_recreate_title_format">Отсканируйте twin-карту #%s</string>
+    <string name="twins_recreate_title_preparing">Подготовка карты</string>
+    <string name="twins_recreate_toolbar">Tangem Twin</string>
+    <string name="twins_recreate_warning">Это действие необратимо. У вас не будет доступа к старому кошельку.</string>
+    <string name="user_wallet_list_add_button">Добавить новый кошелек</string>
+    <string name="user_wallet_list_delete_prompt">Вы уверены, что хотите удалить этот кошелек?</string>
+    <string name="user_wallet_list_editing_count">%d выбрано</string>
+    <string name="user_wallet_list_error_wallet_already_saved">Этот кошелек уже был сохранен, вы можете добавить другой</string>
+    <string name="user_wallet_list_multi_header">Мультивалютные</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Имя кошелька</string>
+    <string name="user_wallet_list_rename_popup_title">Переименование кошелька</string>
+    <string name="user_wallet_list_single_header">Одновалютные</string>
+    <string name="user_wallet_list_title">Мои кошельки</string>
+    <string name="user_wallet_list_unlock_all">Разблокировать все с %s</string>
+    <string name="wallet_address_button_create_payid">Создать PayString</string>
+    <string name="wallet_address_button_explore">Проверить адрес</string>
+    <string name="wallet_balance_blockchain_unreachable">Сеть недоступна</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Блокчейн недоступен. Попробуй позже.</string>
+    <string name="wallet_balance_loading">Баланс загружается…</string>
+    <string name="wallet_balance_missing_derivation">Отсканируйте карту</string>
+    <string name="wallet_balance_tx_in_progress">Транзакция подтверждается…</string>
+    <string name="wallet_balance_verified">Подтвержденный баланс</string>
+    <string name="wallet_button_actions">Действия</string>
+    <string name="wallet_button_buy">Купить</string>
+    <string name="wallet_button_create_wallet">Создать кошелек</string>
+    <string name="wallet_button_sell">Продать</string>
+    <string name="wallet_button_send">Отправить</string>
+    <string name="wallet_button_trade">Обменять</string>
+    <string name="wallet_choose_trade_action">Вы хотите купить или продать криптовалюту?</string>
+    <string name="wallet_connect_alert_sign_message">Запрос на подпись сообщения.\n\n%s</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %1$s, запрос на\nподпись транзакции с BNB.\n\n%2$s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Торговый ордер на %1$s\nЦена: %2$s\nСумма к получению: %3$s\nСумма к оплате: %4$s</string>
+    <string name="wallet_connect_bnb_transaction_message">Детали транзакции:\nОт: %1$s\nК: %2$s\nСумма: %3$s</string>
+    <string name="wallet_connect_clipboard_alert">Буфер обмена содержит код WalletConnect. Использовать скопированное значение или отсканировать QR-код</string>
+    <string name="wallet_connect_create_tx_message">Запрос на создание транзакции для %1$s\n%2$s\n\nСумма: %3$s\nКомиссия: %4$s\nВсего: %5$s\nБаланс: %6$s</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Невозможно отправить транзакцию. Недостаточно средств.</string>
+    <string name="wallet_connect_error_failed_to_connect">Не удалось установить сессию WalletConnect. Пожалуйста, повторите попытку позже.</string>
+    <string name="wallet_connect_error_timeout">Не удалось установить сессию WalletConnect за отведённое время. Пожалуйста, повторите попытку позже.</string>
+    <string name="wallet_connect_error_unsupported_dapp">Cоединение с этим Dapp сервисом не может быть установлено из-за его технической реализации.</string>
+    <string name="wallet_connect_network_not_found_format">Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново.</string>
+    <string name="wallet_connect_no_sessions_message">Нет открытых сессий WalletConnect</string>
+    <string name="wallet_connect_no_sessions_title">Упс. Нет сессий.</string>
+    <string name="wallet_connect_open_session">Открытая сессия</string>
+    <string name="wallet_connect_paste_from_clipboard">Вставить из буфера обмена</string>
+    <string name="wallet_connect_request_session_start">Запрос на открытие сессии для\n%1$s\n\nСЕТЬ: %2$s\n\nURL: %3$s</string>
+    <string name="wallet_connect_same_wcuri">Операция не может быть завершена.\n\nВы уже установили сеанс WalletConnect с этими параметрами.</string>
+    <string name="wallet_connect_scan_new_code">Сканировать новый код</string>
+    <string name="wallet_connect_scanner_error_not_valid_card">Эту карту нельзя использовать с WalletConnect.</string>
+    <string name="wallet_connect_scanner_error_unsupported_network">Сеть не поддерживается. Пожалуйста, выберите другую сеть.</string>
+    <string name="wallet_connect_select_network">Выберите сеть</string>
+    <string name="wallet_connect_sessions_title">Сессии WalletConnect</string>
+    <string name="wallet_connect_subtitle">Подключение к Dapps</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_create_payid">Создать PayString</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_empty">Сначала введите желаемую PayString</string>
+    <string name="wallet_create_payid_error_already_created">Такой PayString уже существует. Попробуйте другой.</string>
+    <string name="wallet_create_payid_error_message">Ошибка при создании PayString</string>
+    <string name="wallet_create_payid_hint">PayString имя</string>
+    <string name="wallet_create_payid_info">Ваша PayString — это уникальная для вас информация, такая как номер телефона, электронная почта или ABN</string>
+    <string name="wallet_currency_subtitle">Сеть %s</string>
+    <string name="wallet_error_empty_card">Карта пуста</string>
+    <string name="wallet_error_empty_card_subtitle">Создайте кошелек, чтобы начать пользоваться картой Tangem</string>
+    <string name="wallet_error_empty_twin_card">Создать кошелек</string>
+    <string name="wallet_error_empty_twin_card_subtitle">Сгенерируйте ключи кошелька на обеих картах, чтобы начать использовать свои Twin карты</string>
+    <string name="wallet_error_no_account">Аккаунт не создан</string>
+    <string name="wallet_error_unsupported_blockchain">Эта карта не поддерживается</string>
+    <string name="wallet_error_unsupported_blockchain_subtitle">Ваша карта Tangem предназначена для работы с другим приложением. Пожалуйста, ознакомьтесь с названием и инструкциями на вашей карте и установите правильное приложение.</string>
+    <string name="wallet_notification_address_copied">Адрес скопирован в буфер обмена</string>
+    <string name="wallet_notification_no_internet">Нет соединения с интернетом</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_title">Tangem</string>
+    <string name="warning_button_can_be_better">Можно лучше</string>
+    <string name="warning_button_learn_more">Узнать больше</string>
+    <string name="warning_button_ok">Понятно!</string>
+    <string name="warning_button_really_cool">Очень круто!</string>
+    <string name="warning_existential_deposit_message">Сеть %1$s использует концепцию экзистенциального депозита. Если баланс вашего счета опустится ниже %2$s, он будет деактивирован, а все оставшиеся средства будут уничтожены.</string>
+    <string name="warning_failed_to_verify_card_message">Эта карта может быть производственным образцом или подделкой</string>
+    <string name="warning_failed_to_verify_card_title">Проверка подлинности не удалась</string>
+    <string name="warning_important_security_info">Важная информация о безопасности \U26A0</string>
+    <string name="warning_low_signatures_format">На этой карте осталось только %s подписей. Вы должны вывести все свои средства.</string>
+    <string name="warning_rate_app_message">Как вам Tangem?</string>
+    <string name="warning_rate_app_title">Один вопрос</string>
+    <string name="warning_signed_tx_previously">Эта карта подписывала транзакции в прошлом</string>
+    <string name="warning_testnet_card_message">Это тестовая карта. Не принимайте её в качестве оплаты. Эта карта должна использоваться только в целях тестирования и разработки.</string>
+    <string name="welcome_interrupted_backup_alert_discard">Отказаться</string>
+    <string name="welcome_interrupted_backup_alert_message">Вы не закончили резервное копирование. Хотите продолжить?</string>
+    <string name="welcome_interrupted_backup_alert_resume">Да, возобновить</string>
+    <string name="welcome_interrupted_backup_discard_discard">Отказаться</string>
+    <string name="welcome_interrupted_backup_discard_message">Если сейчас отказаться, то придётся сбрасывать карты до заводских настроек, чтобы начать заново</string>
+    <string name="welcome_interrupted_backup_discard_resume">Возобновить резервное копирование</string>
+    <string name="welcome_interrupted_backup_discard_title">Это необратимое действие</string>
+    <string name="welcome_unlock">Войти с %s</string>
+    <string name="welcome_unlock_card">Сканировать карту</string>
+    <string name="welcome_unlock_description">Используйте %s или код доступа для входа в приложение</string>
+    <string name="welcome_unlock_title">C возвращением!</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
diff --git a/core/res/src/main/res/values-ru/strings_plurals.xml b/core/res/src/main/res/values-ru/strings_plurals.xml
new file mode 100644
index 0000000000..9b7580d98b
--- /dev/null
+++ b/core/res/src/main/res/values-ru/strings_plurals.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="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>
+
+    <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>
+</resources>
diff --git a/core/res/src/main/res/values-zh-rTW/strings-blockchain.xml b/core/res/src/main/res/values-zh-rTW/strings-blockchain.xml
new file mode 100644
index 0000000000..064dc69503
--- /dev/null
+++ b/core/res/src/main/res/values-zh-rTW/strings-blockchain.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="address_type_default">默認</string>
+    <string name="address_type_legacy">遺留資產</string>
+    <string name="common_fee_error">獲取費用失敗</string>
+    <string name="no_account_generic">加載 %1$s+ %2$s 以創建帳戶</string>
+    <string name="no_account_polkadot">目標帳戶未激活。發送 %s 或更多以激活帳戶。</string>
+    <string name="send_error_blockchain_internal">區塊鏈內部錯誤</string>
+    <string name="send_error_dust_amount_format">最小數量是 %s</string>
+    <string name="send_error_dust_change">更動太小</string>
+    <string name="send_error_insufficient_balance">餘額不足</string>
+    <string name="send_error_invalid_fee_value">無效費用</string>
+    <string name="send_error_minimum_balance_format">最低餘額為 %s</string>
+    <string name="send_error_no_target_account">未創建目標帳戶。發送金額應為 %s + 費用或更多</string>
+    <string name="send_error_unknown">未知錯誤</string>
+    <string name="send_validation_amount_exceeds_balance">金額超出餘額</string>
+    <string name="send_validation_invalid_amount">無效金額</string>
+    <string name="send_validation_invalid_fee">費用超出餘額</string>
+    <string name="send_validation_invalid_total">總金額超出餘額</string>
+    <string name="xtz_withdrawal_message_ignore">不，全部發送</string>
+    <string name="xtz_withdrawal_message_reduce">減少 %s XTZ</string>
+    <string name="xtz_withdrawal_message_warning">為避免下次給錢包充值時支付增加的佣金，請將金額減少 %s XTZ</string>
+</resources>
diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000000..ad0a5ac18f
--- /dev/null
+++ b/core/res/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="add_custom_token_title">添加自定義代幣</string>
+    <string name="address_qr_code_message_format">僅將 %1$s (%2$s) 從 %3$s 網絡發送到此地址。使用其他代幣和網絡可能會導致資金損失</string>
+    <string name="alert_button_request_support">請求支持</string>
+    <string name="alert_button_send_feedback">發送反饋</string>
+    <string name="alert_card_signed_transactions">此卡過去已經充值並簽署過交易。如果您從不受信任的來源收到此卡，請考慮立即提取所有資金。如果是您的卡，則無需擔心</string>
+    <string name="alert_demo_feature_disabled">此功能不在展示模式中提供</string>
+    <string name="alert_demo_message">您正在展示模式。所有資產皆不是真的</string>
+    <string name="alert_developer_card">您掃描的卡是開發卡。不要用它作為付款方式</string>
+    <string name="alert_failed_to_send_transaction_message">原因：%s</string>
+    <string name="alert_failed_to_send_transaction_title">無法發送交易</string>
+    <string name="alert_manage_tokens_addresses_message">請注意代幣在不同的網路有不同的地址。請再次檢查正確的地址</string>
+    <string name="alert_manage_tokens_unsupported_message">此卡不支持Solana網路上的代幣因為韌體限制</string>
+    <string name="alert_signed_hashes_message">這張卡不是不記名票據。我們目前無法將卡上的簽名計數與區塊鏈上的信息相匹配。這很正常，但在極少數情況下可能意味著以前的持有人正在阻止離線簽名，這是安全問題。不要接受此卡作為您不信任的人的實物付款。它在所有其他方面都非常安全。Tangem 是唯一提供簽名計數保護的硬件錢包。</string>
+    <string name="alert_troubleshooting_scan_card_title">有困難在掃描卡上嗎？</string>
+    <string name="alert_unsupported_card">此卡不適用於此app</string>
+    <string name="app_settings_enable_biometrics_description">轉到設置以在 Tangem App 中啟用生物識別身份驗證</string>
+    <string name="app_settings_enable_biometrics_title">啟用生物辨識</string>
+    <string name="app_settings_off_saved_access_code_alert_message">這將刪除所有保存的錢包訪問代碼。對錢包的任何進一步操作都需要提交訪問代碼。</string>
+    <string name="app_settings_off_saved_wallet_alert_message">移除已保存的卡會刪除所有已保存的錢包及其訪問密碼</string>
+    <string name="app_settings_saved_access_codes">保存訪問密碼</string>
+    <string name="app_settings_saved_access_codes_footer">在與您的卡進行交互時，將要求進行生物識別身份驗證，而不是訪問密碼</string>
+    <string name="app_settings_saved_wallet">將錢包保存在應用程序中</string>
+    <string name="app_settings_saved_wallet_footer">啟用以將所有錢包鏈接到 Tangem 應用程序。解鎖應用程序需要生物識別身份驗證。交易簽名需要輕觸您的 Tangem 卡片</string>
+    <string name="app_settings_title">APP設置</string>
+    <string name="card_settings_change_access_code">更改訪問密碼</string>
+    <string name="card_settings_change_access_code_footer">訪問密碼將僅在此卡上更改</string>
+    <string name="card_settings_reset_card_to_factory">回復至原廠設置</string>
+    <string name="card_settings_security_mode">安全模式</string>
+    <string name="card_settings_title">卡片設置</string>
+    <string name="chat_bot_name">Tangem 機器人</string>
+    <string name="common_accept">接受</string>
+    <string name="common_add">添加</string>
+    <string name="common_attention">注意</string>
+    <string name="common_balance">餘額: %s</string>
+    <string name="common_biometric_authentication">生物識別</string>
+    <string name="common_biometrics">生物</string>
+    <string name="common_camera_denied_alert_message">您尚未授予相機訪問權限，請更改您的隱私設置</string>
+    <string name="common_cancel">刪除</string>
+    <string name="common_close">關閉</string>
+    <string name="common_continue">繼續</string>
+    <string name="common_copy">複製</string>
+    <string name="common_create">創造</string>
+    <string name="common_delete">刪除</string>
+    <string name="common_disconnect">斷開連接</string>
+    <string name="common_done">完成</string>
+    <string name="common_enable">允許</string>
+    <string name="common_error">錯誤</string>
+    <string name="common_no">否</string>
+    <string name="common_ok">OK</string>
+    <string name="common_origin_card">主卡片</string>
+    <string name="common_reject">拒絕</string>
+    <string name="common_retry">重試</string>
+    <string name="common_save_changes">保存設置</string>
+    <string name="common_search">搜索</string>
+    <string name="common_server_unavailable">伺服器不可用，請稍後在試</string>
+    <string name="common_share">分享</string>
+    <string name="common_sign">簽署</string>
+    <string name="common_sign_and_send">簽署和發送</string>
+    <string name="common_start">開始</string>
+    <string name="common_submit">提交</string>
+    <string name="common_success">成功</string>
+    <string name="common_terms_and_conditions">條款和條件</string>
+    <string name="common_understand">我了解</string>
+    <string name="common_warning">警告</string>
+    <string name="common_yes">是</string>
+    <string name="contract_address_copied_message">已複製代幣地址</string>
+    <string name="currency_subtitle_expanded">支持的網路</string>
+    <string name="custom_token_contract_address_input_title">代幣地址</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_creation_error_network_not_selected">請選擇網路</string>
+    <string name="custom_token_creation_error_required_field">必填</string>
+    <string name="custom_token_creation_error_wrong_decimals">十進制數必須是有效整數，不大於 %d</string>
+    <string name="custom_token_decimals_input_title">小數點</string>
+    <string name="custom_token_derivation_path_default">默認</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 幣種</string>
+    <string name="custom_token_name_input_placeholder">如 USD Coin</string>
+    <string name="custom_token_name_input_title">名稱</string>
+    <string name="custom_token_network_input_not_selected">未選擇</string>
+    <string name="custom_token_network_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_validation_error_already_added">此代幣/網路已被加入</string>
+    <string name="custom_token_validation_error_not_found">請注意代幣可以被任何人創造。小心詐騙</string>
+    <string name="details_chat">交談</string>
+    <string name="details_manage_security_access_code">訪問密碼</string>
+    <string name="details_manage_security_access_code_description">在掃描卡之前，您必須提交正確的訪問密碼</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_referral_title">推薦計畫</string>
+    <string name="details_row_privacy_policy">隱私政策</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
+    <string name="details_row_title_card_tou">卡片使用條款</string>
+    <string name="details_row_title_cid">卡號</string>
+    <string name="details_row_title_create_backup">連結更多錢包</string>
+    <string name="details_row_title_currency">App Currency</string>
+    <string name="details_row_title_issuer">發行人</string>
+    <string name="details_row_title_send_feedback">發送反饋</string>
+    <string name="details_row_title_signed_hashes">簽署</string>
+    <string name="details_title">細節</string>
+    <string name="disclaimer_error_loading">檢查您的網路連接或切換到其他網絡</string>
+    <string name="disclaimer_title">服務條款</string>
+    <string name="error_update_app">糟糕，當前版本的應用程序無法使用此卡，請檢查更新</string>
+    <string name="error_wrong_wallet_tapped">您使用了另一個錢包中的卡。點按與此錢包關聯的卡片</string>
+    <string name="exchange_receive_view_header">您收到</string>
+    <string name="exchange_send_view_header">您發送</string>
+    <string name="feedback_data_collection_message">以下信息是可選的。如果不想共享，可以將其刪除</string>
+    <string name="feedback_preface_rate_negative">告訴我們您缺少哪些功能，我們會盡力幫助您</string>
+    <string name="feedback_preface_scan_failed">請告訴我們你有什麼卡</string>
+    <string name="feedback_preface_support">嗨! 幫助團隊，</string>
+    <string name="feedback_preface_tx_failed">請告訴我們更多有關您的問題的信息。提供任何小細節都會帶來幫助</string>
+    <string name="feedback_subject_rate_negative">我的建議</string>
+    <string name="feedback_subject_scan_failed">無法掃卡</string>
+    <string name="feedback_subject_support">反饋</string>
+    <string name="feedback_subject_support_tangem">Tangem反饋</string>
+    <string name="feedback_subject_tx_failed">無法發送交易</string>
+    <string name="home_button_order">訂購</string>
+    <string name="initial_message_change_access_code_body">要更改訪問密碼，請完全按照上圖所示連接手機和卡片</string>
+    <string name="initial_message_change_passcode_body">要更改密碼，請完全按照上圖所示連接手機和卡</string>
+    <string name="initial_message_create_wallet_body">要創建錢包，請完全按照上圖所示連接手機和卡</string>
+    <string name="initial_message_scan_header">點擊掃描</string>
+    <string name="initial_message_sign_header">點擊簽名</string>
+    <string name="initial_message_tap_header">點按卡片</string>
+    <string name="internal_error_wallet_manager_not_found">內部錯誤：找不到錢包管理器</string>
+    <string name="main_manage_tokens">管理代幣</string>
+    <string name="main_no_backup_warning_subtitle">為了保護您的資產，我們建議您執行此程序</string>
+    <string name="main_no_backup_warning_title">您的錢包尚未備份</string>
+    <string name="main_page_balance">總餘額</string>
+    <string name="main_processing_full_amount">該金額不包括您的部分資金</string>
+    <string name="main_scan_card_warning_view_subtitle">要訪問所有的網路您需要掃描卡片</string>
+    <string name="main_scan_card_warning_view_title">掃描卡片</string>
+    <string name="main_tokens">代幣</string>
+    <string name="onboarding_access_code_feature_1_description">您必須設置一個單一的訪問代碼來保護您的所有錢包。</string>
+    <string name="onboarding_access_code_feature_1_title">保護</string>
+    <string name="onboarding_access_code_feature_2_description">您可以稍後在每張卡上設置單獨的訪問密碼</string>
+    <string name="onboarding_access_code_feature_2_title">個人化</string>
+    <string name="onboarding_access_code_feature_3_description">門禁密碼可以用聯動卡恢復，不要把所有卡都放在一個地方。</string>
+    <string name="onboarding_access_code_feature_3_title">恢復</string>
+    <string name="onboarding_access_code_hint">選擇您想要的任何單詞、短語或數字作為您的訪問代碼。</string>
+    <string name="onboarding_access_code_intro_title">建立訪問密碼</string>
+    <string name="onboarding_access_code_repeat_code_title">重新輸入訪問密碼</string>
+    <string name="onboarding_access_code_too_short">訪問代碼的長度必須至少為 4 個字符</string>
+    <string name="onboarding_access_codes_doesnt_match">輸入的訪問密碼與初始訪問密碼不匹配</string>
+    <string name="onboarding_alert_message_not_max_backup_cards_added">您已添加一張備用卡。備份過程完成後，您將無法添加更多備份卡。如果您還有一張卡，請將其添加到備份中。您想繼續備份過程嗎？</string>
+    <string name="onboarding_backup_exit_warning">備份過程已部分完成。你現在不能退出</string>
+    <string name="onboarding_balance_title">餘額</string>
+    <string name="onboarding_button_add_backup_card">添加備用卡</string>
+    <string name="onboarding_button_backup_card_format">掃描卡片 #%d</string>
+    <string name="onboarding_button_backup_now">立即備份</string>
+    <string name="onboarding_button_backup_origin">掃描主卡</string>
+    <string name="onboarding_button_claim">獲取</string>
+    <string name="onboarding_button_continue_wallet">繼續至我的錢包</string>
+    <string name="onboarding_button_finalize_backup">完成備份過程</string>
+    <string name="onboarding_button_kyc_start">通過Utorg驗證</string>
+    <string name="onboarding_button_kyc_waiting">刷新</string>
+    <string name="onboarding_button_pin">設置PIN碼</string>
+    <string name="onboarding_button_receive_crypto">接收貨幣</string>
+    <string name="onboarding_button_register_wallet">註冊</string>
+    <string name="onboarding_button_scan_origin_card">掃描主卡</string>
+    <string name="onboarding_button_skip_backup">暫時略過</string>
+    <string name="onboarding_button_what_does_it_mean">它是如何運作的？</string>
+    <string name="onboarding_chat_button_title">支援</string>
+    <string name="onboarding_create_wallet_body">讓我們生成您卡上的所有密鑰並創建一個安全的錢包</string>
+    <string name="onboarding_create_wallet_button_create_wallet">創建錢包</string>
+    <string name="onboarding_create_wallet_header">創造錢包</string>
+    <string name="onboarding_done_body">您的卡已激活並可以使用</string>
+    <string name="onboarding_done_header">成功!</string>
+    <string name="onboarding_exit_alert_message">這此情況，您必須要重新開始</string>
+    <string name="onboarding_exit_alert_title">您想要離開啟用程序嗎?</string>
+    <string name="onboarding_getting_started">開始</string>
+    <string name="onboarding_navbar_kyc_progress">驗證身分</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_pin">PIN 碼</string>
+    <string name="onboarding_navbar_register_wallet">連接</string>
+    <string name="onboarding_navbar_title_creating_backup">創建備份</string>
+    <string name="onboarding_saltpay_button_backup_origin">點擊 SaltPay 卡</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">要開始備份過程，您必須添加 Tangem 卡片作為備份</string>
+    <string name="onboarding_saltpay_subtitle_one_backup_card">通過創建訪問密碼完成備份</string>
+    <string name="onboarding_saltpay_title_backup_card">點擊 Tangem 卡片</string>
+    <string name="onboarding_saltpay_title_no_backup_card">沒有備份卡片</string>
+    <string name="onboarding_saltpay_title_one_backup_card">備份卡片已準備完成</string>
+    <string name="onboarding_saltpay_title_prepare_origin">準備SaltPay卡</string>
+    <string name="onboarding_subtitle_claim">要開始，只需將 wxDAI 獲取到您的錢包</string>
+    <string name="onboarding_subtitle_claim_progress">這會花上幾秒</string>
+    <string name="onboarding_subtitle_kyc_retry">請查看Email已獲得更多指示</string>
+    <string name="onboarding_subtitle_kyc_start">要開始使用您的卡，您必須通過 KYC驗證</string>
+    <string name="onboarding_subtitle_kyc_waiting">請等待驗證完成，您將收到電子郵件通知。通常最多需要 1 小時。您可以關閉該應用程序，稍後再回來</string>
+    <string name="onboarding_subtitle_no_backup_cards">要開始備份過程，最多可添加兩張備份卡。</string>
+    <string name="onboarding_subtitle_one_backup_card">您可以再添加一張卡或完成備份過程</string>
+    <string name="onboarding_subtitle_pin">為您的 SaltPay 卡設置 PIN 碼</string>
+    <string name="onboarding_subtitle_register_wallet">將您的卡片連接到去中心化支付系統</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">準備編號為 %s 的備份卡</string>
+    <string name="onboarding_subtitle_scan_origin_card">準備主卡</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">準備編號為 %s 的主卡</string>
+    <string name="onboarding_subtitle_success_claim">恭喜！ 您的第一張支付加密卡已啟用！</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">您的錢包卡已配置完畢，可以使用了</string>
+    <string name="onboarding_subtitle_two_backup_cards">已添加至最大數量。完成備份過程</string>
+    <string name="onboarding_supplement_button_kyc_waiting">聯繫客服</string>
+    <string name="onboarding_title">啟用卡片</string>
+    <string name="onboarding_title_backup_card_format">備份卡 #%d</string>
+    <string name="onboarding_title_claim">獲取%s</string>
+    <string name="onboarding_title_claim_progress">獲取中</string>
+    <string name="onboarding_title_kyc_retry">有東西出錯了</string>
+    <string name="onboarding_title_kyc_start">確認你的身分</string>
+    <string name="onboarding_title_kyc_waiting">KYC 認證中</string>
+    <string name="onboarding_title_no_backup_cards">沒有備用卡</string>
+    <string name="onboarding_title_one_backup_card">添加了一張備用卡</string>
+    <string name="onboarding_title_pin">PIN 碼</string>
+    <string name="onboarding_title_register_wallet">連接你的錢包</string>
+    <string name="onboarding_title_scan_origin_card">準備好你的卡片</string>
+    <string name="onboarding_title_two_backup_cards">添加了兩張備用卡</string>
+    <string name="onboarding_top_up_body">要開始使用，只需為錢包充值任意金額</string>
+    <string name="onboarding_top_up_body_no_account_error">要開始，只需為錢包充值超過 %1$s %2$s</string>
+    <string name="onboarding_top_up_button_but_crypto">購買加密貨幣</string>
+    <string name="onboarding_top_up_button_show_wallet_address">顯示錢包地址</string>
+    <string name="onboarding_top_up_header">充值你的錢包</string>
+    <string name="onboarding_twin_exit_warning">結對過程已部分完成。你現在不能退出</string>
+    <string name="onboarding_twins_interrupt_warning">如果創建錢包的過程以任何方式中斷，您將得重新開始</string>
+    <string name="onboarding_wallet_info_subtitle_first">您最多可以備份另外兩張空白的 Tangem 錢包卡。</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">可以使用其中一張備用卡恢復訪問密碼</string>
+    <string name="onboarding_wallet_info_subtitle_second">所有備用卡都可以使用相同的密鑰作為全功能使用。</string>
+    <string name="onboarding_wallet_info_subtitle_third">您將能夠設置訪問密碼來保護您的錢包</string>
+    <string name="onboarding_wallet_info_title_first">備援錢包</string>
+    <string name="onboarding_wallet_info_title_fourth">訪問密碼還原</string>
+    <string name="onboarding_wallet_info_title_second">相同的卡片</string>
+    <string name="onboarding_wallet_info_title_third">訪問密碼</string>
+    <string name="referral_button_participate">參與</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_friends_bought_title">您的朋友買</string>
+    <string name="referral_point_currencies_description_prefix">會得到</string>
+    <string name="referral_point_currencies_description_suffix">對於你的朋友在你的 %1$s 網絡地址%2$s 上購買的每個錢包</string>
+    <string name="referral_point_currencies_title">你</string>
+    <string name="referral_point_discount_description_prefix">得到</string>
+    <string name="referral_point_discount_description_suffix">當在 tangem.com購買卡片</string>
+    <string name="referral_point_discount_description_value">%s 折扣</string>
+    <string name="referral_point_discount_title">你的朋友</string>
+    <string name="referral_promo_code_copied">個人促銷碼已複製!</string>
+    <string name="referral_promo_code_title">您的優惠碼</string>
+    <string name="referral_share_link">以折扣價購買 Tangem 錢包！%s</string>
+    <string name="referral_title">推薦您的好友至Tangem</string>
+    <string name="referral_tos_enroled_prefix">你接受了</string>
+    <string name="referral_tos_not_enroled_prefix">點擊此按鈕即表示您接受</string>
+    <string name="referral_tos_suffix">在推薦計劃</string>
+    <string name="registration_task_alert_message">請持有卡片直至操作完成</string>
+    <string name="reset_card_to_factory_button_title">重置卡片</string>
+    <string name="reset_card_to_factory_warning_message">我了解執行此操作後，我將無法再訪問當前錢包</string>
+    <string name="reset_card_with_backup_to_factory_message">恢復原廠設置將從所選卡中完全刪除錢包。您將無法恢復當前錢包或使用卡恢復訪問密碼</string>
+    <string name="reset_card_without_backup_to_factory_message">恢復原廠設置將從所選卡中完全刪除錢包並將其從應用程序中刪除。您將無法恢復當前錢包</string>
+    <string name="russian_bank_card_warning_subtitle">您有其他國家的銀行卡或銀聯卡嗎？</string>
+    <string name="russian_bank_card_warning_title">目前不接受俄羅斯銀行卡</string>
+    <string name="saltpay_error_empty_backup_message">輕觸帶有 visa 標誌的卡片</string>
+    <string name="saltpay_error_empty_backup_title">注意</string>
+    <string name="saltpay_error_no_gas_message">請聯繫客服</string>
+    <string name="saltpay_error_no_gas_title">沒有激活資金</string>
+    <string name="saltpay_error_pin_weak_message">這樣的 PIN 很容易被暴力破解</string>
+    <string name="saltpay_error_pin_weak_title">四個相同的數字不安全</string>
+    <string name="save_user_wallet_agreement_access_description">登錄應用程序並在不掃描卡片的情況下檢查您的資產</string>
+    <string name="save_user_wallet_agreement_access_title">訪問應用程序</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">允許使用生物辨識</string>
+    <string name="save_user_wallet_agreement_code_description_biometrics">將要求生物識別而不是訪問密碼來與您的錢包進行交互</string>
+    <string name="save_user_wallet_agreement_code_title">訪問密碼</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_description">您好像禁用了生物識別，有必要保存錢包</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_title">啟用生物識別授權</string>
+    <string name="save_user_wallet_agreement_header_biometrics">您想使用生物識別技術嗎？</string>
+    <string name="save_user_wallet_agreement_notice">請注意，用您的資金進行交易仍需要您的卡片</string>
+    <string name="scan_card_error">掃卡失敗。再試一次</string>
+    <string name="scan_card_settings_button">掃描卡片</string>
+    <string name="scan_card_settings_message">掃描卡片以更改其設置。這些更改只會影響您掃描過的卡，不會影響綁定到您錢包的其他卡。</string>
+    <string name="scan_card_settings_title">準備好您的卡!</string>
+    <string name="search_tokens_title">搜尋代幣</string>
+    <string name="send_amount_label">數量</string>
+    <string name="send_destination_hint_address">地址</string>
+    <string name="send_destination_hint_address_payid">地址或 PayString</string>
+    <string name="send_error_address_same_as_wallet">地址與錢包地址相同</string>
+    <string name="send_error_payid_not_registered">PayString 未註冊</string>
+    <string name="send_error_payid_request_failed">PayString 請求失敗</string>
+    <string name="send_error_payid_unsupported_by_blockchain">PayString 不被區塊鏈支持</string>
+    <string name="send_extras_error_invalid_destination_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="send_fee_include_description">包含費用</string>
+    <string name="send_fee_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_max_amount_label">最大值</string>
+    <string name="send_network_fee_title">網路費</string>
+    <string name="send_title">發送</string>
+    <string name="send_title_currency_format">發送 %s</string>
+    <string name="send_total_label">總計</string>
+    <string name="send_total_subtitle_asset_format">%1$s 和 %2$s 將被發送</string>
+    <string name="send_total_subtitle_fiat_format">≈ %1$s (費用包含: %2$s)</string>
+    <string name="send_total_subtitle_format">%s 將被發送</string>
+    <string name="send_transaction_success">交易已成功簽署並發送至區塊鏈節點。錢包餘額稍後更新</string>
+    <string name="send_validation_invalid_address">無效地址</string>
+    <string name="shop_buy_now">現在購買</string>
+    <string name="shop_free">免費</string>
+    <string name="shop_i_have_a_promo_code">輸入折扣碼</string>
+    <string name="shop_one_wallet">Tangem 冷錢包</string>
+    <string name="shop_other_payment_methods">其他付款方式</string>
+    <string name="shop_shipping">運送</string>
+    <string name="shop_total">總計</string>
+    <string name="solana_rent_warning">Solana 網絡每 2 天收取 %1$s 的費用。無法付此費用的帳戶將從網絡中清除。向您的帳戶存入超過 %2$s 即可免費使用</string>
+    <string name="story_awe_description">安全地存儲您的加密貨幣，同時將私鑰保存在您的卡中</string>
+    <string name="story_awe_title">創新式的硬體錢包</string>
+    <string name="story_backup_description_1">最多</string>
+    <string name="story_backup_description_2_bold">3張實體卡片</string>
+    <string name="story_backup_description_3">到一個錢包</string>
+    <string name="story_backup_title">更多的安全備份</string>
+    <string name="story_currencies_description">一個冷錢包，可同時將您的比特幣、以太幣和其他幣種-全部存在一張卡中</string>
+    <string name="story_currencies_title">千種虛擬貨幣</string>
+    <string name="story_finish_description">隨時隨地使用它，不需要接線或電池，只需要你的卡片和手機</string>
+    <string name="story_finish_title">適合每個人的冷錢包</string>
+    <string name="story_meet_borrow">借入</string>
+    <string name="story_meet_buy">購買</string>
+    <string name="story_meet_exchange">交易</string>
+    <string name="story_meet_lend">借出</string>
+    <string name="story_meet_pay">付款</string>
+    <string name="story_meet_send">發送</string>
+    <string name="story_meet_store">保存</string>
+    <string name="story_meet_title">認識Tangem</string>
+    <string name="story_web3_description">交易、購買NFT、自由穿梭於100+去中心化服務</string>
+    <string name="story_web3_title">兼容DeFi</string>
+    <string name="swapping_generic_error">有錯誤。請再試一遍</string>
+    <string name="swapping_give_permission">賦予權限</string>
+    <string name="swapping_insufficient_funds">餘額不足</string>
+    <string name="swapping_not_enough_funds_for_fee">您的 %1$s 錢包中沒有足夠的資金來創建交易。首先為您的 %2$s 錢包充值</string>
+    <string name="swapping_pending_transaction_subtitle">交易進行中...</string>
+    <string name="swapping_pending_transaction_title">等待中</string>
+    <string name="swapping_permission_buttons_approve">允許</string>
+    <string name="swapping_permission_header">賦予權限</string>
+    <string name="swapping_permission_rows_amount">數量 %s</string>
+    <string name="swapping_permission_rows_spender">花費者</string>
+    <string name="swapping_permission_rows_your_wallet">您的錢包</string>
+    <string name="swapping_permission_subheader">要繼續，您需要允許 1inch 智能合約使用您的 %s</string>
+    <string name="swapping_permit_and_swap">許可和交換</string>
+    <string name="swapping_success_view_explorer_button_title">在瀏覽器中查看</string>
+    <string name="swapping_success_view_title">進行中</string>
+    <string name="swapping_swap">交換</string>
+    <string name="swapping_swap_of_to">交易 %s 至</string>
+    <string name="swapping_token_list_other_tokens">其他代幣</string>
+    <string name="swapping_token_list_title">選擇代幣</string>
+    <string name="swapping_token_list_your_tokens">您的代幣</string>
+    <string name="swapping_token_not_available">無法使用</string>
+    <string name="tangem_app_name">Tangem</string>
+    <string name="token_details_hide_alert_hide">隱藏</string>
+    <string name="token_details_hide_alert_message">您即將在主屏幕上隱藏此代幣。您可以隨時通過管理代幣頁面將其添加回來。</string>
+    <string name="token_details_hide_alert_title">隱藏 %s</string>
+    <string name="token_details_hide_token">隱藏代幣</string>
+    <string name="token_details_send_blocked_fee_format">%1$s 是 %2$s 網絡中的代幣， 要進行 %3$s 交易，您需要存入一些 %4$s (%5$s) 以支付網絡費用</string>
+    <string name="token_details_send_blocked_tx_format">請等待 %s 交易完成才能發送資金</string>
+    <string name="token_details_unable_hide_alert_message">%1$s 代幣是 %2$s 網絡上的主要貨幣，只要列表中還有該網絡上的其他代幣，它就無法被隱藏。</string>
+    <string name="token_details_unable_hide_alert_title">無法隱藏 %s</string>
+    <string name="token_item_no_rate">無費用</string>
+    <string name="twin_error_same_card">您掃描了同一張卡片。要創建雙錢包，您需要掃描編號為 %d 的卡</string>
+    <string name="twins_onboarding_description_format">這一個是你手裡拿著的，另一個是編號為 %s 的，這兩張卡都可以用來從這個錢包中提取資金</string>
+    <string name="twins_onboarding_subtitle">一個錢包，兩張卡片</string>
+    <string name="twins_recreate_button_format">掃描卡片 #%s</string>
+    <string name="twins_recreate_title_creating_wallet">創建錢包</string>
+    <string name="twins_recreate_title_format">掃描 #%s 雙胞胎卡</string>
+    <string name="twins_recreate_title_preparing">準備卡片</string>
+    <string name="twins_recreate_toolbar">Tangem雙胞胎卡</string>
+    <string name="twins_recreate_warning">這個動作是不可逆的。您將無法訪問舊錢包</string>
+    <string name="user_wallet_list_add_button">添加新錢包</string>
+    <string name="user_wallet_list_editing_count">已選擇 %d</string>
+    <string name="user_wallet_list_error_wallet_already_saved">此錢包已保存，您可以再添加一個</string>
+    <string name="user_wallet_list_multi_header">多幣種</string>
+    <string name="user_wallet_list_rename_popup_placeholder">錢包名稱</string>
+    <string name="user_wallet_list_rename_popup_title">重新命名錢包</string>
+    <string name="user_wallet_list_single_header">單一幣種</string>
+    <string name="user_wallet_list_title">我的錢包</string>
+    <string name="user_wallet_list_unlock_all">用 %s 解鎖全部</string>
+    <string name="wallet_address_button_create_payid">創建支付字符串</string>
+    <string name="wallet_address_button_explore">探索地址</string>
+    <string name="wallet_balance_blockchain_unreachable">網路無法使用</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">區塊鍊無法使用。稍後再試</string>
+    <string name="wallet_balance_loading">餘額加載中</string>
+    <string name="wallet_balance_missing_derivation">掃描卡片</string>
+    <string name="wallet_balance_tx_in_progress">交易進行中</string>
+    <string name="wallet_balance_verified">檢視餘額</string>
+    <string name="wallet_button_actions">動作</string>
+    <string name="wallet_button_buy">購買</string>
+    <string name="wallet_button_create_wallet">創造錢包</string>
+    <string name="wallet_button_sell">銷售</string>
+    <string name="wallet_button_send">發送</string>
+    <string name="wallet_button_trade">交易</string>
+    <string name="wallet_choose_trade_action">您想要購買或賣出交易貨幣?</string>
+    <string name="wallet_connect_alert_sign_message">請求籤署消息。%s</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %1$s，請求\n簽署 BNB 交易。\n%2$s</string>
+    <string name="wallet_connect_bnb_trade_order_message">%1$s 的交易訂單\n價格： %2$s\n接收金額：%3$s\n支付數量： %4$s</string>
+    <string name="wallet_connect_bnb_transaction_message">交易明細：\n從： %1$s\n到： %2$s\n數量： %3$s</string>
+    <string name="wallet_connect_clipboard_alert">剪貼板包含 WalletConnect 代碼。使用複制的值或掃描二維碼</string>
+    <string name="wallet_connect_create_tx_message">請求為 %1$s 創建交易\n%2$s\n\n數量： %3$s\n費用： %4$s\n全部的： %5$s\n餘額： %6$s</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">無法交易，無足夠資金</string>
+    <string name="wallet_connect_error_failed_to_connect">未能建立 WalletConnect 連接。請稍後再試</string>
+    <string name="wallet_connect_error_timeout">無法建立 WalletConnect 連接:超時錯誤。請稍後再試</string>
+    <string name="wallet_connect_error_unsupported_dapp">由於技術問題，無法與此 Dapp 建立連接</string>
+    <string name="wallet_connect_network_not_found_format">沒有 %s 網路，請先加入後再試一次</string>
+    <string name="wallet_connect_no_sessions_message">沒有打開中的WalletConnect連接</string>
+    <string name="wallet_connect_no_sessions_title">Ooops, 沒有連接</string>
+    <string name="wallet_connect_open_session">打開連接</string>
+    <string name="wallet_connect_paste_from_clipboard">從剪貼板貼上</string>
+    <string name="wallet_connect_request_session_start">請求開始會話\n%1$s\n\n網絡： %2$s\n\n網址：%3$s</string>
+    <string name="wallet_connect_same_wcuri">無法完成執行，您已經使用此參數建立了 WalletConnect 連接</string>
+    <string name="wallet_connect_scan_new_code">掃描新密碼</string>
+    <string name="wallet_connect_scanner_error_not_valid_card">此卡不能用於建立 WalletConnect 連接</string>
+    <string name="wallet_connect_scanner_error_unsupported_network">不支持此網絡。請選擇其他網絡</string>
+    <string name="wallet_connect_select_network">選擇網路</string>
+    <string name="wallet_connect_sessions_title">WalletConnect 連接</string>
+    <string name="wallet_connect_subtitle">連結到Dapps</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_create_payid">創建支付字符串</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_empty">首先輸入所需的PayString</string>
+    <string name="wallet_create_payid_error_already_created">此 PayString 已存在。嘗試用不同的</string>
+    <string name="wallet_create_payid_error_message">創建 PayString 時的錯誤回復</string>
+    <string name="wallet_create_payid_hint">支付字符串名稱</string>
+    <string name="wallet_create_payid_info">您的 PayString 是您獨有的信息，例如您的電話號碼、電子郵件或 ABN</string>
+    <string name="wallet_currency_subtitle">%s 網路</string>
+    <string name="wallet_error_empty_card">空白卡片</string>
+    <string name="wallet_error_empty_card_subtitle">創建錢包以開始使用Tangem</string>
+    <string name="wallet_error_empty_twin_card">創建雙胞胎錢包</string>
+    <string name="wallet_error_empty_twin_card_subtitle">在兩張卡上生成錢包密鑰以開始使用您的雙胞胎</string>
+    <string name="wallet_error_no_account">帳號尚未被創造</string>
+    <string name="wallet_error_unsupported_blockchain">不支持此卡</string>
+    <string name="wallet_error_unsupported_blockchain_subtitle">您的 Tangem 卡是為與不同的應用程序一起工作而設計的。請查看卡片上的名稱和說明，並安裝正確的應用程序</string>
+    <string name="wallet_notification_address_copied">地址已復製到剪貼板</string>
+    <string name="wallet_notification_no_internet">無網路</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_title">Tangem</string>
+    <string name="warning_button_can_be_better">可以更好</string>
+    <string name="warning_button_learn_more">了解更多</string>
+    <string name="warning_button_ok">了解</string>
+    <string name="warning_button_really_cool">真的很酷！</string>
+    <string name="warning_existential_deposit_message">%1$s 網絡有一個 Existential Deposit 的概念。如果您的帳戶低於 %2$s，它將被停用，所有剩餘資金將被銷毀</string>
+    <string name="warning_failed_to_verify_card_message">此卡可能是生產樣本或偽造品</string>
+    <string name="warning_failed_to_verify_card_title">認證檢查失敗</string>
+    <string name="warning_important_security_info">重要安全信息\U26A0</string>
+    <string name="warning_low_signatures_format">此卡上只有 %s 個簽名可用。您必須提取所有資金</string>
+    <string name="warning_rate_app_message">你喜歡 Tangem 嗎？</string>
+    <string name="warning_rate_app_title">一個問題</string>
+    <string name="warning_signed_tx_previously">此卡過去曾簽署過交易</string>
+    <string name="warning_testnet_card_message">這是一張測試網卡。不要接受它作為付款。 此卡只能用於測試和開發目的</string>
+    <string name="welcome_interrupted_backup_alert_discard">捨棄</string>
+    <string name="welcome_interrupted_backup_alert_message">您有一個備份中斷了，您想繼續嗎？</string>
+    <string name="welcome_interrupted_backup_alert_resume">是的，恢復</string>
+    <string name="welcome_interrupted_backup_discard_discard">捨棄</string>
+    <string name="welcome_interrupted_backup_discard_message">如果您現在要放棄備份，則必須將卡重置為出廠設置才能重新開始</string>
+    <string name="welcome_interrupted_backup_discard_resume">恢復備份</string>
+    <string name="welcome_interrupted_backup_discard_title">此動作不可逆</string>
+    <string name="welcome_unlock">使用 %s 登錄</string>
+    <string name="welcome_unlock_card">掃描卡片</string>
+    <string name="welcome_unlock_description">使用 %s 或掃描卡片以訪問該應用程序</string>
+    <string name="welcome_unlock_title">歡迎回來!</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
diff --git a/core/res/src/main/res/values-zh-rTW/strings_plurals.xml b/core/res/src/main/res/values-zh-rTW/strings_plurals.xml
new file mode 100644
index 0000000000..80911976be
--- /dev/null
+++ b/core/res/src/main/res/values-zh-rTW/strings_plurals.xml
@@ -0,0 +1,13 @@
+<resources>
+    <plurals name="card_label_card_count">
+        <item quantity="other">%d 卡片</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="other">%d 代幣</item>
+    </plurals>
+
+    <plurals name="referral_wallets_purchased_count">
+        <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 61%
rename from app/src/main/res/values/strings_blockchain.xml
rename to core/res/src/main/res/values/strings-blockchain.xml
index 8014c2a199..3a01e0328f 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"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Insufficient balance</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
+    <string name="common_fee_error">Failed to get fee</string>
+    <string name="no_account_generic">Load %1$s+ %2$s to create account</string>
+    <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</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="send_error_unknown">Unknown error</string>
-    <string name="send_validation_invalid_address">Invalid address</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="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_insufficient_balance">Insufficient balance</string>
+    <string name="send_error_invalid_fee_value">Invalid Fee</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>
-</resources>
\ No newline at end of file
+    <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_amount_exceeds_balance">Amount exceeds balance</string>
+    <string name="send_validation_invalid_amount">Invalid amount</string>
+    <string name="send_validation_invalid_fee">Fee exceeds balance</string>
+    <string name="send_validation_invalid_total">Total amount exceeds balance</string>
+    <string name="xtz_withdrawal_message_ignore">No, send all</string>
+    <string name="xtz_withdrawal_message_reduce">Reduce by %s XTZ</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>
+</resources>
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..72c3273dae
--- /dev/null
+++ b/core/res/src/main/res/values/strings.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="address_qr_code_message_format">Send only %1$s (%2$s) from %3$s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</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_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</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_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</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="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="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_unsupported_card">This card is not designed to work with this app</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</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="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes from the app.</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_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_title">App Settings</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="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="common_accept">Accept</string>
+    <string name="common_add">Add</string>
+    <string name="common_attention">Attention</string>
+    <string name="common_balance">Balance: %s</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</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_cancel">Cancel</string>
+    <string name="common_close">Close</string>
+    <string name="common_continue">Continue</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_create">Create</string>
+    <string name="common_delete">Delete</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_done">Done</string>
+    <string name="common_enable">Enable</string>
+    <string name="common_error">Error</string>
+    <string name="common_no">No</string>
+    <string name="common_ok">OK</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="common_reject">Reject</string>
+    <string name="common_retry">Retry</string>
+    <string name="common_save_changes">Save changes</string>
+    <string name="common_search">Search</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="common_share">Share</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_start">Start</string>
+    <string name="common_submit">Submit</string>
+    <string name="common_success">Success</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_warning">Warning</string>
+    <string name="common_yes">Yes</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="custom_token_contract_address_input_title">Contract address</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_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_required_field">Required field</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_decimals_input_title">Decimals</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</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_network_input_not_selected">Not selected</string>
+    <string name="custom_token_network_input_title">Network</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_validation_error_already_added">This token/network has already been added to your list</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="details_chat">Chat</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="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_referral_title">Referral program</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="details_row_title_cid">Card ID</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="details_row_title_currency">App Currency</string>
+    <string name="details_row_title_issuer">Issuer</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="details_row_title_signed_hashes">Signed</string>
+    <string name="details_title">Details</string>
+    <string name="disclaimer_error_loading">Check your internet connection or switch to a different network</string>
+    <string name="disclaimer_title">Terms of Service</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="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="exchange_receive_view_header">You Receive</string>
+    <string name="exchange_send_view_header">You Send</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="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_support">Hi support team,</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</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_support">Feedback</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="home_button_order">Order</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="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_scan_header">Tap to scan</string>
+    <string name="initial_message_sign_header">Tap to sign</string>
+    <string name="initial_message_tap_header">Tap the card</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</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_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_tokens">Tokens</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_1_title">Protect</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_2_title">Personalize</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_feature_3_title">Restore</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_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_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="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_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_balance_title">Balance</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_backup_now">Backup now</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_chat_button_title">Support</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_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</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_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</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_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</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_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</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_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</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 %1$s %2$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_top_up_header">Top up your wallet</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</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_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup 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_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="referral_button_participate">Participate</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. Error code: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Error code: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_friends_bought_title">Your friends bought</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 %1$s network address%2$s</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</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_with_backup_to_factory_message">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="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="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</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_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow 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_code_title">Access code</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="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="scan_card_settings_button">Scan Card</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_title">Get your card ready!</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="send_amount_label">Amount</string>
+    <string name="send_destination_hint_address">Address</string>
+    <string name="send_destination_hint_address_payid">Address or PayString</string>
+    <string name="send_error_address_same_as_wallet">Address is the same as wallet address</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_payid_unsupported_by_blockchain">PayString unsupported by blockchain</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="send_fee_include_description">Include fee</string>
+    <string name="send_fee_label">Fee</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_max_amount_label">Maximum amount</string>
+    <string name="send_network_fee_title">Network fee</string>
+    <string name="send_title">Send</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="send_total_label">Total</string>
+    <string name="send_total_subtitle_asset_format">%1$s and %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_format">%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="send_validation_invalid_address">Invalid address</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_total">Total</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</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_backup_title">Ultra Secure Backup</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_currencies_title">Thousands of Currencies</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="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_title">Meet\nTangem</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_web3_title">DeFi Compatible</string>
+    <string name="swapping_generic_error">There was an error. Please try again.</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_not_enough_funds_for_fee">Not enough funds for fee in your %1$s wallet to create a transaction. Top up your %2$s wallet first.</string>
+    <string name="swapping_pending_transaction_subtitle">Transaction in progress...</string>
+    <string name="swapping_pending_transaction_title">Waiting</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="swapping_success_view_explorer_button_title">View in Explorer</string>
+    <string name="swapping_success_view_title">In progress</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_swap_of_to">Swap of %1$s to %2$s</string>
+    <string name="swapping_token_list_other_tokens">Other tokens</string>
+    <string name="swapping_token_list_title">Choose token</string>
+    <string name="swapping_token_list_your_tokens">Your tokens</string>
+    <string name="swapping_token_not_available">not available</string>
+    <string name="tangem_app_name">Tangem</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_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_send_blocked_fee_format">%1$s is a token in the %2$s network. To make a %3$s transaction you need to deposit some %4$s (%5$s) to cover the network fee.</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="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_item_no_rate">No rate</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="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="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twins_recreate_title_creating_wallet">Creating 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_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="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_delete_prompt">Are you sure you want to delete this wallet?</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="wallet_address_button_create_payid">Create PayString</string>
+    <string name="wallet_address_button_explore">Explore address</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="wallet_balance_loading">Balance is loading…</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+    <string name="wallet_balance_tx_in_progress">Transaction is in progress…</string>
+    <string name="wallet_balance_verified">Verified Balance</string>
+    <string name="wallet_button_actions">Actions</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_create_wallet">Create wallet</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_send">Send</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %1$s, requesting to\nsign BNB transaction.\n\n%2$s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %1$s\nPrice: %2$s\nAmount to receive: %3$s\nAmount to pay: %4$s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %1$s\nTo: %2$s\nAmount: %3$s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</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_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%1$s\n\nNETWORK: %2$s\n\nURL: %3$s</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_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_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_create_payid">Create PayString</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_empty">Enter desired PayString first</string>
+    <string name="wallet_create_payid_error_already_created">This PayString already exists. Try a different one.</string>
+    <string name="wallet_create_payid_error_message">Error response while creating PayString</string>
+    <string name="wallet_create_payid_hint">PayString name</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_currency_subtitle">%s network</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_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="wallet_error_no_account">Account is not created</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_notification_address_copied">Address was copied to clipboard</string>
+    <string name="wallet_notification_no_internet">No internet connection</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_title">Tangem</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_button_ok">Ok, Got it!</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_existential_deposit_message">%1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_important_security_info">Important security information \U26A0</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="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</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="welcome_interrupted_backup_alert_discard">Discard</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_discard_discard">Discard</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_title">This is an irreversible action</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Scan card</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
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..233b40b0c3
--- /dev/null
+++ b/core/res/src/main/res/values/strings_plurals.xml
@@ -0,0 +1,21 @@
+<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="referral_wallets_purchased_count">
+        <item quantity="zero">%d wallets</item>
+        <item quantity="one">%d wallet</item>
+        <item quantity="other">%d wallets</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>
+</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..28792f7aa2
--- /dev/null
+++ b/core/ui/build.gradle.kts
@@ -0,0 +1,61 @@
+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(Library.composeShimmer)
+
+    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..7a262835b6
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Buttons.kt
@@ -0,0 +1,616 @@
+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
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=97%3A103&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun TextButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+) {
+    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(
+    text: String,
+    icon: Painter,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Left(icon),
+        onClick = onClick,
+        enabled = enabled,
+        showProgress = false,
+        colors = TangemButtonsDefaults.defaultTextButtonColors,
+        size = TangemButtonSize.Text,
+    )
+}
+
+@Composable
+fun WarningTextButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.None,
+        onClick = onClick,
+        enabled = enabled,
+        showProgress = false,
+        colors = TangemButtonsDefaults.warningTextButtonColors,
+        size = TangemButtonSize.Text,
+    )
+}
+
+@Composable
+fun PrimaryButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+) {
+    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(
+    text: String,
+    icon: Painter,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+) {
+    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(
+    text: String,
+    icon: Painter,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Left(icon),
+        onClick = onClick,
+        colors = TangemButtonsDefaults.primaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+@Composable
+fun SecondaryButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+) {
+    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(
+    text: String,
+    icon: Painter,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+) {
+    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(
+    text: String,
+    icon: Painter,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Left(icon),
+        onClick = onClick,
+        colors = TangemButtonsDefaults.secondaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+// region Defaults
+@Suppress("LongParameterList")
+@Composable
+private fun TangemButton(
+    text: String,
+    icon: TangemButtonIcon,
+    onClick: () -> Unit,
+    colors: ButtonColors,
+    showProgress: Boolean,
+    enabled: Boolean,
+    modifier: Modifier = Modifier,
+    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 = TangemTheme.typography.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_24),
+            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_24),
+            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_24),
+            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_24),
+            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_24),
+            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_24),
+            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_24),
+            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_24),
+            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_24),
+            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_24),
+            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..b51b955875
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/ButtonsDeprecated.kt
@@ -0,0 +1,225 @@
+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
+private fun Preview_PrimaryStartIconButton_Enabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryStartIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = true,
+            onClick = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_PrimaryStartIconButton_Enabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryStartIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = true,
+            onClick = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_PrimaryStartIconButton_Disabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryStartIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = false,
+            onClick = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_PrimaryStartIconButton_Disabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryStartIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = false,
+            onClick = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_PrimaryEndIconButton_Enabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryEndIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = true,
+            onClick = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_PrimaryEndIconButton_Enabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryEndIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = true,
+            onClick = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_PrimaryEndIconButton_Disabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryEndIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = false,
+            onClick = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_PrimaryEndIconButton_Disabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryEndIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem_24,
+            enabled = false,
+            onClick = {},
+        )
+    }
+}
+
+/**
+ * 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 onClick 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(
+    text: String,
+    @DrawableRes iconResId: Int,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+) {
+    PrimaryButtonRow(
+        modifier = modifier,
+        enabled = enabled,
+        onClick = onClick,
+        content = {
+            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 onClick 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(
+    text: String,
+    @DrawableRes iconResId: Int,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+) {
+    PrimaryButtonRow(
+        modifier = modifier,
+        enabled = enabled,
+        onClick = onClick,
+        content = {
+            Text(text = text)
+            Spacer(modifier = Modifier.width(dimensionResource(R.dimen.spacing8)))
+            Icon(
+                painter = painterResource(id = iconResId),
+                contentDescription = null,
+            )
+        },
+    )
+}
+
+@Composable
+private fun PrimaryButtonRow(
+    enabled: Boolean,
+    onClick: () -> Unit,
+    content: @Composable (RowScope.() -> Unit),
+    modifier: Modifier = Modifier,
+) {
+    Button(
+        onClick = onClick,
+        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..dd8efe92a9
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt
@@ -0,0 +1,348 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.wrapContentHeight
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Divider
+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.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+import com.valentinilk.shimmer.shimmer
+
+/**
+ * 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
+ * @param isLoading  if true, shimmer is shown instead of [startText] and [endText]
+ *
+ * @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,
+    isLoading: Boolean = false,
+) {
+    Surface(
+        shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+        color = TangemTheme.colors.background.primary,
+        elevation = TangemTheme.dimens.elevation2,
+    ) {
+        CardInfoBox(
+            startText = startText,
+            endText = endText,
+            isLoading = isLoading,
+        )
+    }
+}
+
+/**
+ * [SmallInfoCard] with warning information shown underneath it.
+ *
+ * @param startText text information attached to the left edge
+ * @param endText   text information attached to the right edge
+ * @param warningText text of the warning
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=515%3A1541&t=qYGQJdtf1eeUPdkR-1"
+ * >Figma component</a>
+ */
+@Composable
+fun SmallInfoCardWithWarning(
+    startText: String,
+    endText: String,
+    warningText: String,
+) {
+    Surface(
+        shape = RoundedCornerShape(TangemTheme.dimens.size12),
+        color = TangemTheme.colors.background.primary,
+        elevation = TangemTheme.dimens.elevation2,
+    ) {
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            CardInfoBox(startText = startText, endText = endText)
+
+            Divider(
+                color = TangemTheme.colors.stroke.primary,
+                thickness = TangemTheme.dimens.size0_5,
+                modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing12),
+            )
+
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(
+                        top = TangemTheme.dimens.spacing14,
+                        bottom = TangemTheme.dimens.spacing16,
+                        start = TangemTheme.dimens.spacing16,
+                        end = TangemTheme.dimens.spacing16,
+                    ),
+                horizontalArrangement = Arrangement.Center,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Box(
+                    modifier = Modifier
+                        .background(
+                            color = TangemTheme.colors.background.secondary,
+                            shape = CircleShape,
+                        )
+                        .height(TangemTheme.dimens.size40)
+                        .width(TangemTheme.dimens.size40),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Image(
+                        painter = painterResource(id = R.drawable.img_attention_20),
+                        contentDescription = null,
+                    )
+                }
+                SpacerW12()
+                Text(
+                    text = warningText,
+                    color = TangemTheme.colors.text.primary1,
+                    style = TangemTheme.typography.body2,
+                )
+            }
+        }
+    }
+}
+
+/**
+ * Small card with an icon to the left and title with description shown to the right of it.
+ * Additional context can be shown to the right of it.
+ *
+ * @param title shown to the right of icon
+ * @param description shown to the right of icon
+ * @param icon icon to the left
+ * @param additionalContent shown at the right edge of the card
+ *
+ * @see <a href =
+ * "https://www.figma.com/file/Vs6SkVsFnUPsSCNwlnVf5U/Android-%E2%80%93-UI?node-id=1123%3A4040&t=izokIIb9WWetO32R-1"
+ * >Figma component</a>
+ */
+@Composable
+fun CardWithIcon(
+    title: String,
+    description: String,
+    icon: @Composable () -> Unit,
+    additionalContent: @Composable () -> Unit = {},
+) {
+    Surface(
+        shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+        color = TangemTheme.colors.background.primary,
+        elevation = TangemTheme.dimens.elevation2,
+    ) {
+        IconWithTitleAndDescription(
+            title = title,
+            description = description,
+            icon = icon,
+            additionalContent = additionalContent,
+        )
+    }
+}
+
+/**
+ * A widget with an icon to the left and title with description shown to the right of it.
+ * Additional context can be shown to the right of it.
+ *
+ * @param title shown to the right of icon
+ * @param description shown to the right of icon
+ * @param icon icon to the left
+ * @param additionalContent shown at the right edge of the card
+ *
+ * @see <a href =
+ * "https://www.figma.com/file/Vs6SkVsFnUPsSCNwlnVf5U/Android-%E2%80%93-UI?node-id=1123%3A4040&t=izokIIb9WWetO32R-1"
+ * >Figma component</a>
+ */
+@Composable
+fun IconWithTitleAndDescription(
+    title: String,
+    description: String,
+    icon: @Composable () -> Unit,
+    additionalContent: @Composable () -> Unit = {},
+) {
+    Row(
+        modifier = Modifier
+            .wrapContentHeight()
+            .fillMaxWidth()
+            .padding(
+                horizontal = TangemTheme.dimens.spacing16,
+                vertical = TangemTheme.dimens.spacing12,
+            ),
+        horizontalArrangement = Arrangement.Start,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier = Modifier
+                .background(
+                    color = TangemTheme.colors.background.secondary,
+                    shape = CircleShape,
+                )
+                .height(TangemTheme.dimens.size40)
+                .width(TangemTheme.dimens.size40),
+            contentAlignment = Alignment.Center,
+        ) {
+            icon()
+        }
+
+        SpacerW12()
+
+        Column(
+            modifier = Modifier
+                .weight(weight = 1f, fill = true),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.Start,
+        ) {
+            Text(
+                text = title,
+                color = TangemTheme.colors.text.primary1,
+                style = TangemTheme.typography.subtitle1,
+            )
+            SpacerH4()
+            Text(
+                text = description,
+                color = TangemTheme.colors.text.secondary,
+                style = TangemTheme.typography.body2,
+            )
+        }
+
+        additionalContent()
+    }
+}
+
+// region elements
+
+@Composable
+private fun CardInfoBox(
+    startText: String,
+    endText: String,
+    isLoading: Boolean = false,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .heightIn(TangemTheme.dimens.size48)
+            .padding(
+                horizontal = TangemTheme.dimens.spacing16,
+                vertical = TangemTheme.dimens.spacing12,
+            ),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = startText,
+            color = TangemTheme.colors.text.tertiary,
+            maxLines = 1,
+            style = TangemTheme.typography.subtitle2,
+        )
+
+        if (isLoading) {
+            Box(
+                modifier = Modifier
+                    .size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12)
+                    .shimmer()
+                    .background(
+                        color = TangemTheme.colors.button.secondary,
+                        shape = RoundedCornerShape(TangemTheme.dimens.radius3),
+                    ),
+            )
+        } else {
+            Text(
+                text = endText,
+                color = TangemTheme.colors.text.primary1,
+                maxLines = 1,
+                style = TangemTheme.typography.body2,
+            )
+        }
+    }
+}
+
+// endregion elements
+
+// region Preview
+
+@Suppress("MagicNumber")
+@Composable
+private fun CardsPreview() {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        SmallInfoCard(startText = "Balance", endText = "0.4405434 BTC")
+
+        SpacerH32()
+
+        SmallInfoCardWithWarning(
+            startText = "Balance",
+            endText = "0.4405434 BTC",
+            warningText = "Not enough funds for fee on your Polygon wallet  to create a transaction. " +
+                "Top up your Polygon wallet first.",
+        )
+
+        SpacerH32()
+
+        CardWithIcon(
+            title = "Permit is valid until",
+            description = "26:30",
+            icon = {
+                Icon(
+                    painterResource(id = R.drawable.ic_clock_24),
+                    contentDescription = null,
+                    tint = TangemTheme.colors.icon.primary1,
+                )
+            },
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_Cards_InLightTheme() {
+    TangemTheme(isDark = false) {
+        CardsPreview()
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_InfoCardWithWarning_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        CardsPreview()
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_SimpleInfoCard_InLightTheme() {
+    TangemTheme(isDark = false) {
+        SmallInfoCard(startText = "Balance", endText = "0.4405434 BTC")
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+private fun Preview_SimpleInfoCard_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        SmallInfoCard(startText = "Balance", endText = "0.4405434 BTC")
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/CurrencyPlaceholderIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/CurrencyPlaceholderIcon.kt
new file mode 100644
index 0000000000..24434c3c80
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/CurrencyPlaceholderIcon.kt
@@ -0,0 +1,57 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.CircleShape
+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.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+fun CurrencyPlaceholderIcon(id: String, modifier: Modifier = Modifier) {
+    val letterColor: Color = TangemTheme.colors.text.primary2
+    val circleColor: Color = TangemTheme.colors.icon.secondary
+
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = modifier
+            .background(circleColor, shape = CircleShape),
+    ) {
+        Text(
+            text = id.firstOrNull()?.titlecase() ?: "",
+            textAlign = TextAlign.Center,
+            color = letterColor,
+            modifier = Modifier.padding(TangemTheme.dimens.spacing4),
+            fontSize = 20.sp,
+            fontWeight = FontWeight.Bold,
+        )
+    }
+}
+
+// region preview
+
+@Preview(showBackground = true, heightDp = 40, widthDp = 40)
+@Composable
+private fun Preview_CurrencyPlaceholderIcon_InLightTheme() {
+    TangemTheme(isDark = false) {
+        CurrencyPlaceholderIcon(id = "DAI")
+    }
+}
+
+@Preview(showBackground = true, heightDp = 40, widthDp = 40)
+@Composable
+private fun Preview_CurrencyPlaceholderIcon_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        CurrencyPlaceholderIcon(id = "DAI")
+    }
+}
+
+// endregion preview
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
new file mode 100644
index 0000000000..993ae27a45
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
@@ -0,0 +1,386 @@
+package com.tangem.core.ui.components
+
+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.padding
+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.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.R
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * Dialog button params
+ *
+ * @param title Button text. If not provided default values will be used
+ * @param warning If true then button text will be in theme warning color
+ * @param enabled If false button will be disabled
+ * @param onClick Button click callback
+ */
+data class DialogButton(
+    val title: String? = null,
+    val warning: Boolean = false,
+    val enabled: Boolean = true,
+    val onClick: () -> Unit,
+)
+
+/**
+ * Additional params for dialog text field
+ */
+data class AdditionalTextInputDialogParams(
+    val label: String? = null,
+    val placeholder: String? = null,
+    val caption: String? = null,
+    val enabled: Boolean = true,
+    val isError: Boolean = false,
+)
+
+/**
+ * Simple alert dialog with a message and 'OK' button
+ *
+ * @param message message to show
+ * @param title title to show (no title if null)
+ * @param confirmButton title and action for confirm button
+ * @param dismissButton title and action for dismiss button (no dismiss button if null)
+ * @param onDismissDialog action to perform when dialog is closed
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=48%3A30&t=izDPAJnDbJTTC0Fp-1"
+ * >Figma component</a>
+ */
+@Composable
+fun BasicDialog(
+    message: String,
+    confirmButton: DialogButton,
+    onDismissDialog: () -> Unit,
+    title: String? = null,
+    dismissButton: DialogButton? = null,
+) {
+    TangemDialog(
+        type = DialogType.Message(message),
+        confirmButton = confirmButton,
+        onDismissDialog = onDismissDialog,
+        title = title,
+        dismissButton = dismissButton,
+    )
+}
+
+@Composable
+fun SimpleOkDialog(message: String, onDismissDialog: () -> Unit) {
+    TangemDialog(
+        type = DialogType.Message(message),
+        confirmButton = DialogButton(onClick = onDismissDialog),
+        onDismissDialog = onDismissDialog,
+        title = null,
+        dismissButton = null,
+    )
+}
+
+/**
+ * Dialog with text field
+ *
+ * @param fieldValue Text field value
+ * @param onValueChange Text field value callback
+ * @param title title to show (no title if null)
+ * @param confirmButton title and action for confirm button
+ * @param dismissButton title and action for dismiss button (no dismiss button if null)
+ * @param onDismissDialog action to perform when dialog is closed
+ * @param textFieldParams Additional params for dialog text field
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=268%3A273&t=9uHKoudX78ySqium-4"
+ * >Figma component</a>
+ */
+@Composable
+fun TextInputDialog(
+    fieldValue: TextFieldValue,
+    confirmButton: DialogButton,
+    onDismissDialog: () -> Unit,
+    onValueChange: (TextFieldValue) -> Unit,
+    title: String? = null,
+    dismissButton: DialogButton? = null,
+    textFieldParams: AdditionalTextInputDialogParams,
+) {
+    TangemDialog(
+        type = DialogType.TextInput(
+            value = fieldValue,
+            onValueChange = onValueChange,
+            params = textFieldParams,
+        ),
+        confirmButton = confirmButton,
+        onDismissDialog = onDismissDialog,
+        title = title,
+        dismissButton = dismissButton,
+    )
+}
+
+// region Defaults
+@Composable
+private fun TangemDialog(
+    type: DialogType,
+    confirmButton: DialogButton,
+    onDismissDialog: () -> Unit,
+    title: String? = null,
+    dismissButton: DialogButton? = null,
+) {
+    Dialog(onDismissRequest = onDismissDialog) {
+        Column(
+            modifier = Modifier
+                .background(
+                    shape = TangemTheme.shapes.roundedCornersLarge,
+                    color = TangemTheme.colors.background.plain,
+                )
+                .padding(all = TangemTheme.dimens.spacing24),
+        ) {
+            if (title != null) {
+                Text(
+                    modifier = Modifier.fillMaxWidth(),
+                    text = title,
+                    style = when (type) {
+                        is DialogType.Message -> TangemTheme.typography.h2
+                        is DialogType.TextInput -> TangemTheme.typography.h3
+                    },
+                    color = TangemTheme.colors.text.primary1,
+                )
+                SpacerH16()
+            }
+            DialogContent(type = type)
+            SpacerH24()
+            DialogButtons(confirmButton = confirmButton, dismissButton = dismissButton)
+        }
+    }
+}
+
+@Composable
+private fun DialogContent(
+    modifier: Modifier = Modifier,
+    type: DialogType,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        when (type) {
+            is DialogType.Message -> {
+                Text(
+                    modifier = Modifier.fillMaxWidth(),
+                    text = type.message,
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.secondary,
+                )
+            }
+            is DialogType.TextInput -> {
+                OutlineTextField(
+                    modifier = Modifier.fillMaxWidth(),
+                    value = type.value,
+                    label = type.params.label,
+                    placeholder = type.params.placeholder,
+                    caption = type.params.caption,
+                    enabled = type.params.enabled,
+                    isError = type.params.isError,
+                    onValueChange = { newValue ->
+                        type.onValueChange(newValue)
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun DialogButtons(
+    modifier: Modifier = Modifier,
+    confirmButton: DialogButton,
+    dismissButton: DialogButton?,
+) {
+    Row(
+        modifier = modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(
+            space = TangemTheme.dimens.spacing4,
+            alignment = Alignment.End,
+        ),
+    ) {
+        if (dismissButton != null) {
+            DialogButton(
+                text = dismissButton.title ?: stringResource(id = R.string.common_cancel),
+                warning = dismissButton.warning,
+                enabled = dismissButton.enabled,
+                onClick = dismissButton.onClick,
+            )
+        }
+        DialogButton(
+            text = confirmButton.title ?: stringResource(id = R.string.common_ok),
+            warning = confirmButton.warning,
+            enabled = confirmButton.enabled,
+            onClick = confirmButton.onClick,
+        )
+    }
+}
+
+@Composable
+private fun DialogButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    warning: Boolean,
+    enabled: Boolean,
+    onClick: () -> Unit,
+) {
+    Box(modifier = modifier) {
+        if (warning) {
+            WarningTextButton(
+                text = text,
+                enabled = enabled,
+                onClick = onClick,
+            )
+        } else {
+            TextButton(
+                text = text,
+                enabled = enabled,
+                onClick = onClick,
+            )
+        }
+    }
+}
+
+private sealed interface DialogType {
+    data class Message(val message: String) : DialogType
+
+    data class TextInput(
+        val value: TextFieldValue,
+        val onValueChange: (TextFieldValue) -> Unit,
+        val params: AdditionalTextInputDialogParams = AdditionalTextInputDialogParams(),
+    ) : DialogType
+}
+// endregion Defaults
+
+// region Preview
+@Composable
+private fun SimpleOkDialogPreview() {
+    SimpleOkDialog(
+        message = "All protected passwords will be deleted from the " +
+            "secure storage, you must enter the wallet password to work with the app.",
+    ) {}
+}
+
+@Composable
+private fun BasicDialogPreview() {
+    BasicDialog(
+        message = "All protected passwords will be deleted from the secure storage, you must enter the wallet " +
+            "password to work with the app",
+        title = "Attention",
+        confirmButton = DialogButton {},
+        dismissButton = DialogButton {},
+        onDismissDialog = {},
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_SimpleOkDialog_InLightTheme() {
+    TangemTheme(isDark = false) {
+        SimpleOkDialogPreview()
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_BasicDialog_InLightTheme() {
+    TangemTheme(isDark = false) {
+        BasicDialogPreview()
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_SimpleOkDialog_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        SimpleOkDialogPreview()
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_BasicDialog_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        BasicDialogPreview()
+    }
+}
+
+@Composable
+private fun WarningBasicDialogSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+    ) {
+        BasicDialog(
+            message = "All protected passwords will be deleted from the secure storage, you must enter the wallet " +
+                "password to work with the app",
+            title = "Attention",
+            confirmButton = DialogButton(warning = true) {},
+            dismissButton = DialogButton {},
+            onDismissDialog = {},
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WarningBasicDialogPreview_Light() {
+    TangemTheme {
+        WarningBasicDialogSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WarningBasicDialogPreview_Dark() {
+    TangemTheme(isDark = true) {
+        WarningBasicDialogSample()
+    }
+}
+
+@Composable
+private fun TextInputDialogSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+    ) {
+        TextInputDialog(
+            fieldValue = TextFieldValue(text = ""),
+            title = "Rename Wallet",
+            confirmButton = DialogButton {},
+            onDismissDialog = {},
+            onValueChange = {},
+            textFieldParams = AdditionalTextInputDialogParams(
+                label = "Wallet name",
+            ),
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun TextInputDialogPreview_Light() {
+    TangemTheme {
+        TextInputDialogSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun TextInputDialogPreview_Dark() {
+    TangemTheme(isDark = true) {
+        TextInputDialogSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/KeyboardState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Keyboard.kt
similarity index 74%
rename from app/src/main/java/com/tangem/tap/common/compose/KeyboardState.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/Keyboard.kt
index 2f08f3ae15..072332f939 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/KeyboardState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Keyboard.kt
@@ -1,8 +1,13 @@
-package com.tangem.tap.common.compose
+package com.tangem.core.ui.components
 
 import android.graphics.Rect
 import android.view.ViewTreeObserver
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalView
 
 sealed class Keyboard {
@@ -10,6 +15,10 @@ sealed class Keyboard {
     object Closed : Keyboard()
 }
 
+/**
+ * Allows to subscribe to a soft keyboard to detect when it's open/closed
+ */
+@Suppress("MagicNumber")
 @Composable
 fun keyboardAsState(): State<Keyboard> {
     val keyboardState: MutableState<Keyboard> = remember { mutableStateOf(Keyboard.Closed) }
@@ -19,13 +28,12 @@ fun keyboardAsState(): State<Keyboard> {
     }
     DisposableEffect(view) {
         val onGlobalListener = ViewTreeObserver.OnGlobalLayoutListener {
-
             val rect = Rect()
             view.getWindowVisibleDisplayFrame(rect)
             val screenHeight = view.rootView.height
             val keypadHeight: Int = screenHeight - (rect.bottom + rect.top) - discrepancy.value
             if (discrepancy.value == 0) {
-                discrepancy.value = keypadHeight;
+                discrepancy.value = keypadHeight
                 if (keypadHeight == 0) discrepancy.value = 1
             }
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/MiddleEllipsisText.kt b/core/ui/src/main/java/com/tangem/core/ui/components/MiddleEllipsisText.kt
new file mode 100644
index 0000000000..8d5527b5a6
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/MiddleEllipsisText.kt
@@ -0,0 +1,177 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.SubcomposeLayout
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.TextUnit
+
+/**
+ * https://stackoverflow.com/questions/69083061/how-to-make-middle-ellipsis-in-text-with-jetpack-compose
+ */
+@Suppress("LongMethod")
+@Composable
+fun MiddleEllipsisText(
+    text: String,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified,
+    fontSize: TextUnit = TextUnit.Unspecified,
+    fontStyle: FontStyle? = null,
+    fontWeight: FontWeight? = null,
+    fontFamily: FontFamily? = null,
+    letterSpacing: TextUnit = TextUnit.Unspecified,
+    textDecoration: TextDecoration? = null,
+    textAlign: TextAlign? = null,
+    lineHeight: TextUnit = TextUnit.Unspecified,
+    softWrap: Boolean = true,
+    onTextLayout: (TextLayoutResult) -> Unit = {},
+    style: TextStyle = LocalTextStyle.current,
+) {
+    // some letters, like "r", will have less width when placed right before "."
+    // adding a space to prevent such case
+    val layoutText = remember(text) { "$text $ellipsisText" }
+    val textLayoutResultState = remember(layoutText) {
+        mutableStateOf<TextLayoutResult?>(null)
+    }
+    SubcomposeLayout(modifier) { constraints ->
+        // result is ignored - we only need to fill our textLayoutResult
+        subcompose("measure") {
+            Text(
+                text = layoutText,
+                color = color,
+                fontSize = fontSize,
+                fontStyle = fontStyle,
+                fontWeight = fontWeight,
+                fontFamily = fontFamily,
+                letterSpacing = letterSpacing,
+                textDecoration = textDecoration,
+                textAlign = textAlign,
+                lineHeight = lineHeight,
+                softWrap = softWrap,
+                maxLines = 1,
+                onTextLayout = { textLayoutResultState.value = it },
+                style = style,
+            )
+        }.first().measure(Constraints())
+        // to allow smart cast
+        val textLayoutResult = textLayoutResultState.value
+            ?: // shouldn't happen - onTextLayout is called before subcompose finishes
+            return@SubcomposeLayout layout(0, 0) {}
+        val placeable = subcompose("visible") {
+            val finalText = remember(text, textLayoutResult, constraints.maxWidth) {
+                if (
+                    text.isEmpty() ||
+                    textLayoutResult.getBoundingBox(text.indices.last).right <= constraints.maxWidth
+                ) {
+                    // text not including ellipsis fits on the first line.
+                    return@remember text
+                }
+
+                val ellipsisWidth = layoutText.indices.toList()
+                    .takeLast(ELLIPSIS_CHARACTERS_COUNT)
+                    .let widthLet@{ indices ->
+                        // fix this bug: https://issuetracker.google.com/issues/197146630
+                        // in this case width is invalid
+                        for (i in indices) {
+                            val width = textLayoutResult.getBoundingBox(i).width
+                            if (width > 0) {
+                                return@widthLet width * ELLIPSIS_CHARACTERS_COUNT
+                            }
+                        }
+                        // this should not happen, because
+                        // this error occurs only for the last character in the string
+                        error("all ellipsis chars have invalid width")
+                    }
+                val availableWidth = constraints.maxWidth - ellipsisWidth
+                val startCounter = BoundCounter(text, textLayoutResult) { it }
+                val endCounter = BoundCounter(text, textLayoutResult) { text.indices.last - it }
+
+                while (availableWidth - startCounter.width - endCounter.width > 0) {
+                    val possibleEndWidth = endCounter.widthWithNextChar()
+                    if (
+                        startCounter.width >= possibleEndWidth &&
+                        availableWidth - startCounter.width - possibleEndWidth >= 0
+                    ) {
+                        endCounter.addNextChar()
+                    } else if (availableWidth - startCounter.widthWithNextChar() - endCounter.width >= 0) {
+                        startCounter.addNextChar()
+                    } else {
+                        break
+                    }
+                }
+                startCounter.string.trimEnd() + ellipsisText + endCounter.string.reversed().trimStart()
+            }
+            Text(
+                text = finalText,
+                color = color,
+                fontSize = fontSize,
+                fontStyle = fontStyle,
+                fontWeight = fontWeight,
+                fontFamily = fontFamily,
+                letterSpacing = letterSpacing,
+                textDecoration = textDecoration,
+                textAlign = textAlign,
+                lineHeight = lineHeight,
+                softWrap = softWrap,
+                onTextLayout = onTextLayout,
+                style = style,
+            )
+        }[0].measure(constraints)
+        layout(placeable.width, placeable.height) {
+            placeable.place(0, 0)
+        }
+    }
+}
+
+private const val ELLIPSIS_CHARACTERS_COUNT = 3
+private const val ELLIPSIS_CHARACTER = '.'
+private val ellipsisText = List(ELLIPSIS_CHARACTERS_COUNT) { ELLIPSIS_CHARACTER }.joinToString(separator = "")
+
+private class BoundCounter(
+    private val text: String,
+    private val textLayoutResult: TextLayoutResult,
+    private val charPosition: (Int) -> Int,
+) {
+    var string = ""
+        private set
+    var width = 0f
+        private set
+
+    private var _nextCharWidth: Float? = null
+    private var invalidCharsCount = 0
+
+    fun widthWithNextChar(): Float =
+        width + nextCharWidth()
+
+    private fun nextCharWidth(): Float =
+        _nextCharWidth ?: run {
+            var boundingBox: Rect
+            // invalidCharsCount fixes this bug: https://issuetracker.google.com/issues/197146630
+            invalidCharsCount--
+            do {
+                boundingBox = textLayoutResult
+                    .getBoundingBox(charPosition(string.count() + ++invalidCharsCount))
+            } while (boundingBox.right == 0f)
+            _nextCharWidth = boundingBox.width
+            boundingBox.width
+        }
+
+    fun addNextChar() {
+        string += text[charPosition(string.count())]
+        width += nextCharWidth()
+        _nextCharWidth = null
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
new file mode 100644
index 0000000000..0c4c0c3610
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
@@ -0,0 +1,70 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.sp
+
+@Suppress("MagicNumber")
+@Composable
+fun ResizableText(
+    text: String,
+    fontSizeRange: FontSizeRange,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified,
+    style: TextStyle = LocalTextStyle.current,
+) {
+    val fontSizeValue = remember { mutableStateOf(fontSizeRange.max.value) }
+    val readyToDraw = remember { mutableStateOf(false) }
+
+    val textState = remember { mutableStateOf(text) }
+    if (textState.value != text) {
+        readyToDraw.value = false
+        fontSizeValue.value = fontSizeRange.max.value
+        textState.value = text
+    }
+
+    Text(
+        modifier = modifier.drawWithContent { if (readyToDraw.value) drawContent() },
+        text = text,
+        color = color,
+        softWrap = false,
+        style = style,
+        fontSize = fontSizeValue.value.sp,
+        onTextLayout = {
+            if (it.hasVisualOverflow) {
+                val nextFontSizeValue = fontSizeValue.value - fontSizeRange.step.value
+                if (nextFontSizeValue <= fontSizeRange.min.value) {
+                    fontSizeValue.value = fontSizeRange.min.value
+                    readyToDraw.value = true
+                } else {
+                    fontSizeValue.value = nextFontSizeValue * 0.8f
+                }
+            } else {
+                readyToDraw.value = true
+            }
+        },
+    )
+}
+
+data class FontSizeRange(
+    val min: TextUnit,
+    val max: TextUnit,
+    val step: TextUnit = DEFAULT_TEXT_STEP,
+) {
+    init {
+        require(min < max) { "min should be less than max, $this" }
+        require(step.value > 0) { "step should be greater than 0, $this" }
+    }
+
+    companion object {
+        private val DEFAULT_TEXT_STEP = 1.sp
+    }
+}
\ 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 52%
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..15ba170e20 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("TooManyFunctions")
 
+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,16 @@ fun SpacerH8(modifier: Modifier = Modifier) {
     SpacerH(8.dp, modifier)
 }
 
+@Composable
+fun SpacerH10(modifier: Modifier = Modifier) {
+    SpacerH(10.dp, modifier)
+}
+
+@Composable
+fun SpacerH12(modifier: Modifier = Modifier) {
+    SpacerH(12.dp, modifier)
+}
+
 @Composable
 fun SpacerH16(modifier: Modifier = Modifier) {
     SpacerH(16.dp, modifier)
@@ -38,27 +66,66 @@ 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
+@Composable
+fun SpacerH50(modifier: Modifier = Modifier) {
+    SpacerH(50.dp, modifier)
+}
+
+// TODO: Refactor with context receivers
+@Composable
+fun ColumnScope.SpacerHMax(modifier: Modifier = Modifier) {
+    Spacer(modifier = modifier.weight(1f))
+}
+
+// TODO: Refactor with context receivers
+@Suppress("MagicNumber")
+@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))
 }
 
+@Composable
+fun SpacerW2(modifier: Modifier = Modifier) {
+    SpacerW(2.dp, modifier)
+}
+
 @Composable
 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)
 }
 
+@Composable
+fun SpacerW12(modifier: Modifier = Modifier) {
+    SpacerW(12.dp, modifier)
+}
+
 @Composable
 fun SpacerW16(modifier: Modifier = Modifier) {
     SpacerW(16.dp, modifier)
@@ -74,7 +141,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 +177,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/SuccessScreen.kt b/core/ui/src/main/java/com/tangem/core/ui/components/SuccessScreen.kt
new file mode 100644
index 0000000000..3e767ca2f5
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/SuccessScreen.kt
@@ -0,0 +1,192 @@
+package com.tangem.core.ui.components
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+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.fillMaxSize
+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.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+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.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * Screen for showing result
+ *
+ * @param resultMessage message to show
+ * @param title title to show
+ * @param resultColor color which will tint the round icon of the result
+ * @param icon icon to show in the middle of the round icon
+ * @param secondaryButtonIcon icon to show in the secondary button
+ * @param secondaryButtonText label of the secondary button
+ * @param onSecondaryButtonClick  action on clicking secondary button
+ * @param onButtonClick  action on clicking "Done" button
+ *
+ * @see <a href =
+ * "https://www.figma.com/file/Vs6SkVsFnUPsSCNwlnVf5U/Android-%E2%80%93-UI?node-id=1123%3A3863&t=wwR84h5IsMaMsDhq-1"
+ * >Figma component</a>
+ */
+@Composable
+fun ResultScreenContent(
+    resultMessage: AnnotatedString,
+    onButtonClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    @StringRes title: Int = R.string.common_success,
+    resultColor: Color = TangemTheme.colors.icon.accent,
+    @DrawableRes icon: Int = R.drawable.ic_check_24,
+    @DrawableRes secondaryButtonIcon: Int? = null,
+    @StringRes secondaryButtonText: Int? = null,
+    onSecondaryButtonClick: (() -> Unit)? = null,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .background(TangemTheme.colors.background.secondary)
+            .padding(
+                horizontal = TangemTheme.dimens.spacing16,
+                vertical = TangemTheme.dimens.spacing32,
+            ),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        SpacerHHalf()
+        SuccessImage(resultColor = resultColor, icon = icon)
+        SpacerH50()
+        Text(
+            text = stringResource(id = title),
+            style = TangemTheme.typography.h2,
+            color = TangemTheme.colors.text.primary1,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth(),
+        )
+        SpacerH12()
+        Text(
+            text = resultMessage,
+            style = TangemTheme.typography.subtitle1,
+            color = TangemTheme.colors.text.secondary,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth(),
+        )
+        SpacerHHalf()
+        if (onSecondaryButtonClick != null && secondaryButtonText != null) {
+            SecondaryButtonForResultScreen(
+                secondaryButtonText = secondaryButtonText,
+                secondaryButtonIcon = secondaryButtonIcon,
+                onSecondaryButtonClick = onSecondaryButtonClick,
+            )
+            SpacerH12()
+        }
+        PrimaryButton(
+            text = stringResource(id = R.string.common_close),
+            modifier = Modifier
+                .fillMaxWidth(),
+            onClick = { onButtonClick() },
+        )
+    }
+}
+
+@Composable
+fun SuccessImage(
+    resultColor: Color,
+    @DrawableRes icon: Int,
+) {
+    Box(
+        modifier = Modifier
+            .background(
+                color = resultColor.copy(alpha = 0.2f),
+                shape = CircleShape,
+            ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Box(
+            modifier = Modifier
+                .padding(TangemTheme.dimens.spacing24)
+                .background(
+                    color = resultColor,
+                    shape = CircleShape,
+                )
+                .height(TangemTheme.dimens.size93)
+                .width(TangemTheme.dimens.size93),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                painter = painterResource(id = icon),
+                contentDescription = null,
+                tint = TangemTheme.colors.icon.primary2,
+                modifier = Modifier.size(TangemTheme.dimens.size40),
+            )
+        }
+    }
+}
+
+@Composable
+private fun SecondaryButtonForResultScreen(
+    @StringRes secondaryButtonText: Int,
+    onSecondaryButtonClick: () -> Unit,
+    @DrawableRes secondaryButtonIcon: Int? = null,
+) {
+    if (secondaryButtonIcon != null) {
+        SecondaryButtonIconLeft(
+            text = stringResource(id = secondaryButtonText),
+            icon = painterResource(id = secondaryButtonIcon),
+            onClick = onSecondaryButtonClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    } else {
+        SecondaryButton(
+            text = stringResource(id = secondaryButtonText),
+            onClick = onSecondaryButtonClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+// region preview
+
+@Composable
+private fun SuccessScreenPreview() {
+    ResultScreenContent(
+        resultMessage = AnnotatedString("Swap of 1 000 DAI to 1 131,46 MATIC"),
+        secondaryButtonText = R.string.swapping_success_view_explorer_button_title,
+        onSecondaryButtonClick = {},
+        onButtonClick = {},
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_SuccessScreenContent_InLightTheme() {
+    TangemTheme(isDark = false) {
+        SuccessScreenPreview()
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_SuccessScreenContent_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        SuccessScreenPreview()
+    }
+}
+
+// endregion preview
\ 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..6b9df80601
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
@@ -0,0 +1,416 @@
+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(
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
+    modifier: Modifier = Modifier,
+    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
+@Suppress("LongMethod")
+@Composable
+private fun TangemTextField(
+    value: TextFieldValue,
+    singleLine: Boolean,
+    onValueChange: (TextFieldValue) -> Unit,
+    modifier: Modifier = Modifier,
+    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 = TangemTheme.typography.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 = TangemTheme.typography.caption,
+                        color = colors.labelColor(
+                            enabled = enabled,
+                            error = isError,
+                            interactionSource = interactionSource,
+                        ).value,
+                    )
+                }
+            },
+            placeholder = {
+                if (!placeholder.isNullOrEmpty()) {
+                    Text(
+                        text = placeholder,
+                        style = TangemTheme.typography.body1,
+                        color = colors.placeholderColor(enabled = enabled).value,
+                    )
+                }
+            },
+            trailingIcon = {
+                val iconRes by rememberUpdatedState(
+                    newValue = if (isError) R.drawable.ic_alert_24 else R.drawable.ic_close_24,
+                )
+                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
+}
+
+internal 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
+internal 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)
+    }
+
+    @Suppress("TopLevelComposableFunctions")
+    @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/Warnings.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Warnings.kt
new file mode 100644
index 0000000000..d8293a9868
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Warnings.kt
@@ -0,0 +1,188 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Card
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+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
+
+/**
+ * A card with a warning icon to the left and title with description shown to the right of it.
+ *
+ * @param title title of the warning in bold
+ * @param description description of the warning
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=290%3A217&t=yMepJZTRh5bLkOoJ-1"
+ * >Figma component</a>
+ */
+@Composable
+fun WarningCard(
+    title: String,
+    description: String,
+    icon: @Composable (() -> Unit)? = null,
+) {
+    WarningCardSurface(
+        content = {
+            WarningBody(
+                title = title,
+                description = description,
+                icon = icon,
+            )
+        },
+    )
+}
+
+/**
+ * [WarningCard], but clickable (with an 'greater then' icon to the left)
+ *
+ * @param title title of the warning in bold
+ * @param description description of the warning
+ * @param onClick action to be performed when warning is clicked
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=402%3A528&t=yMepJZTRh5bLkOoJ-1"
+ * >Figma component</a>
+ */
+@Composable
+fun ClickableWarningCard(
+    title: String,
+    description: String,
+    icon: @Composable (() -> Unit)? = null,
+    onClick: () -> Unit,
+) {
+    WarningCardSurface(
+        content = {
+            WarningBody(title = title, description = description, icon = icon) {
+                SpacerW12()
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_chevron_right_24),
+                    tint = TangemTheme.colors.icon.informative,
+                    contentDescription = null,
+                )
+            }
+        },
+        onClick = onClick,
+    )
+}
+
+/**
+ * [WarningCard], but clickable and with a 'refresh' icon at the right edge
+ *
+ * @param title title of the warning in bold
+ * @param description description of the warning
+ * @param onClick action to be performed when warning is clicked
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=290%3A217&t=yMepJZTRh5bLkOoJ-1"
+ * >Figma component</a>
+ */
+@Composable
+fun RefreshableWaringCard(
+    title: String,
+    description: String,
+    icon: @Composable (() -> Unit)? = null,
+    onClick: () -> Unit,
+) {
+    WarningCardSurface(
+        content = {
+            WarningBody(title = title, description = description, icon = icon) {
+                SpacerW12()
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_refresh_24),
+                    tint = TangemTheme.colors.icon.primary1,
+                    contentDescription = null,
+                )
+            }
+        },
+        onClick = onClick,
+    )
+}
+
+// region elements
+
+@Composable
+private fun WarningBody(
+    title: String,
+    description: String,
+    icon: @Composable (() -> Unit)? = null,
+    additionalContent: @Composable () -> Unit = {},
+) {
+    IconWithTitleAndDescription(
+        title = title,
+        description = description,
+        additionalContent = additionalContent,
+        icon = icon ?: {
+            Image(
+                painter = painterResource(id = R.drawable.img_attention_20),
+                contentDescription = null,
+            )
+        },
+    )
+}
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+private fun WarningCardSurface(
+    onClick: (() -> Unit)? = null,
+    content: @Composable () -> Unit,
+) {
+    Card(
+        shape = RoundedCornerShape(TangemTheme.dimens.size12),
+        backgroundColor = TangemTheme.colors.background.primary,
+        elevation = TangemTheme.dimens.elevation2,
+        onClick = onClick ?: {},
+        enabled = onClick != null,
+    ) {
+        content()
+    }
+}
+
+// endregion elements
+
+// region Preview
+
+@Composable
+private fun WarningsPreview() {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        WarningCard(
+            title = "Exchange rate has expired",
+            description = "To access all the networks, you need to scan the card.",
+        )
+        SpacerH32()
+        ClickableWarningCard(
+            title = "Exchange rate has expired",
+            description = "To access all the networks, you need to scan the card.",
+            onClick = {},
+        )
+        SpacerH32()
+        RefreshableWaringCard(
+            title = "Exchange rate has expired",
+            description = "To access all the networks, you need to scan the card.",
+            onClick = {},
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_Warning_InLightTheme() {
+    TangemTheme(isDark = false) {
+        WarningsPreview()
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_Warning_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        WarningsPreview()
+    }
+}
+
+// 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..1b910ca269
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithAdditionalButtons.kt
@@ -0,0 +1,163 @@
+package com.tangem.core.ui.components.appbar
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+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.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.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.appbar.models.AdditionalButton
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * 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()
+            .heightIn(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 = TangemTheme.colors.icon.primary1,
+                )
+            }
+        }
+
+        Text(
+            text = text,
+            modifier = Modifier.align(Alignment.Center),
+            color = TangemTheme.colors.text.primary1,
+            maxLines = 1,
+            style = TangemTheme.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 = TangemTheme.colors.icon.primary1,
+                )
+            }
+        }
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private fun Preview_AppBarWithAdditionalButtons_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan_24,
+                onIconClicked = {},
+            ),
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical_24,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private fun Preview_AppBarWithAdditionalButtons_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan_24,
+                onIconClicked = {},
+            ),
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical_24,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private fun Preview_AppBarWithOnlyStartButtons_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan_24,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private fun Preview_AppBarWithOnlyStartButtons_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan_24,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private fun Preview_AppBarWithOnlyEndButtons_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical_24,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private fun Preview_AppBarWithOnlyEndButtons_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical_24,
+                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..855fcbbc34
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt
@@ -0,0 +1,78 @@
+package com.tangem.core.ui.components.appbar
+
+import androidx.annotation.DrawableRes
+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.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(
+    onBackClick: () -> Unit,
+    text: String? = null,
+    @DrawableRes iconRes: Int? = null,
+) {
+    Row(
+        modifier = Modifier
+            .background(color = TangemTheme.colors.background.secondary)
+            .fillMaxWidth()
+            .padding(all = dimensionResource(R.dimen.spacing16)),
+        horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing16)),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            painter = painterResource(iconRes ?: R.drawable.ic_back_24),
+            contentDescription = null,
+            modifier = Modifier
+                .size(size = dimensionResource(R.dimen.size24))
+                .clickable { onBackClick() },
+            tint = TangemTheme.colors.icon.primary1,
+        )
+        if (!text.isNullOrBlank()) {
+            Text(
+                text = text,
+                color = TangemTheme.colors.text.primary1,
+                maxLines = 1,
+                style = TangemTheme.typography.subtitle1,
+            )
+        }
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private fun PreviewAppBarWithBackButtonInLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithBackButton(text = "Title", onBackClick = {})
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+private 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/AppBarWithSearch.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
new file mode 100644
index 0000000000..b10c630c32
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
@@ -0,0 +1,267 @@
+package com.tangem.core.ui.components.appbar
+
+import androidx.compose.animation.Crossfade
+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.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+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.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.SpacerWMax
+import com.tangem.core.ui.components.TangemTextFieldsDefault
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * App bar with close icon and search functionality
+ *
+ * @param title optional title
+ * @param placeholderSearchText optional text placeholder for search TextField
+ * @param expandedInitially whether the search is expanded on launch
+ * @param tint tint for most of the visual elements of toolbar
+ * @param onBackClick action when close button is clicked
+ * @param onSearchChange action when search is modified
+ * @param onSearchDisplayClose action when search is closed
+ * @param subtitle additional text under the title (optional)
+ * @param icon additional icon under the title (optional)
+ *
+ * @see <a href =
+ * "https://www.figma.com/file/Vs6SkVsFnUPsSCNwlnVf5U/Android-%E2%80%93-UI?node-id=1123%3A4068&t=xj8BBj5DfCWn2Mli-1"
+ * >Figma component</a>
+ */
+@Composable
+fun ExpandableSearchView(
+    onBackClick: () -> Unit,
+    onSearchChange: (String) -> Unit,
+    onSearchDisplayClose: () -> Unit,
+    title: String? = null,
+    placeholderSearchText: String = "",
+    expandedInitially: Boolean = false,
+    tint: Color = TangemTheme.colors.icon.primary1,
+    subtitle: String? = null,
+    icon: Painter? = null,
+) {
+    val (expanded, onExpandedChanged) = remember { mutableStateOf(expandedInitially) }
+
+    Crossfade(targetState = expanded) { isSearchFieldVisible ->
+        if (isSearchFieldVisible) {
+            ExpandedSearchView(
+                placeholderSearchText = placeholderSearchText,
+                onSearchChange = onSearchChange,
+                onSearchDisplayClose = onSearchDisplayClose,
+                onExpandedChange = onExpandedChanged,
+                tint = tint,
+            )
+        } else {
+            CollapsedSearchView(
+                title = title,
+                onBackClick = onBackClick,
+                onExpandedChange = onExpandedChanged,
+                tint = tint,
+                subtitle = subtitle,
+                icon = icon,
+            )
+        }
+    }
+}
+
+@Composable
+private fun CollapsedSearchView(
+    tint: Color,
+    onBackClick: () -> Unit,
+    onExpandedChange: (Boolean) -> Unit,
+    title: String? = null,
+    subtitle: String? = null,
+    icon: Painter? = null,
+) {
+    Row(
+        modifier = Modifier
+            .background(TangemTheme.colors.background.secondary)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_close_24),
+            contentDescription = null,
+            modifier = Modifier
+                .padding(TangemTheme.dimens.spacing16)
+                .size(TangemTheme.dimens.size24)
+                .clickable { onBackClick() },
+            tint = MaterialTheme.colors.onPrimary,
+        )
+        Column(
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.Start,
+        ) {
+            if (!title.isNullOrBlank()) {
+                Text(
+                    text = title,
+                    color = TangemTheme.colors.text.primary1,
+                    maxLines = 1,
+                    style = TangemTheme.typography.subtitle1,
+                    modifier = Modifier.defaultMinSize(minHeight = TangemTheme.dimens.size24),
+                )
+            }
+            if (subtitle != null) {
+                SubtitleView(subtitle = subtitle, icon = icon)
+            }
+        }
+
+        SpacerWMax()
+        Icon(
+            painter = painterResource(id = R.drawable.ic_search_24),
+            tint = tint,
+            contentDescription = null,
+            modifier = Modifier
+                .clickable { onExpandedChange(true) }
+                .padding(end = TangemTheme.dimens.spacing16),
+        )
+    }
+}
+
+@Composable
+private fun SubtitleView(subtitle: String, icon: Painter?) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing4),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        icon?.let {
+            Image(
+                painter = icon,
+                contentDescription = null,
+                modifier = Modifier.size(TangemTheme.dimens.size16),
+            )
+        }
+        Text(
+            text = subtitle,
+            color = TangemTheme.colors.text.secondary,
+            maxLines = 1,
+            style = TangemTheme.typography.caption,
+        )
+    }
+}
+
+@Composable
+private fun ExpandedSearchView(
+    placeholderSearchText: String,
+    onSearchChange: (String) -> Unit,
+    onSearchDisplayClose: () -> Unit,
+    onExpandedChange: (Boolean) -> Unit,
+    tint: Color,
+) {
+    val focusManager = LocalFocusManager.current
+    val textFieldFocusRequester = remember { FocusRequester() }
+
+    SideEffect {
+        textFieldFocusRequester.requestFocus()
+    }
+
+    var textFieldValue by remember { mutableStateOf(TextFieldValue("", TextRange("".length))) }
+
+    Row(
+        modifier = Modifier
+            .background(TangemTheme.colors.background.secondary)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.Start,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        IconButton(
+            onClick = {
+                onExpandedChange(false)
+                onSearchDisplayClose()
+            },
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_back_24),
+                contentDescription = null,
+                tint = tint,
+            )
+        }
+        TextField(
+            value = textFieldValue,
+            onValueChange = {
+                textFieldValue = it
+                onSearchChange(it.text)
+            },
+            singleLine = true,
+            modifier = Modifier
+                .fillMaxWidth()
+                .focusRequester(textFieldFocusRequester),
+            placeholder = {
+                Text(text = placeholderSearchText)
+            },
+            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+            keyboardActions = KeyboardActions(
+                onDone = { focusManager.clearFocus() },
+            ),
+            colors = TangemTextFieldsDefault.defaultTextFieldColors.copy(
+                placeholderColor = TangemTheme.colors.text.disabled,
+                cursorColor = TangemTheme.colors.text.tertiary,
+                focusedIndicatorColor = Color.Transparent,
+                unfocusedIndicatorColor = Color.Transparent,
+                disabledIndicatorColor = Color.Transparent,
+            ),
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun CollapsedSearchViewPreview() {
+    TangemTheme {
+        ExpandableSearchView(
+            title = "Choose Token",
+            onBackClick = {},
+            placeholderSearchText = "Search",
+            onSearchChange = {},
+            onSearchDisplayClose = {},
+            subtitle = "Ethereum",
+            icon = painterResource(id = R.drawable.img_eth_22),
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun ExpandedSearchViewPreview() {
+    TangemTheme {
+        ExpandableSearchView(
+            title = "Choose Token",
+            onBackClick = {},
+            placeholderSearchText = "Search",
+            onSearchChange = {},
+            expandedInitially = true,
+            onSearchDisplayClose = {},
+        )
+    }
+}
\ 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/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/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
new file mode 100644
index 0000000000..ae4d3a5c93
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
@@ -0,0 +1,75 @@
+package com.tangem.core.ui.extensions
+
+import androidx.annotation.DrawableRes
+import com.tangem.core.ui.R
+
+@Suppress("ComplexMethod")
+@DrawableRes
+fun getActiveIconRes(blockchainId: String): Int {
+    return when (blockchainId) {
+        "ARBITRUM-ONE", "ARBITRUM/test" -> R.drawable.img_arbitrum_22
+        "BTC", "BTC/test" -> R.drawable.img_btc_22
+        "BCH" -> R.drawable.img_btc_cash_22
+        "LTC" -> R.drawable.img_litecoin_22
+        "ETH", "ETH/test" -> R.drawable.img_eth_22
+        "ETC", "ETC/test" -> R.drawable.img_eth_classic_22
+        "RSK" -> R.drawable.img_rsk_22
+        "CARDANO", "CARDANO-S" -> R.drawable.img_cardano_22
+        "XTZ" -> R.drawable.img_tezos_22
+        "XRP" -> R.drawable.img_xrp_22
+        "XLM", "XLM/test" -> R.drawable.img_stellar_22
+        "AVALANCHE", "AVALANCHE/test" -> R.drawable.img_avalanche_22
+        "POLYGON", "POLYGON/test" -> R.drawable.img_polygon_22
+        "SOLANA", "SOLANA/test" -> R.drawable.img_solana_22
+        "FTM", "FTM/test" -> R.drawable.img_fantom_22
+        "BSC", "BSC/test", "BINANCE", "BINANCE/test" -> R.drawable.img_bsc_22
+        "DOGE" -> R.drawable.img_dogecoin_22
+        "TRON", "TRON/test" -> R.drawable.img_tron_22
+        "GNO" -> R.drawable.img_gnosis_22
+        "ETH-Pow", "ETH-Pow/test" -> R.drawable.img_eth_pow_22
+        "ETH-Fair" -> R.drawable.img_eth_fair_22
+        "Polkadot", "Polkadot/test" -> R.drawable.img_polkadot_22
+        "Kusama" -> R.drawable.img_kusama_22
+        "OPTIMISM", "OPTIMISM/test" -> R.drawable.img_optimism_22
+        "DASH" -> R.drawable.img_dash_22
+        else -> R.drawable.ic_alert_24
+    }
+}
+
+@Suppress("ComplexMethod")
+@DrawableRes
+fun getActiveIconResByCoinId(coinId: String, networkId: String): Int {
+    return when (coinId) {
+        "binancecoin" -> R.drawable.img_bsc_22
+        "bitcoin" -> R.drawable.img_btc_22
+        "bitcoin-cash" -> R.drawable.img_btc_cash_22
+        "ethereum" -> {
+            when (networkId) {
+                "ethereum" -> R.drawable.img_eth_22
+                "arbitrum-one" -> R.drawable.img_arbitrum_22
+                "optimistic-ethereum" -> R.drawable.img_optimism_22
+                else -> R.drawable.ic_alert_24
+            }
+        }
+        "ethereum-classic" -> R.drawable.img_eth_classic_22
+        "stellar" -> R.drawable.img_stellar_22
+        "cardano" -> R.drawable.img_cardano_22
+        "matic-network" -> R.drawable.img_polygon_22
+        "avalanche-2" -> R.drawable.img_avalanche_22
+        "solana" -> R.drawable.img_solana_22
+        "fantom" -> R.drawable.img_fantom_22
+        "tron" -> R.drawable.img_tron_22
+        "polkadot" -> R.drawable.img_polkadot_22
+        "litecoin" -> R.drawable.img_litecoin_22
+        "rootstock" -> R.drawable.img_rsk_22
+        "tezos" -> R.drawable.img_tezos_22
+        "ripple" -> R.drawable.img_xrp_22
+        "dogecoin" -> R.drawable.img_dogecoin_22
+        "xdai" -> R.drawable.img_gnosis_22
+        "ethereum-pow-iou" -> R.drawable.img_eth_pow_22
+        "ethereumfair" -> R.drawable.img_eth_fair_22
+        "kusama" -> R.drawable.img_kusama_22
+        "dash" -> R.drawable.img_dash_22
+        else -> R.drawable.ic_alert_24
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeBottomSheetFragment.kt b/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeBottomSheetFragment.kt
new file mode 100644
index 0000000000..f4759a6ed8
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeBottomSheetFragment.kt
@@ -0,0 +1,81 @@
+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(
+                        state = provideState().value,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .let {
+                                if (expandedHeightFraction != null) it.fillMaxHeight(expandedHeightFraction!!) else it
+                            }
+                            .background(
+                                color = TangemTheme.colors.background.plain,
+                                shape = TangemTheme.shapes.bottomSheet,
+                            ),
+                    )
+                }
+            }
+        }
+    }
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    protected abstract fun provideState(): State<ScreenState>
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    protected abstract fun ScreenContent(
+        state: ScreenState,
+        modifier: Modifier,
+    )
+}
\ 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..6b6865094a
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeFragment.kt
@@ -0,0 +1,56 @@
+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(
+                        state = provideState().value,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .background(color = backgroundColor),
+                    )
+                }
+            }
+        }
+    }
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    protected abstract fun provideState(): State<ScreenState>
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    protected abstract fun ScreenContent(state: ScreenState, modifier: Modifier)
+}
\ 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/ButtonColorType.kt b/core/ui/src/main/java/com/tangem/core/ui/res/ButtonColorType.kt
new file mode 100644
index 0000000000..5eb3a3fcff
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/ButtonColorType.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 (IS_SYSTEM_IN_DARK_THEME) type.darkColor else type.lightColor
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.kt b/core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.kt
new file mode 100644
index 0000000000..9fa83581b6
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.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 (IS_SYSTEM_IN_DARK_THEME) 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..8dc45fd453
--- /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("LongParameterList")
+@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..4e453421ae
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
@@ -0,0 +1,89 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+@Suppress("ConstructorParameterNaming")
+@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 radius3: Dp = 3.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 size0_5: Dp = 0.5.dp,
+    val size2: Dp = 2.dp,
+    val size4: Dp = 4.dp,
+    val size8: Dp = 8.dp,
+    val size11: Dp = 11.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 size36: Dp = 36.dp,
+    val size40: Dp = 40.dp,
+    val size42: Dp = 42.dp,
+    val size44: Dp = 44.dp,
+    val size46: Dp = 46.dp,
+    val size48: Dp = 48.dp,
+    val size50: Dp = 50.dp,
+    val size56: Dp = 56.dp,
+    val size62: Dp = 62.dp,
+    val size72: Dp = 72.dp,
+    val size80: Dp = 80.dp,
+    val size84: Dp = 84.dp,
+    val size86: Dp = 86.dp,
+    val size93: Dp = 93.dp,
+    val size96: Dp = 96.dp,
+    val size102: Dp = 102.dp,
+    val size116: Dp = 116.dp,
+    val size142: Dp = 142.dp,
+    val size164: Dp = 164.dp,
+    val size200: Dp = 200.dp,
+    // endregion Size
+    // region Spacing
+    val spacing0_5: Dp = 0.5.dp,
+    val spacing2: Dp = 2.dp,
+    val spacing4: Dp = 4.dp,
+    val spacing6: Dp = 6.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 spacing28: Dp = 28.dp,
+    val spacing32: Dp = 32.dp,
+    val spacing34: Dp = 34.dp,
+    val spacing44: Dp = 44.dp,
+    val spacing50: Dp = 50.dp,
+    val spacing52: Dp = 52.dp,
+    val spacing54: Dp = 54.dp,
+    val spacing56: Dp = 56.dp,
+    val spacing92: Dp = 92.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..8239973f6a
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
@@ -0,0 +1,201 @@
+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
+
+// TODO: use isSystemInDarkTheme() for automatic color detection
+internal const val IS_SYSTEM_IN_DARK_THEME: Boolean = false
+
+@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/TextColorType.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TextColorType.kt
new file mode 100644
index 0000000000..5b726844aa
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TextColorType.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 (IS_SYSTEM_IN_DARK_THEME) type.darkColor else type.lightColor
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/InputFormatting.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/InputFormatting.kt
new file mode 100644
index 0000000000..2a1b531fc5
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/InputFormatting.kt
@@ -0,0 +1,27 @@
+package com.tangem.core.ui.utils
+
+/**
+ * Formats input [String] for InputField, to remove wrong symbols, letters etc
+ * Use [decimals] for cut this number symbols after floating point
+ *
+ * Example (with 8 decimals):
+ * input string - ab123.46377372ab53
+ * result string 123.46377372
+ */
+fun getValidatedNumberWithFixedDecimals(text: String, decimals: Int): String {
+    val filteredChars = text.filterIndexed { index, c ->
+        val isOneOrZeroPoint = c == '.' && index != 0 && text.count { it == '.' } <= 1
+        val isIndexPointIndex = c == '.' && index != 0 && text.indexOf('.') == index
+        c.isDigit() || isIndexPointIndex || isOneOrZeroPoint
+    }
+    // If dot is present, take first 3 digits before decimal and first decimals digits after decimal
+    return if (filteredChars.count { it == '.' } == 1) {
+        val beforeDecimal = filteredChars.substringBefore('.')
+        val afterDecimal = filteredChars.substringAfter('.')
+        beforeDecimal + "." + afterDecimal.take(decimals)
+    }
+    // If there is no dot, just take all digits
+    else {
+        filteredChars
+    }
+}
\ 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_24.xml b/core/ui/src/main/res/drawable/ic_alert_24.xml
new file mode 100644
index 0000000000..1d855289ee
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_alert_24.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/core/ui/src/main/res/drawable/ic_arrow_down_24.xml b/core/ui/src/main/res/drawable/ic_arrow_down_24.xml
new file mode 100644
index 0000000000..90afd396ed
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_arrow_down_24.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.08,4.08L13.08,4.08V16.08L18.58,10.58L20,12L12.08,19.92L4.16,12L5.58,10.58L11.08,16.08L11.08,4.08Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_arrow_top_right_24.xml b/core/ui/src/main/res/drawable/ic_arrow_top_right_24.xml
new file mode 100644
index 0000000000..e23e12a295
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_arrow_top_right_24.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="M5,17.59L15.59,7H9V5H19V15H17V8.41L6.41,19L5,17.59Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_arrow_up_24.xml b/core/ui/src/main/res/drawable/ic_arrow_up_24.xml
new file mode 100644
index 0000000000..57f3613ff6
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_arrow_up_24.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="M13.08,19.92H11.08L11.08,7.92L5.58,13.42L4.16,12L12.08,4.08L20,12L18.58,13.42L13.08,7.92V19.92Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/core/ui/src/main/res/drawable/ic_back_24.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_back.xml
rename to core/ui/src/main/res/drawable/ic_back_24.xml
diff --git a/core/ui/src/main/res/drawable/ic_check_24.xml b/core/ui/src/main/res/drawable/ic_check_24.xml
new file mode 100644
index 0000000000..d3e69cbd22
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_check_24.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="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_plus.xml b/core/ui/src/main/res/drawable/ic_chevron_24.xml
similarity index 61%
rename from app/src/main/res/drawable/ic_plus.xml
rename to core/ui/src/main/res/drawable/ic_chevron_24.xml
index e8b4a25be1..19898141ba 100644
--- a/app/src/main/res/drawable/ic_plus.xml
+++ b/core/ui/src/main/res/drawable/ic_chevron_24.xml
@@ -1,5 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" />
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_chevron_right_24.xml b/core/ui/src/main/res/drawable/ic_chevron_right_24.xml
new file mode 100644
index 0000000000..1bb30766a3
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_chevron_right_24.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="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_clock_24.xml b/core/ui/src/main/res/drawable/ic_clock_24.xml
new file mode 100644
index 0000000000..f2dc1c7357
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_clock_24.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="M12,20C14.122,20 16.157,19.157 17.657,17.657C19.157,16.157 20,14.122 20,12C20,9.878 19.157,7.843 17.657,6.343C16.157,4.843 14.122,4 12,4C9.878,4 7.843,4.843 6.343,6.343C4.843,7.843 4,9.878 4,12C4,14.122 4.843,16.157 6.343,17.657C7.843,19.157 9.878,20 12,20ZM12,2C13.313,2 14.614,2.259 15.827,2.761C17.04,3.264 18.142,4 19.071,4.929C20,5.858 20.736,6.96 21.239,8.173C21.741,9.386 22,10.687 22,12C22,14.652 20.946,17.196 19.071,19.071C17.196,20.946 14.652,22 12,22C6.47,22 2,17.5 2,12C2,9.348 3.054,6.804 4.929,4.929C6.804,3.054 9.348,2 12,2ZM12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_close_24.xml b/core/ui/src/main/res/drawable/ic_close_24.xml
new file mode 100644
index 0000000000..ffc64fb7a8
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_close_24.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_24.xml b/core/ui/src/main/res/drawable/ic_copy_24.xml
new file mode 100644
index 0000000000..d01cdf9823
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_copy_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: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_28.xml b/core/ui/src/main/res/drawable/ic_discount_28.xml
new file mode 100644
index 0000000000..5045eccd5b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_discount_28.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_exchange_vertical_24.xml b/core/ui/src/main/res/drawable/ic_exchange_vertical_24.xml
new file mode 100644
index 0000000000..ddc06b2448
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_exchange_vertical_24.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="M9,3L5,7H8V14H10V7H13M16,17V10H14V17H11L15,21L19,17H16Z" />
+</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_locked_24.xml b/core/ui/src/main/res/drawable/ic_locked_24.xml
new file mode 100644
index 0000000000..565e084d7c
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_locked_24.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="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/core/ui/src/main/res/drawable/ic_more_vertical_24.xml b/core/ui/src/main/res/drawable/ic_more_vertical_24.xml
new file mode 100644
index 0000000000..9f5887ceb4
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_more_vertical_24.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_24.xml b/core/ui/src/main/res/drawable/ic_plus_24.xml
new file mode 100644
index 0000000000..b85852c706
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_plus_24.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/core/ui/src/main/res/drawable/ic_refresh_24.xml b/core/ui/src/main/res/drawable/ic_refresh_24.xml
new file mode 100644
index 0000000000..c859856a15
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_refresh_24.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="M17.65,6.35C16.2,4.9 14.21,4 12,4C9.878,4 7.843,4.843 6.343,6.343C4.843,7.843 4,9.878 4,12C4,14.122 4.843,16.157 6.343,17.657C7.843,19.157 9.878,20 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18C10.409,18 8.883,17.368 7.757,16.243C6.632,15.117 6,13.591 6,12C6,10.409 6.632,8.883 7.757,7.757C8.883,6.632 10.409,6 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_scan.xml b/core/ui/src/main/res/drawable/ic_scan_24.xml
similarity index 94%
rename from app/src/main/res/drawable/ic_scan.xml
rename to core/ui/src/main/res/drawable/ic_scan_24.xml
index 1e4cd949d6..31f4345be7 100644
--- a/app/src/main/res/drawable/ic_scan.xml
+++ b/core/ui/src/main/res/drawable/ic_scan_24.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_search_24.xml b/core/ui/src/main/res/drawable/ic_search_24.xml
new file mode 100644
index 0000000000..0e1e91bcd9
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_search_24.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="M9.5,3C11.224,3 12.877,3.685 14.096,4.904C15.315,6.123 16,7.776 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16C7.776,16 6.123,15.315 4.904,14.096C3.685,12.877 3,11.224 3,9.5C3,7.776 3.685,6.123 4.904,4.904C6.123,3.685 7.776,3 9.5,3ZM9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_share_24.xml b/core/ui/src/main/res/drawable/ic_share_24.xml
new file mode 100644
index 0000000000..e35c52d223
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_share_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: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/core/ui/src/main/res/drawable/ic_tangem_24.xml b/core/ui/src/main/res/drawable/ic_tangem_24.xml
new file mode 100644
index 0000000000..04c194fb62
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_tangem_24.xml
@@ -0,0 +1,16 @@
+<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="M4,3.9C4,3.403 4.421,3 4.941,3H19.059C19.579,3 20,3.403 20,3.9V8.4H4V3.9Z" />
+  <path
+      android:fillColor="#000000"
+      android:pathData="M4,12H9.647V21H4.941C4.421,21 4,20.597 4,20.1V12Z" />
+  <path
+      android:fillColor="#000000"
+      android:pathData="M20,12H14.353V21H19.059C19.579,21 20,20.597 20,20.1V12Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_tether_28.xml b/core/ui/src/main/res/drawable/ic_tether_28.xml
new file mode 100644
index 0000000000..e3f94b5dbb
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_tether_28.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/drawable/img_arbitrum_22.xml b/core/ui/src/main/res/drawable/img_arbitrum_22.xml
new file mode 100644
index 0000000000..db6401d732
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_arbitrum_22.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#2C374B"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#24A2EE"
+        android:pathData="M16.549,12.947L13.628,8.469L12.557,10.221L15.38,14.797L16.646,14.212L16.549,12.947Z" />
+    <path
+        android:fillColor="#24A2EE"
+        android:pathData="M15.186,15.38L12.266,10.903L11,12.849L13.336,16.549L14.797,15.965L15.186,15.38Z" />
+    <path
+        android:fillColor="#98BCDC"
+        android:fillType="evenOdd"
+        android:pathData="M5.646,7.885L11,4.77L16.354,7.885V14.115L11,17.23L7.009,14.991L7,16L10.903,18.398C11,18.496 11.097,18.496 11.195,18.398L17.327,14.894C17.425,14.797 17.522,14.699 17.522,14.602V7.593C17.522,7.496 17.425,7.398 17.327,7.301L11.195,3.797C11.097,3.699 11,3.699 10.903,3.797L4.77,7.204C4.673,7.301 4.575,7.398 4.575,7.496V14.505C4.575,14.602 4.673,14.699 4.77,14.797L6,15.5L6.5,14.5L5.743,14.115V7.885H5.646Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.336,7.96H11.292L6.522,15.748L8.177,16.721L13.336,7.96Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.177,8.664C8.664,7.885 10.027,7.885 10.611,7.982L6,15.5C5.805,15.403 5.354,15.186 5.062,14.991C4.673,14.797 4.575,14.797 4.575,14.504V14.115C5.646,12.557 7.69,9.442 8.177,8.664Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_attention_20.xml b/core/ui/src/main/res/drawable/img_attention_20.xml
new file mode 100644
index 0000000000..6c88899401
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_attention_20.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:autoMirrored="true"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#FFB71B"
+        android:pathData="M3.693,17.129H16.307C17.69,17.129 18.529,16.169 18.529,14.924C18.529,14.541 18.415,14.142 18.211,13.784L11.896,2.782C11.473,2.041 10.749,1.667 10,1.667C9.251,1.667 8.519,2.041 8.104,2.782L1.789,13.784C1.569,14.151 1.471,14.541 1.471,14.924C1.471,16.169 2.31,17.129 3.693,17.129Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.341,11.017C9.349,11.449 9.585,11.693 10.008,11.693C10.407,11.693 10.643,11.457 10.651,11.017L10.773,6.598C10.781,6.167 10.439,5.85 10,5.85C9.544,5.85 9.227,6.159 9.235,6.59L9.341,11.017Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.097,13.548C9.097,14.028 9.52,14.419 10.008,14.419C10.488,14.419 10.911,14.036 10.911,13.548C10.911,13.052 10.496,12.669 10.008,12.669C9.512,12.669 9.097,13.06 9.097,13.548Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_avalanche_22.xml b/core/ui/src/main/res/drawable/img_avalanche_22.xml
new file mode 100644
index 0000000000..ce6d69f6c0
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_avalanche_22.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#E74142"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M7.886,15.378H5.752C5.303,15.378 5.081,15.378 4.946,15.292C4.8,15.197 4.711,15.041 4.7,14.868C4.692,14.708 4.803,14.514 5.025,14.125L10.296,4.834C10.52,4.439 10.634,4.242 10.777,4.169C10.931,4.09 11.115,4.09 11.269,4.169C11.412,4.242 11.525,4.439 11.75,4.834L12.833,6.725L12.839,6.735C13.081,7.158 13.204,7.373 13.257,7.598C13.317,7.844 13.317,8.103 13.257,8.349C13.203,8.576 13.082,8.792 12.836,9.222L10.067,14.116L10.06,14.129C9.816,14.556 9.693,14.772 9.521,14.935C9.335,15.114 9.111,15.243 8.865,15.316C8.64,15.378 8.389,15.378 7.886,15.378ZM13.278,15.378H16.336C16.788,15.378 17.015,15.378 17.15,15.289C17.296,15.195 17.388,15.035 17.396,14.862C17.404,14.708 17.295,14.521 17.083,14.155C17.076,14.142 17.068,14.129 17.061,14.116L15.528,11.495L15.511,11.466C15.296,11.102 15.187,10.918 15.047,10.847C14.894,10.768 14.712,10.768 14.558,10.847C14.418,10.92 14.304,11.111 14.08,11.498L12.553,14.119L12.548,14.128C12.325,14.514 12.213,14.707 12.221,14.865C12.232,15.038 12.321,15.197 12.467,15.292C12.599,15.378 12.826,15.378 13.278,15.378Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_binance_22.xml b/core/ui/src/main/res/drawable/img_binance_22.xml
new file mode 100644
index 0000000000..e54d84d8a5
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_binance_22.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#F3BA2F"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M8.33,9.903L11,7.233L13.672,9.905L15.225,8.351L11,4.125L6.775,8.35L8.33,9.903ZM4.124,11.001L5.677,9.447L7.231,11.001L5.677,12.554L4.124,11.001ZM11,14.769L8.329,12.098L6.773,13.65L6.775,13.652L11,17.876L15.225,13.65L15.226,13.649L13.672,12.097L11,14.769ZM14.767,11.001L16.321,9.448L17.875,11.001L16.321,12.555L14.767,11.001ZM11,9.422L12.576,10.999H12.578L12.576,11L11,12.578L9.425,11.003L9.422,10.999L9.425,10.997L9.7,10.721L9.835,10.588L11,9.422Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_bsc_22.xml b/core/ui/src/main/res/drawable/img_bsc_22.xml
new file mode 100644
index 0000000000..4aa4221fd0
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_bsc_22.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#F0B90B"
+        android:pathData="M6.046,11L6.054,13.909L8.525,15.363V17.066L4.607,14.768V10.149L6.046,11ZM6.046,8.091V9.786L4.606,8.935V7.24L6.046,6.388L7.492,7.24L6.046,8.091ZM9.557,7.24L10.997,6.388L12.443,7.24L10.997,8.091L9.557,7.24Z" />
+    <path
+        android:fillColor="#F0B90B"
+        android:pathData="M7.086,13.306V11.603L8.525,12.454V14.149L7.086,13.306ZM9.557,15.973L10.996,16.824L12.443,15.973V17.668L10.996,18.519L9.557,17.668V15.973ZM14.507,7.24L15.946,6.388L17.393,7.24V8.935L15.946,9.786V8.091L14.507,7.24ZM15.946,13.909L15.954,11L17.394,10.149V14.767L13.476,17.065V15.362L15.946,13.909Z" />
+    <path
+        android:fillColor="#F0B90B"
+        android:pathData="M14.914,13.306L13.475,14.149V12.454L14.914,11.603V13.306Z" />
+    <path
+        android:fillColor="#F0B90B"
+        android:pathData="M14.914,8.694L14.922,10.397L12.444,11.851V14.767L11.004,15.611L9.565,14.767V11.851L7.087,10.397V8.694L8.532,7.843L10.996,9.304L13.474,7.843L14.92,8.694H14.914ZM7.086,5.786L10.997,3.481L14.914,5.786L13.475,6.638L10.997,5.177L8.525,6.638L7.086,5.786Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_btc_22.xml b/core/ui/src/main/res/drawable/img_btc_22.xml
new file mode 100644
index 0000000000..7624b7c1ad
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_btc_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#F7931A"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15.85,9.433C16.069,7.969 14.955,7.182 13.431,6.658L13.925,4.675L12.718,4.374L12.237,6.304C11.92,6.225 11.594,6.151 11.27,6.077L11.755,4.134L10.548,3.833L10.053,5.815C9.791,5.755 9.533,5.696 9.283,5.634L9.284,5.628L7.619,5.212L7.298,6.501C7.298,6.501 8.194,6.706 8.175,6.719C8.664,6.841 8.752,7.165 8.737,7.421L8.174,9.68C8.208,9.688 8.252,9.701 8.3,9.72C8.26,9.71 8.217,9.699 8.172,9.688L7.383,12.852C7.323,13.001 7.171,13.224 6.83,13.139C6.842,13.157 5.952,12.92 5.952,12.92L5.353,14.302L6.924,14.693C7.216,14.767 7.503,14.843 7.784,14.915L7.285,16.921L8.491,17.222L8.985,15.237C9.315,15.327 9.634,15.409 9.947,15.487L9.454,17.462L10.661,17.763L11.161,15.761C13.219,16.15 14.767,15.993 15.418,14.132C15.943,12.633 15.392,11.769 14.309,11.205C15.098,11.023 15.692,10.504 15.85,9.433ZM13.092,13.3C12.719,14.799 10.196,13.988 9.378,13.785L10.04,11.128C10.858,11.333 13.482,11.737 13.092,13.3ZM13.466,9.411C13.125,10.775 11.025,10.082 10.344,9.912L10.944,7.502C11.626,7.672 13.82,7.989 13.466,9.411Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_btc_cash_22.xml b/core/ui/src/main/res/drawable/img_btc_cash_22.xml
new file mode 100644
index 0000000000..4b64ee0ba3
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_btc_cash_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#0AC18E"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.685,7.349C14.124,6.086 12.836,5.816 11.259,6.077L10.752,4.125L9.557,4.432L10.056,6.378C9.741,6.457 9.418,6.524 9.099,6.615L8.6,4.679L7.405,4.986L7.912,6.938C7.655,7.011 5.5,7.56 5.5,7.56L5.828,8.831C5.828,8.831 6.706,8.586 6.698,8.606C7.185,8.48 7.414,8.721 7.522,8.949L8.914,14.3C8.931,14.454 8.903,14.719 8.569,14.809C8.589,14.82 7.7,15.031 7.7,15.031L7.83,16.514C7.83,16.514 9.965,15.971 10.245,15.9L10.758,17.875L11.952,17.568L11.44,15.58C11.768,15.504 12.088,15.425 12.4,15.343L12.909,17.321L14.104,17.014L13.592,15.042C15.432,14.598 16.732,13.444 16.465,11.681C16.295,10.617 15.126,9.745 14.155,9.647C14.752,9.121 15.056,8.353 14.685,7.349ZM14.11,12.004C14.348,13.751 11.904,13.965 11.097,14.176L10.395,11.563C11.205,11.352 13.708,10.465 14.11,12.004ZM12.638,8.446C12.89,9.999 10.8,10.179 10.126,10.35L9.486,7.979C10.163,7.813 12.125,7.008 12.638,8.446Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_cardano_22.xml b/core/ui/src/main/res/drawable/img_cardano_22.xml
new file mode 100644
index 0000000000..bda1a6ce6b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_cardano_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#0033AD"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.826,4.491C11.135,4.33 11.511,4.703 11.347,5.011C11.252,5.262 10.892,5.329 10.707,5.138C10.512,4.954 10.576,4.591 10.826,4.491ZM7.511,4.848C7.698,4.771 7.935,4.943 7.916,5.147C7.936,5.369 7.665,5.532 7.474,5.426C7.221,5.328 7.25,4.918 7.511,4.848ZM14.302,5.433C14.009,5.397 13.962,4.937 14.244,4.844C14.463,4.738 14.663,4.938 14.695,5.145C14.649,5.322 14.501,5.484 14.302,5.433ZM8.265,6.26C8.578,6.062 9.025,6.356 8.977,6.72C8.961,7.087 8.473,7.3 8.198,7.052C7.932,6.857 7.972,6.409 8.265,6.26ZM13.044,6.47C13.184,6.11 13.75,6.099 13.909,6.449C14.066,6.722 13.873,7.06 13.593,7.152C13.222,7.221 12.87,6.821 13.044,6.47ZM10.427,7.132C10.424,6.822 10.706,6.592 11,6.571C11.195,6.61 11.408,6.693 11.491,6.89C11.647,7.161 11.509,7.535 11.227,7.66C11.098,7.732 10.946,7.705 10.806,7.696C10.591,7.591 10.41,7.385 10.427,7.132ZM5.497,7.583C5.783,7.407 6.168,7.728 6.06,8.038C6.001,8.307 5.639,8.416 5.433,8.245C5.212,8.084 5.247,7.698 5.497,7.583ZM16.084,7.582C16.327,7.394 16.727,7.61 16.698,7.916C16.715,8.195 16.369,8.406 16.128,8.262C15.863,8.143 15.835,7.735 16.084,7.582ZM11.814,8.138C12.214,7.994 12.69,8.167 12.918,8.523C13.219,8.96 13.059,9.624 12.592,9.875C12.108,10.171 11.401,9.92 11.222,9.379C11.019,8.896 11.315,8.29 11.814,8.138ZM9.465,8.186C9.908,7.976 10.506,8.152 10.72,8.606C10.972,9.048 10.777,9.663 10.326,9.891C9.875,10.148 9.238,9.953 9.019,9.479C8.774,9.02 8.992,8.397 9.465,8.186ZM7.112,8.99C7.146,8.704 7.416,8.518 7.688,8.499C7.981,8.534 8.215,8.762 8.247,9.059C8.228,9.352 8.001,9.639 7.69,9.638C7.347,9.667 7.047,9.326 7.112,8.99ZM14.06,8.561C14.412,8.356 14.9,8.654 14.884,9.058C14.908,9.486 14.368,9.788 14.018,9.537C13.654,9.328 13.683,8.739 14.06,8.561ZM8.509,10.069C8.92,9.956 9.39,10.15 9.592,10.528C9.813,10.908 9.722,11.437 9.379,11.716C8.939,12.125 8.128,11.961 7.893,11.402C7.624,10.89 7.951,10.204 8.509,10.069ZM12.964,10.067C13.364,9.953 13.834,10.107 14.049,10.471C14.333,10.888 14.197,11.509 13.774,11.777C13.331,12.089 12.645,11.925 12.401,11.438C12.105,10.934 12.403,10.221 12.964,10.067ZM5.864,10.542C6.219,10.408 6.613,10.8 6.469,11.152C6.381,11.473 5.929,11.592 5.695,11.355C5.422,11.133 5.523,10.639 5.864,10.542ZM15.492,11.053C15.481,10.759 15.697,10.498 15.998,10.482C16.242,10.521 16.478,10.717 16.459,10.982C16.481,11.332 16.06,11.569 15.762,11.405C15.622,11.334 15.551,11.191 15.492,11.053ZM4.117,10.715C4.331,10.622 4.595,10.807 4.547,11.044C4.535,11.313 4.138,11.416 3.993,11.192C3.864,11.036 3.941,10.795 4.117,10.715ZM17.591,10.71C17.742,10.603 17.983,10.68 18.043,10.855C18.144,11.047 17.959,11.311 17.743,11.278C17.439,11.306 17.341,10.843 17.591,10.71ZM9.669,12C10.232,11.853 10.836,12.322 10.84,12.901C10.876,13.486 10.281,14.005 9.705,13.87C9.261,13.799 8.911,13.37 8.926,12.92C8.925,12.49 9.249,12.091 9.669,12ZM11.896,11.998C12.467,11.839 13.09,12.316 13.08,12.909C13.111,13.483 12.534,13.984 11.97,13.87C11.44,13.802 11.049,13.219 11.197,12.704C11.271,12.361 11.558,12.083 11.896,11.998ZM7.603,12.355C7.998,12.288 8.368,12.728 8.208,13.103C8.091,13.503 7.509,13.611 7.252,13.285C6.951,12.971 7.176,12.398 7.603,12.355ZM14.134,12.373C14.486,12.225 14.918,12.53 14.891,12.912C14.905,13.333 14.371,13.623 14.027,13.377C13.637,13.157 13.708,12.508 14.134,12.373ZM15.959,14.203C15.821,13.946 16.072,13.606 16.357,13.653C16.499,13.651 16.598,13.763 16.689,13.857C16.708,14.009 16.739,14.191 16.613,14.308C16.441,14.525 16.052,14.463 15.959,14.203ZM5.495,13.725C5.762,13.547 6.146,13.812 6.086,14.124C6.054,14.4 5.707,14.557 5.478,14.401C5.232,14.259 5.241,13.854 5.495,13.725ZM10.765,14.302C11.114,14.148 11.559,14.452 11.526,14.837C11.552,15.262 11.002,15.556 10.66,15.301C10.281,15.082 10.344,14.437 10.765,14.302ZM8.324,14.872C8.622,14.715 9.021,14.985 8.994,15.318C9.003,15.592 8.736,15.824 8.466,15.784C8.243,15.779 8.097,15.579 8.026,15.389C8.029,15.181 8.115,14.95 8.324,14.872ZM13.268,14.876C13.574,14.687 14.009,14.959 13.98,15.315C13.988,15.687 13.497,15.925 13.212,15.681C12.936,15.489 12.97,15.029 13.268,14.876ZM14.128,17.002C13.992,16.796 14.152,16.548 14.373,16.501C14.551,16.537 14.739,16.671 14.701,16.877C14.675,17.155 14.268,17.241 14.128,17.002ZM7.303,16.823C7.358,16.66 7.489,16.498 7.681,16.54C7.961,16.56 8.044,16.982 7.799,17.112C7.578,17.261 7.323,17.057 7.303,16.823ZM10.596,17.01C10.649,16.769 10.962,16.652 11.168,16.78C11.304,16.838 11.344,16.99 11.379,17.12C11.36,17.187 11.343,17.255 11.327,17.322C11.243,17.422 11.134,17.522 10.994,17.518C10.733,17.549 10.498,17.254 10.596,17.01Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_dash_22.xml b/core/ui/src/main/res/drawable/img_dash_22.xml
new file mode 100644
index 0000000000..3e52aa86b1
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_dash_22.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#008DE4"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.97,4.846H7.66L7.22,7.304L12.012,7.311C14.372,7.311 15.07,8.168 15.05,9.588C15.038,10.317 14.724,11.549 14.587,11.948C14.224,13.012 13.477,14.227 10.677,14.223L6.02,14.221L5.578,16.682H10.875C12.743,16.682 13.538,16.464 14.379,16.076C16.245,15.215 17.356,13.373 17.8,10.97C18.462,7.392 17.636,4.846 12.97,4.846Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M5.369,9.53C3.979,9.53 3.779,10.436 3.649,10.984C3.476,11.701 3.42,11.991 3.42,11.991H8.856C10.247,11.991 10.446,11.085 10.576,10.537C10.749,9.819 10.805,9.53 10.805,9.53H5.369Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_dogecoin_22.xml b/core/ui/src/main/res/drawable/img_dogecoin_22.xml
new file mode 100644
index 0000000000..2f083f774a
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_dogecoin_22.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#C2A633"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M7.362,16.754H11.16H11.16C11.16,16.754 16.5,17.209 16.5,11.093C16.5,5.213 11.624,5.234 10.681,5.238C10.659,5.238 10.639,5.239 10.622,5.239H7.362V10.368H6.024V11.625H7.362V16.754ZM9.502,7.367H11C11.56,7.367 14.38,7.596 14.384,11.134C14.389,14.63 11.546,14.626 11.089,14.626C11.083,14.626 11.078,14.626 11.073,14.626H9.502V11.625H11.859V10.368H9.502V7.367Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_eth_22.xml b/core/ui/src/main/res/drawable/img_eth_22.xml
new file mode 100644
index 0000000000..0c8469373e
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_eth_22.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#E2E9EC"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#343434"
+        android:pathData="M10.999,3.85L10.903,4.176V13.629L10.999,13.725L15.398,11.131L10.999,3.85Z" />
+    <path
+        android:fillColor="#8C8C8C"
+        android:pathData="M10.999,3.85L6.6,11.131L10.999,13.725V9.136V3.85Z" />
+    <path
+        android:fillColor="#3C3C3B"
+        android:pathData="M10.999,14.556L10.944,14.622V17.989L10.999,18.147L15.4,11.963L10.999,14.556Z" />
+    <path
+        android:fillColor="#8C8C8C"
+        android:pathData="M10.999,18.147V14.556L6.6,11.963L10.999,18.147Z" />
+    <path
+        android:fillColor="#141414"
+        android:pathData="M10.999,13.725L15.397,11.131L10.999,9.137V13.725Z" />
+    <path
+        android:fillColor="#393939"
+        android:pathData="M6.6,11.131L10.999,13.725V9.137L6.6,11.131Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_eth_classic_22.xml b/core/ui/src/main/res/drawable/img_eth_classic_22.xml
new file mode 100644
index 0000000000..99bdcffe57
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_eth_classic_22.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#D2EFD2"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#3AB83A"
+        android:pathData="M7,11.624C8.41,12.433 9.88,13.28 11.016,13.935L15,11.624C13.558,13.939 12.356,15.867 11.016,18C9.675,15.872 8.193,13.523 7,11.624ZM7.153,10.986L11.021,8.756L14.838,10.969L11.023,13.202L7.153,10.986ZM11.016,8.042L7,10.326L10.999,4L15,10.34L11.016,8.042Z" />
+    <path
+        android:fillColor="#0B8311"
+        android:pathData="M11.016,13.935L15,11.624C13.558,13.939 11.016,18 11.016,18V13.935ZM11.021,8.756L14.838,10.969L11.023,13.202L11.021,8.756ZM11.016,8.042L10.999,4L15,10.34L11.016,8.042Z" />
+    <path
+        android:fillColor="#0B8311"
+        android:pathData="M7.153,10.986L11.021,11.329L14.838,10.972L11.023,13.204L7.153,10.986Z" />
+    <path
+        android:fillColor="#146714"
+        android:pathData="M11.021,11.329L14.838,10.972L11.023,13.204L11.021,11.329Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_ethereumfair_round.xml b/core/ui/src/main/res/drawable/img_eth_fair_22.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ethereumfair_round.xml
rename to core/ui/src/main/res/drawable/img_eth_fair_22.xml
diff --git a/app/src/main/res/drawable/ic_ethereumpow_round.xml b/core/ui/src/main/res/drawable/img_eth_pow_22.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ethereumpow_round.xml
rename to core/ui/src/main/res/drawable/img_eth_pow_22.xml
diff --git a/core/ui/src/main/res/drawable/img_fantom_22.xml b/core/ui/src/main/res/drawable/img_fantom_22.xml
new file mode 100644
index 0000000000..3327ab40ae
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_fantom_22.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#13B5EC"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#F8F9F9"
+        android:fillType="evenOdd"
+        android:pathData="M11.95,8.744L14.425,7.3V10.188L11.95,8.744ZM14.425,14.931L11.125,16.856L7.825,14.931V11.563L11.125,13.488L14.425,11.563V14.931ZM7.825,7.3L10.3,8.744L7.825,10.188V7.3ZM11.538,9.431L14.012,10.875L11.538,12.319V9.431ZM10.712,12.319L8.238,10.875L10.712,9.431V12.319ZM14.012,6.613L11.125,8.262L8.238,6.613L11.125,4.894L14.012,6.613ZM7,6.338V15.344L11.125,17.681L15.25,15.344V6.338L11.125,4L7,6.338Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_gnosis_22.xml b/core/ui/src/main/res/drawable/img_gnosis_22.xml
new file mode 100644
index 0000000000..222aa994d2
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_gnosis_22.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#3A775B"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M7.703,12.11C8.163,12.11 8.612,11.957 8.974,11.677L6.058,8.761C5.356,9.669 5.524,10.978 6.432,11.68C6.799,11.957 7.243,12.11 7.703,12.11Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.376,10.028C16.376,9.568 16.223,9.12 15.942,8.757L13.026,11.673C13.935,12.376 15.24,12.208 15.942,11.299C16.223,10.936 16.376,10.488 16.376,10.028Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M17.845,6.854L16.555,8.144C17.594,9.389 17.43,11.243 16.185,12.282C15.094,13.194 13.508,13.194 12.417,12.282L11,13.699L9.587,12.286C8.342,13.325 6.488,13.161 5.449,11.916C4.536,10.824 4.536,9.239 5.449,8.148L4.787,7.486L4.159,6.854C3.4,8.103 3,9.538 3,11C3,15.419 6.581,19 11,19C15.419,19 19,15.419 19,11C19.004,9.538 18.6,8.103 17.845,6.854Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.787,5.478C13.74,2.282 8.679,2.163 5.482,5.209C5.389,5.299 5.299,5.389 5.213,5.478C5.015,5.688 4.828,5.905 4.652,6.133L11,12.484L17.348,6.133C17.176,5.905 16.985,5.688 16.787,5.478ZM11,4.047C12.869,4.047 14.611,4.768 15.92,6.084L11,11.004L6.08,6.084C7.389,4.768 9.131,4.047 11,4.047Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_kusama_22.xml b/core/ui/src/main/res/drawable/img_kusama_22.xml
new file mode 100644
index 0000000000..f3d98bd342
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_kusama_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M17.071,7.316C16.864,7.156 16.618,6.937 16.168,6.882C15.747,6.827 15.317,7.105 15.026,7.288C14.736,7.472 14.187,8.012 13.96,8.176C13.733,8.34 13.152,8.492 12.217,9.043C11.283,9.594 7.614,11.908 7.614,11.908L8.569,11.92L4.312,14.074H4.738L4.125,14.531C4.125,14.531 4.666,14.672 5.12,14.39V14.519C5.12,14.519 10.188,12.557 11.167,13.065L10.57,13.237C10.622,13.237 11.585,13.3 11.585,13.3C11.608,13.496 11.675,13.684 11.781,13.851C11.887,14.019 12.029,14.162 12.198,14.269C12.778,14.644 12.79,14.851 12.79,14.851C12.79,14.851 12.488,14.973 12.488,15.125C12.488,15.125 12.934,14.992 13.347,15.004C13.61,15.014 13.87,15.054 14.123,15.125C14.123,15.125 14.091,14.961 13.689,14.851C13.288,14.742 12.89,14.312 12.695,14.078C12.575,13.928 12.498,13.751 12.469,13.563C12.44,13.375 12.462,13.184 12.532,13.007C12.671,12.651 13.156,12.455 14.159,11.947C15.341,11.345 15.611,10.9 15.778,10.552C15.945,10.204 16.192,9.512 16.331,9.188C16.506,8.77 16.721,8.547 16.9,8.414C17.079,8.281 17.875,7.988 17.875,7.988C17.875,7.988 17.266,7.468 17.071,7.316Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_litecoin_22.xml b/core/ui/src/main/res/drawable/img_litecoin_22.xml
new file mode 100644
index 0000000000..5354cc63be
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_litecoin_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#345D9D"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.186,11.373L10.041,15.235H16.167C16.208,15.233 16.248,15.24 16.286,15.254C16.324,15.269 16.359,15.29 16.389,15.318C16.418,15.345 16.442,15.379 16.459,15.416C16.476,15.453 16.485,15.493 16.487,15.533V15.634L15.954,17.472C15.931,17.559 15.878,17.635 15.806,17.689C15.733,17.742 15.644,17.769 15.554,17.765H6.179L7.751,12.412L5.993,12.944L6.392,11.719L8.15,11.186L10.361,3.676C10.385,3.589 10.438,3.513 10.51,3.46C10.583,3.407 10.671,3.38 10.76,3.383H13.131C13.171,3.381 13.212,3.388 13.25,3.402C13.288,3.416 13.323,3.438 13.352,3.465C13.382,3.493 13.406,3.526 13.423,3.563C13.44,3.6 13.449,3.64 13.45,3.681V3.782L11.586,10.121L13.344,9.588L12.971,10.867L11.186,11.373Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_optimism_22.xml b/core/ui/src/main/res/drawable/img_optimism_22.xml
new file mode 100644
index 0000000000..5ce92be0bc
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_optimism_22.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#FF0420"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M4.044,14.476C4.615,14.896 5.347,15.106 6.24,15.106C7.321,15.106 8.184,14.854 8.829,14.352C9.475,13.841 9.929,13.072 10.191,12.044C10.349,11.413 10.484,10.764 10.597,10.096C10.634,9.856 10.653,9.657 10.653,9.499C10.653,8.974 10.522,8.524 10.259,8.148C9.996,7.766 9.636,7.48 9.178,7.293C8.72,7.098 8.202,7 7.624,7C5.5,7 4.183,8.032 3.673,10.096C3.493,10.854 3.354,11.503 3.256,12.044C3.219,12.284 3.2,12.486 3.2,12.652C3.2,13.44 3.481,14.048 4.044,14.476ZM7.467,13.113C7.174,13.361 6.818,13.485 6.397,13.485C5.677,13.485 5.317,13.139 5.317,12.449C5.317,12.284 5.332,12.126 5.362,11.976C5.497,11.248 5.632,10.633 5.767,10.13C5.894,9.619 6.105,9.24 6.397,8.993C6.698,8.745 7.058,8.621 7.478,8.621C8.191,8.621 8.548,8.963 8.548,9.646C8.548,9.811 8.533,9.972 8.503,10.13C8.413,10.655 8.281,11.271 8.109,11.976C7.981,12.486 7.767,12.866 7.467,13.113ZM10.978,14.915C11.023,14.967 11.087,14.993 11.17,14.993H12.701C12.776,14.993 12.847,14.967 12.915,14.915C12.982,14.862 13.024,14.795 13.039,14.712L13.557,12.246H15.076C16.06,12.246 16.833,12.04 17.396,11.627C17.966,11.214 18.345,10.576 18.533,9.713C18.578,9.511 18.6,9.315 18.6,9.128C18.6,8.475 18.345,7.976 17.835,7.63C17.332,7.285 16.664,7.113 15.831,7.113H12.836C12.761,7.113 12.69,7.139 12.622,7.191C12.555,7.244 12.513,7.311 12.498,7.394L10.945,14.712C10.93,14.787 10.941,14.854 10.978,14.915ZM15.977,10.434C15.744,10.606 15.47,10.693 15.155,10.693H13.861L14.288,8.677H15.639C15.947,8.677 16.165,8.737 16.292,8.858C16.42,8.97 16.484,9.135 16.484,9.353C16.484,9.451 16.472,9.563 16.45,9.691C16.375,10.013 16.217,10.261 15.977,10.434Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_polkadot_22.xml b/core/ui/src/main/res/drawable/img_polkadot_22.xml
new file mode 100644
index 0000000000..9c4c5e7f4b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_polkadot_22.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#FEF2F8"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#E6007A"
+        android:fillType="evenOdd"
+        android:pathData="M14.163,4.48C14.163,5.436 12.747,6.211 10.999,6.211C9.252,6.211 7.835,5.436 7.835,4.48C7.835,3.525 9.252,2.75 10.999,2.75C12.747,2.75 14.163,3.525 14.163,4.48ZM14.163,17.518C14.163,18.474 12.747,19.249 10.999,19.249C9.252,19.249 7.835,18.474 7.835,17.518C7.835,16.563 9.252,15.788 10.999,15.788C12.747,15.788 14.163,16.563 14.163,17.518ZM6.59,8.606C7.464,7.183 7.458,5.642 6.577,5.164C5.697,4.686 4.274,5.452 3.401,6.875C2.527,8.298 2.532,9.839 3.413,10.317C4.294,10.795 5.716,10.029 6.59,8.606ZM18.585,11.682C19.465,12.16 19.471,13.701 18.597,15.124C17.723,16.547 16.301,17.313 15.421,16.836C14.541,16.358 14.536,14.817 15.41,13.394C16.283,11.971 17.705,11.205 18.585,11.682ZM6.578,16.835C7.458,16.357 7.464,14.816 6.59,13.393C5.717,11.97 4.294,11.204 3.414,11.682C2.533,12.16 2.527,13.701 3.401,15.124C4.275,16.547 5.697,17.313 6.578,16.835ZM18.597,6.876C19.471,8.299 19.466,9.839 18.586,10.317C17.706,10.795 16.284,10.029 15.41,8.606C14.536,7.183 14.542,5.642 15.422,5.164C16.302,4.686 17.724,5.453 18.597,6.876Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_polygon_22.xml b/core/ui/src/main/res/drawable/img_polygon_22.xml
new file mode 100644
index 0000000000..efb2fff8c1
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_polygon_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#8247E5"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.614,8.791C14.352,8.647 14.012,8.647 13.724,8.791L11.681,9.896L10.293,10.616L8.25,11.72C7.988,11.864 7.648,11.864 7.36,11.72L5.736,10.856C5.475,10.712 5.291,10.448 5.291,10.16V8.455C5.291,8.167 5.448,7.903 5.736,7.759L7.334,6.919C7.596,6.775 7.936,6.775 8.224,6.919L9.822,7.759C10.083,7.903 10.267,8.167 10.267,8.455V9.56L11.655,8.815V7.711C11.655,7.423 11.498,7.159 11.21,7.015L8.25,5.431C7.988,5.287 7.648,5.287 7.36,5.431L4.348,7.015C4.06,7.159 3.903,7.423 3.903,7.711V10.904C3.903,11.192 4.06,11.456 4.348,11.6L7.36,13.184C7.622,13.328 7.962,13.328 8.25,13.184L10.293,12.104L11.681,11.36L13.724,10.28C13.985,10.136 14.326,10.136 14.614,10.28L16.211,11.12C16.473,11.264 16.656,11.528 16.656,11.816V13.521C16.656,13.809 16.499,14.073 16.211,14.217L14.614,15.081C14.352,15.225 14.012,15.225 13.724,15.081L12.126,14.241C11.864,14.097 11.681,13.833 11.681,13.545V12.44L10.293,13.184V14.289C10.293,14.577 10.45,14.841 10.738,14.985L13.75,16.569C14.012,16.713 14.352,16.713 14.64,16.569L17.652,14.985C17.913,14.841 18.097,14.577 18.097,14.289V11.096C18.097,10.808 17.94,10.544 17.652,10.4L14.614,8.791Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_rsk_22.xml b/core/ui/src/main/res/drawable/img_rsk_22.xml
new file mode 100644
index 0000000000..d8ae9d522f
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_rsk_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M17.783,10.188C17.741,10.169 16.672,9.6 15.77,10.118C15.053,10.535 14.9,11.373 14.881,11.715L14.548,11.909C14.386,11.747 14.155,11.646 13.9,11.646C13.646,11.646 13.424,11.747 13.262,11.909L11.734,11.03C11.753,10.961 11.767,10.887 11.767,10.808C11.767,10.382 11.484,10.03 11.1,9.919V9.373C11.545,9.091 12.961,8.05 12.961,6.388C12.961,4.486 11.059,3.292 10.98,3.241L10.85,3.163L10.707,3.241C10.628,3.292 8.735,4.486 8.735,6.397C8.735,8.054 10.152,9.086 10.596,9.382V9.919C10.212,10.03 9.929,10.387 9.929,10.808C9.929,10.887 9.939,10.961 9.962,11.03L8.435,11.909C8.273,11.747 8.041,11.646 7.796,11.646C7.292,11.646 6.875,12.062 6.875,12.566C6.875,12.983 7.157,13.344 7.541,13.455V15.288C7.157,15.399 6.875,15.755 6.875,16.176C6.875,16.681 7.292,17.097 7.796,17.097C8.069,17.097 8.31,16.986 8.472,16.792L9.957,17.653C9.939,17.722 9.925,17.796 9.925,17.875C9.925,18.379 10.341,18.796 10.846,18.796C11.35,18.796 11.767,18.379 11.767,17.875C11.767,17.796 11.757,17.722 11.734,17.653L13.22,16.792C13.391,16.972 13.636,17.097 13.896,17.097C14.4,17.097 14.817,16.681 14.817,16.176C14.817,15.76 14.534,15.399 14.15,15.288V13.455C14.534,13.344 14.817,12.988 14.817,12.566C14.817,12.497 14.807,12.414 14.798,12.354L15.131,12.159C15.326,12.252 15.71,12.4 16.145,12.4C16.409,12.4 16.691,12.34 16.973,12.187C17.876,11.673 17.922,10.456 17.922,10.415V10.257L17.783,10.188ZM14.159,12.895C14.09,12.955 13.997,12.988 13.905,12.988C13.854,12.988 13.803,12.978 13.761,12.955C13.72,12.946 13.683,12.923 13.65,12.895C13.572,12.835 13.507,12.733 13.498,12.631C13.498,12.613 13.498,12.59 13.498,12.571C13.498,12.553 13.498,12.539 13.498,12.52C13.516,12.368 13.618,12.247 13.752,12.187C13.803,12.168 13.854,12.155 13.905,12.155C13.965,12.155 14.016,12.164 14.067,12.187C14.22,12.247 14.321,12.4 14.321,12.571C14.321,12.59 14.321,12.613 14.312,12.641C14.294,12.747 14.233,12.835 14.159,12.895ZM14.312,16.172C14.312,16.394 14.132,16.588 13.896,16.588C13.817,16.588 13.743,16.57 13.683,16.528C13.562,16.459 13.488,16.324 13.488,16.172V16.162C13.488,16.121 13.498,16.07 13.507,16.042C13.539,15.973 13.576,15.899 13.636,15.862C13.687,15.82 13.748,15.792 13.817,15.783C13.835,15.783 13.868,15.774 13.886,15.774C13.988,15.774 14.067,15.806 14.141,15.866C14.252,15.931 14.312,16.042 14.312,16.172ZM13.646,15.292C13.525,15.334 13.405,15.394 13.313,15.473L11.744,14.561C11.753,14.501 11.762,14.441 11.762,14.381C11.762,14.288 11.753,14.209 11.72,14.126L13.257,13.238C13.359,13.339 13.488,13.418 13.641,13.46V15.292H13.646ZM10.846,18.287C10.642,18.287 10.471,18.134 10.443,17.93C10.443,17.912 10.443,17.889 10.443,17.87C10.443,17.699 10.554,17.546 10.698,17.486C10.749,17.468 10.8,17.454 10.85,17.454C10.901,17.454 10.962,17.463 11.003,17.486C11.156,17.546 11.258,17.699 11.258,17.87C11.258,17.889 11.258,17.912 11.258,17.93C11.216,18.139 11.045,18.287 10.846,18.287ZM9.934,14.566L8.365,15.468C8.263,15.39 8.152,15.325 8.032,15.288V13.455C8.185,13.413 8.305,13.335 8.416,13.233L9.953,14.122C9.934,14.2 9.911,14.293 9.911,14.385C9.911,14.446 9.925,14.506 9.934,14.566ZM8.194,16.172C8.194,16.324 8.115,16.454 8,16.528C7.939,16.57 7.87,16.588 7.787,16.588C7.565,16.588 7.37,16.408 7.37,16.172C7.37,16.042 7.43,15.917 7.523,15.848C7.592,15.788 7.685,15.755 7.777,15.755C7.796,15.755 7.828,15.755 7.847,15.764C7.916,15.774 7.976,15.806 8.027,15.843C8.088,15.894 8.138,15.954 8.157,16.024C8.166,16.065 8.175,16.102 8.175,16.153C8.194,16.162 8.194,16.172 8.194,16.172ZM7.366,12.571C7.366,12.349 7.546,12.155 7.782,12.155C7.833,12.155 7.884,12.164 7.935,12.187C8.064,12.238 8.166,12.358 8.189,12.511C8.189,12.53 8.189,12.553 8.189,12.571C8.189,12.59 8.189,12.613 8.189,12.631C8.18,12.742 8.12,12.835 8.037,12.895C8.004,12.914 7.976,12.937 7.935,12.955C7.884,12.974 7.833,12.988 7.782,12.988C7.68,12.988 7.602,12.955 7.528,12.895C7.426,12.816 7.366,12.705 7.366,12.571ZM10.582,10.479C10.651,10.428 10.744,10.387 10.837,10.387C10.929,10.387 11.017,10.419 11.091,10.479C11.17,10.54 11.221,10.641 11.244,10.743C11.244,10.762 11.244,10.785 11.244,10.803C11.244,10.933 11.184,11.058 11.082,11.127C11.049,11.146 11.012,11.169 10.98,11.187C10.929,11.206 10.878,11.22 10.827,11.22C10.776,11.22 10.726,11.21 10.675,11.187C10.633,11.178 10.605,11.155 10.573,11.127C10.48,11.058 10.411,10.933 10.411,10.803C10.411,10.785 10.411,10.762 10.411,10.743C10.448,10.632 10.499,10.54 10.582,10.479ZM11.248,14.404C11.248,14.524 11.188,14.635 11.096,14.709C11.077,14.719 11.054,14.742 11.035,14.751C10.975,14.783 10.915,14.802 10.841,14.802C10.772,14.802 10.712,14.783 10.647,14.751C10.628,14.742 10.605,14.732 10.587,14.709C10.494,14.64 10.434,14.529 10.434,14.395V14.385C10.434,14.344 10.434,14.316 10.443,14.274C10.462,14.182 10.513,14.112 10.587,14.061C10.628,14.029 10.688,14.001 10.739,13.992C10.772,13.983 10.809,13.983 10.841,13.983C10.883,13.983 10.911,13.983 10.952,13.992C11.003,14.001 11.054,14.034 11.105,14.061C11.174,14.112 11.225,14.191 11.248,14.274C11.258,14.307 11.267,14.344 11.267,14.385C11.248,14.395 11.248,14.395 11.248,14.404ZM13.007,12.349C12.988,12.418 12.975,12.493 12.975,12.571C12.975,12.65 12.984,12.724 13.007,12.802L11.447,13.705C11.346,13.612 11.225,13.543 11.091,13.501V11.692C11.244,11.65 11.364,11.571 11.475,11.47L13.007,12.349ZM9.235,6.393C9.235,5.037 10.429,4.056 10.846,3.764C11.248,4.056 12.456,5.037 12.456,6.393C12.456,7.527 11.619,8.355 11.11,8.739V6.606C11.11,6.462 10.998,6.351 10.855,6.351C10.712,6.351 10.601,6.462 10.601,6.606V8.748C10.073,8.355 9.235,7.536 9.235,6.393ZM10.198,11.47C10.309,11.571 10.429,11.65 10.582,11.692V13.501C10.452,13.543 10.328,13.603 10.226,13.696L8.666,12.793C8.685,12.724 8.698,12.65 8.698,12.571C8.698,12.493 8.689,12.418 8.666,12.349L10.198,11.47ZM8.689,16.334C8.698,16.283 8.698,16.223 8.698,16.172C8.698,16.07 8.68,15.977 8.657,15.889L10.175,15.019C10.286,15.13 10.429,15.223 10.591,15.274V16.996C10.439,17.037 10.309,17.116 10.207,17.218L8.689,16.334ZM11.48,17.218C11.369,17.116 11.239,17.037 11.096,16.996V15.274C11.258,15.232 11.401,15.144 11.512,15.019L13.03,15.889C12.998,15.982 12.988,16.07 12.988,16.172C12.988,16.223 12.988,16.283 12.998,16.334L11.48,17.218ZM16.719,11.752C16.376,11.946 16.001,11.914 15.705,11.831L16.21,11.539C16.33,11.47 16.372,11.317 16.302,11.197C16.233,11.076 16.08,11.035 15.946,11.104L15.441,11.396C15.52,11.113 15.682,10.757 16.02,10.567C16.506,10.285 17.112,10.465 17.385,10.576C17.348,10.863 17.205,11.47 16.719,11.752Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_solana_22.xml b/core/ui/src/main/res/drawable/img_solana_22.xml
new file mode 100644
index 0000000000..8948b33621
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_solana_22.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path android:pathData="M16.97,14.173L14.979,16.35C14.935,16.397 14.883,16.435 14.825,16.461C14.766,16.487 14.704,16.5 14.64,16.5H5.199C5.154,16.5 5.11,16.487 5.072,16.461C5.034,16.436 5.005,16.4 4.987,16.358C4.969,16.316 4.963,16.27 4.971,16.224C4.979,16.179 4.999,16.137 5.03,16.104L7.023,13.926C7.066,13.879 7.118,13.841 7.176,13.815C7.234,13.79 7.297,13.776 7.36,13.776H16.801C16.846,13.776 16.89,13.79 16.928,13.815C16.965,13.84 16.995,13.876 17.013,13.918C17.031,13.96 17.037,14.007 17.029,14.052C17.021,14.097 17.001,14.139 16.97,14.173ZM14.979,9.788C14.935,9.741 14.883,9.703 14.825,9.677C14.766,9.651 14.704,9.638 14.64,9.638H5.199C5.154,9.638 5.11,9.652 5.072,9.677C5.034,9.702 5.005,9.738 4.987,9.78C4.969,9.822 4.963,9.869 4.971,9.914C4.979,9.959 4.999,10.001 5.03,10.035L7.023,12.212C7.066,12.259 7.118,12.297 7.176,12.323C7.234,12.348 7.297,12.362 7.36,12.362H16.801C16.846,12.362 16.89,12.349 16.928,12.323C16.965,12.298 16.995,12.262 17.013,12.22C17.031,12.178 17.037,12.132 17.029,12.086C17.021,12.041 17.001,11.999 16.97,11.965L14.979,9.788ZM5.199,8.224H14.64C14.704,8.224 14.766,8.211 14.825,8.185C14.883,8.159 14.935,8.121 14.979,8.074L16.97,5.897C17.001,5.863 17.021,5.821 17.029,5.776C17.037,5.73 17.031,5.684 17.013,5.642C16.995,5.6 16.965,5.564 16.928,5.539C16.89,5.513 16.846,5.5 16.801,5.5H7.36C7.297,5.5 7.234,5.513 7.176,5.539C7.118,5.565 7.066,5.603 7.023,5.65L5.03,7.827C5,7.861 4.979,7.903 4.972,7.948C4.964,7.993 4.969,8.04 4.987,8.082C5.005,8.124 5.035,8.16 5.072,8.185C5.11,8.21 5.154,8.224 5.199,8.224Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="16.101"
+                android:endY="5.578"
+                android:startX="5.986"
+                android:startY="16.762"
+                android:type="linear">
+                <item
+                    android:color="#FF9945FF"
+                    android:offset="0.08" />
+                <item
+                    android:color="#FF8752F3"
+                    android:offset="0.3" />
+                <item
+                    android:color="#FF5497D5"
+                    android:offset="0.5" />
+                <item
+                    android:color="#FF43B4CA"
+                    android:offset="0.6" />
+                <item
+                    android:color="#FF28E0B9"
+                    android:offset="0.72" />
+                <item
+                    android:color="#FF19FB9B"
+                    android:offset="0.97" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_stellar_22.xml b/core/ui/src/main/res/drawable/img_stellar_22.xml
new file mode 100644
index 0000000000..a87e860293
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_stellar_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.165,5.002C10.374,4.98 9.586,5.119 8.848,5.41C8.11,5.701 7.438,6.14 6.87,6.699C6.303,7.258 5.852,7.927 5.544,8.666C5.235,9.405 5.077,10.199 5.077,11.001C5.077,11.154 5.083,11.306 5.094,11.458C5.11,11.673 5.063,11.887 4.959,12.075C4.855,12.263 4.698,12.415 4.509,12.513L4,12.776V14.002L5.498,13.228L5.983,12.977L6.462,12.731L15.042,8.301L16.007,7.803L18,6.775V5.549L16.024,6.57L14.338,7.441L6.198,11.641C6.171,11.428 6.157,11.214 6.157,10.999C6.158,10.144 6.38,9.303 6.801,8.561C7.221,7.818 7.826,7.2 8.555,6.767C9.283,6.335 10.111,6.102 10.956,6.094C11.801,6.085 12.633,6.299 13.371,6.717L14.335,6.218L14.48,6.144C13.514,5.434 12.358,5.036 11.165,5.002ZM18,8.001L6.949,13.701L5.985,14.2L4,15.225V16.45L5.971,15.432L7.656,14.562L15.806,10.356C15.833,10.57 15.847,10.785 15.846,11.001C15.846,11.858 15.624,12.7 15.203,13.443C14.782,14.186 14.177,14.805 13.447,15.238C12.717,15.671 11.888,15.903 11.042,15.91C10.197,15.918 9.364,15.702 8.626,15.283L8.567,15.315L7.521,15.855C8.405,16.505 9.449,16.895 10.537,16.982C11.626,17.068 12.717,16.848 13.69,16.346C14.663,15.844 15.48,15.078 16.051,14.135C16.621,13.192 16.923,12.108 16.924,11.001C16.924,10.847 16.918,10.693 16.906,10.54C16.89,10.326 16.937,10.111 17.041,9.923C17.146,9.736 17.302,9.583 17.491,9.485L18,9.222V8.001Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_tezos_22.xml b/core/ui/src/main/res/drawable/img_tezos_22.xml
new file mode 100644
index 0000000000..cf9c1d5100
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_tezos_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#2D7DF8"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.717,17.875C10.782,17.875 10.099,17.639 9.669,17.166C9.271,16.766 9.04,16.217 9.026,15.638C9.022,15.462 9.06,15.288 9.139,15.133C9.212,14.999 9.318,14.888 9.446,14.811C9.595,14.733 9.758,14.693 9.924,14.693C10.09,14.693 10.254,14.733 10.403,14.811C10.53,14.888 10.635,14.999 10.708,15.133C10.789,15.288 10.829,15.462 10.825,15.638C10.833,15.849 10.775,16.056 10.661,16.229C10.565,16.37 10.429,16.475 10.271,16.528C10.425,16.733 10.642,16.875 10.886,16.93C11.158,17.013 11.44,17.055 11.723,17.056C12.099,17.06 12.466,16.944 12.778,16.726C13.101,16.486 13.343,16.143 13.466,15.748C13.622,15.278 13.698,14.783 13.691,14.285C13.704,13.766 13.62,13.249 13.446,12.764C13.314,12.375 13.064,12.043 12.735,11.818C12.429,11.615 12.073,11.509 11.711,11.511C11.396,11.539 11.091,11.648 10.825,11.827L10.167,12.173V11.827L13.122,7.668H9.026V11.984C9.015,12.295 9.093,12.603 9.252,12.867C9.328,12.982 9.432,13.074 9.552,13.135C9.673,13.195 9.806,13.222 9.94,13.213C10.186,13.208 10.424,13.12 10.62,12.962C10.841,12.792 11.033,12.584 11.189,12.347C11.203,12.306 11.229,12.269 11.263,12.244C11.29,12.219 11.325,12.205 11.362,12.205C11.433,12.212 11.5,12.242 11.554,12.291C11.623,12.371 11.66,12.476 11.658,12.583C11.651,12.656 11.638,12.727 11.622,12.798C11.476,13.168 11.232,13.485 10.919,13.713C10.628,13.92 10.285,14.029 9.934,14.027C9.047,14.027 8.433,13.844 8.091,13.477C7.915,13.274 7.78,13.037 7.693,12.779C7.605,12.521 7.568,12.247 7.583,11.973V7.668H5.5V6.866H7.593V5.038L7.114,4.535V4.125H8.504L9.026,4.409V6.866L14.437,6.849L14.975,7.416L11.658,10.914C11.858,10.829 12.069,10.776 12.284,10.755C12.71,10.774 13.125,10.899 13.497,11.118C13.927,11.332 14.29,11.672 14.541,12.096C14.767,12.455 14.927,12.855 15.012,13.275C15.083,13.607 15.12,13.945 15.125,14.285C15.127,14.934 14.987,15.574 14.715,16.156C14.458,16.72 14.024,17.175 13.487,17.445C12.936,17.73 12.331,17.877 11.717,17.875Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_tron_22.xml b/core/ui/src/main/res/drawable/img_tron_22.xml
new file mode 100644
index 0000000000..f1dfceca1f
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_tron_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#FF060A"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.541,9.615C15.978,9.096 15.2,8.303 14.566,7.74L14.529,7.714C14.466,7.664 14.396,7.624 14.321,7.598C12.792,7.313 5.681,5.983 5.542,6C5.503,6.005 5.466,6.02 5.433,6.041L5.398,6.069C5.354,6.114 5.32,6.168 5.3,6.227L5.291,6.251V6.384V6.405C6.091,8.634 9.253,15.938 9.875,17.651C9.913,17.767 9.984,17.989 10.117,18H10.147C10.218,18 10.522,17.599 10.522,17.599C10.522,17.599 15.952,11.014 16.501,10.313C16.572,10.226 16.635,10.133 16.689,10.035C16.702,9.958 16.696,9.879 16.67,9.805C16.644,9.732 16.6,9.666 16.541,9.615ZM11.915,10.382L14.233,8.46L15.592,9.713L11.915,10.382ZM11.015,10.256L7.025,6.986L13.481,8.177L11.015,10.256ZM11.375,11.113L15.459,10.455L10.79,16.08L11.375,11.113ZM6.483,7.313L10.681,10.875L10.074,16.084L6.483,7.313Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_xrp_22.xml b/core/ui/src/main/res/drawable/img_xrp_22.xml
new file mode 100644
index 0000000000..41fed91f22
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_xrp_22.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.148,5.5C15.964,5.5 15.787,5.573 15.656,5.702L12.716,8.61C12.259,9.061 11.642,9.314 10.999,9.314C10.356,9.314 9.739,9.061 9.281,8.61L6.344,5.702C6.213,5.573 6.036,5.5 5.852,5.5C5.226,5.5 4.915,6.258 5.359,6.698L8.288,9.595C9.011,10.308 9.985,10.707 11,10.707C12.015,10.707 12.989,10.308 13.712,9.595L16.64,6.696C17.084,6.257 16.773,5.5 16.148,5.5ZM5.827,16.887C6.012,16.887 6.189,16.814 6.32,16.684L9.284,13.75C9.742,13.298 10.358,13.045 11.001,13.045C11.644,13.045 12.261,13.298 12.719,13.75L15.68,16.684C15.811,16.814 15.988,16.887 16.173,16.887C16.798,16.887 17.11,16.129 16.665,15.69L13.712,12.767C12.989,12.054 12.015,11.655 11,11.655C9.985,11.655 9.011,12.054 8.288,12.767L5.335,15.689C4.89,16.129 5.202,16.887 5.827,16.887Z" />
+</vector>
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/FormatExtensions.kt b/core/utils/src/main/java/com/tangem/utils/FormatExtensions.kt
new file mode 100644
index 0000000000..1e96e28844
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/FormatExtensions.kt
@@ -0,0 +1,91 @@
+package com.tangem.utils
+
+import java.math.BigDecimal
+import java.math.RoundingMode
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.*
+
+// todo determine where to place this extensions
+fun BigDecimal.toFormattedString(
+    decimals: Int,
+    roundingMode: RoundingMode = RoundingMode.DOWN,
+    locale: Locale = Locale.US,
+): String {
+    val symbols = DecimalFormatSymbols(locale)
+    val df = DecimalFormat().apply {
+        decimalFormatSymbols = symbols
+        maximumFractionDigits = decimals
+        minimumFractionDigits = 0
+        isGroupingUsed = false
+        this.roundingMode = roundingMode
+    }
+    return df.format(this)
+}
+
+@Suppress("MagicNumber")
+fun BigDecimal.toFormattedCurrencyString(
+    decimals: Int,
+    currency: String,
+    roundingMode: RoundingMode = RoundingMode.DOWN,
+    limitNumberOfDecimals: Boolean = true,
+): String {
+    val decimalsForRounding = if (limitNumberOfDecimals) {
+        if (decimals > 8) 8 else decimals
+    } else {
+        decimals
+    }
+    val formattedAmount = this.toFormattedString(
+        decimals = decimalsForRounding,
+        roundingMode = roundingMode,
+    )
+    return "$formattedAmount $currency"
+}
+
+fun BigDecimal.toFiatString(
+    rateValue: BigDecimal,
+    fiatCurrencyName: String,
+    formatWithSpaces: Boolean = false,
+): String {
+    val fiatValue = rateValue.multiply(this)
+    return fiatValue.toFormattedFiatValue(fiatCurrencyName, formatWithSpaces)
+}
+
+fun BigDecimal.toFormattedFiatValue(
+    fiatCurrencyName: String,
+    formatWithSpaces: Boolean = false,
+): String {
+    val fiatValue = this.setScale(2, RoundingMode.HALF_UP)
+        .let { if (formatWithSpaces) it.formatWithSpaces() else it }
+    return " $fiatValue  $fiatCurrencyName"
+}
+
+@Suppress("MagicNumber")
+fun BigDecimal.formatWithSpaces(): String {
+    val str = this.toString()
+    var integerStr = str.substringBefore('.')
+    val reminderStr = str.substringAfter('.')
+    val packets = arrayListOf<String>()
+
+    var index: Int = integerStr.length
+    while (0 < index) {
+        if (index <= 3) {
+            packets.add(integerStr)
+            break
+        }
+        index -= 3
+        packets.add(integerStr.substring(startIndex = index))
+        integerStr = integerStr.substring(startIndex = 0, endIndex = index)
+    }
+
+    return buildString {
+        packets.reversed().forEachIndexed { index, packet ->
+            append(packet)
+            if (index != packets.lastIndex) append(' ')
+        }
+        if (reminderStr.isNotBlank()) {
+            append('.')
+            append(reminderStr)
+        }
+    }
+}
\ 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/converter/TwoWayConverter.kt b/core/utils/src/main/java/com/tangem/utils/converter/TwoWayConverter.kt
new file mode 100644
index 0000000000..444e4048ab
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/converter/TwoWayConverter.kt
@@ -0,0 +1,8 @@
+package com.tangem.utils.converter
+
+interface TwoWayConverter<I, O> : Converter<I, O> {
+    fun convertBack(value: O): I
+    fun convertListBack(input: List<O>): List<I> {
+        return input.map { convertBack(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..4fbd7b0ccb
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/coroutines/CoroutineExt.kt
@@ -0,0 +1,31 @@
+package com.tangem.utils.coroutines
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+suspend fun <R> runCatching(dispatcher: CoroutineDispatcher, block: suspend () -> R): Result<R> {
+    return runCatching {
+        withContext(dispatcher) { block() }
+    }
+}
+
+class Debouncer {
+
+    private var debounceJob: Job? = null
+
+    fun debounce(
+        waitMs: Long = 300L,
+        coroutineScope: CoroutineScope,
+        destinationFunction: () -> Unit,
+    ) {
+        debounceJob?.cancel()
+        debounceJob = coroutineScope.launch {
+            delay(waitMs)
+            destinationFunction.invoke()
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/coroutines/FeatureCoroutineExceptionHandler.kt b/core/utils/src/main/java/com/tangem/utils/coroutines/FeatureCoroutineExceptionHandler.kt
new file mode 100644
index 0000000000..9b92b1cf18
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/coroutines/FeatureCoroutineExceptionHandler.kt
@@ -0,0 +1,26 @@
+package com.tangem.utils.coroutines
+
+import kotlinx.coroutines.CoroutineExceptionHandler
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.util.logging.Level
+import java.util.logging.Logger
+
+/**
+[REDACTED_AUTHOR]
+ */
+object FeatureCoroutineExceptionHandler {
+
+    // add an external logger (FbAnalytics) for handling errors
+    fun create(from: String): CoroutineExceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        val sw = StringWriter()
+        throwable.printStackTrace(PrintWriter(sw))
+        val exceptionAsString: String = sw.toString()
+        // it delegates logging to android Logger, cause cant use timber in java module
+        Logger.getLogger("CoroutineExceptHandler").log(
+            Level.INFO,
+            "CoroutineException: from: $from, exception: $exceptionAsString",
+        )
+        throw throwable
+    }
+}
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/detekt/UnusedRequiredComponent.kt b/core/utils/src/main/java/com/tangem/utils/detekt/UnusedRequiredComponent.kt
new file mode 100644
index 0000000000..273d9dc981
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/detekt/UnusedRequiredComponent.kt
@@ -0,0 +1,28 @@
+package com.tangem.utils.detekt
+
+/**
+ * Annotation for an unused component that should be ignored by Detekt
+ *
+ * @property description description of why I shouldn't remove it
+ *
+[REDACTED_AUTHOR]
+ */
+@Target(
+    AnnotationTarget.CLASS,
+    AnnotationTarget.ANNOTATION_CLASS,
+    AnnotationTarget.TYPE_PARAMETER,
+    AnnotationTarget.PROPERTY,
+    AnnotationTarget.FIELD,
+    AnnotationTarget.LOCAL_VARIABLE,
+    AnnotationTarget.VALUE_PARAMETER,
+    AnnotationTarget.CONSTRUCTOR,
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY_GETTER,
+    AnnotationTarget.PROPERTY_SETTER,
+    AnnotationTarget.TYPE,
+    AnnotationTarget.EXPRESSION,
+    AnnotationTarget.FILE,
+    AnnotationTarget.TYPEALIAS
+)
+@Retention(AnnotationRetention.SOURCE)
+annotation class UnusedRequiredComponent(val description: String)
\ 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..6dd1011462
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/di/CoroutineDispatcherProviderModule.kt
@@ -0,0 +1,18 @@
+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 02d685f18f..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: 'develop-139',
-    // 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..33ffebc8ed
--- /dev/null
+++ b/domain/build.gradle.kts
@@ -0,0 +1,104 @@
+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(":core:utils"))
+    implementation(project(":common"))
+    implementation(project(":libs:auth"))
+
+    /** 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..c1f72a19de 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.models.CoinsResponse
 
 /**
 [REDACTED_AUTHOR]
@@ -14,6 +14,6 @@ sealed interface DomainDialog {
         val items: List<CoinsResponse.Coin.Network>,
         val networkIdConverter: (String) -> String,
         val onSelect: (CoinsResponse.Coin.Network) -> Unit,
-        val onClose: VoidCallback = {}
+        val onClose: VoidCallback = {},
     ) : DomainDialog
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/DomainLayer.kt b/domain/src/main/java/com/tangem/domain/DomainLayer.kt
index ef083fdc96..a8a52c2d4e 100644
--- a/domain/src/main/java/com/tangem/domain/DomainLayer.kt
+++ b/domain/src/main/java/com/tangem/domain/DomainLayer.kt
@@ -12,7 +12,7 @@ object DomainLayer {
 
     var onInitComplete: ((DomainModuleError?) -> Unit)? = null
 
-    fun init(data: Map<String, Any?>? = null) {
+    fun init() {
         initActionStateLogger()
 
         onInitComplete?.invoke(null)
diff --git a/domain/src/main/java/com/tangem/domain/DomainWrapped.kt b/domain/src/main/java/com/tangem/domain/DomainWrapped.kt
index 3872eeaab1..1b41d0e9cd 100644
--- a/domain/src/main/java/com/tangem/domain/DomainWrapped.kt
+++ b/domain/src/main/java/com/tangem/domain/DomainWrapped.kt
@@ -6,7 +6,7 @@ import com.tangem.blockchain.common.DerivationStyle
 [REDACTED_AUTHOR]
  * Provides a temporary copies of the app module classes, data structures, etc.
  */
-//TODO: refactoring: : after refactoring they should be unwrapped and moved
+// TODO: refactoring: : after refactoring they should be unwrapped and moved
 // to appropriate parts of module
 sealed interface DomainWrapped {
 
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..63695e8fdc
--- /dev/null
+++ b/domain/src/main/java/com/tangem/domain/common/CardDTO.kt
@@ -0,0 +1,304 @@
+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),
+    )
+
+    @Suppress("ComplexMethod")
+    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> {
+        val stringValue: String
+            get() = StringBuilder()
+                .append("$major.$minor")
+                .append(if (patch != 0) ".$patch" else "")
+                .append(type.rawValue ?: "")
+                .toString()
+
+        val doubleValue: Double
+            get() = "$major.$minor".toDouble()
+
+        constructor(firmwareVersion: SdkFirmwareVersion) : this(
+            major = firmwareVersion.major,
+            minor = firmwareVersion.minor,
+            patch = firmwareVersion.patch,
+            type = firmwareVersion.type,
+        )
+
+        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/CardTypesResolver.kt b/domain/src/main/java/com/tangem/domain/common/CardTypesResolver.kt
new file mode 100644
index 0000000000..a938ae53b0
--- /dev/null
+++ b/domain/src/main/java/com/tangem/domain/common/CardTypesResolver.kt
@@ -0,0 +1,19 @@
+package com.tangem.domain.common
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+
+interface CardTypesResolver {
+    fun isTangemNote(): Boolean
+    fun isTangemWallet(): Boolean
+    fun isSaltPay(): Boolean
+    fun isSaltPayVisa(): Boolean
+    fun isSaltPayWallet(): Boolean
+    fun isTangemTwins(): Boolean
+    fun isStart2Coin(): Boolean
+
+    fun isMultiwalletAllowed(): Boolean
+
+    fun getBlockchain(): Blockchain
+    fun getPrimaryToken(): Token?
+}
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/FeatureCoroutineExceptionHandler.kt b/domain/src/main/java/com/tangem/domain/common/FeatureCoroutineExceptionHandler.kt
deleted file mode 100644
index e6dde98009..0000000000
--- a/domain/src/main/java/com/tangem/domain/common/FeatureCoroutineExceptionHandler.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.tangem.domain.common
-
-import kotlinx.coroutines.CoroutineExceptionHandler
-import timber.log.Timber
-import java.io.PrintWriter
-import java.io.StringWriter
-
-/**
-[REDACTED_AUTHOR]
- */
-class FeatureCoroutineExceptionHandler {
-
-    // add an external logger (FbAnalytics) for handling errors
-    companion object {
-        fun create(from: String): CoroutineExceptionHandler = CoroutineExceptionHandler { _, throwable ->
-            val sw = StringWriter()
-            throwable.printStackTrace(PrintWriter(sw))
-            val exceptionAsString: String = sw.toString()
-            Timber.e("CoroutineException: from: %s, exception: %s", from, exceptionAsString)
-            throw throwable
-        }
-    }
-}
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/LogConfig.kt b/domain/src/main/java/com/tangem/domain/common/LogConfig.kt
index c4f96f4b55..f0626bf715 100644
--- a/domain/src/main/java/com/tangem/domain/common/LogConfig.kt
+++ b/domain/src/main/java/com/tangem/domain/common/LogConfig.kt
@@ -3,23 +3,21 @@ package com.tangem.domain.common
 import com.tangem.domain.features.BuildConfig
 
 object LogConfig {
-    val imageLoader: Boolean = false
+    const val imageLoader: Boolean = false
     val storeAction: Boolean = BuildConfig.DEBUG
-    val zendesk: Boolean = false
+    const val zendesk: Boolean = false
     val network: NetworkLogConfig = NetworkLogConfig
     val analyticsHandlers: AnalyticsHandlersLogConfig = AnalyticsHandlersLogConfig
 }
 
 object NetworkLogConfig {
-    val mercuryoService: Boolean = false
-    val moonPayService: Boolean = false
-    val tangemTechService: Boolean = BuildConfig.DEBUG
-    val paymentologyApiService: Boolean = BuildConfig.DEBUG
+    const val mercuryoService: Boolean = false
+    const val moonPayService: Boolean = false
     val blockchainSdkNetwork: Boolean = BuildConfig.DEBUG
 }
 
 object AnalyticsHandlersLogConfig {
-    val firebase: Boolean = false
-    val appsFlyer: Boolean = false
-    val amplitude: Boolean = false
+    const val firebase: Boolean = false
+    const val appsFlyer: Boolean = false
+    const val amplitude: Boolean = false
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt b/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt
index c397160c2d..58c03985a6 100644
--- a/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt
+++ b/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt
@@ -6,42 +6,8 @@ import com.tangem.common.CardIdRange
 import com.tangem.common.contains
 
 object SaltPayWorkaround {
-    fun tokenFrom(blockchain: Blockchain): Token {
-        return when (blockchain) {
-            Blockchain.SaltPay -> Token(
-                name = "WXDAI",
-                symbol = "wxDAI",
-                contractAddress = "0x4346186e7461cB4DF06bCFCB4cD591423022e417",
-                decimals = 18,
-                id = "wrapped-xdai",
-            )
-            Blockchain.SaltPayTestnet -> Token(
-                name = "WXDAI Test",
-                symbol = "MyERC20",
-                contractAddress = "0x69cca8D8295de046C7c14019D9029Ccc77987A48",
-                decimals = 0,
-                id = "wrapped-xdai",
-            )
-            else -> throw IllegalArgumentException()
-        }
-    }
-
-    fun isVisaBatchId(batchId: String): Boolean = visaBatches.contains(batchId)
-
-    fun isWalletCardId(cardId: String): Boolean {
-        return if (walletCardIds.contains(cardId)) true else walletCardIdRanges.contains(cardId)
-    }
-
-    val visaBatches = listOf(
-        "AE02",
-        "AE03",
-    ) + attachTestVisaBatches()
-
-    private fun attachTestVisaBatches(): List<String> {
-        return listOf(
-            "FF03",
-        )
-    }
+    @Suppress("MagicNumber")
+    val visaBatches = listOf("AE02", "AE03") + attachTestVisaBatches()
 
     val walletCardIds = listOf(
         "AC01000000033503",
@@ -74,19 +40,38 @@ object SaltPayWorkaround {
         "AC03000000076229",
     ) + attachTestWalletCardIds()
 
-    private fun attachTestWalletCardIds(): List<String> {
-        return listOf(
-            "FF04000000000232",
-        )
-    }
-
     val walletCardIdRanges = listOf(
         CardIdRange("AC05000000000003", "AC05000000023997")!!,
     ) + attachTestWalletCardIdRanges()
 
+    fun tokenFrom(blockchain: Blockchain): Token {
+        return when (blockchain) {
+            Blockchain.SaltPay -> Token(
+                name = "WXDAI",
+                symbol = "wxDAI",
+                contractAddress = "0x4200000000000000000000000000000000000006",
+                decimals = 18,
+                id = "wrapped-xdai",
+            )
+            else -> error("It is not SaltPay")
+        }
+    }
+
+    fun isVisaBatchId(batchId: String): Boolean = visaBatches.contains(batchId)
+
+    fun isWalletCardId(cardId: String): Boolean {
+        return if (walletCardIds.contains(cardId)) true else walletCardIdRanges.contains(cardId)
+    }
+
+    private fun attachTestVisaBatches(): List<String> {
+        return listOf("FF03")
+    }
+
+    private fun attachTestWalletCardIds(): List<String> {
+        return listOf("FF04000000000232")
+    }
+
     private fun attachTestWalletCardIdRanges(): List<CardIdRange> {
-        return listOf(
-            CardIdRange("FF04000000000000", "FF04999999999999")!!,
-        )
+        return listOf(CardIdRange("FF04000000000000", "FF04999999999999")!!)
     }
 }
\ 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 56c6979d5e..17f4e1c64a 100644
--- a/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
+++ b/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
@@ -1,18 +1,11 @@
 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
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.hdWallet.DerivationPath
-import com.tangem.domain.common.TapWorkarounds.getTangemNoteBlockchain
-import com.tangem.domain.common.TapWorkarounds.isSaltPay
-import com.tangem.domain.common.TapWorkarounds.isSaltPayVisa
-import com.tangem.domain.common.TapWorkarounds.isSaltPayWallet
-import com.tangem.domain.common.TapWorkarounds.isTangemNote
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.operations.CommandResponse
@@ -23,42 +16,20 @@ 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,
     val derivedKeys: Map<KeyWalletPublicKey, ExtendedPublicKeysMap> = mapOf(),
     val primaryCard: PrimaryCard? = null,
 ) : CommandResponse {
-    fun getBlockchain(): Blockchain {
-        return when (productType) {
-            ProductType.SaltPay -> if (card.isTestCard) Blockchain.SaltPayTestnet else Blockchain.SaltPay
-            ProductType.Note -> card.getTangemNoteBlockchain() ?: Blockchain.Unknown
-            else -> {
-                val blockchainName: String = walletData?.blockchain ?: return Blockchain.Unknown
-                Blockchain.fromId(blockchainName)
-            }
-        }
-    }
 
-    fun getPrimaryToken(): Token? {
-        if (card.isSaltPay) return SaltPayWorkaround.tokenFrom(getBlockchain())
+    val cardTypesResolver: CardTypesResolver = TangemCardTypesResolver(
+        card = card,
+        productType = productType,
+        walletData = walletData,
+    )
 
-        val cardToken = walletData?.token ?: return null
-        return Token(
-            cardToken.name,
-            cardToken.symbol,
-            cardToken.contractAddress,
-            cardToken.decimals,
-        )
-    }
-
-    fun isTangemNote(): Boolean = productType == ProductType.Note
-    fun isTangemWallet(): Boolean = productType == ProductType.Wallet
-    fun isSaltPay(): Boolean = productType == ProductType.SaltPay
-    fun isSaltPayVisa(): Boolean = card.isSaltPayVisa
-    fun isSaltPayWallet(): Boolean = card.isSaltPayWallet
-    fun isTangemTwins(): Boolean = productType == ProductType.Twins
     fun twinsIsTwinned(): Boolean = card.isTangemTwins && walletData != null && secondTwinPublicKey != null
     fun supportsHdWallet(): Boolean = card.settings.isHDWalletAllowed
     fun supportsBackup(): Boolean = card.settings.isBackupAllowed
@@ -67,7 +38,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) -> {
@@ -80,7 +51,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
@@ -89,16 +60,4 @@ data class ScanResponse(
     }
 }
 
-enum class ProductType {
-    Note, Twins, Wallet, SaltPay
-}
-
-val Card.productType: ProductType
-    get() = when {
-        isTangemTwins -> ProductType.Twins
-        isTangemNote -> ProductType.Note
-        isSaltPay -> ProductType.SaltPay
-        else -> ProductType.Wallet
-    }
-
 typealias KeyWalletPublicKey = ByteArrayKey
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt b/domain/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
new file mode 100644
index 0000000000..41764fb5cf
--- /dev/null
+++ b/domain/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
@@ -0,0 +1,71 @@
+package com.tangem.domain.common
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+import com.tangem.common.card.EllipticCurve
+import com.tangem.common.card.FirmwareVersion
+import com.tangem.common.card.WalletData
+import com.tangem.common.extensions.guard
+import com.tangem.domain.common.TapWorkarounds.getTangemNoteBlockchain
+import com.tangem.domain.common.TapWorkarounds.isSaltPay
+import com.tangem.domain.common.TapWorkarounds.isSaltPayVisa
+import com.tangem.domain.common.TapWorkarounds.isSaltPayWallet
+import com.tangem.domain.common.TapWorkarounds.isStart2Coin
+import com.tangem.domain.common.TapWorkarounds.isTestCard
+
+class TangemCardTypesResolver(
+    private val card: CardDTO,
+    private val productType: ProductType,
+    private val walletData: WalletData?,
+) : CardTypesResolver {
+
+    override fun isTangemNote(): Boolean = productType == ProductType.Note
+    override fun isTangemWallet(): Boolean = card.settings.isBackupAllowed &&
+        card.settings.isHDWalletAllowed &&
+        card.firmwareVersion >= FirmwareVersion.MultiWalletAvailable &&
+        !card.isSaltPay
+
+    override fun isSaltPay(): Boolean = productType == ProductType.SaltPay
+    override fun isSaltPayVisa(): Boolean = card.isSaltPayVisa
+    override fun isSaltPayWallet(): Boolean = card.isSaltPayWallet
+    override fun isTangemTwins(): Boolean = productType == ProductType.Twins
+    override fun isStart2Coin(): Boolean = card.isStart2Coin
+
+    override fun isMultiwalletAllowed(): Boolean =
+        !isTangemTwins() && !card.isStart2Coin && !isTangemNote() && !isSaltPay() &&
+            (card.firmwareVersion >= FirmwareVersion.MultiWalletAvailable ||
+                card.wallets.firstOrNull()?.curve == EllipticCurve.Secp256k1)
+
+    override fun getBlockchain(): Blockchain {
+        return when (productType) {
+            ProductType.Start2Coin -> if (card.isTestCard) Blockchain.BitcoinTestnet else Blockchain.Bitcoin
+            ProductType.SaltPay -> Blockchain.SaltPay
+            else -> {
+                val blockchainName: String = walletData?.blockchain.guard {
+                    if (productType == ProductType.Note) {
+                        return card.getTangemNoteBlockchain() ?: Blockchain.Unknown
+                    } else {
+                        return Blockchain.Unknown
+                    }
+                }
+                Blockchain.fromId(blockchainName)
+            }
+        }
+    }
+
+    override fun getPrimaryToken(): Token? {
+        if (isSaltPay()) return SaltPayWorkaround.tokenFrom(getBlockchain())
+
+        val cardToken = walletData?.token ?: return null
+        return Token(
+            cardToken.name,
+            cardToken.symbol,
+            cardToken.contractAddress,
+            cardToken.decimals,
+        )
+    }
+}
+
+enum class ProductType {
+    Note, Twins, Wallet, SaltPay, Start2Coin
+}
\ 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..dabbd0e150 100644
--- a/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
+++ b/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
@@ -13,39 +13,49 @@ object TapWorkarounds {
     private const val TEST_CARD_BATCH = "99FF"
     private const val TEST_CARD_ID_STARTS_WITH = "FF99"
 
-    fun isStart2CoinIssuer(cardIssuer: String?): Boolean {
-        return cardIssuer?.lowercase(Locale.US) == START_2_COIN_ISSUER
-    }
+    val CardDTO.isTangemTwins: Boolean
+        get() = TwinsHelper.getTwinCardNumber(cardId) != null
 
-    val Card.isStart2Coin: Boolean
+    // 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
         } else {
             DerivationStyle.NEW
         }
+    val CardDTO.isExcluded: Boolean
+        get() {
+            val excludedBatch = excludedBatches.contains(batchId)
+            val excludedIssuerName = excludedIssuers.contains(issuer.name.uppercase(Locale.ROOT))
+            return excludedBatch || excludedIssuerName
+        }
 
-    val Card.isNotSupportedInThatRelease: Boolean
+    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)
-
     private val tangemNoteBatches = mapOf(
         "AB01" to Blockchain.Bitcoin,
         "AB02" to Blockchain.Ethereum,
@@ -55,40 +65,26 @@ object TapWorkarounds {
         "AB06" to Blockchain.XRP,
         "AB07" to Blockchain.Bitcoin,
         "AB08" to Blockchain.Ethereum,
-        "AB09" to Blockchain.Bitcoin,       // new batches for 3.34
+        "AB09" to Blockchain.Bitcoin, // new batches for 3.34
         "AB10" to Blockchain.Ethereum,
         "AB11" to Blockchain.Bitcoin,
         "AB12" to Blockchain.Ethereum,
     )
 
+    private val excludedBatches = listOf("0027", "0030", "0031", "0035")
+
+    private val excludedIssuers = listOf("TTM BANK")
+
+    @Deprecated(
+        "Now blockchain is read form files (CardTypesResolver.getBlockchain), " +
+            "but for previously saved cards this method is still used",
+    )
+    fun CardDTO.getTangemNoteBlockchain(): Blockchain? =
+        tangemNoteBatches[batchId] ?: if (isSaltPay) Blockchain.Gnosis else null
+
+    fun isStart2CoinIssuer(cardIssuer: String?): Boolean {
+        return cardIssuer?.lowercase(Locale.US) == START_2_COIN_ISSUER
+    }
+
     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",
-        "0031",
-        "0035",
-    )
-
-    private val excludedIssuers = listOf(
-        "TTM BANK",
-    )
 }
\ No newline at end of file
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..7e801695fb 100644
--- a/domain/src/main/java/com/tangem/domain/common/TwinsHelper.kt
+++ b/domain/src/main/java/com/tangem/domain/common/TwinsHelper.kt
@@ -1,57 +1,33 @@
 package com.tangem.domain.common
 
-import com.tangem.common.card.Card
 import com.tangem.crypto.CryptoUtils
 
-class TwinsHelper {
-    companion object {
-        const val TWIN_FILE_NAME = "TwinPublicKey"
+object TwinsHelper {
+    private val firstCardSeries = listOf("CB61", "CB64")
+    private val secondCardSeries = listOf("CB62", "CB65")
 
-        fun verifyTwinPublicKey(issuerData: ByteArray, cardWalletPublicKey: ByteArray?): Boolean {
-            if (issuerData.size < 65 || cardWalletPublicKey == null) return false
+    @Suppress("MagicNumber")
+    fun verifyTwinPublicKey(issuerData: ByteArray, cardWalletPublicKey: ByteArray?): Boolean {
+        if (issuerData.size < 65 || cardWalletPublicKey == null) return false
 
-            val publicKey = issuerData.sliceArray(0 until 65)
-            val signedKey = issuerData.sliceArray(65 until issuerData.size)
-            return CryptoUtils.verify(cardWalletPublicKey, publicKey, signedKey)
-        }
+        val publicKey = issuerData.sliceArray(0 until 65)
+        val signedKey = issuerData.sliceArray(65 until issuerData.size)
+        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? {
-            return when (getTwinCardNumber(cardId) ?: return null) {
-                TwinCardNumber.First -> {
-                    val index = firstCardSeries.indexOf(cardId.take(4))
-                    secondCardSeries[index]
-                }
-                TwinCardNumber.Second -> {
-                    val index = secondCardSeries.indexOf(cardId.take(4))
-                    firstCardSeries[index]
-                }
-            }
-        }
+    @Suppress("MagicNumber")
+    fun getTwinCardIdForUser(cardId: String): String {
+        if (cardId.length < 16) return cardId
 
-        fun getTwinCardIdForUser(cardId: String): String {
-            if (cardId.length < 16) return cardId
-
-            val twinCardId = cardId.substring(11..14)
-            val twinCardNumber = getTwinCardNumber(cardId)?.number ?: 1
-            return "$twinCardId #$twinCardNumber"
-        }
-
-        private val firstCardSeries = listOf("CB61", "CB64")
-        private val secondCardSeries = listOf("CB62", "CB65")
+        val twinCardId = cardId.substring(11..14)
+        val twinCardNumber = getTwinCardNumber(cardId)?.number ?: 1
+        return "$twinCardId #$twinCardNumber"
     }
 }
 
@@ -65,14 +41,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/Blockchain.kt b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
index 0fde777794..f8bb58f3f1 100644
--- a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
+++ b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
@@ -2,6 +2,7 @@ package com.tangem.domain.common.extensions
 
 import com.tangem.blockchain.common.Blockchain
 
+@Suppress("ComplexMethod")
 fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
     return when (networkId) {
         "arbitrum-one" -> Blockchain.Arbitrum
@@ -48,11 +49,11 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
         "optimistic-ethereum/test" -> Blockchain.OptimismTestnet
         "dash" -> Blockchain.Dash
         "sxdai" -> Blockchain.SaltPay
-        "sxdai/test" -> Blockchain.SaltPayTestnet
         else -> null
     }
 }
 
+@Suppress("ComplexMethod")
 fun Blockchain.toNetworkId(): String {
     return when (this) {
         Blockchain.Unknown -> "unknown"
@@ -101,10 +102,10 @@ fun Blockchain.toNetworkId(): String {
         Blockchain.OptimismTestnet -> "optimistic-ethereum/test"
         Blockchain.Dash -> "dash"
         Blockchain.SaltPay -> "sxdai"
-        Blockchain.SaltPayTestnet -> "sxdai/test"
     }
 }
 
+@Suppress("ComplexMethod")
 fun Blockchain.toCoinId(): String {
     return when (this) {
         Blockchain.Binance, Blockchain.BinanceTestnet, Blockchain.BSC, Blockchain.BSCTestnet -> "binancecoin"
@@ -133,7 +134,7 @@ fun Blockchain.toCoinId(): String {
         Blockchain.Kusama -> "kusama"
         Blockchain.Optimism, Blockchain.OptimismTestnet -> "ethereum"
         Blockchain.Dash -> "dash"
-        Blockchain.SaltPay, Blockchain.SaltPayTestnet -> "xdai"
+        Blockchain.SaltPay -> "xdai"
         Blockchain.Unknown -> "unknown"
     }
 }
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/ResultCardSdk.kt b/domain/src/main/java/com/tangem/domain/common/extensions/ResultCardSdk.kt
index d3d0f8e112..ea01ed7eaa 100644
--- a/domain/src/main/java/com/tangem/domain/common/extensions/ResultCardSdk.kt
+++ b/domain/src/main/java/com/tangem/domain/common/extensions/ResultCardSdk.kt
@@ -18,5 +18,4 @@ inline fun <T> CompletionResult<T>.successOr(failureClause: (CompletionResult.Fa
         is CompletionResult.Success -> this.data
         is CompletionResult.Failure -> failureClause(this)
     }
-}
-
+}
\ 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
deleted file mode 100644
index 3304349b69..0000000000
--- a/domain/src/main/java/com/tangem/domain/common/extensions/TangemTechService.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-
-suspend fun TangemTechService.getTokens(
-    contractAddress: String,
-    networkId: String? = null,
-    active: Boolean? = null,
-): Result<CoinsResponse> = coins(
-            contractAddress = contractAddress,
-            networkIds = networkId,
-            active = active
-        )
-
-suspend fun TangemTechService.getListOfCoins(
-    networkIds: List<String>,
-    active: Boolean? = null,
-    searchText: String? = null,
-    offset: Int? = null,
-    limit: Int? = null
-): Result<CoinsResponse> = coins(
-            networkIds = networkIds.joinToString(","),
-            active = active,
-            searchText = searchText,
-            offset = offset,
-            limit = limit
-        )
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/form/FieldDataConverters.kt b/domain/src/main/java/com/tangem/domain/common/form/FieldDataConverters.kt
index a0cd94a04f..f4800c7223 100644
--- a/domain/src/main/java/com/tangem/domain/common/form/FieldDataConverters.kt
+++ b/domain/src/main/java/com/tangem/domain/common/form/FieldDataConverters.kt
@@ -12,7 +12,7 @@ interface DataConverterVisitor<Data, Result> {
 
 interface FieldDataConverter<Result> : DataConverterVisitor<FieldData, Result>
 
-abstract class BaseFieldDataConverter<Result>() : FieldDataConverter<Result> {
+abstract class BaseFieldDataConverter<Result> : FieldDataConverter<Result> {
     protected val collectIds: List<FieldId>
         get() = getIdToCollect()
 
@@ -31,7 +31,7 @@ abstract class BaseFieldDataConverter<Result>() : FieldDataConverter<Result> {
 
 class FieldToJsonConverter(
     private val fieldsToConvert: List<FieldId> = listOf(),
-    protected val jsonConverter: MoshiJsonConverter
+    protected val jsonConverter: MoshiJsonConverter,
 ) : BaseFieldDataConverter<String>() {
 
     override fun getConvertedData(): String = jsonConverter.toJson(collectedData, "  ")
diff --git a/domain/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt b/domain/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt
index 53147c46b8..8f5e7dfd00 100644
--- a/domain/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt
+++ b/domain/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt
@@ -13,26 +13,34 @@ import timber.log.Timber
 /**
 [REDACTED_AUTHOR]
  */
-abstract class CustomTokenValidator<T> : Validator<T, AddCustomTokenError>
+interface CustomTokenValidator<T> : Validator<T, AddCustomTokenError>
 
-class StringIsEmptyValidator : CustomTokenValidator<String>() {
+class StringIsEmptyValidator : CustomTokenValidator<String> {
     override fun validate(data: String?): AddCustomTokenError? = when {
         data == null || data.isEmpty() -> null
         else -> AddCustomTokenError.FieldIsNotEmpty
     }
 }
 
-class StringIsNotEmptyValidator : CustomTokenValidator<String>() {
+class StringIsNotEmptyValidator : CustomTokenValidator<String> {
     override fun validate(data: String?): AddCustomTokenError? = when {
         data == null || data.isEmpty() -> AddCustomTokenError.FieldIsEmpty
         else -> null
     }
 }
 
-class TokenContractAddressValidator : CustomTokenValidator<String>() {
+class TokenContractAddressValidator : CustomTokenValidator<String> {
 
     private var blockchain: Blockchain = Blockchain.Unknown
 
+    private val successAddressValidator = object : AddressService() {
+        override fun makeAddress(walletPublicKey: ByteArray, curve: EllipticCurve?): String {
+            throw UnsupportedOperationException()
+        }
+
+        override fun validate(address: String): Boolean = true
+    }
+
     fun nextValidationFor(blockchain: Blockchain) {
         this.blockchain = blockchain
     }
@@ -63,32 +71,25 @@ class TokenContractAddressValidator : CustomTokenValidator<String>() {
             }
         }
     }
-
-    private val successAddressValidator = object : AddressService() {
-        override fun makeAddress(walletPublicKey: ByteArray, curve: EllipticCurve?): String {
-            throw UnsupportedOperationException()
-        }
-
-        override fun validate(address: String): Boolean = true
-    }
 }
 
-class TokenNetworkValidator : CustomTokenValidator<Blockchain>() {
+class TokenNetworkValidator : CustomTokenValidator<Blockchain> {
     override fun validate(data: Blockchain?): AddCustomTokenError? = when (data) {
         null, Blockchain.Unknown -> AddCustomTokenError.NetworkIsNotSelected
         else -> null
     }
 }
 
-class TokenNameValidator : CustomTokenValidator<String>() {
+class TokenNameValidator : CustomTokenValidator<String> {
     override fun validate(data: String?): AddCustomTokenError? = StringIsNotEmptyValidator().validate(data)
 }
 
-class TokenSymbolValidator : CustomTokenValidator<String>() {
+class TokenSymbolValidator : CustomTokenValidator<String> {
     override fun validate(data: String?): AddCustomTokenError? = StringIsNotEmptyValidator().validate(data)
 }
 
-class TokenDecimalsValidator : CustomTokenValidator<String>() {
+@Suppress("MagicNumber")
+class TokenDecimalsValidator : CustomTokenValidator<String> {
     override fun validate(data: String?): AddCustomTokenError? {
         val decimal = data?.toIntOrNull() ?: return AddCustomTokenError.FieldIsEmpty
 
diff --git a/domain/src/main/java/com/tangem/domain/common/form/Form.kt b/domain/src/main/java/com/tangem/domain/common/form/Form.kt
index 7cf9b4e41d..b63423436e 100644
--- a/domain/src/main/java/com/tangem/domain/common/form/Form.kt
+++ b/domain/src/main/java/com/tangem/domain/common/form/Form.kt
@@ -59,4 +59,4 @@ abstract class BaseDataField<T>(
     override fun visitDataConverter(dataConverter: FieldDataConverter<*>) {
         dataConverter.visit(getData())
     }
-}
+}
\ No newline at end of file
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..17c22839fd
--- /dev/null
+++ b/domain/src/main/java/com/tangem/domain/common/util/UserWalletId.kt
@@ -0,0 +1,34 @@
+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()
+    }
+
+    @Suppress("MagicNumber")
+    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/common/util/ValueDebouncer.kt b/domain/src/main/java/com/tangem/domain/common/util/ValueDebouncer.kt
index 919157a26c..4296bf4c3f 100644
--- a/domain/src/main/java/com/tangem/domain/common/util/ValueDebouncer.kt
+++ b/domain/src/main/java/com/tangem/domain/common/util/ValueDebouncer.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.onEach
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("MagicNumber")
 class ValueDebouncer<T>(
     private val initialValue: T,
     private val debounceDuration: Long = 400,
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..2296da1914 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
@@ -1,15 +1,16 @@
 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.TangemTechApi
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
 
 /**
 [REDACTED_AUTHOR]
  */
 class AddCustomTokenService(
-    private val tangemTechService: TangemTechService,
+    private val tangemTechApi: TangemTechApi,
+    private val dispatchers: CoroutineDispatcherProvider,
     private val supportedTokenNetworkIds: List<String>,
 ) {
 
@@ -17,13 +18,17 @@ class AddCustomTokenService(
         contractAddress: String,
         networkId: String? = null,
         active: Boolean? = null,
-    ): Result<List<CoinsResponse.Coin>> {
-        val networksIds = selectNetworksForSearch(networkId)
-        val result = tangemTechService.getTokens(contractAddress, networksIds, active)
-        return when (result) {
-            is Result.Success -> {
+    ): List<CoinsResponse.Coin> = withContext(dispatchers.io) {
+        runCatching {
+            tangemTechApi.getCoins(
+                contractAddress = contractAddress,
+                networkIds = selectNetworksForSearch(networkId),
+                active = active,
+            )
+        }
+            .onSuccess { response ->
                 var coinsList = mutableListOf<CoinsResponse.Coin>()
-                result.data.coins.forEach { coin ->
+                response.coins.forEach { coin ->
                     val networksWithTheSameAddress = coin.networks
                         .filter { it.contractAddress != null || it.decimalCount != null }
                         .filter { it.contractAddress?.equals(contractAddress, ignoreCase = true) == true }
@@ -37,10 +42,13 @@ class AddCustomTokenService(
                     // https://tangem.slack.com/archives/GMXC6PP71/p1649672562078679
                     coinsList = mutableListOf(coinsList[0])
                 }
-                Result.Success(coinsList)
+                return@withContext coinsList
             }
-            is Result.Failure -> result
-        }
+            .onFailure {
+                return@withContext emptyList()
+            }
+
+        error("Unreachable code because runCatching must return result")
     }
 
     private fun selectNetworksForSearch(networkId: String?): String {
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
index a09d2f3907..fd1a47b728 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
@@ -18,11 +18,11 @@ sealed class CustomCurrency(
 
     class CustomBlockchain(
         network: Blockchain,
-        derivationPath: DerivationPath?
+        derivationPath: DerivationPath?,
     ) : CustomCurrency(network, derivationPath) {
 
         class Converter(
-            private val derivationStyle: DerivationStyle?
+            private val derivationStyle: DerivationStyle?,
         ) : BaseFieldDataConverter<CustomBlockchain>() {
             override fun getConvertedData(): CustomBlockchain {
                 val mainNetwork = collectedData[CustomTokenFieldId.Network] as Blockchain
@@ -30,24 +30,25 @@ sealed class CustomCurrency(
                 val derivationPath = AddCustomTokenState.getDerivationPath(
                     mainNetwork,
                     derivationPathNetwork,
-                    derivationStyle
+                    derivationStyle,
                 )
                 return CustomBlockchain(mainNetwork, derivationPath)
             }
 
-            override fun getIdToCollect(): List<FieldId> = listOf(CustomTokenFieldId.Network, CustomTokenFieldId.DerivationPath)
+            override fun getIdToCollect(): List<FieldId> =
+                listOf(CustomTokenFieldId.Network, CustomTokenFieldId.DerivationPath)
         }
     }
 
     class CustomToken(
         val token: Token,
         network: Blockchain,
-        derivationPath: DerivationPath?
+        derivationPath: DerivationPath?,
     ) : CustomCurrency(network, derivationPath) {
 
         class Converter(
             private val tokenId: String?,
-            private val derivationStyle: DerivationStyle?
+            private val derivationStyle: DerivationStyle?,
         ) : BaseFieldDataConverter<CustomToken>() {
 
             override fun getConvertedData(): CustomToken {
@@ -56,7 +57,7 @@ sealed class CustomCurrency(
                 val derivationPath = AddCustomTokenState.getDerivationPath(
                     mainNetwork,
                     derivationPathNetwork,
-                    derivationStyle
+                    derivationStyle,
                 )
 
                 val token = Token(
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..c2ae9ff018 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
@@ -2,13 +2,13 @@ package com.tangem.domain.features.addCustomToken.redux
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.DerivationStyle
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
 import com.tangem.domain.AddCustomTokenError
 import com.tangem.domain.DomainWrapped
 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 org.rekotlin.Action
 
 /**
@@ -31,7 +31,10 @@ sealed class AddCustomTokenAction : Action {
     data class OnTokenNetworkChanged(val blockchainNetwork: Field.Data<Blockchain>) : AddCustomTokenAction()
     data class OnTokenNameChanged(val tokenName: Field.Data<String>) : AddCustomTokenAction()
     data class OnTokenSymbolChanged(val tokenSymbol: Field.Data<String>) : AddCustomTokenAction()
-    data class OnTokenDerivationPathChanged(val blockchainDerivationPath: Field.Data<Blockchain>) : AddCustomTokenAction()
+    data class OnTokenDerivationPathChanged(
+        val blockchainDerivationPath: Field.Data<Blockchain>,
+    ) : AddCustomTokenAction()
+
     data class OnTokenDecimalsChanged(val tokenDecimals: Field.Data<String>) : AddCustomTokenAction()
     object OnAddCustomTokenClicked : AddCustomTokenAction()
 
@@ -51,7 +54,7 @@ sealed class AddCustomTokenAction : Action {
         data class Remove(val warnings: Set<AddCustomTokenError.Warning>) : Warning()
         data class Replace(
             val remove: Set<AddCustomTokenError.Warning>,
-            val add: Set<AddCustomTokenError.Warning>
+            val add: Set<AddCustomTokenError.Warning>,
         ) : Warning()
     }
 
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..ba47bee24f 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
@@ -3,7 +3,7 @@ package com.tangem.domain.features.addCustomToken.redux
 import android.webkit.ValueCallback
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.extensions.guard
-import com.tangem.common.services.Result
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
 import com.tangem.domain.AddCustomTokenError
 import com.tangem.domain.AddCustomTokenError.Warning.PotentialScamToken
 import com.tangem.domain.AddCustomTokenError.Warning.TokenAlreadyAdded
@@ -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.utils.coroutines.AppCoroutineDispatcherProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -66,6 +66,7 @@ import timber.log.Timber
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("LargeClass")
 internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomTokenHub") {
 
     private val hubState: AddCustomTokenState
@@ -79,10 +80,11 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
         return storeState.copy(addCustomTokensState = newHubState)
     }
 
+    @Suppress("ComplexMethod")
     override suspend fun handleAction(
         action: Action,
         storeState: DomainState,
-        cancel: ValueCallback<Action>
+        cancel: ValueCallback<Action>,
     ) {
         if (action !is AddCustomTokenAction) return
 
@@ -225,18 +227,20 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
             val derivationField = DerivationPath.getField<TokenDerivationPathField>()
             derivationField.data = derivationField.data.copy(
                 value = Blockchain.Unknown,
-                isUserInput = false
+                isUserInput = false,
             )
             state.setField(derivationField)
             dispatchOnMain(UpdateForm(hubState))
         }
 
         if (state.screenState.derivationPath.isEnabled != derivationIsSupportedByNetwork) {
-            val action = Screen.UpdateTokenFields(listOf(
-                DerivationPath to state.screenState.derivationPath.copy(
-                    isEnabled = derivationIsSupportedByNetwork,
+            val action = Screen.UpdateTokenFields(
+                listOf(
+                    DerivationPath to state.screenState.derivationPath.copy(
+                        isEnabled = derivationIsSupportedByNetwork,
+                    ),
                 ),
-            ))
+            )
             dispatchOnMain(action)
         }
     }
@@ -297,10 +301,12 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
             }
         }
 
-        dispatchOnMain(Warning.Replace(
-            remove = warningsRemove,
-            add = warningsAdd,
-        ))
+        dispatchOnMain(
+            Warning.Replace(
+                remove = warningsRemove,
+                add = warningsAdd,
+            ),
+        )
     }
 
     private suspend fun updateAddButton() {
@@ -340,9 +346,8 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
         }
     }
 
-    private suspend fun requestInfoAboutToken(
-        contractAddress: String,
-    ): List<CoinsResponse.Coin> {
+    @Suppress("MagicNumber")
+    private suspend fun requestInfoAboutToken(contractAddress: String): List<CoinsResponse.Coin> {
         val tangemTechServiceManager = requireNotNull(hubState.tangemTechServiceManager)
         dispatchOnMain(Screen.UpdateTokenFields(listOf(ContractAddress to ViewStates.TokenField(isLoading = true))))
 
@@ -355,15 +360,8 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
         // got the result faster than 500ms and the delay would only be the difference between them.
         delay(500)
 
-        val foundTokensResult = tangemTechServiceManager.findToken(contractAddress, selectedNetworkId)
-        val result = when (foundTokensResult) {
-            is Result.Success -> foundTokensResult.data
-            is Result.Failure -> {
-//                val warning = Warning.Network.CheckAddressRequestError
-//                dispatchOnMain(Warning.Add(setOf(warning)))
-                emptyList()
-            }
-        }
+        val result = tangemTechServiceManager.findToken(contractAddress, selectedNetworkId)
+
         dispatchOnMain(Screen.UpdateTokenFields(listOf(ContractAddress to ViewStates.TokenField(isLoading = false))))
         return result
     }
@@ -380,7 +378,7 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
         tokenId: String? = hubState.foundToken?.id,
         tokenContractAddress: String = ContractAddress.getFieldValue(),
         tokenNetworkId: String = Network.getFieldValue<Blockchain>().toNetworkId(),
-        selectedDerivation: Blockchain = DerivationPath.getFieldValue()
+        selectedDerivation: Blockchain = DerivationPath.getFieldValue(),
     ): Boolean {
         val savedCurrencies = hubState.appSavedCurrencies ?: return false
 
@@ -393,6 +391,7 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
                     val sameAddress = tokenContractAddress == wrappedCurrency.token.contractAddress
                     val sameBlockchain = Blockchain.fromNetworkId(tokenNetworkId) == wrappedCurrency.blockchain
                     val sameDerivationPath = derivationPath?.rawPath == wrappedCurrency.derivationPath
+                    @Suppress("ComplexCondition")
                     if (sameId && sameAddress && sameBlockchain && sameDerivationPath) {
                         return true
                     }
@@ -404,7 +403,7 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
 
     private fun isBlockchainPersistIntoAppSavedTokensList(
         selectedNetwork: Blockchain = Network.getFieldValue(),
-        selectedDerivation: Blockchain = DerivationPath.getFieldValue()
+        selectedDerivation: Blockchain = DerivationPath.getFieldValue(),
     ): Boolean {
         val state = hubState
         val savedCurrencies = state.appSavedCurrencies ?: return false
@@ -424,17 +423,14 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
     }
 
     private fun getDerivationPathFromSelectedBlockchain(
-        selectedDerivationBlockchain: Blockchain
+        selectedDerivationBlockchain: Blockchain,
     ): com.tangem.common.hdWallet.DerivationPath? = AddCustomTokenState.getDerivationPath(
         mainNetwork = Network.getFieldValue(),
         derivationNetwork = selectedDerivationBlockchain,
-        derivationStyle = hubState.cardDerivationStyle
+        derivationStyle = hubState.cardDerivationStyle,
     )
 
-    private suspend fun fillTokenFields(
-        token: CoinsResponse.Coin,
-        coinNetwork: CoinsResponse.Coin.Network,
-    ) {
+    private suspend fun fillTokenFields(token: CoinsResponse.Coin, coinNetwork: CoinsResponse.Coin.Network) {
         val blockchain = Blockchain.fromNetworkId(coinNetwork.networkId) ?: Blockchain.Unknown
         Network.setFieldValue(Field.Data(blockchain, false))
         Name.setFieldValue(Field.Data(token.name, false))
@@ -460,11 +456,13 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
 
     private suspend fun enableDisableTokenDetailFields(isEnabled: Boolean = true) {
         val state = hubState
-        val action = Screen.UpdateTokenFields(listOf(
-            Name to state.screenState.name.copy(isEnabled = isEnabled),
-            Symbol to state.screenState.symbol.copy(isEnabled = isEnabled),
-            Decimals to state.screenState.decimals.copy(isEnabled = isEnabled),
-        ))
+        val action = Screen.UpdateTokenFields(
+            listOf(
+                Name to state.screenState.name.copy(isEnabled = isEnabled),
+                Symbol to state.screenState.symbol.copy(isEnabled = isEnabled),
+                Decimals to state.screenState.decimals.copy(isEnabled = isEnabled),
+            ),
+        )
         dispatchOnMain(action)
     }
 
@@ -488,7 +486,8 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
     @Throws
     private fun throwUnAppropriateInitialization(objName: String) {
         throw AddCustomTokenError.UnAppropriateInitialization(
-            "AddCustomTokenHub", "$objName must be not NULL"
+            "AddCustomTokenHub",
+            "$objName must be not NULL",
         )
     }
 
@@ -573,16 +572,14 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
     private suspend fun AddCustomTokenError.Warning.remove() {
         dispatchOnMain(Warning.Remove(setOf(this)))
     }
-
-    private suspend fun AddCustomTokenError.Warning.replaceBy(to: AddCustomTokenError.Warning) {
-        dispatchOnMain(Warning.Replace(setOf(this), setOf(to)))
-    }
 }
 
+@Suppress("ComplexMethod")
 private class AddCustomTokenReducer(
     private val globalState: DomainGlobalState,
 ) : ReStoreReducer<AddCustomTokenState> {
 
+    @Suppress("LongMethod")
     override fun reduceAction(action: Action, state: AddCustomTokenState): AddCustomTokenState {
         return when (action) {
             is Init.SetAddedCurrencies -> {
@@ -597,8 +594,9 @@ private class AddCustomTokenReducer(
                     .filter { it.canHandleTokens() }
                     .map { it.toNetworkId() }
                 val tangemTechServiceManager = AddCustomTokenService(
-                    tangemTechService = globalState.networkServices.tangemTechService,
-                    supportedTokenNetworkIds = supportedTokenNetworkIds
+                    tangemTechApi = globalState.networkServices.tangemTechService.api,
+                    dispatchers = AppCoroutineDispatcherProvider(),
+                    supportedTokenNetworkIds = supportedTokenNetworkIds,
                 )
                 val form = Form(AddCustomTokenState.createFormFields(card, CustomTokenType.Blockchain))
                 state.copy(
@@ -745,5 +743,4 @@ private class AddCustomTokenReducer(
     private fun updateFormState(state: AddCustomTokenState): AddCustomTokenState {
         return state.copy(form = Form(state.form.fieldList))
     }
-
 }
\ No newline at end of file
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..829077bc70 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,11 @@ 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.datasource.api.tangemTech.models.CoinsResponse
 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 +38,6 @@ 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 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,15 +204,18 @@ 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() }
 
             val additionalBlockchains = listOf(
-                Blockchain.Binance, Blockchain.BinanceTestnet,
-                Blockchain.Solana, Blockchain.SolanaTestnet,
-                Blockchain.Tron, Blockchain.TronTestnet,
+                Blockchain.Binance,
+                Blockchain.BinanceTestnet,
+                Blockchain.Solana,
+                Blockchain.SolanaTestnet,
+                Blockchain.Tron,
+                Blockchain.TronTestnet,
             )
 
             val supportedByCard = when (type) {
@@ -239,7 +242,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() }
@@ -265,7 +268,7 @@ data class AddCustomTokenState(
         private var builder: StringBuilder = StringBuilder()
 
         override fun convert(action: Action, stateHolder: DomainState): String? {
-            val action = (action as? AddCustomTokenAction) ?: return null
+            val action = action as? AddCustomTokenAction ?: return null
 
             val state = stateHolder.addCustomTokensState
             val fieldConverter =
diff --git a/domain/src/main/java/com/tangem/domain/redux/DomainStore.kt b/domain/src/main/java/com/tangem/domain/redux/DomainStore.kt
index 703ca18a88..fbd4fe3735 100644
--- a/domain/src/main/java/com/tangem/domain/redux/DomainStore.kt
+++ b/domain/src/main/java/com/tangem/domain/redux/DomainStore.kt
@@ -9,8 +9,6 @@ import org.rekotlin.Store
 /**
 [REDACTED_AUTHOR]
  */
-private class DomainStore // for simple search
-
 private val RE_STORE_HUBS: List<ReStoreHub<DomainState, *>> = listOf(
     DomainGlobalHub(),
     AddCustomTokenHub(),
@@ -19,7 +17,7 @@ private val RE_STORE_HUBS: List<ReStoreHub<DomainState, *>> = listOf(
 val domainStore = Store(
     state = DomainState(),
     middleware = RE_STORE_HUBS.map { it.getMiddleware() },
-    reducer = { action, state -> reduce(action, state) }
+    reducer = { action, state -> reduce(action, state) },
 )
 
 private fun reduce(action: Action, domainState: DomainState?): DomainState {
@@ -42,4 +40,4 @@ private fun reduce(action: Action, domainState: DomainState?): DomainState {
     DomainLayer.actionStateLogger.log(reducedStatesByAction)
 
     return assembleReducedDomainState
-}
+}
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/redux/ReStoreHub.kt b/domain/src/main/java/com/tangem/domain/redux/ReStoreHub.kt
index a869c18177..fc2f0df299 100644
--- a/domain/src/main/java/com/tangem/domain/redux/ReStoreHub.kt
+++ b/domain/src/main/java/com/tangem/domain/redux/ReStoreHub.kt
@@ -1,8 +1,8 @@
 package com.tangem.domain.redux
 
 import android.webkit.ValueCallback
-import com.tangem.domain.common.FeatureCoroutineExceptionHandler
 import com.tangem.domain.redux.global.DomainGlobalState
+import com.tangem.utils.coroutines.FeatureCoroutineExceptionHandler
 import kotlinx.coroutines.*
 import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
diff --git a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt
index d58d26a864..f4256b644e 100644
--- a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt
+++ b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt
@@ -7,7 +7,7 @@ import org.rekotlin.Action
 /**
 [REDACTED_AUTHOR]
  */
-//TODO: refactoring: is alias for the GlobalAction
+// TODO: refactoring: is alias for the GlobalAction
 sealed class DomainGlobalAction : Action {
     data class SaveScanNoteResponse(val scanResponse: ScanResponse) : DomainGlobalAction()
     data class ShowDialog(val stateDialog: DomainDialog?) : DomainGlobalAction()
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..37f01870cc 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
@@ -2,16 +2,17 @@ package com.tangem.domain.redux.global
 
 import android.webkit.ValueCallback
 import com.tangem.common.extensions.toHexString
+import com.tangem.datasource.utils.RequestHeader
 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.lib.auth.AuthProvider
 import org.rekotlin.Action
 
 /**
 [REDACTED_AUTHOR]
  */
-//TODO: refactoring: is alias for the GlobalMiddleware and the GlobalReducer
+// TODO: refactoring: is alias for the GlobalMiddleware and the GlobalReducer
 internal class DomainGlobalHub : BaseStoreHub<DomainGlobalState>("DomainGlobalHub") {
 
     override fun getHubState(storeState: DomainState): DomainGlobalState {
@@ -22,17 +23,8 @@ internal class DomainGlobalHub : BaseStoreHub<DomainGlobalState>("DomainGlobalHu
         return storeState.copy(globalState = newHubState)
     }
 
-    override suspend fun handleAction(
-        action: Action,
-        storeState: DomainState,
-        cancel: ValueCallback<Action>
-    ) {
+    override suspend fun handleAction(action: Action, storeState: DomainState, cancel: ValueCallback<Action>) {
         if (action !is DomainGlobalAction) return
-
-        val state = storeState.globalState
-
-        when (action) {
-        }
     }
 
     override fun getReducer(): ReStoreReducer<DomainGlobalState> = DomainGlobalReducer()
@@ -43,9 +35,14 @@ private class DomainGlobalReducer : ReStoreReducer<DomainGlobalState> {
     override fun reduceAction(action: Action, state: DomainGlobalState): DomainGlobalState {
         return when (action) {
             is DomainGlobalAction.SaveScanNoteResponse -> {
-                val cardPublicKeyHex = action.scanResponse.card.cardPublicKey.toHexString()
-                state.networkServices.tangemTechService.addHeaderInterceptors(
-                    listOf(CardPublicKeyHttpInterceptor(cardPublicKeyHex))
+                val card = action.scanResponse.card
+                state.networkServices.tangemTechService.addAuthenticationHeader(
+                    RequestHeader.AuthenticationHeader(
+                        object : AuthProvider {
+                            override fun getCardPublicKey(): String = card.cardPublicKey.toHexString()
+                            override fun getCardId(): String = card.cardId
+                        },
+                    ),
                 )
                 state.copy(scanResponse = action.scanResponse)
             }
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..231584ecf6 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
@@ -1,10 +1,9 @@
 package com.tangem.domain.redux.global
 
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
+import com.tangem.datasource.api.tangemTech.TangemTechService
 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
 
 /**
 [REDACTED_AUTHOR]
@@ -19,6 +18,6 @@ data class DomainGlobalState(
 )
 
 data class NetworkServices(
-    val tangemTechService: TangemTechService = TangemTechService(LogConfig.network.tangemTechService),
-    val paymentologyService: PaymentologyApiService = PaymentologyApiService(LogConfig.network.paymentologyApiService),
-)
+    val tangemTechService: TangemTechService = TangemTechService,
+    val paymentologyService: PaymentologyApiService = PaymentologyApiService,
+)
\ No newline at end of file
diff --git a/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt b/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt
index b6e967037c..292d9e5e06 100644
--- a/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt
+++ b/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt
@@ -16,7 +16,7 @@ class BlockchainTests {
                 remove(Blockchain.Optimism)
             }
             .map { it to Blockchain.fromNetworkId(it.toNetworkId()) }
-            .mapNotNull { if(it.second == null) it.first else null }
+            .mapNotNull { if (it.second == null) it.first else null }
 
         Truth.assertThat(unimplementedIds).isEmpty()
     }
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 80c3fdc825..93ecf5d376 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -24,7 +24,11 @@ platform :android do
   desc "Runs all the tests"
   lane :test do
     gradle(
-	  task: "test")
+        task: "clean assemble",
+        build_type: "Debug"
+    )
+    gradle(task: "detekt")
+    gradle(task: "test")
   end
 
   desc "Build a signed release APK"
diff --git a/fastlane/README.md b/fastlane/README.md
index 5a974e90ae..4d1e079727 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -1,44 +1,56 @@
 fastlane documentation
-================
+----
+
 # Installation
 
 Make sure you have the latest version of the Xcode command line tools installed:
 
-```
+```sh
 xcode-select --install
 ```
 
-Install _fastlane_ using
-```
-[sudo] gem install fastlane -NV
-```
-or alternatively using `brew install fastlane`
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
 
 # Available Actions
+
 ## Android
+
 ### android test
+
+```sh
+[bundle exec] fastlane android test
 ```
-fastlane android test
-```
+
 Runs all the tests
+
 ### android release
+
+```sh
+[bundle exec] fastlane android release
 ```
-fastlane android release
-```
+
 Build a signed release APK
+
 ### android build
+
+```sh
+[bundle exec] fastlane android build
 ```
-fastlane android build
-```
+
 Build debug and release APKs
+
 ### android beta
+
+```sh
+[bundle exec] fastlane android beta
 ```
-fastlane android beta
-```
+
 Submit a new Beta Build to Firebase App Distribution
 
 ----
 
-This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
-More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
-The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
\ No newline at end of file
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
\ No newline at end of file
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..11ee37cff4
--- /dev/null
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt
@@ -0,0 +1,60 @@
+package com.tangem.feature.referral.converters
+
+import com.tangem.datasource.api.tangemTech.models.ReferralResponse
+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.awards.firstOrNull()?.amount ?: 0,
+                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.awards.firstOrNull()?.amount ?: 0,
+                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<ReferralResponse.Conditions.Award.Token, TokenData> {
+
+    override fun convert(value: ReferralResponse.Conditions.Award.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..371254979a
--- /dev/null
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
@@ -0,0 +1,43 @@
+package com.tangem.feature.referral.data
+
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.api.tangemTech.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
+import javax.inject.Inject
+
+internal class ReferralRepositoryImpl @Inject constructor(
+    private val referralApi: TangemTechApi,
+    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..1f723fe16f
--- /dev/null
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/di/ReferralRepositoryModule.kt
@@ -0,0 +1,31 @@
+package com.tangem.feature.referral.di
+
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+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(
+        tangemTechApi: TangemTechApi,
+        referralConverter: ReferralConverter,
+        coroutineDispatcherProvider: CoroutineDispatcherProvider,
+    ): ReferralRepository {
+        return ReferralRepositoryImpl(
+            referralApi = tangemTechApi,
+            referralConverter = referralConverter,
+            coroutineDispatcher = 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..c7943b3cb6
--- /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.networkId)
+            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..a477782d9f
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/converter/TokensConverter.kt
@@ -0,0 +1,34 @@
+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.Currency.NativeToken
+import com.tangem.lib.crypto.models.Currency.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..f991068cd5
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/di/ReferralDomainModule.kt
@@ -0,0 +1,34 @@
+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(
+            repository = referralRepository,
+            derivationManager = derivationManager,
+            userWalletManager = userWalletManager,
+            tokensConverter = 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..7096e631c0
--- /dev/null
+++ b/features/referral/presentation/build.gradle.kts
@@ -0,0 +1,77 @@
+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:analytics"))
+    implementation(project(":core:res"))
+    implementation(project(":core:utils"))
+    implementation(project(":core:ui"))
+
+    /** AndroidX */
+    implementation(AndroidX.appCompat)
+    implementation(AndroidX.fragmentKtx)
+    implementation(AndroidX.lifecycleViewModelKtx)
+    implementation(Library.materialComponent)
+
+    /** Compose */
+    implementation(Compose.foundation)
+    implementation(Compose.material)
+    implementation(Compose.uiTooling)
+
+    /** Domain */
+    implementation(project(":features:referral:domain"))
+
+    /** Other libraries */
+    implementation(Library.composeShimmer)
+    implementation(Library.accompanistWebView)
+
+    /** 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..938566bd50
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt
@@ -0,0 +1,41 @@
+package com.tangem.feature.referral
+
+import android.os.Bundle
+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 androidx.transition.TransitionInflater
+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)))
+        viewModel.onScreenOpened()
+        return ComposeView(inflater.context).apply {
+            isTransitionGroup = true
+            setContent {
+                ReferralScreen(stateHolder = viewModel.uiState)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/analytics/ReferralEvents.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/analytics/ReferralEvents.kt
new file mode 100644
index 0000000000..41d4f8b1c0
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/analytics/ReferralEvents.kt
@@ -0,0 +1,16 @@
+package com.tangem.feature.referral.analytics
+
+import com.tangem.core.analytics.AnalyticsEvent
+
+sealed class ReferralEvents(
+    event: String,
+) : AnalyticsEvent(REFERRAL_PROGRAM_CATEGORY, event) {
+
+    object ReferralScreenOpened : ReferralEvents(event = "Referral Screen Opened")
+    object ClickParticipate : ReferralEvents(event = "Button - Participate")
+    object ClickCopy : ReferralEvents(event = "Button - Copy")
+    object ClickShare : ReferralEvents(event = "Button - Share")
+    object ClickTaC : ReferralEvents(event = "Link - TaC")
+}
+
+private const val REFERRAL_PROGRAM_CATEGORY = "Referral program"
\ 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..90e8def3d6
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
@@ -0,0 +1,52 @@
+package com.tangem.feature.referral.models
+
+internal data class ReferralStateHolder(
+    val headerState: HeaderState,
+    val referralInfoState: ReferralInfoState,
+    val errorSnackbar: ErrorSnackbar? = null,
+    val analytics: Analytics,
+) {
+
+    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,
+    )
+
+    data class Analytics(
+        val onAgreementClicked: () -> Unit,
+        val onCopyClicked: () -> Unit,
+        val onShareClicked: () -> Unit,
+    )
+}
\ No newline at end of file
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..2a1c5b1e86
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt
@@ -0,0 +1,72 @@
+package com.tangem.feature.referral.ui
+
+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.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.google.accompanist.web.WebView
+import com.google.accompanist.web.rememberWebViewState
+import com.tangem.core.ui.components.appbar.AppBarWithAdditionalButtons
+import com.tangem.core.ui.components.atoms.Hand
+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 = TangemTheme.colors.background.secondary)
+            .fillMaxWidth()
+            .height(LocalConfiguration.current.screenHeightDp.dp - TangemTheme.dimens.spacing16),
+    ) {
+        Hand()
+        Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
+            AppBarWithAdditionalButtons(text = stringResource(id = R.string.details_referral_title))
+            AgreementHtmlView(url = url)
+        }
+    }
+}
+
+@Composable
+private fun AgreementHtmlView(url: String) {
+    val state = rememberWebViewState(url)
+    WebView(
+        state = state,
+        modifier = Modifier.background(TangemTheme.colors.background.secondary),
+        onCreated = {
+            it.settings.apply {
+                javaScriptEnabled = false
+                allowFileAccess = false
+            }
+        },
+    )
+}
+
+@Preview
+@Composable
+private fun Preview_AgreementBottomSheet_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AgreementBottomSheetContent(url = "https://tangem.com/en/")
+    }
+}
+
+@Preview
+@Composable
+private 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..c143b3b4e5
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt
@@ -0,0 +1,73 @@
+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.runtime.Composable
+import androidx.compose.ui.Modifier
+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.feature.referral.presentation.R
+
+@Composable
+internal fun AgreementText(@StringRes firstPartResId: Int, onClick: () -> Unit) {
+    val agreementText = annotatedAgreementString(firstPart = stringResource(firstPartResId))
+    ClickableText(
+        text = agreementText,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = TangemTheme.dimens.spacing54),
+        style = TangemTheme.typography.caption.copy(textAlign = TextAlign.Center),
+        maxLines = 2,
+        onClick = {
+            val clickableSpanStyle = requireNotNull(agreementText.spanStyles.getOrNull(1))
+            if (it in clickableSpanStyle.start..clickableSpanStyle.end) {
+                onClick()
+            }
+        },
+    )
+}
+
+@Composable
+private fun annotatedAgreementString(firstPart: String): AnnotatedString {
+    return buildAnnotatedString {
+        withStyle(SpanStyle(color = TangemTheme.colors.text.tertiary)) {
+            append("$firstPart ")
+        }
+        withStyle(SpanStyle(color = TangemTheme.colors.text.accent)) {
+            append(stringResource(id = R.string.common_terms_and_conditions))
+        }
+        withStyle(SpanStyle(color = TangemTheme.colors.text.tertiary)) {
+            append(" ${stringResource(id = R.string.referral_tos_suffix)}")
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_AgreementText_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Box(modifier = Modifier.background(TangemTheme.colors.background.primary)) {
+            AgreementText(firstPartResId = R.string.referral_tos_not_enroled_prefix, onClick = {})
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_AgreementText_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        Box(modifier = Modifier.background(TangemTheme.colors.background.primary)) {
+            AgreementText(firstPartResId = R.string.referral_tos_not_enroled_prefix, onClick = {})
+        }
+    }
+}
\ 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..78a8239dc0
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/NonParticipateBottomBlock.kt
@@ -0,0 +1,48 @@
+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.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.PrimaryEndIconButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.referral.presentation.R
+
+@Composable
+internal fun NonParticipateBottomBlock(onAgreementClick: () -> Unit, onParticipateClick: () -> Unit) {
+    Column {
+        AgreementText(
+            firstPartResId = R.string.referral_tos_not_enroled_prefix,
+            onClick = onAgreementClick,
+        )
+        PrimaryEndIconButton(
+            modifier = Modifier.padding(all = TangemTheme.dimens.spacing16),
+            text = stringResource(id = R.string.referral_button_participate),
+            iconResId = R.drawable.ic_tangem_24,
+            onClick = onParticipateClick,
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_NonParticipateBottomBlock_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Column(Modifier.background(TangemTheme.colors.background.primary)) {
+            NonParticipateBottomBlock(onAgreementClick = {}, onParticipateClick = {})
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_NonParticipateBottomBlock_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        Column(Modifier.background(TangemTheme.colors.background.primary)) {
+            NonParticipateBottomBlock(onAgreementClick = {}, onParticipateClick = {})
+        }
+    }
+}
\ 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..169fb81271
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt
@@ -0,0 +1,190 @@
+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.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.feature.referral.presentation.R
+
+@Suppress("LongParameterList")
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+internal fun ParticipateBottomBlock(
+    purchasedWalletCount: Int,
+    code: String,
+    shareLink: String,
+    onAgreementClick: () -> Unit,
+    onShowCopySnackbar: () -> Unit,
+    onCopyClick: () -> Unit,
+    onShareClick: () -> 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,
+            onShowCopySnackbar = onShowCopySnackbar,
+            onCopyClick = onCopyClick,
+            onShareClick = onShareClick,
+        )
+        AgreementText(firstPartResId = R.string.referral_tos_enroled_prefix, onClick = onAgreementClick)
+    }
+}
+
+@Composable
+private fun PersonalCodeCard(code: String) {
+    Column(
+        modifier = Modifier
+            .shadow(
+                elevation = TangemTheme.dimens.elevation2,
+                shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+            )
+            .background(
+                color = TangemTheme.colors.background.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 = TangemTheme.colors.text.tertiary,
+            maxLines = 1,
+            style = TangemTheme.typography.subtitle2,
+        )
+        Text(
+            text = code,
+            color = TangemTheme.colors.text.primary1,
+            maxLines = 1,
+            style = TangemTheme.typography.h2,
+        )
+    }
+}
+
+@Composable
+private fun AdditionalButtons(
+    code: String,
+    shareLink: String,
+    onShowCopySnackbar: () -> Unit,
+    onCopyClick: () -> Unit,
+    onShareClick: () -> 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_24,
+            onClick = {
+                onCopyClick.invoke()
+                hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                clipboardManager.setText(AnnotatedString(code))
+                onShowCopySnackbar()
+            },
+        )
+
+        val context = LocalContext.current
+        PrimaryStartIconButton(
+            modifier = Modifier.weight(1f),
+            text = stringResource(id = R.string.common_share),
+            iconResId = R.drawable.ic_share_24,
+            onClick = {
+                onShareClick.invoke()
+                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
+private fun Preview_ParticipateBottomBlock_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Column(Modifier.background(TangemTheme.colors.background.primary)) {
+            ParticipateBottomBlock(
+                purchasedWalletCount = 3,
+                code = "x4JdK",
+                shareLink = "",
+                onAgreementClick = {},
+                onShowCopySnackbar = {},
+                onCopyClick = {},
+                onShareClick = {},
+            )
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_ParticipateBottomBlock_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        Column(Modifier.background(TangemTheme.colors.background.primary)) {
+            ParticipateBottomBlock(
+                purchasedWalletCount = 3,
+                code = "x4JdK",
+                shareLink = "",
+                onAgreementClick = {},
+                onShowCopySnackbar = {},
+                onCopyClick = {},
+                onShareClick = {},
+            )
+        }
+    }
+}
\ 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..ce10a3e537
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
@@ -0,0 +1,610 @@
+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.BoxScope
+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.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.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.TangemColorPalette
+import com.tangem.core.ui.res.TangemTheme
+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
+
+private const val GOOGLE_DOC_LINK_WRAPPER = "https://docs.google.com/viewer?url=%s&embedded=false"
+
+/**
+ * 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 -> String.format(GOOGLE_DOC_LINK_WRAPPER, state.url)
+                        is ReferralInfoState.ParticipantContent -> String.format(GOOGLE_DOC_LINK_WRAPPER, 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,
+                    onAgreementClick = {
+                        stateHolder.analytics.onAgreementClicked.invoke()
+                        coroutineScope.launch {
+                            if (bottomSheetScaffoldState.bottomSheetState.isCollapsed) {
+                                bottomSheetScaffoldState.bottomSheetState.expand()
+                            } else {
+                                bottomSheetScaffoldState.bottomSheetState.collapse()
+                            }
+                        }
+                    },
+                )
+            },
+        )
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun ReferralContent(stateHolder: ReferralStateHolder, onAgreementClick: () -> Unit) {
+    val isCopyButtonPressed = remember { mutableStateOf(false) }
+
+    Box {
+        CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
+            LazyColumn(
+                modifier = Modifier
+                    .background(color = TangemTheme.colors.background.secondary)
+                    .fillMaxSize(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                stickyHeader {
+                    AppBarWithBackButton(
+                        text = stringResource(R.string.details_referral_title),
+                        onBackClick = stateHolder.headerState.onBackClicked,
+                    )
+                }
+                item { Header() }
+                item {
+                    ReferralInfo(
+                        stateHolder = stateHolder,
+                        onAgreementClick = onAgreementClick,
+                        onShowCopySnackbar = { 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 = TangemTheme.colors.text.primary1,
+            textAlign = TextAlign.Center,
+            maxLines = 2,
+            style = TangemTheme.typography.h2,
+        )
+        VerticalSpacer(spaceResId = R.dimen.spacing16)
+    }
+}
+
+@Composable
+private fun ReferralInfo(
+    stateHolder: ReferralStateHolder,
+    onAgreementClick: () -> Unit,
+    onShowCopySnackbar: () -> Unit,
+) {
+    when (val state = stateHolder.referralInfoState) {
+        is ReferralInfoState.ParticipantContent -> {
+            Conditions(state = state)
+            ParticipateBottomBlock(
+                purchasedWalletCount = state.purchasedWalletCount,
+                code = state.code,
+                shareLink = state.shareLink,
+                onAgreementClick = onAgreementClick,
+                onShowCopySnackbar = onShowCopySnackbar,
+                onCopyClick = stateHolder.analytics.onCopyClicked,
+                onShareClick = stateHolder.analytics.onShareClicked,
+            )
+        }
+        is ReferralInfoState.NonParticipantContent -> {
+            Conditions(state = state)
+            VerticalSpacer(spaceResId = R.dimen.spacing44)
+            NonParticipateBottomBlock(
+                onAgreementClick = onAgreementClick,
+                onParticipateClick = state.onParticipateClicked,
+            )
+        }
+        is ReferralInfoState.Loading -> {
+            LoadingCondition(iconResId = R.drawable.ic_tether_28)
+            VerticalSpacer(spaceResId = R.dimen.spacing32)
+            LoadingCondition(iconResId = R.drawable.ic_discount_28)
+        }
+    }
+}
+
+@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_28) {
+        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_28) {
+        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 = TangemTheme.colors.button.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 = TangemTheme.colors.icon.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 = TangemTheme.colors.text.primary1)) {
+                    append(" $award ")
+                }
+                append(
+                    String.format(
+                        stringResource(id = R.string.referral_point_currencies_description_suffix),
+                        networkName,
+                        if (!address.isNullOrBlank()) " $address" else "",
+                    ),
+                )
+            },
+            color = TangemTheme.colors.text.tertiary,
+            style = TangemTheme.typography.body2,
+        )
+    }
+}
+
+@Composable
+private fun InfoForYourFriend(discount: String) {
+    ConditionInfo(title = stringResource(id = R.string.referral_point_discount_title)) {
+        Text(
+            text = buildAnnotatedString {
+                append(stringResource(id = R.string.referral_point_discount_description_prefix))
+                withStyle(SpanStyle(color = TangemTheme.colors.text.primary1)) {
+                    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 = TangemTheme.colors.text.tertiary,
+            style = TangemTheme.typography.body2,
+        )
+    }
+}
+
+@Composable
+private fun ConditionInfo(title: String, subtitleContent: @Composable () -> Unit) {
+    Column(verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing2)) {
+        Text(
+            text = title,
+            color = TangemTheme.colors.text.primary1,
+            style = TangemTheme.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),
+            // .background(Color(0xFFF8F8F8)),
+        )
+        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 BoxScope.ErrorSnackbarHost(errorSnackbar: ErrorSnackbar?) {
+    if (errorSnackbar != null) {
+        val snackbarHostState by remember { mutableStateOf(SnackbarHostState()) }
+        val coroutineScope = rememberCoroutineScope()
+
+        SnackbarHost(
+            hostState = snackbarHostState,
+            modifier = Modifier.align(Alignment.BottomCenter),
+            snackbar = {
+                Snackbar(
+                    snackbarData = it,
+                    modifier = Modifier.fillMaxWidth(),
+                    actionOnNewLine = true,
+                    shape = RoundedCornerShape(size = TangemTheme.dimens.radius8),
+                    backgroundColor = TangemColorPalette.Black,
+                    contentColor = TangemTheme.colors.text.primary2,
+                    actionColor = TangemTheme.colors.text.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 BoxScope.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
+                .align(Alignment.BottomCenter)
+                .padding(start = (width - snackbarWidth).div(2), bottom = dimensionResource(R.dimen.spacing12))
+                .fillMaxWidth(),
+            snackbar = {
+                Box(
+                    modifier = Modifier
+                        .onSizeChanged { snackbarSize = it.width }
+                        .background(TangemColorPalette.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 = TangemTheme.colors.text.primary2,
+                        style = TangemTheme.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
+private 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,
+                analytics = ReferralStateHolder.Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private 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,
+                analytics = ReferralStateHolder.Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private 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,
+                analytics = ReferralStateHolder.Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private 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,
+                analytics = ReferralStateHolder.Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_ReferralScreen_Loading_InLightTheme() {
+    TangemTheme(isDark = false) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.Loading,
+                errorSnackbar = null,
+                analytics = ReferralStateHolder.Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_ReferralScreen_Loading_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.Loading,
+                errorSnackbar = null,
+                analytics = ReferralStateHolder.Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
\ 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..2432d8c1e0
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt
@@ -0,0 +1,142 @@
+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.core.analytics.api.AnalyticsEventHandler
+import com.tangem.feature.referral.analytics.ReferralEvents
+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,
+    private val analyticsEventHandler: AnalyticsEventHandler,
+) : 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))
+    }
+
+    fun onScreenOpened() {
+        analyticsEventHandler.send(ReferralEvents.ReferralScreenOpened)
+    }
+
+    private fun createInitiallyUiState() = ReferralStateHolder(
+        headerState = ReferralStateHolder.HeaderState(onBackClicked = { }),
+        referralInfoState = ReferralInfoState.Loading,
+        errorSnackbar = null,
+        analytics = ReferralStateHolder.Analytics(
+            onAgreementClicked = ::onAgreementClicked,
+            onCopyClicked = ::onCopyClicked,
+            onShareClicked = ::onShareClicked,
+        ),
+    )
+
+    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() {
+        analyticsEventHandler.send(ReferralEvents.ClickParticipate)
+        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 onAgreementClicked() {
+        analyticsEventHandler.send(ReferralEvents.ClickTaC)
+    }
+
+    private fun onCopyClicked() {
+        analyticsEventHandler.send(ReferralEvents.ClickCopy)
+    }
+
+    private fun onShareClicked() {
+        analyticsEventHandler.send(ReferralEvents.ClickShare)
+    }
+
+    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)
+
+    @Suppress("MagicNumber")
+    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 -> this.getToken().symbol
+        }
+        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..9f2c7c0c4d
--- /dev/null
+++ b/features/swap/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:swap:domain"))
+
+    /** Network */
+    implementation(Library.retrofit)
+
+    /** 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..486b25e1ad
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
@@ -0,0 +1,126 @@
+package com.tangem.feature.swap
+
+import com.tangem.datasource.api.oneinch.OneInchApi
+import com.tangem.datasource.api.oneinch.OneInchApiFactory
+import com.tangem.datasource.api.oneinch.OneInchErrorsHandler
+import com.tangem.datasource.api.oneinch.errors.OneIncResponseException
+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.data.AggregatedSwapDataModel
+import com.tangem.feature.swap.domain.models.domain.ApproveModel
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.QuoteModel
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import com.tangem.feature.swap.domain.models.mapErrors
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+@Suppress("LongParameterList")
+internal class SwapRepositoryImpl @Inject constructor(
+    private val tangemTechApi: TangemTechApi,
+    private val oneInchApiFactory: OneInchApiFactory,
+    private val tokensConverter: TokensConverter,
+    private val quotesConverter: QuotesConverter,
+    private val swapConverter: SwapConverter,
+    private val approveConverter: ApproveConverter,
+    private val oneInchErrorsHandler: OneInchErrorsHandler,
+    private val coroutineDispatcher: CoroutineDispatcherProvider,
+) : SwapRepository {
+
+    override suspend fun getRates(currencyId: String, tokenIds: List<String>): Map<String, Double> {
+        return withContext(coroutineDispatcher.io) {
+            tangemTechApi.getRates(currencyId.lowercase(), tokenIds.joinToString(",")).rates
+        }
+    }
+
+    override suspend fun getExchangeableTokens(networkId: String): List<Currency> {
+        return withContext(coroutineDispatcher.io) {
+            tokensConverter.convertList(tangemTechApi.getCoins(exchangeable = true, networkIds = networkId).coins)
+        }
+    }
+
+    override suspend fun findBestQuote(
+        networkId: String,
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount:
+            String,
+    ): AggregatedSwapDataModel<QuoteModel> {
+        return withContext(coroutineDispatcher.io) {
+            try {
+                val response = oneInchErrorsHandler.handleOneInchResponse(
+                    getOneInchApi(networkId).quote(
+                        fromTokenAddress = fromTokenAddress,
+                        toTokenAddress = toTokenAddress,
+                        amount = amount,
+                    ),
+                )
+                AggregatedSwapDataModel(dataModel = quotesConverter.convert(response))
+            } catch (ex: OneIncResponseException) {
+                AggregatedSwapDataModel(null, mapErrors(ex.data.description))
+            }
+        }
+    }
+
+    override suspend fun addressForTrust(networkId: String): String {
+        return withContext(coroutineDispatcher.io) {
+            getOneInchApi(networkId).approveSpender().address
+        }
+    }
+
+    override suspend fun dataToApprove(networkId: String, tokenAddress: String, amount: String?): ApproveModel {
+        return withContext(coroutineDispatcher.io) {
+            approveConverter.convert(getOneInchApi(networkId).approveTransaction(tokenAddress, amount))
+        }
+    }
+
+    override suspend fun checkTokensSpendAllowance(networkId: String, tokenAddress: String, walletAddress: String):
+        AggregatedSwapDataModel<String> {
+        return withContext(coroutineDispatcher.io) {
+            try {
+                val response = oneInchErrorsHandler.handleOneInchResponse(
+                    getOneInchApi(networkId).approveAllowance(tokenAddress, walletAddress),
+                )
+                AggregatedSwapDataModel(response.allowance)
+            } catch (ex: OneIncResponseException) {
+                AggregatedSwapDataModel(null, mapErrors(ex.data.description))
+            }
+        }
+    }
+
+    override suspend fun prepareSwapTransaction(
+        networkId: String,
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount: String,
+        fromWalletAddress: String,
+        slippage: Int,
+    ): AggregatedSwapDataModel<SwapDataModel> {
+        return withContext(coroutineDispatcher.io) {
+            try {
+                val swapResponse = oneInchErrorsHandler.handleOneInchResponse(
+                    getOneInchApi(networkId).swap(
+                        fromTokenAddress = fromTokenAddress,
+                        toTokenAddress = toTokenAddress,
+                        amount = amount,
+                        fromAddress = fromWalletAddress,
+                        slippage = slippage,
+                    ),
+                )
+
+                AggregatedSwapDataModel(swapConverter.convert(swapResponse))
+            } catch (ex: OneIncResponseException) {
+                AggregatedSwapDataModel(null, mapErrors(ex.data.description))
+            }
+        }
+    }
+
+    private fun getOneInchApi(networkId: String): OneInchApi {
+        return oneInchApiFactory.getApi(networkId)
+    }
+}
\ 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..758763e942
--- /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.domain.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..b867bb47cf
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/QuotesConverter.kt
@@ -0,0 +1,20 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.oneinch.models.QuoteResponse
+import com.tangem.feature.swap.domain.models.domain.QuoteModel
+import com.tangem.feature.swap.domain.models.createFromAmountWithOffset
+import com.tangem.utils.converter.Converter
+import javax.inject.Inject
+
+class QuotesConverter @Inject constructor() : Converter<QuoteResponse, QuoteModel> {
+
+    override fun convert(value: QuoteResponse): QuoteModel {
+        return QuoteModel(
+            fromTokenAmount = createFromAmountWithOffset(value.fromTokenAmount, value.fromToken.decimals),
+            toTokenAmount = createFromAmountWithOffset(value.toTokenAmount, value.toToken.decimals),
+            fromTokenAddress = value.fromToken.address,
+            toTokenAddress = value.toToken.address,
+            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..b580b090af
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SwapConverter.kt
@@ -0,0 +1,33 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.oneinch.models.SwapResponse
+import com.tangem.datasource.api.oneinch.models.TransactionDto
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import com.tangem.feature.swap.domain.models.domain.TransactionModel
+import com.tangem.feature.swap.domain.models.createFromAmountWithOffset
+import com.tangem.utils.converter.Converter
+import javax.inject.Inject
+
+class SwapConverter @Inject constructor() : Converter<SwapResponse, SwapDataModel> {
+
+    override fun convert(value: SwapResponse): SwapDataModel {
+        return SwapDataModel(
+            fromTokenAddress = value.fromToken.address,
+            toTokenAddress = value.toToken.address,
+            fromTokenAmount = createFromAmountWithOffset(value.fromTokenAmount, value.fromToken.decimals),
+            toTokenAmount = createFromAmountWithOffset(value.toTokenAmount, value.toToken.decimals),
+            transaction = convertTransaction(value.transaction),
+        )
+    }
+
+    private fun convertTransaction(transactionDto: TransactionDto): TransactionModel {
+        return TransactionModel(
+            fromWalletAddress = transactionDto.fromAddress,
+            toWalletAddress = transactionDto.toAddress,
+            data = transactionDto.data,
+            value = transactionDto.value,
+            gasPrice = transactionDto.gasPrice,
+            gas = transactionDto.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..a35f348ab4
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/TokensConverter.kt
@@ -0,0 +1,41 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
+import com.tangem.feature.swap.domain.models.domain.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 = getSmallIconUrl(value.id),
+            )
+        } else {
+            Currency.NativeToken(
+                id = value.id,
+                name = value.name,
+                symbol = value.symbol,
+                networkId = network.networkId,
+                logoUrl = getSmallIconUrl(value.id),
+            )
+        }
+    }
+
+    private fun getSmallIconUrl(coin: String): String {
+        return "$DEFAULT_IMAGE_HOST$LARGE_ICON_PATH/$coin.png"
+    }
+
+    companion object {
+        private const val DEFAULT_IMAGE_HOST = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/"
+        private const val LARGE_ICON_PATH = "large"
+    }
+}
\ No newline at end of file
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
new file mode 100644
index 0000000000..6cc1d6c846
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
@@ -0,0 +1,46 @@
+package com.tangem.feature.swap.di
+
+import com.tangem.datasource.api.oneinch.OneInchApiFactory
+import com.tangem.datasource.api.oneinch.OneInchErrorsHandler
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.feature.swap.SwapRepositoryImpl
+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.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 SwapDataModule {
+
+    @Provides
+    @Singleton
+    fun provideSwapRepository(
+        tangemTechApi: TangemTechApi,
+        oneInchApiFactory: OneInchApiFactory,
+        tokensConverter: TokensConverter,
+        quotesConverter: QuotesConverter,
+        swapConverter: SwapConverter,
+        approveConverter: ApproveConverter,
+        oneInchErrorsHandler: OneInchErrorsHandler,
+        coroutineDispatcher: CoroutineDispatcherProvider,
+    ): SwapRepository {
+        return SwapRepositoryImpl(
+            tangemTechApi = tangemTechApi,
+            oneInchApiFactory = oneInchApiFactory,
+            tokensConverter = tokensConverter,
+            quotesConverter = quotesConverter,
+            swapConverter = swapConverter,
+            approveConverter = approveConverter,
+            oneInchErrorsHandler = oneInchErrorsHandler,
+            coroutineDispatcher = coroutineDispatcher,
+        )
+    }
+}
\ 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..87fa664521
--- /dev/null
+++ b/features/swap/domain/build.gradle.kts
@@ -0,0 +1,24 @@
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
+    kotlin("kapt")
+    kotlin("plugin.serialization")
+}
+
+dependencies {
+    /** Libs */
+    implementation(project(":libs:crypto"))
+    implementation(project(":core:utils"))
+
+    /** DI */
+    implementation(Library.hiltCore)
+    kapt(Library.hiltKapt)
+
+    /** Other Libraries **/
+    implementation(Library.kotlinSerialization)
+}
+
+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/AllowPermissionsHandler.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/AllowPermissionsHandler.kt
new file mode 100644
index 0000000000..dc02b2c199
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/AllowPermissionsHandler.kt
@@ -0,0 +1,8 @@
+package com.tangem.feature.swap.domain
+
+interface AllowPermissionsHandler {
+
+    fun addAddressToInProgress(tokenAddress: String)
+    fun removeAddressFromProgress(tokenAddress: String)
+    fun isAddressAllowanceInProgress(tokenAddress: String): Boolean
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/AllowPermissionsHandlerImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/AllowPermissionsHandlerImpl.kt
new file mode 100644
index 0000000000..8f73c36ee7
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/AllowPermissionsHandlerImpl.kt
@@ -0,0 +1,19 @@
+package com.tangem.feature.swap.domain
+
+class AllowPermissionsHandlerImpl : AllowPermissionsHandler {
+
+    // todo maybe need to save in store
+    private val allowPermissionsInProgress = mutableSetOf<String>()
+
+    override fun addAddressToInProgress(tokenAddress: String) {
+        allowPermissionsInProgress.add(tokenAddress)
+    }
+
+    override fun removeAddressFromProgress(tokenAddress: String) {
+        allowPermissionsInProgress.remove(tokenAddress)
+    }
+
+    override fun isAddressAllowanceInProgress(tokenAddress: String): Boolean {
+        return allowPermissionsInProgress.contains(tokenAddress)
+    }
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/BlockchainInteractor.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/BlockchainInteractor.kt
new file mode 100644
index 0000000000..9830aea157
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/BlockchainInteractor.kt
@@ -0,0 +1,18 @@
+package com.tangem.feature.swap.domain
+
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.NetworkInfo
+
+interface BlockchainInteractor {
+
+    fun getTokenDecimals(token: Currency): Int
+
+    /**
+     * In app blockchain id, actual in blockchain sdk, not the same as networkId
+     *
+     * workaround till not use backend only and not integrated server vs sdk
+     */
+    fun getBlockchainInfo(networkId: String): NetworkInfo
+
+    fun getExplorerTransactionLink(networkId: String, txAddress: String): String
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/BlockchainInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/BlockchainInteractorImpl.kt
new file mode 100644
index 0000000000..969b20c5b3
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/BlockchainInteractorImpl.kt
@@ -0,0 +1,33 @@
+package com.tangem.feature.swap.domain
+
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.NetworkInfo
+import com.tangem.lib.crypto.TransactionManager
+import javax.inject.Inject
+
+internal class BlockchainInteractorImpl @Inject constructor(
+    private val transactionManager: TransactionManager,
+) : BlockchainInteractor {
+
+    override fun getBlockchainInfo(networkId: String): NetworkInfo {
+        return transactionManager.getBlockchainInfo(networkId).let {
+            NetworkInfo(
+                name = it.name,
+                blockchainId = it.blockchainId,
+                blockchainCurrency = it.blockchainCurrency,
+            )
+        }
+    }
+
+    override fun getExplorerTransactionLink(networkId: String, txAddress: String): String {
+        return transactionManager.getExplorerTransactionLink(networkId, txAddress)
+    }
+
+    override fun getTokenDecimals(token: Currency): Int {
+        return if (token is Currency.NonNativeToken) {
+            token.decimalCount
+        } else {
+            transactionManager.getNativeTokenDecimals(token.networkId)
+        }
+    }
+}
\ 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..4a5da9708f
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt
@@ -0,0 +1,102 @@
+package com.tangem.feature.swap.domain
+
+import com.tangem.feature.swap.domain.models.SwapAmount
+import com.tangem.feature.swap.domain.models.domain.ApproveModel
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import com.tangem.feature.swap.domain.models.ui.FoundTokensState
+import com.tangem.feature.swap.domain.models.ui.SwapState
+import com.tangem.feature.swap.domain.models.ui.TokensDataState
+import com.tangem.feature.swap.domain.models.ui.TxState
+
+interface SwapInteractor {
+
+    /**
+     * Init tokens to swap, load tokens list available to swap for given network
+     *
+     * @param initialCurrency currency which to swap or receive
+     * @return [TokensDataState] that contains info about all available to swap tokens for networkId
+     * and preselected tokens which initially select to swap
+     */
+    suspend fun initTokensToSwap(initialCurrency: Currency): TokensDataState
+
+    /**
+     * On search token, locally search tokens in previously loaded list to swap
+     * searching in names and symbols
+     *
+     * @param networkId networkId for tokens
+     * @param searchQuery string query for search
+     * @return [FoundTokensState] that contains list of tokens matching condition query
+     */
+    suspend fun searchTokens(networkId: String, searchQuery: String): FoundTokensState
+
+    /**
+     * Find specific token by id, null if not found
+     *
+     * @param id token id
+     * @return [Currency] or null
+     */
+    fun findTokenById(id: String): Currency?
+
+    /**
+     * Gives permission to swap, this starts scan card process
+     *
+     * @param networkId network in which selected token
+     * @param estimatedGas estimated gas for transaction
+     * @param transactionData tx data to give approve, it loaded from 1inch in findBestQuote if needed
+     * @param forTokenContractAddress token contract address for which needs permission
+     */
+    @Throws(IllegalStateException::class)
+    suspend fun givePermissionToSwap(
+        networkId: String,
+        estimatedGas: Int,
+        transactionData: ApproveModel,
+        forTokenContractAddress: String,
+    ): TxState
+
+    /**
+     * Find best quote for given tokens to swap
+     * under the hood calls different methods to receive data, depends on permission for given token
+     *
+     * @param networkId network for tokens
+     * @param fromToken [Currency] from which want to swap
+     * @param toToken [Currency] that receive after swap
+     * @param amountToSwap amount you want to swap
+     * @return
+     */
+    @Throws(IllegalStateException::class)
+    suspend fun findBestQuote(
+        networkId: String,
+        fromToken: Currency,
+        toToken: Currency,
+        amountToSwap: String,
+    ): SwapState
+
+    /**
+     * Starts swap transaction, perform sign transaction
+     *
+     * @param networkId network for tokens
+     * @param swapData tx data to swap, contains data to sign
+     * @param currencyToSend [Currency]
+     * @param currencyToGet [Currency]
+     * @param amountToSwap amount to swap
+     * @return [TxState]
+     */
+    @Throws(IllegalStateException::class)
+    suspend fun onSwap(
+        networkId: String,
+        swapData: SwapDataModel,
+        currencyToSend: Currency,
+        currencyToGet: Currency,
+        amountToSwap: String,
+    ): TxState
+
+    /**
+     * Returns token in wallet balance
+     *
+     * @param token
+     */
+    fun getTokenBalance(token: Currency): SwapAmount
+
+    fun isAvailableToSwap(networkId: String): Boolean
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
new file mode 100644
index 0000000000..6a779df7b5
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
@@ -0,0 +1,612 @@
+package com.tangem.feature.swap.domain
+
+import com.tangem.feature.swap.domain.cache.SwapDataCache
+import com.tangem.feature.swap.domain.converters.CryptoCurrencyConverter
+import com.tangem.feature.swap.domain.models.DataError
+import com.tangem.feature.swap.domain.models.SwapAmount
+import com.tangem.feature.swap.domain.models.domain.ApproveModel
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.PreparedSwapConfigState
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import com.tangem.feature.swap.domain.models.toStringWithRightOffset
+import com.tangem.feature.swap.domain.models.ui.AmountFormatter
+import com.tangem.feature.swap.domain.models.ui.FoundTokensState
+import com.tangem.feature.swap.domain.models.ui.PermissionDataState
+import com.tangem.feature.swap.domain.models.ui.PreselectTokens
+import com.tangem.feature.swap.domain.models.ui.RequestApproveStateData
+import com.tangem.feature.swap.domain.models.ui.SwapState
+import com.tangem.feature.swap.domain.models.ui.TokenBalanceData
+import com.tangem.feature.swap.domain.models.ui.TokenSwapInfo
+import com.tangem.feature.swap.domain.models.ui.TokenWithBalance
+import com.tangem.feature.swap.domain.models.ui.TokensDataState
+import com.tangem.feature.swap.domain.models.ui.TxState
+import com.tangem.lib.crypto.TransactionManager
+import com.tangem.lib.crypto.UserWalletManager
+import com.tangem.lib.crypto.models.ProxyAmount
+import com.tangem.lib.crypto.models.ProxyFiatCurrency
+import com.tangem.lib.crypto.models.transactions.SendTxResult
+import com.tangem.utils.toFiatString
+import java.math.BigDecimal
+import javax.inject.Inject
+
+@Suppress("LargeClass")
+internal class SwapInteractorImpl @Inject constructor(
+    private val transactionManager: TransactionManager,
+    private val userWalletManager: UserWalletManager,
+    private val repository: SwapRepository,
+    private val cache: SwapDataCache,
+    private val allowPermissionsHandler: AllowPermissionsHandler,
+) : SwapInteractor {
+
+    private val cryptoCurrencyConverter = CryptoCurrencyConverter()
+    private val amountFormatter = AmountFormatter()
+
+    override suspend fun initTokensToSwap(initialCurrency: Currency): TokensDataState {
+        val networkId = initialCurrency.networkId
+        val availableTokens = cache.getAvailableTokens(networkId)
+        val allLoadedTokens = availableTokens.ifEmpty {
+            val tokens = repository.getExchangeableTokens(networkId)
+            cache.cacheAvailableToSwapTokens(networkId, tokens)
+            tokens
+        }.filter { it.symbol != initialCurrency.symbol }
+
+        // replace tokens in wallet tokens list with loaded same
+        val loadedOnWalletsMap = mutableSetOf<String>()
+        val tokensInWallet = userWalletManager.getUserTokens(networkId)
+            .filter { it.symbol != initialCurrency.symbol }
+            .map { token ->
+                allLoadedTokens.firstOrNull { it.symbol == token.symbol }?.let {
+                    loadedOnWalletsMap.add(it.symbol)
+                    it
+                } ?: cryptoCurrencyConverter.convertBack(token)
+            }
+        val loadedTokens = allLoadedTokens
+            .filter {
+                !loadedOnWalletsMap.contains(it.symbol)
+            }
+        cache.cacheLoadedTokens(loadedTokens)
+        cache.cacheInWalletTokens(tokensInWallet)
+        val tokensBalance = userWalletManager.getCurrentWalletTokensBalance(networkId)
+        val appCurrency = userWalletManager.getUserAppCurrency()
+        val rates = repository.getRates(appCurrency.code, tokensInWallet.map { it.id })
+        return TokensDataState(
+            preselectTokens = PreselectTokens(
+                fromToken = initialCurrency,
+                toToken = selectToToken(initialCurrency, tokensInWallet, loadedTokens),
+            ),
+            foundTokensState = FoundTokensState(
+                tokensInWallet = getTokensWithBalance(tokensInWallet, tokensBalance, rates, appCurrency),
+                loadedTokens = loadedTokens.map { TokenWithBalance(it) },
+            ),
+        )
+    }
+
+    override suspend fun searchTokens(networkId: String, searchQuery: String): FoundTokensState {
+        val searchQueryLowerCase = searchQuery.lowercase()
+        val tokensInWallet = cache.getInWalletTokens()
+            .filter {
+                it.name.lowercase().contains(searchQueryLowerCase) ||
+                    it.symbol.lowercase().contains(searchQueryLowerCase)
+            }
+        val loadedTokens = cache.getLoadedTokens()
+            .filter {
+                it.name.lowercase().contains(searchQueryLowerCase) ||
+                    it.symbol.lowercase().contains(searchQueryLowerCase)
+            }
+        val tokensBalance = userWalletManager.getCurrentWalletTokensBalance(networkId)
+        val appCurrency = userWalletManager.getUserAppCurrency()
+        val rates = repository.getRates(appCurrency.code, tokensInWallet.map { it.id })
+        return FoundTokensState(
+            tokensInWallet = getTokensWithBalance(tokensInWallet, tokensBalance, rates, appCurrency),
+            loadedTokens = loadedTokens.map { TokenWithBalance(it) },
+        )
+    }
+
+    override fun findTokenById(id: String): Currency? {
+        val tokensInWallet = cache.getInWalletTokens()
+        val loadedTokens = cache.getLoadedTokens()
+        return tokensInWallet.firstOrNull { it.id == id } ?: loadedTokens.firstOrNull { it.id == id }
+    }
+
+    override suspend fun givePermissionToSwap(
+        networkId: String,
+        estimatedGas: Int,
+        transactionData: ApproveModel,
+        forTokenContractAddress: String,
+    ): TxState {
+        val increasedEstimatedGas = increaseByPercents(TWENTY_FIVE_PERCENTS, estimatedGas)
+        val gasPrice = transactionData.gasPrice.toBigDecimalOrNull() ?: error("cannot parse gasPrice")
+        val fee = transactionManager.calculateFee(networkId, gasPrice.toPlainString(), increasedEstimatedGas)
+        val result = transactionManager.sendApproveTransaction(
+            networkId = networkId,
+            feeAmount = fee,
+            estimatedGas = increasedEstimatedGas,
+            destinationAddress = transactionData.toAddress,
+            dataToSign = transactionData.data,
+        )
+        return when (result) {
+            is SendTxResult.Success -> {
+                allowPermissionsHandler.addAddressToInProgress(forTokenContractAddress)
+                TxState.TxSent(txAddress = userWalletManager.getLastTransactionHash(networkId) ?: "")
+            }
+            SendTxResult.UserCancelledError -> TxState.UserCancelled
+            is SendTxResult.BlockchainSdkError -> TxState.BlockchainError
+            is SendTxResult.TangemSdkError -> TxState.TangemSdkError
+            is SendTxResult.UnknownError -> TxState.UnknownError
+        }
+    }
+
+    override suspend fun findBestQuote(
+        networkId: String,
+        fromToken: Currency,
+        toToken: Currency,
+        amountToSwap: String,
+    ): SwapState {
+        val amountDecimal = amountToSwap.toBigDecimalOrNull()
+        if (amountDecimal == null || amountDecimal.compareTo(BigDecimal.ZERO) == 0) {
+            return createEmptyAmountState(networkId, fromToken, toToken)
+        }
+        val amount = SwapAmount(amountDecimal, getTokenDecimals(fromToken))
+        val fromTokenAddress = getTokenAddress(fromToken)
+        val toTokenAddress = getTokenAddress(toToken)
+        val isAllowedToSpend = checkAllowance(networkId, fromTokenAddress)
+        val fee = getAndUpdateFee(networkId, fromToken)
+        val isBalanceEnough = isBalanceEnough(fromToken, networkId, amount, fee)
+        val isFeeEnough = checkFeeIsEnough(fee, amount, networkId, fromToken)
+        if (isAllowedToSpend && allowPermissionsHandler.isAddressAllowanceInProgress(fromTokenAddress)) {
+            allowPermissionsHandler.removeAddressFromProgress(fromTokenAddress)
+            transactionManager.updateWalletManager(networkId)
+        }
+        val preparedSwapConfigState = PreparedSwapConfigState(
+            isAllowedToSpend = isAllowedToSpend,
+            isBalanceEnough = isBalanceEnough,
+            isFeeEnough = isFeeEnough,
+        )
+        return if (isAllowedToSpend && isBalanceEnough && isFeeEnough) {
+            loadSwapData(
+                networkId = networkId,
+                fromTokenAddress = fromTokenAddress,
+                toTokenAddress = toTokenAddress,
+                fromToken = fromToken,
+                toToken = toToken,
+                amount = amount,
+                preparedSwapConfigState = preparedSwapConfigState,
+            )
+        } else {
+            loadQuoteData(
+                networkId = networkId,
+                fromTokenAddress = fromTokenAddress,
+                toTokenAddress = toTokenAddress,
+                amount = amount,
+                fromToken = fromToken,
+                toToken = toToken,
+                preparedSwapConfigState = preparedSwapConfigState,
+            )
+        }
+    }
+
+    override suspend fun onSwap(
+        networkId: String,
+        swapData: SwapDataModel,
+        currencyToSend: Currency,
+        currencyToGet: Currency,
+        amountToSwap: String,
+    ): TxState {
+        val amount = requireNotNull(amountToSwap.toBigDecimalOrNull()) { "wrong amount format, use only digits" }
+        val estimatedGas =
+            increaseByPercents(TWENTY_FIVE_PERCENTS, swapData.transaction.gas.toIntOrNull() ?: DEFAULT_GAS)
+        val fee = transactionManager.calculateFee(
+            networkId = networkId,
+            gasPrice = swapData.transaction.gasPrice,
+            estimatedGas = estimatedGas,
+        )
+        val result = transactionManager.sendTransaction(
+            networkId = networkId,
+            amountToSend = amount,
+            currencyToSend = cryptoCurrencyConverter.convert(currencyToSend),
+            feeAmount = fee,
+            estimatedGas = estimatedGas,
+            destinationAddress = swapData.transaction.toWalletAddress,
+            dataToSign = swapData.transaction.data,
+            isSwap = true,
+        )
+        return when (result) {
+            is SendTxResult.Success -> {
+                userWalletManager.addToken(cryptoCurrencyConverter.convert(currencyToGet))
+                TxState.TxSent(
+                    fromAmount = amountFormatter.formatSwapAmountToUI(swapData.fromTokenAmount, currencyToSend.symbol),
+                    toAmount = amountFormatter.formatSwapAmountToUI(swapData.toTokenAmount, currencyToGet.symbol),
+                    txAddress = userWalletManager.getLastTransactionHash(networkId) ?: "",
+                )
+            }
+            SendTxResult.UserCancelledError -> TxState.UserCancelled
+            is SendTxResult.BlockchainSdkError -> TxState.BlockchainError
+            is SendTxResult.TangemSdkError -> TxState.TangemSdkError
+            is SendTxResult.UnknownError -> TxState.UnknownError
+        }
+    }
+
+    override fun getTokenBalance(token: Currency): SwapAmount {
+        return userWalletManager.getCurrentWalletTokensBalance(token.networkId)[token.symbol]?.let {
+            SwapAmount(it.value, it.decimals)
+        } ?: SwapAmount(BigDecimal.ZERO, getTokenDecimals(token))
+    }
+
+    override fun isAvailableToSwap(networkId: String): Boolean {
+        return ONE_INCH_SUPPORTED_NETWORKS.contains(networkId)
+    }
+
+    fun getTokenDecimals(token: Currency): Int {
+        return if (token is Currency.NonNativeToken) {
+            token.decimalCount
+        } else {
+            transactionManager.getNativeTokenDecimals(token.networkId)
+        }
+    }
+
+    private fun selectToToken(
+        initialToken: Currency,
+        tokensInWallet: List<Currency>,
+        loadedTokens: List<Currency>,
+    ): Currency {
+        val toToken = if (tokensInWallet.isNotEmpty()) {
+            tokensInWallet.firstOrNull { it.symbol != initialToken.symbol }
+                ?: loadedTokens.first { it.symbol != initialToken.symbol }
+        } else {
+            val findUsdt = loadedTokens.firstOrNull { it.symbol == USDT_SYMBOL && it.symbol != initialToken.symbol }
+            if (findUsdt == null) {
+                val findUsdc = loadedTokens.firstOrNull { it.symbol == USDC_SYMBOL && it.symbol != initialToken.symbol }
+                findUsdc ?: loadedTokens.first { it.symbol != initialToken.symbol }
+            } else {
+                findUsdt
+            }
+        }
+        return toToken
+    }
+
+    private fun getTokensWithBalance(
+        tokens: List<Currency>,
+        balances: Map<String, ProxyAmount>,
+        rates: Map<String, Double>,
+        appCurrency: ProxyFiatCurrency,
+    ): List<TokenWithBalance> {
+        return tokens.map {
+            val balance = balances[it.symbol]
+            TokenWithBalance(
+                token = it,
+                tokenBalanceData = TokenBalanceData(
+                    amount = balance?.let { amount -> amountFormatter.formatProxyAmountToUI(amount, "") },
+                    amountEquivalent = balance?.value?.toFiatString(
+                        rates[it.id]?.toBigDecimal() ?: BigDecimal.ZERO,
+                        appCurrency.symbol,
+                    ),
+                ),
+            )
+        }
+    }
+
+    private suspend fun getAndUpdateFee(networkId: String, fromToken: Currency): BigDecimal? {
+        val lastFee = cache.getLastFeeForNetwork(networkId)
+        if (lastFee == null) {
+            if (userWalletManager.getNativeTokenBalance(networkId)?.value?.compareTo(BigDecimal.ZERO) == 0) {
+                return null
+            }
+            val transactionData = repository.dataToApprove(networkId, getTokenAddress(fromToken))
+            val fee = transactionManager.getFee(
+                networkId,
+                BigDecimal.ZERO,
+                cryptoCurrencyConverter.convert(fromToken),
+                transactionData.toAddress,
+            ).value
+            cache.cacheLastFeeForNetwork(fee, networkId)
+            return fee
+        }
+        return lastFee
+    }
+
+    private suspend fun checkAllowance(networkId: String, fromTokenAddress: String): Boolean {
+        val allowance = repository.checkTokensSpendAllowance(
+            networkId = networkId,
+            tokenAddress = fromTokenAddress,
+            walletAddress = userWalletManager.getWalletAddress(networkId),
+        )
+        return allowance.error == DataError.NoError && allowance.dataModel != ZERO_BALANCE
+    }
+
+    private fun createEmptyAmountState(
+        networkId: String,
+        fromToken: Currency,
+        toToken: Currency,
+    ): SwapState {
+        val tokensBalance = userWalletManager.getCurrentWalletTokensBalance(networkId)
+        val fromTokenBalance = tokensBalance[fromToken.symbol]?.let {
+            SwapAmount(it.value, it.decimals)
+        }
+        val toTokenBalance = tokensBalance[toToken.symbol]?.let {
+            SwapAmount(it.value, it.decimals)
+        }
+        return SwapState.EmptyAmountState(
+            fromTokenWalletBalance = fromTokenBalance?.let { amountFormatter.formatSwapAmountToUI(it, "") }.orEmpty(),
+            toTokenWalletBalance = toTokenBalance?.let { amountFormatter.formatSwapAmountToUI(it, "") }.orEmpty(),
+        )
+    }
+
+    /**
+     * Load quote data calls only if spend is not allowed for token contract address
+     */
+    @Suppress("LongParameterList")
+    private suspend fun loadQuoteData(
+        networkId: String,
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount: SwapAmount,
+        fromToken: Currency,
+        toToken: Currency,
+        preparedSwapConfigState: PreparedSwapConfigState,
+    ): SwapState {
+        repository.findBestQuote(
+            networkId = networkId,
+            fromTokenAddress = fromTokenAddress,
+            toTokenAddress = toTokenAddress,
+            amount = amount.toStringWithRightOffset(),
+        ).let { quotes ->
+            val quoteDataModel = quotes.dataModel
+            if (quoteDataModel != null) {
+                val transactionData = repository.dataToApprove(networkId, getTokenAddress(fromToken))
+                val fee = transactionManager.calculateFee(
+                    networkId = networkId,
+                    estimatedGas = quoteDataModel.estimatedGas,
+                    gasPrice = transactionData.gasPrice,
+                )
+                val feeFiat = getFormattedFiatFee(networkId, fromToken.id, toToken.id, fee)
+                val formattedFee = amountFormatter.formatBigDecimalAmountToUI(
+                    amount = fee,
+                    decimals = transactionManager.getNativeTokenDecimals(networkId),
+                    currency = userWalletManager.getNetworkCurrency(networkId),
+                ) + feeFiat
+                val swapState = updateBalances(
+                    networkId = networkId,
+                    fromToken = fromToken,
+                    toToken = toToken,
+                    fromTokenAmount = quoteDataModel.fromTokenAmount,
+                    toTokenAmount = quoteDataModel.toTokenAmount,
+                    formattedFee = formattedFee,
+                    preparedSwapConfigState = preparedSwapConfigState,
+                    swapDataModel = null,
+                )
+                return updatePermissionState(
+                    networkId = networkId,
+                    fromToken = fromToken,
+                    quotesLoadedState = swapState,
+                    estimatedGas = quoteDataModel.estimatedGas,
+                    transactionData = transactionData,
+                    formattedFee = formattedFee,
+                )
+            } else {
+                return SwapState.SwapError(quotes.error)
+            }
+        }
+    }
+
+    private suspend fun getFormattedFiatFee(
+        networkId: String,
+        fromTokenId: String,
+        toTokenId: String,
+        fee: BigDecimal,
+    ): String {
+        val appCurrency = userWalletManager.getUserAppCurrency()
+        val nativeToken = userWalletManager.getNativeTokenForNetwork(networkId)
+        val rates = repository.getRates(appCurrency.code, listOf(fromTokenId, toTokenId, nativeToken.id))
+        return rates[nativeToken.id]?.toBigDecimal()?.let { rate ->
+            " (${fee.toFiatString(rate, appCurrency.symbol)})"
+        }.orEmpty()
+    }
+
+    /**
+     * Load swap data calls only if spend is allowed for token contract address
+     */
+    @Suppress("LongParameterList")
+    private suspend fun loadSwapData(
+        networkId: String,
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        fromToken: Currency,
+        toToken: Currency,
+        amount: SwapAmount,
+        preparedSwapConfigState: PreparedSwapConfigState,
+    ): SwapState {
+        repository.prepareSwapTransaction(
+            networkId = networkId,
+            fromTokenAddress = fromTokenAddress,
+            toTokenAddress = toTokenAddress,
+            amount = amount.toStringWithRightOffset(),
+            slippage = DEFAULT_SLIPPAGE,
+            fromWalletAddress = getWalletAddress(networkId),
+        ).let {
+            val swapData = it.dataModel
+            if (swapData != null) {
+                val fee = transactionManager.calculateFee(
+                    networkId = networkId,
+                    estimatedGas = swapData.transaction.gas.toIntOrNull() ?: DEFAULT_GAS,
+                    gasPrice = swapData.transaction.gasPrice,
+                )
+                val feeFiat = getFormattedFiatFee(networkId, fromToken.id, toToken.id, fee)
+                val formattedFee = amountFormatter.formatBigDecimalAmountToUI(
+                    amount = fee,
+                    decimals = transactionManager.getNativeTokenDecimals(networkId),
+                    currency = userWalletManager.getNetworkCurrency(networkId),
+                ) + feeFiat
+                val swapState = updateBalances(
+                    networkId = networkId,
+                    fromToken = fromToken,
+                    toToken = toToken,
+                    fromTokenAmount = swapData.fromTokenAmount,
+                    toTokenAmount = swapData.toTokenAmount,
+                    formattedFee = formattedFee,
+                    preparedSwapConfigState = preparedSwapConfigState,
+                    swapDataModel = swapData,
+                )
+                return swapState.copy(
+                    permissionState = PermissionDataState.Empty,
+                )
+            } else {
+                return SwapState.SwapError(it.error)
+            }
+        }
+    }
+
+    @Suppress("LongParameterList")
+    private suspend fun updateBalances(
+        networkId: String,
+        fromToken: Currency,
+        toToken: Currency,
+        fromTokenAmount: SwapAmount,
+        toTokenAmount: SwapAmount,
+        formattedFee: String,
+        preparedSwapConfigState: PreparedSwapConfigState,
+        swapDataModel: SwapDataModel?,
+    ): SwapState.QuotesLoadedState {
+        val appCurrency = userWalletManager.getUserAppCurrency()
+        val nativeToken = userWalletManager.getNativeTokenForNetwork(networkId)
+        val rates = repository.getRates(appCurrency.code, listOf(fromToken.id, toToken.id, nativeToken.id))
+        val tokensBalance = userWalletManager.getCurrentWalletTokensBalance(networkId)
+        val fromTokenBalance = tokensBalance[fromToken.symbol]?.let {
+            amountFormatter.formatProxyAmountToUI(it, "")
+        }
+        val toTokenBalance = tokensBalance[toToken.symbol]?.let {
+            amountFormatter.formatProxyAmountToUI(it, "")
+        }
+        return SwapState.QuotesLoadedState(
+            fromTokenInfo = TokenSwapInfo(
+                tokenAmount = fromTokenAmount,
+                coinId = fromToken.id,
+                tokenWalletBalance = fromTokenBalance ?: ZERO_BALANCE,
+                tokenFiatBalance = fromTokenAmount.value.toFiatString(
+                    rates[fromToken.id]?.toBigDecimal() ?: BigDecimal.ZERO,
+                    appCurrency.symbol,
+                ),
+            ),
+            toTokenInfo = TokenSwapInfo(
+                tokenAmount = toTokenAmount,
+                coinId = toToken.id,
+                tokenWalletBalance = toTokenBalance ?: ZERO_BALANCE,
+                tokenFiatBalance = toTokenAmount.value.toFiatString(
+                    rates[toToken.id]?.toBigDecimal() ?: BigDecimal.ZERO,
+                    appCurrency.symbol,
+                ),
+            ),
+            fee = formattedFee,
+            networkCurrency = userWalletManager.getNetworkCurrency(networkId),
+            preparedSwapConfigState = preparedSwapConfigState,
+            swapDataModel = swapDataModel,
+        )
+    }
+
+    @Suppress("LongParameterList")
+    private fun updatePermissionState(
+        networkId: String,
+        fromToken: Currency,
+        quotesLoadedState: SwapState.QuotesLoadedState,
+        estimatedGas: Int,
+        transactionData: ApproveModel,
+        formattedFee: String,
+    ): SwapState.QuotesLoadedState {
+        if (allowPermissionsHandler.isAddressAllowanceInProgress(getTokenAddress(fromToken))) {
+            return quotesLoadedState.copy(
+                permissionState = PermissionDataState.PermissionLoading,
+            )
+        }
+        return quotesLoadedState.copy(
+            permissionState = PermissionDataState.PermissionReadyForRequest(
+                currency = fromToken.symbol,
+                amount = INFINITY_SYMBOL,
+                walletAddress = getWalletAddress(networkId),
+                spenderAddress = transactionData.toAddress,
+                fee = formattedFee,
+                requestApproveData = RequestApproveStateData(
+                    estimatedGas = estimatedGas,
+                    approveModel = transactionData,
+                ),
+            ),
+        )
+    }
+
+    private fun isBalanceEnough(fromToken: Currency, networkId: String, amount: SwapAmount, fee: BigDecimal?): Boolean {
+        val tokenBalance =
+            userWalletManager.getCurrentWalletTokensBalance(networkId)[fromToken.symbol]?.value ?: BigDecimal.ZERO
+        return if (fromToken is Currency.NonNativeToken) {
+            tokenBalance >= amount.value
+        } else {
+            tokenBalance > amount.value.plus(fee ?: BigDecimal.ZERO)
+        }
+    }
+
+    private fun getWalletAddress(networkId: String): String {
+        return userWalletManager.getWalletAddress(networkId)
+    }
+
+    private fun getTokenAddress(currency: Currency): String {
+        return when (currency) {
+            is Currency.NativeToken -> {
+                DEFAULT_BLOCKCHAIN_INCH_ADDRESS
+            }
+            is Currency.NonNativeToken -> {
+                currency.contractAddress
+            }
+        }
+    }
+
+    private fun checkFeeIsEnough(
+        fee: BigDecimal?,
+        spendAmount: SwapAmount,
+        networkId: String,
+        fromToken: Currency,
+    ): Boolean {
+        if (fee == null) {
+            return false
+        }
+        val nativeTokenBalance = userWalletManager.getNativeTokenBalance(networkId)
+        val percentsToFeeIncrease = BigDecimal.valueOf(INCREASE_FEE_TO_CHECK_ENOUGH_PERCENT)
+        return when (fromToken) {
+            is Currency.NativeToken -> {
+                nativeTokenBalance?.let { balance ->
+                    return balance.value.minus(spendAmount.value) > fee.multiply(percentsToFeeIncrease)
+                } ?: false
+            }
+            is Currency.NonNativeToken -> {
+                nativeTokenBalance?.let { balance ->
+                    return balance.value > fee.multiply(percentsToFeeIncrease)
+                } ?: false
+            }
+        }
+        return false
+    }
+
+    @Suppress("MagicNumber")
+    private fun increaseByPercents(percents: Int, value: Int): Int {
+        return value * (percents / 100 + 1)
+    }
+
+    companion object {
+        private const val DEFAULT_SLIPPAGE = 2
+        private const val ZERO_BALANCE = "0"
+        private const val DEFAULT_GAS = 300000
+        private const val DEFAULT_BLOCKCHAIN_INCH_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"
+        private const val TWENTY_FIVE_PERCENTS = 25
+        private const val INCREASE_FEE_TO_CHECK_ENOUGH_PERCENT = 1.5
+        private const val USDT_SYMBOL = "USDT"
+        private const val USDC_SYMBOL = "USDC"
+        private const val INFINITY_SYMBOL = "∞"
+
+        private val ONE_INCH_SUPPORTED_NETWORKS = listOf(
+            "ethereum",
+            "binance-smart-chain",
+            "polygon-pos",
+            "optimistic-ethereum",
+            "arbitrum-one",
+            "xdai",
+            "avalanche",
+            "fantom",
+        )
+    }
+}
\ 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..1f882537f6
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
@@ -0,0 +1,64 @@
+package com.tangem.feature.swap.domain
+
+import com.tangem.feature.swap.domain.models.domain.ApproveModel
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.QuoteModel
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import com.tangem.feature.swap.domain.models.data.AggregatedSwapDataModel
+
+interface SwapRepository {
+
+    suspend fun getRates(currencyId: String, tokenIds: List<String>): Map<String, Double>
+
+    suspend fun getExchangeableTokens(networkId: String): List<Currency>
+
+    suspend fun findBestQuote(
+        networkId: String,
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount: String,
+    ): AggregatedSwapDataModel<QuoteModel>
+
+    /**
+     * Returns address of 1inch router that must be trusted
+     *
+     * @return address
+     */
+    suspend fun addressForTrust(networkId: String): 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(
+        networkId: String,
+        tokenAddress: String,
+        amount: String? = null,
+    ): 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(
+        networkId: String,
+        tokenAddress: String,
+        walletAddress: String,
+    ): AggregatedSwapDataModel<String>
+
+    @Suppress("LongParameterList")
+    suspend fun prepareSwapTransaction(
+        networkId: String,
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount: String,
+        fromWalletAddress: String,
+        slippage: Int,
+    ): AggregatedSwapDataModel<SwapDataModel>
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/cache/SwapDataCache.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/cache/SwapDataCache.kt
new file mode 100644
index 0000000000..20cba789db
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/cache/SwapDataCache.kt
@@ -0,0 +1,16 @@
+package com.tangem.feature.swap.domain.cache
+
+import com.tangem.feature.swap.domain.models.domain.Currency
+import java.math.BigDecimal
+
+interface SwapDataCache {
+
+    fun cacheAvailableToSwapTokens(networkId: String, tokens: List<Currency>)
+    fun cacheInWalletTokens(tokens: List<Currency>)
+    fun cacheLoadedTokens(tokens: List<Currency>)
+    fun cacheLastFeeForNetwork(fee: BigDecimal, networkId: String)
+    fun getAvailableTokens(networkId: String): List<Currency>
+    fun getInWalletTokens(): List<Currency>
+    fun getLoadedTokens(): List<Currency>
+    fun getLastFeeForNetwork(networkId: String): BigDecimal?
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/cache/SwapDataCacheImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/cache/SwapDataCacheImpl.kt
new file mode 100644
index 0000000000..bf4ec2aef7
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/cache/SwapDataCacheImpl.kt
@@ -0,0 +1,46 @@
+package com.tangem.feature.swap.domain.cache
+
+import com.tangem.feature.swap.domain.models.domain.Currency
+import java.math.BigDecimal
+
+class SwapDataCacheImpl : SwapDataCache {
+
+    private val availableTokensForNetwork: MutableMap<String, List<Currency>> = mutableMapOf()
+    private val feesForNetworks: MutableMap<String, BigDecimal> = mutableMapOf()
+    private val lastInWalletTokens = mutableListOf<Currency>()
+    private val lastLoadedTokens = mutableListOf<Currency>()
+
+    override fun cacheLastFeeForNetwork(fee: BigDecimal, networkId: String) {
+        feesForNetworks[networkId] = fee
+    }
+
+    override fun cacheInWalletTokens(tokens: List<Currency>) {
+        lastInWalletTokens.clear()
+        lastInWalletTokens.addAll(tokens)
+    }
+
+    override fun cacheLoadedTokens(tokens: List<Currency>) {
+        lastLoadedTokens.clear()
+        lastLoadedTokens.addAll(tokens)
+    }
+
+    override fun getInWalletTokens(): List<Currency> {
+        return lastInWalletTokens
+    }
+
+    override fun getLoadedTokens(): List<Currency> {
+        return lastLoadedTokens
+    }
+
+    override fun cacheAvailableToSwapTokens(networkId: String, tokens: List<Currency>) {
+        availableTokensForNetwork[networkId] = tokens
+    }
+
+    override fun getLastFeeForNetwork(networkId: String): BigDecimal? {
+        return feesForNetworks[networkId]
+    }
+
+    override fun getAvailableTokens(networkId: String): List<Currency> {
+        return availableTokensForNetwork.getOrElse(networkId) { emptyList() }
+    }
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/CryptoCurrencyConverter.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/CryptoCurrencyConverter.kt
new file mode 100644
index 0000000000..90b978100e
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/CryptoCurrencyConverter.kt
@@ -0,0 +1,56 @@
+package com.tangem.feature.swap.domain.converters
+
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.utils.converter.TwoWayConverter
+import com.tangem.lib.crypto.models.Currency as CryptoCurrency
+
+class CryptoCurrencyConverter : TwoWayConverter<Currency, CryptoCurrency> {
+
+    override fun convert(value: Currency): CryptoCurrency {
+        return when (value) {
+            is Currency.NonNativeToken -> {
+                CryptoCurrency.NonNativeToken(
+                    id = value.id,
+                    name = value.name,
+                    symbol = value.symbol,
+                    networkId = value.networkId,
+                    contractAddress = value.contractAddress,
+                    decimalCount = value.decimalCount,
+                )
+            }
+            is Currency.NativeToken -> {
+                CryptoCurrency.NativeToken(
+                    id = value.id,
+                    name = value.name,
+                    symbol = value.symbol,
+                    networkId = value.networkId,
+                )
+            }
+        }
+    }
+
+    override fun convertBack(value: CryptoCurrency): Currency {
+        return when (value) {
+            is CryptoCurrency.NonNativeToken -> {
+                Currency.NonNativeToken(
+                    id = value.id,
+                    name = value.name,
+                    symbol = value.symbol,
+                    networkId = value.networkId,
+                    contractAddress = value.contractAddress,
+                    decimalCount = value.decimalCount,
+                    logoUrl = "",
+                )
+            }
+            is CryptoCurrency.NativeToken -> {
+                Currency.NativeToken(
+                    id = value.id,
+                    name = value.name,
+                    symbol = value.symbol,
+                    networkId = value.networkId,
+                    logoUrl = "",
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
new file mode 100644
index 0000000000..7f65454b85
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
@@ -0,0 +1,47 @@
+package com.tangem.feature.swap.domain.di
+
+import com.tangem.feature.swap.domain.AllowPermissionsHandlerImpl
+import com.tangem.feature.swap.domain.BlockchainInteractor
+import com.tangem.feature.swap.domain.BlockchainInteractorImpl
+import com.tangem.feature.swap.domain.SwapInteractor
+import com.tangem.feature.swap.domain.SwapInteractorImpl
+import com.tangem.feature.swap.domain.SwapRepository
+import com.tangem.feature.swap.domain.cache.SwapDataCacheImpl
+import com.tangem.lib.crypto.TransactionManager
+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 SwapDomainModule {
+
+    @Provides
+    @Singleton
+    fun provideSwapInteractor(
+        swapRepository: SwapRepository,
+        userWalletManager: UserWalletManager,
+        transactionManager: TransactionManager,
+    ): SwapInteractor {
+        return SwapInteractorImpl(
+            transactionManager = transactionManager,
+            userWalletManager = userWalletManager,
+            repository = swapRepository,
+            cache = SwapDataCacheImpl(),
+            allowPermissionsHandler = AllowPermissionsHandlerImpl(),
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideBlockchainInteractor(
+        transactionManager: TransactionManager,
+    ): BlockchainInteractor {
+        return BlockchainInteractorImpl(
+            transactionManager = transactionManager,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/DataError.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/DataError.kt
new file mode 100644
index 0000000000..fee4466f54
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/DataError.kt
@@ -0,0 +1,18 @@
+package com.tangem.feature.swap.domain.models
+
+sealed class DataError {
+    object NoError : DataError()
+    data class UnknownError(val message: String) : DataError()
+    object InsufficientLiquidity : DataError()
+}
+
+fun mapErrors(error: String?): DataError {
+    return if (error == null) {
+        DataError.NoError
+    } else when (error) {
+        INSUFFICIENT_LIQUIDITY_ERROR -> DataError.InsufficientLiquidity
+        else -> DataError.UnknownError(error)
+    }
+}
+
+private const val INSUFFICIENT_LIQUIDITY_ERROR = "insufficient liquidity"
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/SwapAmount.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/SwapAmount.kt
new file mode 100644
index 0000000000..342ce251e7
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/SwapAmount.kt
@@ -0,0 +1,41 @@
+package com.tangem.feature.swap.domain.models
+
+import com.tangem.utils.toFormattedString
+import java.math.BigDecimal
+
+data class SwapAmount(
+    val value: BigDecimal,
+    val decimals: Int,
+)
+
+fun SwapAmount.formatToUIRepresentation(): String {
+    return value.toFormattedString(decimals = decimals)
+}
+
+fun createFromAmountWithoutOffset(amountWithoutOffset: String, decimals: Int): SwapAmount {
+    return SwapAmount(
+        value = requireNotNull(
+            amountWithoutOffset.toBigDecimalOrNull(),
+        ) { "wrong amount format, use only digits" },
+        decimals = decimals,
+    )
+}
+
+fun createFromAmountWithOffset(amountWithOffset: String, decimals: Int): SwapAmount {
+    return SwapAmount(
+        value = requireNotNull(
+            amountWithOffset.toBigDecimalOrNull()?.movePointLeft(decimals),
+        ) { "wrong amount format, use only digits" },
+        decimals = decimals,
+    )
+}
+
+@Throws(IllegalStateException::class)
+fun SwapAmount.toStringWithRightOffset(): String {
+    return value.movePointRight(decimals).toPlainString()
+}
+
+@Throws(IllegalStateException::class)
+fun SwapAmount.toStringWithLeftOffset(): String {
+    return value.movePointLeft(decimals).toPlainString()
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/cache/SwapDataHolder.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/cache/SwapDataHolder.kt
new file mode 100644
index 0000000000..1271078626
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/cache/SwapDataHolder.kt
@@ -0,0 +1,21 @@
+package com.tangem.feature.swap.domain.models.cache
+
+import com.tangem.feature.swap.domain.models.domain.ApproveModel
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.QuoteModel
+import com.tangem.feature.swap.domain.models.SwapAmount
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+
+data class SwapDataHolder(
+    val quoteModel: QuoteModel? = null,
+    val swapModel: SwapDataModel? = null,
+    val approveTxModel: ApproveModel? = null,
+    val amountToSwap: SwapAmount? = null,
+    val networkId: String? = null,
+    val exchangeCurrencies: ExchangeCurrencies? = null,
+)
+
+data class ExchangeCurrencies(
+    val fromCurrency: Currency? = null,
+    val toCurrency: Currency? = null,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/data/AggregatedSwapDataModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/data/AggregatedSwapDataModel.kt
new file mode 100644
index 0000000000..317b0da94f
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/data/AggregatedSwapDataModel.kt
@@ -0,0 +1,15 @@
+package com.tangem.feature.swap.domain.models.data
+
+import com.tangem.feature.swap.domain.models.DataError
+
+/**
+ * Model that aggregate data model from repository return with error [DataError] if it exists
+ *
+ * @param T model type
+ * @property dataModel
+ * @property error possible from repository [DataError]
+ */
+data class AggregatedSwapDataModel<T>(
+    val dataModel: T?,
+    val error: DataError = DataError.NoError,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/ApproveModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/ApproveModel.kt
new file mode 100644
index 0000000000..c21b52c0fa
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/ApproveModel.kt
@@ -0,0 +1,14 @@
+package com.tangem.feature.swap.domain.models.domain
+
+/**
+ * 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/domain/Currency.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/Currency.kt
new file mode 100644
index 0000000000..40cf980a73
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/Currency.kt
@@ -0,0 +1,36 @@
+package com.tangem.feature.swap.domain.models.domain
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed class Currency {
+    abstract val id: String
+    abstract val name: String
+    abstract val symbol: String
+    abstract val networkId: String
+    abstract val logoUrl: String
+
+    @Serializable
+    data class NativeToken(
+        override val id: String,
+        override val name: String,
+        override val symbol: String,
+        override val networkId: String,
+        override val logoUrl: String,
+    ) : Currency()
+
+    @Serializable
+    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()
+}
+
+fun Currency.isNonNative(): Boolean {
+    return this is Currency.NonNativeToken
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/NetworkInfo.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/NetworkInfo.kt
new file mode 100644
index 0000000000..fee839273d
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/NetworkInfo.kt
@@ -0,0 +1,7 @@
+package com.tangem.feature.swap.domain.models.domain
+
+data class NetworkInfo(
+    val name: String,
+    val blockchainId: String,
+    val blockchainCurrency: String,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/PreparedSwapConfigState.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/PreparedSwapConfigState.kt
new file mode 100644
index 0000000000..29515eef16
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/PreparedSwapConfigState.kt
@@ -0,0 +1,7 @@
+package com.tangem.feature.swap.domain.models.domain
+
+data class PreparedSwapConfigState(
+    val isAllowedToSpend: Boolean,
+    val isBalanceEnough: Boolean,
+    val isFeeEnough: Boolean,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/QuoteModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/QuoteModel.kt
new file mode 100644
index 0000000000..871b9d77ea
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/QuoteModel.kt
@@ -0,0 +1,20 @@
+package com.tangem.feature.swap.domain.models.domain
+
+import com.tangem.feature.swap.domain.models.SwapAmount
+
+/**
+ * Quote model holds data about current amounts of exchange and fees
+ *
+ * @property fromTokenAmount amount of token you want to exchange
+ * @property toTokenAmount amount of token you want to receive
+ * @property fromTokenAddress address token you want to exchange
+ * @property toTokenAddress address token you want to receive
+ * @property estimatedGas fee
+ */
+data class QuoteModel(
+    val fromTokenAmount: SwapAmount,
+    val toTokenAmount: SwapAmount,
+    val fromTokenAddress: String,
+    val toTokenAddress: 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/domain/SwapDataModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/SwapDataModel.kt
new file mode 100644
index 0000000000..e2b5356100
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/SwapDataModel.kt
@@ -0,0 +1,19 @@
+package com.tangem.feature.swap.domain.models.domain
+
+import com.tangem.feature.swap.domain.models.SwapAmount
+
+/**
+ * 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
+ */
+data class SwapDataModel(
+    val fromTokenAddress: String,
+    val toTokenAddress: String,
+    val toTokenAmount: SwapAmount,
+    val fromTokenAmount: SwapAmount,
+    val transaction: TransactionModel,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/TransactionModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/TransactionModel.kt
new file mode 100644
index 0000000000..ac5b7b2b05
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/TransactionModel.kt
@@ -0,0 +1,20 @@
+package com.tangem.feature.swap.domain.models.domain
+
+/**
+ * Transaction model
+ *
+ * @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%
+ */
+data class TransactionModel(
+    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/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/AmountFormatter.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/AmountFormatter.kt
new file mode 100644
index 0000000000..26eff81e56
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/AmountFormatter.kt
@@ -0,0 +1,43 @@
+package com.tangem.feature.swap.domain.models.ui
+
+import com.tangem.feature.swap.domain.models.SwapAmount
+import com.tangem.lib.crypto.models.ProxyAmount
+import com.tangem.utils.toFormattedCurrencyString
+import java.math.BigDecimal
+
+class AmountFormatter {
+
+    /**
+     * Use to convert crypto amount [SwapAmount] to UI representation
+     *
+     * @param swapAmount [SwapAmount]
+     * @param currency currency symbol
+     * @return formatted [String]
+     */
+    fun formatSwapAmountToUI(swapAmount: SwapAmount, currency: String): String {
+        return swapAmount.value.toFormattedCurrencyString(swapAmount.decimals, currency)
+    }
+
+    /**
+     * Use to convert crypto amount [ProxyAmount] to UI representation
+     *
+     * @param proxyAmount [ProxyAmount]
+     * @param currency currency symbol
+     * @return formatted [String]
+     */
+    fun formatProxyAmountToUI(proxyAmount: ProxyAmount, currency: String): String {
+        return proxyAmount.value.toFormattedCurrencyString(proxyAmount.decimals, currency)
+    }
+
+    /**
+     * Use to convert ONLY crypto amount [BigDecimal] to UI representation
+     *
+     * @param amount
+     * @param decimals
+     * @param currency
+     * @return formatted [String]
+     */
+    fun formatBigDecimalAmountToUI(amount: BigDecimal, decimals: Int, currency: String): String {
+        return amount.toFormattedCurrencyString(decimals, currency)
+    }
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt
new file mode 100644
index 0000000000..688ad65b7b
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt
@@ -0,0 +1,57 @@
+package com.tangem.feature.swap.domain.models.ui
+
+import com.tangem.feature.swap.domain.models.DataError
+import com.tangem.feature.swap.domain.models.SwapAmount
+import com.tangem.feature.swap.domain.models.domain.ApproveModel
+import com.tangem.feature.swap.domain.models.domain.PreparedSwapConfigState
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+
+sealed interface SwapState {
+
+    data class QuotesLoadedState(
+        val fromTokenInfo: TokenSwapInfo,
+        val toTokenInfo: TokenSwapInfo,
+        val fee: String,
+        val networkCurrency: String,
+        val preparedSwapConfigState: PreparedSwapConfigState,
+        val permissionState: PermissionDataState = PermissionDataState.Empty,
+        val swapDataModel: SwapDataModel? = null,
+    ) : SwapState
+
+    data class EmptyAmountState(
+        val fromTokenWalletBalance: String,
+        val toTokenWalletBalance: String,
+    ) : SwapState
+
+    data class SwapError(val error: DataError) : SwapState
+}
+
+sealed class PermissionDataState {
+
+    data class PermissionReadyForRequest(
+        val currency: String,
+        val amount: String,
+        val walletAddress: String,
+        val spenderAddress: String,
+        val fee: String,
+        val requestApproveData: RequestApproveStateData,
+    ) : PermissionDataState()
+
+    object PermissionFailed : PermissionDataState()
+
+    object PermissionLoading : PermissionDataState()
+
+    object Empty : PermissionDataState()
+}
+
+data class TokenSwapInfo(
+    val tokenAmount: SwapAmount,
+    val coinId: String,
+    val tokenWalletBalance: String,
+    val tokenFiatBalance: String,
+)
+
+data class RequestApproveStateData(
+    val estimatedGas: Int,
+    val approveModel: ApproveModel,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataState.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataState.kt
new file mode 100644
index 0000000000..8d17d05808
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataState.kt
@@ -0,0 +1,28 @@
+package com.tangem.feature.swap.domain.models.ui
+
+import com.tangem.feature.swap.domain.models.domain.Currency
+
+data class TokensDataState(
+    val preselectTokens: PreselectTokens,
+    val foundTokensState: FoundTokensState,
+)
+
+data class FoundTokensState(
+    val tokensInWallet: List<TokenWithBalance>,
+    val loadedTokens: List<TokenWithBalance>,
+)
+
+data class PreselectTokens(
+    val fromToken: Currency,
+    val toToken: Currency,
+)
+
+data class TokenWithBalance(
+    val token: Currency,
+    val tokenBalanceData: TokenBalanceData? = null,
+)
+
+data class TokenBalanceData(
+    val amount: String?,
+    val amountEquivalent: String?,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/TxState.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/TxState.kt
new file mode 100644
index 0000000000..85f32a42ed
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/TxState.kt
@@ -0,0 +1,15 @@
+package com.tangem.feature.swap.domain.models.ui
+
+sealed class TxState {
+
+    data class TxSent(
+        val fromAmount: String? = null,
+        val toAmount: String? = null,
+        val txAddress: String,
+    ) : TxState()
+
+    object UserCancelled : TxState()
+    object BlockchainError : TxState()
+    object TangemSdkError : TxState()
+    object UnknownError : TxState()
+}
\ 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..684ec4d57c
--- /dev/null
+++ b/features/swap/presentation/build.gradle.kts
@@ -0,0 +1,81 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    kotlin("kapt")
+    kotlin("plugin.serialization")
+    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:analytics"))
+    implementation(project(":core:utils"))
+    implementation(project(":core:ui"))
+
+    /** AndroidX */
+    implementation(AndroidX.activityCompose)
+    implementation(AndroidX.appCompat)
+    implementation(AndroidX.fragmentKtx)
+    implementation(AndroidX.lifecycleViewModelKtx)
+    implementation(AndroidX.browser)
+
+    /** Compose */
+    implementation(Compose.foundation)
+    implementation(Compose.material)
+    implementation(Compose.uiTooling)
+    implementation(Compose.coil)
+    implementation(Compose.constraintLayout)
+
+    /** Domain */
+    implementation(project(":features:swap:domain"))
+    implementation(project(":features:swap:data"))//todo remove, only for test
+
+    /** Other libraries */
+    implementation(Library.composeShimmer)
+    implementation(Library.kotlinSerialization)
+
+    /** 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/features/swap/presentation/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
new file mode 100644
index 0000000000..11dce2daa7
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
@@ -0,0 +1,32 @@
+package com.tangem.feature.swap.analytics
+
+import com.tangem.core.analytics.AnalyticsEvent
+
+sealed class SwapEvents(
+    event: String,
+    params: Map<String, String> = mapOf(),
+) : AnalyticsEvent(SWAP_CATEGORY, event, params) {
+
+    data class SwapScreenOpened(val token: String) : SwapEvents(
+        event = "Swap Screen Opened",
+        params = mapOf("Token" to token),
+    )
+
+    object SendTokenBalanceClicked : SwapEvents(event = "Send Token Balance Clicked")
+    object ReceiveTokenClicked : SwapEvents(event = "Receive Token Clicked")
+    object ChooseTokenScreenOpened : SwapEvents(event = "Choose Token Screen Opened")
+    object SearchTokenClicked : SwapEvents(event = "Search Token Clicked")
+    data class ButtonSwapClicked(val sendToken: String, val receiveToken: String) : SwapEvents(
+        event = "Button - Swap",
+        params = mapOf("Send Token" to sendToken, "Receive Token" to receiveToken),
+    )
+
+    object ButtonGivePermissionClicked : SwapEvents(event = "Button - Give permission") // ?
+    object ButtonPermissionApproveClicked : SwapEvents(event = "Button - Permission Approve")
+    object ButtonPermissionCancelClicked : SwapEvents(event = "Button - Permission Cancel")
+    object ButtonPermitAndSwapClicked : SwapEvents(event = "Button - Permit and Swap") // ?
+    object ButtonSwipeClicked : SwapEvents(event = "Button - Swipe")
+    object SwapInProgressScreen : SwapEvents(event = "Swap in Progress Screen Opened")
+}
+
+private const val SWAP_CATEGORY = "Swap"
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
new file mode 100644
index 0000000000..7491904442
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
@@ -0,0 +1,40 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.NetworkInfo
+import com.tangem.feature.swap.domain.models.ui.FoundTokensState
+import com.tangem.feature.swap.domain.models.ui.TokenWithBalance
+import com.tangem.feature.swap.models.Network
+import com.tangem.feature.swap.models.SwapSelectTokenStateHolder
+import com.tangem.feature.swap.models.TokenBalanceData
+import com.tangem.feature.swap.models.TokenToSelect
+
+class TokensDataConverter(
+    private val onSearchEntered: (String) -> Unit,
+    private val onTokenSelected: (String) -> Unit,
+) {
+
+    fun convertWithNetwork(value: FoundTokensState, network: NetworkInfo): SwapSelectTokenStateHolder {
+        return SwapSelectTokenStateHolder(
+            addedTokens = value.tokensInWallet.map { tokenWithBalanceToTokenToSelect(it) },
+            otherTokens = value.loadedTokens.map { tokenWithBalanceToTokenToSelect(it) },
+            onSearchEntered = onSearchEntered,
+            onTokenSelected = onTokenSelected,
+            network = Network(network.name, network.blockchainId),
+        )
+    }
+
+    private fun tokenWithBalanceToTokenToSelect(tokenWithBalance: TokenWithBalance): TokenToSelect {
+        return TokenToSelect(
+            id = tokenWithBalance.token.id,
+            name = tokenWithBalance.token.name,
+            symbol = tokenWithBalance.token.symbol,
+            iconUrl = tokenWithBalance.token.logoUrl,
+            isNative = tokenWithBalance.token is Currency.NativeToken,
+            addedTokenBalanceData = TokenBalanceData(
+                amount = tokenWithBalance.tokenBalanceData?.amount,
+                amountEquivalent = tokenWithBalance.tokenBalanceData?.amountEquivalent,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapPermissionStateHolder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapPermissionStateHolder.kt
new file mode 100644
index 0000000000..0fd2f4fef7
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapPermissionStateHolder.kt
@@ -0,0 +1,29 @@
+package com.tangem.feature.swap.models
+
+sealed class SwapPermissionState {
+
+    object InProgress : SwapPermissionState()
+
+    object Empty : SwapPermissionState()
+
+    data class ReadyForRequest(
+        val currency: String,
+        val amount: String,
+        val walletAddress: String,
+        val spenderAddress: String,
+        val fee: String,
+        val approveButton: ApprovePermissionButton,
+        val cancelButton: CancelPermissionButton,
+    ) : SwapPermissionState()
+}
+
+data class ApprovePermissionButton(
+    val enabled: Boolean,
+    val loading: Boolean = false,
+    val onClick: () -> Unit,
+)
+
+data class CancelPermissionButton(
+    val enabled: Boolean,
+    val onClick: () -> Unit,
+)
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt
new file mode 100644
index 0000000000..b51831dedb
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt
@@ -0,0 +1,29 @@
+package com.tangem.feature.swap.models
+
+data class SwapSelectTokenStateHolder(
+    val addedTokens: List<TokenToSelect>,
+    val otherTokens: List<TokenToSelect>,
+    val network: Network,
+    val onSearchEntered: (String) -> Unit,
+    val onTokenSelected: (String) -> Unit,
+)
+
+data class TokenToSelect(
+    val id: String,
+    val name: String,
+    val symbol: String,
+    val iconUrl: String,
+    val isNative: Boolean,
+    val available: Boolean = true,
+    val addedTokenBalanceData: TokenBalanceData? = null,
+)
+
+data class Network(
+    val name: String,
+    val blockchainId: String,
+)
+
+data class TokenBalanceData(
+    val amount: String?,
+    val amountEquivalent: String?,
+)
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
new file mode 100644
index 0000000000..2bd831273c
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
@@ -0,0 +1,79 @@
+package com.tangem.feature.swap.models
+
+data class SwapStateHolder(
+    val sendCardData: SwapCardData,
+    val receiveCardData: SwapCardData,
+    val networkCurrency: String,
+    val networkId: String,
+    val blockchainId: String, // not the same as networkId, its local id in app
+    val fee: FeeState = FeeState.Empty,
+    val warnings: List<SwapWarning> = emptyList(),
+    val alert: SwapWarning.GenericWarning? = null,
+    val updateInProgress: Boolean = false,
+
+    val permissionState: SwapPermissionState = SwapPermissionState.Empty,
+    val successState: SwapSuccessStateHolder? = null,
+    val selectTokenState: SwapSelectTokenStateHolder? = null,
+
+    val swapButton: SwapButton,
+
+    val onRefresh: () -> Unit,
+    val onBackClicked: () -> Unit,
+    val onChangeCardsClicked: () -> Unit,
+    val onSelectTokenClick: (() -> Unit)? = null,
+    val onSuccess: (() -> Unit)? = null,
+    val onMaxAmountSelected: (() -> Unit)? = null,
+    val onShowPermissionBottomSheet: () -> Unit = {},
+    val onCancelPermissionBottomSheet: () -> Unit = {},
+)
+
+data class SwapCardData(
+    val type: TransactionCardType,
+    val amount: String?,
+    val amountEquivalent: String?,
+    val coinId: String?,
+    val tokenIconUrl: String,
+    val tokenCurrency: String,
+    val balance: String,
+    val isNotNativeToken: Boolean,
+    val canSelectAnotherToken: Boolean = false,
+)
+
+data class SwapButton(
+    val enabled: Boolean,
+    val loading: Boolean = false,
+    val onClick: () -> Unit,
+)
+
+sealed interface FeeState {
+
+    object Empty : FeeState
+
+    data class Loaded(
+        val fee: String = "",
+    ) : FeeState
+
+    object Loading : FeeState
+
+    data class NotEnoughFundsWarning(val fee: String) : FeeState
+}
+
+sealed interface TransactionCardType {
+
+    data class SendCard(
+        val onAmountChanged: ((String) -> Unit),
+        val onFocusChanged: ((Boolean) -> Unit),
+    ) : TransactionCardType
+
+    data class ReceiveCard(
+        val highPriceImpact: String? = null,
+    ) : TransactionCardType
+}
+
+sealed interface SwapWarning {
+    data class PermissionNeeded(val tokenCurrency: String) : SwapWarning
+    object InsufficientFunds : SwapWarning
+    data class GenericWarning(val message: String?, val onClick: () -> Unit) : SwapWarning
+    // data class RateExpired(val onClick: () -> Unit) : SwapWarning
+    // object HighPriceImpact : SwapWarning
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSuccessStateHolder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSuccessStateHolder.kt
new file mode 100644
index 0000000000..56dc3525a8
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSuccessStateHolder.kt
@@ -0,0 +1,7 @@
+package com.tangem.feature.swap.models
+
+data class SwapSuccessStateHolder(
+    val fromTokenAmount: String,
+    val toTokenAmount: String,
+    val onSecondaryButtonClick: () -> Unit,
+)
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/UiActions.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/UiActions.kt
new file mode 100644
index 0000000000..5273bc3b30
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/UiActions.kt
@@ -0,0 +1,15 @@
+package com.tangem.feature.swap.models
+
+data class UiActions(
+    val onSearchEntered: (String) -> Unit,
+    val onTokenSelected: (String) -> Unit,
+    val onAmountChanged: (String) -> Unit,
+    val onAmountSelected: (Boolean) -> Unit,
+    val onSwapClick: () -> Unit,
+    val onGivePermissionClick: () -> Unit,
+    val onChangeCardsClicked: () -> Unit,
+    val onBackClicked: () -> Unit,
+    val onMaxAmountSelected: () -> Unit,
+    val openPermissionBottomSheet: () -> Unit,
+    val hidePermissionBottomSheet: () -> Unit,
+)
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt
new file mode 100644
index 0000000000..d74ac54e33
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt
@@ -0,0 +1,87 @@
+package com.tangem.feature.swap.presentation
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.compose.animation.Crossfade
+import androidx.compose.runtime.Composable
+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.swap.router.CustomTabsManager
+import com.tangem.feature.swap.router.SwapRouter
+import com.tangem.feature.swap.router.SwapScreen
+import com.tangem.feature.swap.ui.SwapScreen
+import com.tangem.feature.swap.ui.SwapSelectTokenScreen
+import com.tangem.feature.swap.ui.SwapSuccessScreen
+import com.tangem.feature.swap.viewmodels.SwapViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import java.lang.ref.WeakReference
+
+@AndroidEntryPoint
+class SwapFragment : Fragment() {
+
+    private val viewModel by viewModels<SwapViewModel>()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        activity?.window?.let { WindowCompat.setDecorFitsSystemWindows(it, true) }
+        viewModel.setRouter(
+            SwapRouter(
+                fragmentManager = WeakReference(parentFragmentManager),
+                customTabsManager = CustomTabsManager(WeakReference(context)),
+            ),
+        )
+        viewModel.onScreenOpened()
+
+        activity?.onBackPressedDispatcher?.addCallback(
+            viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    viewModel.uiState.onBackClicked()
+                }
+            },
+        )
+
+        return ComposeView(inflater.context).apply {
+            setContent {
+                ScreenContent(viewModel = viewModel)
+            }
+        }
+    }
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    private fun ScreenContent(viewModel: SwapViewModel) {
+        Crossfade(targetState = viewModel.currentScreen) { screen ->
+            when (screen) {
+                SwapScreen.Main -> SwapScreen(stateHolder = viewModel.uiState)
+                SwapScreen.Success -> {
+                    val successState = viewModel.uiState.successState
+                    if (successState != null) {
+                        SwapSuccessScreen(state = successState, viewModel.uiState.onBackClicked)
+                    } else {
+                        SwapScreen(stateHolder = viewModel.uiState)
+                    }
+                }
+                SwapScreen.SelectToken -> {
+                    val tokenState = viewModel.uiState.selectTokenState
+                    if (tokenState != null) {
+                        SwapSelectTokenScreen(
+                            state = tokenState,
+                            onBack = viewModel.uiState.onBackClicked,
+                        )
+                    } else {
+                        SwapScreen(stateHolder = viewModel.uiState)
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        const val CURRENCY_BUNDLE_KEY = "swap_currency"
+    }
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/CustomTabsManager.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/CustomTabsManager.kt
new file mode 100644
index 0000000000..15e39f08f3
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/CustomTabsManager.kt
@@ -0,0 +1,18 @@
+package com.tangem.feature.swap.router
+
+import android.content.Context
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsIntent
+import java.lang.ref.WeakReference
+
+class CustomTabsManager(private val context: WeakReference<Context>) {
+    fun openUrl(url: String) {
+        val customTabsIntent = CustomTabsIntent.Builder()
+            .setDefaultColorSchemeParams(
+                CustomTabColorSchemeParams.Builder().build(),
+            )
+            .build()
+        context.get()?.let { customTabsIntent.launchUrl(it, Uri.parse(url)) }
+    }
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt
new file mode 100644
index 0000000000..f29bef3bbc
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt
@@ -0,0 +1,36 @@
+package com.tangem.feature.swap.router
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.fragment.app.FragmentManager
+import java.lang.ref.WeakReference
+
+internal class SwapRouter(
+    private val fragmentManager: WeakReference<FragmentManager>,
+    private val customTabsManager: CustomTabsManager,
+) {
+
+    var currentScreen by mutableStateOf(SwapScreen.Main)
+        private set
+
+    fun openScreen(screen: SwapScreen) {
+        currentScreen = screen
+    }
+
+    fun back() {
+        if (currentScreen == SwapScreen.SelectToken) {
+            currentScreen = SwapScreen.Main
+        } else {
+            fragmentManager.get()?.popBackStack()
+        }
+    }
+
+    fun openUrl(url: String) {
+        customTabsManager.openUrl(url)
+    }
+}
+
+enum class SwapScreen {
+    Main, Success, SelectToken
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/AutosizeTextField.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/AutosizeTextField.kt
new file mode 100644
index 0000000000..7ffc2cc4f1
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/AutosizeTextField.kt
@@ -0,0 +1,96 @@
+package com.tangem.feature.swap.ui
+
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.selection.LocalTextSelectionColors
+import androidx.compose.foundation.text.selection.TextSelectionColors
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.ParagraphIntrinsics
+import androidx.compose.ui.text.font.createFontFamilyResolver
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import com.tangem.core.ui.res.TangemTheme
+
+@Suppress("MagicNumber", "LongMethod")
+@Composable
+internal fun AutoSizeTextField(
+    amount: String,
+    onAmountChange: (String) -> Unit,
+    onFocusChange: (Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val focusManager = LocalFocusManager.current
+    val textFieldFocusRequester = remember { FocusRequester() }
+    BoxWithConstraints(modifier = modifier.fillMaxWidth()) {
+        var shrunkFontSize = TangemTheme.typography.h2.fontSize
+        val calculateIntrinsics = @Composable {
+            ParagraphIntrinsics(
+                text = amount,
+                style = TangemTheme.typography.h2.copy(
+                    color = TangemTheme.colors.text.primary1,
+                    fontSize = shrunkFontSize,
+                ),
+                density = LocalDensity.current,
+                fontFamilyResolver = createFontFamilyResolver(LocalContext.current),
+            )
+        }
+
+        var intrinsics = calculateIntrinsics()
+        with(LocalDensity.current) {
+            while (intrinsics.maxIntrinsicWidth > maxWidth.toPx()) {
+                shrunkFontSize *= 0.9f
+                intrinsics = calculateIntrinsics()
+            }
+        }
+        val customTextSelectionColors = TextSelectionColors(
+            handleColor = Color.Transparent,
+            backgroundColor = TangemTheme.colors.text.secondary.copy(alpha = 0.4f),
+        )
+        CompositionLocalProvider(LocalTextSelectionColors provides customTextSelectionColors) {
+            BasicTextField(
+                value = amount,
+                onValueChange = onAmountChange,
+                singleLine = true,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .focusRequester(textFieldFocusRequester)
+                    .onFocusChanged { onFocusChange(it.hasFocus) },
+                keyboardOptions = KeyboardOptions(
+                    imeAction = ImeAction.Done,
+                    keyboardType = KeyboardType.Decimal,
+                ),
+                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
+                decorationBox = { innerTextField ->
+                    if (amount.isBlank()) {
+                        Text(
+                            text = "0",
+                            color = TangemTheme.colors.text.disabled,
+                            style = TangemTheme.typography.h2,
+                        )
+                    }
+                    innerTextField()
+                },
+                textStyle = TangemTheme.typography.h2.copy(
+                    color = TangemTheme.colors.text.primary1,
+                    fontSize = shrunkFontSize,
+                ),
+                cursorBrush = SolidColor(TangemTheme.colors.text.primary1),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
new file mode 100644
index 0000000000..d2d3ed232e
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@@ -0,0 +1,344 @@
+package com.tangem.feature.swap.ui
+
+import com.tangem.feature.swap.converters.TokensDataConverter
+import com.tangem.feature.swap.domain.models.DataError
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.NetworkInfo
+import com.tangem.feature.swap.domain.models.domain.isNonNative
+import com.tangem.feature.swap.domain.models.formatToUIRepresentation
+import com.tangem.feature.swap.domain.models.ui.FoundTokensState
+import com.tangem.feature.swap.domain.models.ui.PermissionDataState
+import com.tangem.feature.swap.domain.models.ui.SwapState
+import com.tangem.feature.swap.domain.models.ui.TxState
+import com.tangem.feature.swap.models.ApprovePermissionButton
+import com.tangem.feature.swap.models.CancelPermissionButton
+import com.tangem.feature.swap.models.FeeState
+import com.tangem.feature.swap.models.SwapButton
+import com.tangem.feature.swap.models.SwapCardData
+import com.tangem.feature.swap.models.SwapPermissionState
+import com.tangem.feature.swap.models.SwapStateHolder
+import com.tangem.feature.swap.models.SwapSuccessStateHolder
+import com.tangem.feature.swap.models.SwapWarning
+import com.tangem.feature.swap.models.TransactionCardType
+import com.tangem.feature.swap.models.UiActions
+
+/**
+ * State builder creates a specific states for SwapScreen
+ */
+internal class StateBuilder(val actions: UiActions) {
+
+    private val tokensDataConverter = TokensDataConverter(actions.onSearchEntered, actions.onTokenSelected)
+
+    fun createInitialLoadingState(initialCurrency: Currency, networkInfo: NetworkInfo): SwapStateHolder {
+        return SwapStateHolder(
+            networkId = initialCurrency.networkId,
+            blockchainId = networkInfo.blockchainId,
+            sendCardData = SwapCardData(
+                type = TransactionCardType.SendCard(actions.onAmountChanged, actions.onAmountSelected),
+                amount = null,
+                amountEquivalent = null,
+                tokenIconUrl = initialCurrency.logoUrl,
+                tokenCurrency = initialCurrency.symbol,
+                coinId = initialCurrency.id,
+                canSelectAnotherToken = false,
+                isNotNativeToken = initialCurrency.isNonNative(),
+                balance = "",
+            ),
+            receiveCardData = SwapCardData(
+                type = TransactionCardType.ReceiveCard(),
+                amount = null,
+                amountEquivalent = null,
+                tokenIconUrl = "",
+                tokenCurrency = "",
+                canSelectAnotherToken = false,
+                balance = "",
+                isNotNativeToken = false,
+                coinId = null,
+            ),
+            fee = FeeState.Loading,
+            networkCurrency = networkInfo.blockchainCurrency,
+            swapButton = SwapButton(enabled = false, loading = true, onClick = {}),
+            onRefresh = {},
+            onBackClicked = actions.onBackClicked,
+            onChangeCardsClicked = actions.onChangeCardsClicked,
+            onMaxAmountSelected = actions.onMaxAmountSelected,
+            updateInProgress = true,
+            onShowPermissionBottomSheet = actions.openPermissionBottomSheet,
+            onCancelPermissionBottomSheet = actions.hidePermissionBottomSheet,
+        )
+    }
+
+    fun createQuotesLoadingState(
+        uiStateHolder: SwapStateHolder,
+        fromToken: Currency,
+        toToken: Currency,
+        mainTokenId: String,
+    ): SwapStateHolder {
+        return uiStateHolder.copy(
+            sendCardData = SwapCardData(
+                type = requireNotNull(uiStateHolder.sendCardData.type as? TransactionCardType.SendCard),
+                amount = uiStateHolder.sendCardData.amount,
+                amountEquivalent = null,
+                tokenIconUrl = fromToken.logoUrl,
+                tokenCurrency = fromToken.symbol,
+                coinId = fromToken.id,
+                isNotNativeToken = fromToken.isNonNative(),
+                canSelectAnotherToken = mainTokenId != fromToken.id,
+                balance = "",
+            ),
+            receiveCardData = SwapCardData(
+                type = TransactionCardType.ReceiveCard(),
+                amount = null,
+                amountEquivalent = null,
+                tokenIconUrl = toToken.logoUrl,
+                tokenCurrency = toToken.symbol,
+                coinId = toToken.id,
+                isNotNativeToken = toToken.isNonNative(),
+                canSelectAnotherToken = mainTokenId != toToken.id,
+                balance = "",
+            ),
+            fee = FeeState.Loading,
+            swapButton = SwapButton(enabled = false, loading = true, onClick = {}),
+            permissionState = uiStateHolder.permissionState,
+            updateInProgress = true,
+        )
+    }
+
+    fun createQuotesLoadedState(
+        uiStateHolder: SwapStateHolder,
+        quoteModel: SwapState.QuotesLoadedState,
+        fromToken: Currency,
+    ): SwapStateHolder {
+        val warnings = mutableListOf<SwapWarning>()
+        if (!quoteModel.preparedSwapConfigState.isAllowedToSpend && quoteModel.preparedSwapConfigState.isFeeEnough) {
+            warnings.add(SwapWarning.PermissionNeeded(fromToken.symbol))
+        }
+        if (!quoteModel.preparedSwapConfigState.isBalanceEnough) {
+            warnings.add(SwapWarning.InsufficientFunds)
+        }
+        val feeState = if (quoteModel.preparedSwapConfigState.isFeeEnough) {
+            FeeState.Loaded(quoteModel.fee)
+        } else {
+            FeeState.NotEnoughFundsWarning(quoteModel.fee)
+        }
+        return uiStateHolder.copy(
+            sendCardData = SwapCardData(
+                type = requireNotNull(uiStateHolder.sendCardData.type as? TransactionCardType.SendCard),
+                amount = uiStateHolder.sendCardData.amount,
+                amountEquivalent = quoteModel.fromTokenInfo.tokenFiatBalance,
+                tokenIconUrl = uiStateHolder.sendCardData.tokenIconUrl,
+                coinId = quoteModel.fromTokenInfo.coinId,
+                isNotNativeToken = uiStateHolder.sendCardData.isNotNativeToken,
+                tokenCurrency = uiStateHolder.sendCardData.tokenCurrency,
+                canSelectAnotherToken = uiStateHolder.sendCardData.canSelectAnotherToken,
+                balance = quoteModel.fromTokenInfo.tokenWalletBalance,
+            ),
+            receiveCardData = SwapCardData(
+                type = TransactionCardType.ReceiveCard(),
+                amount = quoteModel.toTokenInfo.tokenAmount.formatToUIRepresentation(),
+                amountEquivalent = quoteModel.toTokenInfo.tokenFiatBalance,
+                tokenIconUrl = uiStateHolder.receiveCardData.tokenIconUrl,
+                coinId = quoteModel.toTokenInfo.coinId,
+                isNotNativeToken = uiStateHolder.receiveCardData.isNotNativeToken,
+                tokenCurrency = uiStateHolder.receiveCardData.tokenCurrency,
+                canSelectAnotherToken = uiStateHolder.receiveCardData.canSelectAnotherToken,
+                balance = quoteModel.toTokenInfo.tokenWalletBalance,
+            ),
+            networkCurrency = quoteModel.networkCurrency,
+            warnings = warnings,
+            permissionState = convertPermissionState(quoteModel.permissionState, actions.onGivePermissionClick),
+            fee = feeState,
+            swapButton = SwapButton(
+                enabled = quoteModel.preparedSwapConfigState.isAllowedToSpend &&
+                    quoteModel.preparedSwapConfigState.isBalanceEnough &&
+                    quoteModel.preparedSwapConfigState.isFeeEnough,
+                loading = false,
+                onClick = actions.onSwapClick,
+            ),
+            updateInProgress = false,
+        )
+    }
+
+    fun createQuotesEmptyAmountState(
+        uiStateHolder: SwapStateHolder,
+        emptyAmountState: SwapState.EmptyAmountState,
+    ): SwapStateHolder {
+        return uiStateHolder.copy(
+            sendCardData = SwapCardData(
+                type = requireNotNull(uiStateHolder.sendCardData.type as? TransactionCardType.SendCard),
+                amount = uiStateHolder.sendCardData.amount,
+                amountEquivalent = "",
+                tokenIconUrl = uiStateHolder.sendCardData.tokenIconUrl,
+                coinId = uiStateHolder.sendCardData.coinId,
+                isNotNativeToken = uiStateHolder.sendCardData.isNotNativeToken,
+                tokenCurrency = uiStateHolder.sendCardData.tokenCurrency,
+                canSelectAnotherToken = uiStateHolder.sendCardData.canSelectAnotherToken,
+                balance = emptyAmountState.fromTokenWalletBalance,
+            ),
+            receiveCardData = SwapCardData(
+                type = TransactionCardType.ReceiveCard(),
+                amount = "0",
+                amountEquivalent = "",
+                tokenIconUrl = uiStateHolder.receiveCardData.tokenIconUrl,
+                coinId = uiStateHolder.receiveCardData.coinId,
+                isNotNativeToken = uiStateHolder.receiveCardData.isNotNativeToken,
+                tokenCurrency = uiStateHolder.receiveCardData.tokenCurrency,
+                canSelectAnotherToken = uiStateHolder.receiveCardData.canSelectAnotherToken,
+                balance = emptyAmountState.toTokenWalletBalance,
+            ),
+            fee = FeeState.Empty,
+            swapButton = SwapButton(
+                enabled = false,
+                loading = false,
+                onClick = { },
+            ),
+            updateInProgress = false,
+        )
+    }
+
+    fun createSwapInProgressState(uiState: SwapStateHolder): SwapStateHolder {
+        return uiState.copy(
+            swapButton = uiState.swapButton.copy(
+                loading = true,
+                enabled = false,
+            ),
+        )
+    }
+
+    fun addTokensToState(
+        uiState: SwapStateHolder,
+        dataState: FoundTokensState,
+        networkInfo: NetworkInfo,
+    ): SwapStateHolder {
+        return uiState.copy(
+            selectTokenState = tokensDataConverter.convertWithNetwork(
+                value = dataState,
+                network = networkInfo,
+            ),
+        )
+    }
+
+    private fun convertPermissionState(
+        permissionDataState: PermissionDataState,
+        onGivePermissionClick: () -> Unit,
+    ): SwapPermissionState {
+        return when (permissionDataState) {
+            PermissionDataState.Empty -> SwapPermissionState.Empty
+            PermissionDataState.PermissionFailed -> SwapPermissionState.Empty
+            PermissionDataState.PermissionLoading -> SwapPermissionState.InProgress
+            is PermissionDataState.PermissionReadyForRequest -> SwapPermissionState.ReadyForRequest(
+                currency = permissionDataState.currency,
+                amount = permissionDataState.amount,
+                walletAddress = getShortAddressValue(permissionDataState.walletAddress),
+                spenderAddress = getShortAddressValue(permissionDataState.spenderAddress),
+                fee = permissionDataState.fee,
+                approveButton = ApprovePermissionButton(
+                    enabled = true,
+                    onClick = onGivePermissionClick,
+                ),
+                cancelButton = CancelPermissionButton(
+                    enabled = true,
+                    onClick = {},
+                ),
+            )
+        }
+    }
+
+    fun updateSwapAmount(uiState: SwapStateHolder, amount: String): SwapStateHolder {
+        return uiState.copy(
+            sendCardData = uiState.sendCardData.copy(
+                amount = amount,
+            ),
+        )
+    }
+
+    fun loadingPermissionState(uiState: SwapStateHolder): SwapStateHolder {
+        return uiState.copy(
+            permissionState = SwapPermissionState.InProgress,
+            warnings = uiState.warnings.filterNot { it is SwapWarning.PermissionNeeded },
+        )
+    }
+
+    fun createSuccessState(
+        uiState: SwapStateHolder,
+        txState: TxState.TxSent,
+        onSecondaryBtnClick: () -> Unit,
+    ): SwapStateHolder {
+        return uiState.copy(
+            successState = SwapSuccessStateHolder(
+                fromTokenAmount = txState.fromAmount ?: "",
+                toTokenAmount = txState.toAmount ?: "",
+                onSecondaryButtonClick = onSecondaryBtnClick,
+            ),
+        )
+    }
+
+    fun createSwapErrorTransaction(uiState: SwapStateHolder, onAlertClick: () -> Unit): SwapStateHolder {
+        return uiState.copy(
+            swapButton = uiState.swapButton.copy(
+                enabled = true,
+                loading = false,
+            ),
+            alert = SwapWarning.GenericWarning(
+                message = null,
+                onClick = onAlertClick,
+            ),
+            updateInProgress = false,
+        )
+    }
+
+    fun addWarning(uiState: SwapStateHolder, message: String?): SwapStateHolder {
+        return if (message != null) {
+            val renewWarnings = uiState.warnings.filterNot { it is SwapWarning.GenericWarning }.toMutableList()
+            renewWarnings.add(SwapWarning.GenericWarning(message) {})
+            uiState.copy(
+                warnings = renewWarnings,
+            )
+        } else {
+            uiState
+        }
+    }
+
+    fun mapError(uiState: SwapStateHolder, error: DataError): SwapStateHolder {
+        return when (error) {
+            // todo use if needed later
+            // DataError.InsufficientLiquidity -> TODO()
+            // DataError.NoError -> TODO()
+            is DataError.UnknownError -> addWarning(uiState, error.message)
+            else -> addWarning(uiState, null)
+        }
+    }
+
+    fun addAlert(uiState: SwapStateHolder, onClick: () -> Unit): SwapStateHolder {
+        return uiState.copy(
+            alert = SwapWarning.GenericWarning(
+                message = null,
+                onClick = onClick,
+            ),
+        )
+    }
+
+    fun clearAlert(uiState: SwapStateHolder): SwapStateHolder = uiState.copy(alert = null)
+
+    private fun getShortAddressValue(fullAddress: String): String {
+        check(fullAddress.length > ADDRESS_MIN_LENGTH) { "Invalid address" }
+        val firstAddressPart = fullAddress.substring(startIndex = 0, endIndex = ADDRESS_FIRST_PART_LENGTH)
+        val secondAddressPart = fullAddress.substring(
+            startIndex = fullAddress.length - ADDRESS_SECOND_PART_LENGTH,
+            endIndex = fullAddress.length,
+        )
+        return "$firstAddressPart...$secondAddressPart"
+    }
+
+    fun createSilentLoadState(uiState: SwapStateHolder): SwapStateHolder {
+        return uiState.copy(
+            updateInProgress = true,
+        )
+    }
+
+    private companion object {
+        const val ADDRESS_MIN_LENGTH = 11
+        const val ADDRESS_FIRST_PART_LENGTH = 7
+        const val ADDRESS_SECOND_PART_LENGTH = 4
+    }
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapPermissionBottomSheetContent.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapPermissionBottomSheetContent.kt
new file mode 100644
index 0000000000..e67b98b3da
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapPermissionBottomSheetContent.kt
@@ -0,0 +1,210 @@
+package com.tangem.feature.swap.ui
+
+import androidx.activity.compose.BackHandler
+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.Divider
+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.MiddleEllipsisText
+import com.tangem.core.ui.components.PrimaryButtonIconRight
+import com.tangem.core.ui.components.SecondaryButton
+import com.tangem.core.ui.components.SpacerH10
+import com.tangem.core.ui.components.SpacerH12
+import com.tangem.core.ui.components.SpacerH16
+import com.tangem.core.ui.components.SpacerH28
+import com.tangem.core.ui.components.atoms.Hand
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.swap.models.ApprovePermissionButton
+import com.tangem.feature.swap.models.CancelPermissionButton
+import com.tangem.feature.swap.models.SwapPermissionState
+import com.tangem.feature.swap.presentation.R
+
+@Composable
+fun SwapPermissionBottomSheetContent(data: SwapPermissionState.ReadyForRequest, onCancel: () -> Unit) {
+    BackHandler(onBack = onCancel)
+
+    Column(
+        modifier = Modifier
+            .background(color = TangemTheme.colors.background.primary)
+            .fillMaxWidth()
+            .padding(horizontal = TangemTheme.dimens.spacing16),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Hand()
+
+        SpacerH10()
+
+        Text(
+            text = stringResource(id = R.string.swapping_permission_header),
+            color = TangemTheme.colors.text.primary1,
+            style = TangemTheme.typography.subtitle1,
+        )
+
+        SpacerH10()
+
+        Text(
+            text = stringResource(
+                id = R.string.swapping_permission_subheader,
+                data.currency,
+            ),
+            color = TangemTheme.colors.text.secondary,
+            style = TangemTheme.typography.body2,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing8),
+        )
+
+        SpacerH16()
+
+        ApprovalBottomSheetInfo(data)
+
+        SpacerH28()
+
+        PrimaryButtonIconRight(
+            text = stringResource(id = R.string.swapping_permission_buttons_approve),
+            icon = painterResource(id = R.drawable.ic_tangem_24),
+            modifier = Modifier.fillMaxWidth(),
+            onClick = data.approveButton.onClick,
+        )
+
+        SpacerH12()
+
+        SecondaryButton(
+            text = stringResource(id = R.string.common_cancel),
+            modifier = Modifier.fillMaxWidth(),
+            onClick = {
+                data.cancelButton.onClick()
+                onCancel()
+            },
+        )
+
+        SpacerH16()
+    }
+}
+
+@Composable
+private fun ApprovalBottomSheetInfo(data: SwapPermissionState.ReadyForRequest) {
+    Column(
+        modifier = Modifier
+            .background(color = TangemTheme.colors.background.primary)
+            .fillMaxWidth()
+            .padding(
+                start = TangemTheme.dimens.spacing12,
+                end = TangemTheme.dimens.spacing16,
+            ),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        AmountItem(currency = data.currency, amount = data.amount)
+        DividerBottomSheet()
+        WalletAddressItem(walletAddress = data.walletAddress)
+        DividerBottomSheet()
+        SpenderItem(spenderAddress = data.spenderAddress)
+        DividerBottomSheet()
+        FeeItem(fee = data.fee)
+    }
+}
+
+@Composable
+private fun DividerBottomSheet() {
+    Divider(
+        color = TangemTheme.colors.stroke.primary,
+        thickness = TangemTheme.dimens.size0_5,
+    )
+}
+
+@Composable
+private fun InformationItem(subtitle: String, value: String) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(TangemTheme.dimens.spacing16),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = subtitle,
+            color = TangemTheme.colors.text.primary1,
+            style = TangemTheme.typography.subtitle1,
+            maxLines = 1,
+        )
+
+        MiddleEllipsisText(
+            text = value,
+            color = TangemTheme.colors.text.tertiary,
+            style = TangemTheme.typography.body2,
+            modifier = Modifier.padding(start = TangemTheme.dimens.spacing16)
+        )
+    }
+}
+
+@Composable
+private fun AmountItem(currency: String, amount: String) {
+    InformationItem(
+        subtitle = stringResource(id = R.string.swapping_permission_rows_amount, currency),
+        value = amount,
+    )
+}
+
+@Composable
+private fun WalletAddressItem(walletAddress: String) {
+    InformationItem(
+        subtitle = stringResource(id = R.string.swapping_permission_rows_your_wallet),
+        value = walletAddress,
+    )
+}
+
+@Composable
+private fun SpenderItem(spenderAddress: String) {
+    InformationItem(
+        subtitle = stringResource(id = R.string.swapping_permission_rows_spender),
+        value = spenderAddress,
+    )
+}
+
+@Composable
+private fun FeeItem(fee: String) {
+    InformationItem(
+        subtitle = stringResource(id = R.string.send_fee_label),
+        value = fee,
+    )
+}
+
+// region preview
+
+@Preview
+@Composable
+private fun Preview_AgreementBottomSheet_InLightTheme() {
+    TangemTheme(isDark = false) {
+        SwapPermissionBottomSheetContent(data = previewData) {}
+    }
+}
+
+@Preview
+@Composable
+private fun Preview_AgreementBottomSheet_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        SwapPermissionBottomSheetContent(data = previewData) {}
+    }
+}
+
+private val previewData = SwapPermissionState.ReadyForRequest(
+    currency = "DAI",
+    amount = "∞",
+    walletAddress = "",
+    spenderAddress = "",
+    fee = "2,14$",
+    approveButton = ApprovePermissionButton(true) {},
+    cancelButton = CancelPermissionButton(true) {},
+)
+
+//endregion preview
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
new file mode 100644
index 0000000000..b907deef8d
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
@@ -0,0 +1,75 @@
+package com.tangem.feature.swap.ui
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.ModalBottomSheetLayout
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.swap.models.SwapPermissionState
+import com.tangem.feature.swap.models.SwapStateHolder
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+internal fun SwapScreen(stateHolder: SwapStateHolder) {
+    val coroutineScope = rememberCoroutineScope()
+    val bottomSheetState = rememberModalBottomSheetState(
+        initialValue = ModalBottomSheetValue.Hidden,
+        skipHalfExpanded = true,
+    )
+
+    TangemTheme {
+        ModalBottomSheetLayout(
+            sheetContent = {
+                if (stateHolder.permissionState is SwapPermissionState.ReadyForRequest) {
+                    SwapPermissionBottomSheetContent(
+                        data = stateHolder.permissionState,
+                        onCancel = {
+                            coroutineScope.launch {
+                                stateHolder.onCancelPermissionBottomSheet.invoke()
+                                bottomSheetState.hide()
+                            }
+                        },
+                    )
+                } else {
+                    // Required "else" block to prevent compose crash
+                    // always close BS if its empty, cause user should not see this
+                    LaunchedEffect(Unit) {
+                        coroutineScope.launch { bottomSheetState.hide() }
+                    }
+                    Box(modifier = Modifier.fillMaxSize())
+                }
+            },
+            sheetState = bottomSheetState,
+            sheetShape = RoundedCornerShape(
+                topStart = TangemTheme.dimens.radius16,
+                topEnd = TangemTheme.dimens.radius16,
+            ),
+            sheetElevation = TangemTheme.dimens.elevation24,
+            content = {
+                SwapScreenContent(
+                    state = stateHolder,
+                    onPermissionWarningClick = {
+                        val isBottomSheetReady = !bottomSheetState.isVisible &&
+                            stateHolder.permissionState is SwapPermissionState.ReadyForRequest
+                        coroutineScope.launch {
+                            if (isBottomSheetReady) {
+                                bottomSheetState.show()
+                                stateHolder.onShowPermissionBottomSheet.invoke()
+                            } else {
+                                bottomSheetState.hide()
+                            }
+                        }
+                    },
+                )
+            },
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
new file mode 100644
index 0000000000..2d173cddbe
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
@@ -0,0 +1,383 @@
+package com.tangem.feature.swap.ui
+
+import androidx.compose.animation.AnimatedVisibility
+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
+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.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Card
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+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 androidx.constraintlayout.compose.ConstraintLayout
+import com.tangem.core.ui.components.CardWithIcon
+import com.tangem.core.ui.components.Keyboard
+import com.tangem.core.ui.components.PrimaryButton
+import com.tangem.core.ui.components.PrimaryButtonIconRight
+import com.tangem.core.ui.components.RefreshableWaringCard
+import com.tangem.core.ui.components.SimpleOkDialog
+import com.tangem.core.ui.components.SmallInfoCard
+import com.tangem.core.ui.components.SmallInfoCardWithWarning
+import com.tangem.core.ui.components.WarningCard
+import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.components.keyboardAsState
+import com.tangem.core.ui.extensions.getActiveIconRes
+import com.tangem.core.ui.extensions.getActiveIconResByCoinId
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.swap.models.FeeState
+import com.tangem.feature.swap.models.SwapButton
+import com.tangem.feature.swap.models.SwapCardData
+import com.tangem.feature.swap.models.SwapPermissionState
+import com.tangem.feature.swap.models.SwapStateHolder
+import com.tangem.feature.swap.models.SwapWarning
+import com.tangem.feature.swap.models.TransactionCardType
+import com.tangem.feature.swap.presentation.R
+
+@Suppress("LongMethod")
+@Composable
+internal fun SwapScreenContent(state: SwapStateHolder, onPermissionWarningClick: () -> Unit) {
+    val keyboard by keyboardAsState()
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(color = TangemTheme.colors.background.secondary),
+    ) {
+        Column {
+            AppBarWithBackButton(
+                text = stringResource(R.string.swapping_swap),
+                onBackClick = state.onBackClicked,
+                iconRes = R.drawable.ic_close_24,
+            )
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = TangemTheme.dimens.spacing16,
+                        end = TangemTheme.dimens.spacing16,
+                        top = TangemTheme.dimens.spacing16,
+                        bottom = TangemTheme.dimens.spacing32,
+                    ),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+            ) {
+                MainInfo(state)
+
+                FeeItem(feeState = state.fee, currency = state.networkCurrency)
+
+                if (state.warnings.isNotEmpty()) SwapWarnings(warnings = state.warnings)
+
+                if (state.permissionState is SwapPermissionState.InProgress) {
+                    CardWithIcon(
+                        title = stringResource(id = R.string.swapping_pending_transaction_title),
+                        description = stringResource(id = R.string.swapping_pending_transaction_subtitle),
+                        icon = {
+                            CircularProgressIndicator(
+                                modifier = Modifier
+                                    .size(TangemTheme.dimens.size16),
+                                color = TangemTheme.colors.icon.primary1,
+                                strokeWidth = TangemTheme.dimens.size2,
+                            )
+                        },
+                    )
+                }
+                MainButton(state = state, onPermissionWarningClick = onPermissionWarningClick)
+            }
+        }
+
+        AnimatedVisibility(
+            visible = keyboard is Keyboard.Opened,
+            modifier = Modifier.align(Alignment.BottomCenter),
+        ) {
+            Text(
+                text = stringResource(id = R.string.send_max_amount_label),
+                style = TangemTheme.typography.button,
+                color = TangemTheme.colors.text.primary1,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(TangemTheme.colors.button.secondary)
+                    .clickable { state.onMaxAmountSelected?.invoke() }
+                    .padding(
+                        horizontal = TangemTheme.dimens.spacing14,
+                        vertical = TangemTheme.dimens.spacing16,
+                    ),
+                textAlign = TextAlign.Start,
+            )
+        }
+
+        if (state.alert != null) {
+            SimpleOkDialog(
+                message = state.alert.message ?: stringResource(id = R.string.swapping_generic_error),
+                onDismissDialog = state.alert.onClick,
+            )
+        }
+    }
+}
+
+@Composable
+private fun MainInfo(state: SwapStateHolder) {
+    ConstraintLayout(
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        val networkIconRes = remember {
+            getActiveIconRes(state.blockchainId)
+        }
+        val (topCard, bottomCard, button) = createRefs()
+        TransactionCard(
+            type = state.sendCardData.type,
+            balance = state.sendCardData.balance,
+            amount = state.sendCardData.amount,
+            amountEquivalent = state.sendCardData.amountEquivalent,
+            tokenIconUrl = state.sendCardData.tokenIconUrl,
+            tokenCurrency = state.sendCardData.tokenCurrency,
+            networkIconRes = if (state.sendCardData.isNotNativeToken) networkIconRes else null,
+            iconPlaceholder = state.sendCardData.coinId?.let {
+                getActiveIconResByCoinId(it, state.networkId)
+            },
+            onChangeTokenClick = if (state.sendCardData.canSelectAnotherToken) state.onSelectTokenClick else null,
+            modifier = Modifier.constrainAs(topCard) {
+                top.linkTo(parent.top)
+            },
+        )
+        val marginCard = TangemTheme.dimens.spacing16
+        TransactionCard(
+            type = state.receiveCardData.type,
+            balance = state.receiveCardData.balance,
+            amount = state.receiveCardData.amount,
+            amountEquivalent = state.receiveCardData.amountEquivalent,
+            tokenIconUrl = state.receiveCardData.tokenIconUrl,
+            tokenCurrency = state.receiveCardData.tokenCurrency,
+            networkIconRes = if (state.receiveCardData.isNotNativeToken) networkIconRes else null,
+            iconPlaceholder = state.receiveCardData.coinId?.let {
+                getActiveIconResByCoinId(it, state.networkId)
+            },
+            onChangeTokenClick = if (state.receiveCardData.canSelectAnotherToken) {
+                state.onSelectTokenClick
+            } else {
+                null
+            },
+            modifier = Modifier.constrainAs(bottomCard) {
+                top.linkTo(topCard.bottom, margin = marginCard)
+            },
+        )
+        val marginButton = TangemTheme.dimens.spacing32
+        SwapButton(
+            state,
+            modifier = Modifier.constrainAs(button) {
+                bottom.linkTo(topCard.bottom, margin = -marginButton)
+                start.linkTo(topCard.start)
+                end.linkTo(topCard.end)
+            },
+        )
+    }
+}
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+private fun SwapButton(state: SwapStateHolder, modifier: Modifier = Modifier) {
+    Card(
+        elevation = TangemTheme.dimens.elevation3,
+        shape = CircleShape,
+        backgroundColor = TangemTheme.colors.background.plain,
+        contentColor = TangemTheme.colors.text.primary1,
+        modifier = modifier.size(TangemTheme.dimens.size48),
+        onClick = state.onChangeCardsClicked,
+        enabled = !state.updateInProgress,
+    ) {
+        if (state.updateInProgress) {
+            CircularProgressIndicator(
+                modifier = Modifier
+                    .size(TangemTheme.dimens.size16)
+                    .padding(TangemTheme.dimens.spacing14),
+                color = TangemTheme.colors.icon.primary1,
+                strokeWidth = TangemTheme.dimens.size2,
+            )
+        } else {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_exchange_vertical_24),
+                contentDescription = null,
+                tint = TangemTheme.colors.text.primary1,
+                modifier = Modifier.padding(TangemTheme.dimens.spacing12),
+            )
+        }
+    }
+}
+
+@Composable
+private fun FeeItem(feeState: FeeState, currency: String) {
+    val titleString = stringResource(id = R.string.send_fee_label)
+    when (feeState) {
+        is FeeState.Loaded -> {
+            SmallInfoCard(startText = titleString, endText = feeState.fee, isLoading = false)
+        }
+        FeeState.Loading -> {
+            SmallInfoCard(startText = titleString, endText = "", isLoading = true)
+        }
+        is FeeState.NotEnoughFundsWarning -> {
+            SmallInfoCardWithWarning(
+                startText = titleString,
+                endText = feeState.fee,
+                warningText = stringResource(
+                    id = R.string.swapping_not_enough_funds_for_fee,
+                    currency,
+                    currency,
+                ),
+            )
+        }
+        is FeeState.Empty -> {}
+    }
+}
+
+@Composable
+private fun SwapWarnings(
+    warnings: List<SwapWarning>,
+) {
+    Column(
+        modifier = Modifier
+            .background(color = TangemTheme.colors.background.secondary)
+            .fillMaxWidth(),
+    ) {
+        warnings.forEach { warning ->
+            when (warning) {
+                // SwapWarning.HighPriceImpact -> {
+                //     WarningCard(title = stringResource(id = R.string.), description = stringResource(id = R.string.))
+                // }
+                is SwapWarning.PermissionNeeded -> {
+                    WarningCard(
+                        title = stringResource(id = R.string.swapping_permission_header),
+                        description = stringResource(
+                            id = R.string.swapping_permission_subheader,
+                            warning.tokenCurrency,
+                        ),
+                        icon = {
+                            Image(
+                                painter = painterResource(id = com.tangem.core.ui.R.drawable.ic_locked_24),
+                                contentDescription = null,
+                                modifier = Modifier.size(TangemTheme.dimens.size20),
+                            )
+                        },
+                    )
+                }
+                is SwapWarning.GenericWarning -> {
+                    RefreshableWaringCard(
+                        title = stringResource(id = R.string.common_warning),
+                        description = warning.message ?: stringResource(id = R.string.swapping_generic_error),
+                        onClick = warning.onClick,
+                    )
+                }
+                else -> {}
+                // is SwapWarning.RateExpired -> {
+                //     RefreshableWaringCard(
+                //         title = stringResource(id = R.string.),
+                //         description = stringResource(id = R.string.),
+                //         onClick = warning.onClick,
+                //     )
+                // }
+            }
+        }
+    }
+}
+
+@Composable
+private fun MainButton(state: SwapStateHolder, onPermissionWarningClick: () -> Unit) {
+    when {
+        state.warnings.any { it is SwapWarning.PermissionNeeded } -> {
+            PrimaryButton(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(id = R.string.swapping_give_permission),
+                enabled = true,
+                showProgress = state.swapButton.loading,
+                onClick = onPermissionWarningClick,
+            )
+        }
+        state.warnings.any { it is SwapWarning.InsufficientFunds } -> {
+            PrimaryButton(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(id = R.string.swapping_insufficient_funds),
+                enabled = false,
+                showProgress = state.swapButton.loading,
+                onClick = state.swapButton.onClick,
+            )
+        }
+        else -> {
+            PrimaryButtonIconRight(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(id = R.string.swapping_swap),
+                icon = painterResource(id = R.drawable.ic_tangem_24),
+                enabled = state.swapButton.enabled,
+                showProgress = state.swapButton.loading,
+                onClick = state.swapButton.onClick,
+            )
+        }
+    }
+}
+
+// region preview
+
+private val sendCard = SwapCardData(
+    type = TransactionCardType.SendCard({}) {},
+    amount = "1 000 000",
+    amountEquivalent = "1 000 000",
+    tokenIconUrl = "",
+    tokenCurrency = "DAI",
+    isNotNativeToken = true,
+    canSelectAnotherToken = false,
+    balance = "123",
+    coinId = "",
+)
+
+private val receiveCard = SwapCardData(
+    type = TransactionCardType.ReceiveCard(),
+    amount = "1 000 000",
+    amountEquivalent = "1 000 000",
+    tokenIconUrl = "",
+    tokenCurrency = "DAI",
+    isNotNativeToken = true,
+    canSelectAnotherToken = true,
+    balance = "33333",
+    coinId = "",
+)
+
+private val state = SwapStateHolder(
+    networkId = "ethereum",
+    sendCardData = sendCard,
+    receiveCardData = receiveCard,
+    fee = FeeState.Loaded(fee = "0.155 MATIC (0.14 $)"),
+    warnings = listOf(SwapWarning.PermissionNeeded("DAI")),
+    networkCurrency = "MATIC",
+    swapButton = SwapButton(enabled = true, loading = false, onClick = {}),
+    onRefresh = {}, onBackClicked = {}, onChangeCardsClicked = {},
+    permissionState = SwapPermissionState.InProgress,
+    blockchainId = "POLYGON",
+    // alert = SwapWarning.GenericWarning("There was an error. Please try again.") {},
+)
+
+@Preview
+@Composable
+private fun SwapScreenContentPreview() {
+    TangemTheme(isDark = false) {
+        SwapScreenContent(state = state) {}
+    }
+}
+
+// endregion preview
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
new file mode 100644
index 0000000000..9d83769508
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
@@ -0,0 +1,269 @@
+package com.tangem.feature.swap.ui
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+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.foundation.shape.CircleShape
+import androidx.compose.material.Divider
+import androidx.compose.material.Scaffold
+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.ColorFilter
+import androidx.compose.ui.graphics.ColorMatrix
+import androidx.compose.ui.platform.LocalContext
+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 coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
+import com.tangem.core.ui.components.CurrencyPlaceholderIcon
+import com.tangem.core.ui.components.SpacerW2
+import com.tangem.core.ui.components.appbar.ExpandableSearchView
+import com.tangem.core.ui.extensions.getActiveIconRes
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.swap.models.Network
+import com.tangem.feature.swap.models.SwapSelectTokenStateHolder
+import com.tangem.feature.swap.models.TokenBalanceData
+import com.tangem.feature.swap.models.TokenToSelect
+import com.tangem.feature.swap.presentation.R
+import com.valentinilk.shimmer.shimmer
+
+@Composable
+fun SwapSelectTokenScreen(state: SwapSelectTokenStateHolder, onBack: () -> Unit) {
+    TangemTheme {
+        Scaffold(
+            content = { padding ->
+                ListOfTokens(state = state, Modifier.padding(padding))
+            },
+            topBar = {
+                ExpandableSearchView(
+                    title = stringResource(R.string.swapping_token_list_title),
+                    onBackClick = onBack,
+                    placeholderSearchText = stringResource(id = R.string.search_tokens_title),
+                    onSearchChange = state.onSearchEntered,
+                    onSearchDisplayClose = { state.onSearchEntered("") },
+                    subtitle = state.network.name,
+                    icon = painterResource(id = getActiveIconRes(state.network.blockchainId)),
+                )
+            },
+            modifier = Modifier.background(color = TangemTheme.colors.background.secondary),
+        )
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun ListOfTokens(state: SwapSelectTokenStateHolder, modifier: Modifier = Modifier) {
+    LazyColumn(
+        modifier = modifier
+            .background(color = TangemTheme.colors.background.secondary)
+            .fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        if (state.addedTokens.isNotEmpty()) {
+            stickyHeader { Header(title = R.string.swapping_token_list_your_tokens) }
+        }
+
+        itemsIndexed(items = state.addedTokens) { index, item ->
+            TokenItem(token = item, network = state.network, onTokenClick = { state.onTokenSelected(item.id) })
+
+            if (index != state.addedTokens.lastIndex) {
+                Divider(
+                    color = TangemTheme.colors.stroke.primary,
+                    startIndent = TangemTheme.dimens.spacing54,
+                )
+            }
+        }
+
+        if (state.otherTokens.isNotEmpty()) {
+            stickyHeader { Header(title = R.string.swapping_token_list_other_tokens) }
+        }
+
+        itemsIndexed(items = state.otherTokens) { index, item ->
+            TokenItem(token = item, network = state.network, onTokenClick = { state.onTokenSelected(item.id) })
+            if (index != state.otherTokens.lastIndex) {
+                Divider(
+                    color = TangemTheme.colors.stroke.primary,
+                    startIndent = TangemTheme.dimens.spacing54,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun Header(@StringRes title: Int) {
+    Text(
+        text = stringResource(id = title).uppercase(),
+        style = TangemTheme.typography.overline,
+        color = TangemTheme.colors.text.tertiary,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(
+                vertical = TangemTheme.dimens.spacing6,
+                horizontal = TangemTheme.dimens.spacing16,
+            ),
+        textAlign = TextAlign.Start,
+    )
+}
+
+@Suppress("LongMethod")
+@Composable
+private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = onTokenClick)
+            .padding(
+                vertical = TangemTheme.dimens.spacing14,
+                horizontal = TangemTheme.dimens.spacing16,
+            ),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        TokenIcon(
+            token = token,
+            iconPlaceholder = if (token.isNative) getActiveIconRes(network.blockchainId) else null,
+        )
+
+        Column(modifier = Modifier.align(Alignment.CenterVertically)) {
+            Text(
+                text = token.name,
+                style = TangemTheme.typography.subtitle1,
+                color = if (token.available) {
+                    TangemTheme.colors.text.primary1
+                } else {
+                    TangemTheme.colors.text.tertiary
+                },
+            )
+            SpacerW2()
+            Text(
+                text = token.symbol,
+                style = TangemTheme.typography.caption,
+                color = TangemTheme.colors.text.tertiary,
+            )
+        }
+
+        Spacer(modifier = Modifier.weight(1f))
+
+        if (!token.available) {
+            Text(
+                text = stringResource(id = R.string.swapping_token_not_available),
+                style = TangemTheme.typography.caption,
+                color = TangemTheme.colors.text.tertiary,
+            )
+        } else if (token.addedTokenBalanceData != null) {
+            Column(
+                horizontalAlignment = Alignment.End,
+                verticalArrangement = Arrangement.Center,
+                modifier = Modifier.padding(start = TangemTheme.dimens.spacing8),
+            ) {
+                Text(
+                    text = token.addedTokenBalanceData.amount ?: "",
+                    style = TangemTheme.typography.subtitle1,
+                    color = TangemTheme.colors.text.primary1,
+                )
+                SpacerW2()
+                Text(
+                    text = token.addedTokenBalanceData.amountEquivalent ?: "",
+                    style = TangemTheme.typography.caption,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+            }
+        }
+    }
+}
+
+@Suppress("MagicNumber")
+@Composable
+private fun TokenIcon(
+    token: TokenToSelect,
+    @DrawableRes iconPlaceholder: Int?,
+) {
+    val data = token.iconUrl.ifEmpty {
+        iconPlaceholder
+    }
+    Box(
+        modifier = Modifier
+            .padding(end = TangemTheme.dimens.spacing12),
+    ) {
+        val iconModifier = Modifier
+            .size(TangemTheme.dimens.size40)
+        val colorFilter = if (!token.available) {
+            val matrix = ColorMatrix().apply { setToSaturation(0f) }
+            ColorFilter.colorMatrix(matrix)
+        } else {
+            null
+        }
+        SubcomposeAsyncImage(
+            modifier = iconModifier,
+            model = ImageRequest.Builder(LocalContext.current)
+                .data(data)
+                .crossfade(true)
+                .build(),
+            contentDescription = token.id,
+            loading = { TokenImageShimmer(modifier = iconModifier) },
+            error = { CurrencyPlaceholderIcon(modifier = iconModifier, id = token.id) },
+            alpha = if (!token.available) 0.7f else 1f,
+            colorFilter = colorFilter,
+        )
+    }
+}
+
+@Composable
+private fun TokenImageShimmer(
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier.shimmer()) {
+        Box(
+            modifier = Modifier
+                .matchParentSize()
+                .background(
+                    color = TangemTheme.colors.button.secondary,
+                    shape = CircleShape,
+                ),
+        )
+    }
+}
+
+private val token = TokenToSelect(
+    id = "",
+    name = "USDC",
+    symbol = "USDC",
+    iconUrl = "",
+    isNative = false,
+    addedTokenBalanceData = TokenBalanceData(
+        amount = "15 000 $",
+        amountEquivalent = "15 000 " +
+            "USDT",
+    ),
+)
+
+@Preview
+@Composable
+private fun TokenScreenPreview() {
+    SwapSelectTokenScreen(
+        state = SwapSelectTokenStateHolder(
+            addedTokens = listOf(token, token, token),
+            otherTokens = listOf(token, token, token),
+            onSearchEntered = {},
+            onTokenSelected = {},
+            network = Network("Ethereum", "ETH"),
+        ),
+        onBack = {},
+    )
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
new file mode 100644
index 0000000000..9dbffcc4a7
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
@@ -0,0 +1,85 @@
+package com.tangem.feature.swap.ui
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+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.tooling.preview.Preview
+import com.tangem.core.ui.components.ResultScreenContent
+import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.swap.models.SwapSuccessStateHolder
+import com.tangem.feature.swap.presentation.R
+
+@Composable
+fun SwapSuccessScreen(state: SwapSuccessStateHolder, onBack: () -> Unit) {
+    TangemTheme {
+        Scaffold(
+            content = { padding ->
+                ResultScreenContent(
+                    resultMessage = makeSuccessMessage(
+                        fromTokenAmount = state.fromTokenAmount,
+                        toTokenAmount = state.toTokenAmount,
+                    ),
+                    resultColor = TangemTheme.colors.icon.attention,
+                    onButtonClick = onBack,
+                    icon = R.drawable.ic_clock_24,
+                    secondaryButtonIcon = R.drawable.ic_arrow_top_right_24,
+                    onSecondaryButtonClick = state.onSecondaryButtonClick,
+                    secondaryButtonText = R.string.swapping_success_view_explorer_button_title,
+                    title = R.string.swapping_success_view_title,
+                    modifier = Modifier.padding(padding),
+                )
+            },
+            topBar = {
+                AppBarWithBackButton(
+                    text = stringResource(R.string.swapping_swap),
+                    onBackClick = onBack,
+                    iconRes = R.drawable.ic_close_24,
+                )
+            },
+        )
+    }
+}
+
+@Composable
+private fun makeSuccessMessage(fromTokenAmount: String, toTokenAmount: String): AnnotatedString {
+    val message = stringResource(id = R.string.swapping_swap_of_to, fromTokenAmount, toTokenAmount)
+    return buildAnnotatedString {
+        append(message)
+        addStyle(
+            style = SpanStyle(color = TangemTheme.colors.text.accent),
+            start = message.indexOf(toTokenAmount),
+            end = message.length,
+        )
+    }
+}
+
+// region preview
+
+private val state = SwapSuccessStateHolder(
+    fromTokenAmount = "1 000 DAI",
+    toTokenAmount = "1 131,46 MATIC",
+) {}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_Success_InLightTheme() {
+    TangemTheme(isDark = false) {
+        SwapSuccessScreen(state) {}
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_Success_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        SwapSuccessScreen(state) {}
+    }
+}
+
+// endregion preview
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt
new file mode 100644
index 0000000000..4a62b9f5d0
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt
@@ -0,0 +1,389 @@
+package com.tangem.feature.swap.ui
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+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.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+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.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Card
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+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 androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.FontSizeRange
+import com.tangem.core.ui.components.ResizableText
+import com.tangem.core.ui.components.SpacerH4
+import com.tangem.core.ui.components.SpacerH8
+import com.tangem.core.ui.components.SpacerW16
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.swap.models.TransactionCardType
+import com.valentinilk.shimmer.shimmer
+
+@Suppress("LongParameterList")
+@Composable
+fun TransactionCard(
+    type: TransactionCardType,
+    balance: String,
+    tokenIconUrl: String,
+    tokenCurrency: String,
+    amount: String?,
+    amountEquivalent: String?,
+    modifier: Modifier = Modifier,
+    @DrawableRes iconPlaceholder: Int? = null,
+    @DrawableRes networkIconRes: Int? = null,
+    onChangeTokenClick: (() -> Unit)? = null,
+) {
+    Card(
+        shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+        backgroundColor = TangemTheme.colors.background.primary,
+        elevation = TangemTheme.dimens.elevation2,
+        modifier = modifier,
+    ) {
+        Box(modifier = Modifier.fillMaxSize()) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth(),
+                verticalArrangement = Arrangement.Top,
+                horizontalAlignment = Alignment.Start,
+            ) {
+                Header(balance = balance, type = type)
+
+                Content(
+                    type = type,
+                    amount = amount,
+                    amountEquivalent = amountEquivalent,
+                )
+            }
+
+            Box(modifier = Modifier.align(Alignment.BottomEnd)) {
+                Token(
+                    tokenIconUrl = tokenIconUrl,
+                    tokenCurrency = tokenCurrency,
+                    networkIconRes = networkIconRes,
+                    iconPlaceholder = iconPlaceholder,
+                )
+            }
+
+            if (onChangeTokenClick != null) {
+                Box(modifier = Modifier.align(Alignment.CenterEnd)) {
+                    ChangeTokenSelector()
+                }
+                Box(
+                    Modifier
+                        .align(Alignment.CenterEnd)
+                        .height(TangemTheme.dimens.size116)
+                        .width(TangemTheme.dimens.size102)
+                        .clickable(
+                            indication = rememberRipple(bounded = false),
+                            interactionSource = remember { MutableInteractionSource() },
+                        ) { onChangeTokenClick() },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun Header(
+    type: TransactionCardType,
+    balance: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(
+                bottom = TangemTheme.dimens.spacing8,
+                top = TangemTheme.dimens.spacing12,
+                start = TangemTheme.dimens.spacing16,
+                end = TangemTheme.dimens.spacing16,
+            ),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        val title = when (type) {
+            is TransactionCardType.ReceiveCard -> R.string.exchange_receive_view_header
+            is TransactionCardType.SendCard -> R.string.exchange_send_view_header
+        }
+        Text(
+            text = stringResource(id = title),
+            color = TangemTheme.colors.text.tertiary,
+            maxLines = 1,
+            style = MaterialTheme.typography.subtitle2,
+            modifier = Modifier.defaultMinSize(minHeight = TangemTheme.dimens.size24),
+        )
+        SpacerW16()
+        if (balance.isNotBlank()) {
+            Text(
+                text = stringResource(R.string.common_balance, balance),
+                color = TangemTheme.colors.text.tertiary,
+                style = MaterialTheme.typography.body2,
+                modifier = Modifier
+                    .defaultMinSize(minHeight = TangemTheme.dimens.size20)
+                    .padding(top = TangemTheme.dimens.spacing2),
+            )
+        } else {
+            Box(
+                modifier = Modifier
+                    .size(width = TangemTheme.dimens.size80, height = TangemTheme.dimens.size12)
+                    .shimmer()
+                    .background(
+                        color = TangemTheme.colors.button.secondary,
+                        shape = RoundedCornerShape(TangemTheme.dimens.radius3),
+                    ),
+            )
+        }
+    }
+}
+
+@Suppress("LongMethod")
+@Composable
+private fun Content(
+    type: TransactionCardType,
+    amount: String?,
+    amountEquivalent: String?,
+) {
+    Row(
+        modifier = Modifier
+            .padding(
+                start = TangemTheme.dimens.spacing16,
+                bottom = TangemTheme.dimens.spacing12,
+            ),
+        horizontalArrangement = Arrangement.Start,
+        verticalAlignment = Alignment.Top,
+    ) {
+        Column(
+            modifier = Modifier
+                .padding(
+                    end = TangemTheme.dimens.spacing92,
+                ),
+            verticalArrangement = Arrangement.Top,
+            horizontalAlignment = Alignment.Start,
+        ) {
+            val sumTextModifier = Modifier.defaultMinSize(minHeight = TangemTheme.dimens.size32)
+            when (type) {
+                is TransactionCardType.ReceiveCard -> {
+                    if (amount != null) {
+                        ResizableText(
+                            text = amount,
+                            color = TangemTheme.colors.text.primary1,
+                            style = TangemTheme.typography.h2,
+                            fontSizeRange = FontSizeRange(min = 16.sp, max = TangemTheme.typography.h2.fontSize),
+                            modifier = sumTextModifier,
+                        )
+                    } else {
+                        Box(
+                            modifier = Modifier
+                                .padding(vertical = TangemTheme.dimens.spacing4)
+                                .size(width = TangemTheme.dimens.size102, height = TangemTheme.dimens.size24)
+                                .shimmer()
+                                .background(
+                                    color = TangemTheme.colors.button.secondary,
+                                    shape = RoundedCornerShape(TangemTheme.dimens.radius6),
+                                ),
+                        )
+                    }
+                }
+                is TransactionCardType.SendCard -> {
+                    AutoSizeTextField(
+                        modifier = sumTextModifier,
+                        amount = amount ?: "",
+                        onAmountChange = { type.onAmountChanged(it) },
+                        onFocusChange = type.onFocusChanged,
+                    )
+                }
+            }
+
+            SpacerH8()
+
+            if (amountEquivalent != null) {
+                Text(
+                    text = amountEquivalent,
+                    color = TangemTheme.colors.text.tertiary,
+                    style = TangemTheme.typography.body2,
+                    modifier = Modifier.defaultMinSize(minHeight = TangemTheme.dimens.size20),
+                )
+            } else {
+                Box(
+                    modifier = Modifier
+                        .padding(vertical = TangemTheme.dimens.spacing4)
+                        .size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12)
+                        .shimmer()
+                        .background(
+                            color = TangemTheme.colors.button.secondary,
+                            shape = RoundedCornerShape(TangemTheme.dimens.radius3),
+                        ),
+                )
+            }
+        }
+    }
+}
+
+@Suppress("MagicNumber")
+@Composable
+fun Token(
+    tokenIconUrl: String,
+    tokenCurrency: String,
+    @DrawableRes iconPlaceholder: Int? = null,
+    @DrawableRes networkIconRes: Int? = null,
+) {
+    Column(
+        modifier = Modifier
+            .padding(
+                end = TangemTheme.dimens.spacing12,
+                bottom = TangemTheme.dimens.spacing12,
+            ),
+        verticalArrangement = Arrangement.Bottom,
+        horizontalAlignment = Alignment.End,
+    ) {
+        Box(
+            modifier = Modifier
+                .padding(end = TangemTheme.dimens.spacing16)
+                .size(TangemTheme.dimens.size42),
+        ) {
+            val tokenImageModifier = Modifier
+                .align(Alignment.BottomStart)
+                .size(TangemTheme.dimens.size36)
+
+            val data = tokenIconUrl.ifEmpty {
+                iconPlaceholder
+            }
+            SubcomposeAsyncImage(
+                modifier = tokenImageModifier,
+                model = ImageRequest.Builder(LocalContext.current)
+                    .data(data)
+                    .crossfade(true)
+                    .build(),
+                loading = { TokenImageShimmer(modifier = tokenImageModifier) },
+                // error = { CurrencyPlaceholderIcon(modifier = tokenImageModifier, tokenCurrency) },
+                contentDescription = tokenCurrency,
+            )
+
+            if (networkIconRes != null) {
+                Box(
+                    modifier = Modifier
+                        .align(Alignment.TopEnd)
+                        .size(TangemTheme.dimens.size18)
+                        .background(color = Color.White, shape = CircleShape),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Image(
+                        modifier = Modifier.padding(all = 0.5.dp),
+                        painter = painterResource(id = networkIconRes),
+                        contentDescription = null,
+                    )
+                }
+            }
+        }
+
+        SpacerH4()
+
+        Text(
+            text = tokenCurrency,
+            color = TangemTheme.colors.text.primary1,
+            maxLines = 1,
+            style = TangemTheme.typography.subtitle2,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.defaultMinSize(minWidth = TangemTheme.dimens.size80),
+        )
+    }
+}
+
+@Composable
+fun ChangeTokenSelector() {
+    Box(
+        modifier = Modifier
+            .fillMaxHeight()
+            .padding(
+                top = TangemTheme.dimens.spacing12,
+                start = TangemTheme.dimens.spacing24,
+                end = TangemTheme.dimens.spacing12,
+            ),
+        contentAlignment = Alignment.CenterEnd,
+    ) {
+        Icon(
+            modifier = Modifier.size(TangemTheme.dimens.size20),
+            painter = painterResource(id = R.drawable.ic_chevron_24),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun TokenImageShimmer(
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier.shimmer()) {
+        Box(
+            modifier = Modifier
+                .matchParentSize()
+                .background(
+                    color = TangemTheme.colors.button.secondary,
+                    shape = CircleShape,
+                ),
+        )
+    }
+}
+
+// region preview
+
+@Preview(widthDp = 328, heightDp = 116, showBackground = true)
+@Composable
+private fun Preview_SwapMainCard_InLightTheme() {
+    TangemTheme(isDark = false) {
+        TransactionCardPreview()
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 116, showBackground = true)
+@Composable
+private fun Preview_SwapMainCard_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        TransactionCardPreview()
+    }
+}
+
+@Composable
+private fun TransactionCardPreview() {
+    TransactionCard(
+        type = TransactionCardType.SendCard({}) {},
+        amount = "1 000 000",
+        amountEquivalent = "1 000 000",
+        tokenIconUrl = "",
+        tokenCurrency = "DAI",
+        networkIconRes = R.drawable.img_polygon_22,
+        onChangeTokenClick = {},
+        balance = "123",
+    )
+}
+
+// endregion preview
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/PeriodicTask.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/PeriodicTask.kt
new file mode 100644
index 0000000000..e1343a73cd
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/PeriodicTask.kt
@@ -0,0 +1,57 @@
+package com.tangem.feature.swap.viewmodels
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.util.concurrent.atomic.AtomicBoolean
+
+class PeriodicTask<T>(
+    private val delay: Long,
+    private val task: suspend () -> Result<T>,
+    private val onSuccess: (T) -> Unit,
+    private val onError: (Throwable) -> Unit,
+) {
+
+    private var isActive: AtomicBoolean = AtomicBoolean(false)
+
+    suspend fun runTaskWithDelay() {
+        isActive.set(true)
+        while (isActive.get()) {
+            task.invoke()
+                .onSuccess {
+                    if (!isActive.get()) {
+                        return@onSuccess
+                    }
+                    onSuccess.invoke(it)
+                }
+                .onFailure {
+                    if (!isActive.get()) {
+                        return@onFailure
+                    }
+                    onError.invoke(it)
+                }
+            delay(delay)
+        }
+    }
+
+    fun cancel() {
+        isActive.set(false)
+    }
+}
+
+class SingleTaskScheduler<T> {
+
+    private var lastTask: PeriodicTask<T>? = null
+
+    fun scheduleTask(scope: CoroutineScope, task: PeriodicTask<T>) {
+        lastTask?.cancel()
+        lastTask = task
+        scope.launch {
+            task.runTaskWithDelay()
+        }
+    }
+
+    fun cancelTask() {
+        lastTask?.cancel()
+    }
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapProcessDataState.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapProcessDataState.kt
new file mode 100644
index 0000000000..4fe4e4bfb8
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapProcessDataState.kt
@@ -0,0 +1,15 @@
+package com.tangem.feature.swap.viewmodels
+
+import com.tangem.feature.swap.domain.models.domain.ApproveModel
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+
+data class SwapProcessDataState(
+    val networkId: String,
+    val fromCurrency: Currency? = null,
+    val toCurrency: Currency? = null,
+    val amount: String? = null,
+    val estimatedGas: Int? = null,
+    val approveModel: ApproveModel? = null,
+    val swapModel: SwapDataModel? = null,
+)
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
new file mode 100644
index 0000000000..4d19288be4
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@@ -0,0 +1,410 @@
+package com.tangem.feature.swap.viewmodels
+
+import android.util.Log
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.ui.utils.getValidatedNumberWithFixedDecimals
+import com.tangem.feature.swap.analytics.SwapEvents
+import com.tangem.feature.swap.domain.BlockchainInteractor
+import com.tangem.feature.swap.domain.SwapInteractor
+import com.tangem.feature.swap.domain.models.domain.Currency
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import com.tangem.feature.swap.domain.models.formatToUIRepresentation
+import com.tangem.feature.swap.domain.models.ui.FoundTokensState
+import com.tangem.feature.swap.domain.models.ui.PermissionDataState
+import com.tangem.feature.swap.domain.models.ui.SwapState
+import com.tangem.feature.swap.domain.models.ui.TxState
+import com.tangem.feature.swap.models.SwapStateHolder
+import com.tangem.feature.swap.models.UiActions
+import com.tangem.feature.swap.presentation.SwapFragment
+import com.tangem.feature.swap.router.SwapRouter
+import com.tangem.feature.swap.router.SwapScreen
+import com.tangem.feature.swap.ui.StateBuilder
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.Debouncer
+import com.tangem.utils.coroutines.runCatching
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import javax.inject.Inject
+import kotlin.properties.Delegates
+
+@Suppress("LargeClass")
+@HiltViewModel
+internal class SwapViewModel @Inject constructor(
+    private val swapInteractor: SwapInteractor,
+    private val blockchainInteractor: BlockchainInteractor,
+    private val dispatchers: CoroutineDispatcherProvider,
+    private val analyticsEventHandler: AnalyticsEventHandler,
+    savedStateHandle: SavedStateHandle,
+) : ViewModel() {
+
+    private val currency = Json.decodeFromString<Currency>(
+        savedStateHandle[SwapFragment.CURRENCY_BUNDLE_KEY]
+            ?: error("no expected parameter Currency found"),
+    )
+
+    private val stateBuilder = StateBuilder(
+        actions = createUiActions(),
+    )
+    private val amountDebouncer = Debouncer()
+    private val singleTaskScheduler = SingleTaskScheduler<SwapState>()
+
+    private var dataState by mutableStateOf(SwapProcessDataState(networkId = currency.networkId))
+    var uiState: SwapStateHolder by mutableStateOf(
+        stateBuilder.createInitialLoadingState(
+            initialCurrency = currency,
+            networkInfo = blockchainInteractor.getBlockchainInfo(currency.networkId),
+        ),
+    )
+        private set
+
+    // shows currency order (direct - swap initial to selected, reversed = selected to initial)
+    private var isOrderReversed = false
+    private val lastAmount = mutableStateOf(INITIAL_AMOUNT)
+    private var swapRouter: SwapRouter by Delegates.notNull()
+    var currentScreen = SwapScreen.Main
+        get() = swapRouter.currentScreen
+
+    init {
+        initTokens(currency)
+    }
+
+    override fun onCleared() {
+        singleTaskScheduler.cancelTask()
+        super.onCleared()
+    }
+
+    fun onScreenOpened() {
+        analyticsEventHandler.send(SwapEvents.SwapScreenOpened(currency.symbol))
+    }
+
+    fun setRouter(router: SwapRouter) {
+        swapRouter = router
+        uiState = uiState.copy(
+            onBackClicked = router::back,
+            onSelectTokenClick = {
+                router.openScreen(SwapScreen.SelectToken)
+                analyticsEventHandler.send(SwapEvents.ChooseTokenScreenOpened)
+            },
+            onSuccess = {
+                router.openScreen(SwapScreen.Success)
+            },
+        )
+    }
+
+    private fun initTokens(currency: Currency) {
+        viewModelScope.launch(dispatchers.main) {
+            runCatching(dispatchers.io) {
+                swapInteractor.initTokensToSwap(currency)
+            }
+                .onSuccess { state ->
+                    dataState = dataState.copy(
+                        fromCurrency = state.preselectTokens.fromToken,
+                        toCurrency = state.preselectTokens.toToken,
+                    )
+                    updateTokensState(dataState = state.foundTokensState)
+                    startLoadingQuotes(
+                        fromToken = state.preselectTokens.fromToken,
+                        toToken = state.preselectTokens.toToken,
+                        amount = lastAmount.value,
+                    )
+                }
+                .onFailure {
+                    Log.e("SwapViewModel", it.message ?: it.cause.toString())
+                }
+        }
+    }
+
+    private fun updateTokensState(dataState: FoundTokensState) {
+        uiState = stateBuilder.addTokensToState(
+            uiState = uiState,
+            dataState = dataState,
+            networkInfo = blockchainInteractor.getBlockchainInfo(currency.networkId),
+        )
+    }
+
+    private fun startLoadingQuotes(fromToken: Currency, toToken: Currency, amount: String) {
+        singleTaskScheduler.cancelTask()
+        uiState = stateBuilder.createQuotesLoadingState(uiState, fromToken, toToken, currency.id)
+        singleTaskScheduler.scheduleTask(
+            viewModelScope,
+            loadQuotesTask(
+                fromToken = fromToken,
+                toToken = toToken,
+                amount = amount,
+            ),
+        )
+    }
+
+    private fun loadQuotesTask(
+        fromToken: Currency,
+        toToken: Currency,
+        amount: String,
+    ): PeriodicTask<SwapState> {
+        return PeriodicTask(
+            UPDATE_DELAY,
+            task = {
+                uiState = stateBuilder.createSilentLoadState(uiState)
+                runCatching(dispatchers.io) {
+                    dataState = dataState.copy(
+                        amount = amount,
+                        swapModel = null,
+                        estimatedGas = null,
+                        approveModel = null,
+                    )
+                    swapInteractor.findBestQuote(
+                        networkId = dataState.networkId,
+                        fromToken = fromToken,
+                        toToken = toToken,
+                        amountToSwap = amount,
+                    )
+                }
+            },
+            onSuccess = { swapState ->
+                when (swapState) {
+                    is SwapState.QuotesLoadedState -> {
+                        fillDataState(swapState.permissionState, swapState.swapDataModel)
+                        uiState = stateBuilder.createQuotesLoadedState(
+                            uiStateHolder = uiState,
+                            quoteModel = swapState,
+                            fromToken = fromToken,
+                        )
+                    }
+                    is SwapState.EmptyAmountState -> {
+                        uiState = stateBuilder.createQuotesEmptyAmountState(
+                            uiStateHolder = uiState,
+                            emptyAmountState = swapState,
+                        )
+                    }
+                    is SwapState.SwapError -> {
+                        uiState = stateBuilder.mapError(uiState, swapState.error)
+                    }
+                }
+            },
+            onError = {
+                uiState = stateBuilder.addWarning(uiState, it.message)
+            },
+        )
+    }
+
+    private fun fillDataState(permissionState: PermissionDataState, swapDataModel: SwapDataModel?) {
+        dataState = if (permissionState is PermissionDataState.PermissionReadyForRequest) {
+            dataState.copy(
+                estimatedGas = permissionState.requestApproveData.estimatedGas,
+                approveModel = permissionState.requestApproveData.approveModel,
+            )
+        } else {
+            dataState.copy(
+                swapModel = swapDataModel,
+            )
+        }
+    }
+
+    private fun onSwapClick() {
+        singleTaskScheduler.cancelTask()
+        uiState = stateBuilder.createSwapInProgressState(uiState)
+        viewModelScope.launch(dispatchers.main) {
+            runCatching(dispatchers.io) {
+                swapInteractor.onSwap(
+                    networkId = dataState.networkId,
+                    swapData = requireNotNull(dataState.swapModel),
+                    currencyToSend = requireNotNull(dataState.fromCurrency),
+                    currencyToGet = requireNotNull(dataState.toCurrency),
+                    amountToSwap = requireNotNull(dataState.amount),
+                )
+            }
+                .onSuccess {
+                    when (it) {
+                        is TxState.TxSent -> {
+                            uiState = stateBuilder.createSuccessState(uiState, it) {
+                                val txHash = it.txAddress
+                                if (txHash.isNotEmpty()) {
+                                    swapRouter.openUrl(
+                                        blockchainInteractor.getExplorerTransactionLink(
+                                            networkId = dataState.networkId,
+                                            txAddress = it.txAddress,
+                                        ),
+                                    )
+                                }
+                            }
+                            analyticsEventHandler.send(SwapEvents.SwapInProgressScreen)
+                            swapRouter.openScreen(SwapScreen.Success)
+                        }
+                        else -> {
+                            uiState = stateBuilder.createSwapErrorTransaction(uiState) {
+                                uiState = stateBuilder.clearAlert(uiState)
+                            }
+                        }
+                    }
+                }
+                .onFailure { makeDefaultAlert() }
+        }
+    }
+
+    private fun givePermissionsToSwap() {
+        viewModelScope.launch(dispatchers.main) {
+            runCatching(dispatchers.io) {
+                swapInteractor.givePermissionToSwap(
+                    networkId = dataState.networkId,
+                    estimatedGas = dataState.estimatedGas!!,
+                    transactionData = dataState.approveModel!!,
+                    forTokenContractAddress = (dataState.fromCurrency as? Currency.NonNativeToken)?.contractAddress
+                        ?: "",
+                )
+            }
+                .onSuccess {
+                    when (it) {
+                        is TxState.TxSent -> {
+                            uiState = stateBuilder.loadingPermissionState(uiState)
+                        }
+                        else -> {
+                            makeDefaultAlert()
+                        }
+                    }
+                }
+                .onFailure {
+                    makeDefaultAlert()
+                }
+        }
+    }
+
+    private fun onSearchEntered(searchQuery: String) {
+        viewModelScope.launch(dispatchers.main) {
+            runCatching(dispatchers.io) {
+                swapInteractor.searchTokens(dataState.networkId, searchQuery)
+            }
+                .onSuccess {
+                    updateTokensState(it)
+                }
+                .onFailure { }
+        }
+    }
+
+    private fun onTokenSelect(id: String) {
+        val foundToken = swapInteractor.findTokenById(id)
+        if (foundToken != null) {
+            val fromToken: Currency
+            val toToken: Currency
+            if (isOrderReversed) {
+                fromToken = foundToken
+                toToken = currency
+            } else {
+                fromToken = currency
+                toToken = foundToken
+            }
+            dataState = dataState.copy(
+                fromCurrency = fromToken,
+                toCurrency = toToken,
+            )
+            startLoadingQuotes(fromToken, toToken, lastAmount.value)
+            swapRouter.openScreen(SwapScreen.Main)
+        }
+    }
+
+    private fun onChangeCardsClicked() {
+        val newFromToken = dataState.toCurrency
+        val newToToken = dataState.fromCurrency
+        if (newFromToken != null && newToToken != null) {
+            dataState = dataState.copy(
+                fromCurrency = newFromToken,
+                toCurrency = newToToken,
+            )
+            isOrderReversed = !isOrderReversed
+            lastAmount.value =
+                cutAmountWithDecimals(blockchainInteractor.getTokenDecimals(newFromToken), lastAmount.value)
+            uiState = stateBuilder.updateSwapAmount(uiState, lastAmount.value)
+            startLoadingQuotes(newFromToken, newToToken, lastAmount.value)
+        }
+    }
+
+    private fun onAmountChanged(value: String) {
+        val fromToken = dataState.fromCurrency
+        val toToken = dataState.toCurrency
+        if (fromToken != null && toToken != null) {
+            val cutValue = cutAmountWithDecimals(blockchainInteractor.getTokenDecimals(fromToken), value)
+            uiState = stateBuilder.updateSwapAmount(uiState, cutValue)
+            lastAmount.value = cutValue
+            amountDebouncer.debounce(DEBOUNCE_AMOUNT_DELAY, viewModelScope) {
+                startLoadingQuotes(fromToken, toToken, lastAmount.value)
+            }
+        }
+    }
+
+    private fun onMaxAmountClicked() {
+        dataState.fromCurrency?.let {
+            val balance = swapInteractor.getTokenBalance(it)
+            onAmountChanged(balance.formatToUIRepresentation())
+        }
+    }
+
+    @Suppress("UnusedPrivateMember")
+    private fun onAmountSelected(selected: Boolean) {
+        if (selected) {
+            analyticsEventHandler.send(SwapEvents.SendTokenBalanceClicked)
+        }
+    }
+
+    private fun cutAmountWithDecimals(maxDecimals: Int, amount: String): String {
+        return getValidatedNumberWithFixedDecimals(amount, maxDecimals)
+    }
+
+    private fun makeDefaultAlert() {
+        uiState = stateBuilder.addAlert(uiState) {
+            uiState = stateBuilder.clearAlert(uiState)
+        }
+    }
+
+    private fun createUiActions(): UiActions {
+        return UiActions(
+            onSearchEntered = { onSearchEntered(it) },
+            onTokenSelected = {
+                onTokenSelect(it)
+                analyticsEventHandler.send(SwapEvents.SearchTokenClicked)
+            },
+            onAmountChanged = { onAmountChanged(it) },
+            onSwapClick = {
+                onSwapClick()
+                val sendTokenSymbol = dataState.fromCurrency?.symbol
+                val receiveTokenSymbol = dataState.toCurrency?.symbol
+                if (sendTokenSymbol != null && receiveTokenSymbol != null) {
+                    analyticsEventHandler.send(
+                        SwapEvents.ButtonSwapClicked(
+                            sendToken = sendTokenSymbol,
+                            receiveToken = receiveTokenSymbol,
+                        ),
+                    )
+                }
+            },
+            onGivePermissionClick = {
+                givePermissionsToSwap()
+                analyticsEventHandler.send(SwapEvents.ButtonPermissionApproveClicked)
+            },
+            onChangeCardsClicked = {
+                onChangeCardsClicked()
+                analyticsEventHandler.send(SwapEvents.ButtonSwipeClicked)
+            },
+            onBackClicked = { onSearchEntered("") },
+            onMaxAmountSelected = { onMaxAmountClicked() },
+            openPermissionBottomSheet = {
+                analyticsEventHandler.send(SwapEvents.ButtonGivePermissionClicked)
+            },
+            hidePermissionBottomSheet = {
+                analyticsEventHandler.send(SwapEvents.ButtonPermissionCancelClicked)
+            },
+            onAmountSelected = { onAmountSelected(it) },
+        )
+    }
+
+    companion object {
+        private const val INITIAL_AMOUNT = ""
+        private const val UPDATE_DELAY = 10000L
+        private const val DEBOUNCE_AMOUNT_DELAY = 1000L
+    }
+}
\ 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/TransactionManager.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/TransactionManager.kt
new file mode 100644
index 0000000000..3c40b3a4c0
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/TransactionManager.kt
@@ -0,0 +1,59 @@
+package com.tangem.lib.crypto
+
+import com.tangem.lib.crypto.models.Currency
+import com.tangem.lib.crypto.models.ProxyAmount
+import com.tangem.lib.crypto.models.ProxyNetworkInfo
+import com.tangem.lib.crypto.models.transactions.SendTxResult
+import java.math.BigDecimal
+
+interface TransactionManager {
+
+    @Throws(IllegalStateException::class)
+    suspend fun sendApproveTransaction(
+        networkId: String,
+        feeAmount: BigDecimal,
+        estimatedGas: Int,
+        destinationAddress: String,
+        dataToSign: String,
+    ): SendTxResult
+
+    @Suppress("LongParameterList")
+    @Throws(IllegalStateException::class)
+    suspend fun sendTransaction(
+        networkId: String,
+        amountToSend: BigDecimal,
+        feeAmount: BigDecimal,
+        estimatedGas: Int,
+        destinationAddress: String,
+        dataToSign: String,
+        isSwap: Boolean,
+        currencyToSend: Currency,
+    ): SendTxResult
+
+    @Throws(IllegalStateException::class)
+    suspend fun getFee(
+        networkId: String,
+        amountToSend: BigDecimal,
+        currencyToSend: Currency,
+        destinationAddress: String,
+    ): ProxyAmount
+
+    @Throws(IllegalStateException::class)
+    fun getNativeTokenDecimals(networkId: String): Int
+
+    @Throws(IllegalStateException::class)
+    suspend fun updateWalletManager(networkId: String)
+
+    fun calculateFee(networkId: String, gasPrice: String, estimatedGas: Int): BigDecimal
+
+    /**
+     * In app blockchain id, actual in blockchain sdk, not the same as networkId
+     *
+     * workaround till not use backend only and not integrated server vs sdk
+     */
+    @Throws(IllegalStateException::class)
+    fun getBlockchainInfo(networkId: String): ProxyNetworkInfo
+
+    @Throws(IllegalStateException::class)
+    fun getExplorerTransactionLink(networkId: String, txAddress: String): String
+}
\ 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..86a6075341
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt
@@ -0,0 +1,71 @@
+package com.tangem.lib.crypto
+
+import com.tangem.lib.crypto.models.Currency
+import com.tangem.lib.crypto.models.ProxyAmount
+import com.tangem.lib.crypto.models.ProxyFiatCurrency
+
+/**
+ * Provider for user tokens data
+ */
+interface UserWalletManager {
+
+    /**
+     * Returns all user tokens (merged from local and backend)
+     */
+    suspend fun getUserTokens(networkId: String): List<Currency>
+
+    fun getNativeTokenForNetwork(networkId: String): 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
+     */
+    @Throws(IllegalStateException::class)
+    fun addToken(currency: Currency)
+
+    /**
+     * Returns wallet public address for token
+     *
+     * @param networkId for currency
+     */
+    @Throws(IllegalStateException::class)
+    fun getWalletAddress(networkId: String): String
+
+    /**
+     * Return balances from wallet found by networkId
+     *
+     * @param networkId
+     * @return map of <Symbol, [ProxyAmount]>
+     */
+    @Throws(IllegalStateException::class)
+    fun getCurrentWalletTokensBalance(networkId: String): Map<String, ProxyAmount>
+
+    fun getNativeTokenBalance(networkId: String): ProxyAmount?
+
+    /**
+     * @param networkId
+     * @return currency name
+     */
+    fun getNetworkCurrency(networkId: String): String
+
+    /**
+     * Returns selected app currency
+     */
+    fun getUserAppCurrency(): ProxyFiatCurrency
+
+    @Throws(IllegalStateException::class)
+    fun getLastTransactionHash(networkId: String): 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..1bdb582455
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/Currency.kt
@@ -0,0 +1,29 @@
+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)
+ */
+sealed class Currency(
+    open val id: String,
+    open val name: String,
+    open val symbol: String,
+    open val networkId: String,
+) {
+
+    data class NativeToken(
+        override val id: String,
+        override val name: String,
+        override val symbol: String,
+        override val networkId: String,
+    ) : Currency(id, name, symbol, networkId)
+
+    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/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyAmount.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyAmount.kt
new file mode 100644
index 0000000000..aa4c58b0f3
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyAmount.kt
@@ -0,0 +1,16 @@
+package com.tangem.lib.crypto.models
+
+import java.math.BigDecimal
+
+/**
+ * Proxy amount is always has a Coin type
+ *
+ * @property currencySymbol
+ * @property value amount in [BigDecimal]
+ * @property decimals count for token
+ */
+data class ProxyAmount(
+    val currencySymbol: String,
+    var value: BigDecimal,
+    val decimals: Int,
+)
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyFiatCurrency.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyFiatCurrency.kt
new file mode 100644
index 0000000000..5a46bdef84
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyFiatCurrency.kt
@@ -0,0 +1,7 @@
+package com.tangem.lib.crypto.models
+
+data class ProxyFiatCurrency(
+    val code: String,
+    val name: String,
+    val symbol: String,
+)
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyNetworkInfo.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyNetworkInfo.kt
new file mode 100644
index 0000000000..c836504a95
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/ProxyNetworkInfo.kt
@@ -0,0 +1,7 @@
+package com.tangem.lib.crypto.models
+
+data class ProxyNetworkInfo(
+    val name: String,
+    val blockchainId: String,
+    val blockchainCurrency: String,
+)
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/models/transactions/SendTxResult.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/transactions/SendTxResult.kt
new file mode 100644
index 0000000000..25655c4119
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/transactions/SendTxResult.kt
@@ -0,0 +1,10 @@
+package com.tangem.lib.crypto.models.transactions
+
+sealed interface SendTxResult {
+
+    object Success : SendTxResult
+    object UserCancelledError : SendTxResult
+    data class TangemSdkError(val code: Int, val cause: Throwable?) : SendTxResult
+    data class BlockchainSdkError(val code: Int, val cause: Throwable?) : SendTxResult
+    data class UnknownError(val ex: Exception? = null) : SendTxResult
+}
\ 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/api/paymentology/PaymentologyApi.kt b/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApi.kt
deleted file mode 100644
index 058cd368dd..0000000000
--- a/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApi.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.tangem.network.api.paymentology
-
-import retrofit2.http.Body
-import retrofit2.http.Headers
-import retrofit2.http.POST
-
-/**
-[REDACTED_AUTHOR]
- */
-interface PaymentologyApi {
-
-    @Headers("Content-Type: application/json")
-    @POST("card/verify")
-    suspend fun checkRegistration(
-        @Body request: CheckRegistrationRequests,
-    ): RegistrationResponse
-
-    @Headers("Content-Type: application/json")
-    @POST("card/get_challenge")
-    suspend fun requestAttestationChallenge(
-        @Body request: CheckRegistrationRequests.Item,
-    ): AttestationResponse
-
-    @Headers("Content-Type: application/json")
-    @POST("card/set_pin")
-    suspend fun registerWallet(
-        @Body request: RegisterWalletRequest,
-    ): RegisterWalletResponse
-
-    @Headers("Content-Type: application/json")
-    @POST("card/kyc")
-    suspend fun registerKYC(
-        @Body request: RegisterKYCRequest,
-    ): RegisterWalletResponse
-
-    companion object {
-        val baseUrl: String = "https://paymentologygate.oa.r.appspot.com/"
-    }
-}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApiService.kt b/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApiService.kt
deleted file mode 100644
index 8cd70891c3..0000000000
--- a/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApiService.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.tangem.network.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 kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-/**
-[REDACTED_AUTHOR]
- */
-class PaymentologyApiService(
-    private val logEnabled: Boolean,
-) {
-    private val api = createRetrofitInstance(
-        baseUrl = PaymentologyApi.baseUrl,
-        converterFactory = MoshiConverter.createFactory(MoshiConverter.sdkMoshi()),
-        logEnabled = logEnabled,
-    ).create(PaymentologyApi::class.java)
-
-    suspend fun checkRegistration(
-        cardId: String,
-        publicKey: ByteArray,
-    ): Result<RegistrationResponse> = withContext(Dispatchers.IO) {
-        val requestItem = CheckRegistrationRequests.Item(cardId, publicKey.toHexString())
-        val request = CheckRegistrationRequests(listOf(requestItem))
-        performRequest {
-            api.checkRegistration(request)
-        }
-    }
-
-    suspend fun requestAttestationChallenge(
-        cardId: String,
-        publicKey: ByteArray,
-    ): Result<AttestationResponse> = withContext(Dispatchers.IO) {
-        val requestItem = CheckRegistrationRequests.Item(cardId, publicKey.toHexString())
-        performRequest {
-            api.requestAttestationChallenge(requestItem)
-        }
-    }
-
-    suspend fun registerWallet(
-        request: RegisterWalletRequest,
-    ): Result<RegisterWalletResponse> = withContext(Dispatchers.IO) {
-        performRequest {
-            api.registerWallet(request)
-        }
-    }
-
-    suspend fun registerKYC(
-        request: RegisterKYCRequest,
-    ): Result<RegisterWalletResponse> = withContext(Dispatchers.IO) {
-        performRequest {
-            api.registerKYC(request)
-        }
-    }
-
-    companion object {
-        fun stub(): PaymentologyApiService = PaymentologyApiService(false)
-    }
-}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/paymentology/Requests.kt b/network/src/main/java/com/tangem/network/api/paymentology/Requests.kt
deleted file mode 100644
index 580e60bfa5..0000000000
--- a/network/src/main/java/com/tangem/network/api/paymentology/Requests.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.tangem.network.api.paymentology
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-import com.tangem.common.extensions.calculateHashCode
-
-/**
-[REDACTED_AUTHOR]
- */
-data class CheckRegistrationRequests(
-    val requests: List<Item>,
-) {
-    @JsonClass(generateAdapter = true)
-    data class Item(
-        @Json(name = "CID")
-        val cardId: String = "",
-        val publicKey: String = "",
-    )
-}
-
-data class RegisterWalletRequest(
-    @Json(name = "CID")
-    val cardId: String,
-    val publicKey: ByteArray,
-    val walletPublicKey: ByteArray,
-    val walletSalt: ByteArray,
-    val walletSignature: ByteArray,
-    val cardSalt: ByteArray,
-    val cardSignature: ByteArray,
-    @Json(name = "PIN")
-    val pin: String,
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as RegisterWalletRequest
-
-        if (cardId != other.cardId) return false
-        if (!publicKey.contentEquals(other.publicKey)) return false
-        if (!walletPublicKey.contentEquals(other.walletPublicKey)) return false
-        if (!walletSalt.contentEquals(other.walletSalt)) return false
-        if (!walletSignature.contentEquals(other.walletSignature)) return false
-        if (!cardSalt.contentEquals(other.cardSalt)) return false
-        if (!cardSignature.contentEquals(other.cardSignature)) return false
-        if (pin != other.pin) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int = calculateHashCode(
-        cardId.hashCode(),
-        publicKey.contentHashCode(),
-        walletPublicKey.contentHashCode(),
-        walletSalt.contentHashCode(),
-        walletSignature.contentHashCode(),
-        cardSalt.contentHashCode(),
-        cardSignature.contentHashCode(),
-        pin.hashCode(),
-    )
-}
-
-data class RegisterKYCRequest(
-    @Json(name = "CID")
-    val cardId: String,
-    val publicKey: ByteArray,
-    val kycProvider: String,
-    val kycRefId: String,
-) {
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as RegisterKYCRequest
-
-        if (cardId != other.cardId) return false
-        if (!publicKey.contentEquals(other.publicKey)) return false
-        if (kycProvider != other.kycProvider) return false
-        if (kycRefId != other.kycRefId) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int = calculateHashCode(
-        cardId.hashCode(),
-        publicKey.contentHashCode(),
-        kycProvider.hashCode(),
-        kycRefId.hashCode(),
-    )
-}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/paymentology/Responses.kt b/network/src/main/java/com/tangem/network/api/paymentology/Responses.kt
deleted file mode 100644
index b60324b42d..0000000000
--- a/network/src/main/java/com/tangem/network/api/paymentology/Responses.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.tangem.network.api.paymentology
-
-import com.squareup.moshi.Json
-import com.tangem.common.extensions.calculateHashCode
-import com.tangem.common.services.Result
-
-/**
-[REDACTED_AUTHOR]
- */
-interface ResponseError {
-    val success: Boolean
-    val error: String?
-    val errorCode: Int?
-
-    fun makeErrorMessage(): String {
-        return error ?: "unknown error"
-    }
-}
-
-inline fun <reified T> ResponseError.tryExtractError(): Result<T> = when (success) {
-    true -> Result.Success(this as T)
-    else -> Result.Failure(Throwable(makeErrorMessage()))
-}
-
-data class RegistrationResponse(
-    val results: List<Item> = listOf(),
-    override val success: Boolean,
-    override val error: String?,
-    override val errorCode: Int?,
-) : ResponseError {
-
-    data class Item(
-        @Json(name = "CID")
-        val cardId: String,
-        val passed: Boolean?,
-        val active: Boolean?,
-        @Json(name = "pin_set")
-        val pinSet: Boolean?,
-        @Json(name = "blockchain_init")
-        val blockchainInit: Boolean?,
-        @Json(name = "kyc_passed")
-        val kycPassed: Boolean?,
-        @Json(name = "kyc_provider")
-        val kycProvider: String?,
-        @Json(name = "kyc_date")
-        val kycDate: String?,
-        @Json(name = "kyc_status")
-        val kycStatus: KYCStatus?,
-        @Json(name = "disabled_by_admin")
-        val disabledByAdmin: Boolean?,
-        val error: String?,
-    )
-}
-
-enum class KYCStatus {
-    NOT_STARTED,
-    STARTED,
-    WAITING_FOR_APPROVAL,
-    CORRECTION_REQUESTED,
-    REJECTED,
-    APPROVED,
-}
-
-data class AttestationResponse(
-    val challenge: ByteArray?,
-    override val success: Boolean,
-    override val error: String?,
-    override val errorCode: Int?,
-) : ResponseError {
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AttestationResponse
-
-        if (!challenge.contentEquals(other.challenge)) return false
-        if (success != other.success) return false
-        if (error != other.error) return false
-        if (errorCode != other.errorCode) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int = calculateHashCode(
-        challenge.contentHashCode(),
-        success.hashCode(),
-        error.hashCode(),
-        errorCode.hashCode(),
-    )
-}
-
-data class RegisterWalletResponse(
-    override val success: Boolean,
-    override val error: String?,
-    override val errorCode: Int?,
-) : ResponseError
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt b/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt
deleted file mode 100644
index 4f88fca3b7..0000000000
--- a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.tangem.network.api.tangemTech
-
-import java.math.BigDecimal
-
-/**
-[REDACTED_AUTHOR]
- */
-interface HttpResponse
-sealed interface TangemTechResponse : HttpResponse
-
-data class CoinsResponse(
-    val imageHost: String?,
-    val coins: List<Coin>,
-    val total: Int
-) : TangemTechResponse {
-
-    data class Coin(
-        val id: String,
-        val name: String,
-        val symbol: String,
-        val active: Boolean,
-        val networks: List<Network> = listOf()
-    ) : TangemTechResponse {
-
-        data class Network(
-            val networkId: String,
-            val contractAddress: String? = null,
-            val decimalCount: BigDecimal? = null,
-        ) : TangemTechResponse
-    }
-}
-
-//rates.keys = networkId's
-data class RatesResponse(val rates: Map<String, Double>) : TangemTechResponse
-
-data class CurrenciesResponse(val currencies: List<Currency>) {
-
-    data class Currency(
-        val id: String,
-        val code: String,       // this is an uppercase id
-        val name: String,
-        val rateBTC: String,
-        val unit: String,       // $, €, ₽
-        val type: String,
-    ) : TangemTechResponse
-}
-
-data class GeoResponse(
-    val code: String,
-) : TangemTechResponse
-
-data class UserTokensResponse(
-    val version: Int = 0,
-    val group: String? = null,
-    val sort: String? = null,
-    val tokens: List<TokenResponse> = emptyList(),
-) : TangemTechResponse
-
-data class TokenResponse(
-    val id: String? = null,
-    val networkId: String,
-    val derivationPath: String? = null,
-    val name: String,
-    val symbol: String,
-    val decimals: Int,
-    val contractAddress: String?,
-) : TangemTechResponse
-
-data class TangemTechError(
-    val code: Int,
-    val description: String,
-)
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt b/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt
deleted file mode 100644
index 518edd9fec..0000000000
--- a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.tangem.network.api.tangemTech
-
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.PUT
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-/**
-[REDACTED_AUTHOR]
- */
-interface TangemTechApi {
-
-    @GET("coins")
-    suspend fun coins(
-        @Query("contractAddress") contractAddress: String? = 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
-    ): CoinsResponse
-
-    @GET("rates")
-    suspend fun rates(
-        @Query("currencyId") currencyId: String,
-        @Query("coinIds") coinIds: String,
-    ): RatesResponse
-
-    @GET("currencies")
-    suspend fun currencies(): CurrenciesResponse
-
-    @GET("geo")
-    suspend fun geo(): GeoResponse
-
-    @GET("user-tokens/{user-id}")
-    suspend fun getUserTokens(@Path(value = "user-id") userId: String): UserTokensResponse
-
-    @PUT("user-tokens/{user-id}")
-    suspend fun putUserTokens(@Path(value = "user-id") userId: String, @Body userTokens: UserTokensResponse)
-}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt b/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt
deleted file mode 100644
index 6137e8dfa0..0000000000
--- a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.tangem.network.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 kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-/**
-[REDACTED_AUTHOR]
- */
-class TangemTechService(
-    private val logIsEnabled: Boolean = false,
-) {
-
-    private val headerInterceptors = mutableListOf<AddHeaderInterceptor>(
-        CacheControlHttpInterceptor(cacheMaxAge),
-    )
-
-    private var api: TangemTechApi = createApi()
-
-    suspend fun coins(
-        contractAddress: String? = null,
-        networkIds: String? = null,
-        active: Boolean? = null,
-        searchText: String? = null,
-        offset: Int? = null,
-        limit: Int? = null,
-    ): Result<CoinsResponse> = withContext(Dispatchers.IO) {
-        performRequest {
-            api.coins(
-                contractAddress = contractAddress,
-                networkIds = networkIds,
-                active = active,
-                searchText = searchText,
-                offset = offset,
-                limit = limit,
-            )
-        }
-    }
-
-    suspend fun rates(
-        currency: String,
-        ids: List<String>,
-    ): Result<RatesResponse> = withContext(Dispatchers.IO) {
-        performRequest {
-            api.rates(currency.lowercase(), ids.joinToString(","))
-        }
-    }
-
-    suspend fun userCountry(): Result<GeoResponse> = withContext(Dispatchers.IO) {
-        performRequest { api.geo() }
-    }
-
-    suspend fun currencies(): Result<CurrenciesResponse> = withContext(Dispatchers.IO) {
-        performRequest { api.currencies() }
-    }
-
-    suspend fun getUserTokens(userId: String): Result<UserTokensResponse> = withContext(Dispatchers.IO) {
-        performRequest { api.getUserTokens(userId) }
-    }
-
-    suspend fun putUserTokens(userId: String, userTokens: UserTokensResponse): Result<Unit> =
-        withContext(Dispatchers.IO) {
-            performRequest { api.putUserTokens(userId, userTokens) }
-        }
-
-    fun addHeaderInterceptors(interceptors: List<AddHeaderInterceptor>) {
-        headerInterceptors.removeAll(interceptors)
-        headerInterceptors.addAll(interceptors)
-        api = createApi()
-    }
-
-    private fun createApi(): TangemTechApi {
-        val retrofit = createRetrofitInstance(
-            baseUrl = baseUrl,
-            interceptors = headerInterceptors.toList(),
-            logEnabled = logIsEnabled,
-        )
-        return retrofit.create(TangemTechApi::class.java)
-    }
-
-    companion object {
-        const val baseUrl = "https://api.tangem-tech.com/v1/"
-        const val cacheMaxAge = 600
-    }
-}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/common/Interceptors.kt b/network/src/main/java/com/tangem/network/common/Interceptors.kt
deleted file mode 100644
index bc46e5a0a0..0000000000
--- a/network/src/main/java/com/tangem/network/common/Interceptors.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.tangem.network.common
-
-import okhttp3.Interceptor
-import okhttp3.Response
-
-/**
-[REDACTED_AUTHOR]
- */
-open class AddHeaderInterceptor(
-    private val headers: Map<String, String>
-) : Interceptor {
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val request = chain.request().newBuilder().apply {
-            headers.forEach {
-                addHeader(it.key, it.value)
-            }
-        }.build()
-
-        return chain.proceed(request)
-    }
-}
-
-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
diff --git a/network/src/main/java/com/tangem/network/common/MoshiConverter.kt b/network/src/main/java/com/tangem/network/common/MoshiConverter.kt
index 1f967032e3..e69de29bb2 100644
--- a/network/src/main/java/com/tangem/network/common/MoshiConverter.kt
+++ b/network/src/main/java/com/tangem/network/common/MoshiConverter.kt
@@ -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..b7dc831ec1
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,25 @@
+include(":app")
+include(":domain")
+include(":common")
+
+// region Core modules
+include(":core:analytics")
+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