diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index a3726af32f..bbfd3f9a72 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 98e0e77a85..625d07fe40 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 30
+        versionCode 31
         versionName "0.85.5." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java
index fca13d0111..27a06193a5 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java
@@ -61,7 +61,7 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
     private boolean feeRequestSuccess = false;
     private boolean balanceRequestSuccess = false;
     private EditText etWallet;
-//    private TextView tvAmountEquivalent;
+    //    private TextView tvAmountEquivalent;
 //    private TextView tvFeeEquivalent;
     private EditText etAmount;
     private EditText etFee;
@@ -569,10 +569,12 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_SIGN_PAYMENT) {
-            if (data != null && data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
-                TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
-                updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
-                mCard = updatedCard;
+            if (data != null && data.getExtras() != null) {
+                if (data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
+                    TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
+                    updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
+                    mCard = updatedCard;
+                }
             }
             if (resultCode == SignPaymentActivity.RESULT_INVALID_PIN && requestPIN2Count < 2) {
                 requestPIN2Count++;
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java
index 8311f8cd2a..ad8aadd1a7 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java
@@ -873,13 +873,13 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
                 break;
             case REQUEST_CODE_SEND_PAYMENT:
                 if (resultCode == Activity.RESULT_OK) {
-//                    mSwipeRefreshLayout.postDelayed(this::onRefresh, 10000);
+                    mSwipeRefreshLayout.postDelayed(this::onRefresh, 10000);
                     mSwipeRefreshLayout.setRefreshing(true);
                     mCard.clearInfo();
                     updateViews();
                 }
 
-                if (data != null) {
+                if (data != null && data.getExtras() != null) {
                     if (data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
                         TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
                         updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
@@ -894,7 +894,6 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
                     }
                     updateViews();
                 }
-
                 break;
         }
     }