lint

status-im · Dec 21, 2023 · 033f5e4 · 033f5e4
1 parent ad72f06
commit 033f5e4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -93,10 +93,20 @@
     [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]
   ;; [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]
+=======
+;; [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
@@ -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]