diff --git a/src/quo2/components/navigation/top_nav.cljs b/src/quo2/components/navigation/top_nav.cljs index 9bc77fd74c..f539ef8bee 100644 --- a/src/quo2/components/navigation/top_nav.cljs +++ b/src/quo2/components/navigation/top_nav.cljs @@ -63,6 +63,7 @@ :right 20 :top 12 :flex-direction :row}} + ;; TODO component shouldn't know anything about parent system, we should pass buttons as parameters [base-button :i/search open-search :open-search-button button-common-props] [base-button :i/scan open-scanner :open-scanner-button button-common-props] [base-button :i/qr-code show-qr :show-qr-button button-common-props] diff --git a/src/status_im2/contexts/communities/discover/view.cljs b/src/status_im2/contexts/communities/discover/view.cljs index 55738492eb..1cc253fcca 100644 --- a/src/status_im2/contexts/communities/discover/view.cljs +++ b/src/status_im2/contexts/communities/discover/view.cljs @@ -133,6 +133,6 @@ :style {:margin-vertical 12 :margin-left 20} :on-press #(rf/dispatch [:navigate-back])} - :close] + :i/close] [screen-title] [other-communities]])]) diff --git a/src/status_im2/contexts/communities/home/view.cljs b/src/status_im2/contexts/communities/home/view.cljs index 3562a52543..6dbb7d1562 100644 --- a/src/status_im2/contexts/communities/home/view.cljs +++ b/src/status_im2/contexts/communities/home/view.cljs @@ -40,9 +40,7 @@ (defn get-item-layout-js [_ index] #js {:length 64 :offset (* 64 index) :index index}) -(def selected-tab (reagent/atom :joined)) - -(defn home-community-segments [] +(defn home-community-segments [selected-tab] [rn/view {:style {:padding-bottom 12 :padding-top 16 :margin-top 8 @@ -64,7 +62,7 @@ :data community-ids :render-fn render-fn}]) -(defn segments-community-lists [] +(defn segments-community-lists [selected-tab] (let [communities (rf/sub [:communities/community-ids]) tab @selected-tab] [rn/view {:style {:padding-left 20 @@ -90,17 +88,19 @@ (defn home [] [safe-area/consumer (fn [insets] - [rn/view {:style {:flex 1 - :padding-top (:top insets) - :background-color (colors/theme-colors - colors/neutral-5 - colors/neutral-95)}} - [topnav/top-nav {:type :default - :open-activity-center navigate-to-activity-center}] - [title-column] - [discover-card/discover-card {:on-press #(rf/dispatch [:navigate-to :discover-communities]) - :title (i18n/label :t/discover) - :description (i18n/label :t/whats-trending) - :accessibility-label :communities-home-discover-card}] - [home-community-segments] - [segments-community-lists]])]) + (let [selected-tab (reagent/atom :joined)] + (fn [] + [rn/view {:style {:flex 1 + :padding-top (:top insets) + :background-color (colors/theme-colors + colors/neutral-5 + colors/neutral-95)}} + [topnav/top-nav {:type :default + :open-activity-center navigate-to-activity-center}] + [title-column] + [discover-card/discover-card {:on-press #(rf/dispatch [:navigate-to :discover-communities]) + :title (i18n/label :t/discover) + :description (i18n/label :t/whats-trending) + :accessibility-label :communities-home-discover-card}] + [home-community-segments selected-tab] + [segments-community-lists selected-tab]])))]) diff --git a/src/status_im/ui2/screens/quo2_preview/avatars/account_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs similarity index 92% rename from src/status_im/ui2/screens/quo2_preview/avatars/account_avatar.cljs rename to src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs index e0662fe8c2..5580c3e26d 100644 --- a/src/status_im/ui2/screens/quo2_preview/avatars/account_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.avatars.account-avatar +(ns status-im2.contexts.quo-preview.avatars.account-avatar (:require [reagent.core :as reagent] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.avatars.account-avatar :as quo2])) (def descriptor [{:label "Icon" diff --git a/src/status_im/ui2/screens/quo2_preview/avatars/channel_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/avatars/channel_avatar.cljs rename to src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs index 028c478fd7..fb12e1aa24 100644 --- a/src/status_im/ui2/screens/quo2_preview/avatars/channel_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.avatars.channel-avatar +(ns status-im2.contexts.quo-preview.avatars.channel-avatar (:require [reagent.core :as reagent] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.avatars.channel-avatar :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/avatars/group_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/avatars/group_avatar.cljs rename to src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs index c8d0158cdd..4415474701 100644 --- a/src/status_im/ui2/screens/quo2_preview/avatars/group_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.avatars.group-avatar +(ns status-im2.contexts.quo-preview.avatars.group-avatar (:require [reagent.core :as reagent] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.avatars.group-avatar :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/avatars/icon_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/avatars/icon_avatar.cljs rename to src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs index 5e44274767..26d48a610a 100644 --- a/src/status_im/ui2/screens/quo2_preview/avatars/icon_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.avatars.icon-avatar +(ns status-im2.contexts.quo-preview.avatars.icon-avatar (:require [reagent.core :as reagent] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.avatars.icon-avatar :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/avatars/user_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/avatars/user_avatar.cljs rename to src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs index 8fad6b8d11..246d7fe160 100644 --- a/src/status_im/ui2/screens/quo2_preview/avatars/user_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.avatars.user-avatar +(ns status-im2.contexts.quo-preview.avatars.user-avatar (:require [react-native.core :as rn] [quo2.foundations.colors :as colors] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.avatars.user-avatar :as quo2] [reagent.core :as reagent] [status-im.react-native.resources :as resources])) diff --git a/src/status_im/ui2/screens/quo2_preview/avatars/wallet_user_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/avatars/wallet_user_avatar.cljs rename to src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs index 2f3a13776c..17a277128e 100644 --- a/src/status_im/ui2/screens/quo2_preview/avatars/wallet_user_avatar.cljs +++ b/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.avatars.wallet-user-avatar +(ns status-im2.contexts.quo-preview.avatars.wallet-user-avatar (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.components.avatars.wallet-user-avatar :as quo2] [quo2.foundations.colors :as colors])) diff --git a/src/status_im/ui2/screens/quo2_preview/buttons/button.cljs b/src/status_im2/contexts/quo_preview/buttons/button.cljs similarity index 96% rename from src/status_im/ui2/screens/quo2_preview/buttons/button.cljs rename to src/status_im2/contexts/quo_preview/buttons/button.cljs index 58405a4555..0de4238014 100644 --- a/src/status_im/ui2/screens/quo2_preview/buttons/button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/button.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.buttons.button +(ns status-im2.contexts.quo-preview.buttons.button (:require [reagent.core :as reagent] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.buttons.button :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/buttons/dynamic_button.cljs b/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/buttons/dynamic_button.cljs rename to src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs index fd1029a2e3..f48a0b8f81 100644 --- a/src/status_im/ui2/screens/quo2_preview/buttons/dynamic_button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.buttons.dynamic-button +(ns status-im2.contexts.quo-preview.buttons.dynamic-button (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.buttons.dynamic-button :as quo2] [status-im.i18n.i18n :as i18n])) diff --git a/src/status_im/ui2/screens/quo2_preview/code/snippet.cljs b/src/status_im2/contexts/quo_preview/code/snippet.cljs similarity index 96% rename from src/status_im/ui2/screens/quo2_preview/code/snippet.cljs rename to src/status_im2/contexts/quo_preview/code/snippet.cljs index d75acbf820..5d8ff6ef1e 100644 --- a/src/status_im/ui2/screens/quo2_preview/code/snippet.cljs +++ b/src/status_im2/contexts/quo_preview/code/snippet.cljs @@ -1,5 +1,5 @@ -(ns status-im.ui2.screens.quo2-preview.code.snippet - (:require [status-im.ui2.screens.quo2-preview.preview :as preview] +(ns status-im2.contexts.quo-preview.code.snippet + (:require [status-im2.contexts.quo-preview.preview :as preview] [react-native.core :as rn] [quo2.components.code.snippet :as snippet] [quo2.foundations.colors :as colors] diff --git a/src/status_im/ui2/screens/quo2_preview/community/community_card_view.cljs b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/community/community_card_view.cljs rename to src/status_im2/contexts/quo_preview/community/community_card_view.cljs index f9e76ea80b..29253335d1 100644 --- a/src/status_im/ui2/screens/quo2_preview/community/community_card_view.cljs +++ b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.community.community-card-view +(ns status-im2.contexts.quo-preview.community.community-card-view (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [status-im.constants :as constants] [quo2.foundations.colors :as colors] diff --git a/src/status_im/ui2/screens/quo2_preview/community/community_list_view.cljs b/src/status_im2/contexts/quo_preview/community/community_list_view.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/community/community_list_view.cljs rename to src/status_im2/contexts/quo_preview/community/community_list_view.cljs index b7a6c6b2c7..42e9bb6963 100644 --- a/src/status_im/ui2/screens/quo2_preview/community/community_list_view.cljs +++ b/src/status_im2/contexts/quo_preview/community/community_list_view.cljs @@ -1,10 +1,10 @@ -(ns status-im.ui2.screens.quo2-preview.community.community-list-view +(ns status-im2.contexts.quo-preview.community.community-list-view (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] [quo2.foundations.colors :as colors] [quo2.components.community.community-list-view :as community-list-view] - [status-im.ui2.screens.quo2-preview.community.data :as data])) + [status-im2.contexts.quo-preview.community.data :as data])) (def descriptor [{:label "Notifications:" :key :notifications diff --git a/src/status_im/ui2/screens/quo2_preview/community/community_membership_list_view.cljs b/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/community/community_membership_list_view.cljs rename to src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs index a762ba722d..08f4fbd394 100644 --- a/src/status_im/ui2/screens/quo2_preview/community/community_membership_list_view.cljs +++ b/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs @@ -1,9 +1,9 @@ -(ns status-im.ui2.screens.quo2-preview.community.community-membership-list-view +(ns status-im2.contexts.quo-preview.community.community-membership-list-view (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] [quo2.foundations.colors :as colors] - [status-im.ui2.screens.quo2-preview.community.data :as data] + [status-im2.contexts.quo-preview.community.data :as data] [quo2.components.community.community-list-view :as community-list-view])) (def descriptor [{:label "Notifications:" diff --git a/src/status_im/ui2/screens/quo2_preview/community/data.cljs b/src/status_im2/contexts/quo_preview/community/data.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/community/data.cljs rename to src/status_im2/contexts/quo_preview/community/data.cljs index cba1fa137b..b712244312 100644 --- a/src/status_im/ui2/screens/quo2_preview/community/data.cljs +++ b/src/status_im2/contexts/quo_preview/community/data.cljs @@ -1,4 +1,4 @@ -(ns status-im.ui2.screens.quo2-preview.community.data +(ns status-im2.contexts.quo-preview.community.data (:require [quo.design-system.colors :as quo.colors] [status-im.i18n.i18n :as i18n] diff --git a/src/status_im/ui2/screens/quo2_preview/community/discover_card.cljs b/src/status_im2/contexts/quo_preview/community/discover_card.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/community/discover_card.cljs rename to src/status_im2/contexts/quo_preview/community/discover_card.cljs index 50fc37a5d1..080c33e91d 100644 --- a/src/status_im/ui2/screens/quo2_preview/community/discover_card.cljs +++ b/src/status_im2/contexts/quo_preview/community/discover_card.cljs @@ -1,4 +1,4 @@ -(ns status-im.ui2.screens.quo2-preview.community.discover-card +(ns status-im2.contexts.quo-preview.community.discover-card (:require [quo.react-native :as rn] [quo.previews.preview :as preview] [reagent.core :as reagent] diff --git a/src/status_im/ui2/screens/quo2_preview/counter/counter.cljs b/src/status_im2/contexts/quo_preview/counter/counter.cljs similarity index 92% rename from src/status_im/ui2/screens/quo2_preview/counter/counter.cljs rename to src/status_im2/contexts/quo_preview/counter/counter.cljs index cfa5113341..1e70ec0f62 100644 --- a/src/status_im/ui2/screens/quo2_preview/counter/counter.cljs +++ b/src/status_im2/contexts/quo_preview/counter/counter.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.counter.counter +(ns status-im2.contexts.quo-preview.counter.counter (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.components.counter.counter :as quo2] [quo2.foundations.colors :as colors])) diff --git a/src/status_im/ui2/screens/quo2_preview/dividers/divider_label.cljs b/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/dividers/divider_label.cljs rename to src/status_im2/contexts/quo_preview/dividers/divider_label.cljs index 81855ec6af..08b678814a 100644 --- a/src/status_im/ui2/screens/quo2_preview/dividers/divider_label.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.dividers.divider-label +(ns status-im2.contexts.quo-preview.dividers.divider-label (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.dividers.divider-label :as divider-label])) diff --git a/src/status_im/ui2/screens/quo2_preview/dividers/new_messages.cljs b/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/dividers/new_messages.cljs rename to src/status_im2/contexts/quo_preview/dividers/new_messages.cljs index 73854201cc..cf9858b5fc 100644 --- a/src/status_im/ui2/screens/quo2_preview/dividers/new_messages.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.dividers.new-messages +(ns status-im2.contexts.quo-preview.dividers.new-messages (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.dividers.new-messages :as new-messages] [status-im.i18n.i18n :as i18n])) diff --git a/src/status_im/ui2/screens/quo2_preview/drawers/action_drawers.cljs b/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/drawers/action_drawers.cljs rename to src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs index 86deff4ab5..efa3c067c1 100644 --- a/src/status_im/ui2/screens/quo2_preview/drawers/action_drawers.cljs +++ b/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs @@ -1,5 +1,5 @@ -(ns status-im.ui2.screens.quo2-preview.drawers.action-drawers - (:require [status-im.ui2.screens.quo2-preview.preview :as preview] +(ns status-im2.contexts.quo-preview.drawers.action-drawers + (:require [status-im2.contexts.quo-preview.preview :as preview] [react-native.core :as rn] [quo2.components.drawers.action-drawers :as quo2] [quo2.components.buttons.button :as button] diff --git a/src/status_im/ui2/screens/quo2_preview/dropdowns/dropdown.cljs b/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs similarity index 96% rename from src/status_im/ui2/screens/quo2_preview/dropdowns/dropdown.cljs rename to src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs index 202c7f5ac5..88e53a1aec 100644 --- a/src/status_im/ui2/screens/quo2_preview/dropdowns/dropdown.cljs +++ b/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.dropdowns.dropdown +(ns status-im2.contexts.quo-preview.dropdowns.dropdown (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.dropdowns.dropdown :as quo2] [quo2.foundations.colors :as colors] [reagent.core :as reagent])) diff --git a/src/status_im/ui2/screens/quo2_preview/info/info_message.cljs b/src/status_im2/contexts/quo_preview/info/info_message.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/info/info_message.cljs rename to src/status_im2/contexts/quo_preview/info/info_message.cljs index e7a878bc9f..3907828c05 100644 --- a/src/status_im/ui2/screens/quo2_preview/info/info_message.cljs +++ b/src/status_im2/contexts/quo_preview/info/info_message.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.info.info-message +(ns status-im2.contexts.quo-preview.info.info-message (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.info.info-message :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/info/information_box.cljs b/src/status_im2/contexts/quo_preview/info/information_box.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/info/information_box.cljs rename to src/status_im2/contexts/quo_preview/info/information_box.cljs index dad659656b..7f14e396d5 100644 --- a/src/status_im/ui2/screens/quo2_preview/info/information_box.cljs +++ b/src/status_im2/contexts/quo_preview/info/information_box.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.info.information-box +(ns status-im2.contexts.quo-preview.info.information-box (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.info.information-box :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/list_items/channel.cljs b/src/status_im2/contexts/quo_preview/list_items/channel.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/list_items/channel.cljs rename to src/status_im2/contexts/quo_preview/list_items/channel.cljs index bf5e370786..76cc8b417d 100644 --- a/src/status_im/ui2/screens/quo2_preview/list_items/channel.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/channel.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.list-items.channel +(ns status-im2.contexts.quo-preview.list-items.channel (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.list-items.channel :as quo2-channel])) diff --git a/src/status_im/ui2/screens/quo2_preview/list_items/preview_lists.cljs b/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/list_items/preview_lists.cljs rename to src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs index fd3ac790cf..21fcb814c1 100644 --- a/src/status_im/ui2/screens/quo2_preview/list_items/preview_lists.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.list-items.preview-lists +(ns status-im2.contexts.quo-preview.list-items.preview-lists (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [status-im.react-native.resources :as resources] [quo2.components.list-items.preview-list :as quo2] diff --git a/src/status_im/ui2/screens/quo2_preview/main.cljs b/src/status_im2/contexts/quo_preview/main.cljs similarity index 66% rename from src/status_im/ui2/screens/quo2_preview/main.cljs rename to src/status_im2/contexts/quo_preview/main.cljs index 200d3bdf06..c3a0acae2a 100644 --- a/src/status_im/ui2/screens/quo2_preview/main.cljs +++ b/src/status_im2/contexts/quo_preview/main.cljs @@ -1,57 +1,57 @@ -(ns status-im.ui2.screens.quo2-preview.main +(ns status-im2.contexts.quo-preview.main (:require [react-native.core :as rn] [react-native.safe-area :as safe-area] [quo2.foundations.colors :as colors] [quo2.theme :as theme] [quo2.components.markdown.text :as quo2-text] [quo2.components.buttons.button :as quo2-button] - [status-im.ui2.screens.quo2-preview.avatars.channel-avatar :as channel-avatar] - [status-im.ui2.screens.quo2-preview.avatars.icon-avatar :as icon-avatar] - [status-im.ui2.screens.quo2-preview.avatars.group-avatar :as group-avatar] - [status-im.ui2.screens.quo2-preview.avatars.user-avatar :as user-avatar] - [status-im.ui2.screens.quo2-preview.avatars.wallet-user-avatar :as wallet-user-avatar] - [status-im.ui2.screens.quo2-preview.buttons.button :as button] - [status-im.ui2.screens.quo2-preview.buttons.dynamic-button :as dynamic-button] - [status-im.ui2.screens.quo2-preview.code.snippet :as code-snippet] - [status-im.ui2.screens.quo2-preview.counter.counter :as counter] - [status-im.ui2.screens.quo2-preview.community.community-card-view :as community-card] - [status-im.ui2.screens.quo2-preview.community.community-list-view :as community-list-view] - [status-im.ui2.screens.quo2-preview.community.community-membership-list-view :as community-membership-list-view] - [status-im.ui2.screens.quo2-preview.community.discover-card :as discover-card] - [status-im.ui2.screens.quo2-preview.dividers.divider-label :as divider-label] - [status-im.ui2.screens.quo2-preview.dividers.new-messages :as new-messages] - [status-im.ui2.screens.quo2-preview.drawers.action-drawers :as drawers] - [status-im.ui2.screens.quo2-preview.dropdowns.dropdown :as dropdown] - [status-im.ui2.screens.quo2-preview.info.info-message :as info-message] - [status-im.ui2.screens.quo2-preview.info.information-box :as information-box] - [status-im.ui2.screens.quo2-preview.wallet.lowest-price :as lowest-price] - [status-im.ui2.screens.quo2-preview.list-items.preview-lists :as preview-lists] - [status-im.ui2.screens.quo2-preview.list-items.channel :as channel] - [status-im.ui2.screens.quo2-preview.markdown.text :as text] - [status-im.ui2.screens.quo2-preview.messages.gap :as messages-gap] - [status-im.ui2.screens.quo2-preview.messages.system-message :as system-message] - [status-im.ui2.screens.quo2-preview.notifications.activity-logs :as activity-logs] - [status-im.ui2.screens.quo2-preview.posts-and-attachments.messages-skeleton :as messages-skeleton] - [status-im.ui2.screens.quo2-preview.reactions.react :as react] - [status-im.ui2.screens.quo2-preview.selectors.disclaimer :as disclaimer] - [status-im.ui2.screens.quo2-preview.selectors.selectors :as selectors] - [status-im.ui2.screens.quo2-preview.switcher.switcher-cards :as switcher-cards] - [status-im.ui2.screens.quo2-preview.navigation.top-nav :as top-nav] - [status-im.ui2.screens.quo2-preview.navigation.bottom-nav-tab :as bottom-nav-tab] - [status-im.ui2.screens.quo2-preview.navigation.floating-shell-button :as floating-shell-button] - [status-im.ui2.screens.quo2-preview.tabs.account-selector :as account-selector] - [status-im.ui2.screens.quo2-preview.tabs.segmented-tab :as segmented] - [status-im.ui2.screens.quo2-preview.tabs.tabs :as tabs] - [status-im.ui2.screens.quo2-preview.tags.context-tags :as context-tags] - [status-im.ui2.screens.quo2-preview.tags.tags :as tags] - [status-im.ui2.screens.quo2-preview.tags.permission-tag :as permission-tag] - [status-im.ui2.screens.quo2-preview.tags.status-tags :as status-tags] - [status-im.ui2.screens.quo2-preview.tags.token-tag :as token-tag] - [status-im.ui2.screens.quo2-preview.wallet.token-overview :as token-overview] - [status-im.ui2.screens.quo2-preview.wallet.network-breakdown :as network-breakdown] - [status-im.ui2.screens.quo2-preview.wallet.network-amount :as network-amount] - [status-im.ui2.screens.quo2-preview.navigation.page-nav :as page-nav] - [status-im.ui2.screens.quo2-preview.avatars.account-avatar :as account-avatar] + [status-im2.contexts.quo-preview.avatars.channel-avatar :as channel-avatar] + [status-im2.contexts.quo-preview.avatars.icon-avatar :as icon-avatar] + [status-im2.contexts.quo-preview.avatars.group-avatar :as group-avatar] + [status-im2.contexts.quo-preview.avatars.user-avatar :as user-avatar] + [status-im2.contexts.quo-preview.avatars.wallet-user-avatar :as wallet-user-avatar] + [status-im2.contexts.quo-preview.buttons.button :as button] + [status-im2.contexts.quo-preview.buttons.dynamic-button :as dynamic-button] + [status-im2.contexts.quo-preview.code.snippet :as code-snippet] + [status-im2.contexts.quo-preview.counter.counter :as counter] + [status-im2.contexts.quo-preview.community.community-card-view :as community-card] + [status-im2.contexts.quo-preview.community.community-list-view :as community-list-view] + [status-im2.contexts.quo-preview.community.community-membership-list-view :as community-membership-list-view] + [status-im2.contexts.quo-preview.community.discover-card :as discover-card] + [status-im2.contexts.quo-preview.dividers.divider-label :as divider-label] + [status-im2.contexts.quo-preview.dividers.new-messages :as new-messages] + [status-im2.contexts.quo-preview.drawers.action-drawers :as drawers] + [status-im2.contexts.quo-preview.dropdowns.dropdown :as dropdown] + [status-im2.contexts.quo-preview.info.info-message :as info-message] + [status-im2.contexts.quo-preview.info.information-box :as information-box] + [status-im2.contexts.quo-preview.wallet.lowest-price :as lowest-price] + [status-im2.contexts.quo-preview.list-items.preview-lists :as preview-lists] + [status-im2.contexts.quo-preview.list-items.channel :as channel] + [status-im2.contexts.quo-preview.markdown.text :as text] + [status-im2.contexts.quo-preview.messages.gap :as messages-gap] + [status-im2.contexts.quo-preview.messages.system-message :as system-message] + [status-im2.contexts.quo-preview.notifications.activity-logs :as activity-logs] + [status-im2.contexts.quo-preview.posts-and-attachments.messages-skeleton :as messages-skeleton] + [status-im2.contexts.quo-preview.reactions.react :as react] + [status-im2.contexts.quo-preview.selectors.disclaimer :as disclaimer] + [status-im2.contexts.quo-preview.selectors.selectors :as selectors] + [status-im2.contexts.quo-preview.switcher.switcher-cards :as switcher-cards] + [status-im2.contexts.quo-preview.navigation.top-nav :as top-nav] + [status-im2.contexts.quo-preview.navigation.bottom-nav-tab :as bottom-nav-tab] + [status-im2.contexts.quo-preview.navigation.floating-shell-button :as floating-shell-button] + [status-im2.contexts.quo-preview.tabs.account-selector :as account-selector] + [status-im2.contexts.quo-preview.tabs.segmented-tab :as segmented] + [status-im2.contexts.quo-preview.tabs.tabs :as tabs] + [status-im2.contexts.quo-preview.tags.context-tags :as context-tags] + [status-im2.contexts.quo-preview.tags.tags :as tags] + [status-im2.contexts.quo-preview.tags.permission-tag :as permission-tag] + [status-im2.contexts.quo-preview.tags.status-tags :as status-tags] + [status-im2.contexts.quo-preview.tags.token-tag :as token-tag] + [status-im2.contexts.quo-preview.wallet.token-overview :as token-overview] + [status-im2.contexts.quo-preview.wallet.network-breakdown :as network-breakdown] + [status-im2.contexts.quo-preview.wallet.network-amount :as network-amount] + [status-im2.contexts.quo-preview.navigation.page-nav :as page-nav] + [status-im2.contexts.quo-preview.avatars.account-avatar :as account-avatar] [re-frame.core :as re-frame])) (def screens-categories diff --git a/src/status_im/ui2/screens/quo2_preview/markdown/text.cljs b/src/status_im2/contexts/quo_preview/markdown/text.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/markdown/text.cljs rename to src/status_im2/contexts/quo_preview/markdown/text.cljs index 174ea8d3c5..abdee82d7d 100644 --- a/src/status_im/ui2/screens/quo2_preview/markdown/text.cljs +++ b/src/status_im2/contexts/quo_preview/markdown/text.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.markdown.text +(ns status-im2.contexts.quo-preview.markdown.text (:require [quo2.foundations.colors :as colors] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [react-native.core :as rn] [quo2.components.markdown.text :as quo2] [reagent.core :as reagent])) diff --git a/src/status_im/ui2/screens/quo2_preview/messages/gap.cljs b/src/status_im2/contexts/quo_preview/messages/gap.cljs similarity index 90% rename from src/status_im/ui2/screens/quo2_preview/messages/gap.cljs rename to src/status_im2/contexts/quo_preview/messages/gap.cljs index 53ce56af28..2ceb307aca 100644 --- a/src/status_im/ui2/screens/quo2_preview/messages/gap.cljs +++ b/src/status_im2/contexts/quo_preview/messages/gap.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.messages.gap +(ns status-im2.contexts.quo-preview.messages.gap (:require - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [react-native.core :as rn] [quo2.components.messages.gap :as gap] [reagent.core :as reagent] diff --git a/src/status_im/ui2/screens/quo2_preview/messages/system_message.cljs b/src/status_im2/contexts/quo_preview/messages/system_message.cljs similarity index 96% rename from src/status_im/ui2/screens/quo2_preview/messages/system_message.cljs rename to src/status_im2/contexts/quo_preview/messages/system_message.cljs index bf192048c2..18250862aa 100644 --- a/src/status_im/ui2/screens/quo2_preview/messages/system_message.cljs +++ b/src/status_im2/contexts/quo_preview/messages/system_message.cljs @@ -1,8 +1,8 @@ -(ns status-im.ui2.screens.quo2-preview.messages.system-message +(ns status-im2.contexts.quo-preview.messages.system-message (:require [reagent.core :as reagent] [status-im.react-native.resources :as resources] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.messages.system-message :as system-message] [quo2.foundations.colors :as colors] [status-im.i18n.i18n :as i18n])) diff --git a/src/status_im/ui2/screens/quo2_preview/navigation/bottom_nav_tab.cljs b/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/navigation/bottom_nav_tab.cljs rename to src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs index 476679838d..c192defbea 100644 --- a/src/status_im/ui2/screens/quo2_preview/navigation/bottom_nav_tab.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.navigation.bottom-nav-tab +(ns status-im2.contexts.quo-preview.navigation.bottom-nav-tab (:require [react-native.core :as rn] [react-native.reanimated :as reanimated] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.components.navigation.bottom-nav-tab :as quo2] [quo2.foundations.colors :as colors])) diff --git a/src/status_im/ui2/screens/quo2_preview/navigation/floating_shell_button.cljs b/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/navigation/floating_shell_button.cljs rename to src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs index 00a5c39a76..a5c0308eb0 100644 --- a/src/status_im/ui2/screens/quo2_preview/navigation/floating_shell_button.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.navigation.floating-shell-button +(ns status-im2.contexts.quo-preview.navigation.floating-shell-button (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [react-native.reanimated :as reanimated] [quo2.components.navigation.floating-shell-button :as quo2] diff --git a/src/status_im/ui2/screens/quo2_preview/navigation/page_nav.cljs b/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs similarity index 98% rename from src/status_im/ui2/screens/quo2_preview/navigation/page_nav.cljs rename to src/status_im2/contexts/quo_preview/navigation/page_nav.cljs index 818e7ff173..27e13f7fea 100644 --- a/src/status_im/ui2/screens/quo2_preview/navigation/page_nav.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs @@ -1,5 +1,5 @@ -(ns status-im.ui2.screens.quo2-preview.navigation.page-nav - (:require [status-im.ui2.screens.quo2-preview.preview :as preview] +(ns status-im2.contexts.quo-preview.navigation.page-nav + (:require [status-im2.contexts.quo-preview.preview :as preview] [react-native.core :as rn] [quo2.components.navigation.page-nav :as quo2] [quo2.foundations.colors :as colors] diff --git a/src/status_im/ui2/screens/quo2_preview/navigation/top_nav.cljs b/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/navigation/top_nav.cljs rename to src/status_im2/contexts/quo_preview/navigation/top_nav.cljs index bbc8a2fc99..c1c970c293 100644 --- a/src/status_im/ui2/screens/quo2_preview/navigation/top_nav.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.navigation.top-nav +(ns status-im2.contexts.quo-preview.navigation.top-nav (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.components.navigation.top-nav :as quo2] [quo2.foundations.colors :as colors])) diff --git a/src/status_im/ui2/screens/quo2_preview/notifications/activity_logs.cljs b/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs similarity index 97% rename from src/status_im/ui2/screens/quo2_preview/notifications/activity_logs.cljs rename to src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs index ea1a1d4e1a..67e2e9d62d 100644 --- a/src/status_im/ui2/screens/quo2_preview/notifications/activity_logs.cljs +++ b/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs @@ -1,11 +1,11 @@ -(ns status-im.ui2.screens.quo2-preview.notifications.activity-logs - (:require [status-im.ui2.screens.quo2-preview.preview :as preview] +(ns status-im2.contexts.quo-preview.notifications.activity-logs + (:require [status-im2.contexts.quo-preview.preview :as preview] [react-native.core :as rn] [quo2.components.markdown.text :as text] [quo2.components.notifications.activity-logs :as activity-logs] [quo2.components.tags.context-tags :as context-tags] [quo2.foundations.colors :as colors] - [status-im.ui2.screens.quo2-preview.tags.status-tags :as status-tags] + [status-im2.contexts.quo-preview.tags.status-tags :as status-tags] [reagent.core :as reagent])) (def descriptor [{:label "Unread?" diff --git a/src/status_im/ui2/screens/quo2_preview/posts_and_attachments/messages_skeleton.cljs b/src/status_im2/contexts/quo_preview/posts_and_attachments/messages_skeleton.cljs similarity index 76% rename from src/status_im/ui2/screens/quo2_preview/posts_and_attachments/messages_skeleton.cljs rename to src/status_im2/contexts/quo_preview/posts_and_attachments/messages_skeleton.cljs index 3e3cef509b..c7efd8b035 100644 --- a/src/status_im/ui2/screens/quo2_preview/posts_and_attachments/messages_skeleton.cljs +++ b/src/status_im2/contexts/quo_preview/posts_and_attachments/messages_skeleton.cljs @@ -1,4 +1,4 @@ -(ns status-im.ui2.screens.quo2-preview.posts-and-attachments.messages-skeleton +(ns status-im2.contexts.quo-preview.posts-and-attachments.messages-skeleton (:require [quo.react-native :as rn] [quo2.foundations.colors :as colors] [status-im.ui.screens.chat.components.messages-skeleton :as messages-skeleton])) diff --git a/src/status_im/ui2/screens/quo2_preview/preview.clj b/src/status_im2/contexts/quo_preview/preview.clj similarity index 82% rename from src/status_im/ui2/screens/quo2_preview/preview.clj rename to src/status_im2/contexts/quo_preview/preview.clj index 799896d7a2..674030ecde 100644 --- a/src/status_im/ui2/screens/quo2_preview/preview.clj +++ b/src/status_im2/contexts/quo_preview/preview.clj @@ -1,4 +1,4 @@ -(ns status-im.ui2.screens.quo2-preview.preview) +(ns status-im2.contexts.quo-preview.preview) (defmacro list-comp [[binding seq-expr & bindings] body-expr] (cond (not binding) diff --git a/src/status_im/ui2/screens/quo2_preview/preview.cljs b/src/status_im2/contexts/quo_preview/preview.cljs similarity index 98% rename from src/status_im/ui2/screens/quo2_preview/preview.cljs rename to src/status_im2/contexts/quo_preview/preview.cljs index 2c706c6d12..fc64ec4edd 100644 --- a/src/status_im/ui2/screens/quo2_preview/preview.cljs +++ b/src/status_im2/contexts/quo_preview/preview.cljs @@ -1,8 +1,8 @@ -(ns status-im.ui2.screens.quo2-preview.preview +(ns status-im2.contexts.quo-preview.preview (:require [reagent.core :as reagent] [react-native.core :as rn] [quo2.foundations.colors :as colors]) - (:require-macros status-im.ui2.screens.quo2-preview.preview)) + (:require-macros status-im2.contexts.quo-preview.preview)) (def container {:flex-direction :row :padding-vertical 8 diff --git a/src/status_im/ui2/screens/quo2_preview/reactions/react.cljs b/src/status_im2/contexts/quo_preview/reactions/react.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/reactions/react.cljs rename to src/status_im2/contexts/quo_preview/reactions/react.cljs index e2126aa1fb..85cf02982f 100644 --- a/src/status_im/ui2/screens/quo2_preview/reactions/react.cljs +++ b/src/status_im2/contexts/quo_preview/reactions/react.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.reactions.react +(ns status-im2.contexts.quo-preview.reactions.react (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.foundations.colors :as colors] [quo2.components.reactions.reaction :as quo2.reaction])) diff --git a/src/status_im/ui2/screens/quo2_preview/selectors/disclaimer.cljs b/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/selectors/disclaimer.cljs rename to src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs index 8cc28279f2..6c4a6bc1b0 100644 --- a/src/status_im/ui2/screens/quo2_preview/selectors/disclaimer.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs @@ -1,4 +1,4 @@ -(ns status-im.ui2.screens.quo2-preview.selectors.disclaimer +(ns status-im2.contexts.quo-preview.selectors.disclaimer (:require [react-native.core :as rn] [reagent.core :as reagent] [quo2.components.buttons.button :as button] diff --git a/src/status_im/ui2/screens/quo2_preview/selectors/selectors.cljs b/src/status_im2/contexts/quo_preview/selectors/selectors.cljs similarity index 98% rename from src/status_im/ui2/screens/quo2_preview/selectors/selectors.cljs rename to src/status_im2/contexts/quo_preview/selectors/selectors.cljs index 00d365a9e6..fe084b2da9 100644 --- a/src/status_im/ui2/screens/quo2_preview/selectors/selectors.cljs +++ b/src/status_im2/contexts/quo_preview/selectors/selectors.cljs @@ -1,4 +1,4 @@ -(ns status-im.ui2.screens.quo2-preview.selectors.selectors +(ns status-im2.contexts.quo-preview.selectors.selectors (:require ["react-native" :refer [StyleSheet]] [oops.core :refer [oget]] [quo.previews.preview :as preview] diff --git a/src/status_im/ui2/screens/quo2_preview/switcher/switcher_cards.cljs b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs similarity index 97% rename from src/status_im/ui2/screens/quo2_preview/switcher/switcher_cards.cljs rename to src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs index 2397443c21..462573fd14 100644 --- a/src/status_im/ui2/screens/quo2_preview/switcher/switcher_cards.cljs +++ b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.switcher.switcher-cards +(ns status-im2.contexts.quo-preview.switcher.switcher-cards (:require [react-native.core :as rn] [reagent.core :as reagent] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [status-im.react-native.resources :as resources] [status-im2.contexts.shell.cards.view :as switcher-cards])) diff --git a/src/status_im/ui2/screens/quo2_preview/tabs/account_selector.cljs b/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/tabs/account_selector.cljs rename to src/status_im2/contexts/quo_preview/tabs/account_selector.cljs index 0f6c68a70f..76883abcf6 100644 --- a/src/status_im/ui2/screens/quo2_preview/tabs/account_selector.cljs +++ b/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.tabs.account-selector +(ns status-im2.contexts.quo-preview.tabs.account-selector (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.foundations.colors :as colors] [quo2.components.tabs.account-selector :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/tabs/segmented_tab.cljs b/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/tabs/segmented_tab.cljs rename to src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs index d95ef31499..6c035e5e9d 100644 --- a/src/status_im/ui2/screens/quo2_preview/tabs/segmented_tab.cljs +++ b/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.tabs.segmented-tab +(ns status-im2.contexts.quo-preview.tabs.segmented-tab (:require [react-native.core :as rn] [quo2.foundations.colors :as colors] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.tabs.segmented-tab :as quo2] [reagent.core :as reagent])) diff --git a/src/status_im/ui2/screens/quo2_preview/tabs/tabs.cljs b/src/status_im2/contexts/quo_preview/tabs/tabs.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/tabs/tabs.cljs rename to src/status_im2/contexts/quo_preview/tabs/tabs.cljs index 863030dc13..b7329358c3 100644 --- a/src/status_im/ui2/screens/quo2_preview/tabs/tabs.cljs +++ b/src/status_im2/contexts/quo_preview/tabs/tabs.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.tabs.tabs +(ns status-im2.contexts.quo-preview.tabs.tabs (:require [react-native.core :as rn] [quo2.foundations.colors :as colors] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.tabs.tabs :as quo2] [reagent.core :as reagent])) diff --git a/src/status_im/ui2/screens/quo2_preview/tags/context_tags.cljs b/src/status_im2/contexts/quo_preview/tags/context_tags.cljs similarity index 97% rename from src/status_im/ui2/screens/quo2_preview/tags/context_tags.cljs rename to src/status_im2/contexts/quo_preview/tags/context_tags.cljs index 847fd49eaf..74408a8b41 100644 --- a/src/status_im/ui2/screens/quo2_preview/tags/context_tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/context_tags.cljs @@ -1,8 +1,8 @@ -(ns status-im.ui2.screens.quo2-preview.tags.context-tags +(ns status-im2.contexts.quo-preview.tags.context-tags (:require [reagent.core :as reagent] [status-im.multiaccounts.core :as multiaccounts] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.tags.context-tags :as quo2])) diff --git a/src/status_im/ui2/screens/quo2_preview/tags/permission_tag.cljs b/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs similarity index 98% rename from src/status_im/ui2/screens/quo2_preview/tags/permission_tag.cljs rename to src/status_im2/contexts/quo_preview/tags/permission_tag.cljs index 218a4e5442..2be51c53c5 100644 --- a/src/status_im/ui2/screens/quo2_preview/tags/permission_tag.cljs +++ b/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.tags.permission-tag +(ns status-im2.contexts.quo-preview.tags.permission-tag (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.tags.permission-tag :as permission-tag] [quo2.foundations.colors :as colors] [status-im.react-native.resources :as resources] diff --git a/src/status_im/ui2/screens/quo2_preview/tags/status_tags.cljs b/src/status_im2/contexts/quo_preview/tags/status_tags.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/tags/status_tags.cljs rename to src/status_im2/contexts/quo_preview/tags/status_tags.cljs index 5b17c3830a..9f24bcf620 100644 --- a/src/status_im/ui2/screens/quo2_preview/tags/status_tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/status_tags.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.tags.status-tags +(ns status-im2.contexts.quo-preview.tags.status-tags (:require [reagent.core :as reagent] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.tags.status-tags :as quo2] [status-im.i18n.i18n :as i18n])) diff --git a/src/status_im/ui2/screens/quo2_preview/tags/tags.cljs b/src/status_im2/contexts/quo_preview/tags/tags.cljs similarity index 97% rename from src/status_im/ui2/screens/quo2_preview/tags/tags.cljs rename to src/status_im2/contexts/quo_preview/tags/tags.cljs index 9e79282057..9c054c9f5a 100644 --- a/src/status_im/ui2/screens/quo2_preview/tags/tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/tags.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.tags.tags +(ns status-im2.contexts.quo-preview.tags.tags (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [status-im.ui.components.react :as react] [quo2.foundations.colors :as colors] [quo2.components.tags.tags :as tags] diff --git a/src/status_im/ui2/screens/quo2_preview/tags/token_tag.cljs b/src/status_im2/contexts/quo_preview/tags/token_tag.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/tags/token_tag.cljs rename to src/status_im2/contexts/quo_preview/tags/token_tag.cljs index 03fc64ffd6..7a29d379b2 100644 --- a/src/status_im/ui2/screens/quo2_preview/tags/token_tag.cljs +++ b/src/status_im2/contexts/quo_preview/tags/token_tag.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.tags.token-tag +(ns status-im2.contexts.quo-preview.tags.token-tag (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.components.tags.token-tag :as quo2] [quo2.foundations.colors :as colors])) diff --git a/src/status_im/ui2/screens/quo2_preview/wallet/lowest_price.cljs b/src/status_im2/contexts/quo_preview/wallet/lowest_price.cljs similarity index 94% rename from src/status_im/ui2/screens/quo2_preview/wallet/lowest_price.cljs rename to src/status_im2/contexts/quo_preview/wallet/lowest_price.cljs index a1e12b80e3..5ccb282a09 100644 --- a/src/status_im/ui2/screens/quo2_preview/wallet/lowest_price.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/lowest_price.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.wallet.lowest-price +(ns status-im2.contexts.quo-preview.wallet.lowest-price (:require [quo2.foundations.colors :as colors] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.components.wallet.lowest-price :as quo2] [reagent.core :as reagent])) diff --git a/src/status_im/ui2/screens/quo2_preview/wallet/network_amount.cljs b/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs similarity index 93% rename from src/status_im/ui2/screens/quo2_preview/wallet/network_amount.cljs rename to src/status_im2/contexts/quo_preview/wallet/network_amount.cljs index 13d3d81230..fd62cbfd06 100644 --- a/src/status_im/ui2/screens/quo2_preview/wallet/network_amount.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs @@ -1,5 +1,5 @@ -(ns status-im.ui2.screens.quo2-preview.wallet.network-amount - (:require [status-im.ui2.screens.quo2-preview.preview :as preview] +(ns status-im2.contexts.quo-preview.wallet.network-amount + (:require [status-im2.contexts.quo-preview.preview :as preview] [react-native.core :as rn] [quo2.components.wallet.network-amount :refer [network-amount]] [quo2.foundations.colors :as colors] diff --git a/src/status_im/ui2/screens/quo2_preview/wallet/network_breakdown.cljs b/src/status_im2/contexts/quo_preview/wallet/network_breakdown.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/wallet/network_breakdown.cljs rename to src/status_im2/contexts/quo_preview/wallet/network_breakdown.cljs index 1b1fd1c4bc..e8f4b02dea 100644 --- a/src/status_im/ui2/screens/quo2_preview/wallet/network_breakdown.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/network_breakdown.cljs @@ -1,7 +1,7 @@ -(ns status-im.ui2.screens.quo2-preview.wallet.network-breakdown +(ns status-im2.contexts.quo-preview.wallet.network-breakdown (:require [reagent.core :as reagent] [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [quo2.foundations.colors :as colors] [quo2.components.wallet.network-breakdown :as quo2] [status-im.i18n.i18n :as i18n] diff --git a/src/status_im/ui2/screens/quo2_preview/wallet/token_overview.cljs b/src/status_im2/contexts/quo_preview/wallet/token_overview.cljs similarity index 95% rename from src/status_im/ui2/screens/quo2_preview/wallet/token_overview.cljs rename to src/status_im2/contexts/quo_preview/wallet/token_overview.cljs index 0bb1e08bd1..58895d3740 100644 --- a/src/status_im/ui2/screens/quo2_preview/wallet/token_overview.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/token_overview.cljs @@ -1,6 +1,6 @@ -(ns status-im.ui2.screens.quo2-preview.wallet.token-overview +(ns status-im2.contexts.quo-preview.wallet.token-overview (:require [react-native.core :as rn] - [status-im.ui2.screens.quo2-preview.preview :as preview] + [status-im2.contexts.quo-preview.preview :as preview] [reagent.core :as reagent] [quo2.components.wallet.token-overview :as quo2] [quo2.foundations.colors :as colors] diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs index 4037ce1278..4af3b60eff 100644 --- a/src/status_im2/navigation/screens.cljs +++ b/src/status_im2/navigation/screens.cljs @@ -3,9 +3,9 @@ [status-im2.contexts.communities.discover.view :as communities.discover] [status-im2.contexts.communities.overview.view :as communities.overview] [status-im2.contexts.shell.view :as shell] + [status-im2.contexts.quo-preview.main :as quo.preview] ;; TODO remove when not used anymore - [status-im.ui2.screens.quo2-preview.main :as quo2.preview] [status-im.ui2.screens.chat.home :as chat.home] [status-im.ui2.screens.chat.view :as chat] [status-im.ui.screens.screens :as old-screens])) @@ -36,7 +36,7 @@ :component communities.overview/overview}] (when config/quo-preview-enabled? - quo2.preview/screens) + quo.preview/screens) (when config/quo-preview-enabled? - quo2.preview/main-screens))) + quo.preview/main-screens))) diff --git a/src/status_im2/setup/dev.cljs b/src/status_im2/setup/dev.cljs index 6ea9afca40..d71be1abd3 100644 --- a/src/status_im2/setup/dev.cljs +++ b/src/status_im2/setup/dev.cljs @@ -4,14 +4,17 @@ [status-im.ethereum.json-rpc :as json-rpc] ["react-native" :refer (DevSettings LogBox)])) +;; Ignore all logs, because there are lots of temporary warnings when developing and hot reloading +(.ignoreAllLogs LogBox) + ;; Only ignore warnings/errors that cannot be fixed for the time being. ;; When you add a warning to be ignored explain below why it is ignored and how it can be fixed. ;; When a warning is fixed make sure to remove it from here. -(.ignoreLogs ^js LogBox (clj->js ["undefined is not an object (evaluating 'e.message')" - "Cannot read property 'message' of undefined" - "InternalError Metro has encountered an error" - "undefined Unable to resolve module `parse-svg-path`" - "group12"])) +#_(.ignoreLogs ^js LogBox (clj->js ["undefined is not an object (evaluating 'e.message')" + "Cannot read property 'message' of undefined" + "InternalError Metro has encountered an error" + "undefined Unable to resolve module `parse-svg-path`" + "group12"])) ;; List of ignored warnings/errors: ;; 1. "evaluating 'e.message'": Not sure why this error is happening, but it is coming from here @@ -22,7 +25,6 @@ ;; 5. "group12": referring to the group-icon size 12x12. Currently, it is not available. When the design team adds it to the ;; icon set it will be added to project. - (defn setup [] (rf/set-mergeable-keys #{:filters/load-filters :pairing/set-installation-metadata