diff --git a/src/status_im/ui/screens/home/subs.cljs b/src/status_im/ui/screens/home/subs.cljs index 31b9054981..a8a23094fe 100644 --- a/src/status_im/ui/screens/home/subs.cljs +++ b/src/status_im/ui/screens/home/subs.cljs @@ -12,6 +12,12 @@ :chain-sync-state (fn [{:node/keys [chain-sync-state]} _] chain-sync-state)) +(re-frame/reg-sub + :current-network-initialized? + (fn [db _] + (let [network (get-in db [:account/account :networks (:network db)])] + (boolean network)))) + (re-frame/reg-sub :current-network-uses-rpc? (fn [db _] diff --git a/src/status_im/ui/screens/home/views.cljs b/src/status_im/ui/screens/home/views.cljs index fa3bdcbf98..8fe4439384 100644 --- a/src/status_im/ui/screens/home/views.cljs +++ b/src/status_im/ui/screens/home/views.cljs @@ -92,7 +92,8 @@ view-id [:get :view-id] sync-state [:chain-sync-state] latest-block-number [:latest-block-number] - rpc-network? [:current-network-uses-rpc?]] + rpc-network? [:current-network-uses-rpc?] + network-initialized? [:current-network-initialized?]] {:component-did-mount (fn [this] (let [[_ loading?] (.. this -props -argv)] @@ -108,7 +109,7 @@ (true? old-loading?)) (re-frame/dispatch [:load-chats-messages]))))} [react/view styles/container - [toolbar show-welcome? (not rpc-network?) sync-state latest-block-number] + [toolbar show-welcome? (and network-initialized? (not rpc-network?)) sync-state latest-block-number] (cond show-welcome? [welcome view-id] loading?