diff --git a/app/src/main/java/com/tangem/ui/activity/ConfirmTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/ConfirmTransactionActivity.kt
index e96bc9bd30..ed4d1d7a5f 100644
--- a/app/src/main/java/com/tangem/ui/activity/ConfirmTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/ConfirmTransactionActivity.kt
@@ -29,6 +29,8 @@ import kotlinx.android.synthetic.main.activity_confirm_transaction.*
 import org.greenrobot.eventbus.EventBus
 import java.io.IOException
 import java.util.*
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 
 class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
 
@@ -200,9 +202,9 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == Constant.REQUEST_CODE_SIGN_TRANSACTION) {
             if (data != null && data.extras != null) {
-                if (data.extras!!.containsKey("UID") && data.extras!!.containsKey("Card")) {
-                    val updatedCard = TangemCard(data.getStringExtra("UID"))
-                    updatedCard.loadFromBundle(data.getBundleExtra("Card"))
+                if (data.extras!!.containsKey(EXTRA_TANGEM_CARD_UID) && data.extras!!.containsKey(EXTRA_TANGEM_CARD)) {
+                    val updatedCard = TangemCard(data.getStringExtra(EXTRA_TANGEM_CARD_UID))
+                    updatedCard.loadFromBundle(data.getBundleExtra(EXTRA_TANGEM_CARD))
                     ctx.card = updatedCard
                 }
             }
@@ -288,7 +290,7 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
         EventBus.getDefault().post(transactionFinishWithError)
 
         val intent = Intent()
-        intent.putExtra("message", message)
+        intent.putExtra(Constant.EXTRA_MESSAGE, message)
         setResult(errorCode, intent)
         finish()
     }
diff --git a/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt
index 21bc397938..67ce65f0d5 100644
--- a/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt
@@ -29,13 +29,15 @@ import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_create_new_wallet.*
 import kotlinx.android.synthetic.main.layout_progress_horizontal.*
 import kotlinx.android.synthetic.main.layout_touch_card.*
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 
 class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
     companion object {
         fun callingIntent(context: Context, ctx: TangemContext): Intent {
             val intent = Intent(context, CreateNewWalletActivity::class.java)
-            intent.putExtra("UID", ctx.card!!.uid)
-            intent.putExtra("Card", ctx.card!!.asBundle)
+            intent.putExtra(EXTRA_TANGEM_CARD_UID, ctx.card!!.uid)
+            intent.putExtra(EXTRA_TANGEM_CARD, ctx.card!!.asBundle)
             return intent
         }
     }
@@ -113,31 +115,31 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
             if (cardProtocol.error == null) {
                 rlProgressBar.post { rlProgressBar.visibility = View.GONE }
 
-                progressBar!!.post {
-                    progressBar!!.progress = 100
-                    progressBar!!.progressTintList = ColorStateList.valueOf(Color.GREEN)
+                progressBar?.post {
+                    progressBar?.progress = 100
+                    progressBar?.progressTintList = ColorStateList.valueOf(Color.GREEN)
                     val intent = Intent()
-                    intent.putExtra("UID", cardProtocol.card.uid)
-                    intent.putExtra("Card", cardProtocol.card.asBundle)
+                    intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                    intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                     setResult(Activity.RESULT_OK, intent)
                     finish()
                 }
             } else {
                 lastReadSuccess = false
                 if (cardProtocol.error is CardProtocol.TangemException_InvalidPIN) {
-                    progressBar!!.post {
-                        progressBar!!.progress = 100
-                        progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED)
+                    progressBar?.post {
+                        progressBar?.progress = 100
+                        progressBar?.progressTintList = ColorStateList.valueOf(Color.RED)
                     }
-                    progressBar!!.postDelayed({
+                    progressBar?.postDelayed({
                         try {
-                            progressBar!!.progress = 0
-                            progressBar!!.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
-                            progressBar!!.visibility = View.INVISIBLE
+                            progressBar?.progress = 0
+                            progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
+                            progressBar?.visibility = View.INVISIBLE
                             val intent = Intent()
-                            intent.putExtra("message", "Cannot create wallet. Make sure you enter correct PIN2!")
-                            intent.putExtra("UID", cardProtocol.card.uid)
-                            intent.putExtra("Card", cardProtocol.card!!.asBundle)
+                            intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.cannot_create_wallet))
+                            intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                            intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card!!.asBundle)
                             setResult(Constant.RESULT_INVALID_PIN, intent)
                             finish()
                         } catch (e: Exception) {
diff --git a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt
index 0bf7193030..9852984e20 100644
--- a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt
@@ -35,6 +35,8 @@ import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_empty_wallet.*
 import kotlinx.android.synthetic.main.layout_tangem_card.*
 import javax.inject.Inject
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 
 class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
     companion object {
@@ -88,8 +90,8 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
             requestPIN2Count = 0
             val intent = Intent(baseContext, PinRequestActivity::class.java)
             intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
-            intent.putExtra("UID", ctx.card!!.uid)
-            intent.putExtra("Card", ctx.card!!.asBundle)
+            intent.putExtra(EXTRA_TANGEM_CARD_UID, ctx.card!!.uid)
+            intent.putExtra(EXTRA_TANGEM_CARD, ctx.card!!.asBundle)
             startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2)
         }
 
@@ -111,17 +113,17 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
                 }
                 finish()
             } else {
-                if (data != null && data.extras!!.containsKey("UID") && data.extras!!.containsKey("Card")) {
-                    val updatedCard = TangemCard(data.getStringExtra("UID"))
-                    updatedCard.loadFromBundle(data.getBundleExtra("Card"))
+                if (data != null && data.extras!!.containsKey(EXTRA_TANGEM_CARD_UID) && data.extras!!.containsKey(EXTRA_TANGEM_CARD)) {
+                    val updatedCard = TangemCard(data.getStringExtra(EXTRA_TANGEM_CARD_UID))
+                    updatedCard.loadFromBundle(data.getBundleExtra(EXTRA_TANGEM_CARD))
                     ctx.card = updatedCard
                 }
                 if (resultCode == Constant.RESULT_INVALID_PIN && requestPIN2Count < 2) {
                     requestPIN2Count++
                     val intent = Intent(baseContext, PinRequestActivity::class.java)
                     intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
-                    intent.putExtra("UID", ctx.card!!.uid)
-                    intent.putExtra("Card", ctx.card!!.asBundle)
+                    intent.putExtra(EXTRA_TANGEM_CARD_UID, ctx.card!!.uid)
+                    intent.putExtra(EXTRA_TANGEM_CARD, ctx.card!!.asBundle)
                     startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2)
                     return
                 }
diff --git a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
index 7e379c1a50..ee2c2663dd 100644
--- a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
@@ -10,26 +10,17 @@ import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
 import android.os.Bundle
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.PopupMenu
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.PopupMenu
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import com.scottyab.rootbeer.RootBeer
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.data.Logger
-import com.tangem.data.network.ServerApiCommon
-import com.tangem.di.Navigator
-import com.tangem.domain.wallet.CoinEngineFactory
-import com.tangem.domain.wallet.TangemContext
-import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
-import com.tangem.ui.dialog.RootFoundDialog
-import com.tangem.ui.dialog.WaitSecurityDelayDialog
 import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
 import com.tangem.card_android.android.nfc.NfcLifecycleObserver
 import com.tangem.card_android.android.reader.NfcManager
@@ -39,6 +30,14 @@ import com.tangem.card_android.data.saveToBundle
 import com.tangem.card_common.data.TangemCard
 import com.tangem.card_common.reader.CardProtocol
 import com.tangem.card_common.tasks.ReadCardInfoTask
+import com.tangem.data.Logger
+import com.tangem.data.network.ServerApiCommon
+import com.tangem.di.Navigator
+import com.tangem.domain.wallet.CoinEngineFactory
+import com.tangem.domain.wallet.TangemContext
+import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
+import com.tangem.ui.dialog.RootFoundDialog
+import com.tangem.ui.dialog.WaitSecurityDelayDialog
 import com.tangem.util.CommonUtil
 import com.tangem.util.LOG
 import com.tangem.util.PhoneUtility
@@ -49,6 +48,8 @@ import kotlinx.android.synthetic.main.layout_touch_card.*
 import java.io.File
 import java.util.*
 import javax.inject.Inject
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 
 class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, PopupMenu.OnMenuItemClickListener {
 
@@ -142,7 +143,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
     private fun verifyPermissions() {
         NfcManager.verifyPermissions(this)
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
-            Log.e("QRScanActivity", "User hasn't granted permission to use camera")
             ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), Constant.REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS)
         }
     }
@@ -275,14 +275,14 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
 
                     // TODO - ??? remove save and load???
                     val cardInfo = Bundle()
-                    cardInfo.putString("UID", cardProtocol.card.uid)
+                    cardInfo.putString(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
                     val bCard = Bundle()
                     cardProtocol.card.saveToBundle(bCard)
-                    cardInfo.putBundle("Card", bCard)
+                    cardInfo.putBundle(EXTRA_TANGEM_CARD, bCard)
 
                     val uid = cardInfo.getString("UID")
                     val card = TangemCard(uid)
-                    cardInfo.getBundle("Card")?.let { card.loadFromBundle(it) }
+                    cardInfo.getBundle(EXTRA_TANGEM_CARD)?.let { card.loadFromBundle(it) }
 
                     val ctx = TangemContext(card)
                     when {
diff --git a/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt
index 119afdb024..780e648132 100644
--- a/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt
@@ -28,6 +28,8 @@ import com.tangem.card_common.util.Util
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_pin_swap.*
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 
 class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
     companion object {
@@ -121,8 +123,8 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
                     progressBar!!.progress = 100
                     progressBar!!.progressTintList = ColorStateList.valueOf(Color.GREEN)
                     val intent = Intent()
-                    intent.putExtra("UID", cardProtocol.card.uid)
-                    intent.putExtra("Card", cardProtocol.card.asBundle)
+                    intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                    intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                     setResult(Activity.RESULT_OK, intent)
                     finish()
                 }
@@ -138,8 +140,8 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
                             progressBar!!.visibility = View.INVISIBLE
                             val intent = Intent()
                             intent.putExtra("message", "Cannot change PIN(s). Make sure you enter correct PIN2!")
-                            intent.putExtra("UID", cardProtocol.card.uid)
-                            intent.putExtra("Card", cardProtocol.card.asBundle)
+                            intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                            intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                             setResult(RESULT_INVALID_PIN, intent)
                             finish()
                         } catch (e: Exception) {
@@ -160,11 +162,11 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
                 }
             }
 
-            progressBar!!.postDelayed({
+            progressBar?.postDelayed({
                 try {
-                    progressBar!!.progress = 0
-                    progressBar!!.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
-                    progressBar!!.visibility = View.INVISIBLE
+                    progressBar?.progress = 0
+                    progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
+                    progressBar?.visibility = View.INVISIBLE
                 } catch (e: Exception) {
                     e.printStackTrace()
                 }
diff --git a/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt
index de237ebf2b..a10181720d 100644
--- a/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt
@@ -33,6 +33,8 @@ import kotlinx.android.synthetic.main.activity_purge.*
 import kotlinx.android.synthetic.main.layout_touch_card.*
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 
 class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
     companion object {
@@ -155,8 +157,8 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
                     progressBar?.progressTintList = ColorStateList.valueOf(Color.GREEN)
 
                     val intent = Intent()
-                    intent.putExtra("UID", cardProtocol.card.uid)
-                    intent.putExtra("Card", cardProtocol.card.asBundle)
+                    intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                    intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                     setResult(Activity.RESULT_OK, intent)
 
                     EventBus.getDefault().post(DeletingWalletFinish())
@@ -176,8 +178,8 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
                             progressBar?.visibility = View.INVISIBLE
 
                             val intent = Intent()
-                            intent.putExtra("UID", cardProtocol.card.uid)
-                            intent.putExtra("Card", cardProtocol.card.asBundle)
+                            intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                            intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                             intent.putExtra("message", getString(R.string.cannot_erase_wallet))
                             setResult(RESULT_INVALID_PIN, intent)
                             finish()
@@ -186,15 +188,15 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
                         }
                     }, 500)
                 } else {
-                    progressBar!!.post {
+                    progressBar?.post {
                         if (cardProtocol.error is CardProtocol.TangemException_ExtendedLengthNotSupported) {
                             if (!NoExtendedLengthSupportDialog.allReadyShowed)
                                 NoExtendedLengthSupportDialog().show(supportFragmentManager, NoExtendedLengthSupportDialog.TAG)
                         } else
                             Toast.makeText(baseContext, R.string.try_to_scan_again, Toast.LENGTH_LONG).show()
 
-                        progressBar!!.progress = 100
-                        progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED)
+                        progressBar?.progress = 100
+                        progressBar?.progressTintList = ColorStateList.valueOf(Color.RED)
                     }
                 }
             }
diff --git a/app/src/main/java/com/tangem/ui/activity/SignTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/SignTransactionActivity.kt
index 56c58299c1..f8530c86cb 100644
--- a/app/src/main/java/com/tangem/ui/activity/SignTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/SignTransactionActivity.kt
@@ -15,24 +15,26 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.tangem.App
 import com.tangem.Constant
+import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
+import com.tangem.card_android.android.nfc.NfcLifecycleObserver
+import com.tangem.card_android.android.reader.NfcManager
+import com.tangem.card_android.android.reader.NfcReader
+import com.tangem.card_common.reader.CardProtocol
+import com.tangem.card_common.tasks.SignTask
+import com.tangem.card_common.util.Util
 import com.tangem.domain.wallet.CoinEngine
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
-import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.card_android.android.nfc.NfcLifecycleObserver
-import com.tangem.card_android.android.reader.NfcManager
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.asBundle
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.SignTask
-import com.tangem.card_common.util.Util
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_sign_transaction.*
 import kotlinx.android.synthetic.main.layout_progress_horizontal.*
 import kotlinx.android.synthetic.main.layout_touch_card.*
+import com.tangem.card_android.data.asBundle
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 
 class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
 
@@ -118,15 +120,14 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
             val uid = tag.id
             val sUID = Util.byteArrayToHexString(uid)
 
-            if (sUID == ctx.card!!.uid) {
-                if (lastReadSuccess) {
-                    isoDep.timeout = ctx.card!!.pauseBeforePIN2 + 5000
-                } else {
-                    isoDep.timeout = ctx.card!!.pauseBeforePIN2 + 65000
-                }
+            if (sUID == ctx.card.uid) {
+                if (lastReadSuccess)
+                    isoDep.timeout = ctx.card.pauseBeforePIN2 + 5000
+                else
+                    isoDep.timeout = ctx.card.pauseBeforePIN2 + 65000
 
                 val coinEngine = CoinEngineFactory.create(ctx)
-                        ?: throw CardProtocol.TangemException("Can't create CoinEngine!")
+                        ?: throw CardProtocol.TangemException(getString(R.string.ex_cant_create_coinEngine))
                 coinEngine.setOnNeedSendTransaction { tx ->
                     if (tx != null) {
                         val intent = Intent(this, SendTransactionActivity::class.java)
@@ -145,9 +146,9 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
         } catch (e: CardProtocol.TangemException_WrongAmount) {
             try {
                 val intent = Intent()
-                intent.putExtra("message", getString(R.string.cannot_sign_transaction_wrong_amount))
-                intent.putExtra("UID", ctx.card.uid)
-                intent.putExtra("Card", ctx.card.asBundle)
+                intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.cannot_sign_transaction_wrong_amount))
+                intent.putExtra(EXTRA_TANGEM_CARD_UID, ctx.card.uid)
+                intent.putExtra(EXTRA_TANGEM_CARD, ctx.card.asBundle)
                 setResult(Activity.RESULT_CANCELED, intent)
                 finish()
             } catch (e: Exception) {
@@ -196,9 +197,9 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
                             progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
                             progressBar?.visibility = View.INVISIBLE
                             val intent = Intent()
-                            intent.putExtra("message", getString(R.string.cannot_sign_transaction_make_sure_you_enter_correct_pin_2))
-                            intent.putExtra("UID", cardProtocol.card.uid)
-                            intent.putExtra("Card", cardProtocol.card.asBundle)
+                            intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.cannot_sign_transaction_make_sure_you_enter_correct_pin_2))
+                            intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                            intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                             setResult(Constant.RESULT_INVALID_PIN_, intent)
                             finish()
                         } catch (e: Exception) {
@@ -209,16 +210,16 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
                     if (cardProtocol.error is CardProtocol.TangemException_WrongAmount) {
                         try {
                             val intent = Intent()
-                            intent.putExtra("message", getString(R.string.cannot_sign_transaction_wrong_amount))
-                            intent.putExtra("UID", cardProtocol.card.uid)
-                            intent.putExtra("Card", cardProtocol.card.asBundle)
+                            intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.cannot_sign_transaction_wrong_amount))
+                            intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
+                            intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                             setResult(Activity.RESULT_CANCELED, intent)
                             finish()
                         } catch (e: Exception) {
                             e.printStackTrace()
                         }
                     }
-                    progressBar!!.post {
+                    progressBar?.post {
                         if (cardProtocol.error is CardProtocol.TangemException_ExtendedLengthNotSupported) {
                             if (!NoExtendedLengthSupportDialog.allReadyShowed) {
                                 NoExtendedLengthSupportDialog.message = getText(R.string.the_nfc_adapter_length_apdu).toString() + "\n" + getText(R.string.the_nfc_adapter_length_apdu_advice).toString()
@@ -227,8 +228,8 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
                         } else {
                             Toast.makeText(baseContext, R.string.try_to_scan_again, Toast.LENGTH_LONG).show()
                         }
-                        progressBar!!.progress = 100
-                        progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED)
+                        progressBar?.progress = 100
+                        progressBar?.progressTintList = ColorStateList.valueOf(Color.RED)
                     }
                 }
             }
@@ -242,11 +243,11 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
             }
         }, 500)
 
-        progressBar!!.postDelayed({
+        progressBar?.postDelayed({
             try {
-                progressBar!!.progress = 0
-                progressBar!!.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
-                progressBar!!.visibility = View.INVISIBLE
+                progressBar?.progress = 0
+                progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
+                progressBar?.visibility = View.INVISIBLE
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -256,11 +257,11 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
     override fun onReadCancel() {
         signTransactionTask = null
 
-        progressBar!!.postDelayed({
+        progressBar?.postDelayed({
             try {
-                progressBar!!.progress = 0
-                progressBar!!.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
-                progressBar!!.visibility = View.INVISIBLE
+                progressBar?.progress = 0
+                progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
+                progressBar?.visibility = View.INVISIBLE
             } catch (e: Exception) {
                 e.printStackTrace()
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b424f87e0d..ca3a05c013 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,6 +135,7 @@
     <string name="to_change_pin_codes">to change PIN/PIN2 codes</string>
     <string name="by_tapping_the_card">By tapping the card, you will permanently remove the blockchain wallet. Ensure there will be no further incoming transactions</string>
     <string name="cannot_erase_wallet">Cannot erase wallet. Make sure you enter correct PIN2!</string>
+    <string name="cannot_create_wallet">Cannot create wallet. Make sure you enter correct PIN2!</string>
 
     <!-- PrepareTransactionActivity -->
     <string name="enter_wallet_address">enter wallet address</string>
diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml
index e49e137b5e..78b9c55461 100644
--- a/app/src/main/res/values/strings_untranslatable.xml
+++ b/app/src/main/res/values/strings_untranslatable.xml
@@ -20,4 +20,6 @@
     <string name="_9">9</string>
     <string name="_0">0</string>
 
+    <string name="ex_cant_create_coinEngine">Can\'t create CoinEngine!</string>
+
 </resources>