diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
index c49bbbc8ba..25218e0f0f 100644
--- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
@@ -8,6 +8,7 @@ import android.graphics.Color
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
+import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import android.text.Html
@@ -69,7 +70,10 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         tvIssuer.text = ctx.card!!.issuerDescription
 
         if (ctx.card!!.tokenSymbol.length > 1) {
-            val html = Html.fromHtml(ctx.blockchainName)
+            @Suppress("DEPRECATION") val html = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                Html.fromHtml(ctx.blockchainName, Html.FROM_HTML_MODE_LEGACY)
+            else
+                Html.fromHtml(ctx.blockchainName)
             tvBlockchain.text = html
         } else
             tvBlockchain.text = ctx.blockchainName
diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
index 96770dc505..4c4062f6a7 100644
--- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
@@ -126,7 +126,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
 
         // set phone name
         if (antenna.fullName != "")
-            tvNFCHint.text = String.format(getString(R.string.scan_banknote), antenna!!.fullName)
+            tvNFCHint.text = String.format(getString(R.string.scan_banknote), antenna.fullName)
         else
             tvNFCHint.text = String.format(getString(R.string.scan_banknote), getString(R.string.phone))
 
@@ -309,7 +309,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
 
                     val uid = cardInfo.getString("UID")
                     val card = TangemCard(uid)
-                    card.loadFromBundle(cardInfo.getBundle("Card"))
+                    cardInfo.getBundle("Card")?.let { card.loadFromBundle(it) }
 
                     val ctx = TangemContext(card)
                     when {
@@ -317,8 +317,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
                             val engineCoin = CoinEngineFactory.create(ctx)
                                     ?: throw CardProtocol.TangemException("Can't create CoinEngine!")
                             engineCoin.defineWallet()
-                            //mCard.setWallet(Blockchain.calculateWalletAddress(mCard, pkUncompressed));
-
                             navigator.showLoadedWallet(this, it, ctx)
                         }
                         card.status == TangemCard.Status.Empty -> navigator.showEmptyWallet(this, ctx)
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index 4474b04951..78c51540e0 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -1,5 +1,6 @@
 package com.tangem.presentation.fragment
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.AlertDialog
 import android.content.*
@@ -9,6 +10,7 @@ import android.content.res.ColorStateList
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
+import android.os.Build
 import android.os.Bundle
 import androidx.core.content.ContextCompat
 import android.text.Html
@@ -562,7 +564,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                     5000)
         }
 
-        if (srl!!.isRefreshing) {
+        if (srl.isRefreshing) {
             tvBalanceLine1.setTextColor(resources.getColor(R.color.primary))
             tvBalanceLine1.text = getString(R.string.verifying_in_blockchain)
             tvBalanceLine2.text = ""
@@ -580,21 +582,32 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
         val engine = CoinEngineFactory.create(ctx)
         when {
             engine!!.hasBalanceInfo() -> {
-                val html = Html.fromHtml(engine.balanceHTML)
+                @Suppress("DEPRECATION") val html = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                    Html.fromHtml(engine.balanceHTML, Html.FROM_HTML_MODE_LEGACY)
+                else
+                    Html.fromHtml(engine.balanceHTML)
                 tvBalance.text = html
                 tvBalanceEquivalent.text = engine.balanceEquivalent
             }
-            ctx.card!!.offlineBalance != null -> {
-                val html = Html.fromHtml(engine.offlineBalanceHTML)
+
+            ctx.card?.offlineBalance != null -> {
+                @Suppress("DEPRECATION") val html = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                    Html.fromHtml(engine.offlineBalanceHTML, Html.FROM_HTML_MODE_LEGACY)
+                else
+                    Html.fromHtml(engine.offlineBalanceHTML)
                 tvBalance.text = html
             }
+
             else -> tvBalance.text = getString(R.string.no_data_string)
         }
 
         tvWallet.text = ctx.coinData!!.wallet
 
         if (ctx.card!!.tokenSymbol.length > 1) {
-            val html = Html.fromHtml(ctx.blockchainName)
+            @Suppress("DEPRECATION") val html = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                Html.fromHtml(ctx.blockchainName, Html.FROM_HTML_MODE_LEGACY)
+            else
+                Html.fromHtml(ctx.blockchainName)
             tvBlockchain.text = html
         } else
             tvBlockchain.text = ctx.blockchainName
@@ -607,7 +620,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
             btnExtract.backgroundTintList = inactiveColor
         }
 
-        //TODO why ???
+//        //TODO why ???
 //        ctx.error = null
 //        ctx.message = null
     }