status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-11 03:26:31 +00:00
Code Issues Projects Releases Wiki Activity

fix settings navigation (#18854)

Browse Source
This commit is contained in:
Parvesh Monu 2024-02-23 15:09:11 +05:30 committed by GitHub
parent 6f8aa15b17
commit 9fab422e0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/status_im/contexts/profile/settings/list_items.cljs
View File

@ -48,19 +48,19 @@
:blur? true
:action :arrow}]
[{:title (i18n/label :t/syncing)
:on-press #(rf/dispatch [:navigate-to :settings-syncing])
:on-press #(rf/dispatch [:open-modal :settings-syncing])
:image-props :i/syncing
:image :icon
:blur? true
:action :arrow}
{:title (i18n/label :t/notifications)
:on-press #(rf/dispatch [:navigate-to :notifications])
:on-press #(rf/dispatch [:open-modal :notifications])
:image-props :i/activity-center
:image :icon
:blur? true
:action :arrow}
{:title (i18n/label :t/appearance)
:on-press #(rf/dispatch [:navigate-to :appearance])
:on-press #(rf/dispatch [:open-modal :appearance])
:image-props :i/light
:image :icon
:blur? true
@ -78,28 +78,28 @@
:blur? true
:action :arrow}
{:title (i18n/label :t/advanced)
:on-press #(rf/dispatch [:navigate-to :advanced-settings])
:on-press #(rf/dispatch [:open-modal :advanced-settings])
:image-props :i/settings
:image :icon
:blur? true
:action :arrow}]
;; temporary link to legacy settings
[{:title "Legacy settings"
:on-press #(rf/dispatch [:navigate-to :my-profile])
:on-press #(rf/dispatch [:open-modal :my-profile])
:action :arrow
:image :icon
:blur? true
:image-props :i/toggle}
(when config/quo-preview-enabled?
{:title "Quo preview"
:on-press #(rf/dispatch [:navigate-to :quo-preview])
:on-press #(rf/dispatch [:open-modal :quo-preview])
:action :arrow
:image :icon
:blur? true
:image-props :i/light})
(when config/quo-preview-enabled?
{:title "Feature Flags"
:on-press #(rf/dispatch [:navigate-to :feature-flags])
:on-press #(rf/dispatch [:open-modal :feature-flags])
:action :arrow
:image :icon
:blur? true

4
src/status_im/contexts/syncing/syncing_devices_list/style.cljs
View File

@ -2,8 +2,10 @@
(:require
[quo.foundations.colors :as colors]))
(def container-main
(defn container-main
[top]
{:background-color colors/neutral-95
:padding-top top
:flex 1})
(def page-container

4
src/status_im/contexts/syncing/syncing_devices_list/view.cljs
View File

@ -3,6 +3,7 @@
[quo.core :as quo]
[quo.foundations.colors :as colors]
[react-native.core :as rn]
[react-native.safe-area :as safe-area]
[status-im.contexts.syncing.device.view :as device]
[status-im.contexts.syncing.syncing-devices-list.style :as style]
[utils.i18n :as i18n]
@ -11,6 +12,7 @@
(defn view
[]
(let [devices (rf/sub [:pairing/installations])
insets (safe-area/get-insets)
devices-with-button (map #(assoc % :show-button? true) devices)
user-device (first devices-with-button)
other-devices (rest devices-with-button)
@ -18,7 +20,7 @@
{:keys [paired-devices unpaired-devices]} (group-by
#(if (:enabled? %) :paired-devices :unpaired-devices)
other-devices)]
[rn/view {:style style/container-main}
[rn/view {:style (style/container-main (:top insets))}
[quo/page-nav
{:type :no-title
:background :blur

4
src/status_im/navigation/screens.cljs
View File

@ -167,7 +167,7 @@
:component settings/view}
{:name :settings-syncing
:options (merge options/dark-screen {:insets {:top? true}})
:options options/transparent-modal-screen-options
:component settings-syncing/view}
{:name :settings-setup-syncing
@ -425,7 +425,7 @@
;; Settings
{:name :settings-password
:options options/transparent-screen-options
:options options/transparent-modal-screen-options
:component settings-password/view}]
(when js/goog.DEBUG