status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-10 09:57:15 +00:00
Code Issues Projects Releases Wiki Activity

Watch-only address balance should not be included in the overall balance by default #19657 (#19716)

Browse Source
This commit is contained in:
mmilad75 2024-04-29 15:34:39 +01:00 committed by GitHub
parent e9c2d24cc3
commit 42e407fbcf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/subs/wallet/wallet.cljs
View File

@ -290,7 +290,7 @@
(rf/reg-sub (rf/reg-sub
:wallet/aggregated-tokens :wallet/aggregated-tokens
:<- [:wallet/accounts] :<- [:wallet/accounts-without-watched-accounts]
(fn [accounts] (fn [accounts]
(utils/aggregate-tokens-for-all-accounts accounts))) (utils/aggregate-tokens-for-all-accounts accounts)))

8
src/status_im/subs/wallet/wallet_test.cljs
View File

@ -495,7 +495,7 @@
eth-token (some #(when (= (:symbol %) "ETH") %) result) eth-token (some #(when (= (:symbol %) "ETH") %) result)
eth-mainnet-raw-balance (get-in eth-token [:balances-per-chain 1 :raw-balance])] eth-mainnet-raw-balance (get-in eth-token [:balances-per-chain 1 :raw-balance])]
(is (match? 2 (count result))) (is (match? 2 (count result)))
(is (money/equal-to (money/bignumber 7520) eth-mainnet-raw-balance))))) (is (money/equal-to (money/bignumber 2520) eth-mainnet-raw-balance)))))
(h/deftest-sub :wallet/aggregated-token-values-and-balance (h/deftest-sub :wallet/aggregated-token-values-and-balance
[sub-name] [sub-name]
@ -505,7 +505,7 @@
(assoc-in [:wallet :accounts] accounts))) (assoc-in [:wallet :accounts] accounts)))
(let [{:keys [formatted-balance tokens]} (rf/sub [sub-name])] (let [{:keys [formatted-balance tokens]} (rf/sub [sub-name])]
(is (match? 2 (count tokens))) (is (match? 2 (count tokens)))
(is (match? "$4506.00" formatted-balance))))) (is (match? "$2106.00" formatted-balance)))))
(h/deftest-sub :wallet/accounts-with-customization-color (h/deftest-sub :wallet/accounts-with-customization-color
[sub-name] [sub-name]
@ -656,8 +656,8 @@
(let [result (rf/sub [sub-name]) (let [result (rf/sub [sub-name])
chains (keys result)] chains (keys result)]
(is (match? (count chains) 3)) (is (match? (count chains) 3))
(is (match? (get result constants/ethereum-mainnet-chain-id) "$3504.00")) (is (match? (get result constants/ethereum-mainnet-chain-id) "$1504.00"))
(is (match? (get result constants/optimism-mainnet-chain-id) "$1002.00"))))) (is (match? (get result constants/optimism-mainnet-chain-id) "$602.00")))))
(h/deftest-sub :wallet/current-viewing-account-fiat-balance-per-chain (h/deftest-sub :wallet/current-viewing-account-fiat-balance-per-chain
[sub-name] [sub-name]