add factory reset option on new Keycard account

Author: bitgamma

package.json

@@ -61,7 +61,7 @@
     "react-native-screens": "^2.10.1",
     "react-native-shake": "^3.3.1",
     "react-native-splash-screen": "^3.2.0",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.34",
+    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#feature/factory-reset",
     "react-native-svg": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
     "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v10.9.2",

src/status_im/keycard/card.cljs

@@ -99,6 +99,25 @@
         [:keycard.callback/on-get-application-info-error
          (error-object->map response)]))})))
 
+(defn factory-reset [{:keys [on-success] :as args}]
+  (log/debug "[keycard] factory-reset")
+  (keycard/factory-reset
+   card
+   (merge
+    args
+    {:on-success
+     (fn [response]
+       (log/debug "[keycard response succ] get-application-info")
+       (re-frame/dispatch
+        [:keycard.callback/on-get-application-info-success
+         response on-success]))
+     :on-failure
+     (fn [response]
+       (log/debug "[keycard response fail] get-application-info")
+       (re-frame/dispatch
+        [:keycard.callback/on-get-application-info-error
+         (error-object->map response)]))})))
+
 (defn install-applet []
   (log/debug "[keycard] install-applet")
   (keycard/install-applet

src/status_im/keycard/common.cljs

@@ -409,6 +409,12 @@
            (navigation/navigate-to-cofx :keycard-recovery-pin nil)))
         (show-wrong-keycard-alert true)))))
 
+(fx/defn factory-reset
+  {:events [:keycard/factory-reset]}
+  [{:keys [db]} on-card-read]
+  (log/debug "[keycard] factory-reset")
+  {:keycard/factory-reset {:on-success on-card-read}})
+
 ;; Get application info
 
 (fx/defn get-application-info

src/status_im/keycard/fx.cljs

@@ -59,6 +59,10 @@
  :keycard/get-application-info
  card/get-application-info)
 
+(re-frame/reg-fx
+ :keycard/factory-reset
+ card/factory-reset)
+
 (re-frame/reg-fx
  :keycard/check-nfc-support
  card/check-nfc-support)

src/status_im/keycard/ios_keycard.cljs

@@ -14,6 +14,7 @@
   (remove-event-listener [this event])
   (remove-event-listeners [this])
   (get-application-info [this args])
+  (factory-reset [this args])
   (install-applet [this args])
   (install-cash-applet [this args])
   (init-card [this args])

src/status_im/keycard/keycard.cljs

@@ -4,6 +4,7 @@
             [status-im.i18n.i18n :as i18n]
             [status-im.navigation :as navigation]
             [status-im.utils.fx :as fx]
+            [status-im.utils.utils :as utils]
             [status-im.keycard.common :as common]
             [status-im.keycard.mnemonic :as mnemonic]
             [taoensso.timbre :as log]
@@ -274,6 +275,11 @@
                {:mnemonic     mnemonic
                 :pin          pin'}})))
 
+(fx/defn factory-reset-card-toggle
+  {:events [:keycard.onboarding.intro.ui/factory-reset-card-toggle]}
+  [{:keys [db] :as cofx} checked?]
+  {:db (assoc-in db [:keycard :factory-reset-card?] checked?)})
+
 (fx/defn begin-setup-pressed
   {:events [:keycard.onboarding.intro.ui/begin-setup-pressed]}
   [{:keys [db] :as cofx}]
@@ -283,13 +289,29 @@
             (update :keycard
                     dissoc :secrets :card-state :multiaccount-wallet-address
                     :multiaccount-whisper-public-key
-                    :application-info)
+                    :application-info :factory-reset-card?)
             (assoc-in [:keycard :setup-step] :begin)
             (assoc-in [:keycard :pin :on-verified] nil))}
-   (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)})))
+   (if (get-in db [:keycard :factory-reset-card?])
+     (utils/show-confirmation {:title               (i18n/label :t/keycard-factory-reset-title)
+                               :content             (i18n/label :t/keycard-factory-reset-text)
+                               :confirm-button-text (i18n/label :t/yes)
+                               :cancel-button-text  (i18n/label :t/no)
+                               :on-accept           #(re-frame/dispatch [::factory-reset])
+                               :on-cancel           #()})
+     (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 factory-reset
+  {:events [::factory-reset]}
+  [cofx]
+  (common/show-connection-sheet
+   cofx
+   {:on-card-connected :keycard/factory-reset
+    :on-card-read      :keycard/check-card-state
+    :handler           (common/factory-reset :keycard/check-card-state)}))
 
 (fx/defn cancel-confirm
   {:events [::cancel-confirm]}

src/status_im/keycard/onboarding.cljs

@@ -107,6 +107,17 @@
                 (on-success info))))
       (catch on-failure)))
 
+(defn factory-reset
+  [{:keys [on-success on-failure]}]
+  (.. status-keycard
+      (factoryReset)
+      (then (fn [response]
+              (let [info (-> response
+                             (js->clj :keywordize-keys true)
+                             (update :key-uid ethereum/normalized-hex))]
+                (on-success info))))
+      (catch on-failure)))
+
 (defn install-applet [{:keys [on-success on-failure]}]
   (.. status-keycard
       installApplet
@@ -313,6 +324,8 @@
     (set-pairings args))
   (keycard/get-application-info [this args]
     (get-application-info args))
+  (keycard/factory-reset [this args]
+    (factory-reset args))
   (keycard/install-applet [this args]
     (install-applet args))
   (keycard/install-cash-applet [this args]

src/status_im/keycard/real_keycard.cljs

@@ -119,6 +119,7 @@
   (log/debug "get-application-info")
   (later #(on-success (get @state :application-info))))
 
+(defn factory-reset [_])
 (defn install-applet [_])
 (defn install-cash-applet [_])
 
@@ -459,6 +460,9 @@
   (keycard/get-application-info [this args]
     (log/debug "simulated card get-application-info")
     (get-application-info args))
+  (keycard/factory-reset [this args]
+    (log/debug "simulated card factory-reset")
+    (get-application-info args))
   (keycard/install-applet [this args]
     (log/debug "simulated card install-applet")
     (install-applet args))

src/status_im/keycard/simulated_keycard.cljs

@@ -11,13 +11,14 @@
             [status-im.ui.components.topbar :as topbar]
             [status-im.ui.screens.keycard.pin.views :as pin.views]
             [status-im.ui.screens.keycard.styles :as styles]
+            [status-im.ui.components.checkbox.view :as checkbox]
             [quo.core :as quo]
             [status-im.constants :as constants])
   (:require-macros [status-im.utils.views :refer [defview letsubs]]))
 
 (defview intro []
   (letsubs [flow [:keycard-flow]
-            {:keys [from-key-storage-and-migration?]} [:keycard]]
+            {:keys [from-key-storage-and-migration? factory-reset-card?]} [:keycard]]
     [react/view styles/container
      (when-not from-key-storage-and-migration?
        [topbar/topbar])
@@ -86,6 +87,11 @@
                              [react/text {:style {:color         colors/gray
                                                   :padding-right 35}}
                               text]]]]))]
+      [react/view {:style {:flex-direction :row}}
+       [checkbox/checkbox {:checked?        factory-reset-card?
+                           :style           {:margin-right 10}
+                           :on-value-change #(re-frame/dispatch [:keycard.onboarding.intro.ui/factory-reset-card-toggle %])}]
+       [react/text (i18n/label :t/keycard-factory-reset)]]
       [react/view {:margin-bottom 40}
        [quo/button {:on-press #(re-frame/dispatch [:keycard.onboarding.intro.ui/begin-setup-pressed])}
         (i18n/label :t/begin-set-up)]]]]))