add config for all balances

src/status_im/config.cljs

@@ -134,4 +134,4 @@
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
 (def test-networks-enabled? (enabled? (get-config :TEST_NETWORKS_ENABLED "0")))
 
-(def include-watch-only-balance-in-total? false)
+(def include-watch-only-balance-in-total? true)

src/status_im/contexts/wallet/home/view.cljs

@@ -43,7 +43,7 @@
         networks                        (rf/sub [:wallet/selected-network-details])
         account-cards-data              (rf/sub [:wallet/account-cards-data])
         cards                           (conj account-cards-data (new-account-card-data))
-        {:keys [formatted-balance]}     (rf/sub [:wallet/total-owned-accounts-balance])]
+        {:keys [formatted-balance]}     (rf/sub [:wallet/aggregated-token-values-and-balance])]
     (rn/use-effect (fn []
                      (when (and @account-list-ref (pos? (count cards)))
                        (.scrollToOffset ^js @account-list-ref

src/status_im/subs/wallet/wallet.cljs

@@ -292,8 +292,10 @@
 (rf/reg-sub
  :wallet/aggregated-tokens
  :<- [:wallet/accounts]
- (fn [accounts]
-   (utils/aggregate-tokens-for-all-accounts accounts)))
+ :<- [:wallet/accounts-without-watched-accounts]
+ (fn [[all-accounts owned-accounts]]
+   (let [accounts (if config/include-watch-only-balance-in-total? all-accounts owned-accounts)]
+   (utils/aggregate-tokens-for-all-accounts accounts))))
 
 (rf/reg-sub
  :wallet/aggregated-tokens-in-selected-networks
@@ -320,19 +322,6 @@
                                                               :currency-symbol currency-symbol})
                                aggregated-tokens)})))
 
-(rf/reg-sub
- :wallet/total-owned-accounts-balance
- :<- [:wallet/accounts]
- :<- [:wallet/accounts-without-watched-accounts]
- :<- [:wallet/balances-in-selected-networks]
- :<- [:profile/currency-symbol]
- (fn [[all-accounts owned-accounts balances currency-symbol]]
-   (let [accounts          (if config/include-watch-only-balance-in-total? all-accounts owned-accounts)
-         raw-balance       (utils/calculate-balance-from-accounts accounts balances)
-         formatted-balance (utils/prettify-balance currency-symbol raw-balance)]
-     {:balance           raw-balance
-      :formatted-balance formatted-balance})))
-
 (rf/reg-sub
  :wallet/network-preference-details
  :<- [:wallet/current-viewing-account]