Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#21578] Keycard - Factory reset a Keycard #21914

Merged
merged 2 commits into from
Jan 20, 2025
Merged

[#21578] Keycard - Factory reset a Keycard #21914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89efbf4
[#21578] Keycard - Factory reset a Keycard
flexsurfer Jan 10, 2025
5ba2af9
ISSUE 7 Scanning not a keycard redirects to Failed to reset keycard i…
flexsurfer Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/status_im/contexts/keycard/different_card/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
(ns status-im.contexts.keycard.different-card.view
(:require [quo.core :as quo]
[react-native.core :as rn]
[status-im.common.events-helper :as events-helper]
[utils.i18n :as i18n]))

(defn view
[]
[:<>
[quo/page-nav
{:icon-name :i/close
:on-press events-helper/navigate-back}]
[quo/page-top
{:title (i18n/label :t/different-keycard)
:description :text
:description-text (i18n/label :t/scan-previous-keycard)}]
[rn/view {:style {:flex 1}}]
[rn/view {:style {:padding-horizontal 20}}
[quo/button {:on-press events-helper/navigate-back}
(i18n/label :t/try-again)]]])

4 changes: 4 additions & 0 deletions src/status_im/contexts/keycard/effects.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
(fn [args]
(keycard/export-key (keycard.utils/wrap-handlers args))))

(rf/reg-fx :effects.keycard/factory-reset
(fn [args]
(keycard/factory-reset (keycard.utils/wrap-handlers args))))

(rf/reg-fx :effects.keycard/sign
(fn [args]
(-> (keycard/sign args)
Expand Down
19 changes: 15 additions & 4 deletions src/status_im/contexts/keycard/error/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
(:require [quo.core :as quo]
[react-native.core :as rn]
[status-im.common.events-helper :as events-helper]
[status-im.contexts.keycard.factory-reset.view :as factory-reset]
[utils.i18n :as i18n]
[utils.re-frame :as rf]))

Expand Down Expand Up @@ -31,7 +32,17 @@
:description-text description}]
[rn/view {:style {:margin-horizontal 20}}
[quo/keycard {:holder-name ""}]
[quo/information-box
{:type :default
:style {:margin-top 20}}
(i18n/label :t/unlock-reset-instructions)]]]))
(when (not= :keycard/error.keycard-blank error)
[:<>
[quo/section-label
{:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
[quo/settings-item
{:title (i18n/label :t/factory-reset)
:image :icon
:image-props :i/placeholder
:action :arrow
:description :text
:description-props {:text (i18n/label :t/remove-keycard-content)}
:on-press (fn []
(rf/dispatch [:show-bottom-sheet
{:content factory-reset/sheet}]))}]])]]))
4 changes: 4 additions & 0 deletions src/status_im/contexts/keycard/events.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
(fn [_ [data]]
{:effects.keycard/export-key data}))

(rf/reg-event-fx :keycard/factory-reset
(fn [_ [data]]
{:effects.keycard/factory-reset data}))

(rf/reg-event-fx :keycard/connect-derive-address-and-add-account
(fn [_ [{:keys [pin derivation-path key-uid account-preferences]}]]
{:fx [[:dispatch
Expand Down
96 changes: 96 additions & 0 deletions src/status_im/contexts/keycard/factory_reset/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
(ns status-im.contexts.keycard.factory-reset.view
(:require [quo.core :as quo]
[react-native.core :as rn]
[status-im.common.events-helper :as events-helper]
[utils.i18n :as i18n]
[utils.re-frame :as rf]))

(defn- reset-card
[]
(rf/dispatch
[:keycard/factory-reset
{:on-success (fn []
(rf/dispatch [:navigate-back])
(rf/dispatch [:keycard/disconnect])
(rf/dispatch [:open-modal :screen/keycard.factory-reset.success]))
:on-failure (fn []
(rf/dispatch [:navigate-back])
(rf/dispatch [:keycard/disconnect])
(rf/dispatch [:open-modal :screen/keycard.factory-reset.fail]))}]))

(defn- connect-and-reset
[key-uid]
(rf/dispatch
[:keycard/connect
{:key-uid key-uid
:on-success reset-card
:on-error (fn [error]
(if (or (= error :keycard/error.keycard-frozen)
(= error :keycard/error.keycard-locked)
(= error :keycard/error.keycard-unpaired))
(reset-card)
(do
(rf/dispatch [:navigate-back])
(if (= error :keycard/error.keycard-wrong-profile)
(do
(rf/dispatch [:keycard/disconnect])
(rf/dispatch [:open-modal :screen/keycard.different-card]))
(rf/dispatch [:keycard/on-application-info-error error])))))}]))

(defn success-view
[]
[:<>
[quo/page-nav
{:icon-name :i/close
:on-press events-helper/navigate-back}]
[quo/page-top
{:title (i18n/label :t/keycard-reset-success)
:description :text
:description-text (i18n/label :t/keycard-empty-ready)}]
[rn/view {:style {:flex 1}}]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick one, what is this rn/view for? It doesn't have any content or size, that's why I'm asking. File src/status_im/contexts/keycard/different_card/view.cljs also has this same empty rn/view.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@flexsurfer probably my comment got lost in the myriad of comments in the PR, but could you elaborate on my question above?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh sorry @ilmotta that true, I missed your comment, this view just pushes next view to the bottom

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay it's really necessary. Thanks for the explanation!

[rn/view {:style {:padding-horizontal 20}}
[quo/button {:on-press events-helper/navigate-back}
(i18n/label :t/done)]]])

(defn failed-view
[]
[:<>
[quo/page-nav
{:icon-name :i/close
:on-press events-helper/navigate-back}]
[quo/page-top
{:title (i18n/label :t/keycard-reset-failed)}]
[rn/view {:style {:flex 1}}]
[rn/view {:style {:padding-horizontal 20}}
[quo/button {:on-press events-helper/navigate-back}
(i18n/label :t/try-again)]]])

(defn sheet
[]
(let [customization-color (rf/sub [:profile/customization-color])
key-uid (rf/sub [:keycard/key-uid])
[checked? set-checked] (rn/use-state false)]
[:<>
[quo/drawer-top {:title (i18n/label :t/factory-reset-keycard)}]
[quo/text
{:style {:padding-horizontal 20
:padding-top 8
:padding-bottom 8}}
(i18n/label :t/factory-reset-warning)]
[quo/disclaimer
{:checked? checked?
:container-style {:margin-horizontal 20}
:on-change #(set-checked (not checked?))}
(i18n/label :t/key-pair-erased)]
[quo/bottom-actions
{:actions :two-actions
:button-one-label (i18n/label :t/continue)
:button-one-props {:disabled? (not checked?)
:customization-color customization-color
:on-press (fn []
(rf/dispatch [:hide-bottom-sheet])
(connect-and-reset key-uid))}
:button-two-label (i18n/label :t/cancel)
:button-two-props {:type :grey
:on-press (fn []
(rf/dispatch [:hide-bottom-sheet]))}}]]))
2 changes: 1 addition & 1 deletion src/status_im/contexts/keycard/not_keycard/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
[rn/image
{:resize-mode :contain
:source (resources/get-image :not-keycard)}]]
[rn/view {:padding-horizontal 20}
[rn/view {:style {:padding-horizontal 20}}
[quo/button {:on-press events-helper/navigate-back}
(i18n/label :t/try-again)]]])
31 changes: 22 additions & 9 deletions src/status_im/contexts/settings/keycard/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,28 @@
[]
(let [keycards (rf/sub [:keycard/registered-keycards])]
[:<>
[quo/divider-label
{:counter? false
:tight? true
:blur? true}
(i18n/label :t/registered-keycards)]
[rn/view {:style style/registered-keycards-container}
(for [keycard keycards]
^{:key (:keycard-uid keycard)}
[registered-keycard keycard])]]))
[rn/view {:style {:flex 1}}
[quo/divider-label
{:counter? false
:tight? true
:blur? true}
(i18n/label :t/registered-keycards)]
[rn/view {:style style/registered-keycards-container}
(for [keycard keycards]
^{:key (:keycard-uid keycard)}
[registered-keycard keycard])]]
[quo/text
{:size :heading-2
:weight :semi-bold
:style {:margin-left 20}}
(i18n/label :t/scan-keycard-actions)]
[quo/divider-label (i18n/label :t/tips-scan-keycard)]
[quo/markdown-list {:description (i18n/label :t/remove-phone-case)}]
[quo/markdown-list {:description (i18n/label :t/keep-card-steady)}]
[quo/bottom-actions
{:actions :one-action
:button-one-label (i18n/label :t/ready-to-scan)
:button-one-props {:on-press #(rf/dispatch [:keycard/connect])}}]]))

(defn view
[]
Expand Down
25 changes: 24 additions & 1 deletion src/status_im/navigation/screens.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
[status-im.contexts.keycard.authorise.view :as keycard.authorise]
[status-im.contexts.keycard.check.view :as keycard.check]
[status-im.contexts.keycard.create.view :as keycard.create]
[status-im.contexts.keycard.different-card.view :as keycard.different-card]
[status-im.contexts.keycard.empty.view :as keycard.empty]
[status-im.contexts.keycard.error.view :as keycard.error]
[status-im.contexts.keycard.factory-reset.view :as keycard.factory-reset]
[status-im.contexts.keycard.migrate.fail.view :as keycard.migrate.fail]
[status-im.contexts.keycard.migrate.profile-keys.view :as keycard.migrate.profile-keys]
[status-im.contexts.keycard.migrate.re-encrypting.view :as keycard.re-encrypting]
Expand Down Expand Up @@ -895,6 +897,13 @@
:insets {:top? true :bottom? true}}
:component keycard.error/view}

{:name :screen/keycard.different-card
:metrics {:track? true}
:options {:theme :dark
:modalPresentationStyle :fullScreen
:insets {:top? true :bottom? true}}
:component keycard.different-card/view}

{:name :screen/keycard.not-keycard
:metrics {:track? true}
:options {:theme :dark
Expand Down Expand Up @@ -966,7 +975,21 @@
{:name :screen/keycard.create.ready-to-add
:metrics {:track? true}
:options {:insets {:top? true :bottom? true}}
:component keycard.create/ready-to-add}])
:component keycard.create/ready-to-add}

{:name :screen/keycard.factory-reset.success
:metrics {:track? true}
flexsurfer marked this conversation as resolved.
Show resolved Hide resolved
:options {:theme :dark
:modalPresentationStyle :fullScreen
:insets {:top? true :bottom? true}}
:component keycard.factory-reset/success-view}

{:name :screen/keycard.factory-reset.fail
:metrics {:track? true}
:options {:theme :dark
:modalPresentationStyle :fullScreen
:insets {:top? true :bottom? true}}
:component keycard.factory-reset/failed-view}])

(defn screens
[]
Expand Down
6 changes: 6 additions & 0 deletions src/status_im/subs/keycard.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,9 @@
:<- [:keycard]
(fn [keycard]
(get-in keycard [:application-info :initialized?])))

(rf/reg-sub
:keycard/key-uid
:<- [:keycard]
(fn [keycard]
(get-in keycard [:application-info :key-uid])))
11 changes: 11 additions & 0 deletions translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,7 @@
"device-syncing": "Device syncing",
"devices": "Devices",
"devices-count": "{{number}} devices",
"different-keycard": "It’s a different Keycard",
"disable": "disable",
"disable-all": "Disable all",
"disable-later-in-settings": "You can disable this later in Settings",
Expand Down Expand Up @@ -1028,6 +1029,9 @@
"export-key": "Export private key",
"external-link": "External link",
"external-storage-denied": "Access to external storage is denied",
"factory-reset": "Factory reset",
"factory-reset-keycard": "Factory reset this Keycard",
"factory-reset-warning": "Please ensure you have a backup of your recovery phrase before proceeding with the factory reset. If you want to switch to password authentication instead of Keycard, remove the profile from the device and log in with your recovery phrase.",
"failed": "Failed",
"failed-on": "Failed on",
"failed-to-fetch-community": "Failed to fetch community",
Expand Down Expand Up @@ -1346,6 +1350,7 @@
"key-name-error-taken": "Key pair name already in use",
"key-name-error-too-short": "Key pair name must be at least {{count}} characters",
"key-on-device": "Private key is saved on this device",
"key-pair-erased": "Key pair will be erased from Keycard",
"key-pair-imported-successfully": "{{name}} key pair imported successfully",
"key-pair-migrated-successfully": "Profile key pair successfully migrated",
"key-pair-name-updated": "Key pair name updated",
Expand All @@ -1369,6 +1374,7 @@
"keycard-desc": "Own a Keycard? Store your keys on it; you’ll need it for transactions",
"keycard-dont-ask-card": "Don't ask for card to sign in",
"keycard-empty": "Keycard is empty",
"keycard-empty-ready": "Keycard is empty and ready to be used",
"keycard-enter-new-passcode": "Enter new passcode {{step}}/2",
"keycard-error-description": "Connect the card again to continue",
"keycard-error-title": "Connection lost",
Expand Down Expand Up @@ -1427,7 +1433,9 @@
"keycard-redeem-title": "Redeem to",
"keycard-redeem-tx": "Redeem assets",
"keycard-redeem-tx-desc": "Tap the card to sign and receive assets",
"keycard-reset-failed": "Failed to reset Keycard",
"keycard-reset-passcode": "Reset passcode",
"keycard-reset-success": "Keycard has been reset",
"keycard-success-description": "You may remove the card now",
"keycard-success-title": "Success",
"keycard-unauthorized-operation": "You're unauthorized to perform this operation.\n Please tap valid card and try again.",
Expand Down Expand Up @@ -2140,6 +2148,7 @@
"remove-from-contacts-text": "By removing a user from your contact list you do not hide your wallet address from them",
"remove-group": "Remove group",
"remove-key-pair-and-derived-accounts": "Remove key pair and derived accounts",
"remove-keycard-content": "Remove all content from this Keycard",
"remove-network": "Remove network",
"remove-nickname": "Remove nickname",
"remove-nickname-toast": "You have removed {{secondary-name}}'s nickname",
Expand Down Expand Up @@ -2232,9 +2241,11 @@
"scan-an-address-qr-code": "Scan an address QR code",
"scan-key-pairs-qr-code": "Scan key pairs QR code",
"scan-keycard": "Scan Keycard",
"scan-keycard-actions": "Scan Keycard to see available actions",
"scan-or-enter-a-sync-code": "Scan or enter a sync code",
"scan-or-enter-sync-code": "Scan or enter sync code",
"scan-or-enter-sync-code-seen-on-this-device": "Scan or enter sync code seen on this device",
"scan-previous-keycard": "Please scan Keycard you previously scanned",
"scan-qr": "Scan QR",
"scan-qr-code": "Scan QR code",
"scan-sync-code": "Scan Sync Code",
Expand Down