lint

Author: OmarBasem

src/quo2/components/wallet/network_amount/view.cljs

@@ -7,7 +7,7 @@
     [quo2.components.wallet.network-amount.style :as style]
     [quo2.foundations.resources :as resources]))
 
-(defn- network-amount-internal
+(defn- view-internal
   [{:keys [amount token theme]}]
   [rn/view {:style style/container}
    [rn/image
@@ -21,4 +21,4 @@
    [rn/view
     {:style (style/divider theme)}]])
 
-(def network-amount (quo.theme/with-theme network-amount-internal))
+(def view (quo.theme/with-theme view-internal))

src/quo2/core.cljs

@@ -284,10 +284,10 @@
 (def url-preview-list quo2.components.links.url-preview-list.view/view)
 (def link-preview quo2.components.links.link-preview.view/view)
 
-<<<<<<< HEAD
+
 ;;;; GRADIENT
 (def gradient-cover quo2.components.gradient.gradient-cover.view/view)
-=======
+
 ;;;; WALLET
-(def network-amount quo2.components.wallet.network-amount.view/network-amount)
->>>>>>> 0cde849f5 (feat: network amount comp)
+(def network-amount quo2.components.wallet.network-amount.view/view)
+

src/quo2/core_spec.cljs

@@ -45,4 +45,5 @@
     [quo2.components.settings.settings-list.component-spec]
     [quo2.components.settings.category.component-spec]
     [quo2.components.share.share-qr-code.component-spec]
-    [quo2.components.tags.status-tags-component-spec]))
+    [quo2.components.tags.status-tags-component-spec]
+    [quo2.components.wallet.network-amount.component-spec]))

src/status_im2/contexts/quo_preview/main.cljs

@@ -100,11 +100,8 @@
     [status-im2.contexts.quo-preview.keycard.keycard :as keycard]
     [status-im2.contexts.quo-preview.loaders.skeleton :as skeleton]
     [status-im2.contexts.quo-preview.community.channel-actions :as channel-actions]
-<<<<<<< HEAD
-    [status-im2.contexts.quo-preview.gradient.gradient-cover :as gradient-cover]))
-=======
+    [status-im2.contexts.quo-preview.gradient.gradient-cover :as gradient-cover]
     [status-im2.contexts.quo-preview.wallet.network-amount :as network-amount]))
->>>>>>> 0cde849f5 (feat: network amount comp)
 
 (def screens-categories
   {:foundations       [{:name      :shadows