diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
index 2978ee8a4f..06cfd6347e 100644
--- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
@@ -28,21 +28,20 @@ import com.tangem.App
 import com.tangem.Constant
 import com.tangem.data.Logger
 import com.tangem.data.network.ServerApiCommon
-import com.tangem.tangemcard.android.nfc.DeviceNFCAntennaLocation
-import com.tangem.tangemcard.tasks.ReadCardInfoTask
 import com.tangem.di.Navigator
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.RootFoundDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
-import com.tangem.presentation.dialog.WaitSecurityDelayDialogNew
+import com.tangem.tangemcard.android.nfc.DeviceNFCAntennaLocation
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.TangemCard
 import com.tangem.tangemcard.data.loadFromBundle
 import com.tangem.tangemcard.data.saveToBundle
+import com.tangem.tangemcard.reader.CardProtocol
+import com.tangem.tangemcard.tasks.ReadCardInfoTask
 import com.tangem.util.CommonUtil
 import com.tangem.util.LOG
 import com.tangem.util.PhoneUtility
diff --git a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
index 6b43c44410..3258c8e3f4 100644
--- a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
@@ -20,21 +20,15 @@ import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
-import com.tangem.presentation.dialog.WaitSecurityDelayDialogNew
-import com.tangem.presentation.event.ReadAfterRequest
-import com.tangem.presentation.event.ReadBeforeRequest
-import com.tangem.presentation.event.ReadWait
-import com.tangem.presentation.event.TransactionFinishWithError
-import com.tangem.tangemcard.reader.CardProtocol
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.asBundle
+import com.tangem.tangemcard.reader.CardProtocol
 import com.tangem.tangemcard.tasks.SignTask
 import com.tangem.tangemcard.util.Util
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_sign_payment.*
-import org.greenrobot.eventbus.EventBus
 
 class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
 
@@ -259,38 +253,38 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         }, 500)
     }
 
-    private val waitSecurityDelayDialogNew = WaitSecurityDelayDialogNew()
+//    private val waitSecurityDelayDialogNew = WaitSecurityDelayDialogNew()
 
     override fun onReadBeforeRequest(timeout: Int) {
-//        LOG.i(TAG, "onReadBeforeRequest timeout $timeout")
-//        WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
+        LOG.i(TAG, "onReadBeforeRequest timeout $timeout")
+        WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
 
-        if (!waitSecurityDelayDialogNew.isAdded)
-            waitSecurityDelayDialogNew.show(supportFragmentManager, WaitSecurityDelayDialogNew.TAG)
+//        if (!waitSecurityDelayDialogNew.isAdded)
+//            waitSecurityDelayDialogNew.show(supportFragmentManager, WaitSecurityDelayDialogNew.TAG)
 
 
-        val readBeforeRequest = ReadBeforeRequest()
-        readBeforeRequest.timeout = timeout
-        EventBus.getDefault().post(readBeforeRequest)
+//        val readBeforeRequest = ReadBeforeRequest()
+//        readBeforeRequest.timeout = timeout
+//        EventBus.getDefault().post(readBeforeRequest)
 
     }
 
     override fun onReadAfterRequest() {
-//        LOG.i(TAG, "onReadAfterRequest")
-//        WaitSecurityDelayDialog.onReadAfterRequest(this)
+        LOG.i(TAG, "onReadAfterRequest")
+        WaitSecurityDelayDialog.onReadAfterRequest(this)
 
-        val readAfterRequest = ReadAfterRequest()
-        EventBus.getDefault().post(readAfterRequest)
+//        val readAfterRequest = ReadAfterRequest()
+//        EventBus.getDefault().post(readAfterRequest)
 
     }
 
     override fun onReadWait(msec: Int) {
-//        LOG.i(TAG, "onReadWait msec $msec")
-//        WaitSecurityDelayDialog.onReadWait(this, msec)
+        LOG.i(TAG, "onReadWait msec $msec")
+        WaitSecurityDelayDialog.onReadWait(this, msec)
 
-        val readWait = ReadWait()
-        readWait.msec = msec
-        EventBus.getDefault().post(readWait)
+//        val readWait = ReadWait()
+//        readWait.msec = msec
+//        EventBus.getDefault().post(readWait)
 
 
     }
diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt
index 4e44beb311..7a29f8f39b 100644
--- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt
+++ b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt
@@ -126,51 +126,6 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() {
             setRemainingTimeout(readWait.msec!!)
     }
 
-    fun onReadBeforeRequest(timeout: Int) {
-//        if (timerToShowDelayDialog != null || timeout < DELAY_BEFORE_SHOW_DIALOG + MIN_REMAINING_DELAY_TO_SHOW_DIALOG)
-//            return
-//
-//        timerToShowDelayDialog = Timer()
-//        timerToShowDelayDialog!!.schedule(object : TimerTask() {
-//            override fun run() {
-//                setup(timeout, DELAY_BEFORE_SHOW_DIALOG)
-//                isCancelable = false
-//                if (!isVisible)
-//                    show(activity?.supportFragmentManager, TAG)
-//            }
-//        }, DELAY_BEFORE_SHOW_DIALOG.toLong())
-    }
-
-    fun onReadAfterRequest() {
-//        if (timerToShowDelayDialog == null)
-//            return
-//
-//        timerToShowDelayDialog!!.cancel()
-//        timerToShowDelayDialog = null
-    }
-
-    fun onReadWait(msec: Int) {
-//        if (timerToShowDelayDialog != null) {
-//            timerToShowDelayDialog!!.cancel()
-//            timerToShowDelayDialog = null
-//        }
-//
-//        if (msec == 0) {
-//            dismiss()
-//            return
-//        }
-//
-//        if (msec > MIN_REMAINING_DELAY_TO_SHOW_DIALOG) {
-//            // 1000ms - card delay notification interval
-//            setup(msec + 1000, 1000)
-//            isCancelable = false
-////            if (!isVisible)
-//            show(activity?.supportFragmentManager, TAG)
-//
-//        } else
-//            setRemainingTimeout(msec)
-    }
-
     private fun setup(msTimeout: Int, msProgress: Int) {
         this.msTimeout = msTimeout
         this.msProgress = msProgress