From a6729ce8c55e961580986f6d6b5ae8243e8299cd Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <roman.wolosovskyi@gmail.com>
Date: Wed, 29 Apr 2020 09:29:24 +0300
Subject: [PATCH] [#10444] Fix keycard pin changing when card is not tapped

---
 src/status_im/hardwallet/common.cljs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/status_im/hardwallet/common.cljs b/src/status_im/hardwallet/common.cljs
index 9d41859853..53fcd6dd8e 100644
--- a/src/status_im/hardwallet/common.cljs
+++ b/src/status_im/hardwallet/common.cljs
@@ -471,10 +471,13 @@
   (let [on-success (or on-success
                        (get-in db [:hardwallet :pin :on-verified]))
         on-failure (or on-failure
-                       (get-in db [:hardwallet :pin :on-verified-failure]))]
+                       (get-in db [:hardwallet :pin :on-verified-failure]))
+        pin-step   (or pin-step
+                       (get-in db [:hardwallet :pin :step]))]
     (fx/merge
      cofx
      {:db (update-in db [:hardwallet :pin] assoc
+                     :step pin-step
                      :on-verified on-success
                      :on-verified-failure on-failure)}
      (show-connection-sheet
@@ -486,5 +489,5 @@
            (fx/merge
             cofx
             {:db                    (assoc-in db [:hardwallet :pin :status] :verifying)
-             :hardwallet/verify-pin {:pin        pin
-                                     :pairing    pairing}})))}))))
+             :hardwallet/verify-pin {:pin     pin
+                                     :pairing pairing}})))}))))