From 033f5e480053318aad969d5dbd5e862db57cd347 Mon Sep 17 00:00:00 2001 From: Omar Basem Date: Thu, 21 Dec 2023 21:24:12 +0400 Subject: [PATCH] lint --- src/quo/components/drawers/drawer_top/style.cljs | 6 +++--- src/quo/core_spec.cljs | 10 ++++++++++ .../wallet/common/sheets/network_preferences/view.cljs | 1 - 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/quo/components/drawers/drawer_top/style.cljs b/src/quo/components/drawers/drawer_top/style.cljs index ff1729afaf4..3a7a03a9232 100644 --- a/src/quo/components/drawers/drawer_top/style.cljs +++ b/src/quo/components/drawers/drawer_top/style.cljs @@ -12,9 +12,9 @@ (defn description [theme blur?] - {:color (if blur? - colors/white-opa-40 - (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)) + {:color (if blur? + colors/white-opa-40 + (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)) :margin-top 2}) (def left-container diff --git a/src/quo/core_spec.cljs b/src/quo/core_spec.cljs index 40fe30ed226..4e948ca4ee2 100644 --- a/src/quo/core_spec.cljs +++ b/src/quo/core_spec.cljs @@ -93,6 +93,7 @@ [quo.components.wallet.wallet-activity.component-spec] [quo.components.wallet.wallet-overview.component-spec])) +<<<<<<< HEAD ;; [quo.components.inputs.address-input.component-spec] ;; [quo.components.inputs.title-input.component-spec] ;; [quo.components.list-items.account.component-spec] @@ -100,3 +101,12 @@ ;; [quo.components.list-items.saved-address.component-spec] ;; [quo.components.list-items.saved-contact-address.component-spec] ;; [quo.components.list-items.token-network.component-spec] +======= +;; [quo.components.inputs.address-input.component-spec] +;; [quo.components.inputs.title-input.component-spec] +;; [quo.components.list-items.account.component-spec] +;; [quo.components.list-items.address.component-spec] +;; [quo.components.list-items.saved-address.component-spec] +;; [quo.components.list-items.saved-contact-address.component-spec] +;; [quo.components.list-items.token-network.component-spec] +>>>>>>> 63954db3a (lint) diff --git a/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs b/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs index 9dc27a3b4ab..4cc47f72e2e 100644 --- a/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs +++ b/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs @@ -5,7 +5,6 @@ [quo.foundations.resources :as resources] [quo.theme :as quo.theme] [react-native.blur :as blur] - [react-native.platform :as platform] [reagent.core :as reagent] [status-im.contexts.wallet.common.sheets.network-preferences.style :as style] [utils.i18n :as i18n]