Merge branch 'develop' into bugfix/21616

Author: alwx

resources/images/ui2/[email protected]

@@ -58,7 +58,7 @@
 
         :error
         [info-message/view
-         {:icon   :i/info
+         {:icon   :i/alert
           :size   :default
           :status :error}
          text]

resources/images/ui2/[email protected]

@@ -35,7 +35,7 @@
      subtitle]]])
 
 (defn- main-variant
-  [{:keys [title subtitle button-label image max-height accessibility-label on-press button-type]}]
+  [{:keys [title subtitle button-label image max-height accessibility-label on-press button-props]}]
   [rn/view {:style style/main-variant}
    [rn/view {:style style/main-variant-text-container}
     [text/text
@@ -56,18 +56,20 @@
      :resize-mode         :contain
      :source              image}]
    [button/button
-    {:on-press            on-press
-     :accessibility-label accessibility-label
-     :type                (or button-type :grey)
-     :size                40
-     :container-style     style/main-button
-     :theme               :dark
-     :background          :blur}
+    (merge
+     {:on-press            on-press
+      :accessibility-label accessibility-label
+      :type                :grey
+      :size                40
+      :container-style     style/main-button
+      :theme               :dark
+      :background          :blur}
+     button-props)
     button-label]])
 
 (defn small-option-card
   [{:keys [variant title subtitle button-label image max-height on-press accessibility-label
-           button-type container-style]
+           button-props container-style]
     :or   {variant :main accessibility-label :small-option-card}}]
   (let [main-variant?  (= variant :main)
         card-component (if main-variant? main-variant icon-variant)
@@ -84,4 +86,4 @@
        :accessibility-label accessibility-label
        :image               image
        :max-height          max-height
-       :button-type         button-type}]]))
+       :button-props        button-props}]]))

resources/images/ui2/[email protected]

@@ -4,7 +4,6 @@
   {:keycard-logo       (js/require "../resources/images/ui2/keycard-logo.png")
    :keycard-chip-light (js/require "../resources/images/ui2/keycard-chip-light.png")
    :keycard-chip-dark  (js/require "../resources/images/ui2/keycard-chip-dark.png")
-   :keycard-watermark  (js/require "../resources/images/ui2/keycard-watermark.png")
    :bored-ape          (js/require "../resources/images/mock2/bored-ape.png")})
 
 (def ui-themed

resources/images/ui2/[email protected]

@@ -18,13 +18,13 @@
    :podcasts                      (js/require "../resources/images/ui2/podcasts.png")
    :generate-keys                 (js/require "../resources/images/ui2/generate-keys.png")
    :add-key-to-keycard            (js/require "../resources/images/ui2/add-key-to-keycard.png")
+   :import-key-to-keycard         (js/require "../resources/images/ui2/import-key-to-keycard.png")
    :ethereum-address              (js/require "../resources/images/ui2/ethereum-address.png")
    :use-keycard                   (js/require "../resources/images/ui2/keycard.png")
    :use-recovery-phrase           (js/require "../resources/images/ui2/recovery-phrase.png")
    :check-your-keycard            (js/require "../resources/images/ui2/check-your-keycard.png")
    :qr-code                       (js/require "../resources/images/ui2/qr-code.png")
    :keycard-logo                  (js/require "../resources/images/ui2/keycard-logo.png")
-   :keycard-watermark             (js/require "../resources/images/ui2/keycard-watermark.png")
    :keycard-buy                   (js/require "../resources/images/ui2/keycard-buy.png")
    :keycard-migration             (js/require "../resources/images/ui2/keycard-migration.png")
    :keycard-migration-failed      (js/require "../resources/images/ui2/keycard-migration-failed.png")

src/quo/components/buttons/predictive_keyboard/view.cljs

@@ -10,16 +10,35 @@
     [utils.re-frame :as rf]
     [utils.security.core :as security]))
 
+(defn- partially-operable-accounts?
+  [accounts]
+  (->> accounts
+       vals
+       (some #(= :partially (:operable %)))
+       boolean))
+
+(rf/reg-event-fx :standard-auth/migrate-partially-operable-accounts
+ (fn [{:keys [db]} [{:keys [masked-password on-success]}]]
+   (let [on-auth-success-callback         #(on-success masked-password)
+         has-partially-operable-accounts? (-> (get-in db [:wallet :accounts])
+                                              partially-operable-accounts?)]
+     {:fx [(if has-partially-operable-accounts?
+             [:dispatch
+              [:wallet/make-partially-operable-accounts-fully-operable
+               {:password   masked-password
+                :on-success on-auth-success-callback
+                :on-error   on-auth-success-callback}]]
+             [:effects.standard-auth/on-auth-success on-auth-success-callback])]})))
+
 (defn- handle-password-success
-  [has-partially-operable-accounts? on-auth-success masked-password]
+  [{:keys [migrate-partially-operable-accounts? on-auth-success masked-password]}]
   (let [on-auth-success-callback #(on-auth-success masked-password)]
     (rf/dispatch [:standard-auth/set-success true])
     (rf/dispatch [:standard-auth/reset-login-password])
-    (if has-partially-operable-accounts?
-      (rf/dispatch [:wallet/make-partially-operable-accounts-fully-operable
-                    {:password   masked-password
-                     :on-success on-auth-success-callback
-                     :on-error   on-auth-success-callback}])
+    (if migrate-partially-operable-accounts?
+      (rf/dispatch [:standard-auth/migrate-partially-operable-accounts
+                    {:masked-password masked-password
+                     :on-success      on-auth-success}])
       (on-auth-success-callback))))
 
 (defn authorize
@@ -42,9 +61,10 @@
                     {:pin        pin
                      :on-success (fn [{:keys [encryption-public-key]}]
                                    (rf/dispatch [:keycard/disconnect])
-                                   (handle-password-success false
-                                                            on-auth-success
-                                                            (security/mask-data encryption-public-key)))
+                                   (handle-password-success {:migrate-partially-operable-accounts? false
+                                                             :on-auth-success on-auth-success
+                                                             :masked-password (security/mask-data
+                                                                               encryption-public-key)}))
                      :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error
                                                 %])}]))}]))}]]
         [:effects.biometric/check-if-available
@@ -85,7 +105,12 @@
         keycard? (get-in db [:profile/profile :keycard-pairing])]
     {:fx [(if keycard?
             [:keychain/get-keycard-keys [key-uid on-auth-success]]
-            [:keychain/get-user-password [key-uid on-auth-success]])
+            [:keychain/get-user-password
+             [key-uid
+              (fn [masked-password]
+                (rf/dispatch [:standard-auth/migrate-partially-operable-accounts
+                              {:masked-password masked-password
+                               :on-success      on-auth-success}]))]])
           [:dispatch [:standard-auth/set-success true]]
           [:dispatch [:standard-auth/reset-login-password]]]}))
 
@@ -108,15 +133,14 @@
 (defn- bottom-sheet-password-view
   [{:keys [on-press-biometric on-auth-success auth-button-icon-left auth-button-label]}]
   (fn []
-    (let [has-partially-operable-accounts? (rf/sub [:wallet/has-partially-operable-accounts?])]
-      [enter-password/view
-       {:on-enter-password   #(handle-password-success
-                               has-partially-operable-accounts?
-                               on-auth-success
-                               (security/hash-masked-password %))
-        :on-press-biometrics on-press-biometric
-        :button-icon-left    auth-button-icon-left
-        :button-label        auth-button-label}])))
+    [enter-password/view
+     {:on-enter-password   #(handle-password-success {:migrate-partially-operable-accounts? true
+                                                      :on-auth-success on-auth-success
+                                                      :masked-password (security/hash-masked-password
+                                                                        %)})
+      :on-press-biometrics on-press-biometric
+      :button-icon-left    auth-button-icon-left
+      :button-label        auth-button-label}]))
 
 (defn authorize-with-keycard
   [_ [{:keys [on-complete]}]]
@@ -155,6 +179,12 @@
    (when on-close
      (on-close success?))))
 
+(rf/reg-fx
+ :effects.standard-auth/on-auth-success
+ (fn [on-auth-success]
+   (when on-auth-success
+     (on-auth-success))))
+
 (rf/reg-event-fx
  :standard-auth/close
  (fn [{:keys [db]} [on-close]]

src/quo/components/onboarding/small_option_card/view.cljs

@@ -1,5 +1,7 @@
 (ns status-im.contexts.keycard.create.events
   (:require [clojure.string :as string]
+            [status-im.common.resources :as resources]
+            [utils.i18n :as i18n]
             [utils.re-frame :as rf]
             [utils.security.core :as security]))
 
@@ -49,10 +51,13 @@
               security/safe-unmask-data
               (string/join " ")
               security/mask-data))
-    :fx [[:dispatch [:keycard/create.create-or-enter-pin]]]}))
+    :fx [[:dispatch
+          [:keycard/create.create-or-enter-pin
+           {:ready-to-add-screen-title (i18n/label :t/ready-add-keypair-keycard)
+            :ready-to-add-screen-image (resources/get-image :add-key-to-keycard)}]]]}))
 
 (rf/reg-event-fx :keycard/create.create-or-enter-pin
- (fn [{:keys [db]}]
+ (fn [{:keys [db]} [{:keys [ready-to-add-screen-title ready-to-add-screen-image]}]]
    (let [{:keys [initialized?]} (get-in db [:keycard :application-info])]
      {:fx [[:dispatch [:navigate-back]]
            (if initialized?
@@ -66,7 +71,9 @@
                {:on-complete (fn [new-pin]
                                (rf/dispatch [:navigate-back])
                                (rf/dispatch [:keycard/create.save-pin new-pin])
-                               (rf/dispatch [:open-modal :screen/keycard.create.ready-to-add]))}]])]})))
+                               (rf/dispatch [:open-modal :screen/keycard.create.ready-to-add
+                                             {:title ready-to-add-screen-title
+                                              :image ready-to-add-screen-image}]))}]])]})))
 
 (rf/reg-event-fx :keycard/create.save-pin
  (fn [{:keys [db]} [pin]]
@@ -123,4 +130,7 @@
    (if (contains? (:profile/profiles-overview db) key-uid)
      {:fx [[:dispatch [:onboarding/multiaccount-already-exists key-uid]]]}
      {:db (assoc-in db [:keycard :create :masked-phrase] masked-seed-phrase)
-      :fx [[:dispatch [:keycard/create.create-or-enter-pin]]]})))
+      :fx [[:dispatch
+            [:keycard/create.create-or-enter-pin
+             {:ready-to-add-screen-title (i18n/label :t/ready-to-import-keypair-keycard)
+              :ready-to-add-screen-image (resources/get-image :import-key-to-keycard)}]]]})))