[Fix] Nav bar in Syncing screen (#16014)

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
This commit is contained in:
Mohamed Javid 2023-05-27 00:28:18 +08:00 committed by GitHub
parent a18cf2f786
commit 2d1b37ab7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions

View File

@ -1,11 +1,9 @@
(ns status-im2.contexts.syncing.setup-syncing.style (ns status-im2.contexts.syncing.setup-syncing.style
(:require [quo2.foundations.colors :as colors])) (:require [quo2.foundations.colors :as colors]))
(defn container-main (def container-main
[top]
{:background-color colors/neutral-95 {:background-color colors/neutral-95
:flex 1 :flex 1})
:padding-top top})
(def page-container (def page-container
{:margin-horizontal 20}) {:margin-horizontal 20})

View File

@ -12,7 +12,6 @@
[reagent.core :as reagent] [reagent.core :as reagent]
[status-im2.common.resources :as resources] [status-im2.common.resources :as resources]
[react-native.hooks :as hooks] [react-native.hooks :as hooks]
[react-native.safe-area :as safe-area]
[status-im2.contexts.syncing.utils :as sync-utils])) [status-im2.contexts.syncing.utils :as sync-utils]))
(def code-valid-for-ms 120000) (def code-valid-for-ms 120000)
@ -66,7 +65,7 @@
(reset! valid-for-ms code-valid-for-ms))] (reset! valid-for-ms code-valid-for-ms))]
(fn [] (fn []
[rn/view {:style (style/container-main (safe-area/get-top))} [rn/view {:style style/container-main}
[:f> f-use-interval clock cleanup-clock @delay] [:f> f-use-interval clock cleanup-clock @delay]
[rn/scroll-view {} [rn/scroll-view {}
[navigation-bar] [navigation-bar]

View File

@ -90,6 +90,12 @@
:animations {:showModal {:alpha {:from 1 :to 1 :duration 300}} :animations {:showModal {:alpha {:from 1 :to 1 :duration 300}}
:dismissModal {:alpha {:from 1 :to 1 :duration 300}}}}) :dismissModal {:alpha {:from 1 :to 1 :duration 300}}}})
(def dark-screen
(merge (statusbar true)
{:layout {:componentBackgroundColor colors/neutral-95
:orientation ["portrait"]
:backgroundColor colors/neutral-95}}))
(def lightbox (def lightbox
{:topBar {:visible false} {:topBar {:visible false}
:statusBar {:backgroundColor :transparent :statusBar {:backgroundColor :transparent

View File

@ -95,12 +95,11 @@
:component communities.overview/overview} :component communities.overview/overview}
{:name :settings-syncing {:name :settings-syncing
:options (options/statusbar true) :options (merge options/dark-screen {:insets {:top? true}})
:component settings-syncing/view} :component settings-syncing/view}
{:name :settings-setup-syncing {:name :settings-setup-syncing
:options (options/statusbar true) :options (merge options/dark-screen {:insets {:top? true}})
:component settings-setup-syncing/view} :component settings-setup-syncing/view}
;; Onboarding ;; Onboarding