diff --git a/doc/new-guidelines.md b/doc/new-guidelines.md index 9ca50ff1869..93c1a20c5ed 100644 --- a/doc/new-guidelines.md +++ b/doc/new-guidelines.md @@ -550,14 +550,14 @@ used in the new code in `src/status_im2/`. Don't use (rf/merge cofx (reset-community-id-input id) (bottom-sheet/hide-bottom-sheet) - (navigation/open-modal :invite-people-community {:invite? true}))) + (navigation/open-modal :screen/invite-people-community {:invite? true}))) ;; good (re-frame/reg-event-fx :communities/invite-people-pressed (fn [{:keys [db]} [id]] {:db (assoc db :communities/community-id-input id) :fx [[:dispatch [:hide-bottom-sheet]] - [:dispatch [:open-modal :invite-people-community {:invite? true}]]]})) + [:dispatch [:open-modal :screen/invite-people-community {:invite? true}]]]})) ``` ### Registering top-level re-frame subscriptions diff --git a/src/legacy/status_im/browser/core.cljs b/src/legacy/status_im/browser/core.cljs index 0a70481c193..0e8f5ec4676 100644 --- a/src/legacy/status_im/browser/core.cljs +++ b/src/legacy/status_im/browser/core.cljs @@ -306,8 +306,8 @@ :browser/options {:browser-id (:browser-id browser)} :browser/screen-id :browser) - :dispatch-n [[:shell/change-tab :browser-stack]]} - (navigation/pop-to-root :shell-stack) + :dispatch-n [[:shell/change-tab :screen/browser-stack]]} + (navigation/pop-to-root :screen/shell-stack) (chat.events/close-chat (:current-chat-id db)) (update-browser browser) (resolve-url nil)) @@ -323,7 +323,7 @@ :browser/options {:browser-id browser-id} :browser/screen-id :browser) - :dispatch-n [[:shell/change-tab :browser-stack]]} + :dispatch-n [[:shell/change-tab :screen/browser-stack]]} (update-browser browser) (resolve-url nil)))) @@ -332,7 +332,7 @@ [{:keys [db] :as cofx}] (rf/merge cofx {:db (assoc db :browser/screen-id :browser-tabs) - :dispatch-n [[:shell/change-tab :browser-stack]]})) + :dispatch-n [[:shell/change-tab :screen/browser-stack]]})) (rf/defn web3-error-callback {:events [:browser.dapp/transaction-on-error]} diff --git a/src/legacy/status_im/events.cljs b/src/legacy/status_im/events.cljs index 12cde36a03b..4aa9eada100 100644 --- a/src/legacy/status_im/events.cljs +++ b/src/legacy/status_im/events.cljs @@ -168,7 +168,7 @@ [{:keys [db] :as cofx} view-id] (rf/merge cofx (cond - (= :chat view-id) + (= :screen/chat view-id) {:effects.async-storage/set {:chat-id (get-in cofx [:db :current-chat-id]) :key-uid (get-in cofx [:db :profile/profile :key-uid])} :db (assoc db :screens/was-focused-once? true) diff --git a/src/legacy/status_im/group_chats/core.cljs b/src/legacy/status_im/group_chats/core.cljs index a2479cd8904..2187ddb93f5 100644 --- a/src/legacy/status_im/group_chats/core.cljs +++ b/src/legacy/status_im/group_chats/core.cljs @@ -23,7 +23,7 @@ (fn [{:keys [db]} [response]] {:db (dissoc db :current-chat-id) :fx [[:dispatch [:sanitize-messages-and-process-response response]] - [:dispatch [:pop-to-root :shell-stack]] + [:dispatch [:pop-to-root :screen/shell-stack]] [:activity-center.notifications/fetch-unread-count]]})) (rf/defn handle-chat-update @@ -116,7 +116,7 @@ [cofx chat-id] (rf/merge cofx (chat.events/deactivate-chat chat-id) - (navigation/pop-to-root :shell-stack))) + (navigation/pop-to-root :screen/shell-stack))) (def not-blank? (complement string/blank?)) diff --git a/src/legacy/status_im/pairing/core.cljs b/src/legacy/status_im/pairing/core.cljs index 7d2e8d4b7a0..57b0eddd083 100644 --- a/src/legacy/status_im/pairing/core.cljs +++ b/src/legacy/status_im/pairing/core.cljs @@ -74,7 +74,7 @@ [{:keys [db] :as cofx}] (rf/merge cofx {:db (assoc-in db [:pairing/prompt-user-pop-up] false)} - (navigation/navigate-to :installations nil))) + (navigation/navigate-to :screen/installations nil))) (rf/defn prompt-user-on-new-installation [{:keys [db]}] diff --git a/src/legacy/status_im/qr_scanner/core.cljs b/src/legacy/status_im/qr_scanner/core.cljs index 32be50d9136..3d8bf1ffca1 100644 --- a/src/legacy/status_im/qr_scanner/core.cljs +++ b/src/legacy/status_im/qr_scanner/core.cljs @@ -14,7 +14,7 @@ [_ opts] {:request-permissions-fx {:permissions [:camera] - :on-allowed #(re-frame/dispatch [:open-modal :qr-scanner opts]) + :on-allowed #(re-frame/dispatch [:open-modal :screen/qr-scanner opts]) :on-denied (fn [] (utils/set-timeout #(utils/show-popup (i18n/label :t/error) @@ -62,8 +62,8 @@ (cond (and public-key own) (rf/merge cofx - (navigation/pop-to-root :shell-stack) - (navigation/navigate-to :my-profile nil)) + (navigation/pop-to-root :screen/shell-stack) + (navigation/navigate-to :screen/my-profile nil)) (and public-key (not own)) (rf/merge cofx @@ -73,14 +73,15 @@ :else {:effects.utils/show-popup {:title (i18n/label :t/unable-to-read-this-code) :content (i18n/label :t/ens-name-not-found) - :on-dismiss #(re-frame/dispatch [:pop-to-root :shell-stack])}}))) + :on-dismiss #(re-frame/dispatch [:pop-to-root + :screen/shell-stack])}}))) (rf/defn handle-eip681 [cofx data] (rf/merge cofx - {:dispatch-n [[:shell/change-tab :wallet-stack] + {:dispatch-n [[:shell/change-tab :screen/wallet-stack] [:wallet-legacy/parse-eip681-uri-and-resolve-ens data]]} - (navigation/pop-to-root :shell-stack))) + (navigation/pop-to-root :screen/shell-stack))) (rf/defn handle-local-pairing {:events [::handle-local-pairing-uri]} @@ -103,7 +104,8 @@ :event ::match-scanned-value}) {:dispatch [:navigate-back] :effects.utils/show-popup {:title (i18n/label :t/unable-to-read-this-code) - :on-dismiss #(re-frame/dispatch [:pop-to-root :shell-stack])}}))) + :on-dismiss #(re-frame/dispatch [:pop-to-root + :screen/shell-stack])}}))) (rf/defn on-scan {:events [::on-scan-success]} 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 b70b8c2e8d1..94740260865 100644 --- a/src/legacy/status_im/ui/screens/advanced_settings/views.cljs +++ b/src/legacy/status_im/ui/screens/advanced_settings/views.cljs @@ -41,7 +41,7 @@ :title (i18n/label :t/log-level) :accessibility-label :log-level-settings-button :on-press - #(re-frame/dispatch [:open-modal :legacy-:og-level-settings]) + #(re-frame/dispatch [:open-modal :screen/legacy-log-level-settings]) :accessory :text :accessory-text current-log-level :chevron true} @@ -49,7 +49,7 @@ :title (i18n/label :t/fleet) :accessibility-label :fleet-settings-button :on-press - #(re-frame/dispatch [:open-modal :fleet-settings]) + #(re-frame/dispatch [:open-modal :screen/fleet-settings]) :accessory :text :accessory-text current-fleet :chevron true} @@ -64,14 +64,14 @@ :accessibility-label :rpc-usage-info :container-margin-top 8 :on-press - #(re-frame/dispatch [:open-modal :rpc-usage-info]) + #(re-frame/dispatch [:open-modal :screen/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 [:open-modal :peers-stats]) + #(re-frame/dispatch [:open-modal :screen/peers-stats]) :chevron true} {:size :small :title (i18n/label :t/light-client-enabled) diff --git a/src/legacy/status_im/ui/screens/browser/views.cljs b/src/legacy/status_im/ui/screens/browser/views.cljs index cc28ed20692..c2a29313d71 100644 --- a/src/legacy/status_im/ui/screens/browser/views.cljs +++ b/src/legacy/status_im/ui/screens/browser/views.cljs @@ -104,7 +104,7 @@ (if empty-tab [react/touchable-highlight {:accessibility-label :universal-qr-scanner - :on-press #(re-frame/dispatch [:open-modal :shell-qr-reader])} + :on-press #(re-frame/dispatch [:open-modal :screen/shell-qr-reader])} [icons/icon :main-icons/qr {:color colors/black}]] [react/touchable-highlight {:on-press #(re-frame/dispatch diff --git a/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs b/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs index 4f7df7c40b5..cfd2e04c5da 100644 --- a/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs +++ b/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs @@ -180,7 +180,7 @@ [rn/view (style/community-view-button) [rn/touchable-opacity {:on-press #(do - (rf/dispatch [:pop-to-root :shell-stack]) + (rf/dispatch [:pop-to-root :screen/shell-stack]) (rf/dispatch [:communities/navigate-to-community-overview (:id community)]) (rf/dispatch [:chat/close]))} [rn/text diff --git a/src/legacy/status_im/ui/screens/communities/members.cljs b/src/legacy/status_im/ui/screens/communities/members.cljs index 623a296379a..b953f7a9b77 100644 --- a/src/legacy/status_im/ui/screens/communities/members.cljs +++ b/src/legacy/status_im/ui/screens/communities/members.cljs @@ -104,7 +104,8 @@ [react/view {:flex-direction :row} (when (pos? requests-count) [unviewed-indicator/unviewed-indicator requests-count])] - :on-press #(rf/dispatch [:navigate-to :community-requests-to-join {:community-id community-id}]) + :on-press #(rf/dispatch [:navigate-to :screen/community-requests-to-join + {:community-id community-id}]) :title (i18n/label :t/membership-requests)}] [quo/separator {:style {:margin-vertical 8}}]])) diff --git a/src/legacy/status_im/ui/screens/glossary/view.cljs b/src/legacy/status_im/ui/screens/glossary/view.cljs deleted file mode 100644 index 2a48abe6572..00000000000 --- a/src/legacy/status_im/ui/screens/glossary/view.cljs +++ /dev/null @@ -1,74 +0,0 @@ -(ns legacy.status-im.ui.screens.glossary.view - (:require - [legacy.status-im.ui.components.colors :as colors] - [legacy.status-im.ui.components.list.views :as list] - [legacy.status-im.ui.components.react :as react] - [quo.core :as quo] - [utils.i18n :as i18n] - [utils.re-frame :as rf])) - -(def messages - [{:title :t/account-title - :content :t/account-content} - {:title :t/wallet-key-title - :content :t/wallet-key-content} - {:title :t/chat-key-title - :content :t/chat-key-content} - {:title :t/chat-name-title - :content :t/chat-name-content} - {:title :t/ens-name-title - :content :t/ens-name-content} - {:title :t/mailserver-title - :content :t/mailserver-content} - {:title :t/peer-title - :content :t/peer-content} - {:title :t/seed-phrase-title - :content :t/seed-phrase-content}]) - -(defn render-section-header - [{:keys [title]}] - [react/view - {:style {:position "absolute" - :width 24 - :padding-vertical 16 - :background-color colors/white}} - [react/text - {:style {:color colors/blue - :font-weight "700"}} - title]]) - -(defn render-element - [{:keys [title content]}] - [react/view - {:style {:margin-left 24 - :margin-top 16}} - [react/text - {:style {:font-weight "700" - :margin-bottom 6}} - (i18n/label title)] - [react/text - (i18n/label content)]]) - -(defn glossary - [] - (let [sections (->> messages - (group-by (comp first i18n/label :title)) - seq - (sort-by first) - (map (fn [[k v]] - {:title k - :data v})))] - [:<> - [quo/page-nav - {:type :title - :title (i18n/label :t/glossary) - :background :blur - :icon-name :i/close - :on-press #(rf/dispatch [:navigate-back])}] - [list/section-list - {:contentContainerStyle {:padding-horizontal 16 - :padding-bottom 16} - :stickySectionHeadersEnabled true - :sections sections - :render-fn render-element - :render-section-header-fn render-section-header}]])) diff --git a/src/legacy/status_im/ui/screens/help_center/views.cljs b/src/legacy/status_im/ui/screens/help_center/views.cljs index d68f73b63e9..4789dd3ebfd 100644 --- a/src/legacy/status_im/ui/screens/help_center/views.cljs +++ b/src/legacy/status_im/ui/screens/help_center/views.cljs @@ -12,7 +12,7 @@ [{:size :small :title (i18n/label :t/submit-bug) :accessibility-label :submit-bug-button - :on-press #(re-frame/dispatch [:open-modal :bug-report]) + :on-press #(re-frame/dispatch [:open-modal :screen/bug-report]) :chevron true} {:size :small :title (i18n/label :t/status-help) 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 0af14bc5d4e..0a4171b18b0 100644 --- a/src/legacy/status_im/ui/screens/profile/user/views.cljs +++ b/src/legacy/status_im/ui/screens/profile/user/views.cljs @@ -18,7 +18,7 @@ :title (i18n/label :t/sync-settings) :accessibility-label :sync-settings-button :chevron true - :on-press #(re-frame/dispatch [:open-modal :legacy-sync-settings])}]]) + :on-press #(re-frame/dispatch [:open-modal :screen/legacy-sync-settings])}]]) (defn legacy-settings [] diff --git a/src/legacy/status_im/ui/screens/screens.cljs b/src/legacy/status_im/ui/screens/screens.cljs index b2917b7bae2..9117d4bb3e0 100644 --- a/src/legacy/status_im/ui/screens/screens.cljs +++ b/src/legacy/status_im/ui/screens/screens.cljs @@ -8,7 +8,6 @@ [legacy.status-im.ui.screens.communities.members :as members] [legacy.status-im.ui.screens.default-sync-period-settings.view :as default-sync-period-settings] [legacy.status-im.ui.screens.fleet-settings.views :as fleet-settings] - [legacy.status-im.ui.screens.glossary.view :as glossary] [legacy.status-im.ui.screens.help-center.views :as help-center] [legacy.status-im.ui.screens.log-level-settings.views :as log-level-settings] [legacy.status-im.ui.screens.notifications-settings.views :as notifications-settings] @@ -40,7 +39,7 @@ (defn screens [] [;;PROGRESS - {:name :progress + {:name :screen/progress :options {:insets {:top? true} :theme :dark} :component progress/progress} @@ -52,86 +51,81 @@ ;;SETTINGS - {:name :legacy-notifications + {:name :screen/legacy-notifications :options {:topBar {:visible false} :insets {:top? platform/android?}} :component notifications-settings/notifications-settings} - {:name :legacy-appearance + {:name :screen/legacy-appearance :options {:topBar {:visible false} :insets {:top? platform/android?}} :component appearance/appearance-view} ;; ADVANCED - {:name :legacy-advanced-settings + {:name :screen/legacy-advanced-settings :options {:topBar {:visible false} :insets {:top? platform/android?}} :component advanced-settings/advanced-settings} - {:name :legacy-:og-level-settings + {:name :screen/legacy-log-level-settings :options {:topBar {:visible false} :insets {:top? platform/android?}} :component log-level-settings/log-level-settings} ;; LEGACY SETTINGS - {:name :legacy-settings + {:name :screen/legacy-settings :options {:topBar {:visible false} :insets {:top? platform/android?}} :component profile.user/legacy-settings} ;; SYNC - {:name :legacy-sync-settings + {:name :screen/legacy-sync-settings :options {:topBar {:visible false} :insets {:top? platform/android?}} :component sync-settings/sync-settings} ;; STATUS HELP - {:name :help-center + {:name :screen/help-center :options {:topBar {:visible false} :insets {:top? platform/android?}} :component help-center/help-center} - {:name :glossary - :options {:topBar {:visible false} - :insets {:top? platform/android?}} - :component glossary/glossary} - - {:name :bug-report + {:name :screen/bug-report :options {:topBar {:visible false} :insets {:top? platform/android?}} :component bug-report/bug-report} ;; OTHER - {:name :wakuv2-settings + {:name :screen/wakuv2-settings :options {:insets {:top? true}} :component wakuv2-settings/wakuv2-settings} - {:name :edit-wakuv2-node + {:name :screen/edit-wakuv2-node :options {:insets {:top? true}} :component edit-wakuv2-node/edit-node} - {:name :installations + {:name :screen/installations :options {:topBar (topbar-options (i18n/label :t/devices)) :insets {:top? true}} :component pairing/installations} - {:name :rpc-usage-info + {:name :screen/rpc-usage-info :options {:topBar (topbar-options :t/rpc-usage-info) :insets {:top? true}} :component rpc-usage-info/usage-info} - {:name :peers-stats + {:name :screen/peers-stats :options {:topBar (topbar-options :t/peers-stats) :insets {:top? true}} :component peers-stats/peers-stats} - {:name :fleet-settings + {:name :screen/fleet-settings :options {:topBar (topbar-options :t/fleet-settings) :insets {:top? true}} :component fleet-settings/fleet-settings} - {:name :backup-settings + {:name :screen/backup-settings :options {:topBar (topbar-options :t/backup-settings) :insets {:top? true}} :component backup-settings/backup-settings} - {:name :backup-seed + {:name :screen/backup-seed :options {:insets {:top? platform/android? :bottom? true}} :component profile.seed/backup-seed} - {:name :default-sync-period-settings + {:name :screen/default-sync-period-settings :options {:topBar (topbar-options :t/default-sync-period) :insets {:top? true}} :component default-sync-period-settings/default-sync-period-settings}]) diff --git a/src/legacy/status_im/ui/screens/sync_settings/views.cljs b/src/legacy/status_im/ui/screens/sync_settings/views.cljs index d76802700fe..5d695c27047 100644 --- a/src/legacy/status_im/ui/screens/sync_settings/views.cljs +++ b/src/legacy/status_im/ui/screens/sync_settings/views.cljs @@ -31,7 +31,7 @@ {:size :small :title (i18n/label :t/backup-settings) :accessibility-label :backup-settings-button - :on-press #(re-frame/dispatch [:navigate-to :backup-settings]) + :on-press #(re-frame/dispatch [:navigate-to :screen/backup-settings]) :chevron true :accessory :text :accessory-text (if backup-enabled? @@ -41,7 +41,7 @@ {:size :small :title (i18n/label :t/default-sync-period) :accessibility-label :default-sync-period-button - :on-press #(re-frame/dispatch [:navigate-to :default-sync-period-settings]) + :on-press #(re-frame/dispatch [:navigate-to :screen/default-sync-period-settings]) :chevron true :accessory :text :accessory-text (cond @@ -82,5 +82,5 @@ {:size :small :title (i18n/label :t/devices) :accessibility-label :pairing-settings-button - :on-press #(re-frame/dispatch [:navigate-to :installations]) + :on-press #(re-frame/dispatch [:navigate-to :screen/installations]) :chevron true}]]])) diff --git a/src/legacy/status_im/utils/logging/core.cljs b/src/legacy/status_im/utils/logging/core.cljs index f41d6e5f8f5..5357183c543 100644 --- a/src/legacy/status_im/utils/logging/core.cljs +++ b/src/legacy/status_im/utils/logging/core.cljs @@ -171,7 +171,7 @@ :onPress #(re-frame/dispatch [:logging.ui/send-logs-pressed :sharing]) :style "default"}] - :on-accept #(do (re-frame/dispatch [:open-modal :bug-report]) + :on-accept #(do (re-frame/dispatch [:open-modal :screen/bug-report]) (re-frame/dispatch [:logging/dialog-left])) :on-cancel #(re-frame/dispatch [:logging/dialog-left])}})) diff --git a/src/legacy/status_im/waku/core.cljs b/src/legacy/status_im/waku/core.cljs index de7c11258b7..dc4f9f02723 100644 --- a/src/legacy/status_im/waku/core.cljs +++ b/src/legacy/status_im/waku/core.cljs @@ -34,7 +34,7 @@ (get-in db [:profile/profile :wakuv2-config :CustomNodes])))] (rf/merge cofx {:db (assoc db :wakuv2-nodes/list custom-nodes) - :dispatch [:navigate-to :wakuv2-settings]}))) + :dispatch [:navigate-to :screen/wakuv2-settings]}))) (rf/defn edit {:events [:wakuv2.ui/add-node-pressed] @@ -50,7 +50,7 @@ :id id)} (set-input :name name) (set-input :address address))] - (assoc fxs :dispatch [:navigate-to :edit-wakuv2-node]))) + (assoc fxs :dispatch [:navigate-to :screen/edit-wakuv2-node]))) (rf/defn delete [{:keys [db] :as cofx} id] diff --git a/src/status_im/common/emoji_picker/events.cljs b/src/status_im/common/emoji_picker/events.cljs index e02729185c1..903a9b5db3c 100644 --- a/src/status_im/common/emoji_picker/events.cljs +++ b/src/status_im/common/emoji_picker/events.cljs @@ -5,4 +5,4 @@ (rf/defn open-emoji-picker {:events [:emoji-picker/open]} [_ {:keys [on-select]}] - {:dispatch [:open-modal :emoji-picker {:on-select on-select}]}) + {:dispatch [:open-modal :screen/emoji-picker {:on-select on-select}]}) diff --git a/src/status_im/common/home/top_nav/view.cljs b/src/status_im/common/home/top_nav/view.cljs index 2503bf11922..052c144cf7e 100644 --- a/src/status_im/common/home/top_nav/view.cljs +++ b/src/status_im/common/home/top_nav/view.cljs @@ -49,10 +49,10 @@ :unread-indicator/new :mention nil) screen-id (quo.context/use-screen-id) - initial-share-tab (if (= :wallet-stack screen-id) :wallet :profile)] + initial-share-tab (if (= :screen/wallet-stack screen-id) :wallet :profile)] [quo/top-nav - {:avatar-on-press #(rf/dispatch [:open-modal :settings]) - :scan-on-press #(rf/dispatch [:open-modal :shell-qr-reader]) + {:avatar-on-press #(rf/dispatch [:open-modal :screen/settings]) + :scan-on-press #(rf/dispatch [:open-modal :screen/shell-qr-reader]) :activity-center-on-press #(rf/dispatch [:activity-center/open]) :right-section-content (when (and (= (:status wallet-blockchain-status) "down") wallet-latest-update) diff --git a/src/status_im/common/lightbox/events.cljs b/src/status_im/common/lightbox/events.cljs index 5cd35668846..348d570d951 100644 --- a/src/status_im/common/lightbox/events.cljs +++ b/src/status_im/common/lightbox/events.cljs @@ -5,7 +5,7 @@ (rf/reg-event-fx :lightbox/navigate-to-lightbox (fn [{:keys [db]} [animation-shared-element-id screen-params]] - (reagent/next-tick #(rf/dispatch [:navigate-to :lightbox screen-params])) + (reagent/next-tick #(rf/dispatch [:navigate-to :screen/lightbox screen-params])) {:db (assoc db :animation-shared-element-id animation-shared-element-id)})) (rf/reg-event-fx :lightbox/update-animation-shared-element-id diff --git a/src/status_im/common/universal_links.cljs b/src/status_im/common/universal_links.cljs index f9e16ccc883..55a937dfa08 100644 --- a/src/status_im/common/universal_links.cljs +++ b/src/status_im/common/universal_links.cljs @@ -66,7 +66,7 @@ (rf/defn handle-community-requests [cofx {:keys [community-id]}] (log/info "universal-links: handling community request " community-id) - (navigation/navigate-to cofx :community-requests-to-join {:community-id community-id})) + (navigation/navigate-to cofx :screen/community-requests-to-join {:community-id community-id})) (rf/defn handle-view-profile [{:keys [db] :as cofx} {:keys [public-key ens-name]}] @@ -74,8 +74,8 @@ (cond (and public-key (own-public-key? db public-key)) (rf/merge cofx - (navigation/pop-to-root :shell-stack) - (navigation/navigate-to :settings nil)) + (navigation/pop-to-root :screen/shell-stack) + (navigation/navigate-to :screen/settings nil)) public-key {:dispatch [:chat.ui/show-profile public-key ens-name]})) diff --git a/src/status_im/contexts/centralized_metrics/tracking.cljs b/src/status_im/contexts/centralized_metrics/tracking.cljs index 6606235fca8..feb21bd4f45 100644 --- a/src/status_im/contexts/centralized_metrics/tracking.cljs +++ b/src/status_im/contexts/centralized_metrics/tracking.cljs @@ -38,9 +38,9 @@ (def ^:const view-ids-to-track #{;; Tabs - :communities-stack - :chats-stack - :wallet-stack}) + :screen/communities-stack + :screen/chats-stack + :screen/wallet-stack}) (defn track-view-id-event [view-id] diff --git a/src/status_im/contexts/centralized_metrics/tracking_test.cljs b/src/status_im/contexts/centralized_metrics/tracking_test.cljs index e228b5ce0a7..d229faeac2d 100644 --- a/src/status_im/contexts/centralized_metrics/tracking_test.cljs +++ b/src/status_im/contexts/centralized_metrics/tracking_test.cljs @@ -47,7 +47,7 @@ :platform platform-os :appVersion app-version :eventValue {:viewId "communities-stack"}}}] - (tracking/track-view-id-event :communities-stack))) + (tracking/track-view-id-event :screen/communities-stack))) (is (= [{:metric {:eventName "navigation" :platform platform-os @@ -75,7 +75,7 @@ :platform platform-os :appVersion app-version :eventValue {:viewId "wallet-stack"}}}] - (tracking/metrics-event [:set-view-id :wallet-stack]))) + (tracking/metrics-event [:set-view-id :screen/wallet-stack]))) (is (nil? (tracking/metrics-event [:unknown-event]))) (is (= [{:metric {:eventName "navigation" diff --git a/src/status_im/contexts/chat/actions/view.cljs b/src/status_im/contexts/chat/actions/view.cljs index af55fc3d27d..822352b6f89 100644 --- a/src/status_im/contexts/chat/actions/view.cljs +++ b/src/status_im/contexts/chat/actions/view.cljs @@ -24,7 +24,7 @@ :on-press (fn [] (rf/dispatch [:group-chat/clear-contacts]) (debounce/throttle-and-dispatch - [:open-modal :start-a-new-chat] + [:open-modal :screen/start-a-new-chat] 1000))} {:icon :i/add-user :accessibility-label :add-a-contact @@ -32,5 +32,5 @@ :sub-label (i18n/label :t/enter-chat-key) :add-divider? true :on-press #(debounce/throttle-and-dispatch - [:open-modal :new-contact] + [:open-modal :screen/new-contact] 1000)}]]]) diff --git a/src/status_im/contexts/chat/contacts/events.cljs b/src/status_im/contexts/chat/contacts/events.cljs index 847d29a4b2e..046166035d0 100644 --- a/src/status_im/contexts/chat/contacts/events.cljs +++ b/src/status_im/contexts/chat/contacts/events.cljs @@ -159,4 +159,4 @@ :fx [[:dispatch [:universal-links/generate-profile-url {:public-key public-key - :on-success #(rf/dispatch [:open-modal :share-contact])}]]]})) + :on-success #(rf/dispatch [:open-modal :screen/share-contact])}]]]})) diff --git a/src/status_im/contexts/chat/events.cljs b/src/status_im/contexts/chat/events.cljs index beae3b7135f..0dcfa035a24 100644 --- a/src/status_im/contexts/chat/events.cljs +++ b/src/status_im/contexts/chat/events.cljs @@ -99,7 +99,7 @@ (update :chats-home-list set/difference removed-chats)) :fx [(when (not-empty removed-chats) [:effects/push-notifications-clear-message-notifications removed-chats]) - (when (and (= view-id :chat) (removed-chats current-chat-id)) + (when (and (= view-id :screen/chat) (removed-chats current-chat-id)) [:dispatch [:navigate-back]])]})) (re-frame/reg-event-fx :chat/ensure-chats ensure-chats) @@ -201,7 +201,7 @@ [{db :db :as cofx} chat-id animation] (rf/merge cofx (when-not (:current-chat-id db) - {:dispatch [:navigate-to :chat {:animation animation}]}) + {:dispatch [:navigate-to :screen/chat {:animation animation}]}) (close-chat chat-id) (force-close-chat chat-id) (fn [{:keys [db]}] @@ -217,7 +217,7 @@ cofx {:dispatch-later {:ms 500 :dispatch [:chat/navigate-to-chat chat-id animation]}} - (navigation/pop-to-root :shell-stack))) + (navigation/pop-to-root :screen/shell-stack))) (rf/defn handle-clear-history-response {:events [:chat/history-cleared]} @@ -452,5 +452,5 @@ {:pubkey public-key :ens ens-name :success-fn (fn [_] - {:dispatch [:open-modal :contact-profile]})}]} - {:dispatch [:open-modal :settings]})))) + {:dispatch [:open-modal :screen/contact-profile]})}]} + {:dispatch [:open-modal :screen/settings]})))) diff --git a/src/status_im/contexts/chat/home/add_new_contact/views.cljs b/src/status_im/contexts/chat/home/add_new_contact/views.cljs index 8a7e1384558..cbe71928921 100644 --- a/src/status_im/contexts/chat/home/add_new_contact/views.cljs +++ b/src/status_im/contexts/chat/home/add_new_contact/views.cljs @@ -101,7 +101,7 @@ {:type :outline :icon-only? true :size 40 - :on-press #(rf/dispatch [:open-modal :scan-profile-qr-code])} + :on-press #(rf/dispatch [:open-modal :screen/scan-profile-qr-code])} :i/scan]]])) (defn- invalid-text diff --git a/src/status_im/contexts/chat/home/new_chat/view.cljs b/src/status_im/contexts/chat/home/new_chat/view.cljs index 30bce532e34..099bd5d7f6f 100644 --- a/src/status_im/contexts/chat/home/new_chat/view.cljs +++ b/src/status_im/contexts/chat/home/new_chat/view.cljs @@ -46,7 +46,7 @@ :size 32 :on-press #(do (rf/dispatch [:navigate-back]) - (rf/dispatch [:open-modal :new-contact]))} + (rf/dispatch [:open-modal :screen/new-contact]))} (i18n/label :t/add-a-contact)]])) (def ^:private contacts-selection-limit (dec constants/max-group-chat-participants)) diff --git a/src/status_im/contexts/chat/messenger/composer/actions/image/view.cljs b/src/status_im/contexts/chat/messenger/composer/actions/image/view.cljs index 71780dcf46c..f0ffab15a91 100644 --- a/src/status_im/contexts/chat/messenger/composer/actions/image/view.cljs +++ b/src/status_im/contexts/chat/messenger/composer/actions/image/view.cljs @@ -20,7 +20,7 @@ [images-count] (device-permissions/camera #(if (>= images-count constants/max-album-photos) (photo-limit-toast) - (rf/dispatch [:navigate-to :camera-screen])))) + (rf/dispatch [:navigate-to :screen/camera-screen])))) (defn camera-button [] diff --git a/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/view.cljs b/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/view.cljs index 48b9c987cd8..0df5f31a8f8 100644 --- a/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/view.cljs +++ b/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/view.cljs @@ -40,7 +40,7 @@ (and community-chat? (not pending?) (not joined)) (if keycard? keycard-feature-unavailable - #(rf/dispatch [:open-modal :community-account-selection-sheet + #(rf/dispatch [:open-modal :screen/community-account-selection-sheet {:community-id community-id}])) (not community-chat?) diff --git a/src/status_im/contexts/chat/messenger/photo_selector/events.cljs b/src/status_im/contexts/chat/messenger/photo_selector/events.cljs index 5af1decbf49..98529f09fac 100644 --- a/src/status_im/contexts/chat/messenger/photo_selector/events.cljs +++ b/src/status_im/contexts/chat/messenger/photo_selector/events.cljs @@ -78,6 +78,6 @@ (re-frame/reg-event-fx :photo-selector/navigate-to-photo-selector (fn [] - {:fx [[:dispatch [:open-modal :photo-selector]] + {:fx [[:dispatch [:open-modal :screen/photo-selector]] [:dispatch [:photo-selector/get-photos-for-selected-album]] [:dispatch [:photo-selector/camera-roll-get-albums]]]})) diff --git a/src/status_im/contexts/communities/actions/accounts_selection/view.cljs b/src/status_im/contexts/communities/actions/accounts_selection/view.cljs index 796c0d69362..80f4acb81e4 100644 --- a/src/status_im/contexts/communities/actions/accounts_selection/view.cljs +++ b/src/status_im/contexts/communities/actions/accounts_selection/view.cljs @@ -74,7 +74,8 @@ show-addresses-for-permissions (rn/use-callback (fn [] (if can-edit-addresses? - (rf/dispatch [:open-modal :addresses-for-permissions + (rf/dispatch [:open-modal + :screen/addresses-for-permissions {:community-id id}]) (rf/dispatch [:show-bottom-sheet {:community-id id @@ -84,7 +85,7 @@ show-airdrop-addresses (rn/use-callback (fn [] (if can-edit-addresses? - (rf/dispatch [:open-modal :address-for-airdrop + (rf/dispatch [:open-modal :screen/address-for-airdrop {:community-id id}]) (rf/dispatch [:show-bottom-sheet {:community-id id diff --git a/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs b/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs index efa178de313..bebc79d8794 100644 --- a/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs +++ b/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs @@ -61,15 +61,15 @@ (rf/reg-event-fx :communities/addresses-for-permissions-cancel-request (fn [_ [request-id]] {:fx [[:dispatch [:communities/cancel-request-to-join request-id]] - [:dispatch [:pop-to-root :shell-stack]] + [:dispatch [:pop-to-root :screen/shell-stack]] [:dispatch [:hide-bottom-sheet]]]})) (rf/reg-event-fx :communities/addresses-for-permissions-leave (fn [_ [community-id]] {:fx [[:dispatch [:communities/leave community-id]] [:dispatch [:hide-bottom-sheet]] - [:dispatch [:dismiss-modal :addresses-for-permissions]] - [:dispatch [:pop-to-root :shell-stack]]]})) + [:dispatch [:dismiss-modal :screen/addresses-for-permissions]] + [:dispatch [:pop-to-root :screen/shell-stack]]]})) (defn check-permissions-to-join-for-selection [{:keys [db]} [community-id addresses]] diff --git a/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs b/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs index b66918d5a23..8bbc8112b94 100644 --- a/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs +++ b/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs @@ -62,7 +62,7 @@ :button-one-props {:customization-color color :on-press (fn [] - (rf/dispatch [:dismiss-modal :addresses-for-permissions]) + (rf/dispatch [:dismiss-modal :screen/addresses-for-permissions]) (rf/dispatch [:hide-bottom-sheet]))} :button-two-label (i18n/label :t/cancel) @@ -128,7 +128,7 @@ confirm-discard-changes (rn/use-callback (fn [] (if identical-choices? - (rf/dispatch [:dismiss-modal :addresses-for-permissions]) + (rf/dispatch [:dismiss-modal :screen/addresses-for-permissions]) (rf/dispatch [:show-bottom-sheet {:content (fn [] [confirm-discard-drawer @@ -195,7 +195,8 @@ {:community-id id :addresses addresses-to-reveal :on-success (fn [] - (rf/dispatch [:dismiss-modal :addresses-for-permissions]) + (rf/dispatch [:dismiss-modal + :screen/addresses-for-permissions]) (rf/dispatch [:hide-bottom-sheet]))}]) (rf/dispatch [:communities/set-share-all-addresses id flag-share-all-addresses])) (do diff --git a/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs b/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs index 8628beb9e9f..c5b513eb887 100644 --- a/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs +++ b/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs @@ -26,7 +26,7 @@ :on-success (fn [] (rf/dispatch [:dismiss-modal - :address-for-airdrop]) + :screen/address-for-airdrop]) (rf/dispatch [:hide-bottom-sheet]))}]) (do @@ -45,7 +45,8 @@ accounts (rf/sub [:communities/accounts-to-reveal id]) airdrop-address (rf/sub [:communities/airdrop-address id]) can-edit-addresses? (rf/sub [:communities/can-edit-shared-addresses? id]) - go-back (rn/use-callback #(rf/dispatch [:dismiss-modal :address-for-airdrop]))] + go-back (rn/use-callback #(rf/dispatch [:dismiss-modal + :screen/address-for-airdrop]))] [:<> (when can-edit-addresses? [quo/page-nav diff --git a/src/status_im/contexts/communities/actions/community_options/view.cljs b/src/status_im/contexts/communities/actions/community_options/view.cljs index 715f93b4cc5..de0c16248f2 100644 --- a/src/status_im/contexts/communities/actions/community_options/view.cljs +++ b/src/status_im/contexts/communities/actions/community_options/view.cljs @@ -51,7 +51,8 @@ :right-icon :i/chevron-right :accessibility-label :edit-shared-addresses :on-press (fn [] - (rf/dispatch [:open-modal :community-account-selection {:community-id id}])) + (rf/dispatch [:open-modal :screen/community-account-selection + {:community-id id}])) :label (i18n/label :t/edit-shared-addresses)}) (defn mark-as-read diff --git a/src/status_im/contexts/communities/events.cljs b/src/status_im/contexts/communities/events.cljs index 5733dd45fac..425dcf7e4a0 100644 --- a/src/status_im/contexts/communities/events.cljs +++ b/src/status_im/contexts/communities/events.cljs @@ -336,12 +336,12 @@ [:dispatch [:communities/update-last-opened-at community-id]] [:dispatch [:communities/fetch-community {:community-id community-id}]] - [:dispatch [:navigate-to :community-overview community-id]] + [:dispatch [:navigate-to :screen/community-overview community-id]] (when (get-in db [:communities community-id :joined]) [:dispatch [:activity-center.notifications/dismiss-community-overview community-id]])]} - (when-not (#{:shell :communities-stack :discover-communities} current-view-id) - (navigation/pop-to-root :shell-stack)))))) + (when-not (#{:screen/communities-stack :screen/discover-communities} current-view-id) + (navigation/pop-to-root :screen/shell-stack)))))) (rf/reg-event-fx :communities/navigate-to-community-overview navigate-to-community-overview) diff --git a/src/status_im/contexts/communities/home/view.cljs b/src/status_im/contexts/communities/home/view.cljs index 0ebc825736d..a840696902c 100644 --- a/src/status_im/contexts/communities/home/view.cljs +++ b/src/status_im/contexts/communities/home/view.cljs @@ -70,7 +70,7 @@ #(rf/dispatch [:show-bottom-sheet {:content actions.home-plus/view}])) :accessibility-label :new-communities-button} :card-props - {:on-press #(rf/dispatch [:navigate-to :discover-communities]) + {:on-press #(rf/dispatch [:navigate-to :screen/discover-communities]) :title (i18n/label :t/discover) :description (i18n/label :t/favorite-communities) :banner (resources/get-image :discover) diff --git a/src/status_im/contexts/communities/overview/view.cljs b/src/status_im/contexts/communities/overview/view.cljs index 7af91f39d0e..665c1488691 100644 --- a/src/status_im/contexts/communities/overview/view.cljs +++ b/src/status_im/contexts/communities/overview/view.cljs @@ -63,7 +63,7 @@ (defn- show-join-modal [community-id] (fn [] - (rf/dispatch [:open-modal :community-account-selection-sheet + (rf/dispatch [:open-modal :screen/community-account-selection-sheet {:community-id community-id}]))) (defn token-gated-communities-info @@ -518,7 +518,7 @@ (defn view [id] - (let [community-id (or id (rf/sub [:get-screen-params :community-overview])) + (let [community-id (or id (quo.context/use-screen-params)) community (rf/sub [:communities/community-overview community-id]) collapsed? (:joined? community)] [rn/view {:style style/community-overview-container} diff --git a/src/status_im/contexts/communities/sharing/events.cljs b/src/status_im/contexts/communities/sharing/events.cljs index 268e1f0c015..d00927d6e39 100644 --- a/src/status_im/contexts/communities/sharing/events.cljs +++ b/src/status_im/contexts/communities/sharing/events.cljs @@ -9,7 +9,7 @@ (fn [{:keys [db]} [id]] {:db (assoc db :communities/community-id-input id) :fx [[:dispatch [:hide-bottom-sheet]] - [:dispatch [:open-modal :invite-people-community {:id id}]]]})) + [:dispatch [:open-modal :screen/invite-people-community {:id id}]]]})) (rf/reg-event-fx :communities/share-community-pressed (fn [{:keys [db]} [id]] @@ -31,7 +31,7 @@ (rf/reg-event-fx :communities/share-community-channel-url-qr-code (fn [_ [chat-id]] - (let [on-success #(rf/dispatch [:open-modal :share-community-channel + (let [on-success #(rf/dispatch [:open-modal :screen/share-community-channel {:chat-id chat-id :url %}])] {:fx [[:dispatch [:communities/get-community-channel-share-data chat-id on-success]]]}))) diff --git a/src/status_im/contexts/contact/blocking/events.cljs b/src/status_im/contexts/contact/blocking/events.cljs index d8583b6ba36..b7e337a81f0 100644 --- a/src/status_im/contexts/contact/blocking/events.cljs +++ b/src/status_im/contexts/contact/blocking/events.cljs @@ -67,7 +67,7 @@ ;; reset navigation to avoid going back to non existing one to one chat (when current-chat-id (if from-one-to-one-chat? - [:dispatch [:pop-to-root :shell-stack]] + [:dispatch [:pop-to-root :screen/shell-stack]] [:dispatch [:navigate-back]]))]}))) (rf/reg-event-fx :contact/unblocked diff --git a/src/status_im/contexts/onboarding/create_profile/view.cljs b/src/status_im/contexts/onboarding/create_profile/view.cljs index 413eceb457e..cea7c834749 100644 --- a/src/status_im/contexts/onboarding/create_profile/view.cljs +++ b/src/status_im/contexts/onboarding/create_profile/view.cljs @@ -64,7 +64,7 @@ (defn- navigate-to-quo-preview [] - (rf/dispatch [:navigate-to :quo-preview])) + (rf/dispatch [:navigate-to :screen/quo-preview])) (defn view [] diff --git a/src/status_im/contexts/onboarding/events.cljs b/src/status_im/contexts/onboarding/events.cljs index b6b25739267..e8b02b5b54d 100644 --- a/src/status_im/contexts/onboarding/events.cljs +++ b/src/status_im/contexts/onboarding/events.cljs @@ -15,7 +15,7 @@ {:fx [(when notifications-enabled? [:dispatch [:push-notifications/switch true]]) [:dispatch [:shell/change-tab shell.constants/default-selected-stack]] - [:dispatch [:update-theme-and-init-root :shell-stack]] + [:dispatch [:update-theme-and-init-root :screen/shell-stack]] [:dispatch [:profile/show-testnet-mode-banner-if-enabled]] [:dispatch [:universal-links/process-stored-event]]]})) diff --git a/src/status_im/contexts/onboarding/log_in/view.cljs b/src/status_im/contexts/onboarding/log_in/view.cljs index 2ac2941e700..d46694a951f 100644 --- a/src/status_im/contexts/onboarding/log_in/view.cljs +++ b/src/status_im/contexts/onboarding/log_in/view.cljs @@ -76,7 +76,7 @@ (defn- navigate-to-quo-preview [] - (rf/dispatch [:navigate-to :quo-preview])) + (rf/dispatch [:navigate-to :screen/quo-preview])) (defn view [] diff --git a/src/status_im/contexts/preview/quo/common.cljs b/src/status_im/contexts/preview/quo/common.cljs index 35710612f5d..21bc362349d 100644 --- a/src/status_im/contexts/preview/quo/common.cljs +++ b/src/status_im/contexts/preview/quo/common.cljs @@ -21,7 +21,7 @@ :on-press #(if light? (rf/dispatch [:theme/switch {:theme :dark}]) (rf/dispatch [:theme/switch {:theme :light}]))}] - :on-press #(if (or logged-in? (not= (rf/sub [:view-id]) :quo-preview)) + :on-press #(if (or logged-in? (not= (rf/sub [:view-id]) :screen/quo-preview)) (rf/dispatch [:navigate-back]) (do (rf/dispatch [:theme/switch {:theme :dark}]) diff --git a/src/status_im/contexts/preview/quo/component_preview/events.cljs b/src/status_im/contexts/preview/quo/component_preview/events.cljs index 64c78adfdf0..f2bcc096a36 100644 --- a/src/status_im/contexts/preview/quo/component_preview/events.cljs +++ b/src/status_im/contexts/preview/quo/component_preview/events.cljs @@ -3,7 +3,7 @@ [quo.core :as quo] [re-frame.core :as re-frame])) -(def preview-screen-name :dev-component-preview) +(def preview-screen-name :screen/dev-component-preview) (when js/goog.DEBUG (re-frame/reg-event-fx :dev/preview-component diff --git a/src/status_im/contexts/preview/quo/main.cljs b/src/status_im/contexts/preview/quo/main.cljs index 5e660bcfc06..1d777d14654 100644 --- a/src/status_im/contexts/preview/quo/main.cljs +++ b/src/status_im/contexts/preview/quo/main.cljs @@ -221,363 +221,363 @@ [utils.re-frame :as rf])) (def screens-categories - {:foundations [{:name :gradients + {:foundations [{:name :screen/gradients :component gradients/view} - {:name :shadows + {:name :screen/shadows :component shadows/view}] - :animated-list [{:name :animated-header-list + :animated-list [{:name :screen/animated-header-list :component animated-header-list/mock-screen}] - :avatar [{:name :community-avatar + :avatar [{:name :screen/community-avatar :component community-avatar/view} - {:name :dapp-avatar + {:name :screen/dapp-avatar :component dapp-avatar/view} - {:name :group-avatar + {:name :screen/group-avatar :component group-avatar/view} - {:name :icon-avatar + {:name :screen/icon-avatar :component icon-avatar/view} - {:name :token-avatar + {:name :screen/token-avatar :component token-avatar/view} - {:name :user-avatar + {:name :screen/user-avatar :component user-avatar/view} - {:name :wallet-user-avatar + {:name :screen/wallet-user-avatar :component wallet-user-avatar/view} - {:name :channel-avatar + {:name :screen/channel-avatar :component channel-avatar/view} - {:name :collection-avatar + {:name :screen/collection-avatar :component collection-avatar/view} - {:name :account-avatar + {:name :screen/account-avatar :component account-avatar/view}] - :banner [{:name :alert-banners + :banner [{:name :screen/alert-banners :component alert-banner/view} - {:name :banner + {:name :screen/banner :component banner/view}] - :buttons [{:name :button + :buttons [{:name :screen/button :component button/view} - {:name :composer-button + {:name :screen/composer-button :component composer-button/view} - {:name :dynamic-button + {:name :screen/dynamic-button :component dynamic-button/view} - {:name :slide-button + {:name :screen/slide-button :component slide-button/view} - {:name :swap-order-button + {:name :screen/swap-order-button :component swap-order-button/view} - {:name :predictive-keyboard + {:name :screen/predictive-keyboard :component predictive-keyboard/view} - {:name :wallet-button + {:name :screen/wallet-button :component wallet-button/view} - {:name :wallet-ctas + {:name :screen/wallet-ctas :component wallet-ctas/view}] - :browser [{:name :browser-input + :browser [{:name :screen/browser-input :component browser-input/view}] - :calendar [{:name :calendar + :calendar [{:name :screen/calendar :component calendar/view} - {:name :calendar-day + {:name :screen/calendar-day :component calendar-day/view} - {:name :calendar-year + {:name :screen/calendar-year :component calendar-year/view}] - :cards [{:name :wallet-card + :cards [{:name :screen/wallet-card :component wallet-card/view}] - :code [{:name :snippet + :code [{:name :screen/snippet :component code-snippet/view} - {:name :snippet-preview + {:name :screen/snippet-preview :component code-snippet-preview/view}] - :colors [{:name :color-picker + :colors [{:name :screen/color-picker :component color-picker/view} - {:name :color + {:name :screen/color :component color/view}] - :community [{:name :community-card-view + :community [{:name :screen/community-card-view :component community-card/view} - {:name :community-detail-token-gating + {:name :screen/community-detail-token-gating :component community-detail-token-gating/view} - {:name :community-token-gating + {:name :screen/community-token-gating :component community-token-gating/view} - {:name :community-membership-list-view + {:name :screen/community-membership-list-view :component community-membership-list-view/view} - {:name :community-stat + {:name :screen/community-stat :component community-stat/view} - {:name :discover-card + {:name :screen/discover-card :component discover-card/view} - {:name :channel-action + {:name :screen/channel-action :options {:insets {:bottom? true}} :component channel-action/view} - {:name :channel-actions + {:name :screen/channel-actions :options {:insets {:bottom? true}} :component channel-actions/view}] - :counter [{:name :collectible-counter + :counter [{:name :screen/collectible-counter :component collectible-counter/view} - {:name :counter + {:name :screen/counter :component counter/view} - {:name :step + {:name :screen/step :component step/view}] - :dividers [{:name :divider-label + :dividers [{:name :screen/divider-label :component divider-label/view} - {:name :divider-line + {:name :screen/divider-line :component divider-line/view} - {:name :new-messages + {:name :screen/new-messages :component new-messages/view} - {:name :divider-date + {:name :screen/divider-date :component divider-date/view} - {:name :strength-divider + {:name :screen/strength-divider :component strength-divider/view}] - :drawers [{:name :action-drawers + :drawers [{:name :screen/action-drawers :component action-drawers/view} - {:name :documentation-drawer + {:name :screen/documentation-drawer :component documentation-drawers/view} - {:name :drawer-action + {:name :screen/drawer-action :component drawer-action/view} - {:name :drawer-buttons + {:name :screen/drawer-buttons :component drawer-buttons/view} - {:name :drawer-top + {:name :screen/drawer-top :component drawer-top/view} - {:name :permission-drawers + {:name :screen/permission-drawers :component permission-drawers/view} - {:name :bottom-actions + {:name :screen/bottom-actions :component bottom-actions/view}] - :dropdowns [{:name :dropdown + :dropdowns [{:name :screen/dropdown :component dropdown/view} - {:name :network-dropdown + {:name :screen/network-dropdown :component network-dropdown/view} - {:name :dropdown-input + {:name :screen/dropdown-input :component dropdown-input/view}] - :empty-state [{:name :empty-state + :empty-state [{:name :screen/empty-state :component empty-state/view}] - :gradient [{:name :gradient-cover + :gradient [{:name :screen/gradient-cover :component gradient-cover/view}] - :graph [{:name :interactive-graph + :graph [{:name :screen/interactive-graph :options {:topBar {:visible true}} :component interactive-graph/view} - {:name :wallet-graph + {:name :screen/wallet-graph :options {:topBar {:visible true}} :component wallet-graph/view}] - :info [{:name :info-message + :info [{:name :screen/info-message :component info-message/view} - {:name :information-box + {:name :screen/information-box :component information-box/view}] - :inputs [{:name :input + :inputs [{:name :screen/input :component input/view} - {:name :address-input + {:name :screen/address-input :component address-input/view} - {:name :locked-input + {:name :screen/locked-input :component locked-input/view} - {:name :profile-input + {:name :screen/profile-input :component profile-input/view} - {:name :recovery-phrase-input + {:name :screen/recovery-phrase-input :component recovery-phrase-input/view} - {:name :search-input + {:name :screen/search-input :component search-input/view} - {:name :title-input + {:name :screen/title-input :component title-input/view}] - :ios [{:name :drawer-bar + :ios [{:name :screen/drawer-bar :component drawer-bar/view}] - :numbered-keyboard [{:name :keyboard-key + :numbered-keyboard [{:name :screen/keyboard-key :component keyboard-key/view} - {:name :numbered-keyboard + {:name :screen/numbered-keyboard :component numbered-keyboard/view}] - :pin-input [{:name :pin-input + :pin-input [{:name :screen/pin-input :component pin-input/view}] - :links [{:name :internal-link-card + :links [{:name :screen/internal-link-card :options {:insets {:top true}} :component internal-link-card/view} - {:name :url-preview + {:name :screen/url-preview :options {:insets {:top? true}} :component url-preview/view} - {:name :url-preview-list + {:name :screen/url-preview-list :options {:insets {:top? true}} :component url-preview-list/view} - {:name :link-preview + {:name :screen/link-preview :options {:insets {:top? true}} :component link-preview/view}] - :list-items [{:name :account + :list-items [{:name :screen/account :component account-item/view} - {:name :account-list-card + {:name :screen/account-list-card :component account-list-card/view} - {:name :address + {:name :screen/address :component address/view} - {:name :approval-info + {:name :screen/approval-info :component approval-info/view} - {:name :channel + {:name :screen/channel :component channel/view} - {:name :community-list + {:name :screen/community-list :options {:insets {:top? true}} :component community-list-item/view} - {:name :dapp + {:name :screen/dapp :component dapp/preview} - {:name :missing-keypair + {:name :screen/missing-keypair :component missing-keypair/view} - {:name :network-list + {:name :screen/network-list :component network-list/view} - {:name :preview-lists + {:name :screen/preview-lists :component preview-lists/view} - {:name :quiz-item + {:name :screen/quiz-item :component quiz-item/view} - {:name :saved-address + {:name :screen/saved-address :component saved-address/view} - {:name :saved-contact-address + {:name :screen/saved-contact-address :component saved-contact-address/view} - {:name :token-network + {:name :screen/token-network :component token-network/view} - {:name :token-value + {:name :screen/token-value :component token-value/view} - {:name :user-list + {:name :screen/user-list :options {:topBar {:visible true}} :component user-list/view}] - :loaders [{:name :skeleton-list + :loaders [{:name :screen/skeleton-list :options {:topBar {:visible true}} :component skeleton-list/view}] - :markdown [{:name :texts + :markdown [{:name :screen/texts :component text/view} - {:name :markdown-list + {:name :screen/markdown-list :component markdown-list/view}] - :messages [{:name :author + :messages [{:name :screen/author :component messages-author/view} - {:name :gap + {:name :screen/gap :component messages-gap/view} - {:name :system-messages + {:name :screen/system-messages :component system-message/view}] - :navigation [{:name :bottom-nav-tab + :navigation [{:name :screen/bottom-nav-tab :component bottom-nav-tab/view} - {:name :top-nav + {:name :screen/top-nav :component top-nav/view} - {:name :page-nav + {:name :screen/page-nav :component page-nav/view} - {:name :floating-shell-button + {:name :screen/floating-shell-button :component floating-shell-button/view}] - :notifications [{:name :activity-logs + :notifications [{:name :screen/activity-logs :component activity-logs/view} - {:name :activity-logs-photos + {:name :screen/activity-logs-photos :component activity-logs-photos/view} - {:name :toast + {:name :screen/toast :component toast/view} - {:name :notification + {:name :screen/notification :component notification/view}] - :onboarding [{:name :small-option-card + :onboarding [{:name :screen/small-option-card :component small-option-card/view}] - :password [{:name :tips + :password [{:name :screen/tips :component tips/view} - {:name :password-tips + {:name :screen/password-tips :component password-tips/view}] - :profile [{:name :collectible + :profile [{:name :screen/collectible :component collectible/view} - {:name :collectible-list-item + {:name :screen/collectible-list-item :component collectible-list-item/view} - {:name :expanded-collectible + {:name :screen/expanded-collectible :component expanded-collectible/view} - {:name :link-card + {:name :screen/link-card :component link-card/view} - {:name :profile-card + {:name :screen/profile-card :component profile-card/view} - {:name :select-profile + {:name :screen/select-profile :component select-profile/view} - {:name :showcase-nav + {:name :screen/showcase-nav :component showcase-nav/view}] - :record-audio [{:name :record-audio + :record-audio [{:name :screen/record-audio :component record-audio/view}] - :selectors [{:name :disclaimer + :selectors [{:name :screen/disclaimer :component disclaimer/view} - {:name :filter + {:name :screen/filter :component filter/view} - {:name :selectors + {:name :screen/selectors :component selectors/view} - {:name :reactions-selector + {:name :screen/reactions-selector :component reactions-selector/preview} - {:name :react-selector + {:name :screen/react-selector :component (react-selector/preview-react-selector)} - {:name :react + {:name :screen/react :component react/preview-react}] - :settings [{:name :privacy-option + :settings [{:name :screen/privacy-option :component privacy-option/view} - {:name :page-setting + {:name :screen/page-setting :component page-setting/view} - {:name :accounts + {:name :screen/accounts :component accounts/view} - {:name :settings-item + {:name :screen/settings-item :component settings-item/view} - {:name :reorder-item + {:name :screen/reorder-item :component reorder-item/view} - {:name :category + {:name :screen/category :component category/view} - {:name :data-item + {:name :screen/data-item :component data-item/view} - {:name :section-label + {:name :screen/section-label :component section-label/view}] - :share [{:name :qr-code + :share [{:name :screen/qr-code :component qr-code/view} - {:name :share-qr-code + {:name :screen/share-qr-code :component share-qr-code/view}] - :slideshow [{:name :slider-bar + :slideshow [{:name :screen/slider-bar :component slider-bar/view}] - :tabs [{:name :segmented + :tabs [{:name :screen/segmented :component segmented/view} - {:name :tabs + {:name :screen/tabs :component tabs/view} - {:name :account-selector + {:name :screen/account-selector :component account-selector/view}] - :tags [{:name :collectible-tag + :tags [{:name :screen/collectible-tag :component collectible-tag/view} - {:name :context-tags + {:name :screen/context-tags :component context-tags/view} - {:name :network-status-tag + {:name :screen/network-status-tag :component network-status-tag/view} - {:name :network-tags + {:name :screen/network-tags :component network-tags/view} - {:name :number-tag + {:name :screen/number-tag :component number-tag/view} - {:name :permission-tag + {:name :screen/permission-tag :component permission-tag/view} - {:name :status-tags + {:name :screen/status-tags :component status-tags/view} - {:name :summary-tag + {:name :screen/summary-tag :component summary-tag/view} - {:name :tag + {:name :screen/tag :component tag/view} - {:name :tags + {:name :screen/tags :component tags/view} - {:name :tiny-tag + {:name :screen/tiny-tag :component tiny-tag/view} - {:name :token-tag + {:name :screen/token-tag :component token-tag/view}] - :text-combinations [{:name :text-combinations + :text-combinations [{:name :screen/text-combinations :component text-combinations/view} - {:name :channel-name + {:name :screen/channel-name :component channel-name/view} - {:name :page-top + {:name :screen/page-top :component page-top/view} - {:name :standard-title + {:name :screen/standard-title :component standard-title/view} - {:name :username + {:name :screen/username :component username/view}] - :wallet [{:name :account-card :component account-card/view} - {:name :account-origin :component account-origin/view} - {:name :account-overview + :wallet [{:name :screen/account-card :component account-card/view} + {:name :screen/account-origin :component account-origin/view} + {:name :screen/account-overview :component account-overview/view} - {:name :account-permissions + {:name :screen/account-permissions :component account-permissions/view} - {:name :amount-input + {:name :screen/amount-input :component amount-input/view} - {:name :approval-label + {:name :screen/approval-label :component approval-label/view} - {:name :confirmation-progress + {:name :screen/confirmation-progress :component confirmation-progress/view} - {:name :keypair :component keypair/view} - {:name :missing-keypairs + {:name :screen/keypair :component keypair/view} + {:name :screen/missing-keypairs :component missing-keypairs/view} - {:name :network-amount :component network-amount/view} - {:name :network-bridge :component network-bridge/view} - {:name :network-link :component network-link/view} - {:name :network-routing :component network-routing/view} - {:name :progress-bar :component progress-bar/view} - {:name :required-tokens + {:name :screen/network-amount :component network-amount/view} + {:name :screen/network-bridge :component network-bridge/view} + {:name :screen/network-link :component network-link/view} + {:name :screen/network-routing :component network-routing/view} + {:name :screen/progress-bar :component progress-bar/view} + {:name :screen/required-tokens :component required-tokens/view} - {:name :summary-info :component summary-info/view} - {:name :swap-input :component swap-input/view} - {:name :token-input :component token-input/view} - {:name :wallet-activity :component wallet-activity/view} - {:name :transaction-progress :component transaction-progress/view} - {:name :transaction-summary :component transaction-summary/view} - {:name :wallet-overview + {:name :screen/summary-info :component summary-info/view} + {:name :screen/swap-input :component swap-input/view} + {:name :screen/token-input :component token-input/view} + {:name :screen/wallet-activity :component wallet-activity/view} + {:name :screen/transaction-progress :component transaction-progress/view} + {:name :screen/transaction-summary :component transaction-summary/view} + {:name :screen/wallet-overview :component wallet-overview/view}] - :keycard [{:name :keycard-component :component keycard/view}]}) + :keycard [{:name :screen/keycard-component :component keycard/view}]}) (defn- category-view [] @@ -620,7 +620,7 @@ {:visible false}))))) (def main-screens - [{:name :quo-preview + [{:name :screen/quo-preview :options {:topBar {:visible false} :insets {:top? true}} :component main-screen}]) diff --git a/src/status_im/contexts/preview/status_im/main.cljs b/src/status_im/contexts/preview/status_im/main.cljs index a535d7aa14f..d8c44cf977e 100644 --- a/src/status_im/contexts/preview/status_im/main.cljs +++ b/src/status_im/contexts/preview/status_im/main.cljs @@ -13,10 +13,10 @@ [utils.re-frame :as rf])) (def screens-categories - {:common [{:name :floating-button-page + {:common [{:name :screen/floating-button-page :component floating-button-page/view}] :banner - [{:name :alert-banner-preview + [{:name :screen/alert-banner-preview :component alert-banner/view}]}) (defn- category-view @@ -60,7 +60,7 @@ {:visible false}))))) (def main-screens - [{:name :status-im-preview + [{:name :screen/status-im-preview :options {:topBar {:visible false} :insets {:top? true}} :component main-screen}]) diff --git a/src/status_im/contexts/profile/contact/actions/view.cljs b/src/status_im/contexts/profile/contact/actions/view.cljs index e49e7cc3c58..808a158a8f2 100644 --- a/src/status_im/contexts/profile/contact/actions/view.cljs +++ b/src/status_im/contexts/profile/contact/actions/view.cljs @@ -42,7 +42,7 @@ (rf/dispatch [:universal-links/generate-profile-url {:public-key public-key :on-success #(rf/dispatch [:open-modal - :share-contact])}])) + :screen/share-contact])}])) [public-key]) has-nickname? (rn/use-memo (fn [] (not (string/blank? nickname))) [nickname]) on-share-profile (rn/use-callback diff --git a/src/status_im/contexts/profile/edit/list_items.cljs b/src/status_im/contexts/profile/edit/list_items.cljs index 35afd1c6cbe..76d6ef349d6 100644 --- a/src/status_im/contexts/profile/edit/list_items.cljs +++ b/src/status_im/contexts/profile/edit/list_items.cljs @@ -21,17 +21,17 @@ :label-props (utils/truncate-str full-name constants/profile-name-max-length) :container-style style/item-container} (not ens-name?) - (assoc :on-press #(rf/dispatch [:open-modal :edit-name]) + (assoc :on-press #(rf/dispatch [:open-modal :screen/edit-name]) :action :arrow)) {:title (i18n/label :t/bio) - :on-press #(rf/dispatch [:open-modal :edit-bio]) + :on-press #(rf/dispatch [:open-modal :screen/edit-bio]) :blur? true :label :text :label-props (utils/truncate-str bio 15) :action :arrow :container-style style/item-container} {:title (i18n/label :t/accent-colour) - :on-press #(rf/dispatch [:open-modal :edit-accent-colour]) + :on-press #(rf/dispatch [:open-modal :screen/edit-accent-colour]) :label :color :label-props (colors/resolve-color customization-color theme) :blur? true diff --git a/src/status_im/contexts/profile/login/events.cljs b/src/status_im/contexts/profile/login/events.cljs index 1a74b90b99b..6ef066dde7a 100644 --- a/src/status_im/contexts/profile/login/events.cljs +++ b/src/status_im/contexts/profile/login/events.cljs @@ -100,7 +100,7 @@ [:dispatch [:onboarding/finish-onboarding false]]] :else - [[:dispatch [:update-theme-and-init-root :shell-stack]] + [[:dispatch [:update-theme-and-init-root :screen/shell-stack]] [:dispatch [:profile/show-testnet-mode-banner-if-enabled]]]))}))) ;; login phase 2: we want to load and show chats faster, so we split login into 2 phases @@ -209,7 +209,7 @@ {:db (-> db (assoc-in [:profile/login :password] password) (assoc-in [:profile/login :processing] true)) - :fx [[:dispatch [:update-theme-and-init-root :progress]] + :fx [[:dispatch [:update-theme-and-init-root :screen/progress]] [:effects.profile/login [(get-in db [:profile/login :key-uid]) (security/safe-unmask-data password)]]]}))) diff --git a/src/status_im/contexts/profile/profiles/view.cljs b/src/status_im/contexts/profile/profiles/view.cljs index bbdd311e7b8..41f75cb158c 100644 --- a/src/status_im/contexts/profile/profiles/view.cljs +++ b/src/status_im/contexts/profile/profiles/view.cljs @@ -226,7 +226,7 @@ :type :grey :background :blur :icon-only? true - :on-press #(rf/dispatch [:navigate-to :quo-preview]) + :on-press #(rf/dispatch [:navigate-to :screen/quo-preview]) :disabled? processing :accessibility-label :quo-preview :container-style {:margin-right 12}} diff --git a/src/status_im/contexts/profile/push_notifications/local/events.cljs b/src/status_im/contexts/profile/push_notifications/local/events.cljs index 73990484da7..8840e538abd 100644 --- a/src/status_im/contexts/profile/push_notifications/local/events.cljs +++ b/src/status_im/contexts/profile/push_notifications/local/events.cljs @@ -13,7 +13,7 @@ (defn foreground-chat? [{{:keys [current-chat-id view-id]} :db} chat-id] (and (= current-chat-id chat-id) - (= view-id :chat))) + (= view-id :screen/chat))) (defn show-message-pn? [{{:keys [app-state profile/profile]} :db :as cofx} diff --git a/src/status_im/contexts/profile/settings/list_items.cljs b/src/status_im/contexts/profile/settings/list_items.cljs index e17b63465e0..38c5144840f 100644 --- a/src/status_im/contexts/profile/settings/list_items.cljs +++ b/src/status_im/contexts/profile/settings/list_items.cljs @@ -8,7 +8,7 @@ [mnemonic?] [(when mnemonic? [{:title (i18n/label :t/back-up-seed-phrase) - :on-press #(rf/dispatch [:open-modal :backup-seed]) + :on-press #(rf/dispatch [:open-modal :screen/backup-seed]) :image-props :i/seed :image :icon :label :icon @@ -17,7 +17,7 @@ :blur? true :action :arrow}]) [{:title (i18n/label :t/edit-profile) - :on-press #(rf/dispatch [:open-modal :edit-profile]) + :on-press #(rf/dispatch [:open-modal :screen/edit-profile]) :image-props :i/edit :image :icon :blur? true @@ -73,13 +73,13 @@ :blur? true :action :arrow} {:title (i18n/label :t/notifications) - :on-press #(rf/dispatch [:open-modal :legacy-notifications]) + :on-press #(rf/dispatch [:open-modal :screen/legacy-notifications]) :image-props :i/activity-center :image :icon :blur? true :action :arrow} {:title (i18n/label :t/appearance) - :on-press #(rf/dispatch [:open-modal :legacy-appearance]) + :on-press #(rf/dispatch [:open-modal :screen/legacy-appearance]) :image-props :i/light :image :icon :blur? true @@ -98,28 +98,28 @@ :blur? true :action :arrow}) {:title (i18n/label :t/advanced) - :on-press #(rf/dispatch [:open-modal :legacy-advanced-settings]) + :on-press #(rf/dispatch [:open-modal :screen/legacy-advanced-settings]) :image-props :i/settings :image :icon :blur? true :action :arrow}] ;; temporary link to legacy settings [{:title "Legacy settings" - :on-press #(rf/dispatch [:open-modal :legacy-settings]) + :on-press #(rf/dispatch [:open-modal :screen/legacy-settings]) :action :arrow :image :icon :blur? true :image-props :i/toggle} (when config/quo-preview-enabled? {:title "Quo preview" - :on-press #(rf/dispatch [:open-modal :quo-preview]) + :on-press #(rf/dispatch [:open-modal :screen/quo-preview]) :action :arrow :image :icon :blur? true :image-props :i/light}) (when config/quo-preview-enabled? {:title "Feature Flags" - :on-press #(rf/dispatch [:open-modal :feature-flags]) + :on-press #(rf/dispatch [:open-modal :screen/feature-flags]) :action :arrow :image :icon :blur? true @@ -129,6 +129,6 @@ :action :arrow :blur? true} {:title (i18n/label :t/status-help) - :on-press #(rf/dispatch [:open-modal :help-center]) + :on-press #(rf/dispatch [:open-modal :screen/help-center]) :action :arrow :blur? true}]]) diff --git a/src/status_im/contexts/shell/activity_center/events.cljs b/src/status_im/contexts/shell/activity_center/events.cljs index 281ead28b74..9578281617d 100644 --- a/src/status_im/contexts/shell/activity_center/events.cljs +++ b/src/status_im/contexts/shell/activity_center/events.cljs @@ -27,7 +27,7 @@ filter-type (assoc-in [:activity-center :filter :type] filter-type)) - :fx [[:dispatch [:open-modal :activity-center {}]] + :fx [[:dispatch [:open-modal :screen/activity-center {}]] ;; We delay marking as seen so that the user doesn't see the unread bell icon ;; change while the Activity Center modal is opening. [:dispatch-later diff --git a/src/status_im/contexts/shell/activity_center/events_test.cljs b/src/status_im/contexts/shell/activity_center/events_test.cljs index 6df16a4d86b..9aeeff32141 100644 --- a/src/status_im/contexts/shell/activity_center/events_test.cljs +++ b/src/status_im/contexts/shell/activity_center/events_test.cljs @@ -15,13 +15,13 @@ (deftest open-activity-center-test (testing "opens the activity center with default filters" (is (match? {:db {} - :fx [[:dispatch [:open-modal :activity-center {}]] + :fx [[:dispatch [:open-modal :screen/activity-center {}]] [:dispatch-later [{:ms 1000 :dispatch [:activity-center/mark-as-seen]}]]]} (events/open-activity-center {:db {}} [nil])))) (testing "opens the activity center with filters enabled" (is (match? {:db {:activity-center {:filter {:status :unread :type types/contact-request}}} - :fx [[:dispatch [:open-modal :activity-center {}]] + :fx [[:dispatch [:open-modal :screen/activity-center {}]] [:dispatch-later [{:ms 1000 :dispatch [:activity-center/mark-as-seen]}]]]} (events/open-activity-center {:db {}} [{:filter-type types/contact-request @@ -392,9 +392,9 @@ (events/reconcile-seen-state {:db {}} true)))) (testing "update seen state when the user is on other screen" - (is (match? {:db {:view-id :chats-stack + (is (match? {:db {:view-id :screen/chats-stack :activity-center {:seen? false}}} - (events/reconcile-seen-state {:db {:view-id :chats-stack}} false)))) + (events/reconcile-seen-state {:db {:view-id :screen/chats-stack}} false)))) (testing "update seen state when the user is on activity center" (is (match? {:db {:view-id :activity-center diff --git a/src/status_im/contexts/shell/bottom_tabs/view.cljs b/src/status_im/contexts/shell/bottom_tabs/view.cljs index e1df5d44c42..014e3c3c9c1 100644 --- a/src/status_im/contexts/shell/bottom_tabs/view.cljs +++ b/src/status_im/contexts/shell/bottom_tabs/view.cljs @@ -44,10 +44,10 @@ [reanimated/view {:style (style/bottom-tabs-container (:bottom-tabs-height shared-values))} [rn/view {:style (style/bottom-tabs)} - [bottom-tab :i/wallet :wallet-stack shared-values notifications-data] + [bottom-tab :i/wallet :screen/wallet-stack shared-values notifications-data] [gesture/gesture-detector {:gesture messages-double-tap-gesture} - [bottom-tab :i/messages :chats-stack shared-values notifications-data]] + [bottom-tab :i/messages :screen/chats-stack shared-values notifications-data]] [gesture/gesture-detector {:gesture communities-double-tab-gesture} - [bottom-tab :i/communities :communities-stack shared-values notifications-data]] + [bottom-tab :i/communities :screen/communities-stack shared-values notifications-data]] (when config/show-not-implemented-features? - [bottom-tab :i/browser :browser-stack shared-values notifications-data])]]])) + [bottom-tab :i/browser :screen/browser-stack shared-values notifications-data])]]])) diff --git a/src/status_im/contexts/shell/constants.cljs b/src/status_im/contexts/shell/constants.cljs index 3d4eff2988f..ab3da232ecb 100644 --- a/src/status_im/contexts/shell/constants.cljs +++ b/src/status_im/contexts/shell/constants.cljs @@ -2,30 +2,31 @@ (def ^:const floating-shell-button-height 44) -(def ^:const default-selected-stack :wallet-stack) +(def ^:const default-selected-stack :screen/wallet-stack) ;; Bottom tabs (def ^:const bottom-tabs-container-height-android 57) (def ^:const bottom-tabs-container-height-ios 82) ;; Stacks -(def ^:const stacks-ids [:communities-stack :chats-stack :wallet-stack :browser-stack]) +(def ^:const stacks-ids + [:screen/communities-stack :screen/chats-stack :screen/wallet-stack :screen/browser-stack]) ;; Keywords (def ^:const stacks-opacity-keywords - {:communities-stack :communities-stack-opacity - :chats-stack :chats-stack-opacity - :wallet-stack :wallet-stack-opacity - :browser-stack :browser-stack-opacity}) + {:screen/communities-stack :communities-stack-opacity + :screen/chats-stack :chats-stack-opacity + :screen/wallet-stack :wallet-stack-opacity + :screen/browser-stack :browser-stack-opacity}) (def ^:const tabs-icon-color-keywords - {:communities-stack :communities-tab-icon-color - :chats-stack :chats-tab-icon-opacity - :wallet-stack :wallet-tab-icon-opacity - :browser-stack :browser-tab-icon-opacity}) + {:screen/communities-stack :communities-tab-icon-color + :screen/chats-stack :chats-tab-icon-opacity + :screen/wallet-stack :wallet-tab-icon-opacity + :screen/browser-stack :browser-tab-icon-opacity}) (def ^:const stacks-z-index-keywords - {:communities-stack :communities-stack-z-index - :chats-stack :chats-stack-z-index - :wallet-stack :wallet-stack-z-index - :browser-stack :browser-stack-z-index}) + {:screen/communities-stack :communities-stack-z-index + :screen/chats-stack :chats-stack-z-index + :screen/wallet-stack :wallet-stack-z-index + :screen/browser-stack :browser-stack-z-index}) diff --git a/src/status_im/contexts/shell/effects.cljs b/src/status_im/contexts/shell/effects.cljs index cc45213c7b7..adf0ccfb505 100644 --- a/src/status_im/contexts/shell/effects.cljs +++ b/src/status_im/contexts/shell/effects.cljs @@ -13,5 +13,5 @@ (some-> @state/selected-stack-id-shared-value (reanimated/set-shared-value (name stack-id))) (utils/change-selected-stack stack-id) - (when-not (= stack-id :wallet-stack) + (when-not (= stack-id :screen/wallet-stack) (rf/dispatch [:wallet/reset-selected-networks]))))) diff --git a/src/status_im/contexts/shell/home_stack/view.cljs b/src/status_im/contexts/shell/home_stack/view.cljs index 7788efe07d0..dabb895cc27 100644 --- a/src/status_im/contexts/shell/home_stack/view.cljs +++ b/src/status_im/contexts/shell/home_stack/view.cljs @@ -14,10 +14,10 @@ (defn load-stack? [stack-id] (case stack-id - :communities-stack @state/load-communities-stack? - :chats-stack @state/load-chats-stack? - :browser-stack @state/load-browser-stack? - :wallet-stack @state/load-wallet-stack?)) + :screen/communities-stack @state/load-communities-stack? + :screen/chats-stack @state/load-chats-stack? + :screen/browser-stack @state/load-browser-stack? + :screen/wallet-stack @state/load-wallet-stack?)) (defn- f-stack-view [stack-id shared-values] @@ -29,10 +29,10 @@ :z-index (get shared-values (get shell.constants/stacks-z-index-keywords stack-id))})} (case stack-id - :communities-stack [communities/view] - :chats-stack [chat/view] - :wallet-stack [wallet/view] - :browser-stack [browser.stack/browser-stack] + :screen/communities-stack [communities/view] + :screen/chats-stack [chat/view] + :screen/wallet-stack [wallet/view] + :screen/browser-stack [browser.stack/browser-stack] [:<>])]) (defn lazy-screen @@ -45,7 +45,7 @@ [shared-values] (let [theme (quo.context/use-theme)] [rn/view {:style (style/home-stack theme)} - [lazy-screen :communities-stack shared-values theme] - [lazy-screen :chats-stack shared-values theme] - [lazy-screen :browser-stack shared-values theme] - [lazy-screen :wallet-stack shared-values theme]])) + [lazy-screen :screen/communities-stack shared-values theme] + [lazy-screen :screen/chats-stack shared-values theme] + [lazy-screen :screen/browser-stack shared-values theme] + [lazy-screen :screen/wallet-stack shared-values theme]])) diff --git a/src/status_im/contexts/shell/qr_reader/view.cljs b/src/status_im/contexts/shell/qr_reader/view.cljs index 322f6951cd2..9a6960190d7 100644 --- a/src/status_im/contexts/shell/qr_reader/view.cljs +++ b/src/status_im/contexts/shell/qr_reader/view.cljs @@ -78,14 +78,14 @@ (utils-address/supported-address? scanned-text) (when-let [address (utils-address/supported-address->eth-address scanned-text)] (debounce/debounce-and-dispatch [:generic-scanner/scan-success address] 300) - (debounce/debounce-and-dispatch [:shell/change-tab :wallet-stack] 300)) + (debounce/debounce-and-dispatch [:shell/change-tab :screen/wallet-stack] 300)) (utils-address/eip-681-address? scanned-text) (do (debounce/debounce-and-dispatch [:generic-scanner/scan-success (utils-address/eip-681-address->eth-address scanned-text)] 300) - (debounce/debounce-and-dispatch [:shell/change-tab :wallet-stack] 300)) + (debounce/debounce-and-dispatch [:shell/change-tab :screen/wallet-stack] 300)) (pairing-qr-code? scanned-text) ;; TODO: https://github.com/status-im/status-mobile/issues/18744 diff --git a/src/status_im/contexts/shell/share/view.cljs b/src/status_im/contexts/shell/share/view.cljs index fad6fb50b49..933742afe53 100644 --- a/src/status_im/contexts/shell/share/view.cljs +++ b/src/status_im/contexts/shell/share/view.cljs @@ -32,7 +32,7 @@ :accessibility-label :shell-scan-button :on-press (fn [] (rf/dispatch [:navigate-back]) - (rf/dispatch [:open-modal :shell-qr-reader]))} + (rf/dispatch [:open-modal :screen/shell-qr-reader]))} :i/scan]] [quo/text {:size :heading-1 diff --git a/src/status_im/contexts/shell/utils.cljs b/src/status_im/contexts/shell/utils.cljs index e3a03c7367c..4b6a7fc70d9 100644 --- a/src/status_im/contexts/shell/utils.cljs +++ b/src/status_im/contexts/shell/utils.cljs @@ -14,10 +14,10 @@ (defn load-stack [stack-id] (case stack-id - :communities-stack (reset! state/load-communities-stack? true) - :chats-stack (reset! state/load-chats-stack? true) - :wallet-stack (reset! state/load-wallet-stack? true) - :browser-stack (reset! state/load-browser-stack? true) + :screen/communities-stack (reset! state/load-communities-stack? true) + :screen/chats-stack (reset! state/load-chats-stack? true) + :screen/wallet-stack (reset! state/load-wallet-stack? true) + :screen/browser-stack (reset! state/load-browser-stack? true) "")) (defn change-selected-stack @@ -30,7 +30,7 @@ (defn reset-bottom-tabs [] (let [selected-stack-id @state/selected-stack-id-value] - (reset! state/load-communities-stack? (= selected-stack-id :communities-stack)) - (reset! state/load-chats-stack? (= selected-stack-id :chats-stack)) - (reset! state/load-wallet-stack? (= selected-stack-id :wallet-stack)) - (reset! state/load-browser-stack? (= selected-stack-id :browser-stack)))) + (reset! state/load-communities-stack? (= selected-stack-id :screen/communities-stack)) + (reset! state/load-chats-stack? (= selected-stack-id :screen/chats-stack)) + (reset! state/load-wallet-stack? (= selected-stack-id :screen/wallet-stack)) + (reset! state/load-browser-stack? (= selected-stack-id :screen/browser-stack)))) diff --git a/src/status_im/contexts/syncing/scan_sync_code/view.cljs b/src/status_im/contexts/syncing/scan_sync_code/view.cljs index e35047661a6..13c18cadf4a 100644 --- a/src/status_im/contexts/syncing/scan_sync_code/view.cljs +++ b/src/status_im/contexts/syncing/scan_sync_code/view.cljs @@ -71,8 +71,8 @@ :type :grey :background :blur :size 32 - :accessibility-label :find-sync-code - :on-press #(rf/dispatch [:open-modal :find-sync-code])} + :accessibility-label :screen/find-sync-code + :on-press #(rf/dispatch [:open-modal :screen/find-sync-code])} (i18n/label :t/find-sync-code)]]] [reanimated/view {:style (reanimated/apply-animations-to-style @@ -302,7 +302,7 @@ (some #{view-id} [:screen/onboarding.sign-in-intro :screen/onboarding.sign-in - :scan-sync-code-page]) + :screen/scan-sync-code-page]) (boolean (not-empty @qr-view-finder))) camera-ready-to-scan? (and (or (not animated?) @render-camera?) show-camera? diff --git a/src/status_im/contexts/syncing/setup_syncing/view.cljs b/src/status_im/contexts/syncing/setup_syncing/view.cljs index 29040ea2563..4397f476a45 100644 --- a/src/status_im/contexts/syncing/setup_syncing/view.cljs +++ b/src/status_im/contexts/syncing/setup_syncing/view.cljs @@ -67,7 +67,7 @@ :on-press #(rf/dispatch [:navigate-back]) :right-side [{:icon-left :i/info :label (i18n/label :t/how-to-pair) - :on-press #(rf/dispatch [:open-modal :how-to-pair])}]}] + :on-press #(rf/dispatch [:open-modal :screen/how-to-pair])}]}] [rn/view {:style style/page-container} [rn/view {:style style/title-container} [quo/text @@ -130,5 +130,5 @@ [quo/divider-label {:tight? false} (i18n/label :t/have-a-sync-code?)] [quo/action-drawer [[{:icon :i/scan - :on-press #(rf/dispatch [:open-modal :scan-sync-code-page]) + :on-press #(rf/dispatch [:open-modal :screen/scan-sync-code-page]) :label (i18n/label :t/scan-or-enter-sync-code)}]]]]]]))) 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 305e4c74467..bcf2ec1ec68 100644 --- a/src/status_im/contexts/syncing/syncing_devices_list/view.cljs +++ b/src/status_im/contexts/syncing/syncing_devices_list/view.cljs @@ -22,7 +22,7 @@ :content (fn [] [check-before-syncing/view {:customization-color customization-color - :on-submit #(rf/dispatch [:open-modal :settings-setup-syncing])}])}])) + :on-submit #(rf/dispatch [:open-modal :screen/settings-setup-syncing])}])}])) (defn view [] diff --git a/src/status_im/contexts/wallet/account/share_address/view.cljs b/src/status_im/contexts/wallet/account/share_address/view.cljs index de523147377..3255c353af7 100644 --- a/src/status_im/contexts/wallet/account/share_address/view.cljs +++ b/src/status_im/contexts/wallet/account/share_address/view.cljs @@ -58,7 +58,7 @@ :right-side [{:icon-name :i/scan :on-press (fn [] (rf/dispatch [:navigate-back]) - (rf/dispatch [:open-modal :shell-qr-reader]))}] + (rf/dispatch [:open-modal :screen/shell-qr-reader]))}] :accessibility-label :top-bar}] [quo/page-top {:title title diff --git a/src/status_im/contexts/wallet/account/view.cljs b/src/status_im/contexts/wallet/account/view.cljs index 2878abd950f..950d320251c 100644 --- a/src/status_im/contexts/wallet/account/view.cljs +++ b/src/status_im/contexts/wallet/account/view.cljs @@ -36,7 +36,7 @@ [account-switcher/view {:type :wallet-networks :show-dapps-button? true - :on-press #(rf/dispatch [:pop-to-root :shell-stack])}] + :on-press #(rf/dispatch [:pop-to-root :screen/shell-stack])}] [quo/account-overview {:container-style style/account-overview :current-value formatted-balance diff --git a/src/status_im/contexts/wallet/common/token_value/view.cljs b/src/status_im/contexts/wallet/common/token_value/view.cljs index e8f14208508..af501b321ae 100644 --- a/src/status_im/contexts/wallet/common/token_value/view.cljs +++ b/src/status_im/contexts/wallet/common/token_value/view.cljs @@ -102,11 +102,11 @@ (and (not selected-account) unique-owner?) (assoc :token-symbol token-symbol :token token-data - :stack-id :wallet-stack) + :stack-id :screen/wallet-stack) (and (not selected-account) (not unique-owner?)) (assoc :token-symbol token-symbol - :stack-id :wallet-stack))] + :stack-id :screen/wallet-stack))] [quo/action-drawer [(cond->> [(when (ff/enabled? ::ff/wallet.assets-modal-manage-tokens) (action-manage-tokens watch-only?)) @@ -135,7 +135,7 @@ (or (not watch-only?) (ff/enabled? ::ff/wallet.long-press-watch-only-asset)) (assoc :on-long-press (fn [] - (when (= entry-point :wallet-stack) + (when (= entry-point :screen/wallet-stack) (rf/dispatch [:wallet/close-account-page]) (rf/dispatch [:wallet/clean-current-viewing-account])) (rf/dispatch diff --git a/src/status_im/contexts/wallet/events.cljs b/src/status_im/contexts/wallet/events.cljs index f781679b61b..8e0fbb56194 100644 --- a/src/status_im/contexts/wallet/events.cljs +++ b/src/status_im/contexts/wallet/events.cljs @@ -47,7 +47,7 @@ (rf/reg-event-fx :wallet/navigate-to-account-within-stack (fn [{:keys [db]} [address]] {:db (assoc-in db [:wallet :current-viewing-account-address] address) - :fx [[:dispatch [:navigate-to-within-stack [:screen/wallet.accounts :shell-stack]]]]})) + :fx [[:dispatch [:navigate-to-within-stack [:screen/wallet.accounts :screen/shell-stack]]]]})) (rf/reg-event-fx :wallet/navigate-to-new-account (fn [{:keys [db]} [address]] @@ -80,7 +80,7 @@ (fn [{:keys [db]} [ignore-just-completed-transaction?]] (let [{:keys [entry-point just-completed-transaction? collectible-multiple-owners?]} (-> db :wallet :ui :send) - entry-point-wallet-home? (= entry-point :wallet-stack)] + entry-point-wallet-home? (= entry-point :screen/wallet-stack)] {:db (cond-> db (and (not entry-point) (not ignore-just-completed-transaction?) @@ -191,7 +191,7 @@ :dispatch [:hide-bottom-sheet]}] [:dispatch-later {:ms 100 - :dispatch [:pop-to-root :shell-stack]}] + :dispatch [:pop-to-root :screen/shell-stack]}] [:dispatch-later {:ms 100 :dispatch [:wallet/show-account-deleted-toast toast-message]}]]})) @@ -374,7 +374,7 @@ (-> db :wallet :current-viewing-account-address) (utils/get-default-account (-> db :wallet :accounts))) view-id (:view-id db) - root-screen? (or (= view-id :wallet-stack) (nil? view-id)) + root-screen? (or (= view-id :screen/wallet-stack) (nil? view-id)) multi-account-balance? (-> (utils/get-accounts-with-token-balance (:accounts wallet) token) (count) diff --git a/src/status_im/contexts/wallet/home/tabs/assets/view.cljs b/src/status_im/contexts/wallet/home/tabs/assets/view.cljs index ec040a7df6e..f1880210d15 100644 --- a/src/status_im/contexts/wallet/home/tabs/assets/view.cljs +++ b/src/status_im/contexts/wallet/home/tabs/assets/view.cljs @@ -45,5 +45,5 @@ [rn/flat-list {:render-fn token-value/view :data tokens - :render-data {:entry-point :wallet-stack} + :render-data {:entry-point :screen/wallet-stack} :content-container-style style/list-container}])])) diff --git a/src/status_im/contexts/wallet/send/events.cljs b/src/status_im/contexts/wallet/send/events.cljs index a057b1fd883..98179f23cac 100644 --- a/src/status_im/contexts/wallet/send/events.cljs +++ b/src/status_im/contexts/wallet/send/events.cljs @@ -147,8 +147,8 @@ :recipient (or recipient address) :to-address address)) :fx [[:dispatch [:hide-bottom-sheet]] - [:dispatch [:shell/change-tab :wallet-stack]] - [:dispatch [:pop-to-root :shell-stack]] + [:dispatch [:shell/change-tab :screen/wallet-stack]] + [:dispatch [:pop-to-root :screen/shell-stack]] [:dispatch-later [{:ms 600 :dispatch (if multiple-accounts? @@ -203,7 +203,7 @@ (some #(when (= (:symbol %) token-symbol) %) unique-owner-tokens))) view-id (:view-id db) - root-screen? (or (= view-id :wallet-stack) (nil? view-id)) + root-screen? (or (= view-id :screen/wallet-stack) (nil? view-id)) multi-account-balance? (-> (utils/get-accounts-with-token-balance (:accounts wallet) token) (count) @@ -303,7 +303,7 @@ (rf/reg-event-fx :wallet/clean-selected-collectible (fn [{:keys [db]} [{:keys [ignore-entry-point?]}]] - (let [entry-point-wallet-home? (= (get-in db [:wallet :ui :send :entry-point]) :wallet-stack) + (let [entry-point-wallet-home? (= (get-in db [:wallet :ui :send :entry-point]) :screen/wallet-stack) multiple-owners? (get-in db [:wallet :ui :send :collectible-multiple-owners?]) transaction-type (get-in db [:wallet :ui :send :tx-type])] (when (or ignore-entry-point? @@ -326,7 +326,7 @@ entry-point (cond entry-point entry-point viewing-account? :account-collectible-tab - :else :wallet-stack) + :else :screen/wallet-stack) collection-data (:collection-data collectible) collectible-data (:collectible-data collectible) contract-type (:contract-type collectible) @@ -796,7 +796,7 @@ (rf/reg-event-fx :wallet/collectible-amount-navigate-back (fn [{db :db} [{:keys []}]] - (let [keep-tx-data? (#{:account-collectible-tab :wallet-stack} + (let [keep-tx-data? (#{:account-collectible-tab :screen/wallet-stack} (-> db :wallet :ui :send :entry-point))] {:db (cond-> db :always (update-in [:wallet :ui :send] dissoc :amount :route) diff --git a/src/status_im/contexts/wallet/swap/events.cljs b/src/status_im/contexts/wallet/swap/events.cljs index e7bcb256459..e36e43ca5fa 100644 --- a/src/status_im/contexts/wallet/swap/events.cljs +++ b/src/status_im/contexts/wallet/swap/events.cljs @@ -17,7 +17,7 @@ (fn [{:keys [db]} [{:keys [network asset-to-receive open-new-screen? from-account] :as data}]] (let [{:keys [wallet]} db view-id (:view-id db) - root-screen? (or (= view-id :wallet-stack) (nil? view-id)) + root-screen? (or (= view-id :screen/wallet-stack) (nil? view-id)) available-accounts (utils/get-accounts-with-token-balance (:accounts wallet) (:asset-to-pay data)) account (or from-account diff --git a/src/status_im/navigation/effects.cljs b/src/status_im/navigation/effects.cljs index 3362e550437..90e3c0ea083 100644 --- a/src/status_im/navigation/effects.cljs +++ b/src/status_im/navigation/effects.cljs @@ -24,16 +24,18 @@ home-stack? (some #(= view-id %) shell.constants/stacks-ids) ;; Home screen nav bar always dark due to bottom tabs nav-bar-color (if (or home-stack? - (= view-id :shell-stack) + (= view-id :screen/shell-stack) (= theme :dark)) colors/neutral-100 colors/white) - comp-id (if (some #(= view-id %) shell.constants/stacks-ids) :shell-stack view-id)] + comp-id (if (some #(= view-id %) shell.constants/stacks-ids) + :screen/shell-stack + view-id)] [status-bar-theme nav-bar-color comp-id])) (defn reload-status-nav-color-fx [[view-id theme]] - (when (and (= @state/root-id :shell-stack) view-id) + (when (and (= @state/root-id :screen/shell-stack) view-id) (let [[status-bar-theme nav-bar-color comp-id] (get-status-nav-color view-id theme)] (when platform/android? (navigation/merge-options diff --git a/src/status_im/navigation/events.cljs b/src/status_im/navigation/events.cljs index 5097d794eda..631aa076a5c 100644 --- a/src/status_im/navigation/events.cljs +++ b/src/status_im/navigation/events.cljs @@ -54,9 +54,9 @@ {:fx [[:navigate-back nil] (when (or ;; Closing chat using UI buttons in chat screen (screen-id is known) - (= screen-id :chat) + (= screen-id :screen/chat) ;; Support chat closing using android hardware back button - (and platform/android? (= (:view-id db) :chat))) + (and platform/android? (= (:view-id db) :screen/chat))) [:dispatch [:chat/close]])]}) (rf/defn navigate-back-to @@ -127,7 +127,7 @@ (rf/defn set-view-id {:events [:set-view-id]} [{:keys [db]} view-id] - (let [view-id (if (= view-id :shell-stack) (:shell/selected-stack-id db) view-id)] + (let [view-id (if (= view-id :screen/shell-stack) (:shell/selected-stack-id db) view-id)] {:db (assoc db :view-id view-id) :set-view-id-fx [view-id (:theme db)]})) diff --git a/src/status_im/navigation/roots.cljs b/src/status_im/navigation/roots.cljs index a1a46de948d..ee33f8e6ce4 100644 --- a/src/status_im/navigation/roots.cljs +++ b/src/status_im/navigation/roots.cljs @@ -11,11 +11,11 @@ :children [{:component {:name :screen/onboarding.intro :id :screen/onboarding.intro :options (options/dark-root-options)}}]}}} - :shell-stack + :screen/shell-stack {:root - {:stack {:id :shell-stack - :children [{:component {:name :shell-stack - :id :shell-stack + {:stack {:id :screen/shell-stack + :children [{:component {:name :screen/shell-stack + :id :screen/shell-stack :options (options/root-options {:nav-bar-color colors/neutral-100 :status-bar-theme status-bar-theme})}}]}}} @@ -34,9 +34,9 @@ (defn old-roots [status-bar-theme] - {:progress - {:root {:stack {:children [{:component {:name :progress - :id :progress + {:screen/progress + {:root {:stack {:children [{:component {:name :screen/progress + :id :screen/progress :options (options/root-options {:status-bar-theme status-bar-theme})}}] :options (assoc (options/root-options nil) diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs index 011e64b11df..8beb3353734 100644 --- a/src/status_im/navigation/screens.cljs +++ b/src/status_im/navigation/screens.cljs @@ -167,13 +167,13 @@ [utils.collection])) (def chat-screens - [{:name :start-a-new-chat + [{:name :screen/start-a-new-chat :metrics {:track? true :alias-id :messenger.new-chat} :options {:sheet? true} :component new-chat/view} - {:name :chat + {:name :screen/chat :metrics {:track? true :alias-id :messenger.chat} :options {:popGesture false @@ -207,12 +207,12 @@ :component group.details/add-manage-members}]) (def community-screens - [{:name :discover-communities + [{:name :screen/discover-communities :metrics {:track? true :alias-id :community.discover} :component communities.discover/view} - {:name :community-overview + {:name :screen/community-overview :metrics {:track? true :alias-id :community.overview} :options {:animations transitions/stack-transition-from-bottom} @@ -221,12 +221,12 @@ ;; Note: the sheet screen is used when selecting addresses to share when ;; joining a community. The non-sheet screen is used when editing shared ;; addresses after the join request was sent. - {:name :community-account-selection-sheet + {:name :screen/community-account-selection-sheet :metrics {:track? true :alias-id :community.select-addresses-for-joining-community} :options {:sheet? true} :component communities.accounts-selection/view} - {:name :community-account-selection + {:name :screen/community-account-selection :metrics {:track? true :alias-id :community.select-addresses-for-community} :options {:insets {:top? true}} @@ -238,13 +238,13 @@ :options options/transparent-screen-options :component share-community/view} - {:name :invite-people-community + {:name :screen/invite-people-community :metrics {:track? true :alias-id :community.invite-people} :options {:sheet? true} :component communities.invite/view} - {:name :share-community-channel + {:name :screen/share-community-channel :metrics {:track? true :alias-id :community.share-channel} :options options/transparent-screen-options @@ -256,70 +256,70 @@ :options {:insets {:top? true}} :component channel-view-channel-members-and-details/view} - {:name :addresses-for-permissions + {:name :screen/addresses-for-permissions :metrics {:track? true :alias-id :community.choose-addresses-for-permissions} :options {:insets {:top? true}} :component addresses-for-permissions/view} - {:name :address-for-airdrop + {:name :screen/address-for-airdrop :metrics {:track? true :alias-id :community.choose-addresses-for-airdrop} :options {:insets {:top? true}} :component airdrop-addresses/view}]) (def contact-screens - [{:name :new-contact + [{:name :screen/new-contact :metrics {:track? true :alias-id :contact.new-contact} :options {:sheet? true} :component add-new-contact/new-contact} - {:name :scan-profile-qr-code + {:name :screen/scan-profile-qr-code :metrics {:track? true :alias-id :contact.scan-profile-qr-code} :options options/dark-screen :component scan-profile-qr-page/view} - {:name :contact-profile + {:name :screen/contact-profile :metrics {:track? true :alias-id :contact.contact-profile} :options {:modalPresentationStyle :overCurrentContext} :component contact-profile/view} - {:name :share-contact + {:name :screen/share-contact :metrics {:track? true :alias-id :contact.share-profile} :options options/transparent-screen-options :component share-contact/view}]) (def device-syncing-screens - [{:name :how-to-pair + [{:name :screen/how-to-pair :metrics {:track? true :alias-id :syncing.how-to-pair} :options (assoc options/dark-screen :sheet? true) :component how-to-pair/view} - {:name :find-sync-code + {:name :screen/find-sync-code :metrics {:track? true :alias-id :syncing.find-sync-code} :options (assoc options/dark-screen :sheet? true) :component find-sync-code/view} - {:name :settings-setup-syncing + {:name :screen/settings-setup-syncing :metrics {:track? true :alias-id :syncing.setup-syncing} :options options/transparent-screen-options :component settings-setup-syncing/view} - {:name :scan-sync-code-page + {:name :screen/scan-sync-code-page :metrics {:track? true :alias-id :syncing.scan-sync-code} :options options/transparent-modal-screen-options :component scan-sync-code-page/view}]) (def settings-screens - [{:name :settings + [{:name :screen/settings :metrics {:track? true :alias-id :settings.profile-settings} :options options/transparent-screen-options @@ -332,25 +332,25 @@ :insets {:top? true :bottom? true}} :component settings.keycard/view} - {:name :edit-profile + {:name :screen/edit-profile :metrics {:track? true :alias-id :settings.edit-profile} :options options/transparent-modal-screen-options :component edit-profile/view} - {:name :edit-accent-colour + {:name :screen/edit-accent-colour :metrics {:track? true :alias-id :settings.edit-profile-accent-colour} :options options/transparent-modal-screen-options :component edit-accent-colour/view} - {:name :edit-name + {:name :screen/edit-name :metrics {:track? true :alias-id :settings.edit-profile-name} :options options/transparent-modal-screen-options :component edit-name/view} - {:name :edit-bio + {:name :screen/edit-bio :metrics {:track? true :alias-id :settings.edit-profile-bio} :options options/transparent-modal-screen-options @@ -1166,7 +1166,7 @@ onboarding-screens keycard-screens - [{:name :activity-center + [{:name :screen/activity-center :metrics {:track? true} :options options/transparent-screen-options :component activity-center/view} @@ -1176,32 +1176,32 @@ :options options/transparent-screen-options :component share/view} - {:name :shell-stack + {:name :screen/shell-stack :metrics {:track? true} :component shell/shell-stack} - {:name :shell-qr-reader + {:name :screen/shell-qr-reader :metrics {:track? true} :options options/dark-screen :component shell-qr-reader/view} - {:name :lightbox + {:name :screen/lightbox :metrics {:track? true} :options options/lightbox :component lightbox/lightbox} - {:name :photo-selector + {:name :screen/photo-selector :metrics {:track? true} :options {:sheet? true} :component photo-selector/photo-selector} - {:name :camera-screen + {:name :screen/camera-screen :metrics {:track? true} :options {:navigationBar {:backgroundColor colors/black} :theme :dark} :component camera-screen/camera-screen} - {:name :emoji-picker + {:name :screen/emoji-picker :metrics {:track? true} :options {:sheet? true} :component emoji-picker/view} @@ -1252,12 +1252,8 @@ :options options/transparent-screen-options :component edit-profile-modal/view}] - [{:name :shell - :metrics {:track? true} - :options {:theme :dark}}] - (when js/goog.DEBUG - [{:name :dev-component-preview + [{:name :screen/dev-component-preview :options {:sheet? true} :component component-preview/view}]) @@ -1274,7 +1270,7 @@ status-im-preview/main-screens) (when config/quo-preview-enabled? - [{:name :feature-flags + [{:name :screen/feature-flags :options {:insets {:top? true}} :component feature-flags/view}]))) diff --git a/src/status_im/navigation/view.cljs b/src/status_im/navigation/view.cljs index e2fb6b9b12c..cf2c5ff2d62 100644 --- a/src/status_im/navigation/view.cljs +++ b/src/status_im/navigation/view.cljs @@ -58,13 +58,8 @@ (let [screen-details (get (if js/goog.DEBUG (get-screens) screens) - (keyword screen-key)) - qualified-screen-details (get (if js/goog.DEBUG - (get-screens) - screens) (keyword "screen" screen-key)) - ;; Todo: Remove qualifier check once #22358 is fixed - {:keys [component options name]} (or qualified-screen-details screen-details) + {:keys [component options name]} screen-details screen-params (rf/sub [:get-screen-params name]) {:keys [insets sheet? theme skip-background?]} options diff --git a/src/status_im/subs/chats.cljs b/src/status_im/subs/chats.cljs index f5f427512e3..4b4429ebe5f 100644 --- a/src/status_im/subs/chats.cljs +++ b/src/status_im/subs/chats.cljs @@ -16,7 +16,7 @@ :<- [:view-id] :<- [:home-items-show-number] (fn [[chats view-id home-items-show-number]] - (if (or (empty? @memo-chats-stack-items) (= view-id :chats-stack)) + (if (or (empty? @memo-chats-stack-items) (= view-id :screen/chats-stack)) (let [res (take home-items-show-number chats)] (reset! memo-chats-stack-items res) res) diff --git a/src/status_im/subs/communities.cljs b/src/status_im/subs/communities.cljs index 2eabd3f3e21..e8cecfff4a8 100644 --- a/src/status_im/subs/communities.cljs +++ b/src/status_im/subs/communities.cljs @@ -202,7 +202,7 @@ ;; joined, to some of them join request sent and others were opened one day and their data remained ;; in app-db. Result map has form: {:joined [id1, id2] :pending [id3, id5] :opened [id4]}" (fn [[view-id communities requests]] - (if (or (empty? @memo-communities-stack-items) (= view-id :communities-stack)) + (if (or (empty? @memo-communities-stack-items) (= view-id :screen/communities-stack)) (let [grouped-communities (->> communities vals ;; Remove data that can grow fast or is diff --git a/src/status_im/subs/shell.cljs b/src/status_im/subs/shell.cljs index 967a0a9197a..bf78aaa22a5 100644 --- a/src/status_im/subs/shell.cljs +++ b/src/status_im/subs/shell.cljs @@ -37,13 +37,13 @@ {:chats-stack {:unviewed-messages-count 0 :unviewed-mentions-count 0} :community-stack {:unviewed-messages-count 0 :unviewed-mentions-count 0}} chats)] - {:communities-stack + {:screen/communities-stack {:new-notifications? (pos? (:unviewed-messages-count community-stack)) :notification-indicator (if (pos? (:unviewed-mentions-count community-stack)) :counter :unread-dot) :counter-label (:unviewed-mentions-count community-stack)} - :chats-stack + :screen/chats-stack {:new-notifications? (pos? (:unviewed-messages-count chats-stack)) :notification-indicator (if (pos? (:unviewed-mentions-count chats-stack)) :counter diff --git a/src/status_im/subs/shell_test.cljs b/src/status_im/subs/shell_test.cljs index bd04303779b..9f11392987e 100644 --- a/src/status_im/subs/shell_test.cljs +++ b/src/status_im/subs/shell_test.cljs @@ -19,12 +19,12 @@ :unviewed-mentions-count 0}}) (def expected-notification-data-for-one-to-one-group-community-chats1 - {:communities-stack {:new-notifications? true - :notification-indicator :unread-dot - :counter-label 0} - :chats-stack {:new-notifications? true - :notification-indicator :unread-dot - :counter-label 0}}) + {:screen/communities-stack {:new-notifications? true + :notification-indicator :unread-dot + :counter-label 0} + :screen/chats-stack {:new-notifications? true + :notification-indicator :unread-dot + :counter-label 0}}) (def one-to-one-group-community-chats2 (merge @@ -40,12 +40,12 @@ :unviewed-mentions-count 7}})) (def expected-notification-data-for-one-to-one-group-community-chats2 - {:communities-stack {:new-notifications? true - :notification-indicator :counter - :counter-label 7} - :chats-stack {:new-notifications? true - :notification-indicator :counter - :counter-label 11}}) + {:screen/communities-stack {:new-notifications? true + :notification-indicator :counter + :counter-label 7} + :screen/chats-stack {:new-notifications? true + :notification-indicator :counter + :counter-label 11}}) (h/deftest-sub :shell/bottom-tabs-notifications-data [sub-name]