diff --git a/app/build.gradle b/app/build.gradle
index 5e41bbe87f..febc5293ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     implementation 'com.google.android.play:core-ktx:1.8.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation 'com.tangem:blockchain:develop-17'
+    implementation 'com.tangem:blockchain:develop-22'
     implementation 'com.tangem:core:develop-36'
     implementation 'com.tangem:sdk:develop-36'
 
@@ -117,10 +117,6 @@ dependencies {
     implementation 'com.squareup.moshi:moshi:1.9.2'
     implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
-//
-//    //Crypto
-    implementation "com.madgag.spongycastle:core:1.58.0.0"
-
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation "com.google.truth:truth:1.0.1"
diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt
index 491f1c9cfb..166ae2183f 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -5,6 +5,7 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.ktx.remoteConfig
 import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
 import com.tangem.Log
+import com.tangem.blockchain.network.BlockchainSdkRetrofitBuilder
 import com.tangem.tap.common.images.PicassoHelper
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.appReducer
@@ -58,6 +59,8 @@ class TapApplication : Application() {
 
         initFeedbackManager()
         loadConfigs()
+
+        BlockchainSdkRetrofitBuilder.enableNetworkLogging = BuildConfig.DEBUG
     }
 
     private fun loadConfigs() {
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 dc12172a82..0ca68b4ea3 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
@@ -19,5 +19,6 @@ fun Blockchain.getIconRes(): Int {
         Blockchain.Tezos -> R.drawable.ic_tezos
         Blockchain.XRP -> R.drawable.ic_xrp
         Blockchain.Stellar -> R.drawable.ic_stellar
+        else -> R.drawable.shape_circle
     }
 }
\ 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 17cac3c3e6..3fb9fb0d67 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
@@ -35,6 +35,7 @@ fun Blockchain.getSupportedCurves(): List<EllipticCurve>? {
         Blockchain.Tezos -> listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519)
         Blockchain.Cardano, Blockchain.CardanoShelley, Blockchain.Stellar ->
             listOf(EllipticCurve.Ed25519)
+        else -> listOf(EllipticCurve.Secp256k1)
     }
 }
 
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 6c0328c7ce..62e9849d04 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
@@ -18,9 +18,6 @@ import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.item_currency_wallet.view.*
-import kotlinx.android.synthetic.main.item_currency_wallet.view.iv_currency
-import kotlinx.android.synthetic.main.item_currency_wallet.view.tv_currency_symbol
-import kotlinx.android.synthetic.main.item_currency_wallet.view.tv_token_letter
 import java.math.BigDecimal
 
 class WalletAdapter
@@ -57,7 +54,7 @@ class WalletAdapter
 
         val sorted = listModified.sortedWith(
                 compareByDescending<WalletData> { it.currencyData.fiatAmount ?: BigDecimal.ZERO }
-                        .thenBy { it.currencyData.currencySymbol }
+                    .thenBy { it.currencyData.currency }
         )
         val sortedList = listOfNotNull(primaryBlockchainWallet, primaryTokenWallet) + sorted
         super.submitList(sortedList)
diff --git a/build.gradle b/build.gradle
index 576034574e..f2dcf4b2fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,28 +19,10 @@ buildscript {
 allprojects {
     repositories {
         google()
+        jcenter()
+        mavenLocal()
+        maven { url "https://nexus.tangem-tech.com/repository/maven-releases/" }
         maven { url 'https://jitpack.io' }
-        def nexusUser = "viewer"
-        def nexusPass = "smartcash124"
-        repositories {
-            google()
-            jcenter()
-            maven {
-                credentials {
-                    username = nexusUser
-                    password = nexusPass
-                }
-                url "https://nexus.tangem-tech.com/repository/maven-releases/"
-            }
-            maven {
-                credentials {
-                    username = nexusUser
-                    password = nexusPass
-                }
-                url "https://nexus.tangem-tech.com/repository/maven-snapshots/"
-            }
-            maven { url 'https://jitpack.io' }
-        }
     }
 }