lint

status-im · Jun 14, 2024 · 7775286 · 7775286
1 parent debb454
commit 7775286
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/status_im/contexts/wallet/db.cljs b/src/status_im/contexts/wallet/db.cljs
@@ -6,5 +6,5 @@
    :selected-networks (set constants/default-network-names)})
 
 (def defaults
-  {:ui {:network-filter  network-filter-defaults
-        :tokens-loading? true}})
+  {:ui {:network-filter network-filter-defaults
+        :tokens-loading {}}})
diff --git a/src/status_im/subs/wallet/wallet.cljs b/src/status_im/subs/wallet/wallet.cljs
@@ -47,10 +47,12 @@
  :wallet/home-tokens-loading?
  :<- [:wallet/tokens-loading]
  (fn [tokens-loading]
-   (->> tokens-loading
-        vals
-        (some true?)
-        boolean)))
+   (if (empty? tokens-loading)
+     true
+     (->> tokens-loading
+          vals
+          (some true?)
+          boolean))))
 
 (rf/reg-sub
  :wallet/current-viewing-account-tokens-loading?
@@ -335,7 +337,8 @@
                   :customization-color color
                   :type                (if watch-only? :watch-only :empty)
                   :on-press            #(rf/dispatch [:wallet/navigate-to-account address])
-                  :loading?            (get tokens-loading address)
+                  :loading?            (or (get tokens-loading address)
+                                           (not (contains? tokens-loading address)))
                   :balance             (utils/prettify-balance currency-symbol (get balances address))))
          accounts)))