diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8e44652cdd..cd2f3a654d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
   </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
     <option name="myNullables">
       <value>
         <list size="10">
diff --git a/app/src/main/java/com/tangem/Constant.kt b/app/src/main/java/com/tangem/Constant.kt
index 19a2d09a1c..6283ce6435 100644
--- a/app/src/main/java/com/tangem/Constant.kt
+++ b/app/src/main/java/com/tangem/Constant.kt
@@ -8,12 +8,18 @@ object Constant {
 
     const val EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"
 
+    const val WALLET_ADDRESS = "Wallet address"
+
     const val EXTRA_MESSAGE = "message"
 
     const val EXTRA_MODIFICATION = "modification"
     const val EXTRA_MODIFICATION_DELETE = "delete"
     const val EXTRA_MODIFICATION_UPDATE = "update"
 
+    const val EXTRA_MODE = "mode"
+
+    const val INTENT_TYPE_TEXT_PLAIN = "text/plain"
+
     // LoadedWallet, VerifyCard
     const val REQUEST_CODE_SEND_TRANSACTION = 1
     const val REQUEST_CODE_PURGE = 2
@@ -39,7 +45,7 @@ object Constant {
     const val MILLIS_AUTO_HIDE = 1000
 
     // PinRequestActivity
-    const val EXTRA_MODE = "mode"
+
     const val KEY_ALIAS = "pinKey"
     const val KEYSTORE = "AndroidKeyStore"
 
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 c8190e6477..c09d220e7b 100644
--- a/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt
@@ -33,6 +33,7 @@ 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)
@@ -69,26 +70,21 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
     }
 
     override fun onTagDiscovered(tag: Tag) {
-        try {
-            // get IsoDep handle and run cardReader thread
-            val isoDep = IsoDep.get(tag)
-            val uid = tag.id
-            val sUID = Util.byteArrayToHexString(uid)
+        // get IsoDep handle and run cardReader thread
+        val isoDep = IsoDep.get(tag)
+        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
 
-                createNewWalletTask = CreateNewWalletTask(ctx.card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this)
-                createNewWalletTask?.start()
-            } else {
-                nfcManager.ignoreTag(isoDep.tag)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
+            createNewWalletTask = CreateNewWalletTask(ctx.card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this)
+            createNewWalletTask?.start()
+        } else
+            nfcManager.ignoreTag(isoDep.tag)
     }
 
     public override fun onPause() {
@@ -143,37 +139,27 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
                         }
                     }, 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_SHORT).show()
-                        }
-                        progressBar!!.progress = 100
-                        progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED)
+                        } else
+                            Toast.makeText(this, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show()
+
+                        progressBar?.progress = 100
+                        progressBar?.progressTintList = ColorStateList.valueOf(Color.RED)
                     }
                 }
             }
         }
 
-        rlProgressBar.postDelayed({
-            try {
-                rlProgressBar.visibility = View.GONE
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }, 500)
+        rlProgressBar.postDelayed({ rlProgressBar?.visibility = View.GONE }, 500)
 
         progressBar?.postDelayed({
-            try {
-                progressBar?.progress = 0
-                progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
-                progressBar?.visibility = View.INVISIBLE
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
+            progressBar?.progress = 0
+            progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
+            progressBar?.visibility = View.INVISIBLE
         }, 500)
     }
 
@@ -185,13 +171,9 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
         createNewWalletTask = null
 
         progressBar?.postDelayed({
-            try {
-                progressBar?.progress = 0
-                progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
-                progressBar?.visibility = View.INVISIBLE
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
+            progressBar?.progress = 0
+            progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
+            progressBar?.visibility = View.INVISIBLE
         }, 500)
     }
 
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 73c45ccee3..2113e39e67 100644
--- a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt
@@ -89,7 +89,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         btnNewWallet.setOnClickListener {
             requestPIN2Count = 0
             val intent = Intent(baseContext, PinRequestActivity::class.java)
-            intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+            intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
             intent.putExtra(EXTRA_TANGEM_CARD_UID, ctx.card!!.uid)
             intent.putExtra(EXTRA_TANGEM_CARD, ctx.card!!.asBundle)
             startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2)
@@ -107,7 +107,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         if (requestCode == Constant.REQUEST_CODE_CREATE_NEW_WALLET_ACTIVITY) {
             if (resultCode == Activity.RESULT_OK) {
                 if (data != null) {
-                    data.putExtra("modification", "updateAndViewCard")
+                    data.putExtra(Constant.EXTRA_MODIFICATION, "updateAndViewCard")
                     data.putExtra("updateDelay", 0)
                     setResult(Activity.RESULT_OK, data)
                 }
@@ -121,7 +121,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
                 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(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
                     intent.putExtra(EXTRA_TANGEM_CARD_UID, ctx.card!!.uid)
                     intent.putExtra(EXTRA_TANGEM_CARD, ctx.card!!.asBundle)
                     startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2)
diff --git a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt
index 70d69899d6..f0e8188008 100644
--- a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt
@@ -218,15 +218,15 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge
         if (mode == Mode.RequestNewPIN || mode == Mode.ConfirmNewPIN) {
             val resultData = Intent()
             val pin = PINStorage.loadEncryptedPIN(cipher)
-            resultData.putExtra("newPIN", pin)
-            resultData.putExtra("confirmPIN", pin)
+            resultData.putExtra(Constant.EXTRA_NEW_PIN, pin)
+            resultData.putExtra(Constant.EXTRA_CONFIRM_PIN, pin)
             setResult(Activity.RESULT_OK, resultData)
             finish()
         } else if (mode == Mode.RequestNewPIN2 || mode == Mode.ConfirmNewPIN2) {
             val resultData = Intent()
             val pin = PINStorage.loadEncryptedPIN2(cipher)
-            resultData.putExtra("newPIN2", pin)
-            resultData.putExtra("confirmPIN2", pin)
+            resultData.putExtra(Constant.EXTRA_NEW_PIN_2, pin)
+            resultData.putExtra(Constant.EXTRA_CONFIRM_PIN_2, pin)
             setResult(Activity.RESULT_OK, resultData)
             finish()
         } else if (mode == Mode.RequestPIN) {
@@ -297,13 +297,13 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge
         var focusView: View? = null
 
         if (mode == Mode.ConfirmNewPIN) {
-            if (pin != intent.getStringExtra("newPIN")) {
+            if (pin != intent.getStringExtra(Constant.EXTRA_NEW_PIN)) {
                 tvPin!!.error = getString(R.string.error_pin_confirmation_failed)
                 focusView = tvPin
                 cancel = true
             }
         } else if (mode == Mode.ConfirmNewPIN2) {
-            if (pin != intent.getStringExtra("newPIN2")) {
+            if (pin != intent.getStringExtra(Constant.EXTRA_NEW_PIN_2)) {
                 tvPin!!.error = getString(R.string.error_pin_confirmation_failed)
                 focusView = tvPin
                 cancel = true
@@ -321,17 +321,17 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge
         else {
             if (mode == Mode.RequestNewPIN || mode == Mode.ConfirmNewPIN) {
                 val resultData = Intent()
-                resultData.putExtra("newPIN", pin)
+                resultData.putExtra(Constant.EXTRA_NEW_PIN, pin)
                 if (mode == Mode.ConfirmNewPIN)
-                    resultData.putExtra("confirmPIN", pin)
+                    resultData.putExtra(Constant.EXTRA_CONFIRM_PIN, pin)
 
                 setResult(Activity.RESULT_OK, resultData)
                 finish()
             } else if (mode == Mode.RequestNewPIN2 || mode == Mode.ConfirmNewPIN2) {
                 val resultData = Intent()
-                resultData.putExtra("newPIN2", pin)
+                resultData.putExtra(Constant.EXTRA_NEW_PIN_2, pin)
                 if (mode == Mode.ConfirmNewPIN2)
-                    resultData.putExtra("confirmPIN2", pin)
+                    resultData.putExtra(Constant.EXTRA_CONFIRM_PIN_2, pin)
 
                 setResult(Activity.RESULT_OK, resultData)
                 finish()
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 d7f5e2b4c3..813d237ea9 100644
--- a/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt
@@ -136,7 +136,7 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
                             progressBar!!.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
                             progressBar!!.visibility = View.INVISIBLE
                             val intent = Intent()
-                            intent.putExtra("message", "Cannot change PIN(s). Make sure you enter correct PIN2!")
+                            intent.putExtra(Constant.EXTRA_MESSAGE, "Cannot change PIN(s). Make sure you enter correct PIN2!")
                             intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
                             intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
                             setResult(RESULT_INVALID_PIN, intent)
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 58e3bc942e..ce33a17eb4 100644
--- a/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt
@@ -14,6 +14,7 @@ import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.tangem.App
+import com.tangem.Constant
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
@@ -175,7 +176,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
                             val intent = Intent()
                             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))
+                            intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.cannot_erase_wallet))
                             setResult(RESULT_INVALID_PIN, intent)
                             finish()
                         } catch (e: Exception) {
diff --git a/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java b/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java
index 50b24b101e..a977511814 100644
--- a/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java
+++ b/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java
@@ -8,13 +8,13 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
+import com.tangem.Constant;
 import com.tangem.wallet.R;
 
 public class PINSwapWarningDialog extends DialogFragment {
     public static final String TAG = PINSwapWarningDialog.class.getSimpleName();
 
-    public static final String EXTRA_MESSAGE = "message";
-    private String message;
+    private String message = "";
     private OnPositiveButton mOnPositiveButton;
 
     public interface OnPositiveButton {
@@ -28,7 +28,9 @@ public class PINSwapWarningDialog extends DialogFragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        message = getArguments().getString(EXTRA_MESSAGE);
+        if (getArguments() != null) {
+            message = getArguments().getString(Constant.EXTRA_MESSAGE);
+        }
     }
 
     @NonNull
@@ -45,7 +47,7 @@ public class PINSwapWarningDialog extends DialogFragment {
     }
 
     @Override
-    public void onCancel(DialogInterface dialog) {
+    public void onCancel(@NonNull DialogInterface dialog) {
         super.onCancel(dialog);
     }
 
diff --git a/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java b/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java
index 49646c489f..119c2a6e49 100644
--- a/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java
+++ b/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java
@@ -21,6 +21,8 @@ import androidx.fragment.app.DialogFragment;
  * Created by dvol on 06.03.2018.
  */
 public class ShowQRCodeDialog extends DialogFragment {
+    public static final String TAG = ShowQRCodeDialog.class.getSimpleName();
+
     private ImageView ivQR;
     private TextView tvQRaddress;
     private Bitmap bmQR;
@@ -71,7 +73,7 @@ public class ShowQRCodeDialog extends DialogFragment {
         activity.runOnUiThread(() -> {
                     ShowQRCodeDialog instance = new ShowQRCodeDialog();
                     instance.setup(content);
-                    instance.show(activity.getSupportFragmentManager(), "ShowQRCodeDialog");
+                    instance.show(activity.getSupportFragmentManager(), TAG);
                 });
     }
 
diff --git a/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt
index 1e27ef605a..7695c2027f 100644
--- a/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt
@@ -360,9 +360,9 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                 pinSwapWarningDialog.setOnRefreshPage { (activity as LoadedWalletActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) }
                 val bundle = Bundle()
                 if (!CardProtocol.isDefaultPIN(newPIN) || !CardProtocol.isDefaultPIN2(newPIN2))
-                    bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_forget))
+                    bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_forget))
                 else
-                    bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_use_default))
+                    bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_use_default))
                 pinSwapWarningDialog.arguments = bundle
                 activity?.supportFragmentManager?.let { pinSwapWarningDialog.show(it, PINSwapWarningDialog.TAG) }
             }
@@ -388,8 +388,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                     (activity as LoadedWalletActivity).navigator.showPinRequestRequestPin2(context as Activity, PinRequestActivity.Mode.RequestPIN2.toString(), ctx)
                     return
                 } else {
-                    if (data != null && data.extras!!.containsKey("message")) {
-                        ctx.error = data.getStringExtra("message")
+                    if (data != null && data.extras!!.containsKey(Constant.EXTRA_MESSAGE)) {
+                        ctx.error = data.getStringExtra(Constant.EXTRA_MESSAGE)
                     }
                 }
             }
@@ -420,8 +420,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
 
                     return
                 } else {
-                    if (data != null && data.extras!!.containsKey("message")) {
-                        ctx.error = data.getStringExtra("message")
+                    if (data != null && data.extras!!.containsKey(Constant.EXTRA_MESSAGE)) {
+                        ctx.error = data.getStringExtra(Constant.EXTRA_MESSAGE)
                     }
                 }
                 updateViews()
@@ -622,10 +622,6 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
             btnExtract.isEnabled = false
             btnExtract.backgroundTintList = inactiveColor
         }
-
-//        //TODO why ???
-//        ctx.error = null
-//        ctx.message = null
     }
 
     private fun refresh() {
@@ -766,10 +762,10 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
     private fun doShareWallet(useURI: Boolean) {
         if (useURI) {
             val engine = CoinEngineFactory.create(ctx)
-            val txtShare = engine!!.shareWalletUri.toString()
+            val txtShare = engine?.shareWalletUri.toString()
             val intent = Intent(Intent.ACTION_SEND)
-            intent.type = "text/plain"
-            intent.putExtra(Intent.EXTRA_SUBJECT, "Wallet address")
+            intent.type = Constant.INTENT_TYPE_TEXT_PLAIN
+            intent.putExtra(Intent.EXTRA_SUBJECT, Constant.WALLET_ADDRESS)
             intent.putExtra(Intent.EXTRA_TEXT, txtShare)
 
             val packageManager = activity?.packageManager
diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt
index 302c7f2347..c13af16ed7 100644
--- a/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt
@@ -6,7 +6,6 @@ import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.os.Build
 import android.os.Bundle
-import androidx.core.content.ContextCompat
 import android.text.Html
 import android.text.format.DateUtils
 import android.view.LayoutInflater
@@ -14,21 +13,24 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.data.Blockchain
-import com.tangem.domain.wallet.CoinEngineFactory
-import com.tangem.domain.wallet.TangemContext
-import com.tangem.ui.activity.*
-import com.tangem.ui.dialog.PINSwapWarningDialog
-import com.tangem.ui.event.DeletingWalletFinish
 import com.tangem.card_android.android.data.PINStorage
 import com.tangem.card_android.android.nfc.NfcLifecycleObserver
 import com.tangem.card_android.android.reader.NfcManager
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
 import com.tangem.card_android.data.loadFromBundle
 import com.tangem.card_common.data.TangemCard
 import com.tangem.card_common.reader.CardProtocol
-import com.tangem.util.LOG
+import com.tangem.data.Blockchain
+import com.tangem.domain.wallet.CoinEngineFactory
+import com.tangem.domain.wallet.TangemContext
+import com.tangem.ui.activity.PinRequestActivity
+import com.tangem.ui.activity.VerifyCardActivity
+import com.tangem.ui.dialog.PINSwapWarningDialog
+import com.tangem.ui.event.DeletingWalletFinish
 import com.tangem.wallet.BuildConfig
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.fr_verify_card.*
@@ -73,7 +75,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
 
         btnOk.setOnClickListener {
             val data = prepareResultIntent()
-            data.putExtra(Constant.EXTRA_MODIFICATION, "update")
+            data.putExtra(Constant.EXTRA_MODIFICATION, getString(R.string.update))
             activity?.finish()
         }
     }
@@ -96,20 +98,19 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        LOG.i(TAG, "requestCode $requestCode resultCode $resultCode")
         when (requestCode) {
             Constant.REQUEST_CODE_ENTER_NEW_PIN -> if (resultCode == Activity.RESULT_OK) {
                 if (data != null) {
-                    if (data.extras!!.containsKey("confirmPIN")) {
+                    if (data.extras!!.containsKey(Constant.EXTRA_CONFIRM_PIN)) {
                         val intent = Intent(context, PinRequestActivity::class.java)
-                        intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+                        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
                         ctx.saveToIntent(intent)
-                        newPIN = data.getStringExtra("newPIN")
+                        newPIN = data.getStringExtra(Constant.EXTRA_NEW_PIN)
                         startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN)
                     } else {
                         val intent = Intent(context, PinRequestActivity::class.java)
-                        intent.putExtra("newPIN", data.getStringExtra("newPIN"))
-                        intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN.toString())
+                        intent.putExtra(Constant.EXTRA_NEW_PIN, data.getStringExtra(Constant.EXTRA_NEW_PIN))
+                        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.ConfirmNewPIN.toString())
                         startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN)
                     }
                 }
@@ -117,16 +118,16 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
 
             Constant.REQUEST_CODE_ENTER_NEW_PIN2 -> if (resultCode == Activity.RESULT_OK) {
                 if (data != null) {
-                    if (data.extras!!.containsKey("confirmPIN2")) {
+                    if (data.extras!!.containsKey(Constant.EXTRA_CONFIRM_PIN_2)) {
                         val intent = Intent(context, PinRequestActivity::class.java)
-                        intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+                        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
                         ctx.saveToIntent(intent)
-                        newPIN2 = data.getStringExtra("newPIN2")
+                        newPIN2 = data.getStringExtra(Constant.EXTRA_NEW_PIN_2)
                         startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN)
                     } else {
                         val intent = Intent(context, PinRequestActivity::class.java)
-                        intent.putExtra("newPIN2", data.getStringExtra("newPIN2"))
-                        intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN2.toString())
+                        intent.putExtra(Constant.EXTRA_NEW_PIN_2, data.getStringExtra(Constant.EXTRA_NEW_PIN_2))
+                        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.ConfirmNewPIN2.toString())
                         startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN2)
                     }
                 }
@@ -141,9 +142,9 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
                 pinSwapWarningDialog.setOnRefreshPage { (activity as VerifyCardActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) }
                 val bundle = Bundle()
                 if (!CardProtocol.isDefaultPIN(newPIN) || !CardProtocol.isDefaultPIN2(newPIN2))
-                    bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_forget))
+                    bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_forget))
                 else
-                    bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_use_default))
+                    bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_use_default))
                 pinSwapWarningDialog.arguments = bundle
                 activity?.supportFragmentManager?.let { pinSwapWarningDialog.show(it, PINSwapWarningDialog.TAG) }
             }
@@ -151,27 +152,27 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
             Constant.REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) {
                 if (data == null) {
                     ctx.saveToIntent(data)
-                    data?.putExtra("modification", "delete")
+                    data?.putExtra(Constant.EXTRA_MODIFICATION, Constant.EXTRA_MODIFICATION_DELETE)
                 } else
-                    data.putExtra("modification", "update")
-                activity!!.setResult(Activity.RESULT_OK, data)
-                activity!!.finish()
+                    data.putExtra(Constant.EXTRA_MODIFICATION, Constant.EXTRA_MODIFICATION_UPDATE)
+                activity?.setResult(Activity.RESULT_OK, data)
+                activity?.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(context, PinRequestActivity::class.java)
-                    intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+                    intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
                     ctx.saveToIntent(intent)
                     startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN)
                     return
                 } else {
-                    if (data != null && data.extras!!.containsKey("message")) {
-                        ctx.error = data.getStringExtra("message")
+                    if (data != null && data.extras!!.containsKey(Constant.EXTRA_MESSAGE)) {
+                        ctx.error = data.getStringExtra(Constant.EXTRA_MESSAGE)
                     }
                 }
             }
@@ -179,21 +180,10 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
             Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE -> if (resultCode == Activity.RESULT_OK)
                 (activity as VerifyCardActivity).navigator.showPurge(context as Activity, ctx)
 
-//            Constant.REQUEST_CODE_PURGE -> if (resultCode == Activity.RESULT_OK) {
-//                if (data == null) {
-//                    ctx.saveToIntent(data)
-//                    data?.putExtra(Constant.EXTRA_MODIFICATION, "delete")
-//                } else
-//                    data.putExtra(Constant.EXTRA_MODIFICATION, "update")
-//
-//                activity?.setResult(Activity.RESULT_OK, data)
-//                activity?.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) {
@@ -204,8 +194,8 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
                     startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE)
                     return
                 } else {
-                    if (data != null && data.extras!!.containsKey("message")) {
-                        ctx.error = data.getStringExtra("message")
+                    if (data != null && data.extras!!.containsKey(Constant.EXTRA_MESSAGE)) {
+                        ctx.error = data.getStringExtra(Constant.EXTRA_MESSAGE)
                     }
                 }
                 updateViews()
@@ -403,7 +393,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
     private fun doSetPin() {
         requestPIN2Count = 0
         val intent = Intent(context, PinRequestActivity::class.java)
-        intent.putExtra("mode", PinRequestActivity.Mode.RequestNewPIN.toString())
+        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestNewPIN.toString())
         newPIN = ""
         newPIN2 = ""
         startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN)
@@ -412,7 +402,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
     private fun doResetPin() {
         requestPIN2Count = 0
         val intent = Intent(context, PinRequestActivity::class.java)
-        intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
         ctx.saveToIntent(intent)
         newPIN = PINStorage.getDefaultPIN()
         newPIN2 = ""
@@ -422,7 +412,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
     private fun doResetPin2() {
         requestPIN2Count = 0
         val intent = Intent(context, PinRequestActivity::class.java)
-        intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
         ctx.saveToIntent(intent)
         newPIN = ""
         newPIN2 = PINStorage.getDefaultPIN2()
@@ -432,7 +422,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
     private fun doResetPins() {
         requestPIN2Count = 0
         val intent = Intent(context, PinRequestActivity::class.java)
-        intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
         ctx.saveToIntent(intent)
         newPIN = PINStorage.getDefaultPIN()
         newPIN2 = PINStorage.getDefaultPIN2()
@@ -442,7 +432,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
     private fun doSetPin2() {
         requestPIN2Count = 0
         val intent = Intent(context, PinRequestActivity::class.java)
-        intent.putExtra("mode", PinRequestActivity.Mode.RequestNewPIN2.toString())
+        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestNewPIN2.toString())
         newPIN = ""
         newPIN2 = ""
         startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN2)
@@ -459,7 +449,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback {
         }
 
         val intent = Intent(context, PinRequestActivity::class.java)
-        intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString())
+        intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString())
         ctx.saveToIntent(intent)
         startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE)
     }