different card

Author: flexsurfer

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

@@ -0,0 +1,20 @@
+(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            "It’s a different Keycard"
+     :description      :text
+     :description-text "Please scan Keycard you previously scanned"}]
+   [rn/view {:style {:flex 1}}]
+   [rn/view {:padding-horizontal 20}
+    [quo/button {:on-press events-helper/navigate-back}
+     (i18n/label :t/try-again)]]])

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

@@ -29,7 +29,11 @@
                            (= error :keycard/error.keycard-blank))
                      (do
                        (rf/dispatch [:navigate-back])
-                       (rf/dispatch [:keycard/on-application-info-error error]))
+                       (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])))
                      (reset-card)))}]))
 
 (defn success-view

src/status_im/navigation/screens.cljs

@@ -33,6 +33,7 @@
     [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]
@@ -895,6 +896,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
@@ -970,14 +978,16 @@
 
    {:name      :screen/keycard.factory-reset.success
     :metrics   {:track? true}
-    :options   {:theme  :dark
-                :insets {:top? true :bottom? true}}
+    :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
-                :insets {:top? true :bottom? true}}
+    :options   {:theme                  :dark
+                :modalPresentationStyle :fullScreen
+                :insets                 {:top? true :bottom? true}}
     :component keycard.factory-reset/failed-view}])
 
 (defn screens