From b67ecacd8bc4d9780ee2fcf2adf03e3c48706c95 Mon Sep 17 00:00:00 2001 From: Michele Balistreri Date: Tue, 25 May 2021 10:00:30 +0300 Subject: [PATCH] fix #10793 and #11060 Signed-off-by: Michele Balistreri --- src/status_im/keycard/wallet.cljs | 3 ++- src/status_im/ui/screens/keycard/subs.cljs | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/status_im/keycard/wallet.cljs b/src/status_im/keycard/wallet.cljs index 740efa1cc0..ca841fb0f1 100644 --- a/src/status_im/keycard/wallet.cljs +++ b/src/status_im/keycard/wallet.cljs @@ -14,7 +14,8 @@ {:db (-> db (assoc-in [:keycard :pin :enter-step] :export-key) (update-in [:keycard :pin] dissoc :export-key) - (assoc :keycard/new-account-sheet? true))})) + (assoc :keycard/new-account-sheet? true)) + :dismiss-keyboard nil})) (fx/defn verify-pin-with-delay [cofx] diff --git a/src/status_im/ui/screens/keycard/subs.cljs b/src/status_im/ui/screens/keycard/subs.cljs index 829910cc12..8194231653 100644 --- a/src/status_im/ui/screens/keycard/subs.cljs +++ b/src/status_im/ui/screens/keycard/subs.cljs @@ -203,6 +203,5 @@ (re-frame/reg-sub :keycard/frozen-card? (fn [db] - (let [{:keys [pin-retry-counter]} - (get-in db [:keycard :application-info])] - (zero? pin-retry-counter)))) + (and (common/keycard-multiaccount? db) + (zero? (get-in db [:keycard :application-info :pin-retry-counter])))))