Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
 into issue-13832

Merge
  • Loading branch information
ibrkhalil committed Sep 6, 2022
2 parents 94e2137 + b9015c5 commit 5d6b4c8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
3 changes: 2 additions & 1 deletion src/status_im/contact/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@

(and blocked (not was-blocked))
(conj [::contact.block/contact-blocked contact chats]))))
[[:offload-messages constants/timeline-chat-id]]
[[:offload-messages constants/timeline-chat-id]
[:get-activity-center-notifications-count]]
contacts)]
(merge
{:db (update db :contacts/contacts
Expand Down
7 changes: 0 additions & 7 deletions src/status_im/keycard/onboarding.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,6 @@
(assoc-in [:keycard :recovery-phrase :input-word] nil)
(assoc-in [:keycard :setup-step] :recovery-phrase-confirm-word2))})

(fx/defn recovery-phrase-confirm-word-back-pressed
{:events [:keycard.onboarding.recovery-phrase-confirm-word.ui/back-pressed]}
[{:keys [db] :as cofx}]
(if (= (:view-id db) :keycard-onboarding-recovery-phrase-confirm-word1)
(navigation/navigate-to-cofx cofx :keycard-onboarding-recovery-phrase nil)
(navigation/navigate-to-cofx cofx :keycard-onboarding-recovery-phrase-confirm-word1 nil)))

(fx/defn proceed-with-generating-key
[{:keys [db] :as cofx}]
(let [pin (get-in db [:keycard :secrets :pin]
Expand Down
7 changes: 1 addition & 6 deletions src/status_im/ui/screens/keycard/onboarding/views.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -310,12 +310,7 @@
:width 250}
[tooltip/tooltip error]]]
[bottom-toolbar/toolbar
{:left
[quo/button {:on-press #(re-frame/dispatch [:keycard.onboarding.recovery-phrase-confirm-word.ui/back-pressed])
:type :secondary
:before :main-icon/back}
(i18n/label :t/back)]
:right
{:right
[quo/button {:on-press #(re-frame/dispatch [:keycard.onboarding.recovery-phrase-confirm-word.ui/next-pressed])
:accessibility-label :next
:disabled (empty? input-word)
Expand Down

0 comments on commit 5d6b4c8

Please sign in to comment.