fix Keycard UI issues (#22075)

Author: Parveshdhull

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

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

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

@@ -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}]]))

src/status_im/contexts/keycard/create/view.cljs

@@ -24,6 +24,7 @@
       :title               (i18n/label :t/check-keycard)
       :subtitle            (i18n/label :t/see-keycard-ready)
       :button-label        (i18n/label :t/scan-keycard)
+      :button-props        {:type :primary :icon-left :i/keycard}
       :accessibility-label :get-keycard
       :image               (resources/get-image :check-your-keycard)
       :on-press            #(rf/dispatch [:keycard/create.check-empty-card])}]

src/status_im/contexts/keycard/empty/view.cljs

@@ -25,7 +25,7 @@
      :accessibility-label :create-new-profile-keycard
      :container-style     {:margin-horizontal 20 :margin-top 8}
      :image               (resources/get-image :keycard-buy)
-     :button-type         :primary
+     :button-props        {:type :primary}
      :on-press            #(rf/dispatch [:keycard/create.get-phrase])}]
    [quo/small-option-card
     {:variant             :icon

src/status_im/contexts/keycard/error/view.cljs

@@ -15,9 +15,9 @@
                                          :description (i18n/label :t/cant-store-new-keys)}
    :keycard/error.keycard-unpaired      {:title       (i18n/label :t/keycard-full)
                                          :description (i18n/label :t/pairing-slots-occupied)}
-   :keycard/error.keycard-frozen        {:title       (i18n/label :t/keycard-locked)
+   :keycard/error.keycard-frozen        {:title       (i18n/label :t/keycard-blocked)
                                          :description (i18n/label :t/cant-use-right-now)}
-   :keycard/error.keycard-locked        {:title       (i18n/label :t/keycard-locked)
+   :keycard/error.keycard-locked        {:title       (i18n/label :t/keycard-blocked)
                                          :description (i18n/label :t/cant-use-right-now)}})
 
 (defn view

translations/en.json

@@ -1388,6 +1388,7 @@
   "keycard-backup-success-body": "Backup card created successfully. You can now use it with your account just like the primary card.",
   "keycard-backup-success-title": "Backup successful",
   "keycard-blocked": "Keycard has been blocked.\nYou need to reset card to continue using it.",
+  "keycard-blocked": "Keycard is blocked",
   "keycard-can-use-with-new-passcode": "You can use this card with your new passcode",
   "keycard-cancel-setup-text": "This will cancel keycard setup. It's highly recommended to finish the setup in order to use keycard. Do you really want to cancel?",
   "keycard-cancel-setup-title": "Dangerous operation",
@@ -1417,7 +1418,6 @@
   "keycard-is-frozen-factory-reset": "Reset with mnemonic",
   "keycard-is-frozen-reset": "Reset with PUK",
   "keycard-is-frozen-title": "Keycard is frozen",
-  "keycard-locked": "Keycard is locked",
   "keycard-migration-failed-instruction-1": "Try logging out and logging back in with Keycard; everything might work fine.",
   "keycard-migration-failed-instruction-2": "If the key pair hasn’t migrated to Keycard, remove your profile, and recover it using your recovery phrase.",
   "keycard-not-empty": "Keycard is not empty",