From c6271557b102cce0357ddcc23d577a872a812d6f Mon Sep 17 00:00:00 2001 From: Michele Balistreri Date: Fri, 10 Dec 2021 10:14:01 +0300 Subject: [PATCH] fix pairing for new cards Signed-off-by: Michele Balistreri --- src/status_im/keycard/core.cljs | 4 +++- src/status_im/keycard/onboarding.cljs | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/status_im/keycard/core.cljs b/src/status_im/keycard/core.cljs index 195982f28f..430044efc7 100644 --- a/src/status_im/keycard/core.cljs +++ b/src/status_im/keycard/core.cljs @@ -70,7 +70,9 @@ (mnemonic/set-mnemonic)) (when (= flow :recovery) (onboarding/proceed-with-generating-key))) - (recovery/load-pair-screen cofx)))) + (if (get-in db [:keycard :secrets :password]) + (onboarding/load-pairing-screen cofx) + (recovery/load-pair-screen cofx))))) (fx/defn navigate-to-keycard-settings {:events [:profile.ui/keycard-settings-button-pressed]} diff --git a/src/status_im/keycard/onboarding.cljs b/src/status_im/keycard/onboarding.cljs index d77516874a..9a7c9dd790 100644 --- a/src/status_im/keycard/onboarding.cljs +++ b/src/status_im/keycard/onboarding.cljs @@ -236,7 +236,10 @@ (assoc-in [:keycard :card-state] :init) (assoc-in [:keycard :setup-step] :secret-keys) (update-in [:keycard :secrets] merge secrets'))} - (load-pairing-screen)))) + (common/show-connection-sheet + {:on-card-connected :keycard/get-application-info + :on-card-read :keycard/check-card-state + :handler (common/get-application-info :keycard/check-card-state)})))) (fx/defn on-install-applet-and-init-card-error {:events [:keycard.callback/on-install-applet-and-init-card-error