Sync process is blocked on Enabled notifications screen (#20883)
This commit is contained in:
parent
c1d2d44da4
commit
3aa7e103f7
|
@ -38,7 +38,7 @@
|
||||||
(rf/dispatch [:push-notifications/switch true])
|
(rf/dispatch [:push-notifications/switch true])
|
||||||
(rf/dispatch [:navigate-to-within-stack
|
(rf/dispatch [:navigate-to-within-stack
|
||||||
[:screen/onboarding.welcome
|
[:screen/onboarding.welcome
|
||||||
:screen/onboarding.generating-keys]]))
|
:screen/onboarding.enable-notifications]]))
|
||||||
:type :primary
|
:type :primary
|
||||||
:icon-left :i/notifications
|
:icon-left :i/notifications
|
||||||
:accessibility-label :enable-notifications-button
|
:accessibility-label :enable-notifications-button
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
nil)
|
nil)
|
||||||
(rf/dispatch [:navigate-to-within-stack
|
(rf/dispatch [:navigate-to-within-stack
|
||||||
[:screen/onboarding.welcome
|
[:screen/onboarding.welcome
|
||||||
:screen/onboarding.generating-keys]]))
|
:screen/onboarding.enable-notifications]]))
|
||||||
:accessibility-label :enable-notifications-later-button
|
:accessibility-label :enable-notifications-later-button
|
||||||
:type :grey
|
:type :grey
|
||||||
:background :blur
|
:background :blur
|
||||||
|
|
|
@ -2,6 +2,13 @@
|
||||||
(:require
|
(:require
|
||||||
[quo.foundations.colors :as colors]))
|
[quo.foundations.colors :as colors]))
|
||||||
|
|
||||||
|
(def absolute-fill
|
||||||
|
{:position :absolute
|
||||||
|
:top 0
|
||||||
|
:bottom 0
|
||||||
|
:left 0
|
||||||
|
:right 0})
|
||||||
|
|
||||||
(defn page-container
|
(defn page-container
|
||||||
[in-onboarding?]
|
[in-onboarding?]
|
||||||
{:flex 1
|
{:flex 1
|
||||||
|
|
|
@ -52,7 +52,9 @@
|
||||||
profile-color (:color (rf/sub [:onboarding/profile]))
|
profile-color (:color (rf/sub [:onboarding/profile]))
|
||||||
logged-in? (rf/sub [:multiaccount/logged-in?])]
|
logged-in? (rf/sub [:multiaccount/logged-in?])]
|
||||||
[rn/view {:style (style/page-container in-onboarding?)}
|
[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}]
|
[quo/page-nav {:type :no-title :background :blur}]
|
||||||
[page-title (pairing-progress pairing-status)]
|
[page-title (pairing-progress pairing-status)]
|
||||||
(if config/show-not-implemented-features?
|
(if config/show-not-implemented-features?
|
||||||
|
|
|
@ -3,6 +3,13 @@
|
||||||
[quo.foundations.colors :as colors]
|
[quo.foundations.colors :as colors]
|
||||||
[react-native.reanimated :as reanimated]))
|
[react-native.reanimated :as reanimated]))
|
||||||
|
|
||||||
|
(def absolute-fill
|
||||||
|
{:position :absolute
|
||||||
|
:top 0
|
||||||
|
:bottom 0
|
||||||
|
:left 0
|
||||||
|
:right 0})
|
||||||
|
|
||||||
(defn page-container
|
(defn page-container
|
||||||
[top]
|
[top]
|
||||||
{:flex 1
|
{:flex 1
|
||||||
|
|
|
@ -66,7 +66,8 @@
|
||||||
translate-x (reanimated/use-shared-value 0)
|
translate-x (reanimated/use-shared-value 0)
|
||||||
window-width (:width (rn/get-window))]
|
window-width (:width (rn/get-window))]
|
||||||
[rn/view {:style (style/page-container top)}
|
[rn/view {:style (style/page-container top)}
|
||||||
[background/view true]
|
[rn/view {:style style/absolute-fill}
|
||||||
|
[background/view true]]
|
||||||
[reanimated/view
|
[reanimated/view
|
||||||
{:style (style/content translate-x)}
|
{:style (style/content translate-x)}
|
||||||
[page-title]
|
[page-title]
|
||||||
|
|
Loading…
Reference in New Issue