Fixup

src/status_im/hardwallet/core.cljs

@@ -451,6 +451,8 @@
                              :cancel-button-text  ""
                              :confirm-button-text :t/okay}})
 
+;; NOTE: Maybe replaced by multiple events based on on flow to make it easier to maintain.
+;; Because there are many execution paths it is harder to follow all possible states.
 (fx/defn check-card-state
   {:events [:hardwallet/check-card-state]}
   [{:keys [db] :as cofx}]

src/status_im/hardwallet/onboarding.cljs

@@ -297,7 +297,7 @@
                      (assoc-in [:hardwallet :pin :on-verified] nil))}
             (common/set-on-card-connected :hardwallet/get-application-info)
             (common/set-on-card-read :hardwallet/check-card-state)
-            (common/show-pair-sheet {:on-cancel [::cancel-pressed]})))
+            (common/show-pair-sheet {})))
 
 (fx/defn cancel-confirm
   {:events [::cancel-confirm]}

src/status_im/ui/screens/keycard/views.cljs

@@ -225,14 +225,12 @@
             retry-counter [:hardwallet/retry-counter]]
     [react/view styles/container
      [topbar/topbar
-      (cond-> {:accessories [{:icon    :main-icons/more
-                              :handler #(re-frame/dispatch [:keycard.login.pin.ui/more-icon-pressed])}]}
-        ;; multiple-multiaccounts?
-        ;; (assoc :navigation
-        ;;        {:icon                :main-icons/back
-        ;;         :accessibility-label :back-button
-        ;;         :handler             #(re-frame/dispatch [:keycard.login.pin.ui/cancel-pressed])})
-)]
+      {:accessories [{:icon    :main-icons/more
+                      :handler #(re-frame/dispatch [:keycard.login.pin.ui/more-icon-pressed])}]
+       :navigation
+       {:icon                :main-icons/back
+        :accessibility-label :back-button
+        :handler             #(re-frame/dispatch [:keycard.login.pin.ui/cancel-pressed])}}]
      [react/view {:flex            1
                   :flex-direction  :column
                   :justify-content :space-between