From 3aa7e103f73711774128d88da1dfb4798ec9756f Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Fri, 26 Jul 2024 13:48:38 +0530 Subject: [PATCH] Sync process is blocked on Enabled notifications screen (#20883) --- .../contexts/onboarding/enable_notifications/view.cljs | 4 ++-- .../contexts/onboarding/syncing/progress/style.cljs | 7 +++++++ .../contexts/onboarding/syncing/progress/view.cljs | 4 +++- .../contexts/onboarding/syncing/results/style.cljs | 7 +++++++ .../contexts/onboarding/syncing/results/view.cljs | 3 ++- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/status_im/contexts/onboarding/enable_notifications/view.cljs b/src/status_im/contexts/onboarding/enable_notifications/view.cljs index 54caa8777b..0c043b8081 100644 --- a/src/status_im/contexts/onboarding/enable_notifications/view.cljs +++ b/src/status_im/contexts/onboarding/enable_notifications/view.cljs @@ -38,7 +38,7 @@ (rf/dispatch [:push-notifications/switch true]) (rf/dispatch [:navigate-to-within-stack [:screen/onboarding.welcome - :screen/onboarding.generating-keys]])) + :screen/onboarding.enable-notifications]])) :type :primary :icon-left :i/notifications :accessibility-label :enable-notifications-button @@ -52,7 +52,7 @@ nil) (rf/dispatch [:navigate-to-within-stack [:screen/onboarding.welcome - :screen/onboarding.generating-keys]])) + :screen/onboarding.enable-notifications]])) :accessibility-label :enable-notifications-later-button :type :grey :background :blur diff --git a/src/status_im/contexts/onboarding/syncing/progress/style.cljs b/src/status_im/contexts/onboarding/syncing/progress/style.cljs index 2704eed627..9cc9a652b5 100644 --- a/src/status_im/contexts/onboarding/syncing/progress/style.cljs +++ b/src/status_im/contexts/onboarding/syncing/progress/style.cljs @@ -2,6 +2,13 @@ (:require [quo.foundations.colors :as colors])) +(def absolute-fill + {:position :absolute + :top 0 + :bottom 0 + :left 0 + :right 0}) + (defn page-container [in-onboarding?] {:flex 1 diff --git a/src/status_im/contexts/onboarding/syncing/progress/view.cljs b/src/status_im/contexts/onboarding/syncing/progress/view.cljs index 5317a746aa..4bd3de32b0 100644 --- a/src/status_im/contexts/onboarding/syncing/progress/view.cljs +++ b/src/status_im/contexts/onboarding/syncing/progress/view.cljs @@ -52,7 +52,9 @@ profile-color (:color (rf/sub [:onboarding/profile])) logged-in? (rf/sub [:multiaccount/logged-in?])] [rn/view {:style (style/page-container in-onboarding?)} - (when-not in-onboarding? [background/view true]) + (when-not in-onboarding? + [rn/view {:style style/absolute-fill} + [background/view true]]) [quo/page-nav {:type :no-title :background :blur}] [page-title (pairing-progress pairing-status)] (if config/show-not-implemented-features? diff --git a/src/status_im/contexts/onboarding/syncing/results/style.cljs b/src/status_im/contexts/onboarding/syncing/results/style.cljs index 53e370e86d..7b65dc0ce0 100644 --- a/src/status_im/contexts/onboarding/syncing/results/style.cljs +++ b/src/status_im/contexts/onboarding/syncing/results/style.cljs @@ -3,6 +3,13 @@ [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) +(def absolute-fill + {:position :absolute + :top 0 + :bottom 0 + :left 0 + :right 0}) + (defn page-container [top] {:flex 1 diff --git a/src/status_im/contexts/onboarding/syncing/results/view.cljs b/src/status_im/contexts/onboarding/syncing/results/view.cljs index 36fe212949..125c17b61e 100644 --- a/src/status_im/contexts/onboarding/syncing/results/view.cljs +++ b/src/status_im/contexts/onboarding/syncing/results/view.cljs @@ -66,7 +66,8 @@ translate-x (reanimated/use-shared-value 0) window-width (:width (rn/get-window))] [rn/view {:style (style/page-container top)} - [background/view true] + [rn/view {:style style/absolute-fill} + [background/view true]] [reanimated/view {:style (style/content translate-x)} [page-title]