diff --git a/app/src/main/java/com/tangem/Constant.kt b/app/src/main/java/com/tangem/Constant.kt
new file mode 100644
index 0000000000..5fb46a7a5f
--- /dev/null
+++ b/app/src/main/java/com/tangem/Constant.kt
@@ -0,0 +1,13 @@
+package com.tangem
+
+object Constant {
+
+
+    const val EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"
+
+    const val MESSAGE = "Message"
+    const val ERROR = "Error"
+
+    const val EXTRA_MODIFICATION = "modification"
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt
index fd0ffb52e5..15eb86bb96 100644
--- a/app/src/main/java/com/tangem/di/Navigator.kt
+++ b/app/src/main/java/com/tangem/di/Navigator.kt
@@ -29,6 +29,10 @@ class Navigator {
         context.startActivityForResult(VerifyCardActivity.callingIntent(context, card, coinData, message, error), LoadedWallet.REQUEST_CODE_VERIFY_CARD)
     }
 
+    fun showPinSwap(context: Activity) {
+
+    }
+
 //    fun showPreparePayment(context: Activity) {
 //
 //    }
diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java
index c3f34a86bc..cbbcf52164 100644
--- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java
+++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java
@@ -4,9 +4,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.tangem.Constant;
+
 
 public class TangemContext {
-    public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA";
+//    public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA";
     private Context context;
     private TangemCard card;
     private CoinData coinData;
@@ -87,8 +89,8 @@ public class TangemContext {
         }
 
         if (tangemContext.getBlockchain() != null) {
-            if (bundle.containsKey(EXTRA_BLOCKCHAIN_DATA)) {
-                tangemContext.coinData = CoinData.fromBundle(tangemContext.getBlockchain(), bundle.getBundle(EXTRA_BLOCKCHAIN_DATA));
+            if (bundle.containsKey(Constant.EXTRA_BLOCKCHAIN_DATA)) {
+                tangemContext.coinData = CoinData.fromBundle(tangemContext.getBlockchain(), bundle.getBundle(Constant.EXTRA_BLOCKCHAIN_DATA));
             } else {
                 tangemContext.coinData = CoinEngineFactory.INSTANCE.create(tangemContext).createCoinData();
             }
@@ -107,7 +109,7 @@ public class TangemContext {
         }
 
         if (coinData != null) {
-            intent.putExtra(EXTRA_BLOCKCHAIN_DATA, coinData.asBundle());
+            intent.putExtra(Constant.EXTRA_BLOCKCHAIN_DATA, coinData.asBundle());
         }
 
         intent.putExtra("Error", error);
diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
index 2ec2b8f723..402da7169c 100644
--- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
@@ -5,10 +5,10 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.tangem.App
+import com.tangem.Constant
 import com.tangem.di.Navigator
 import com.tangem.domain.wallet.CoinData
 import com.tangem.domain.wallet.TangemCard
-import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.fragment.VerifyCard
 import com.tangem.wallet.R
 import javax.inject.Inject
@@ -23,9 +23,9 @@ class VerifyCardActivity : AppCompatActivity() {
             val intent = Intent(context, VerifyCardActivity::class.java)
             intent.putExtra(TangemCard.EXTRA_UID, card.uid)
             intent.putExtra(TangemCard.EXTRA_CARD, card.asBundle)
-            intent.putExtra(TangemContext.EXTRA_BLOCKCHAIN_DATA, coinData.asBundle())
-            intent.putExtra("Message", message)
-            intent.putExtra("Error", error)
+            intent.putExtra(Constant.EXTRA_BLOCKCHAIN_DATA, coinData.asBundle())
+            intent.putExtra(Constant.MESSAGE, message)
+            intent.putExtra(Constant.ERROR, error)
             return intent
         }
     }
@@ -43,7 +43,7 @@ class VerifyCardActivity : AppCompatActivity() {
         super.onBackPressed()
         val verifyCard = supportFragmentManager.findFragmentById(R.id.verify_card_fragment) as VerifyCard
         val data = verifyCard.prepareResultIntent()
-        data.putExtra("modification", "update")
+        data.putExtra(Constant.EXTRA_MODIFICATION, "update")
         finish()
     }