diff --git a/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt b/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
index 7004f6e794..a56dadf42e 100644
--- a/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
@@ -62,7 +62,7 @@ abstract class BaseFragment : Fragment() {
         return if (destination == DESTINATION_NOT_SET) {
             findNavController(this).popBackStack()
         } else {
-            findNavController(this).popBackStack(destination, true)
+            findNavController(this).popBackStack(destination, false)
         }
     }
 
diff --git a/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt b/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt
index 9452150813..ceb8baf9ee 100644
--- a/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt
@@ -148,7 +148,6 @@ class PurgeFragment : BaseFragment(), NfcAdapter.ReaderCallback, CardProtocol.No
                     data.putString(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid)
                     data.putBundle(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle)
 
-//                    EventBus.getDefault().post(DeletingWalletFinish())
                     navigateToDestination(R.id.action_purgeFragment_to_mainFragment)
                 }
             } else {
diff --git a/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt b/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt
index a50599dc58..4df01cc933 100644
--- a/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt
@@ -10,7 +10,6 @@ import com.tangem.App
 import com.tangem.Constant
 import com.tangem.tangem_card.util.Util
 import com.tangem.ui.activity.MainActivity
-import com.tangem.ui.event.TransactionFinishWithError
 import com.tangem.ui.event.TransactionFinishWithSuccess
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.CoinEngine
@@ -74,7 +73,6 @@ class SendTransactionFragment : BaseFragment(), NfcAdapter.ReaderCallback {
 
     private fun finishWithSuccess() {
         val transactionFinishWithSuccess = TransactionFinishWithSuccess()
-        transactionFinishWithSuccess.message = getString(R.string.transaction_has_been_successfully_signed)
         EventBus.getDefault().post(transactionFinishWithSuccess)
 
         val data = Bundle()
@@ -83,10 +81,6 @@ class SendTransactionFragment : BaseFragment(), NfcAdapter.ReaderCallback {
     }
 
     private fun finishWithError(message: String) {
-        val transactionFinishWithError = TransactionFinishWithError()
-        transactionFinishWithError.message = String.format(getString(R.string.try_again_failed_to_send_transaction), message)
-        EventBus.getDefault().post(transactionFinishWithError)
-
         val data = Bundle()
         data.putString(Constant.EXTRA_MESSAGE, String.format(getString(R.string.try_again_failed_to_send_transaction), message))
         navigateBackWithResult(Activity.RESULT_CANCELED, data, R.id.loadedWalletFragment)
diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
index 6e7e6c9f27..e052f8b620 100644
--- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
@@ -41,7 +41,6 @@ import com.tangem.ui.dialog.PINSwapWarningDialog
 import com.tangem.ui.dialog.ShowQRCodeDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
 import com.tangem.ui.event.DeletingWalletFinish
-import com.tangem.ui.event.TransactionFinishWithError
 import com.tangem.ui.event.TransactionFinishWithSuccess
 import com.tangem.ui.fragment.BaseFragment
 import com.tangem.ui.fragment.pin.PinRequestFragment
@@ -329,20 +328,10 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
 
     @Subscribe
     fun onTransactionFinishWithSuccess(transactionFinishWithSuccess: TransactionFinishWithSuccess) {
-        ctx.message = transactionFinishWithSuccess.message
-        //ctx.coinData.clearInfo()
-        updateViews()
-        //srl?.isRefreshing = true
         refreshAction = Runnable { refresh() }
         srl?.postDelayed(refreshAction, 10000)
     }
 
-    @Subscribe
-    fun onTransactionFinishWithError(transactionFinishWithError: TransactionFinishWithError) {
-        ctx.error = transactionFinishWithError.message
-        updateViews()
-    }
-
     @Subscribe
     fun onDeleteWalletFinish(deletingWalletFinish: DeletingWalletFinish) {
         navigateUp()
@@ -495,6 +484,13 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
                     }
                 }
             }
+            else -> if (data != null && data.containsKey(Constant.EXTRA_MESSAGE)) {
+                when (resultCode) {
+                    Activity.RESULT_CANCELED -> ctx.error = data.getString(Constant.EXTRA_MESSAGE)
+                    Activity.RESULT_OK -> ctx.message = data.getString(Constant.EXTRA_MESSAGE)
+                }
+                updateViews()
+            }
         }
     }
 
diff --git a/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt b/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt
index 29d882f6b9..f31338069c 100644
--- a/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt
+++ b/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt
@@ -22,7 +22,6 @@ import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
 import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
 import com.tangem.tangem_sdk.data.loadFromBundle
 import com.tangem.ui.activity.MainActivity
-import com.tangem.ui.event.TransactionFinishWithError
 import com.tangem.ui.fragment.BaseFragment
 import com.tangem.ui.fragment.pin.PinRequestFragment
 import com.tangem.ui.navigation.NavigationResultListener
@@ -32,7 +31,6 @@ import com.tangem.wallet.CoinEngineFactory
 import com.tangem.wallet.R
 import com.tangem.wallet.TangemContext
 import kotlinx.android.synthetic.tangemAccess.fragment_confirm_transaction.*
-import org.greenrobot.eventbus.EventBus
 import java.io.IOException
 import java.util.*
 
@@ -300,10 +298,9 @@ class ConfirmTransactionFragment : BaseFragment(), NavigationResultListener, Nfc
     }
 
     private fun finishWithError(errorCode: Int, message: String) {
-        val transactionFinishWithError = TransactionFinishWithError()
-        transactionFinishWithError.message = message
-        EventBus.getDefault().post(transactionFinishWithError)
-
-        navigateBackWithResult(errorCode, bundleOf(Constant.EXTRA_MESSAGE to message))
+        navigateBackWithResult(
+                errorCode,
+                bundleOf(Constant.EXTRA_MESSAGE to message),
+                R.id.loadedWalletFragment)
     }
 }
\ No newline at end of file