diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..57188dd623
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+[*.{kt,kts}]
+ktlint_code_style = official
+ktlint_ignore_back_ticked_identifier = true
+
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+
+ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
+ij_kotlin_packages_to_use_import_on_demand = java.util.*, kotlinx.android.synthetic.**
+
+max_line_length = 120
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 96ff0f5af3..ad9c1261c4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,7 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="120" />
+    <option name="SOFT_MARGINS" value="120" />
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/app/build.gradle b/app/build.gradle
index 3f12b8e345..105d4d8323 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,13 +6,13 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply from: '../dependencies.gradle'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
     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 31
+        targetSdkVersion 32
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false'
@@ -83,12 +83,11 @@ dependencies {
     implementation implementation(project(path: ':network'))
     implementation implementation(project(path: ':common'))
 
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.fragment:fragment-ktx:1.4.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'com.google.android.material:material:1.5.0'
-    implementation "androidx.core:core-ktx:1.7.0"
     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'
@@ -164,14 +163,14 @@ dependencies {
     implementation 'com.google.android.gms:play-services-wallet:19.1.0'
 
     //Compose
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    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.1.1'
-    implementation 'androidx.compose.foundation:foundation-layout: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"
 
diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 7593f303e7..78d55638ca 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -5,6 +5,8 @@ import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.tangem.TangemSdk
@@ -27,11 +29,11 @@ import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.shop.redux.ShopAction
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ActivityMainBinding
-import java.lang.ref.WeakReference
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import java.lang.ref.WeakReference
+import kotlin.coroutines.CoroutineContext
 
 lateinit var tangemSdk: TangemSdk
 lateinit var tangemSdkManager: TangemSdkManager
@@ -83,8 +85,10 @@ class MainActivity : AppCompatActivity(), SnackbarHandler {
     }
 
     private fun systemActions() {
-        // makes the status bar text dark
-        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        WindowInsetsControllerCompat(window, binding.root)
+            .isAppearanceLightStatusBars = true
+
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
     }
 
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 70f4ae2d61..a5682e3b5c 100644
--- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
@@ -105,6 +105,12 @@ class DialogManager : StoreSubscriber<GlobalState> {
                     dAppName = state.dialog.dAppName,
                     context = context
                 )
+            is WalletConnectDialog.UnsupportedNetwork ->
+                SimpleAlertDialog.create(
+                    titleRes = R.string.wallet_connect,
+                    messageRes = R.string.wallet_connect_scanner_error_unsupported_network,
+                    context = context
+                )
             is BackupDialog.AddMoreBackupCards -> AddMoreBackupCardsDialog.create(context)
             is BackupDialog.BackupInProgress -> BackupInProgressDialog.create(context)
             is BackupDialog.UnfinishedBackupFound -> UnfinishedBackupFoundDialog.create(context)
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 89d9327ed6..f538ff13a3 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
@@ -61,7 +61,11 @@ fun FragmentActivity.popBackTo(screen: AppScreen?, inclusive: Boolean = false) {
 }
 
 fun FragmentActivity.getPreviousScreen(): AppScreen? {
-    val indexOfLastFragment = this.supportFragmentManager.backStackEntryCount - 1
+    val indexOfLastFragment = if (this.supportFragmentManager.backStackEntryCount > 0) {
+        this.supportFragmentManager.backStackEntryCount - 1
+    } else {
+        0
+    }
     val tag = if (indexOfLastFragment < this.supportFragmentManager.backStackEntryCount)
         this.supportFragmentManager.getBackStackEntryAt(indexOfLastFragment).name
     else null
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 40acdd1b7d..39e0103066 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
@@ -8,7 +8,7 @@ import com.tangem.tap.common.TestActions
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.extensions.amountToCreateAccount
 import com.tangem.tap.domain.getFirstToken
-import com.tangem.tap.features.demo.isDemoWallet
+import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.wallet.redux.AddressData
 import com.tangem.tap.features.wallet.redux.reducers.createAddressesData
 import com.tangem.tap.network.NetworkConnectivity
@@ -21,7 +21,10 @@ import timber.log.Timber
 [REDACTED_AUTHOR]
  */
 suspend fun WalletManager.safeUpdate(): Result<Wallet> = try {
-    if (isDemoWallet() || TestActions.testAmountInjectionForWalletManagerEnabled) {
+    val scanResponse = store.state.globalState.scanResponse
+        ?: error("Scan response must not be null")
+
+    if (scanResponse.isDemoCard() || TestActions.testAmountInjectionForWalletManagerEnabled) {
         delay(500)
         TestActions.testAmountInjectionForWalletManagerEnabled = false
         Result.Success(wallet)
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 20d1eda08c..9e22833682 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt
@@ -5,44 +5,25 @@ import com.tangem.TangemSdk
 import com.tangem.blockchain.common.TransactionSigner
 import com.tangem.blockchain.common.Wallet
 import com.tangem.common.CompletionResult
-import com.tangem.tap.domain.tasks.SignHashTask
+import com.tangem.common.card.Card
 import com.tangem.tap.domain.tasks.SignHashesTask
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class TangemSigner(
+    private val card: Card,
     private val tangemSdk: TangemSdk,
     private val initialMessage: Message,
     private val signerCallback: (TangemSignerResponse) -> Unit,
 ) : TransactionSigner {
 
-    override suspend fun sign(hash: ByteArray, cardId: String, publicKey: Wallet.PublicKey): CompletionResult<ByteArray> {
+    override suspend fun sign(
+        hashes: List<ByteArray>,
+        publicKey: Wallet.PublicKey
+    ): CompletionResult<List<ByteArray>> {
         return suspendCoroutine { continuation ->
-            val command = SignHashTask(hash, publicKey)
-            tangemSdk.startSessionWithRunnable(
-                runnable = command,
-                cardId = cardId,
-                initialMessage = initialMessage,
-            ) { result ->
-                when (result) {
-                    is CompletionResult.Success -> {
-                        signerCallback(
-                            TangemSignerResponse(
-                                result.data.totalSignedHashes,
-                                result.data.remainingSignatures
-                            )
-                        )
-                        continuation.resume(CompletionResult.Success(result.data.signature))
-                    }
-                    is CompletionResult.Failure ->
-                        continuation.resume(CompletionResult.Failure(result.error))
-                }
-            }
-        }
-    }
+            val cardId = if (card.backupStatus?.isActive == true) null else card.cardId
 
-    override suspend fun sign(hashes: List<ByteArray>, cardId: String, publicKey: Wallet.PublicKey): CompletionResult<List<ByteArray>> {
-        return suspendCoroutine { continuation ->
             val task = SignHashesTask(hashes, publicKey)
             tangemSdk.startSessionWithRunnable(
                 runnable = task,
@@ -65,6 +46,21 @@ class TangemSigner(
             }
         }
     }
+
+    override suspend fun sign(
+        hash: ByteArray,
+        publicKey: Wallet.PublicKey
+    ): CompletionResult<ByteArray> {
+        val result = sign(
+            hashes = listOf(hash),
+            publicKey = publicKey
+        )
+
+        return when (result) {
+            is CompletionResult.Success -> CompletionResult.Success(result.data.first())
+            is CompletionResult.Failure -> CompletionResult.Failure(result.error)
+        }
+    }
 }
 
 data class TangemSignerResponse(
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 e636c4fa07..34b8289884 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
@@ -32,9 +32,10 @@ fun WalletManagerFactory.makeWalletManagerForApp(
     return when {
         scanResponse.isTangemTwins() && scanResponse.secondTwinPublicKey != null -> {
             makeTwinWalletManager(
-                card.cardId,
-                wallet.publicKey, scanResponse.secondTwinPublicKey!!.hexToBytes(),
-                environmentBlockchain, wallet.curve
+                walletPublicKey = wallet.publicKey,
+                pairPublicKey = scanResponse.secondTwinPublicKey!!.hexToBytes(),
+                blockchain = environmentBlockchain,
+                curve = wallet.curve
             )
         }
         seedKey != null && derivationParams != null -> {
@@ -47,7 +48,6 @@ fun WalletManagerFactory.makeWalletManagerForApp(
                 ?: return null
 
             makeWalletManager(
-                cardId = card.cardId,
                 blockchain = environmentBlockchain,
                 seedKey = wallet.publicKey,
                 derivedKey = derivedKey,
@@ -56,7 +56,6 @@ fun WalletManagerFactory.makeWalletManagerForApp(
         }
         else -> {
             makeWalletManager(
-                cardId = card.cardId,
                 blockchain = environmentBlockchain,
                 walletPublicKey = wallet.publicKey,
                 curve = wallet.curve
diff --git a/app/src/main/java/com/tangem/tap/domain/statePrinter/WalletStateConverter.kt b/app/src/main/java/com/tangem/tap/domain/statePrinter/WalletStateConverter.kt
index 07ac4886bb..57762aaf51 100644
--- a/app/src/main/java/com/tangem/tap/domain/statePrinter/WalletStateConverter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/statePrinter/WalletStateConverter.kt
@@ -57,7 +57,6 @@ class WalletStateConverter : StringStateConverter<AppState> {
         walletMap["publicKey"] = publicKeyMap
         walletMap["amounts"] = amounts
         walletMap["addresses"] = wallet.addresses.toString()
-        walletMap["cardId"] = wallet.cardId
 
         return walletMap
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt b/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
index 032c0b97ca..f05065bc8d 100644
--- a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
+++ b/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
@@ -4,16 +4,17 @@ import android.content.res.Resources
 import android.net.Uri
 import androidx.core.os.ConfigurationCompat
 import com.tangem.common.card.Card
-import java.util.*
+import java.util.Locale
 
 /**
 [REDACTED_AUTHOR]
  */
 class CardTou {
-    private val locale: Locale = ConfigurationCompat.getLocales(Resources.getSystem().configuration).get(0)
+    private val locale: Locale =
+        ConfigurationCompat.getLocales(Resources.getSystem().configuration).get(0)!!
 
     fun getUrl(card: Card): Uri? {
-        val issuerName = card.issuer.name ?: return null
+        val issuerName = card.issuer.name
         if (issuerName.lowercase(Locale.getDefault()) != "start2coin") return null
 
         val baseUrl = "https://app.tangem.com/tou/"
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 fe8a593787..b366229775 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
@@ -1,11 +1,13 @@
 package com.tangem.tap.domain.walletconnect
 
 import com.github.salomonbrys.kotson.fromJson
+import com.github.salomonbrys.kotson.toMap
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 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
 
@@ -18,9 +20,11 @@ class EthSignHelper {
                 .create()
         }
 
-        fun tryToParseEthTypedMessage(data: String): WCEthereumSignMessage? {
-            val request =
-                gson.fromJson<CustomJsonRpcRequests>(data)
+        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(
@@ -53,12 +57,26 @@ class EthSignHelper {
     }
 }
 
-data class CustomJsonRpcRequests(
+data class CustomJsonRpcRequest(
     val id: Long,
     val jsonrpc: String = JSONRPC_VERSION,
     val method: WCMethodExtended?,
     val params: JsonArray
-)
+) {
+
+    fun blockchainFromChainId(): Blockchain? {
+        return try {
+            val hex = params[0].asJsonObject.toMap()[CHAIN_ID_KEY]?.asString ?: ""
+            Blockchain.fromChainId(Integer.decode(hex))
+        } catch (exception: Exception) {
+            null
+        }
+    }
+
+    companion object {
+        const val CHAIN_ID_KEY = "chainId"
+    }
+}
 
 enum class WCMethodExtended {
     @SerializedName("wc_sessionRequest")
@@ -95,5 +113,10 @@ enum class WCMethodExtended {
     GET_ACCOUNTS,
 
     @SerializedName("trust_signTransaction")
-    SIGN_TRANSACTION;
+    SIGN_TRANSACTION,
+
+    @SerializedName("wallet_switchEthereumChain")
+    SWITCH_CHAIN,
+
+    ;
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt
index dd94266b06..7d36064f1e 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
@@ -11,14 +11,20 @@ import com.tangem.tap.store
 import com.tangem.tap.walletConnectRepository
 import com.trustwallet.walletconnect.WCClient
 import com.trustwallet.walletconnect.models.WCPeerMeta
-import com.trustwallet.walletconnect.models.binance.*
+import com.trustwallet.walletconnect.models.binance.WCBinanceCancelOrder
+import com.trustwallet.walletconnect.models.binance.WCBinanceTradeOrder
+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.WCSession
 import com.trustwallet.walletconnect.models.session.WCSessionUpdate
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import okhttp3.*
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
 import okhttp3.logging.HttpLoggingInterceptor
 import timber.log.Timber
 import java.util.*
@@ -71,6 +77,22 @@ class WalletConnectManager {
         }
     }
 
+    fun updateBlockchain(session: WalletConnectSession) {
+        sessions[session.session]?.client?.updateSession(
+            accounts = listOfNotNull(session.getAddress()),
+            chainId = session.wallet.blockchain?.getChainId(),
+            approved = true
+        )
+
+
+        val updatedSession = sessions[session.session]?.copy(
+            wallet = session.wallet
+        )
+        if (updatedSession != null) {
+            sessions[session.session] = updatedSession
+        }
+    }
+
     private fun setupConnectionTimeoutCheck(session: WCSession) {
         scope.launch {
             delay(20_000)
@@ -409,23 +431,43 @@ class WalletConnectManager {
             Timber.d("Custom Request")
             Timber.d(data)
 
-            val message = EthSignHelper.tryToParseEthTypedMessage(data)
-            if (message != null) {
-                Timber.d("onEthSign_v4: $message")
-                store.state.globalState.analyticsHandlers?.logWcEvent(
-                    Analytics.WcAnalyticsEvent.Action(
-                        Analytics.WcAction.PersonalSign
+            val request = EthSignHelper.parseCustomRequest(data)
+
+            when (request.method) {
+                WCMethodExtended.ETH_SIGN_TYPE_DATA_V4 -> handleTypedDataV4(request, client, id)
+                WCMethodExtended.SWITCH_CHAIN -> {
+                    val blockchain = request.blockchainFromChainId()
+                    Timber.d("WC switch chainID\nNew Blockchain: $blockchain")
+                    val session = sessions[client.session]?.toWalletConnectSession()
+                    if (session != null) {
+                        store.dispatchOnMain(WalletConnectAction.SwitchBlockchain(blockchain, session))
+                    }
+                }
+                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.analyticsHandlers?.logWcEvent(
+                Analytics.WcAnalyticsEvent.Action(
+                    Analytics.WcAction.PersonalSign
+                )
+            )
+            sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
+                store.dispatchOnMain(
+                    WalletConnectAction.HandlePersonalSignRequest(
+                        message,
+                        sessionData,
+                        id
                     )
                 )
-                sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
-                    store.dispatchOnMain(
-                        WalletConnectAction.HandlePersonalSignRequest(
-                            message,
-                            sessionData,
-                            id
-                        )
-                    )
-                }
             }
         }
     }
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 1d0dc4a9e0..a3b0d31a89 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
@@ -5,8 +5,17 @@ import com.tangem.blockchain.blockchains.ethereum.EthereumGasLoader
 import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
 import com.tangem.blockchain.blockchains.ethereum.EthereumUtils
 import com.tangem.blockchain.blockchains.ethereum.EthereumUtils.Companion.toKeccak
-import com.tangem.blockchain.common.*
-import com.tangem.blockchain.extensions.*
+import com.tangem.blockchain.common.Amount
+import com.tangem.blockchain.common.AmountType
+import com.tangem.blockchain.common.CommonSigner
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.common.TransactionSender
+import com.tangem.blockchain.common.Wallet
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.extensions.Result
+import com.tangem.blockchain.extensions.SimpleResult
+import com.tangem.blockchain.extensions.hexToBigDecimal
+import com.tangem.blockchain.extensions.isAscii
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.hexToBytes
@@ -17,7 +26,11 @@ import com.tangem.operations.sign.SignHashCommand
 import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.extensions.toFormattedString
-import com.tangem.tap.features.details.redux.walletconnect.*
+import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
+import com.tangem.tap.features.details.redux.walletconnect.WalletForSession
+import com.tangem.tap.features.details.redux.walletconnect.WcPersonalSignData
+import com.tangem.tap.features.details.redux.walletconnect.WcTransactionData
+import com.tangem.tap.features.details.redux.walletconnect.WcTransactionType
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.PersonalSignDialogData
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.TransactionRequestDialogData
 import com.tangem.tap.store
@@ -25,8 +38,8 @@ import com.tangem.tap.tangemSdk
 import com.tangem.tap.tangemSdkManager
 import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage
 import com.trustwallet.walletconnect.models.ethereum.WCEthereumTransaction
-import timber.log.Timber
 import java.math.BigDecimal
+import timber.log.Timber
 
 class WalletConnectSdkHelper {
 
@@ -108,9 +121,8 @@ class WalletConnectSdkHelper {
         )
         val blockchain = session.wallet.getBlockchainForSession()
         return factory.makeWalletManager(
-            session.wallet.cardId,
-            blockchain,
-            publicKey
+            blockchain = blockchain,
+            publicKey = publicKey
         )
     }
 
@@ -124,7 +136,7 @@ class WalletConnectSdkHelper {
     private suspend fun sendTransaction(data: WcTransactionData): String? {
         val result = (data.walletManager as TransactionSender).send(
             transactionData = data.transaction,
-            signer = Signer(tangemSdk)
+            signer = CommonSigner(tangemSdk)
         )
         return when (result) {
             SimpleResult.Success -> {
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WcWalletManagerFactory.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WcWalletManagerFactory.kt
new file mode 100644
index 0000000000..7c978b7b6f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WcWalletManagerFactory.kt
@@ -0,0 +1,95 @@
+package com.tangem.tap.domain.walletconnect
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Wallet
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.common.WalletManagerFactory
+import com.tangem.common.card.EllipticCurve
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.tap.domain.extensions.getPrimaryCurve
+import com.tangem.tap.domain.extensions.makeWalletManagerForApp
+import com.tangem.tap.domain.tokens.CurrenciesRepository
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.features.details.redux.walletconnect.WalletForSession
+import com.tangem.tap.features.wallet.redux.WalletState
+
+class WcWalletManagerFactory(
+    private val factory: WalletManagerFactory,
+    private val currenciesRepository: CurrenciesRepository,
+    ) {
+
+    suspend fun getWalletManager(
+        wallet: WalletForSession, blockchain: Blockchain, walletState: WalletState
+    ): WalletManager? {
+        val blockchainToMake = if (blockchain == Blockchain.Ethereum && wallet.isTestNet) {
+            Blockchain.EthereumTestnet
+        } else {
+            blockchain
+        }
+
+        val blockchainNetwork = BlockchainNetwork(
+            blockchain = blockchainToMake,
+            derivationPath = wallet.derivationPath?.rawPath,
+            tokens = emptyList()
+        )
+
+        return if (walletState.cardId == wallet.cardId) {
+            walletState.getWalletManager(blockchainNetwork)
+        } else {
+            val blockchainNetworkWithTokens = currenciesRepository
+                .loadSavedCurrencies(
+                    cardId = wallet.cardId,
+                    isHdWalletSupported = wallet.derivationPath != null
+                ).firstOrNull { it == blockchainNetwork }
+
+            if (blockchainNetworkWithTokens != null) {
+                factory.makeWalletManager(
+                    cardId = wallet.cardId,
+                    blockchain = blockchainToMake,
+                    publicKey = Wallet.PublicKey(
+                        wallet.walletPublicKey!!,
+                        wallet.derivedPublicKey,
+                        wallet.derivationPath
+                    ),
+                    tokens = blockchainNetworkWithTokens.tokens,
+                    curve = blockchainToMake.getPrimaryCurve() ?: EllipticCurve.Secp256k1
+                )
+            } else {
+                null
+            }
+        }
+    }
+
+    suspend fun getWalletManager(
+        scanResponse: ScanResponse, blockchain: Blockchain, walletState: WalletState
+    ): WalletManager? {
+        val card = scanResponse.card
+        val blockchainToMake = if (blockchain == Blockchain.Ethereum && card.isTestCard) {
+            Blockchain.EthereumTestnet
+        } else {
+            blockchain
+        }
+
+        val blockchainNetwork = BlockchainNetwork(
+            blockchain = blockchainToMake,
+            card = card
+        )
+
+        return if (walletState.cardId == card.cardId) {
+           walletState.getWalletManager(blockchainNetwork)
+        } else {
+            if (currenciesRepository
+                    .loadSavedCurrencies(card.cardId, card.settings.isHDWalletAllowed)
+                    .contains(blockchainNetwork)
+            ) {
+                factory.makeWalletManagerForApp(
+                    scanResponse = scanResponse,
+                    blockchainNetwork = blockchainNetwork
+                )
+            } else {
+                null
+            }
+        }
+    }
+}
\ No newline at end of file
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 7fe717e1a5..f7ccf6156a 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
@@ -109,7 +109,7 @@ class DemoConfig {
                 testDemoCardIds).distinct()
     }
 
-    private val releaseDemoCardIds = mutableListOf<String>(
+    private val releaseDemoCardIds = mutableListOf(
 //        Tangem Wallet:
         "AC01000000041100",
         "AC01000000042462",
@@ -284,7 +284,10 @@ class DemoTransactionSender(
 
     override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
         val dataToSign = randomString(32).toByteArray()
-        val signerResponse = signer.sign(dataToSign, walletManager.wallet.cardId, walletManager.wallet.publicKey)
+        val signerResponse = signer.sign(
+            hash = dataToSign,
+            publicKey = walletManager.wallet.publicKey
+        )
         return when (signerResponse) {
             is CompletionResult.Success -> SimpleResult.Failure(Exception(ID))
             is CompletionResult.Failure -> SimpleResult.fromTangemSdkError(signerResponse.error)
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 99ecfbc227..66d09bdbf0 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.blockchain.common.WalletManager
+import com.tangem.common.card.Card
 import com.tangem.domain.common.ScanResponse
 
 /**
 [REDACTED_AUTHOR]
  */
 fun ScanResponse.isDemoCard(): Boolean = DemoHelper.isDemoCardId(card.cardId)
-fun WalletManager.isDemoWallet(): Boolean = DemoHelper.isDemoCardId(wallet.cardId)
\ No newline at end of file
+fun Card.isDemoCard(): Boolean = DemoHelper.isDemoCardId(cardId)
\ 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 a180d20d4a..471ccaa44c 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
@@ -1,6 +1,7 @@
 package com.tangem.tap.features.details.redux.walletconnect
 
 import android.app.Activity
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.redux.NotificationAction
 import com.tangem.wallet.R
@@ -47,6 +48,16 @@ sealed class WalletConnectAction : Action {
         data class Success(val session: WalletConnectSession) : WalletConnectAction()
     }
 
+    data class SwitchBlockchain(
+        val blockchain: Blockchain?,
+        val session: WalletConnectSession
+    ) : WalletConnectAction()
+
+    data class UpdateBlockchain(
+        val updatedSession: WalletConnectSession
+    ) : WalletConnectAction()
+
+
     data class FailureEstablishingSession(val session: WCSession?) : WalletConnectAction()
 
     data class SetSessionsRestored(val sessions: List<WalletConnectSession>) :
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 25c5d373b4..7f7a88748a 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
@@ -1,10 +1,8 @@
 package com.tangem.tap.features.details.redux.walletconnect
 
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.WalletManager
 import com.tangem.common.extensions.guard
 import com.tangem.domain.common.ScanResponse
-import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.getFromClipboard
@@ -14,11 +12,10 @@ import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.currenciesRepository
 import com.tangem.tap.domain.extensions.isMultiwalletAllowed
-import com.tangem.tap.domain.extensions.makeWalletManagerForApp
-import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.domain.walletconnect.BnbHelper
 import com.tangem.tap.domain.walletconnect.WalletConnectManager
 import com.tangem.tap.domain.walletconnect.WalletConnectNetworkUtils
+import com.tangem.tap.domain.walletconnect.WcWalletManagerFactory
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.scope
 import com.tangem.tap.store
@@ -159,6 +156,45 @@ class WalletConnectMiddleware {
                     action.id, action.data, action.sessionData
                 )
             }
+            is WalletConnectAction.SwitchBlockchain -> {
+                val blockchain = action.blockchain.guard {
+                    store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork))
+                    return
+                }
+
+                val factory = WcWalletManagerFactory(
+                    factory = store.state.globalState.tapWalletManager.walletManagerFactory,
+                    currenciesRepository = currenciesRepository
+                )
+                val walletState = store.state.walletState
+                scope.launch {
+                    val walletManager = factory.getWalletManager(
+                            wallet = action.session.wallet,
+                            blockchain = blockchain,
+                            walletState = walletState
+                        ).guard {
+                        store.dispatchOnMain(
+                            GlobalAction.ShowDialog(
+                                WalletConnectDialog.AddNetwork(blockchain.fullName)
+                            )
+                        )
+                        return@launch
+                    }
+
+                    val updatedWallet = action.session.wallet.copy(
+                        walletPublicKey = walletManager.wallet.publicKey.seedKey,
+                        derivedPublicKey = walletManager.wallet.publicKey.derivedKey,
+                        derivationPath = walletManager.wallet.publicKey.derivationPath,
+                        blockchain = action.blockchain
+
+                    )
+                    val updatedSession = action.session.copy(wallet = updatedWallet)
+                    store.dispatchOnMain(WalletConnectAction.UpdateBlockchain(updatedSession))
+                }
+            }
+            is WalletConnectAction.UpdateBlockchain -> {
+                walletConnectManager.updateBlockchain(action.updatedSession)
+            }
         }
     }
 
@@ -189,8 +225,13 @@ class WalletConnectMiddleware {
             return
         }
 
+        val factory = WcWalletManagerFactory(
+            factory = store.state.globalState.tapWalletManager.walletManagerFactory,
+            currenciesRepository = currenciesRepository
+        )
+        val walletState = store.state.walletState
         scope.launch {
-            val walletManager = getWalletManager(scanResponse, blockchain).guard {
+            val walletManager = factory.getWalletManager(scanResponse, blockchain, walletState).guard {
                 store.dispatchOnMain(WalletConnectAction.FailureEstablishingSession(session.session))
                 store.dispatchOnMain(
                     GlobalAction.ShowDialog(
@@ -232,37 +273,4 @@ class WalletConnectMiddleware {
         }
 
     }
-
-    private suspend fun getWalletManager(
-        scanResponse: ScanResponse, blockchain: Blockchain
-    ): WalletManager? {
-        val card = scanResponse.card
-        val factory = store.state.globalState.tapWalletManager.walletManagerFactory
-        val blockchainToMake = if (blockchain == Blockchain.Ethereum && card.isTestCard) {
-            Blockchain.EthereumTestnet
-        } else {
-            blockchain
-        }
-
-        val blockchainNetwork = BlockchainNetwork(
-            blockchain = blockchainToMake,
-            card = card
-        )
-
-        return if (store.state.globalState.scanResponse?.card?.cardId == card.cardId) {
-            store.state.walletState.getWalletManager(blockchainNetwork)
-        } else {
-            if (currenciesRepository
-                    .loadSavedCurrencies(card.cardId, card.settings.isHDWalletAllowed)
-                    .contains(blockchainNetwork)
-            ) {
-                factory.makeWalletManagerForApp(
-                    scanResponse = scanResponse,
-                    blockchainNetwork = blockchainNetwork
-                )
-            } else {
-                null
-            }
-        }
-    }
 }
\ No newline at end of file
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 216367e9ee..191fa7b170 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
@@ -34,6 +34,11 @@ class WalletConnectReducer {
                 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
             }
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 4f5861c67b..fbd95c6393 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
@@ -82,6 +82,7 @@ data class WalletForSession(
 sealed class WalletConnectDialog : StateDialog {
     data class ClipboardOrScanQr(val clipboardUri: String) : WalletConnectDialog()
     object UnsupportedCard : WalletConnectDialog()
+    object UnsupportedNetwork : WalletConnectDialog()
     data class AddNetwork(val network: String) : WalletConnectDialog()
     object OpeningSessionRejected : WalletConnectDialog()
     object SessionTimeout : WalletConnectDialog()
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 125458acf8..fc23162829 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
@@ -1,10 +1,14 @@
 package com.tangem.tap.features.home
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 import com.google.accompanist.appcompattheme.AppCompatTheme
 import com.tangem.tap.common.redux.navigation.AppScreen
@@ -15,12 +19,12 @@ 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 com.tangem.wallet.R
 import org.rekotlin.StoreSubscriber
 
-class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState> {
+class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
 
-    var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
+    private var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
+    private var composeView: ComposeView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -29,6 +33,13 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        val context = container?.context ?: return null
+
         store.dispatch(BackupAction.CheckForUnfinishedBackup)
         getView()?.findViewById<ComposeView>(R.id.cv_stories)?.setContent {
             AppCompatTheme {
@@ -46,16 +57,16 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
                         store.dispatch(TokensAction.LoadCurrencies())
                     }
                 )
+        composeView = ComposeView(context).apply {
+            setContent {
+                AppCompatTheme {
+                    ScreenContent()
+                }
             }
         }
-    }
 
-    private fun getRegionProvider(): RegionProvider = RegionService(
-        listOf(
-//            TelephonyManagerRegionProvider(requireContext()),
-            LocaleRegionProvider()
-        )
-    )
+        return composeView
+    }
 
     override fun onStart() {
         super.onStart()
@@ -71,6 +82,11 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
         store.unsubscribe(this)
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        rollbackStatusBarIconsColor()
+        composeView = null
+    }
 
     override fun newState(state: HomeState) {
         if (activity == null || view == null) return
@@ -78,4 +94,32 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
         homeState.value = state
     }
 
+    @Composable
+    private fun ScreenContent() {
+        StoriesScreen(
+            homeState,
+            onScanButtonClick = { store.dispatch(HomeAction.ReadCard) },
+            onShopButtonClick = {
+                store.dispatch(
+                    HomeAction.GoToShop(store.state.globalState.userCountryCode)
+                )
+            },
+            onSearchTokensClick = {
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
+                store.dispatch(TokensAction.AllowToAddTokens(false))
+                store.dispatch(TokensAction.LoadCurrencies())
+            }
+        )
+    }
+
+    /*
+    * !!! Workaround !!!
+    * Used to roll back the color of icons in the status bar after the stories screen
+    * */
+    private fun rollbackStatusBarIconsColor() {
+        WindowInsetsControllerCompat(
+            activity?.window ?: return,
+            view ?: return,
+        ).isAppearanceLightStatusBars = true
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
similarity index 80%
rename from app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt
rename to app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
index 3ea4e1c26b..51d2f6a1bb 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
@@ -3,12 +3,25 @@ package com.tangem.tap.features.home.compose
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.*
+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.WindowInsets
+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.systemBars
+import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -25,8 +38,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.tap.common.compose.SpacerS24
-import com.tangem.tap.features.home.compose.content.*
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.tangem.tap.features.home.compose.content.FirstStoriesContent
+import com.tangem.tap.features.home.compose.content.StoriesCurrencies
+import com.tangem.tap.features.home.compose.content.StoriesRevolutionaryWallet
+import com.tangem.tap.features.home.compose.content.StoriesUltraSecureBackup
+import com.tangem.tap.features.home.compose.content.StoriesWalletForEveryone
+import com.tangem.tap.features.home.compose.content.StoriesWeb3
 import com.tangem.tap.features.home.compose.views.HomeButtons
 import com.tangem.tap.features.home.compose.views.StoriesProgressBar
 import com.tangem.tap.features.home.redux.HomeState
@@ -43,6 +61,7 @@ fun StoriesScreen(
 ) {
     val steps = 6
     val currentStep = remember { mutableStateOf(1) }
+    val systemUiController = rememberSystemUiController()
 
     val isDarkBackground = currentStep.value !in 3..5
 
@@ -58,13 +77,20 @@ fun StoriesScreen(
 
     val hideContent = remember { mutableStateOf(true) }
 
+    SideEffect {
+        systemUiController.setSystemBarsColor(
+            color = Color.Transparent,
+            darkIcons = false,
+        )
+    }
+
     Box(
-        Modifier
+        modifier = Modifier
             .fillMaxSize()
             .background(Color(0xFF090E13))
     ) {
         Row(
-            Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize()
         ) {
             Box(
                 Modifier
@@ -105,19 +131,23 @@ fun StoriesScreen(
         }
         if (!isDarkBackground) {
             Image(
+                modifier = Modifier.fillMaxSize(),
                 painter = painterResource(id = R.drawable.ic_overlay),
                 contentDescription = null,
-                modifier = Modifier
-                    .fillMaxSize(),
                 contentScale = ContentScale.FillBounds
             )
         }
+
+        val insets = WindowInsets.systemBars
+            .union(WindowInsets(top = 32.dp))
+
         Column(
+            modifier = Modifier
+                .windowInsetsPadding(insets)
+                .fillMaxSize(),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
-            modifier = Modifier.fillMaxWidth()
         ) {
-            SpacerS24()
             StoriesProgressBar(
                 steps = steps,
                 currentStep = currentStep.value,
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 29165f8bad..cd4075a0ca 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
@@ -7,7 +7,7 @@ import com.tangem.blockchain.extensions.Result
 import com.tangem.common.extensions.isZero
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.demo.DemoTransactionSender
-import com.tangem.tap.features.demo.isDemoWallet
+import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.send.redux.AmountActionUi
 import com.tangem.tap.features.send.redux.FeeAction
 import com.tangem.tap.features.send.redux.ReceiptAction
@@ -28,6 +28,7 @@ class RequestFeeMiddleware {
     fun handle(appState: AppState?, dispatch: DispatchFunction) {
         val sendState = appState?.sendState ?: return
         val walletManager = sendState.walletManager ?: return
+        val scanResponse = appState.globalState.scanResponse ?: return
 
         if (!SendState.isReadyToRequestFee()) {
             dispatch(FeeAction.FeeCalculation.SetFeeError(FeeAction.Error.ADDRESS_OR_AMOUNT_IS_EMPTY))
@@ -40,7 +41,7 @@ class RequestFeeMiddleware {
 
         val destinationAddress = sendState.addressPayIdState.destinationWalletAddress!!
         val destinationAmount = Amount(typedAmount, sendState.amountState.amountToSendCrypto)
-        val txSender = if (walletManager.isDemoWallet()) {
+        val txSender = if (scanResponse.isDemoCard()) {
             DemoTransactionSender(walletManager)
         } else {
             walletManager as TransactionSender
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 1727c81944..4a1f2df785 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
@@ -4,7 +4,11 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tangem.blockchain.blockchains.binance.BinanceTransactionExtras
 import com.tangem.blockchain.blockchains.stellar.StellarTransactionExtras
 import com.tangem.blockchain.blockchains.xrp.XrpTransactionBuilder
-import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.Amount
+import com.tangem.blockchain.common.BlockchainSdkError
+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
@@ -15,7 +19,11 @@ import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
 import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.analytics.AnalyticsEvent
 import com.tangem.tap.common.analytics.AnalyticsParam
-import com.tangem.tap.common.extensions.*
+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.extensions.stripZeroPlainString
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -26,9 +34,15 @@ import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.domain.extensions.minimalAmount
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoTransactionSender
-import com.tangem.tap.features.demo.isDemoWallet
-import com.tangem.tap.features.send.redux.*
+import com.tangem.tap.features.demo.isDemoCard
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi
+import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction
+import com.tangem.tap.features.send.redux.AmountAction
+import com.tangem.tap.features.send.redux.AmountActionUi
 import com.tangem.tap.features.send.redux.FeeAction.RequestFee
+import com.tangem.tap.features.send.redux.PrepareSendScreen
+import com.tangem.tap.features.send.redux.SendAction
+import com.tangem.tap.features.send.redux.SendActionUi
 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
@@ -38,6 +52,7 @@ import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdk
 import com.tangem.wallet.R
+import java.util.EnumSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -45,7 +60,6 @@ import kotlinx.coroutines.withContext
 import org.rekotlin.Action
 import org.rekotlin.Middleware
 import timber.log.Timber
-import java.util.*
 
 /**
 [REDACTED_AUTHOR]
@@ -161,7 +175,11 @@ private fun sendTransaction(
             tangemSdk.config.linkedTerminal = false
         }
 
-        val signer = TangemSigner(tangemSdk, action.messageForSigner) { signResponse ->
+        val signer = TangemSigner(
+            card = card,
+            tangemSdk = tangemSdk,
+            initialMessage = action.messageForSigner
+        ) { signResponse ->
             store.dispatch(
                 GlobalAction.UpdateWalletSignedHashes(
                     walletSignedHashes = signResponse.totalSignedHashes,
@@ -171,7 +189,7 @@ private fun sendTransaction(
             )
         }
         val sendResult = try {
-            if (walletManager.isDemoWallet()) {
+            if (card.isDemoCard()) {
                 DemoTransactionSender(walletManager).send(txData, signer)
             } else {
                 (walletManager as TransactionSender).send(txData, signer)
@@ -340,5 +358,4 @@ private fun updateWarnings(dispatch: (Action) -> Unit) {
 
     val warnings = warningsManager.getWarnings(WarningMessage.Location.SendScreen, listOf(blockchain))
     dispatch(SendAction.Warnings.Set(warnings))
-}
-
+}
\ 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 ba70c84e05..21489b82f3 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
@@ -73,6 +73,9 @@ data class WalletState(
     val walletManagers: List<WalletManager>
         get() = wallets.mapNotNull { it.walletManager }
 
+    val cardId: String?
+        get() = wallets.firstOrNull()?.walletManager?.wallet?.cardId
+
     fun getWalletManager(currency: Currency?): WalletManager? {
         if (currency?.blockchain == null) return null
         return getWalletStore(currency)?.walletManager
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 a7ee50446d..064647d863 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
@@ -45,6 +45,7 @@ class TradeCryptoMiddleware {
 
         val selectedWalletData = store.state.walletState.getSelectedWalletData() ?: return
         val exchangeManager = store.state.globalState.exchangeManager ?: return
+        val card = store.state.globalState.scanResponse?.card ?: return
         val appCurrency = store.state.globalState.appCurrency
 
         val addresses = selectedWalletData.walletAddresses?.list.orEmpty()
@@ -59,7 +60,13 @@ class TradeCryptoMiddleware {
                 return
             }
 
-            scope.launch { exchangeManager.buyErc20TestnetTokens(walletManager, currency.token) }
+            scope.launch {
+                exchangeManager.buyErc20TestnetTokens(
+                    card = card,
+                    walletManager = walletManager,
+                    token = currency.token
+                )
+            }
             return
         }
 
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 7a4ac13ea5..7c63b551f9 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
@@ -1,8 +1,5 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
-import android.content.Intent
-import android.net.Uri
-import androidx.core.content.ContextCompat
 import com.tangem.blockchain.blockchains.solana.RentProvider
 import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.AmountType
@@ -15,12 +12,7 @@ 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.Analytics
-import com.tangem.tap.common.extensions.copyToClipboard
-import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
-import com.tangem.tap.common.extensions.dispatchOnMain
-import com.tangem.tap.common.extensions.onCardScanned
-import com.tangem.tap.common.extensions.shareText
-import com.tangem.tap.common.extensions.stripZeroPlainString
+import com.tangem.tap.common.extensions.*
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
@@ -233,9 +225,7 @@ class WalletMiddleware {
                 action.context.shareText(action.address)
             }
             is WalletAction.ExploreAddress -> {
-                val uri = Uri.parse(action.exploreUrl)
-                val intent = Intent(Intent.ACTION_VIEW, uri)
-                ContextCompat.startActivity(action.context, intent, null)
+                store.dispatchOpenUrl(action.exploreUrl)
             }
             is WalletAction.Send -> {
                 val newAction = prepareSendAction(action.amount, store.state.walletState)
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 fb75bc6474..41076760dc 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
@@ -5,7 +5,6 @@ import android.widget.TextView
 import androidx.constraintlayout.utils.widget.ImageFilterView
 import coil.imageLoader
 import coil.request.ImageRequest
-import coil.transform.RoundedCornersTransformation
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.IconsUtil
 import com.tangem.blockchain.common.Token
@@ -21,13 +20,13 @@ private const val QCX = "QCX"
 private const val VOYR = "VOYRME"
 
 fun loadCurrencyIcon(
-    currencyImageView: ImageFilterView,
+    currencyImageView: CurrencyIconView,
     currencyTextView: TextView,
     token: Token?,
     blockchain: Blockchain,
 ) {
     CurrencyIconLoader(
-        currencyImageView = currencyImageView,
+        currencyImageView = currencyImageView.imageView,
         currencyTextView = currencyTextView,
         token = token,
         blockchain = blockchain
@@ -135,14 +134,6 @@ private inline fun ImageView.loadIcon(
         .placeholder(placeholderRes)
         .error(placeholderRes)
         .fallback(placeholderRes)
-        .transformations(
-            RoundedCornersTransformation(
-                topLeft = 32f,
-                topRight = 32f,
-                bottomLeft = 32f,
-                bottomRight = 32f
-            )
-        )
         .listener(
             onStart = { onStart() },
             onSuccess = { _, _ -> onSuccess() },
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
new file mode 100644
index 0000000000..35d89aaa27
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt
@@ -0,0 +1,30 @@
+package com.tangem.tap.features.wallet.ui.images
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.utils.widget.ImageFilterView
+import com.google.android.material.card.MaterialCardView
+import com.tangem.tangem_sdk_new.extensions.dpToPx
+import com.tangem.wallet.databinding.ViewCurrencyIconBinding
+
+class CurrencyIconView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+) : MaterialCardView(context, attrs, defStyleAttr) {
+    private val binding = ViewCurrencyIconBinding.inflate(
+        LayoutInflater.from(context),
+        this
+    )
+
+    val imageView: ImageFilterView
+        get() = binding.iv
+
+    init {
+        elevation = 0f
+        cardElevation = 0f
+        radius = dpToPx(8f)
+        background = null
+    }
+}
\ No newline at end of file
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 811c9c0545..8d1085d316 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,6 +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.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -68,7 +69,11 @@ class CurrencyExchangeManager(
     enum class Action { Buy, Sell }
 }
 
-suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(walletManager: EthereumWalletManager, token: Token) {
+suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(
+    card: Card,
+    walletManager: EthereumWalletManager,
+    token: Token,
+) {
     walletManager.safeUpdate()
 
     val amountToSend = Amount(walletManager.wallet.blockchain)
@@ -85,7 +90,9 @@ suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(walletManager: Ethereu
     val transaction = walletManager.createTransaction(amountToSend, fee, destinationAddress)
 
     val signer = TangemSigner(
-        tangemSdk = tangemSdk, Message()
+        card = card,
+        tangemSdk = tangemSdk,
+        initialMessage = Message(),
     ) { signResponse ->
         store.dispatch(
             GlobalAction.UpdateWalletSignedHashes(
diff --git a/app/src/main/res/drawable/ic_overlay.xml b/app/src/main/res/drawable/ic_overlay.xml
index 586397f855..5487da88f8 100644
--- a/app/src/main/res/drawable/ic_overlay.xml
+++ b/app/src/main/res/drawable/ic_overlay.xml
@@ -4,10 +4,18 @@
     <path android:fillColor="#F8F9F9" android:pathData="M0,0h360v720h-360z"/>
     <path android:fillAlpha="0.2" android:pathData="M0,0h360v720h-360z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="179.591" android:endY="82.4634"
-                android:startX="180" android:startY="0" android:type="linear">
-                <item android:color="#FF090E13" android:offset="0"/>
-                <item android:color="#00000000" android:offset="1"/>
+            <gradient
+                    android:endX="179.591"
+                    android:endY="120.4634"
+                    android:startX="180"
+                    android:startY="0"
+                    android:type="linear">
+                <item
+                        android:color="#FF090E13"
+                        android:offset="0" />
+                <item
+                        android:color="#00000000"
+                        android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
diff --git a/app/src/main/res/drawable/shape_rectangle_rounded_8.xml b/app/src/main/res/drawable/shape_rectangle_rounded_8.xml
index a788f39093..4f20cb0e64 100644
--- a/app/src/main/res/drawable/shape_rectangle_rounded_8.xml
+++ b/app/src/main/res/drawable/shape_rectangle_rounded_8.xml
@@ -5,4 +5,4 @@
 
     <corners android:radius="8dp" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
deleted file mode 100644
index 7a95116cd8..0000000000
--- a/app/src/main/res/layout/fragment_home.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/cv_stories"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_currency_wallet.xml b/app/src/main/res/layout/item_currency_wallet.xml
index 7f145c3e1d..9ac49b1ad9 100644
--- a/app/src/main/res/layout/item_currency_wallet.xml
+++ b/app/src/main/res/layout/item_currency_wallet.xml
@@ -16,34 +16,32 @@
             android:elevation="3dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="12dp"
-                android:paddingBottom="12dp"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:animateLayoutChanges="true"
-                android:clipToPadding="false">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:animateLayoutChanges="true"
+            android:clipToPadding="false">
 
-            <androidx.constraintlayout.utils.widget.ImageFilterView
-                    android:id="@+id/iv_currency"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@drawable/shape_circle"
-                    tools:tint="@color/iconGray" />
+            <com.tangem.tap.features.wallet.ui.images.CurrencyIconView
+                android:id="@+id/iv_currency"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                    android:id="@+id/tv_token_letter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="2dp"
-                    android:textColor="@android:color/white"
-                    android:textSize="25sp"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_currency"
+                android:id="@+id/tv_token_letter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:textColor="@android:color/white"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="@id/iv_currency"
                     app:layout_constraintEnd_toEndOf="@id/iv_currency"
                     app:layout_constraintStart_toStartOf="@id/iv_currency"
                     app:layout_constraintTop_toTopOf="@id/iv_currency"
diff --git a/app/src/main/res/layout/layout_balance_wallet_details.xml b/app/src/main/res/layout/layout_balance_wallet_details.xml
index 781b8f5145..757660b3a9 100644
--- a/app/src/main/res/layout/layout_balance_wallet_details.xml
+++ b/app/src/main/res/layout/layout_balance_wallet_details.xml
@@ -39,14 +39,13 @@
         app:layout_constraintTop_toBottomOf="@id/tv_fiat_amount"
         tools:text="0.43 BTC" />
 
-    <androidx.constraintlayout.utils.widget.ImageFilterView
+    <com.tangem.tap.features.wallet.ui.images.CurrencyIconView
         android:id="@+id/iv_currency"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_margin="16dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/shape_circle" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_token_letter"
@@ -100,4 +99,4 @@
         app:constraint_referenced_ids="tv_amount, tv_fiat_amount, tv_status" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_currency_icon.xml b/app/src/main/res/layout/view_currency_icon.xml
new file mode 100644
index 0000000000..6859d75600
--- /dev/null
+++ b/app/src/main/res/layout/view_currency_icon.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge 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:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:background="@null"
+    android:elevation="0dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    tools:parentTag="androidx.cardview.widget.CardView">
+
+    <androidx.constraintlayout.utils.widget.ImageFilterView
+        android:id="@+id/iv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter"
+        tools:src="@drawable/ic_eth" />
+
+</merge>
diff --git a/app/src/main/res/values-de/strings_final.xml b/app/src/main/res/values-de/strings_final.xml
index 4eae54e057..e859d46e47 100644
--- a/app/src/main/res/values-de/strings_final.xml
+++ b/app/src/main/res/values-de/strings_final.xml
@@ -59,5 +59,6 @@
     <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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings_final.xml b/app/src/main/res/values-fr/strings_final.xml
index 158ab46c65..c4e1f946db 100644
--- a/app/src/main/res/values-fr/strings_final.xml
+++ b/app/src/main/res/values-fr/strings_final.xml
@@ -59,5 +59,6 @@
     <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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings_final.xml b/app/src/main/res/values-it/strings_final.xml
index 158ab46c65..bb1cf7be30 100644
--- a/app/src/main/res/values-it/strings_final.xml
+++ b/app/src/main/res/values-it/strings_final.xml
@@ -59,5 +59,7 @@
     <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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml
index d2028c922e..d4ddb9ad8c 100644
--- a/app/src/main/res/values-ru/strings_final.xml
+++ b/app/src/main/res/values-ru/strings_final.xml
@@ -61,9 +61,12 @@
     <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="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>
diff --git a/app/src/main/res/values/strings_final.xml b/app/src/main/res/values/strings_final.xml
index adbf1e7604..4c7ec8e0bd 100644
--- a/app/src/main/res/values/strings_final.xml
+++ b/app/src/main/res/values/strings_final.xml
@@ -64,6 +64,8 @@
     <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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f36d1cd4bf..09cdff0b35 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,10 +5,6 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorSecondary">@color/colorSecondary</item>
         <item name="android:textColor">@color/darkGray6</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowContentOverlay">@null</item>
         <item name="actionMenuTextColor">@color/menu_accent_color</item>
 
         <item name="materialCardViewStyle">@style/Widget.AppTheme.CardView</item>
diff --git a/dependencies.gradle b/dependencies.gradle
index 45200c5dcf..b4a597ff72 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,12 +1,12 @@
 ext.versions = [
         kotlin               : '1.6.10',
         build_gradle         : '7.1.3',
-        tamgem_card_sdk      : 'develop-154',
-        tamgem_blockchain_sdk: 'develop-93',
+        tamgem_card_sdk      : 'develop-156',
+        tamgem_blockchain_sdk: 'develop-96',
 ]
 
 ext.environmentConfig = [
         environment      : "ENVIRONMENT",
         testActionEnabled: "TEST_ACTION_ENABLED",
         logEnabled       : "LOG_ENABLED",
-]
\ No newline at end of file
+]
diff --git a/domain/build.gradle b/domain/build.gradle
index d7a8832fd4..f4b0183cc8 100644
--- a/domain/build.gradle
+++ b/domain/build.gradle
@@ -85,4 +85,4 @@ dependencies {
     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
+}