fix(wallet): Wallet Home jumping (#20347)

This commit is contained in:
Omar Basem 2024-06-14 18:07:00 +04:00 committed by GitHub
parent 686f6bdf5e
commit 6a3794f380
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 10 deletions

View File

@ -2,12 +2,13 @@
(:require
[quo.foundations.colors :as colors]))
(def container-info
(defn container-info
[{:keys [metrics]}]
{:padding-horizontal 20
:padding-top 12
:padding-bottom 32
:flex-grow 1
:max-height 98})
:height (if (= metrics :none) 78 98)})
(def container-info-top
{:flex-direction :row

View File

@ -116,7 +116,7 @@
(defn- view-internal
[props]
[rn/view {:style style/container-info}
[rn/view {:style (style/container-info props)}
[view-info-top props]
[view-info-bottom props]])

View File

@ -59,7 +59,6 @@
:on-error #(log/error "failed to start messenger" %)}]]
[:dispatch [:universal-links/generate-profile-url]]
[:dispatch [:community/fetch]]
[:dispatch [:wallet/initialize]]
[:push-notifications/load-preferences]
[:profile.config/get-node-config]
[:logs/set-level log-level]
@ -145,6 +144,7 @@
(when (and new-account? (not recovered-account?))
[:dispatch [:wallet-legacy/set-initial-blocks-range]])
[:dispatch [:ens/update-usernames ensUsernames]]
[:dispatch [:wallet/initialize]]
[:dispatch [:profile.login/login-existing-profile settings account]]]})))
(rf/reg-event-fx

View File

@ -6,4 +6,5 @@
:selected-networks (set constants/default-network-names)})
(def defaults
{:ui {:network-filter network-filter-defaults}})
{:ui {:network-filter network-filter-defaults
:tokens-loading {}}})

View File

@ -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)))