From 796bd4ac454daa69c7658a0eaf1e1d4cfbcdf1fd Mon Sep 17 00:00:00 2001 From: ibrkhalil Date: Wed, 4 Jan 2023 10:31:05 +0200 Subject: [PATCH] Lint --- src/quo2/components/list_items/menu_item.cljs | 12 ++++++------ src/status_im/ui/screens/home/sheet/views.cljs | 5 +++-- .../screens/chat/components/new_chat/view.cljs | 3 ++- .../common/contact_list_item/view.cljs | 17 ----------------- src/status_im2/common/home/actions/view.cljs | 16 ++++++++-------- 5 files changed, 19 insertions(+), 34 deletions(-) diff --git a/src/quo2/components/list_items/menu_item.cljs b/src/quo2/components/list_items/menu_item.cljs index d65b7c9f5c..69f4cda793 100644 --- a/src/quo2/components/list_items/menu_item.cljs +++ b/src/quo2/components/list_items/menu_item.cljs @@ -7,12 +7,12 @@ (defn themes [type] (case type - :main {:icon-color (theme-colors colors/neutral-50 colors/neutral-10) - :background (theme-colors colors/white colors/neutral-90) - :text-color (theme-colors colors/neutral-100 colors/white)} - :danger {:icon-color (theme-colors colors/danger-50 colors/danger-60) - :background (theme-colors colors/white colors/neutral-90) - :text-color (theme-colors colors/danger-50 colors/danger-60)} + :main {:icon-color (theme-colors colors/neutral-50 colors/neutral-10) + :background (theme-colors colors/white colors/neutral-90) + :text-color (theme-colors colors/neutral-100 colors/white)} + :danger {:icon-color (theme-colors colors/danger-50 colors/danger-60) + :background (theme-colors colors/white colors/neutral-90) + :text-color (theme-colors colors/danger-50 colors/danger-60)} :transparent {:icon-color (theme-colors colors/neutral-50 colors/neutral-10) :text-color (theme-colors colors/neutral-100 colors/white)})) diff --git a/src/status_im/ui/screens/home/sheet/views.cljs b/src/status_im/ui/screens/home/sheet/views.cljs index b6b83aae3c..f789635f9f 100644 --- a/src/status_im/ui/screens/home/sheet/views.cljs +++ b/src/status_im/ui/screens/home/sheet/views.cljs @@ -71,8 +71,9 @@ :icon-bg-color :transparent :type :transparent :container-padding-vertical 12 - :style-props {:border-bottom-width 1 - :border-color (colors/theme-colors colors/neutral-10 colors/neutral-90)} + :style-props {:border-bottom-width 1 + :border-color (colors/theme-colors colors/neutral-10 + colors/neutral-90)} :title-column-style {:margin-left 2} :icon-color (colors/theme-colors colors/neutral-50 colors/neutral-40) :accessibility-label :start-a-new-chat diff --git a/src/status_im/ui2/screens/chat/components/new_chat/view.cljs b/src/status_im/ui2/screens/chat/components/new_chat/view.cljs index 9f5fca3bdf..bec2d23a74 100644 --- a/src/status_im/ui2/screens/chat/components/new_chat/view.cljs +++ b/src/status_im/ui2/screens/chat/components/new_chat/view.cljs @@ -122,7 +122,8 @@ (if one-contact-selected? (hide-sheet-and-dispatch [:chat.ui/start-chat public-key]) - (hide-sheet-and-dispatch [:navigate-to :new-group])))} + (hide-sheet-and-dispatch [:navigate-to + :new-group])))} (if one-contact-selected? (i18n/label :t/chat-with {:selected-user first-username}) (i18n/label :t/setup-group-chat))]}])]))]) diff --git a/src/status_im2/common/contact_list_item/view.cljs b/src/status_im2/common/contact_list_item/view.cljs index e3f1940914..99d3009abd 100644 --- a/src/status_im2/common/contact_list_item/view.cljs +++ b/src/status_im2/common/contact_list_item/view.cljs @@ -46,32 +46,15 @@ :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/common/home/actions/view.cljs b/src/status_im2/common/home/actions/view.cljs index 983c95a639..4e3a613ef8 100644 --- a/src/status_im2/common/home/actions/view.cljs +++ b/src/status_im2/common/home/actions/view.cljs @@ -1,13 +1,13 @@ (ns status-im2.common.home.actions.view (:require ;;TODO move to - ;;status-im2 - [i18n.i18n :as i18n] - [quo2.components.drawers.action-drawers :as drawer] - [status-im.chat.models :as chat.models] - [status-im2.common.bottom-sheet.view :refer [close-bottom-sheet-fn]] - [status-im2.common.confirmation-drawer.view :as confirmation-drawer] ;;TODO move to - [status-im2.common.constants :as constants] - [utils.re-frame :as rf])) + ;;status-im2 + [i18n.i18n :as i18n] + [quo2.components.drawers.action-drawers :as drawer] + [status-im.chat.models :as chat.models] + [status-im2.common.bottom-sheet.view :refer [close-bottom-sheet-fn]] + [status-im2.common.confirmation-drawer.view :as confirmation-drawer] ;;TODO move to + [status-im2.common.constants :as constants] + [utils.re-frame :as rf])) (defn- entry [{:keys [icon label on-press danger? sub-label chevron? add-divider? accessibility-label]}]