From 7775286e35f54754d58f4affc355c9b2d38d79ea Mon Sep 17 00:00:00 2001 From: Omar Basem Date: Thu, 13 Jun 2024 17:11:00 +0400 Subject: [PATCH] lint --- src/status_im/contexts/wallet/db.cljs | 4 ++-- src/status_im/subs/wallet/wallet.cljs | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/status_im/contexts/wallet/db.cljs b/src/status_im/contexts/wallet/db.cljs index 17b8aa9dd04..2e53cb87f9c 100644 --- 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 index 69561b99925..8fb0ca10c47 100644 --- 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)))