From 9deb5dbf56891c6a84f96947d7e4e656e38d56a9 Mon Sep 17 00:00:00 2001 From: ibrahem Date: Sun, 1 Jan 2023 18:37:30 +0200 Subject: [PATCH] Formatting --- .../common/contact_list_item/view.cljs | 17 +++++++++++++++++ src/status_im2/subs/contact_test.cljs | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/status_im2/common/contact_list_item/view.cljs b/src/status_im2/common/contact_list_item/view.cljs index 99d3009abd..e3f1940914 100644 --- a/src/status_im2/common/contact_list_item/view.cljs +++ b/src/status_im2/common/contact_list_item/view.cljs @@ -46,15 +46,32 @@ :right 20}} (if (= icon :options) [quo/icon :i/options +<<<<<<< HEAD {:size 20 :color (colors/theme-colors colors/neutral-50 colors/neutral-40)}] +======= + {:size 20 :color (colors/theme-colors colors/neutral-50 colors/neutral-40)}] +>>>>>>> 17d3ad846 (Formatting) (react/use-memo (fn [] [quo/checkbox {:default-checked? @checked? :accessibility-label :contact-toggle-check :disabled? (and member? (not admin?)) +<<<<<<< HEAD :on-change on-check}]) +======= + :on-change (fn [selected] + (if start-a-new-chat? + (on-toggle true @checked? public-key) + (if-not member? + (if selected + (rf/dispatch [:select-participant public-key true]) + (rf/dispatch [:deselect-participant public-key true])) + (if selected + (rf/dispatch [:undo-deselect-member public-key true]) + (rf/dispatch [:deselect-member public-key true])))))}]) +>>>>>>> 17d3ad846 (Formatting) [checked?]))])])) (defn contact-list-item diff --git a/src/status_im2/subs/contact_test.cljs b/src/status_im2/subs/contact_test.cljs index 317d7368d1..c9352cea10 100644 --- a/src/status_im2/subs/contact_test.cljs +++ b/src/status_im2/subs/contact_test.cljs @@ -4,7 +4,6 @@ [status-im.test-helpers :as h] status-im2.subs.contact [utils.re-frame :as rf])) - (def ^:private contacts-sample-data {:selected-contacts-count 1 :contacts/contacts {"0xtest" {:last-updated 1672582629695