From 2d1b37ab7baa970231d61a3f1d7844ecf2169c6e Mon Sep 17 00:00:00 2001
From: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
Date: Sat, 27 May 2023 00:28:18 +0800
Subject: [PATCH] [Fix] Nav bar in Syncing screen (#16014)

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
---
 src/status_im2/contexts/syncing/setup_syncing/style.cljs | 6 ++----
 src/status_im2/contexts/syncing/setup_syncing/view.cljs  | 3 +--
 src/status_im2/navigation/options.cljs                   | 6 ++++++
 src/status_im2/navigation/screens.cljs                   | 5 ++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/status_im2/contexts/syncing/setup_syncing/style.cljs b/src/status_im2/contexts/syncing/setup_syncing/style.cljs
index 418788fce9..5cdabc83e2 100644
--- a/src/status_im2/contexts/syncing/setup_syncing/style.cljs
+++ b/src/status_im2/contexts/syncing/setup_syncing/style.cljs
@@ -1,11 +1,9 @@
 (ns status-im2.contexts.syncing.setup-syncing.style
   (:require [quo2.foundations.colors :as colors]))
 
-(defn container-main
-  [top]
+(def container-main
   {:background-color colors/neutral-95
-   :flex             1
-   :padding-top      top})
+   :flex             1})
 
 (def page-container
   {:margin-horizontal 20})
diff --git a/src/status_im2/contexts/syncing/setup_syncing/view.cljs b/src/status_im2/contexts/syncing/setup_syncing/view.cljs
index b2e11e6bc2..500763d11a 100644
--- a/src/status_im2/contexts/syncing/setup_syncing/view.cljs
+++ b/src/status_im2/contexts/syncing/setup_syncing/view.cljs
@@ -12,7 +12,6 @@
             [reagent.core :as reagent]
             [status-im2.common.resources :as resources]
             [react-native.hooks :as hooks]
-            [react-native.safe-area :as safe-area]
             [status-im2.contexts.syncing.utils :as sync-utils]))
 
 (def code-valid-for-ms 120000)
@@ -66,7 +65,7 @@
                         (reset! valid-for-ms code-valid-for-ms))]
 
     (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]
        [rn/scroll-view {}
         [navigation-bar]
diff --git a/src/status_im2/navigation/options.cljs b/src/status_im2/navigation/options.cljs
index 82cb0bd045..25122e980b 100644
--- a/src/status_im2/navigation/options.cljs
+++ b/src/status_im2/navigation/options.cljs
@@ -90,6 +90,12 @@
    :animations             {:showModal    {: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
   {:topBar        {:visible false}
    :statusBar     {:backgroundColor :transparent
diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs
index fec20f9999..f7afe78497 100644
--- a/src/status_im2/navigation/screens.cljs
+++ b/src/status_im2/navigation/screens.cljs
@@ -95,12 +95,11 @@
      :component communities.overview/overview}
 
     {:name      :settings-syncing
-     :options   (options/statusbar true)
+     :options   (merge options/dark-screen {:insets {:top? true}})
      :component settings-syncing/view}
 
     {:name      :settings-setup-syncing
-     :options   (options/statusbar true)
-
+     :options   (merge options/dark-screen {:insets {:top? true}})
      :component settings-setup-syncing/view}
 
     ;; Onboarding