From 851eb6ea8f4a6eef8fc45eb2022b10d7618dfbeb Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Mon, 4 Mar 2024 16:06:59 +0530 Subject: [PATCH] fix settings navigation (#19080) --- .../ui/screens/advanced_settings/views.cljs | 14 +++++----- .../ui/screens/profile/user/views.cljs | 26 +++++++++---------- .../contexts/shell/jump_to/view.cljs | 4 +-- .../contexts/syncing/setup_syncing/style.cljs | 7 +++-- .../contexts/syncing/setup_syncing/view.cljs | 2 +- .../syncing/syncing_devices_list/view.cljs | 2 +- src/status_im/navigation/screens.cljs | 2 +- 7 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/legacy/status_im/ui/screens/advanced_settings/views.cljs b/src/legacy/status_im/ui/screens/advanced_settings/views.cljs index 32a2cfbd48..fc9d919e6c 100644 --- a/src/legacy/status_im/ui/screens/advanced_settings/views.cljs +++ b/src/legacy/status_im/ui/screens/advanced_settings/views.cljs @@ -28,7 +28,7 @@ :accessibility-label :network-button :container-margin-top 8 :on-press - #(re-frame/dispatch [:navigate-to :network-settings]) + #(re-frame/dispatch [:open-modal :network-settings]) :accessory :text :accessory-text network-name :chevron true} @@ -37,13 +37,13 @@ :accessibility-label :network-button :container-margin-top 8 :on-press - #(re-frame/dispatch [:navigate-to :network-info]) + #(re-frame/dispatch [:open-modal :network-info]) :chevron true} {:size :small :title (i18n/label :t/log-level) :accessibility-label :log-level-settings-button :on-press - #(re-frame/dispatch [:navigate-to :log-level-settings]) + #(re-frame/dispatch [:open-modal :log-level-settings]) :accessory :text :accessory-text current-log-level :chevron true} @@ -51,7 +51,7 @@ :title (i18n/label :t/fleet) :accessibility-label :fleet-settings-button :on-press - #(re-frame/dispatch [:navigate-to :fleet-settings]) + #(re-frame/dispatch [:open-modal :fleet-settings]) :accessory :text :accessory-text current-fleet :chevron true} @@ -66,14 +66,14 @@ :accessibility-label :rpc-usage-info :container-margin-top 8 :on-press - #(re-frame/dispatch [:navigate-to :rpc-usage-info]) + #(re-frame/dispatch [:open-modal :rpc-usage-info]) :chevron true} {:size :small :title (i18n/label :t/peers-stats) :accessibility-label :peers-stats :container-margin-top 8 :on-press - #(re-frame/dispatch [:navigate-to :peers-stats]) + #(re-frame/dispatch [:open-modal :peers-stats]) :chevron true} {:size :small :title (i18n/label :t/light-client-enabled) @@ -123,7 +123,7 @@ :title (i18n/label :t/set-currency) :accessibility-label :wallet-change-currency :on-press #(hide-sheet-and-dispatch - [:navigate-to :currency-settings]) + [:open-modal :currency-settings]) :chevron true}])) (defn- flat-list-data diff --git a/src/legacy/status_im/ui/screens/profile/user/views.cljs b/src/legacy/status_im/ui/screens/profile/user/views.cljs index a5a2b6ac75..cacbd9ba2d 100644 --- a/src/legacy/status_im/ui/screens/profile/user/views.cljs +++ b/src/legacy/status_im/ui/screens/profile/user/views.cljs @@ -102,7 +102,7 @@ :chevron true :icon :main-icons/username} registrar - (assoc :on-press #(re-frame/dispatch [:navigate-to :ens-main registrar])))] + (assoc :on-press #(re-frame/dispatch [:open-modal :ens-main registrar])))] [list.item/list-item {:title (i18n/label :t/contacts) :icon :main-icons/in-contacts @@ -112,7 +112,7 @@ (str active-contacts-count) (i18n/label :t/none)) :chevron true - :on-press #(re-frame/dispatch [:navigate-to :contacts-list])}] + :on-press #(re-frame/dispatch [:open-modal :contacts-list])}] [react/view {:padding-top 16} [quo/list-header (i18n/label :t/settings)]] [list.item/list-item @@ -122,71 +122,71 @@ :chevron true :accessory (when mnemonic [components.common/counter {:size 22} 1]) - :on-press #(re-frame/dispatch [:navigate-to :privacy-and-security])}] + :on-press #(re-frame/dispatch [:open-modal :privacy-and-security])}] (when config/quo-preview-enabled? [list.item/list-item {:icon :main-icons/appearance :title "Quo Preview" :accessibility-label :appearance-settings-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :quo-preview])}]) + :on-press #(re-frame/dispatch [:open-modal :quo-preview])}]) (when config/quo-preview-enabled? [list.item/list-item {:icon :main-icons/appearance :title "Status IM Components" :accessibility-label :status-im-common-components :chevron true - :on-press #(re-frame/dispatch [:navigate-to :status-im-preview])}]) + :on-press #(re-frame/dispatch [:open-modal :status-im-preview])}]) [list.item/list-item {:icon :main-icons/appearance :title (i18n/label :t/appearance) :accessibility-label :appearance-settings-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :appearance])}] + :on-press #(re-frame/dispatch [:open-modal :appearance])}] [list.item/list-item {:icon :main-icons/notification :title (i18n/label :t/notifications) :accessibility-label :notifications-settings-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :notifications])}] + :on-press #(re-frame/dispatch [:open-modal :notifications])}] [list.item/list-item {:icon :main-icons/mobile :title (i18n/label :t/sync-settings) :accessibility-label :sync-settings-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :sync-settings])}] + :on-press #(re-frame/dispatch [:open-modal :sync-settings])}] (when keycard-pairing [list.item/list-item {:icon :main-icons/keycard :title (i18n/label :t/keycard) :accessibility-label :keycard-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :keycard-settings])}]) + :on-press #(re-frame/dispatch [:open-modal :keycard-settings])}]) [list.item/list-item {:icon :main-icons/settings-advanced :title (i18n/label :t/advanced) :accessibility-label :advanced-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :advanced-settings])}] + :on-press #(re-frame/dispatch [:open-modal :advanced-settings])}] [list.item/list-item {:icon :main-icons/help :title (i18n/label :t/need-help) :accessibility-label :help-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :help-center])}] + :on-press #(re-frame/dispatch [:open-modal :help-center])}] [list.item/list-item {:icon :main-icons/info :title (i18n/label :t/about-app) :accessibility-label :about-button :chevron true - :on-press #(re-frame/dispatch [:navigate-to :about-app])}] + :on-press #(re-frame/dispatch [:open-modal :about-app])}] (when local-pairing-mode-enabled? [list.item/list-item {:icon :i/mobile :title (i18n/label :t/syncing) :accessibility-label :syncing :chevron true - :on-press #(re-frame/dispatch [:navigate-to :settings-syncing])}]) + :on-press #(re-frame/dispatch [:open-modal :settings-syncing])}]) [react/view {:padding-vertical 24} [list.item/list-item {:icon :main-icons/log-out diff --git a/src/status_im/contexts/shell/jump_to/view.cljs b/src/status_im/contexts/shell/jump_to/view.cljs index fce1e5e87b..620a91bbaf 100644 --- a/src/status_im/contexts/shell/jump_to/view.cljs +++ b/src/status_im/contexts/shell/jump_to/view.cljs @@ -15,8 +15,8 @@ (defn navigate-back-handler [] - (when (and (not @navigation.state/curr-modal) - (seq (utils/open-floating-screens))) + (when (or @navigation.state/curr-modal + (seq (utils/open-floating-screens))) (rf/dispatch [:navigate-back]) true)) diff --git a/src/status_im/contexts/syncing/setup_syncing/style.cljs b/src/status_im/contexts/syncing/setup_syncing/style.cljs index 4fe95e2f3f..a176a465ce 100644 --- a/src/status_im/contexts/syncing/setup_syncing/style.cljs +++ b/src/status_im/contexts/syncing/setup_syncing/style.cljs @@ -1,9 +1,12 @@ (ns status-im.contexts.syncing.setup-syncing.style (:require - [quo.foundations.colors :as colors])) + [quo.foundations.colors :as colors] + [react-native.safe-area :as safe-area])) -(def container-main +(defn container-main + [] {:background-color colors/neutral-95 + :padding-top (safe-area/get-top) :flex 1}) (def page-container diff --git a/src/status_im/contexts/syncing/setup_syncing/view.cljs b/src/status_im/contexts/syncing/setup_syncing/view.cljs index 3490c4a83d..e6fee474d5 100644 --- a/src/status_im/contexts/syncing/setup_syncing/view.cljs +++ b/src/status_im/contexts/syncing/setup_syncing/view.cljs @@ -57,7 +57,7 @@ (rf/dispatch [:syncing/get-connection-string entered-password set-code]))] (fn [] - [rn/view {:style style/container-main} + [rn/view {:style (style/container-main)} [:f> f-use-interval clock cleanup-clock @delay-ms] [rn/scroll-view {} [quo/page-nav diff --git a/src/status_im/contexts/syncing/syncing_devices_list/view.cljs b/src/status_im/contexts/syncing/syncing_devices_list/view.cljs index a30aec6d29..02a5c8e963 100644 --- a/src/status_im/contexts/syncing/syncing_devices_list/view.cljs +++ b/src/status_im/contexts/syncing/syncing_devices_list/view.cljs @@ -38,7 +38,7 @@ :type :primary :customization-color profile-color :icon-only? true - :on-press #(rf/dispatch [:navigate-to :settings-setup-syncing])} + :on-press #(rf/dispatch [:open-modal :settings-setup-syncing])} :i/add]] [device/view (merge user-device {:this-device? true})] (when (seq paired-devices) diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs index a58fe69b04..9b68b5e42e 100644 --- a/src/status_im/navigation/screens.cljs +++ b/src/status_im/navigation/screens.cljs @@ -174,7 +174,7 @@ :component settings-syncing/view} {:name :settings-setup-syncing - :options (merge options/dark-screen {:insets {:top? true}}) + :options options/transparent-screen-options :component settings-setup-syncing/view} ;; Onboarding