From 46182ad3083aa7e64d41413a59329add1a752ac2 Mon Sep 17 00:00:00 2001 From: Jamie Caprani Date: Tue, 27 Jun 2023 11:48:23 +0100 Subject: [PATCH] chore: move activity centre and share into shell namespace (#16395) --- src/status_im/communities/core.cljs | 2 +- src/status_im/contact/block.cljs | 2 +- src/status_im/data_store/activities.cljs | 2 +- src/status_im/data_store/activities_test.cljs | 2 +- src/status_im/events.cljs | 4 ++-- src/status_im/group_chats/core.cljs | 2 +- src/status_im/multiaccounts/login/core.cljs | 2 +- src/status_im/transport/message/core.cljs | 2 +- .../chat/home/contact_request/view.cljs | 2 +- .../{ => shell}/activity_center/events.cljs | 4 ++-- .../activity_center/events_test.cljs | 6 ++--- .../notification/admin/view.cljs | 6 ++--- .../notification/common/style.cljs | 2 +- .../notification/common/view.cljs | 4 ++-- .../notification/community_kicked/view.cljs | 6 ++--- .../notification/community_request/view.cljs | 6 ++--- .../notification/contact_requests/events.cljs | 2 +- .../notification/contact_requests/view.cljs | 6 ++--- .../contact_verification/view.cljs | 6 ++--- .../notification/membership/view.cljs | 6 ++--- .../notification/mentions/style.cljs | 2 +- .../notification/mentions/view.cljs | 6 ++--- .../notification/reply/style.cljs | 2 +- .../notification/reply/view.cljs | 6 ++--- .../activity_center/notification_types.cljs | 2 +- .../{ => shell}/activity_center/style.cljs | 2 +- .../{ => shell}/activity_center/view.cljs | 23 ++++++++++--------- .../contexts/{ => shell}/share/events.cljs | 2 +- .../contexts/{ => shell}/share/style.cljs | 2 +- .../contexts/{ => shell}/share/view.cljs | 4 ++-- src/status_im2/db.cljs | 2 +- src/status_im2/events.cljs | 2 +- src/status_im2/navigation/screens.cljs | 4 ++-- src/status_im2/subs/activity_center.cljs | 2 +- src/status_im2/subs/activity_center_test.cljs | 2 +- 35 files changed, 69 insertions(+), 68 deletions(-) rename src/status_im2/contexts/{ => shell}/activity_center/events.cljs (99%) rename src/status_im2/contexts/{ => shell}/activity_center/events_test.cljs (99%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/admin/view.cljs (94%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/common/style.cljs (95%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/common/view.cljs (97%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/community_kicked/view.cljs (83%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/community_request/view.cljs (91%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/contact_requests/events.cljs (94%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/contact_requests/view.cljs (96%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/contact_verification/view.cljs (97%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/membership/view.cljs (92%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/mentions/style.cljs (79%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/mentions/view.cljs (91%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/reply/style.cljs (76%) rename src/status_im2/contexts/{ => shell}/activity_center/notification/reply/view.cljs (92%) rename src/status_im2/contexts/{ => shell}/activity_center/notification_types.cljs (93%) rename src/status_im2/contexts/{ => shell}/activity_center/style.cljs (96%) rename src/status_im2/contexts/{ => shell}/activity_center/view.cljs (91%) rename src/status_im2/contexts/{ => shell}/share/events.cljs (93%) rename src/status_im2/contexts/{ => shell}/share/style.cljs (98%) rename src/status_im2/contexts/{ => shell}/share/view.cljs (98%) diff --git a/src/status_im/communities/core.cljs b/src/status_im/communities/core.cljs index ba914f9830..9d1232a930 100644 --- a/src/status_im/communities/core.cljs +++ b/src/status_im/communities/core.cljs @@ -11,7 +11,7 @@ [status-im.bottom-sheet.events :as bottom-sheet] [status-im2.common.toasts.events :as toasts] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.events :as activity-center] + [status-im2.contexts.shell.activity-center.events :as activity-center] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] diff --git a/src/status_im/contact/block.cljs b/src/status_im/contact/block.cljs index d75e155e8e..e3841744d6 100644 --- a/src/status_im/contact/block.cljs +++ b/src/status_im/contact/block.cljs @@ -6,7 +6,7 @@ [status-im2.contexts.contacts.events :as contacts-store] [utils.re-frame :as rf] [status-im.utils.types :as types] - [status-im2.contexts.activity-center.events :as activity-center] + [status-im2.contexts.shell.activity-center.events :as activity-center] [status-im2.navigation.events :as navigation])) (rf/defn clean-up-chat diff --git a/src/status_im/data_store/activities.cljs b/src/status_im/data_store/activities.cljs index 15de562d08..57f8af6dd9 100644 --- a/src/status_im/data_store/activities.cljs +++ b/src/status_im/data_store/activities.cljs @@ -2,7 +2,7 @@ (:require [clojure.set :as set] [status-im.data-store.messages :as messages] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.notification-types :as notification-types])) + [status-im2.contexts.shell.activity-center.notification-types :as notification-types])) (defn mark-notifications-as-read [notifications] diff --git a/src/status_im/data_store/activities_test.cljs b/src/status_im/data_store/activities_test.cljs index 4b79b42da4..eeb8bd8621 100644 --- a/src/status_im/data_store/activities_test.cljs +++ b/src/status_im/data_store/activities_test.cljs @@ -2,7 +2,7 @@ (:require [cljs.test :refer [deftest is testing]] [status-im2.constants :as constants] [status-im.data-store.activities :as store] - [status-im2.contexts.activity-center.notification-types :as notification-types])) + [status-im2.contexts.shell.activity-center.notification-types :as notification-types])) (def chat-id "0x04c66155") diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs index 35e5874955..6634396b99 100644 --- a/src/status_im/events.cljs +++ b/src/status_im/events.cljs @@ -52,8 +52,8 @@ status-im.wallet.choose-recipient.core [status-im.wallet.core :as wallet] status-im.wallet.custom-tokens.core - status-im2.contexts.activity-center.events - status-im2.contexts.activity-center.notification.contact-requests.events + status-im2.contexts.shell.activity-center.events + status-im2.contexts.shell.activity-center.notification.contact-requests.events status-im2.contexts.shell.jump-to.events status-im2.contexts.onboarding.events status-im.chat.models.gaps diff --git a/src/status_im/group_chats/core.cljs b/src/status_im/group_chats/core.cljs index f6b80797af..e8c3fb2d44 100644 --- a/src/status_im/group_chats/core.cljs +++ b/src/status_im/group_chats/core.cljs @@ -7,7 +7,7 @@ [re-frame.core :as re-frame] [status-im2.contexts.chat.events :as chat.events] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.events :as activity-center] + [status-im2.contexts.shell.activity-center.events :as activity-center] [status-im2.navigation.events :as navigation] [utils.re-frame :as rf])) diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index 98e5c7b38a..324687ba0a 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -37,7 +37,7 @@ [status-im.wallet.core :as wallet] [status-im.wallet.prices :as prices] [status-im2.common.json-rpc.events :as json-rpc] - [status-im2.contexts.activity-center.events :as activity-center] + [status-im2.contexts.shell.activity-center.events :as activity-center] [status-im2.contexts.chat.messages.link-preview.events :as link-preview] [status-im2.contexts.contacts.events :as contacts] [status-im2.navigation.events :as navigation] diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs index 3147da9ce5..c069861df1 100644 --- a/src/status_im/transport/message/core.cljs +++ b/src/status_im/transport/message/core.cljs @@ -20,7 +20,7 @@ [utils.re-frame :as rf] [status-im.utils.types :as types] [status-im.visibility-status-updates.core :as models.visibility-status-updates] - [status-im2.contexts.activity-center.events :as activity-center] + [status-im2.contexts.shell.activity-center.events :as activity-center] [status-im2.contexts.chat.messages.pin.events :as messages.pin])) (rf/defn process-next diff --git a/src/status_im2/contexts/chat/home/contact_request/view.cljs b/src/status_im2/contexts/chat/home/contact_request/view.cljs index 16844aaa55..457c3af6c7 100644 --- a/src/status_im2/contexts/chat/home/contact_request/view.cljs +++ b/src/status_im2/contexts/chat/home/contact_request/view.cljs @@ -4,7 +4,7 @@ [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] - [status-im2.contexts.activity-center.notification-types :as notification-types] + [status-im2.contexts.shell.activity-center.notification-types :as notification-types] [status-im2.contexts.chat.home.contact-request.style :as style] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/events.cljs b/src/status_im2/contexts/shell/activity_center/events.cljs similarity index 99% rename from src/status_im2/contexts/activity_center/events.cljs rename to src/status_im2/contexts/shell/activity_center/events.cljs index bfabe62060..440ad3ac5e 100644 --- a/src/status_im2/contexts/activity_center/events.cljs +++ b/src/status_im2/contexts/shell/activity_center/events.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.activity-center.events +(ns status-im2.contexts.shell.activity-center.events (:require [quo2.foundations.colors :as colors] [status-im.data-store.activities :as activities] [status-im.data-store.chats :as data-store.chats] [status-im2.common.toasts.events :as toasts] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.notification-types :as types] + [status-im2.contexts.shell.activity-center.notification-types :as types] [status-im2.contexts.chat.events :as chat.events] [taoensso.timbre :as log] [utils.collection :as collection] diff --git a/src/status_im2/contexts/activity_center/events_test.cljs b/src/status_im2/contexts/shell/activity_center/events_test.cljs similarity index 99% rename from src/status_im2/contexts/activity_center/events_test.cljs rename to src/status_im2/contexts/shell/activity_center/events_test.cljs index 5e8b37b61c..a81345537a 100644 --- a/src/status_im2/contexts/activity_center/events_test.cljs +++ b/src/status_im2/contexts/shell/activity_center/events_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.activity-center.events-test +(ns status-im2.contexts.shell.activity-center.events-test (:require [cljs.test :refer [deftest is testing]] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.events :as events] - [status-im2.contexts.activity-center.notification-types :as types] + [status-im2.contexts.shell.activity-center.events :as events] + [status-im2.contexts.shell.activity-center.notification-types :as types] [test-helpers.unit :as h])) (h/use-log-fixture) diff --git a/src/status_im2/contexts/activity_center/notification/admin/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs similarity index 94% rename from src/status_im2/contexts/activity_center/notification/admin/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs index 3f868c0c7f..1b6ee5d3cc 100644 --- a/src/status_im2/contexts/activity_center/notification/admin/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.activity-center.notification.admin.view +(ns status-im2.contexts.shell.activity-center.notification.admin.view (:require [quo2.core :as quo] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.notification.common.style :as common-style] - [status-im2.contexts.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/common/style.cljs b/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs similarity index 95% rename from src/status_im2/contexts/activity_center/notification/common/style.cljs rename to src/status_im2/contexts/shell/activity_center/notification/common/style.cljs index 7fbf242457..8cba8b2a4c 100644 --- a/src/status_im2/contexts/activity_center/notification/common/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.activity-center.notification.common.style +(ns status-im2.contexts.shell.activity-center.notification.common.style (:require [quo2.foundations.colors :as colors])) (def swipe-action-width 80) diff --git a/src/status_im2/contexts/activity_center/notification/common/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs similarity index 97% rename from src/status_im2/contexts/activity_center/notification/common/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/common/view.cljs index 511f6f2b3a..0f59bcc67d 100644 --- a/src/status_im2/contexts/activity_center/notification/common/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.activity-center.notification.common.view +(ns status-im2.contexts.shell.activity-center.notification.common.view (:require [quo2.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] [quo2.foundations.colors :as colors] [status-im.multiaccounts.core :as multiaccounts] - [status-im2.contexts.activity-center.notification.common.style :as style] + [status-im2.contexts.shell.activity-center.notification.common.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/community_kicked/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs similarity index 83% rename from src/status_im2/contexts/activity_center/notification/community_kicked/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs index 23107a9250..2b465c7e55 100644 --- a/src/status_im2/contexts/activity_center/notification/community_kicked/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.activity-center.notification.community-kicked.view +(ns status-im2.contexts.shell.activity-center.notification.community-kicked.view (:require [quo2.core :as quo] - [status-im2.contexts.activity-center.notification.common.style :as common-style] - [status-im2.contexts.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/community_request/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs similarity index 91% rename from src/status_im2/contexts/activity_center/notification/community_request/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs index 45c11d874f..1494b4d87c 100644 --- a/src/status_im2/contexts/activity_center/notification/community_request/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.activity-center.notification.community-request.view +(ns status-im2.contexts.shell.activity-center.notification.community-request.view (:require [quo2.core :as quo] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.notification.common.style :as common-style] - [status-im2.contexts.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/contact_requests/events.cljs b/src/status_im2/contexts/shell/activity_center/notification/contact_requests/events.cljs similarity index 94% rename from src/status_im2/contexts/activity_center/notification/contact_requests/events.cljs rename to src/status_im2/contexts/shell/activity_center/notification/contact_requests/events.cljs index 63ede623f8..2d5f9fe665 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_requests/events.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/contact_requests/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.activity-center.notification.contact-requests.events +(ns status-im2.contexts.shell.activity-center.notification.contact-requests.events (:require [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/contact_requests/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs similarity index 96% rename from src/status_im2/contexts/activity_center/notification/contact_requests/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs index a418845276..e5c95389a3 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_requests/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.activity-center.notification.contact-requests.view +(ns status-im2.contexts.shell.activity-center.notification.contact-requests.view (:require [quo2.core :as quo] [react-native.gesture :as gesture] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.notification.common.style :as common-style] - [status-im2.contexts.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs similarity index 97% rename from src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs index cfc8deba1d..de47d00b97 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.activity-center.notification.contact-verification.view +(ns status-im2.contexts.shell.activity-center.notification.contact-verification.view (:require [clojure.string :as string] [quo2.core :as quo] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.notification.common.style :as common-style] - [status-im2.contexts.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/membership/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs similarity index 92% rename from src/status_im2/contexts/activity_center/notification/membership/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs index c1d31a2343..aa5e8186e2 100644 --- a/src/status_im2/contexts/activity_center/notification/membership/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.activity-center.notification.membership.view +(ns status-im2.contexts.shell.activity-center.notification.membership.view (:require [quo2.core :as quo] [react-native.gesture :as gesture] - [status-im2.contexts.activity-center.notification.common.style :as common-style] - [status-im2.contexts.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/mentions/style.cljs b/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs similarity index 79% rename from src/status_im2/contexts/activity_center/notification/mentions/style.cljs rename to src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs index 99ff7d7dc8..2afad0b0ac 100644 --- a/src/status_im2/contexts/activity_center/notification/mentions/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.activity-center.notification.mentions.style +(ns status-im2.contexts.shell.activity-center.notification.mentions.style (:require [quo2.foundations.colors :as colors])) (def tag diff --git a/src/status_im2/contexts/activity_center/notification/mentions/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs similarity index 91% rename from src/status_im2/contexts/activity_center/notification/mentions/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs index 5477d118f8..2db7aedba8 100644 --- a/src/status_im2/contexts/activity_center/notification/mentions/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.activity-center.notification.mentions.view +(ns status-im2.contexts.shell.activity-center.notification.mentions.view (:require [clojure.string :as string] [quo2.core :as quo] [react-native.gesture :as gesture] - [status-im2.contexts.activity-center.notification.common.view :as common] - [status-im2.contexts.activity-center.notification.mentions.style :as style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.mentions.style :as style] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/reply/style.cljs b/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs similarity index 76% rename from src/status_im2/contexts/activity_center/notification/reply/style.cljs rename to src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs index 2a5fa39078..ad1b8bc66f 100644 --- a/src/status_im2/contexts/activity_center/notification/reply/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.activity-center.notification.reply.style +(ns status-im2.contexts.shell.activity-center.notification.reply.style (:require [quo2.foundations.colors :as colors])) (def tag diff --git a/src/status_im2/contexts/activity_center/notification/reply/view.cljs b/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs similarity index 92% rename from src/status_im2/contexts/activity_center/notification/reply/view.cljs rename to src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs index 058705e8dc..39ca74040d 100644 --- a/src/status_im2/contexts/activity_center/notification/reply/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.activity-center.notification.reply.view +(ns status-im2.contexts.shell.activity-center.notification.reply.view (:require [clojure.string :as string] [quo2.core :as quo] [react-native.gesture :as gesture] [status-im2.contexts.chat.messages.content.legacy-view :as old-message] [status-im2.common.not-implemented :as not-implemented] [status-im2.constants :as constants] - [status-im2.contexts.activity-center.notification.common.view :as common] - [status-im2.contexts.activity-center.notification.reply.style :as style] + [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im2.contexts.shell.activity-center.notification.reply.style :as style] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/activity_center/notification_types.cljs b/src/status_im2/contexts/shell/activity_center/notification_types.cljs similarity index 93% rename from src/status_im2/contexts/activity_center/notification_types.cljs rename to src/status_im2/contexts/shell/activity_center/notification_types.cljs index 12b75a9986..2062ed7c3a 100644 --- a/src/status_im2/contexts/activity_center/notification_types.cljs +++ b/src/status_im2/contexts/shell/activity_center/notification_types.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.activity-center.notification-types) +(ns status-im2.contexts.shell.activity-center.notification-types) (def ^:const no-type 0) (def ^:const one-to-one-chat 1) diff --git a/src/status_im2/contexts/activity_center/style.cljs b/src/status_im2/contexts/shell/activity_center/style.cljs similarity index 96% rename from src/status_im2/contexts/activity_center/style.cljs rename to src/status_im2/contexts/shell/activity_center/style.cljs index c4a126bdff..e57e2b0843 100644 --- a/src/status_im2/contexts/activity_center/style.cljs +++ b/src/status_im2/contexts/shell/activity_center/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.activity-center.style +(ns status-im2.contexts.shell.activity-center.style (:require [quo2.foundations.colors :as colors])) (def screen-padding 20) diff --git a/src/status_im2/contexts/activity_center/view.cljs b/src/status_im2/contexts/shell/activity_center/view.cljs similarity index 91% rename from src/status_im2/contexts/activity_center/view.cljs rename to src/status_im2/contexts/shell/activity_center/view.cljs index 765fe971fa..ea3ef93ccf 100644 --- a/src/status_im2/contexts/activity_center/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/view.cljs @@ -1,22 +1,23 @@ -(ns status-im2.contexts.activity-center.view +(ns status-im2.contexts.shell.activity-center.view (:require [clojure.set :as set] [oops.core :as oops] [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] - [status-im2.contexts.activity-center.notification-types :as types] - [status-im2.contexts.activity-center.notification.admin.view :as admin] - [status-im2.contexts.activity-center.notification.contact-requests.view :as contact-requests] - [status-im2.contexts.activity-center.notification.contact-verification.view :as + [status-im2.contexts.shell.activity-center.notification-types :as types] + [status-im2.contexts.shell.activity-center.notification.admin.view :as admin] + [status-im2.contexts.shell.activity-center.notification.contact-requests.view :as + contact-requests] + [status-im2.contexts.shell.activity-center.notification.contact-verification.view :as contact-verification] - [status-im2.contexts.activity-center.notification.membership.view :as membership] - [status-im2.contexts.activity-center.notification.mentions.view :as mentions] - [status-im2.contexts.activity-center.notification.reply.view :as reply] - [status-im2.contexts.activity-center.notification.community-request.view :as + [status-im2.contexts.shell.activity-center.notification.membership.view :as membership] + [status-im2.contexts.shell.activity-center.notification.mentions.view :as mentions] + [status-im2.contexts.shell.activity-center.notification.reply.view :as reply] + [status-im2.contexts.shell.activity-center.notification.community-request.view :as community-request] - [status-im2.contexts.activity-center.notification.community-kicked.view :as + [status-im2.contexts.shell.activity-center.notification.community-kicked.view :as community-kicked] - [status-im2.contexts.activity-center.style :as style] + [status-im2.contexts.shell.activity-center.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf] [react-native.blur :as blur] diff --git a/src/status_im2/contexts/share/events.cljs b/src/status_im2/contexts/shell/share/events.cljs similarity index 93% rename from src/status_im2/contexts/share/events.cljs rename to src/status_im2/contexts/shell/share/events.cljs index 9952a43c12..e42472d9d5 100644 --- a/src/status_im2/contexts/share/events.cljs +++ b/src/status_im2/contexts/shell/share/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.share.events +(ns status-im2.contexts.shell.share.events (:require [utils.re-frame :as rf] [status-im2.common.toasts.events :as toasts] [quo2.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/share/style.cljs b/src/status_im2/contexts/shell/share/style.cljs similarity index 98% rename from src/status_im2/contexts/share/style.cljs rename to src/status_im2/contexts/shell/share/style.cljs index 0f0333a91c..2224957b2f 100644 --- a/src/status_im2/contexts/share/style.cljs +++ b/src/status_im2/contexts/shell/share/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.share.style +(ns status-im2.contexts.shell.share.style (:require [quo2.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/share/view.cljs b/src/status_im2/contexts/shell/share/view.cljs similarity index 98% rename from src/status_im2/contexts/share/view.cljs rename to src/status_im2/contexts/shell/share/view.cljs index 67cc00c039..216a68248b 100644 --- a/src/status_im2/contexts/share/view.cljs +++ b/src/status_im2/contexts/shell/share/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.share.view +(ns status-im2.contexts.shell.share.view (:require [utils.i18n :as i18n] [quo2.core :as quo] [react-native.core :as rn] - [status-im2.contexts.share.style :as style] + [status-im2.contexts.shell.share.style :as style] [utils.re-frame :as rf] [reagent.core :as reagent] [quo2.foundations.colors :as colors] diff --git a/src/status_im2/db.cljs b/src/status_im2/db.cljs index e5bda384c9..18c589d168 100644 --- a/src/status_im2/db.cljs +++ b/src/status_im2/db.cljs @@ -2,7 +2,7 @@ (:require [react-native.core :as rn] [status-im.fleet.core :as fleet] [status-im.wallet.db :as wallet.db] - [status-im2.contexts.activity-center.events :as activity-center])) + [status-im2.contexts.shell.activity-center.events :as activity-center])) ;; initial state of app-db (def app-db diff --git a/src/status_im2/events.cljs b/src/status_im2/events.cljs index 25a590f61f..bc3d57afbb 100644 --- a/src/status_im2/events.cljs +++ b/src/status_im2/events.cljs @@ -14,7 +14,7 @@ [status-im2.db :as db] [utils.re-frame :as rf] [utils.datetime :as datetime] - status-im2.contexts.share.events + status-im2.contexts.shell.share.events status-im2.contexts.syncing.events status-im2.contexts.chat.events status-im2.common.password-authentication.events diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs index a2515c9ae7..c51e603022 100644 --- a/src/status_im2/navigation/screens.cljs +++ b/src/status_im2/navigation/screens.cljs @@ -1,7 +1,7 @@ (ns status-im2.navigation.screens (:require [status-im2.config :as config] - [status-im2.contexts.activity-center.view :as activity-center] + [status-im2.contexts.shell.activity-center.view :as activity-center] [status-im2.contexts.add-new-contact.views :as add-new-contact] [status-im2.contexts.chat.lightbox.view :as lightbox] [status-im2.contexts.chat.messages.view :as chat] @@ -31,7 +31,7 @@ [status-im.ui.screens.screens :as old-screens] [status-im2.contexts.communities.actions.request-to-join.view :as join-menu] [status-im2.contexts.syncing.setup-syncing.view :as settings-setup-syncing] - [status-im2.contexts.share.view :as share] + [status-im2.contexts.shell.share.view :as share] [status-im2.contexts.onboarding.syncing.results.view :as syncing-results] [status-im2.contexts.onboarding.syncing.progress.view :as syncing-devices] [status-im2.contexts.chat.new-chat.view :as new-chat])) diff --git a/src/status_im2/subs/activity_center.cljs b/src/status_im2/subs/activity_center.cljs index d94f93c179..886fe4f227 100644 --- a/src/status_im2/subs/activity_center.cljs +++ b/src/status_im2/subs/activity_center.cljs @@ -1,6 +1,6 @@ (ns status-im2.subs.activity-center (:require [re-frame.core :as re-frame] - [status-im2.contexts.activity-center.notification-types :as types])) + [status-im2.contexts.shell.activity-center.notification-types :as types])) (re-frame/reg-sub :activity-center/notifications diff --git a/src/status_im2/subs/activity_center_test.cljs b/src/status_im2/subs/activity_center_test.cljs index 0360ccc567..25eb4edb90 100644 --- a/src/status_im2/subs/activity_center_test.cljs +++ b/src/status_im2/subs/activity_center_test.cljs @@ -1,7 +1,7 @@ (ns status-im2.subs.activity-center-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - [status-im2.contexts.activity-center.notification-types :as types] + [status-im2.contexts.shell.activity-center.notification-types :as types] status-im2.subs.activity-center [test-helpers.unit :as h] [utils.re-frame :as rf]))