diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs index bb9832d230..31f39e88fb 100644 --- a/src/status_im/subs.cljs +++ b/src/status_im/subs.cljs @@ -482,6 +482,12 @@ (fn [[macc acc]] (some #(when (= (:address %) (:address acc)) %) (:accounts macc)))) +(re-frame/reg-sub + :multiple-multiaccounts? + :<- [:multiaccounts/multiaccounts] + (fn [multiaccounts] + (> (count multiaccounts) 1))) + ;;CHAT ============================================================================================================== (re-frame/reg-sub diff --git a/src/status_im/ui/screens/keycard/views.cljs b/src/status_im/ui/screens/keycard/views.cljs index 47e86e1a2e..bbe9d04424 100644 --- a/src/status_im/ui/screens/keycard/views.cljs +++ b/src/status_im/ui/screens/keycard/views.cljs @@ -3,6 +3,7 @@ (:require [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.toolbar.actions :as actions] [status-im.ui.screens.keycard.styles :as styles] [status-im.i18n :as i18n] [status-im.ui.components.colors :as colors] @@ -363,15 +364,16 @@ enter-step [:hardwallet/pin-enter-step] status [:hardwallet/pin-status] error-label [:hardwallet/pin-error-label] + multiple-multiaccounts? [:multiple-multiaccounts?] {:keys [address name] :as account} [:multiaccounts/login]] [react/view styles/container [toolbar/toolbar {:transparent? true :style {:margin-top 32}} - [toolbar/nav-text - {:handler #(re-frame/dispatch [:keycard.login.pin.ui/cancel-pressed]) - :style {:padding-left 21}} - (i18n/label :t/cancel)] + (when multiple-multiaccounts? + [toolbar/nav-button + (actions/back + #(re-frame/dispatch [:keycard.login.pin.ui/cancel-pressed]))]) [react/text {:style {:color colors/gray}} (i18n/label :t/step-i-of-n {:number 2 :step 1})]