lint

status-im · May 13, 2024 · b7c7b50 · b7c7b50
1 parent 47224d2
commit b7c7b50
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 44 deletions.
diff --git a/src/status_im/contexts/wallet/home/view.cljs b/src/status_im/contexts/wallet/home/view.cljs
@@ -85,7 +85,6 @@
      [tokens-loading?])
     [rn/view {:style (style/home-container)}
      [common.top-nav/view]
-<<<<<<< HEAD
      [refreshable-flat-list/view
       {:refresh-control       [rn/refresh-control
                                {:refreshing (and tokens-loading? init-loaded?)
@@ -109,31 +108,3 @@
        :data                  []
        :render-fn             #()
        :footer                [tabs/view {:selected-tab selected-tab}]}]]))
-=======
-     [rn/view
-      [quo/wallet-overview
-       {:state             (if tokens-loading? :loading :default)
-        :time-frame        :none
-        :metrics           :none
-        :balance           formatted-balance
-        :networks          networks
-        :dropdown-on-press #(rf/dispatch [:show-bottom-sheet {:content network-filter/view}])}]]
-     (when (ff/enabled? ::ff/wallet.graph) [quo/wallet-graph {:time-frame :empty}])
-     [rn/flat-list
-      {:ref                               #(reset! account-list-ref %)
-       :style                             style/accounts-list
-       :content-container-style           style/accounts-list-container
-       :data                              cards
-       :horizontal                        true
-       :separator                         [rn/view {:style style/separator}]
-       :render-fn                         (fn [item] [quo/account-card item])
-       :shows-horizontal-scroll-indicator false}]
-     [quo/tabs
-      {:style          style/tabs
-       :size           32
-       :default-active selected-tab
-       :data           tabs-data
-       :on-change      (fn [tab]
-                         (set-selected-tab tab))}]
-     [tabs/view {:selected-tab selected-tab}]]))
->>>>>>> f39e5bfea (lint)
diff --git a/src/status_im/feature_flags.cljs b/src/status_im/feature_flags.cljs
@@ -27,22 +27,7 @@
    ::wallet.wallet-connect              (enabled-in-env? :FLAG_WALLET_CONNECT_ENABLED)})
 
 (defonce ^:private feature-flags-config
-<<<<<<< HEAD
   (reagent/atom initial-flags))
-=======
-  (reagent/atom
-   {::community.edit-account-selection   (enabled-in-env? :FLAG_EDIT_ACCOUNT_SELECTION_ENABLED)
-    ::wallet.assets-modal-hide           (enabled-in-env? :FLAG_ASSETS_MODAL_HIDE)
-    ::wallet.assets-modal-manage-tokens  (enabled-in-env? :FLAG_ASSETS_MODAL_MANAGE_TOKENS)
-    ::wallet.bridge-token                (enabled-in-env? :FLAG_BRIDGE_TOKEN_ENABLED)
-    ::wallet.contacts                    (enabled-in-env? :FLAG_CONTACTS_ENABLED)
-    ::wallet.edit-derivation-path        (enabled-in-env? :FLAG_EDIT_DERIVATION_PATH)
-    ::wallet.graph                       (enabled-in-env? :FLAG_GRAPH_ENABLED)
-    ::wallet.import-private-key          (enabled-in-env? :FLAG_IMPORT_PRIVATE_KEY_ENABLED)
-    ::wallet.long-press-watch-only-asset (enabled-in-env? :FLAG_LONG_PRESS_WATCH_ONLY_ASSET_ENABLED)
-    ::wallet.swap                        (enabled-in-env? :FLAG_SWAP_ENABLED)
-    ::wallet.wallet-connect              (enabled-in-env? :FLAG_WALLET_CONNECT_ENABLED)}))
->>>>>>> d84afea14 (lint)
 
 (defn feature-flags [] @feature-flags-config)