From d2e35fe928e78e14dc8ad0a2f33dc02e11a4c6b5 Mon Sep 17 00:00:00 2001 From: flexsurfer Date: Wed, 18 Jan 2023 15:43:58 +0100 Subject: [PATCH] move constants/config to status-im2 root and remove old constants/config (#14821) --- .carve_ignore | 76 +++--- shadow-cljs.edn | 12 +- src/status_im/browser/core.cljs | 2 +- src/status_im/browser/eip3085.cljs | 2 +- src/status_im/browser/eip3326.cljs | 2 +- src/status_im/browser/permissions.cljs | 2 +- src/status_im/chat/db.cljs | 2 +- src/status_im/chat/models.cljs | 2 +- src/status_im/chat/models/images.cljs | 2 +- src/status_im/chat/models/input.cljs | 13 +- src/status_im/chat/models/input_test.cljs | 2 +- src/status_im/chat/models/loading.cljs | 2 +- src/status_im/chat/models/mentions.cljs | 2 +- src/status_im/chat/models/message.cljs | 2 +- .../chat/models/message_content.cljs | 2 +- src/status_im/chat/models/reactions.cljs | 2 +- src/status_im/communities/core.cljs | 2 +- src/status_im/contact/core.cljs | 2 +- src/status_im/contact/db.cljs | 2 +- src/status_im/data_store/activities.cljs | 2 +- src/status_im/data_store/activities_test.cljs | 2 +- src/status_im/data_store/chats.cljs | 2 +- src/status_im/data_store/settings.cljs | 2 +- src/status_im/ethereum/stateofus.cljs | 2 +- src/status_im/events.cljs | 2 +- src/status_im/fleet/core.cljs | 4 +- src/status_im/fleet/core_test.cljs | 2 +- src/status_im/group_chats/core.cljs | 2 +- src/status_im/keycard/card.cljs | 2 +- src/status_im/keycard/onboarding.cljs | 2 +- src/status_im/keycard/recovery.cljs | 2 +- src/status_im/keycard/simulated_keycard.cljs | 2 +- src/status_im/keycard/wallet.cljs | 2 +- src/status_im/multiaccounts/create/core.cljs | 4 +- src/status_im/multiaccounts/db.cljs | 2 +- src/status_im/multiaccounts/login/core.cljs | 2 +- src/status_im/multiaccounts/recover/core.cljs | 2 +- src/status_im/multiaccounts/update/core.cljs | 2 +- src/status_im/native_module/core.cljs | 2 +- src/status_im/node/core.cljs | 2 +- src/status_im/notifications/core.cljs | 2 +- src/status_im/pairing/core.cljs | 2 +- src/status_im/router/core.cljs | 2 +- src/status_im/signing/core.cljs | 2 +- src/status_im/stickers/core.cljs | 4 +- src/status_im/transport/message/core.cljs | 2 +- .../ui/components/tooltip/styles.cljs | 2 +- src/status_im/ui/components/webview.cljs | 2 +- src/status_im/ui/screens/about_app/views.cljs | 3 +- .../ui/screens/advanced_settings/views.cljs | 2 +- .../ui/screens/appearance/views.cljs | 2 +- .../ui/screens/browser/options/views.cljs | 2 +- .../ui/screens/chat/components/input.cljs | 2 +- src/status_im/ui/screens/chat/group.cljs | 2 +- src/status_im/ui/screens/chat/sheets.cljs | 2 +- .../screens/chat/styles/message/message.cljs | 2 +- .../ui/screens/communities/community.cljs | 2 +- .../ui/screens/communities/icon.cljs | 4 +- .../ui/screens/communities/invite.cljs | 2 +- .../ui/screens/communities/members.cljs | 2 +- .../ui/screens/communities/membership.cljs | 2 +- .../ui/screens/communities/profile.cljs | 2 +- .../communities/reorder_categories.cljs | 2 +- .../ui/screens/communities/views.cljs | 2 +- .../ui/screens/dapps_permissions/views.cljs | 2 +- .../default_sync_period_settings/view.cljs | 4 +- src/status_im/ui/screens/group/views.cljs | 2 +- .../ui/screens/help_center/views.cljs | 2 +- .../ui/screens/home/sheet/views.cljs | 2 +- .../ui/screens/home/views/inner_item.cljs | 2 +- .../ui/screens/keycard/onboarding/views.cljs | 2 +- .../ui/screens/keycard/recovery/views.cljs | 2 +- .../ui/screens/keycard/settings/views.cljs | 2 +- src/status_im/ui/screens/keycard/views.cljs | 2 +- .../screens/multiaccounts/recover/views.cljs | 2 +- .../ui/screens/onboarding/keys/views.cljs | 2 +- .../ui/screens/onboarding/password/views.cljs | 2 +- .../privacy_and_security_settings/views.cljs | 4 +- .../ui/screens/profile/group_chat/views.cljs | 2 +- .../ui/screens/profile/user/edit_picture.cljs | 2 +- .../ui/screens/profile/user/views.cljs | 2 +- .../profile/visibility_status/utils.cljs | 2 +- .../profile/visibility_status/views.cljs | 2 +- .../ui/screens/qr_scanner/views.cljs | 2 +- .../ui/screens/sync_settings/views.cljs | 2 +- .../ui/screens/terms_of_service/views.cljs | 2 +- .../ui/screens/wallet/account/views.cljs | 2 +- .../session_proposal/views.cljs | 2 +- .../chat/components/new_chat/view.cljs | 2 +- .../screens/chat/components/reply/view.cljs | 2 +- .../ui2/screens/chat/composer/input.cljs | 2 +- .../ui2/screens/chat/messages/message.cljs | 4 +- src/status_im/utils/config.cljs | 168 ------------- src/status_im/utils/js_resources.cljs | 2 +- src/status_im/utils/snoopy.cljs | 2 +- src/status_im/utils/universal_links/core.cljs | 2 +- .../utils/universal_links/utils.cljs | 2 +- src/status_im/utils/wallet_connect.cljs | 2 +- .../utils/wallet_connect_legacy.cljs | 2 +- .../visibility_status_updates/core.cljs | 2 +- src/status_im/wallet/accounts/core.cljs | 2 +- src/status_im/wallet/core.cljs | 2 +- src/status_im/wallet_connect/core.cljs | 4 +- src/status_im/wallet_connect_legacy/core.cljs | 2 +- src/status_im2/common/constants.cljs | 238 ------------------ src/status_im2/common/home/actions/view.cljs | 2 +- src/status_im2/{setup => }/config.cljs | 15 +- src/{status_im => status_im2}/constants.cljs | 52 +++- .../contexts/activity_center/events_test.cljs | 2 +- .../notification/admin/view.cljs | 2 +- .../notification/contact_request/view.cljs | 2 +- .../contact_verification/view.cljs | 2 +- .../notification/reply/view.cljs | 2 +- .../contact_requests/bottom_drawer.cljs | 2 +- .../chat/messages/content/album/view.cljs | 2 +- .../chat/messages/content/reactions/view.cljs | 2 +- .../contexts/chat/messages/content/view.cljs | 2 +- .../contexts/chat/messages/drawers/view.cljs | 4 +- .../contexts/chat/messages/list/events.cljs | 2 +- .../contexts/chat/messages/list/view.cljs | 2 +- .../contexts/chat/messages/pin/events.cljs | 2 +- .../contexts/chat/messages/view.cljs | 2 +- .../contexts/communities/overview/view.cljs | 2 +- .../community/community_card_view.cljs | 2 +- .../quo_preview/switcher/switcher_cards.cljs | 2 +- src/status_im2/contexts/shell/cards/view.cljs | 2 +- src/status_im2/contexts/shell/events.cljs | 2 +- .../syncing/sheets/enter_password/view.cljs | 2 +- src/status_im2/navigation/screens.cljs | 2 +- src/status_im2/navigation/view.cljs | 2 +- src/status_im2/setup/core.cljs | 2 +- src/status_im2/setup/log.cljs | 2 +- src/status_im2/subs/chat/chats.cljs | 4 +- src/status_im2/subs/chat/chats_test.cljs | 2 +- src/status_im2/subs/chat/messages.cljs | 2 +- src/status_im2/subs/chat/messages_test.cljs | 2 +- src/status_im2/subs/communities.cljs | 2 +- src/status_im2/subs/general.cljs | 2 +- src/status_im2/subs/home.cljs | 2 +- src/status_im2/subs/networks.cljs | 2 +- src/status_im2/subs/onboarding.cljs | 2 +- src/status_im2/subs/shell.cljs | 2 +- src/status_im2/subs/stickers.cljs | 2 +- src/status_im2/subs/wallet/wallet.cljs | 2 +- 144 files changed, 251 insertions(+), 618 deletions(-) delete mode 100644 src/status_im/utils/config.cljs delete mode 100644 src/status_im2/common/constants.cljs rename src/status_im2/{setup => }/config.cljs (92%) rename src/{status_im => status_im2}/constants.cljs (90%) diff --git a/.carve_ignore b/.carve_ignore index caa11565b5..6914071f1e 100644 --- a/.carve_ignore +++ b/.carve_ignore @@ -1,7 +1,7 @@ status-im.utils.build/warning-handler status-im.utils.build/get-current-sha -status-im2.common.constants/spacing-char -status-im2.common.constants/arg-wrapping-char +status-im2.constants/spacing-char +status-im2.constants/arg-wrapping-char status-im.ios.core/init status-im.ui.components.camera/aspects status-im.ui.components.camera/capture-targets @@ -46,8 +46,8 @@ status-im.utils.handlers/logged-in status-im.multiaccounts.model/credentials status-im.multiaccounts.login.core/contract-fleet? status-im.multiaccounts.login.core/fetch-nodes -status-im.utils.config/rpc-networks-only? -status-im.utils.config/waku-enabled? +status-im2.config/rpc-networks-only? +status-im2.config/waku-enabled? status-im.utils.pairing/has-paired-installations? status-im.tribute-to-talk.core-test/user-cofx quo.gesture-handler/tap-gesture-handler @@ -154,40 +154,40 @@ status-im.ethereum.ens/name-hash status-im.ethereum.ens/ABI-hash status-im.ethereum.ens/pubkey-hash status-im.network.core/get-network -status-im.constants/desktop-content-types -status-im.constants/blocks-per-hour -status-im.constants/one-earth-day -status-im.constants/left-pane-min-width -status-im.constants/system -status-im.constants/contact-discovery -status-im.constants/send-transaction-failed-parse-response -status-im.constants/send-transaction-failed-parse-params -status-im.constants/send-transaction-no-account-selected -status-im.constants/send-transaction-invalid-tx-sender -status-im.constants/web3-get-logs -status-im.constants/web3-transaction-receipt -status-im.constants/web3-new-filter -status-im.constants/web3-new-pending-transaction-filter -status-im.constants/web3-new-block-filter -status-im.constants/web3-uninstall-filter -status-im.constants/web3-get-filter-changes -status-im.constants/web3-shh-post -status-im.constants/web3-shh-new-identity -status-im.constants/web3-shh-has-identity -status-im.constants/web3-shh-new-group -status-im.constants/web3-shh-add-to-group -status-im.constants/web3-shh-new-filter -status-im.constants/web3-shh-uninstall-filter -status-im.constants/web3-shh-get-filter-changes -status-im.constants/web3-shh-get-messages -status-im.constants/status-create-address -status-im.constants/event-transfer-hash -status-im.constants/regx-rtl-characters -status-im.constants/desktop-msg-chars-hard-limit -status-im.constants/debug-metrics -status-im.constants/scan-qr-code -status-im.constants/ipfs-proto-code -status-im.constants/swarm-proto-code +status-im2.constants/desktop-content-types +status-im2.constants/blocks-per-hour +status-im2.constants/one-earth-day +status-im2.constants/left-pane-min-width +status-im2.constants/system +status-im2.constants/contact-discovery +status-im2.constants/send-transaction-failed-parse-response +status-im2.constants/send-transaction-failed-parse-params +status-im2.constants/send-transaction-no-account-selected +status-im2.constants/send-transaction-invalid-tx-sender +status-im2.constants/web3-get-logs +status-im2.constants/web3-transaction-receipt +status-im2.constants/web3-new-filter +status-im2.constants/web3-new-pending-transaction-filter +status-im2.constants/web3-new-block-filter +status-im2.constants/web3-uninstall-filter +status-im2.constants/web3-get-filter-changes +status-im2.constants/web3-shh-post +status-im2.constants/web3-shh-new-identity +status-im2.constants/web3-shh-has-identity +status-im2.constants/web3-shh-new-group +status-im2.constants/web3-shh-add-to-group +status-im2.constants/web3-shh-new-filter +status-im2.constants/web3-shh-uninstall-filter +status-im2.constants/web3-shh-get-filter-changes +status-im2.constants/web3-shh-get-messages +status-im2.constants/status-create-address +status-im2.constants/event-transfer-hash +status-im2.constants/regx-rtl-characters +status-im2.constants/desktop-msg-chars-hard-limit +status-im2.constants/debug-metrics +status-im2.constants/scan-qr-code +status-im2.constants/ipfs-proto-code +status-im2.constants/swarm-proto-code status-im.multiaccounts.update.publisher/publish-update! status-im.utils.async/task-queue status-im.utils.async/async-periodic-run! diff --git a/shadow-cljs.edn b/shadow-cljs.edn index e03174e264..b7d6d6bfd5 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -47,8 +47,8 @@ :build-notify status-im2.setup.hot-reload/build-notify :preloads [re-frisk-remote.preload]} :closure-defines - {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN" - status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"} + {status-im2.config/POKT_TOKEN #shadow/env "POKT_TOKEN" + status-im2.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"} :compiler-options {:output-feature-set :es5 :closure-defines {re-frame.trace/trace-enabled? true} @@ -61,8 +61,8 @@ :chunks {:fleets status-im.fleet.default-fleet/default-fleets} :release {:closure-defines - {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN" - status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"} + {status-im2.config/POKT_TOKEN #shadow/env "POKT_TOKEN" + status-im2.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"} :compiler-options {:output-feature-set :es6 ;;disable for android build as there ;;is an intermittent warning with deftype @@ -89,8 +89,8 @@ :ui-driven true :closure-defines - {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN" - status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"} + {status-im2.config/POKT_TOKEN #shadow/env "POKT_TOKEN" + status-im2.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"} :compiler-options {;; needed because we override require and it ;; messes with source-map which reports callstack diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs index 2dec5cb4f0..7f693295e2 100644 --- a/src/status_im/browser/core.cljs +++ b/src/status_im/browser/core.cljs @@ -8,7 +8,7 @@ [status-im.browser.eip3326 :as eip3326] [status-im.browser.permissions :as browser.permissions] [status-im.browser.webview-ref :as webview-ref] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.ens :as ens] [utils.i18n :as i18n] diff --git a/src/status_im/browser/eip3085.cljs b/src/status_im/browser/eip3085.cljs index 5df4d73e2b..f942a4f176 100644 --- a/src/status_im/browser/eip3085.cljs +++ b/src/status_im/browser/eip3085.cljs @@ -3,7 +3,7 @@ (ns status-im.browser.eip3085 (:require [clojure.string :as string] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.network.core :as network] [status-im.ui.screens.browser.eip3085.sheet :as sheet] [utils.re-frame :as rf] diff --git a/src/status_im/browser/eip3326.cljs b/src/status_im/browser/eip3326.cljs index 3c40faddfe..2568f7489b 100644 --- a/src/status_im/browser/eip3326.cljs +++ b/src/status_im/browser/eip3326.cljs @@ -1,7 +1,7 @@ ;reference https://eips.ethereum.org/EIPS/eip-3326 EIP-3326: Wallet Switch Ethereum Chain RPC Method ;(`wallet_switchEthereumChain`) (ns status-im.browser.eip3326 - (:require [status-im.constants :as constants] + (:require [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ui.screens.browser.eip3326.sheet :as sheet] [utils.re-frame :as rf])) diff --git a/src/status_im/browser/permissions.cljs b/src/status_im/browser/permissions.cljs index 84ddffdccf..cbb9fe2e94 100644 --- a/src/status_im/browser/permissions.cljs +++ b/src/status_im/browser/permissions.cljs @@ -1,5 +1,5 @@ (ns status-im.browser.permissions - (:require [status-im.constants :as constants] + (:require [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [utils.re-frame :as rf] diff --git a/src/status_im/chat/db.cljs b/src/status_im/chat/db.cljs index 3dd6c98707..fe129cbdf9 100644 --- a/src/status_im/chat/db.cljs +++ b/src/status_im/chat/db.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.db - (:require [status-im.constants :as constants])) + (:require [status-im2.constants :as constants])) (defn group-chat-name [{:keys [public? name]}] diff --git a/src/status_im/chat/models.cljs b/src/status_im/chat/models.cljs index bdcf375bb1..543a968809 100644 --- a/src/status_im/chat/models.cljs +++ b/src/status_im/chat/models.cljs @@ -5,7 +5,7 @@ [status-im.add-new.db :as new-public-chat.db] [status-im.chat.models.loading :as loading] [status-im2.contexts.chat.messages.list.events :as message-list] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.chats :as chats-store] [status-im.data-store.contacts :as contacts-store] [utils.i18n :as i18n] diff --git a/src/status_im/chat/models/images.cljs b/src/status_im/chat/models/images.cljs index 75536ac4aa..5289afc6c0 100644 --- a/src/status_im/chat/models/images.cljs +++ b/src/status_im/chat/models/images.cljs @@ -7,7 +7,7 @@ [utils.i18n :as i18n] [status-im.ui.components.permissions :as permissions] [status-im.ui.components.react :as react] - [status-im.utils.config :as config] + [status-im2.config :as config] [status-im.utils.fs :as fs] [utils.re-frame :as rf] [status-im.utils.image-processing :as image-processing] diff --git a/src/status_im/chat/models/input.cljs b/src/status_im/chat/models/input.cljs index 8004217e35..687ac01631 100644 --- a/src/status_im/chat/models/input.cljs +++ b/src/status_im/chat/models/input.cljs @@ -3,12 +3,11 @@ [clojure.string :as string] [goog.object :as object] [re-frame.core :as re-frame] - [status-im2.common.constants :as chat.constants] [status-im.chat.models :as chat] [status-im.chat.models.mentions :as mentions] [status-im.chat.models.message :as chat.message] [status-im.chat.models.message-content :as message-content] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.re-frame :as rf] [utils.i18n :as i18n] [utils.datetime :as datetime] @@ -78,14 +77,14 @@ (defn- start-cooldown [{:keys [db]} cooldowns] {:dispatch-later [{:dispatch [:chat/disable-cooldown] - :ms (chat.constants/cooldown-periods-ms + :ms (constants/cooldown-periods-ms cooldowns - chat.constants/default-cooldown-period-ms)}] + constants/default-cooldown-period-ms)}] :show-cooldown-warning nil :db (assoc db :chat/cooldowns (if (= - chat.constants/cooldown-reset-threshold + constants/cooldown-reset-threshold cooldowns) 0 cooldowns) @@ -103,8 +102,8 @@ :as cofx}] (when (chat/public-chat? cofx current-chat-id) (let [spamming-fast? (< (- (datetime/timestamp) last-outgoing-message-sent-at) - (+ chat.constants/spam-interval-ms (* 1000 cooldowns))) - spamming-frequently? (= chat.constants/spam-message-frequency-threshold + (+ constants/spam-interval-ms (* 1000 cooldowns))) + spamming-frequently? (= constants/spam-message-frequency-threshold spam-messages-frequency)] (cond-> {:db (assoc db :chat/last-outgoing-message-sent-at (datetime/timestamp) diff --git a/src/status_im/chat/models/input_test.cljs b/src/status_im/chat/models/input_test.cljs index f3c24ae43a..90e9da7156 100644 --- a/src/status_im/chat/models/input_test.cljs +++ b/src/status_im/chat/models/input_test.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.models.input-test (:require [cljs.test :refer-macros [deftest is testing]] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im.chat.models.input :as input] [utils.datetime :as datetime])) diff --git a/src/status_im/chat/models/loading.cljs b/src/status_im/chat/models/loading.cljs index 1b82f55661..8fea1dc574 100644 --- a/src/status_im/chat/models/loading.cljs +++ b/src/status_im/chat/models/loading.cljs @@ -1,7 +1,7 @@ (ns status-im.chat.models.loading (:require [re-frame.core :as re-frame] [status-im2.contexts.chat.messages.list.events :as message-list] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.chats :as data-store.chats] [status-im.data-store.messages :as data-store.messages] [status-im2.contexts.activity-center.events :as activity-center] diff --git a/src/status_im/chat/models/mentions.cljs b/src/status_im/chat/models/mentions.cljs index b692eb4b7b..c510290e7c 100644 --- a/src/status_im/chat/models/mentions.cljs +++ b/src/status_im/chat/models/mentions.cljs @@ -3,7 +3,7 @@ [quo.react :as react] [quo.react-native :as rn] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.contact.db :as contact.db] [status-im.multiaccounts.core :as multiaccounts] [status-im.native-module.core :as status] diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs index b490f8cc14..c9253eff53 100644 --- a/src/status_im/chat/models/message.cljs +++ b/src/status_im/chat/models/message.cljs @@ -5,7 +5,7 @@ [status-im.chat.models.loading :as chat.loading] [status-im.chat.models.mentions :as mentions] [status-im2.contexts.chat.messages.list.events :as message-list] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.messages :as data-store.messages] [status-im.transport.message.protocol :as protocol] [status-im2.contexts.chat.messages.list.state :as view.state] diff --git a/src/status_im/chat/models/message_content.cljs b/src/status_im/chat/models/message_content.cljs index d90a665c85..e585d3911d 100644 --- a/src/status_im/chat/models/message_content.cljs +++ b/src/status_im/chat/models/message_content.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.models.message-content - (:require [status-im.constants :as constants])) + (:require [status-im2.constants :as constants])) (defn emoji-only-content? "Determines if text is just an emoji" diff --git a/src/status_im/chat/models/reactions.cljs b/src/status_im/chat/models/reactions.cljs index cb596bcbdd..b44c277aa1 100644 --- a/src/status_im/chat/models/reactions.cljs +++ b/src/status_im/chat/models/reactions.cljs @@ -1,6 +1,6 @@ (ns status-im.chat.models.reactions (:require [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.reactions :as data-store.reactions] [status-im.transport.message.protocol :as message.protocol] [utils.re-frame :as rf] diff --git a/src/status_im/communities/core.cljs b/src/status_im/communities/core.cljs index ba00000316..a0bd1c1f3f 100644 --- a/src/status_im/communities/core.cljs +++ b/src/status_im/communities/core.cljs @@ -7,7 +7,7 @@ [utils.i18n :as i18n] [status-im.async-storage.core :as async-storage] [status-im.bottom-sheet.core :as bottom-sheet] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles] [utils.re-frame :as rf] [status-im.utils.universal-links.core :as universal-links] diff --git a/src/status_im/contact/core.cljs b/src/status_im/contact/core.cljs index ff527032e7..a31786f074 100644 --- a/src/status_im/contact/core.cljs +++ b/src/status_im/contact/core.cljs @@ -1,6 +1,6 @@ (ns status-im.contact.core (:require [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.contact.block :as contact.block] [status-im.contact.db :as contact.db] [status-im.data-store.contacts :as contacts-store] diff --git a/src/status_im/contact/db.cljs b/src/status_im/contact/db.cljs index 5d2f359334..e5dc8d8733 100644 --- a/src/status_im/contact/db.cljs +++ b/src/status_im/contact/db.cljs @@ -1,7 +1,7 @@ (ns status-im.contact.db (:require [clojure.set :as set] [clojure.string :as string] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.multiaccounts.core :as multiaccounts] [status-im.utils.gfycat.core :as gfycat] diff --git a/src/status_im/data_store/activities.cljs b/src/status_im/data_store/activities.cljs index 6360dc2570..f347ae97d6 100644 --- a/src/status_im/data_store/activities.cljs +++ b/src/status_im/data_store/activities.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.activities (:require [clojure.set :as set] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.messages :as messages] [status-im2.contexts.activity-center.notification-types :as notification-types])) diff --git a/src/status_im/data_store/activities_test.cljs b/src/status_im/data_store/activities_test.cljs index db60db7c11..ee9320f3e9 100644 --- a/src/status_im/data_store/activities_test.cljs +++ b/src/status_im/data_store/activities_test.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.activities-test (:require [cljs.test :refer [deftest is testing]] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.activities :as store] [status-im2.contexts.activity-center.notification-types :as notification-types])) diff --git a/src/status_im/data_store/chats.cljs b/src/status_im/data_store/chats.cljs index ebc507b1aa..c25a318074 100644 --- a/src/status_im/data_store/chats.cljs +++ b/src/status_im/data_store/chats.cljs @@ -1,6 +1,6 @@ (ns status-im.data-store.chats (:require [clojure.set :as set] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.messages :as messages] [utils.re-frame :as rf] [status-im.utils.types :as types] diff --git a/src/status_im/data_store/settings.cljs b/src/status_im/data_store/settings.cljs index d73b2e7cf3..564e0cf863 100644 --- a/src/status_im/data_store/settings.cljs +++ b/src/status_im/data_store/settings.cljs @@ -1,7 +1,7 @@ (ns status-im.data-store.settings (:require [status-im.data-store.visibility-status-updates :as visibility-status-updates] [status-im.ethereum.eip55 :as eip55] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (defn rpc->networks [networks] diff --git a/src/status_im/ethereum/stateofus.cljs b/src/status_im/ethereum/stateofus.cljs index f66a2326f7..dd2969731e 100644 --- a/src/status_im/ethereum/stateofus.cljs +++ b/src/status_im/ethereum/stateofus.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [status-im.ethereum.core :as ethereum] [status-im.ethereum.ens :as ens] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (def domain "stateofus.eth") diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs index 5c67ec5023..9ceddd923e 100644 --- a/src/status_im/events.cljs +++ b/src/status_im/events.cljs @@ -13,7 +13,7 @@ status-im.chat.models.input status-im.chat.models.loading status-im.chat.models.transport - [status-im.constants :as constants] + [status-im2.constants :as constants] status-im.contact.block status-im.contact.chat status-im.contact.core diff --git a/src/status_im/fleet/core.cljs b/src/status_im/fleet/core.cljs index ef356a5d90..63a34a0f82 100644 --- a/src/status_im/fleet/core.cljs +++ b/src/status_im/fleet/core.cljs @@ -1,10 +1,10 @@ (ns status-im.fleet.core (:require [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.node.core :as node] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf])) (defn current-fleet-sub diff --git a/src/status_im/fleet/core_test.cljs b/src/status_im/fleet/core_test.cljs index 8e8f351d57..33fb94d8e9 100644 --- a/src/status_im/fleet/core_test.cljs +++ b/src/status_im/fleet/core_test.cljs @@ -1,6 +1,6 @@ (ns status-im.fleet.core-test (:require [cljs.test :refer-macros [deftest is testing]] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.fleet.core :as fleet])) #_(deftest fleets-test diff --git a/src/status_im/group_chats/core.cljs b/src/status_im/group_chats/core.cljs index 6544b367ca..f382da3b69 100644 --- a/src/status_im/group_chats/core.cljs +++ b/src/status_im/group_chats/core.cljs @@ -6,7 +6,7 @@ [oops.core :as oops] [re-frame.core :as re-frame] [status-im.chat.models :as models.chat] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im2.contexts.activity-center.events :as activity-center] [status-im2.navigation.events :as navigation] [utils.re-frame :as rf])) diff --git a/src/status_im/keycard/card.cljs b/src/status_im/keycard/card.cljs index 1e489d1e8c..101a6a3613 100644 --- a/src/status_im/keycard/card.cljs +++ b/src/status_im/keycard/card.cljs @@ -3,7 +3,7 @@ [status-im.keycard.keycard :as keycard] [status-im.keycard.real-keycard :as real-keycard] [status-im.keycard.simulated-keycard :as simulated-keycard] - [status-im.utils.config :as config] + [status-im2.config :as config] [taoensso.timbre :as log])) (defonce card diff --git a/src/status_im/keycard/onboarding.cljs b/src/status_im/keycard/onboarding.cljs index a65bb3fb28..38c3860b7c 100644 --- a/src/status_im/keycard/onboarding.cljs +++ b/src/status_im/keycard/onboarding.cljs @@ -1,7 +1,7 @@ (ns status-im.keycard.onboarding (:require [clojure.string :as string] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.keycard.common :as common] status-im.keycard.fx diff --git a/src/status_im/keycard/recovery.cljs b/src/status_im/keycard/recovery.cljs index 38f9dd9e77..ebdb3237b5 100644 --- a/src/status_im/keycard/recovery.cljs +++ b/src/status_im/keycard/recovery.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [status-im.bottom-sheet.core :as bottom-sheet] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] [utils.i18n :as i18n] diff --git a/src/status_im/keycard/simulated_keycard.cljs b/src/status_im/keycard/simulated_keycard.cljs index 7949349f97..7ff6487b7c 100644 --- a/src/status_im/keycard/simulated_keycard.cljs +++ b/src/status_im/keycard/simulated_keycard.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [re-frame.db :as re-frame.db] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [utils.i18n :as i18n] [status-im.keycard.keycard :as keycard] diff --git a/src/status_im/keycard/wallet.cljs b/src/status_im/keycard/wallet.cljs index eb736d08dc..0d7886f9d8 100644 --- a/src/status_im/keycard/wallet.cljs +++ b/src/status_im/keycard/wallet.cljs @@ -1,6 +1,6 @@ (ns status-im.keycard.wallet (:require [status-im.bottom-sheet.core :as bottom-sheet] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] [status-im.keycard.common :as common] diff --git a/src/status_im/multiaccounts/create/core.cljs b/src/status_im/multiaccounts/create/core.cljs index ce9e1aab1b..cf1fcdeb39 100644 --- a/src/status_im/multiaccounts/create/core.cljs +++ b/src/status_im/multiaccounts/create/core.cljs @@ -1,14 +1,14 @@ (ns status-im.multiaccounts.create.core (:require [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.settings :as data-store.settings] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] [utils.i18n :as i18n] [status-im.native-module.core :as status] [status-im.node.core :as node] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf] [status-im.utils.signing-phrase.core :as signing-phrase] [status-im.utils.types :as types] diff --git a/src/status_im/multiaccounts/db.cljs b/src/status_im/multiaccounts/db.cljs index 70f55bf7a6..b68ab74bd4 100644 --- a/src/status_im/multiaccounts/db.cljs +++ b/src/status_im/multiaccounts/db.cljs @@ -1,6 +1,6 @@ (ns status-im.multiaccounts.db (:require [cljs.spec.alpha :as spec] - [status-im.constants :as const])) + [status-im2.constants :as const])) (defn valid-length? [password] diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index 9b22c76989..e43c65bfa8 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -28,7 +28,7 @@ [status-im.signing.eip1559 :as eip1559] [status-im.transport.core :as transport] [status-im.ui.components.react :as react] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf] [status-im.utils.keychain.core :as keychain] [status-im.utils.mobile-sync :as utils.mobile-sync] diff --git a/src/status_im/multiaccounts/recover/core.cljs b/src/status_im/multiaccounts/recover/core.cljs index d092a28005..746fc864a1 100644 --- a/src/status_im/multiaccounts/recover/core.cljs +++ b/src/status_im/multiaccounts/recover/core.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [status-im.bottom-sheet.core :as bottom-sheet] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.mnemonic :as mnemonic] [utils.i18n :as i18n] diff --git a/src/status_im/multiaccounts/update/core.cljs b/src/status_im/multiaccounts/update/core.cljs index 22c9f396c9..32a82f0231 100644 --- a/src/status_im/multiaccounts/update/core.cljs +++ b/src/status_im/multiaccounts/update/core.cljs @@ -1,5 +1,5 @@ (ns status-im.multiaccounts.update.core - (:require [status-im.constants :as constants] + (:require [status-im2.constants :as constants] [utils.re-frame :as rf] [status-im.utils.types :as types] [taoensso.timbre :as log])) diff --git a/src/status_im/native_module/core.cljs b/src/status_im/native_module/core.cljs index 0f5134bc15..b2025ff60f 100644 --- a/src/status_im/native_module/core.cljs +++ b/src/status_im/native_module/core.cljs @@ -6,7 +6,7 @@ [status-im.utils.react-native :as react-native-utils] [status-im.utils.types :as types] [taoensso.timbre :as log] - [status-im.constants :as constants])) + [status-im2.constants :as constants])) (defn status [] diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs index 062d3b2b8b..1506575136 100644 --- a/src/status_im/node/core.cljs +++ b/src/status_im/node/core.cljs @@ -1,7 +1,7 @@ (ns status-im.node.core (:require [re-frame.core :as re-frame] [status-im.native-module.core :as status] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf] [status-im.utils.platform :as utils.platform] [status-im.utils.types :as types] diff --git a/src/status_im/notifications/core.cljs b/src/status_im/notifications/core.cljs index c91579046b..328ca511a5 100644 --- a/src/status_im/notifications/core.cljs +++ b/src/status_im/notifications/core.cljs @@ -5,7 +5,7 @@ [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.notifications.android :as pn-android] [status-im.notifications.local :as local] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf] [taoensso.timbre :as log])) diff --git a/src/status_im/pairing/core.cljs b/src/status_im/pairing/core.cljs index 62c131fc5a..0c2583766b 100644 --- a/src/status_im/pairing/core.cljs +++ b/src/status_im/pairing/core.cljs @@ -2,7 +2,7 @@ (:require [re-frame.core :as re-frame] [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf] [status-im.utils.platform :as utils.platform] [status-im2.common.json-rpc.events :as json-rpc] diff --git a/src/status_im/router/core.cljs b/src/status_im/router/core.cljs index 2db42f8fe4..bb5c16cbe5 100644 --- a/src/status_im/router/core.cljs +++ b/src/status_im/router/core.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [status-im.add-new.db :as public-chat.db] [status-im.chat.models :as chat.models] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip681 :as eip681] [status-im.ethereum.ens :as ens] diff --git a/src/status_im/signing/core.cljs b/src/status_im/signing/core.cljs index c1e479c586..ce31ff18d6 100644 --- a/src/status_im/signing/core.cljs +++ b/src/status_im/signing/core.cljs @@ -2,7 +2,7 @@ (:require [clojure.set :as set] [clojure.string :as string] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] [status-im.ethereum.tokens :as tokens] diff --git a/src/status_im/stickers/core.cljs b/src/status_im/stickers/core.cljs index e03d029b58..5f3617f1fe 100644 --- a/src/status_im/stickers/core.cljs +++ b/src/status_im/stickers/core.cljs @@ -1,9 +1,9 @@ (ns status-im.stickers.core (:require [clojure.string :as string] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf] [status-im.utils.utils :as utils] [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 930c9382ef..c17e5463ed 100644 --- a/src/status_im/transport/message/core.cljs +++ b/src/status_im/transport/message/core.cljs @@ -6,7 +6,7 @@ [status-im.chat.models.message :as models.message] [status-im.chat.models.reactions :as models.reactions] [status-im.communities.core :as models.communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.contact.core :as models.contact] [status-im.data-store.activities :as data-store.activities] [status-im.data-store.chats :as data-store.chats] diff --git a/src/status_im/ui/components/tooltip/styles.cljs b/src/status_im/ui/components/tooltip/styles.cljs index 8ce1a5f278..09f32626dd 100644 --- a/src/status_im/ui/components/tooltip/styles.cljs +++ b/src/status_im/ui/components/tooltip/styles.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.components.tooltip.styles (:require [quo.design-system.colors :as colors] - [status-im.utils.config :as config] + [status-im2.config :as config] [status-im.utils.styles :as styles])) (def tooltip-container diff --git a/src/status_im/ui/components/webview.cljs b/src/status_im/ui/components/webview.cljs index aeb7ad2194..fcbf940b31 100644 --- a/src/status_im/ui/components/webview.cljs +++ b/src/status_im/ui/components/webview.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.components.webview (:require ["react-native-webview" :default rn-webview] [reagent.core :as reagent] - [status-im.utils.config :as config] + [status-im2.config :as config] [status-im.utils.platform :as platform])) (def webview-class diff --git a/src/status_im/ui/screens/about_app/views.cljs b/src/status_im/ui/screens/about_app/views.cljs index f3fc286bcb..b761a8aeaf 100644 --- a/src/status_im/ui/screens/about_app/views.cljs +++ b/src/status_im/ui/screens/about_app/views.cljs @@ -2,7 +2,8 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :refer [principles-link privacy-policy-link terms-of-service-link]] + [status-im2.constants :refer + [principles-link privacy-policy-link terms-of-service-link]] [utils.i18n :as i18n] [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/advanced_settings/views.cljs b/src/status_im/ui/screens/advanced_settings/views.cljs index 05a70057fa..a842c695d4 100644 --- a/src/status_im/ui/screens/advanced_settings/views.cljs +++ b/src/status_im/ui/screens/advanced_settings/views.cljs @@ -3,7 +3,7 @@ [re-frame.core :as re-frame] [utils.i18n :as i18n] [status-im.ui.components.list.views :as list] - [status-im2.setup.config :as config]) + [status-im2.config :as config]) (:require-macros [status-im.utils.views :as views])) (defn- normal-mode-settings-data diff --git a/src/status_im/ui/screens/appearance/views.cljs b/src/status_im/ui/screens/appearance/views.cljs index a86ed77cb4..3e696d6c5a 100644 --- a/src/status_im/ui/screens/appearance/views.cljs +++ b/src/status_im/ui/screens/appearance/views.cljs @@ -6,7 +6,7 @@ [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (defn button [label icon theme selected?] diff --git a/src/status_im/ui/screens/browser/options/views.cljs b/src/status_im/ui/screens/browser/options/views.cljs index ae5c83a192..d0f8ae9789 100644 --- a/src/status_im/ui/screens/browser/options/views.cljs +++ b/src/status_im/ui/screens/browser/options/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.browser.core :as browser] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.chat-icon.screen :as chat-icon] diff --git a/src/status_im/ui/screens/chat/components/input.cljs b/src/status_im/ui/screens/chat/components/input.cljs index b8001fe65d..2c848e14a2 100644 --- a/src/status_im/ui/screens/chat/components/input.cljs +++ b/src/status_im/ui/screens/chat/components/input.cljs @@ -9,7 +9,7 @@ [quo.react-native :as rn] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.common.constants :as chat.constants] + [status-im2.constants :as chat.constants] [status-im.chat.models.mentions :as mentions] [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im/ui/screens/chat/group.cljs b/src/status_im/ui/screens/chat/group.cljs index 359c6baa00..f8588db8d7 100644 --- a/src/status_im/ui/screens/chat/group.cljs +++ b/src/status_im/ui/screens/chat/group.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.utils.platform :as platform] diff --git a/src/status_im/ui/screens/chat/sheets.cljs b/src/status_im/ui/screens/chat/sheets.cljs index 2438618992..0bbb88d5aa 100644 --- a/src/status_im/ui/screens/chat/sheets.cljs +++ b/src/status_im/ui/screens/chat/sheets.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.chat.sheets (:require [quo.core :as quo] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.list-selection :as list-selection] diff --git a/src/status_im/ui/screens/chat/styles/message/message.cljs b/src/status_im/ui/screens/chat/styles/message/message.cljs index 8bfc23eee1..2a5de95642 100644 --- a/src/status_im/ui/screens/chat/styles/message/message.cljs +++ b/src/status_im/ui/screens/chat/styles/message/message.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.chat.styles.message.message (:require [quo.design-system.colors :as colors] [quo2.foundations.colors :as quo2.colors] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ui.components.react :as react] [status-im.ui.screens.chat.styles.photos :as photos])) diff --git a/src/status_im/ui/screens/communities/community.cljs b/src/status_im/ui/screens/communities/community.cljs index 2c16e24476..c9d457d08a 100644 --- a/src/status_im/ui/screens/communities/community.cljs +++ b/src/status_im/ui/screens/communities/community.cljs @@ -9,7 +9,7 @@ [react-native.core :as rn] [status-im.chat.models.link-preview :as link-preview] [status-im.communities.core :as communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.react-native.resources :as resources] [status-im.ui.components.accordion :as accordion] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] diff --git a/src/status_im/ui/screens/communities/icon.cljs b/src/status_im/ui/screens/communities/icon.cljs index 86f2646149..4a00ccf79d 100644 --- a/src/status_im/ui/screens/communities/icon.cljs +++ b/src/status_im/ui/screens/communities/icon.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.communities.icon (:require [quo.design-system.colors :as colors] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.react-native.resources :as resources] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.react :as react] @@ -40,4 +40,4 @@ :else [chat-icon.screen/chat-icon-view-chat-list-redesign - id true name color size]))) \ No newline at end of file + id true name color size]))) diff --git a/src/status_im/ui/screens/communities/invite.cljs b/src/status_im/ui/screens/communities/invite.cljs index e48555cd79..842e4f4c83 100644 --- a/src/status_im/ui/screens/communities/invite.cljs +++ b/src/status_im/ui/screens/communities/invite.cljs @@ -4,7 +4,7 @@ [quo.react-native :as rn] [reagent.core :as reagent] [status-im.communities.core :as communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] diff --git a/src/status_im/ui/screens/communities/members.cljs b/src/status_im/ui/screens/communities/members.cljs index 2254191c79..05b081ed7d 100644 --- a/src/status_im/ui/screens/communities/members.cljs +++ b/src/status_im/ui/screens/communities/members.cljs @@ -3,7 +3,7 @@ [quo.react-native :as rn] [reagent.core :as reagent] [status-im.communities.core :as communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] diff --git a/src/status_im/ui/screens/communities/membership.cljs b/src/status_im/ui/screens/communities/membership.cljs index 67d52af596..54fe8d1ef1 100644 --- a/src/status_im/ui/screens/communities/membership.cljs +++ b/src/status_im/ui/screens/communities/membership.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.react-native :as rn] [status-im.communities.core :as communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [utils.re-frame :as rf])) diff --git a/src/status_im/ui/screens/communities/profile.cljs b/src/status_im/ui/screens/communities/profile.cljs index 065dda99e8..64bd3e8909 100644 --- a/src/status_im/ui/screens/communities/profile.cljs +++ b/src/status_im/ui/screens/communities/profile.cljs @@ -5,7 +5,7 @@ [quo.react-native :as rn] [reagent.core :as reagent] [status-im.communities.core :as communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.copyable-text :as copyable-text] diff --git a/src/status_im/ui/screens/communities/reorder_categories.cljs b/src/status_im/ui/screens/communities/reorder_categories.cljs index fa64786f8d..d89b0f3ab1 100644 --- a/src/status_im/ui/screens/communities/reorder_categories.cljs +++ b/src/status_im/ui/screens/communities/reorder_categories.cljs @@ -8,7 +8,7 @@ [quo2.components.community.style :as styles] [reagent.core :as reagent] [status-im.communities.core :as communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/communities/views.cljs b/src/status_im/ui/screens/communities/views.cljs index 2962426c0f..df0d870d85 100644 --- a/src/status_im/ui/screens/communities/views.cljs +++ b/src/status_im/ui/screens/communities/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as quo.colors] [status-im.communities.core :as communities] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.badge :as badge] [status-im.ui.components.copyable-text :as copyable-text] diff --git a/src/status_im/ui/screens/dapps_permissions/views.cljs b/src/status_im/ui/screens/dapps_permissions/views.cljs index bc56460bf5..e8e6d75002 100644 --- a/src/status_im/ui/screens/dapps_permissions/views.cljs +++ b/src/status_im/ui/screens/dapps_permissions/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] diff --git a/src/status_im/ui/screens/default_sync_period_settings/view.cljs b/src/status_im/ui/screens/default_sync_period_settings/view.cljs index 420b2f19f9..61612071a0 100644 --- a/src/status_im/ui/screens/default_sync_period_settings/view.cljs +++ b/src/status_im/ui/screens/default_sync_period_settings/view.cljs @@ -2,10 +2,10 @@ (:require-macros [status-im.utils.views :as views]) (:require [quo.core :as quo] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.react :as react] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (def titles {constants/two-mins (i18n/label :t/two-minutes) diff --git a/src/status_im/ui/screens/group/views.cljs b/src/status_im/ui/screens/group/views.cljs index 76a55d2b9c..827bf29b6e 100644 --- a/src/status_im/ui/screens/group/views.cljs +++ b/src/status_im/ui/screens/group/views.cljs @@ -3,7 +3,7 @@ [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] diff --git a/src/status_im/ui/screens/help_center/views.cljs b/src/status_im/ui/screens/help_center/views.cljs index 57ba1f14f8..a265964cf9 100644 --- a/src/status_im/ui/screens/help_center/views.cljs +++ b/src/status_im/ui/screens/help_center/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.help-center.views (:require [quo.core :as quo] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/home/sheet/views.cljs b/src/status_im/ui/screens/home/sheet/views.cljs index 07347d65f2..26f0c16454 100644 --- a/src/status_im/ui/screens/home/sheet/views.cljs +++ b/src/status_im/ui/screens/home/sheet/views.cljs @@ -7,7 +7,7 @@ [status-im.ui.components.invite.views :as invite] [status-im.ui.components.react :as rn] [status-im.ui2.screens.chat.components.new-chat.view :as new-chat-aio] - [status-im.utils.config :as config] + [status-im2.config :as config] [quo2.core :as quo2] [status-im.ui.screens.home.sheet.styles :as style])) diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs index 395e58d66c..99ef6f57e1 100644 --- a/src/status_im/ui/screens/home/views/inner_item.cljs +++ b/src/status_im/ui/screens/home/views/inner_item.cljs @@ -5,7 +5,7 @@ [quo2.components.markdown.text :as quo2.text] [quo2.foundations.colors :as quo2.colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.badge :as badge] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] diff --git a/src/status_im/ui/screens/keycard/onboarding/views.cljs b/src/status_im/ui/screens/keycard/onboarding/views.cljs index ffcdf6e861..829ef8138b 100644 --- a/src/status_im/ui/screens/keycard/onboarding/views.cljs +++ b/src/status_im/ui/screens/keycard/onboarding/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.keycard.onboarding :as keycard.onboarding] [status-im.react-native.resources :as resources] diff --git a/src/status_im/ui/screens/keycard/recovery/views.cljs b/src/status_im/ui/screens/keycard/recovery/views.cljs index e2d4565d1a..10fd089763 100644 --- a/src/status_im/ui/screens/keycard/recovery/views.cljs +++ b/src/status_im/ui/screens/keycard/recovery/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.keycard.recovery :as keycard.recovery] [status-im.react-native.resources :as resources] diff --git a/src/status_im/ui/screens/keycard/settings/views.cljs b/src/status_im/ui/screens/keycard/settings/views.cljs index f1e50f1f92..f76fe22750 100644 --- a/src/status_im/ui/screens/keycard/settings/views.cljs +++ b/src/status_im/ui/screens/keycard/settings/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/keycard/views.cljs b/src/status_im/ui/screens/keycard/views.cljs index eb84329d79..c02bbc662d 100644 --- a/src/status_im/ui/screens/keycard/views.cljs +++ b/src/status_im/ui/screens/keycard/views.cljs @@ -5,7 +5,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.bottom-sheet.core :as bottom-sheet] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.keycard.login :as keycard.login] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im/ui/screens/multiaccounts/recover/views.cljs b/src/status_im/ui/screens/multiaccounts/recover/views.cljs index dfac598130..c57306217e 100644 --- a/src/status_im/ui/screens/multiaccounts/recover/views.cljs +++ b/src/status_im/ui/screens/multiaccounts/recover/views.cljs @@ -11,7 +11,7 @@ [status-im.react-native.resources :as resources] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] - [status-im2.setup.config :as config] + [status-im2.config :as config] [utils.security.core])) (defn hide-sheet-and-dispatch diff --git a/src/status_im/ui/screens/onboarding/keys/views.cljs b/src/status_im/ui/screens/onboarding/keys/views.cljs index 584ecca97b..2285ddf586 100644 --- a/src/status_im/ui/screens/onboarding/keys/views.cljs +++ b/src/status_im/ui/screens/onboarding/keys/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/onboarding/password/views.cljs b/src/status_im/ui/screens/onboarding/password/views.cljs index 9f75ee5778..568180ee11 100644 --- a/src/status_im/ui/screens/onboarding/password/views.cljs +++ b/src/status_im/ui/screens/onboarding/password/views.cljs @@ -3,7 +3,7 @@ [quo.react-native :as rn] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.constants :as const] + [status-im2.constants :as const] [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [utils.security.core :as security])) diff --git a/src/status_im/ui/screens/privacy_and_security_settings/views.cljs b/src/status_im/ui/screens/privacy_and_security_settings/views.cljs index f26db8eee4..158fc27453 100644 --- a/src/status_im/ui/screens/privacy_and_security_settings/views.cljs +++ b/src/status_im/ui/screens/privacy_and_security_settings/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.privacy-and-security-settings.views (:require [quo.core :as quo] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.multiaccounts.biometric.core :as biometric] [status-im.multiaccounts.key-storage.core :as key-storage] @@ -9,7 +9,7 @@ [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.ui.components.common.common :as components.common] [status-im.ui.components.react :as react] - [status-im.utils.config :as config] + [status-im2.config :as config] [status-im.utils.platform :as platform]) (:require-macros [status-im.utils.views :as views])) diff --git a/src/status_im/ui/screens/profile/group_chat/views.cljs b/src/status_im/ui/screens/profile/group_chat/views.cljs index e065da9128..b9cf0ed779 100644 --- a/src/status_im/ui/screens/profile/group_chat/views.cljs +++ b/src/status_im/ui/screens/profile/group_chat/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] diff --git a/src/status_im/ui/screens/profile/user/edit_picture.cljs b/src/status_im/ui/screens/profile/user/edit_picture.cljs index 3081bbe1a7..6a781a927f 100644 --- a/src/status_im/ui/screens/profile/user/edit_picture.cljs +++ b/src/status_im/ui/screens/profile/user/edit_picture.cljs @@ -4,7 +4,7 @@ [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.react :as react] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (def crop-size 1000) (def crop-opts diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index e5ff42de8d..912a6d16b0 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -19,7 +19,7 @@ [status-im.utils.gfycat.core :as gfy] [status-im.utils.universal-links.utils :as universal-links] [status-im.utils.utils :as utils] - [status-im2.setup.config :as config]) + [status-im2.config :as config]) (:require-macros [status-im.utils.views :as views])) (views/defview share-chat-key diff --git a/src/status_im/ui/screens/profile/visibility_status/utils.cljs b/src/status_im/ui/screens/profile/visibility_status/utils.cljs index 77435fa450..424a8b9b1a 100644 --- a/src/status_im/ui/screens/profile/visibility_status/utils.cljs +++ b/src/status_im/ui/screens/profile/visibility_status/utils.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [quo.design-system.colors :as colors] [quo2.foundations.colors :as quo2.colors] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.screens.profile.visibility-status.styles :as styles] [utils.datetime :as datetime] diff --git a/src/status_im/ui/screens/profile/visibility_status/views.cljs b/src/status_im/ui/screens/profile/visibility_status/views.cljs index 636b1e6419..26322204f9 100644 --- a/src/status_im/ui/screens/profile/visibility_status/views.cljs +++ b/src/status_im/ui/screens/profile/visibility_status/views.cljs @@ -6,7 +6,7 @@ [quo.react-native :as rn] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ui.components.animation :as anim] [status-im.ui.components.react :as react] [status-im.ui.screens.profile.visibility-status.styles :as styles] diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs index 0ae3df94bf..aee959fd2f 100644 --- a/src/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/status_im/ui/screens/qr_scanner/views.cljs @@ -10,7 +10,7 @@ [status-im.ui.components.react :as react] [status-im.ui.components.topbar :as topbar] [status-im.ui.screens.qr-scanner.styles :as styles] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (def camera (reagent/adapt-react-class CameraKitCamera)) diff --git a/src/status_im/ui/screens/sync_settings/views.cljs b/src/status_im/ui/screens/sync_settings/views.cljs index 8d237e18e1..da78688c44 100644 --- a/src/status_im/ui/screens/sync_settings/views.cljs +++ b/src/status_im/ui/screens/sync_settings/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/terms_of_service/views.cljs b/src/status_im/ui/screens/terms_of_service/views.cljs index e3f552fa2b..aa52de3ab5 100644 --- a/src/status_im/ui/screens/terms_of_service/views.cljs +++ b/src/status_im/ui/screens/terms_of_service/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.spacing :as spacing] [quo.design-system.typography :as typography] [re-frame.core :as re-frame] - [status-im.constants :refer [docs-link]] + [status-im2.constants :refer [docs-link]] [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/wallet/account/views.cljs b/src/status_im/ui/screens/wallet/account/views.cljs index 71bc0fc570..09ccd0872b 100644 --- a/src/status_im/ui/screens/wallet/account/views.cljs +++ b/src/status_im/ui/screens/wallet/account/views.cljs @@ -22,7 +22,7 @@ [status-im.ui.screens.wallet.buy-crypto.views :as buy-crypto] [status-im.ui.screens.wallet.collectibles.views :as collectibles.views] [status-im.ui.screens.wallet.transactions.views :as history] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf]) (:require-macros [status-im.utils.views :as views])) diff --git a/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs b/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs index 0f587a40de..38e2f1b469 100644 --- a/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs +++ b/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs @@ -6,7 +6,7 @@ [quo.platform :as platform] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.bottom-panel.views :as bottom-panel] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui2/screens/chat/components/new_chat/view.cljs b/src/status_im/ui2/screens/chat/components/new_chat/view.cljs index dc6f9cf710..c6fc7d82c1 100644 --- a/src/status_im/ui2/screens/chat/components/new_chat/view.cljs +++ b/src/status_im/ui2/screens/chat/components/new_chat/view.cljs @@ -4,7 +4,7 @@ [quo2.foundations.colors :as quo2.colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.re-frame :as rf] diff --git a/src/status_im/ui2/screens/chat/components/reply/view.cljs b/src/status_im/ui2/screens/chat/components/reply/view.cljs index e584f95231..23dab5d171 100644 --- a/src/status_im/ui2/screens/chat/components/reply/view.cljs +++ b/src/status_im/ui2/screens/chat/components/reply/view.cljs @@ -6,7 +6,7 @@ [quo2.components.icon :as quo2.icon] [quo2.components.markdown.text :as quo2.text] [quo2.foundations.colors :as colors] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.stateofus :as stateofus] [status-im.ui.components.icons.icons :as icons] [status-im.ui.screens.chat.photos :as photos] diff --git a/src/status_im/ui2/screens/chat/composer/input.cljs b/src/status_im/ui2/screens/chat/composer/input.cljs index 9926615304..8b5219c2f9 100644 --- a/src/status_im/ui2/screens/chat/composer/input.cljs +++ b/src/status_im/ui2/screens/chat/composer/input.cljs @@ -8,7 +8,7 @@ [quo2.foundations.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.common.constants :as chat.constants] + [status-im2.constants :as chat.constants] [status-im.chat.models.mentions :as mentions] [utils.i18n :as i18n] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui2/screens/chat/messages/message.cljs b/src/status_im/ui2/screens/chat/messages/message.cljs index c1af273914..098c9ae388 100644 --- a/src/status_im/ui2/screens/chat/messages/message.cljs +++ b/src/status_im/ui2/screens/chat/messages/message.cljs @@ -8,7 +8,7 @@ [quo2.foundations.typography :as typography] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.fast-image :as fast-image] @@ -21,7 +21,7 @@ [status-im.ui.screens.chat.utils :as chat.utils] [status-im.ui.screens.communities.icon :as communities.icon] [status-im.ui2.screens.chat.components.reply.view :as components.reply] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.datetime :as datetime] [status-im.utils.utils :as utils] [status-im2.contexts.chat.home.chat-list-item.view :as home.chat-list-item] diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs deleted file mode 100644 index d8494ca7c3..0000000000 --- a/src/status_im/utils/config.cljs +++ /dev/null @@ -1,168 +0,0 @@ -(ns status-im.utils.config - (:require ["react-native-config" :default react-native-config] - [clojure.string :as string] - [status-im.ethereum.core :as ethereum] - [status-im.ethereum.ens :as ens])) -;;TODO (14/11/22 flexsurfer) this namespace has been moved to the status-im2 namespace, we keep this -;;only -;;for old (status 1.0) code, -;; can be removed with old code later -(def config - (memoize - (fn [] - (js->clj react-native-config :keywordize-keys true)))) - -(defn get-config - ([k] (get (config) k)) - ([k not-found] (get (config) k not-found))) - -(defn enabled? [v] (= "1" v)) - -(goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9") -(goog-define OPENSEA_API_KEY "") - -(def mainnet-rpc-url (str "https://eth-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN)) -(def goerli-rpc-url (str "https://goerli-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN)) -(def opensea-api-key OPENSEA_API_KEY) -(def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1"))) -(def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED))) -(def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0"))) -(def cached-webviews-enabled? (enabled? (get-config :CACHED_WEBVIEWS_ENABLED 0))) -(def snoopy-enabled? (enabled? (get-config :SNOOPY 0))) -(def dev-build? (enabled? (get-config :DEV_BUILD 0))) -(def max-message-delivery-attempts (js/parseInt (get-config :MAX_MESSAGE_DELIVERY_ATTEMPTS "6"))) -(def max-images-batch (js/parseInt (get-config :MAX_IMAGES_BATCH "1"))) -;; NOTE: only disabled in releases -(def local-notifications? (enabled? (get-config :LOCAL_NOTIFICATIONS "1"))) -(def blank-preview? (enabled? (get-config :BLANK_PREVIEW "1"))) -(def group-chat-enabled? (enabled? (get-config :GROUP_CHATS_ENABLED "0"))) -(def tooltip-events? (enabled? (get-config :TOOLTIP_EVENTS "0"))) -(def commands-enabled? (enabled? (get-config :COMMANDS_ENABLED "0"))) -(def keycard-test-menu-enabled? (enabled? (get-config :KEYCARD_TEST_MENU "1"))) -(def qr-test-menu-enabled? (enabled? (get-config :QR_READ_TEST_MENU "0"))) -(def quo-preview-enabled? (enabled? (get-config :ENABLE_QUO_PREVIEW "0"))) -(def communities-enabled? (enabled? (get-config :COMMUNITIES_ENABLED "0"))) -(def database-management-enabled? (enabled? (get-config :DATABASE_MANAGEMENT_ENABLED "0"))) -(def debug-webview? (enabled? (get-config :DEBUG_WEBVIEW "0"))) -(def delete-message-enabled? (enabled? (get-config :DELETE_MESSAGE_ENABLED "0"))) -(def collectibles-enabled? (enabled? (get-config :COLLECTIBLES_ENABLED "1"))) -(def test-stateofus? (enabled? (get-config :TEST_STATEOFUS "0"))) -(def two-minutes-syncing? (enabled? (get-config :TWO_MINUTES_SYNCING "0"))) -(def swap-enabled? (enabled? (get-config :SWAP_ENABLED "0"))) -(def stickers-test-enabled? (enabled? (get-config :STICKERS_TEST_ENABLED "0"))) - -;; CONFIG VALUES -(def log-level - (string/upper-case (get-config :LOG_LEVEL ""))) -(def fleet (get-config :FLEET "eth.staging")) -(def apn-topic (get-config :APN_TOPIC "im.status.ethereum")) -(def default-network (get-config :DEFAULT_NETWORK "goerli_rpc")) -(def max-installations 2) -; currently not supported in status-go -(def enable-remove-profile-picture? false) - -(def verify-transaction-chain-id (js/parseInt (get-config :VERIFY_TRANSACTION_CHAIN_ID "1"))) -(def verify-transaction-url - (if (= :mainnet (ethereum/chain-id->chain-keyword verify-transaction-chain-id)) - mainnet-rpc-url - goerli-rpc-url)) - -(def verify-ens-chain-id (js/parseInt (get-config :VERIFY_ENS_CHAIN_ID "1"))) -(def verify-ens-url - (if (= :mainnet (ethereum/chain-id->chain-keyword verify-ens-chain-id)) - mainnet-rpc-url - goerli-rpc-url)) -(def verify-ens-contract-address - (get-config :VERIFY_ENS_CONTRACT_ADDRESS - ((ethereum/chain-id->chain-keyword verify-ens-chain-id) ens/ens-registries))) - -(def default-multiaccount - {:preview-privacy? blank-preview? - :wallet/visible-tokens {:mainnet #{:SNT}} - :currency :usd - :appearance 0 - :profile-pictures-show-to 1 - :profile-pictures-visibility 1 - :log-level log-level - :webview-allow-permission-requests? false - :opensea-enabled? false - :link-previews-enabled-sites #{} - :link-preview-request-enabled true}) - -(defn default-visible-tokens - [chain] - (get-in default-multiaccount [:wallet/visible-tokens chain])) - -(def mainnet-networks - [{:id "mainnet_rpc" - :chain-explorer-link "https://etherscan.io/address/" - :name "Mainnet with upstream RPC" - :config {:NetworkId (ethereum/chain-keyword->chain-id :mainnet) - :DataDir "/ethereum/mainnet_rpc" - :UpstreamConfig {:Enabled true - :URL mainnet-rpc-url}}}]) - -(def sidechain-networks - [{:id "xdai_rpc" - :name "xDai Chain" - :chain-explorer-link "https://blockscout.com/xdai/mainnet/address/" - :config {:NetworkId (ethereum/chain-keyword->chain-id :xdai) - :DataDir "/ethereum/xdai_rpc" - :UpstreamConfig {:Enabled true - :URL "https://gnosischain-rpc.gateway.pokt.network"}}} - {:id "bsc_rpc" - :chain-explorer-link "https://bscscan.com/address/" - :name "BSC Network" - :config {:NetworkId (ethereum/chain-keyword->chain-id :bsc) - :DataDir "/ethereum/bsc_rpc" - :UpstreamConfig {:Enabled true - :URL "https://bsc-dataseed.binance.org"}}}]) - -(def testnet-networks - [{:id "goerli_rpc" - :chain-explorer-link "https://goerli.etherscan.io/address/" - :name "Goerli with upstream RPC" - :config {:NetworkId (ethereum/chain-keyword->chain-id :goerli) - :DataDir "/ethereum/goerli_rpc" - :UpstreamConfig {:Enabled true - :URL goerli-rpc-url}}} - {:id "bsc_testnet_rpc" - :chain-explorer-link "https://testnet.bscscan.com/address/" - :name "BSC testnet" - :config {:NetworkId (ethereum/chain-keyword->chain-id :bsc-testnet) - :DataDir "/ethereum/bsc_testnet_rpc" - :UpstreamConfig {:Enabled true - :URL "https://data-seed-prebsc-1-s1.binance.org:8545/"}}}]) - -(def default-networks - (concat testnet-networks mainnet-networks sidechain-networks)) - -(def default-networks-by-id - (into {} - (map (fn [{:keys [id] :as network}] - [id network]) - default-networks))) - -(def default-wallet-connect-metadata - {:name "Status Wallet" - :description - "Status is a secure messaging app, crypto wallet, and Web3 browser built with state of the art technology." - :url "#" - :icons ["https://statusnetwork.com/img/press-kit-status-logo.svg"]}) - -(def wallet-connect-project-id "87815d72a81d739d2a7ce15c2cfdefb3") - -;; NOTE moved to status-im2.common.constants -(def delete-message-undo-time-limit-ms 4000) -(def delete-message-for-me-undo-time-limit-ms 4000) - -;; NOTE for development only should be removed in status 2.0 -(def new-ui-enabled? true) - -(def waku-nodes-config - {:status.prod ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"] - :status.test ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.nodes.status.im"] - :wakuv2.prod - ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.waku.nodes.status.im"] - :wakuv2.test - ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.waku.nodes.status.im"]}) diff --git a/src/status_im/utils/js_resources.cljs b/src/status_im/utils/js_resources.cljs index 23ba33e457..fe41428640 100644 --- a/src/status_im/utils/js_resources.cljs +++ b/src/status_im/utils/js_resources.cljs @@ -1,6 +1,6 @@ (ns status-im.utils.js-resources (:require-macros [status-im.utils.slurp :refer [slurp]]) - (:require [status-im.utils.config :as config])) + (:require [status-im2.config :as config])) (def provider-file (slurp "resources/js/provider.js")) (defn ethereum-provider diff --git a/src/status_im/utils/snoopy.cljs b/src/status_im/utils/snoopy.cljs index 37d1fe43fd..2569d2b157 100644 --- a/src/status_im/utils/snoopy.cljs +++ b/src/status_im/utils/snoopy.cljs @@ -5,7 +5,7 @@ ["rn-snoopy/stream/buffer" :default buffer] ["rn-snoopy/stream/filter" :default sn-filter] [clojure.string :as string] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (defn create-filter [f] diff --git a/src/status_im/utils/universal_links/core.cljs b/src/status_im/utils/universal_links/core.cljs index 95dbd4f4e1..5e51764b2b 100644 --- a/src/status_im/utils/universal_links/core.cljs +++ b/src/status_im/utils/universal_links/core.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [status-im.add-new.db :as new-chat.db] [status-im.chat.models :as chat] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.group-chats.core :as group-chats] [utils.i18n :as i18n] diff --git a/src/status_im/utils/universal_links/utils.cljs b/src/status_im/utils/universal_links/utils.cljs index 38537688c3..5e5570db51 100644 --- a/src/status_im/utils/universal_links/utils.cljs +++ b/src/status_im/utils/universal_links/utils.cljs @@ -1,6 +1,6 @@ (ns status-im.utils.universal-links.utils (:require [goog.string :as gstring] - [status-im.constants :as constants])) + [status-im2.constants :as constants])) ;; domains should be without the trailing slash (def domains diff --git a/src/status_im/utils/wallet_connect.cljs b/src/status_im/utils/wallet_connect.cljs index 96dcd6722c..419154c3fd 100644 --- a/src/status_im/utils/wallet_connect.cljs +++ b/src/status_im/utils/wallet_connect.cljs @@ -2,7 +2,7 @@ (:require ["@react-native-async-storage/async-storage" :default AsyncStorage] ["@walletconnect/client" :refer [CLIENT_EVENTS] :default WalletConnectClient] [clojure.string :as string] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (defn init [on-success on-error] diff --git a/src/status_im/utils/wallet_connect_legacy.cljs b/src/status_im/utils/wallet_connect_legacy.cljs index b3acdf7647..b21cadf5e1 100644 --- a/src/status_im/utils/wallet_connect_legacy.cljs +++ b/src/status_im/utils/wallet_connect_legacy.cljs @@ -1,6 +1,6 @@ (ns status-im.utils.wallet-connect-legacy (:require ["@walletconnect/client-legacy" :default WalletConnect] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (defn create-connector [uri] diff --git a/src/status_im/visibility_status_updates/core.cljs b/src/status_im/visibility_status_updates/core.cljs index 7d116006f7..c44f0f7d77 100644 --- a/src/status_im/visibility_status_updates/core.cljs +++ b/src/status_im/visibility_status_updates/core.cljs @@ -1,5 +1,5 @@ (ns status-im.visibility-status-updates.core - (:require [status-im.constants :as constants] + (:require [status-im2.constants :as constants] [status-im.data-store.visibility-status-updates :as visibility-status-updates-store] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.ui.screens.profile.visibility-status.utils :as utils] diff --git a/src/status_im/wallet/accounts/core.cljs b/src/status_im/wallet/accounts/core.cljs index 1b090743fe..50cb4766e6 100644 --- a/src/status_im/wallet/accounts/core.cljs +++ b/src/status_im/wallet/accounts/core.cljs @@ -3,7 +3,7 @@ [clojure.string :as string] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ens.core :as ens.core] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] diff --git a/src/status_im/wallet/core.cljs b/src/status_im/wallet/core.cljs index 296377f35c..0353661bee 100644 --- a/src/status_im/wallet/core.cljs +++ b/src/status_im/wallet/core.cljs @@ -17,7 +17,7 @@ [status-im.qr-scanner.core :as qr-scaner] [status-im.signing.eip1559 :as eip1559] [status-im.signing.gas :as signing.gas] - [status-im.utils.config :as config] + [status-im2.config :as config] [status-im.utils.core :as utils.core] [utils.re-frame :as rf] [utils.datetime :as datetime] diff --git a/src/status_im/wallet_connect/core.cljs b/src/status_im/wallet_connect/core.cljs index 66a40133b2..5b20f6be2e 100644 --- a/src/status_im/wallet_connect/core.cljs +++ b/src/status_im/wallet_connect/core.cljs @@ -2,10 +2,10 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [status-im.browser.core :as browser] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.signing.core :as signing] - [status-im.utils.config :as config] + [status-im2.config :as config] [utils.re-frame :as rf] [status-im.utils.types :as types] [status-im.utils.wallet-connect :as wallet-connect] diff --git a/src/status_im/wallet_connect_legacy/core.cljs b/src/status_im/wallet_connect_legacy/core.cljs index bdaf453b49..09bb708b1e 100644 --- a/src/status_im/wallet_connect_legacy/core.cljs +++ b/src/status_im/wallet_connect_legacy/core.cljs @@ -1,7 +1,7 @@ (ns status-im.wallet-connect-legacy.core (:require [re-frame.core :as re-frame] [status-im.browser.core :as browser] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.signing.core :as signing] [utils.re-frame :as rf] diff --git a/src/status_im2/common/constants.cljs b/src/status_im2/common/constants.cljs deleted file mode 100644 index 2b7bbf2f0d..0000000000 --- a/src/status_im2/common/constants.cljs +++ /dev/null @@ -1,238 +0,0 @@ -(ns status-im2.common.constants) - -(def ^:const ms-in-bg-for-require-bioauth 5000) - -(def ^:const content-type-text 1) -(def ^:const content-type-sticker 2) -(def ^:const content-type-status 3) -(def ^:const content-type-emoji 4) -(def ^:const content-type-command 5) -(def ^:const content-type-system-text 6) -(def ^:const content-type-image 7) -(def ^:const content-type-audio 8) -(def ^:const content-type-community 9) -(def ^:const content-type-gap 10) -(def ^:const content-type-contact-request 11) ;; TODO: temp, will be removed -(def ^:const content-type-gif 12) -(def ^:const content-type-link 13) -(def ^:const content-type-album 14) - -(def ^:const contact-request-state-none 0) -(def ^:const contact-request-state-mutual 1) -(def ^:const contact-request-state-sent 2) -(def ^:const contact-request-state-received 3) -(def ^:const contact-request-state-dismissed 4) - -(def ^:const contact-verification-status-unknown 0) -(def ^:const contact-verification-status-pending 1) -(def ^:const contact-verification-status-accepted 2) -(def ^:const contact-verification-status-declined 3) -(def ^:const contact-verification-status-cancelled 4) -(def ^:const contact-verification-status-trusted 5) -(def ^:const contact-verification-status-untrustworthy 6) - -(def ^:const activity-center-membership-status-idle 0) -(def ^:const activity-center-membership-status-pending 1) -(def ^:const activity-center-membership-status-accepted 2) -(def ^:const activity-center-membership-status-declined 3) - -(def ^:const emoji-reaction-love 1) -(def ^:const emoji-reaction-thumbs-up 2) -(def ^:const emoji-reaction-thumbs-down 3) -(def ^:const emoji-reaction-laugh 4) -(def ^:const emoji-reaction-sad 5) -(def ^:const emoji-reaction-angry 6) - -(def ^:const one-to-one-chat-type 1) -(def ^:const public-chat-type 2) -(def ^:const private-group-chat-type 3) -(def ^:const profile-chat-type 4) -(def ^:const timeline-chat-type 5) -(def ^:const community-chat-type 6) - -(def ^:const contact-request-message-state-none 0) -(def ^:const contact-request-message-state-pending 1) -(def ^:const contact-request-message-state-accepted 2) -(def ^:const contact-request-message-state-declined 3) - -(def request-to-join-pending-state 1) - -(def reactions - {emoji-reaction-love :i/love - emoji-reaction-thumbs-up :i/thumbs-up - emoji-reaction-thumbs-down :i/thumbs-down - emoji-reaction-laugh :i/laugh - emoji-reaction-sad :i/sad - emoji-reaction-angry :i/angry}) - -(def ^:const invitation-state-unknown 0) -(def ^:const invitation-state-requested 1) -(def ^:const invitation-state-rejected 2) -(def ^:const invitation-state-approved 3) -(def ^:const invitation-state-granted 4) -(def ^:const invitation-state-removed 5) - -(def ^:const message-type-one-to-one 1) -(def ^:const message-type-public-group 2) -(def ^:const message-type-private-group 3) -(def ^:const message-type-private-group-system-message 4) -(def ^:const message-type-community-chat 5) -(def ^:const message-type-gap 6) - -(def ^:const command-state-request-address-for-transaction 1) -(def ^:const command-state-request-address-for-transaction-declined 2) -(def ^:const command-state-request-address-for-transaction-accepted 3) -(def ^:const command-state-request-transaction 4) -(def ^:const command-state-request-transaction-declined 5) -(def ^:const command-state-transaction-pending 6) -(def ^:const command-state-transaction-sent 7) - -(def ^:const profile-pictures-show-to-contacts-only 1) -(def ^:const profile-pictures-show-to-everyone 2) -(def ^:const profile-pictures-show-to-none 3) - -(def ^:const profile-pictures-visibility-contacts-only 1) -(def ^:const profile-pictures-visibility-everyone 2) -(def ^:const profile-pictures-visibility-none 3) - -(def ^:const min-password-length 6) -(def ^:const max-group-chat-participants 20) -(def ^:const default-number-of-messages 20) -(def ^:const default-number-of-pin-messages 3) - -(def ^:const mailserver-password "status-offline-inbox") - -(def ^:const send-transaction-failed-parse-response 1) -(def ^:const send-transaction-failed-parse-params 2) -(def ^:const send-transaction-no-account-selected 3) -(def ^:const send-transaction-invalid-tx-sender 4) -(def ^:const send-transaction-err-decrypt 5) - -(def ^:const web3-send-transaction "eth_sendTransaction") -(def ^:const web3-personal-sign "personal_sign") -(def ^:const web3-eth-sign "eth_sign") -(def ^:const web3-sign-typed-data "eth_signTypedData") -(def ^:const web3-sign-typed-data-v3 "eth_signTypedData_v3") -(def ^:const web3-sign-typed-data-v4 "eth_signTypedData_v4") - -(def ^:const web3-keycard-sign-typed-data "keycard_signTypedData") - -(def ^:const status-create-address "status_createaddress") - -(def ^:const community-no-membership-access 1) -(def ^:const community-invitation-only-access 2) -(def ^:const community-on-request-access 3) - -;; Community rules for joining -(def ^:const community-rule-ens-only "ens-only") - -(def ^:const community-channel-access-no-membership 1) -(def ^:const community-channel-access-invitation-only 2) -(def ^:const community-channel-access-on-request 3) - -; BIP44 Wallet Root Key, the extended key from which any wallet can be derived -(def ^:const path-wallet-root "m/44'/60'/0'/0") -; EIP1581 Root Key, the extended key from which any whisper key/encryption key can be derived -(def ^:const path-eip1581 "m/43'/60'/1581'") -; BIP44-0 Wallet key, the default wallet key -(def ^:const path-default-wallet (str path-wallet-root "/0")) -; EIP1581 Chat Key 0, the default whisper key -(def ^:const path-whisper (str path-eip1581 "/0'/0")) - -(def ^:const path-default-wallet-keyword (keyword path-default-wallet)) -(def ^:const path-whisper-keyword (keyword path-whisper)) -(def ^:const path-wallet-root-keyword (keyword path-wallet-root)) -(def ^:const path-eip1581-keyword (keyword path-eip1581)) - -(def ^:const method-id-transfer "0xa9059cbb") -(def ^:const method-id-approve "0x095ea7b3") -(def ^:const method-id-approve-and-call "0xcae9ca51") - -(def regx-emoji - #"^((?:[\u261D\u26F9\u270A-\u270D]|\uD83C[\uDF85\uDFC2-\uDFC4\uDFC7\uDFCA-\uDFCC]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66-\uDC69\uDC6E\uDC70-\uDC78\uDC7C\uDC81-\uDC83\uDC85-\uDC87\uDCAA\uDD74\uDD75\uDD7A\uDD90\uDD95\uDD96\uDE45-\uDE47\uDE4B-\uDE4F\uDEA3\uDEB4-\uDEB6\uDEC0\uDECC]|\uD83E[\uDD18-\uDD1C\uDD1E\uDD1F\uDD26\uDD30-\uDD39\uDD3D\uDD3E\uDDD1-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])?|(?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDEEB\uDEEC\uDEF4-\uDEF8]|\uD83E[\uDD10-\uDD3A\uDD3C-\uDD3E\uDD40-\uDD45\uDD47-\uDD4C\uDD50-\uDD6B\uDD80-\uDD97\uDDC0\uDDD0-\uDDE6])|(?:[#\*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267B\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEF8]|\uD83E[\uDD10-\uDD3A\uDD3C-\uDD3E\uDD40-\uDD45\uDD47-\uDD4C\uDD50-\uDD6B\uDD80-\uDD97\uDDC0\uDDD0-\uDDE6])\uFE0F|[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF])+$") -(def regx-bold #"\*[^*]+\*") -(def regx-italic #"~[^~]+~") -(def regx-backquote #"`[^`]+`") -(def regx-universal-link #"((^https?://join.status.im/)|(^status-im://))[\x00-\x7F]+$") -(def regx-community-universal-link #"((^https?://join.status.im/)|(^status-im://))c/([\x00-\x7F]+)$") -(def regx-deep-link #"((^ethereum:.*)|(^status-im://[\x00-\x7F]+$))") - -(def ^:const dapp-permission-contact-code "contact-code") -(def ^:const dapp-permission-web3 "web3") -(def ^:const dapp-permission-qr-code "qr-code") -(def ^:const api-response "api-response") -(def ^:const api-request "api-request") -(def ^:const history-state-changed "history-state-changed") -(def ^:const web3-send-async-read-only "web3-send-async-read-only") -(def ^:const web3-send-async-callback "web3-send-async-callback") -(def ^:const scan-qr-code "scan-qr-code") - -(def ^:const faq "https://status.im/faq/") -(def ^:const faq-keycard (str faq "#keycard")) -(def ^:const keycard-integration-link "https://status.im/keycard-integration") - -(def ^:const status-community-id "0x039b2da47552aa117a96ea8f1d4d108ba66637c7517a3c94a57b99dbb8a002eda2") - -(def ^:const timeline-chat-id - "@timeline70bd746ddcc12beb96b2c9d572d0784ab137ffc774f5383e50585a932080b57cca0484b259e61cecbaa33a4c98a300a") - -(def ^:const two-mins (* 2 60)) -(def ^:const one-day (* 60 60 24)) -(def ^:const three-days (* one-day 3)) -(def ^:const one-week (* one-day 7)) -(def ^:const one-month (* one-day 31)) - -(def ^:const privacy-policy-link "https://status.im/privacy-policy/") -(def ^:const terms-of-service-link "https://status.im/terms-of-use") -(def ^:const docs-link "https://status.im/docs/") -(def ^:const principles-link "https://our.status.im/our-principles/") - -(def ^:const visibility-status-unknown 0) -(def ^:const visibility-status-automatic 1) -(def ^:const visibility-status-dnd 2) -(def ^:const visibility-status-always-online 3) -(def ^:const visibility-status-inactive 4) - -(def ^:const wallet-connect-version-1 1) -(def ^:const wallet-connect-version-2 2) - -(def ^:const sticker-pack-status-installed 1) -(def ^:const sticker-pack-status-pending 2) -(def ^:const sticker-pack-status-owned 3) - -(def ^:const community-member-role-all 1) -(def ^:const community-member-role-manage-users 2) -(def ^:const community-member-role-moderator 3) - -(def ^:const delete-message-undo-time-limit-ms 4000) -(def ^:const delete-message-for-me-undo-time-limit-ms 4000) - -(def ^:const album-image-sizes - {4 {0 146 - 1 146 - 2 146 - 3 146} - 5 {0 146 - 1 146 - 2 97 - 3 97 - 4 97} - :default {0 146 - 1 146 - 2 72.5 - 3 72.5 - 4 72.5 - 5 72.5}}) - -(def ^:const spam-message-frequency-threshold 4) -(def ^:const spam-interval-ms 1000) -(def ^:const default-cooldown-period-ms 10000) -(def ^:const cooldown-reset-threshold 3) -(def ^:const cooldown-periods-ms - {1 2000 - 2 5000 - 3 10000}) - -(def ^:const max-text-size 4096) -;; any message that comes after this amount of ms will be grouped separately -(def ^:const group-ms 300000) diff --git a/src/status_im2/common/home/actions/view.cljs b/src/status_im2/common/home/actions/view.cljs index 9cb01664ea..c576988e7b 100644 --- a/src/status_im2/common/home/actions/view.cljs +++ b/src/status_im2/common/home/actions/view.cljs @@ -4,7 +4,7 @@ [status-im.chat.models :as chat.models] [status-im2.common.confirmation-drawer.view :as confirmation-drawer] ;;TODO move to ;;status-im2 - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [utils.re-frame :as rf])) (defn- entry diff --git a/src/status_im2/setup/config.cljs b/src/status_im2/config.cljs similarity index 92% rename from src/status_im2/setup/config.cljs rename to src/status_im2/config.cljs index 85b5996727..b02538417c 100644 --- a/src/status_im2/setup/config.cljs +++ b/src/status_im2/config.cljs @@ -1,4 +1,4 @@ -(ns status-im2.setup.config +(ns status-im2.config (:require [clojure.string :as string] [react-native.config :as react-native-config] [status-im.ethereum.core :as ethereum] @@ -145,6 +145,13 @@ ;;TODO for development only should be removed in status 2.0 (def new-ui-enabled? true) -;; TODO: Remove this (highly) temporary flag once the new Activity Center is -;; usable enough to replace the old one **in the new UI**. -(def new-activity-center-enabled? true) +(def delete-message-undo-time-limit-ms 4000) +(def delete-message-for-me-undo-time-limit-ms 4000) + +(def waku-nodes-config + {:status.prod ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"] + :status.test ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.nodes.status.im"] + :wakuv2.prod + ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.waku.nodes.status.im"] + :wakuv2.test + ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.waku.nodes.status.im"]}) diff --git a/src/status_im/constants.cljs b/src/status_im2/constants.cljs similarity index 90% rename from src/status_im/constants.cljs rename to src/status_im2/constants.cljs index a08a5f756f..fa84220450 100644 --- a/src/status_im/constants.cljs +++ b/src/status_im2/constants.cljs @@ -1,5 +1,4 @@ -(ns status-im.constants - (:require [status-im.react-native.resources :as resources])) +(ns status-im2.constants) (def ^:const ms-in-bg-for-require-bioauth 5000) @@ -14,6 +13,9 @@ (def ^:const content-type-community 9) (def ^:const content-type-gap 10) (def ^:const content-type-contact-request 11) ;; TODO: temp, will be removed +(def ^:const content-type-gif 12) +(def ^:const content-type-link 13) +(def ^:const content-type-album 14) (def ^:const contact-request-state-none 0) (def ^:const contact-request-state-mutual 1) @@ -29,6 +31,11 @@ (def ^:const contact-verification-status-trusted 5) (def ^:const contact-verification-status-untrustworthy 6) +(def ^:const activity-center-membership-status-idle 0) +(def ^:const activity-center-membership-status-pending 1) +(def ^:const activity-center-membership-status-accepted 2) +(def ^:const activity-center-membership-status-declined 3) + (def ^:const emoji-reaction-love 1) (def ^:const emoji-reaction-thumbs-up 2) (def ^:const emoji-reaction-thumbs-down 3) @@ -50,14 +57,6 @@ (def request-to-join-pending-state 1) -(def reactions-old - {emoji-reaction-love (:love resources/reactions-old) - emoji-reaction-thumbs-up (:thumbs-up resources/reactions-old) - emoji-reaction-thumbs-down (:thumbs-down resources/reactions-old) - emoji-reaction-laugh (:laugh resources/reactions-old) - emoji-reaction-sad (:sad resources/reactions-old) - emoji-reaction-angry (:angry resources/reactions-old)}) - (def reactions {emoji-reaction-love :i/love emoji-reaction-thumbs-up :i/thumbs-up @@ -205,6 +204,39 @@ (def ^:const community-member-role-manage-users 2) (def ^:const community-member-role-moderator 3) +(def ^:const delete-message-undo-time-limit-ms 4000) +(def ^:const delete-message-for-me-undo-time-limit-ms 4000) + +(def ^:const album-image-sizes + {4 {0 146 + 1 146 + 2 146 + 3 146} + 5 {0 146 + 1 146 + 2 97 + 3 97 + 4 97} + :default {0 146 + 1 146 + 2 72.5 + 3 72.5 + 4 72.5 + 5 72.5}}) + +(def ^:const spam-message-frequency-threshold 4) +(def ^:const spam-interval-ms 1000) +(def ^:const default-cooldown-period-ms 10000) +(def ^:const cooldown-reset-threshold 3) +(def ^:const cooldown-periods-ms + {1 2000 + 2 5000 + 3 10000}) + +(def ^:const max-text-size 4096) +;; any message that comes after this amount of ms will be grouped separately +(def ^:const group-ms 300000) + (def ^:const local-pairing-connection-string-identifier "If any string begins with cs we know its a connection string. This is useful when we read QR codes we know it is a connection string if it begins with this identifier. diff --git a/src/status_im2/contexts/activity_center/events_test.cljs b/src/status_im2/contexts/activity_center/events_test.cljs index 6e6e209521..b1738ed6da 100644 --- a/src/status_im2/contexts/activity_center/events_test.cljs +++ b/src/status_im2/contexts/activity_center/events_test.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.activity-center.events-test (:require [cljs.test :refer [deftest is testing]] - [status-im.constants :as constants] + [status-im2.constants :as constants] status-im.events [test-helpers.unit :as h] [status-im2.contexts.activity-center.events :as activity-center] diff --git a/src/status_im2/contexts/activity_center/notification/admin/view.cljs b/src/status_im2/contexts/activity_center/notification/admin/view.cljs index d6a05afb8b..89b955c273 100644 --- a/src/status_im2/contexts/activity_center/notification/admin/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/admin/view.cljs @@ -2,7 +2,7 @@ (:require [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.contexts.activity-center.notification.common.style :as style] [status-im2.contexts.activity-center.notification.common.view :as common] [utils.datetime :as datetime] diff --git a/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs b/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs index 86d01f7195..21312d5789 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs @@ -2,7 +2,7 @@ (:require [utils.i18n :as i18n] [quo2.core :as quo] [react-native.core :as rn] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.datetime :as datetime] [status-im2.contexts.activity-center.notification.common.view :as common] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs b/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs index 8392a09b36..c4b2865c64 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [utils.i18n :as i18n] [quo2.core :as quo] - [status-im.constants :as constants] + [status-im2.constants :as constants] [utils.datetime :as datetime] [status-im2.contexts.activity-center.notification.common.view :as common] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/activity_center/notification/reply/view.cljs b/src/status_im2/contexts/activity_center/notification/reply/view.cljs index 582bdc44ed..39d595ecaf 100644 --- a/src/status_im2/contexts/activity_center/notification/reply/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/reply/view.cljs @@ -4,7 +4,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [status-im.ui2.screens.chat.messages.message :as old-message] - [status-im2.common.constants :as constants] + [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] [utils.datetime :as datetime] diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs index fe48f05821..7feb5a81d4 100644 --- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs +++ b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs @@ -4,7 +4,7 @@ [utils.re-frame :as rf] [quo2.core :as quo] [quo2.components.drawers.permission-context.view :as permission-context] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (defn view [contact-id contact-request-state] diff --git a/src/status_im2/contexts/chat/messages/content/album/view.cljs b/src/status_im2/contexts/chat/messages/content/album/view.cljs index 6a0e2b43f9..a0f3697b03 100644 --- a/src/status_im2/contexts/chat/messages/content/album/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/album/view.cljs @@ -4,7 +4,7 @@ [react-native.core :as rn] [react-native.fast-image :as fast-image] [status-im2.contexts.chat.messages.content.album.style :as style] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (def max-display-count 6) diff --git a/src/status_im2/contexts/chat/messages/content/reactions/view.cljs b/src/status_im2/contexts/chat/messages/content/reactions/view.cljs index a5c7b52115..931472c713 100644 --- a/src/status_im2/contexts/chat/messages/content/reactions/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/reactions/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.chat.messages.content.reactions.view - (:require [status-im2.common.constants :as constants] + (:require [status-im2.constants :as constants] [quo2.core :as quo] [react-native.core :as rn] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/chat/messages/content/view.cljs b/src/status_im2/contexts/chat/messages/content/view.cljs index d7e83b6abe..5f5e15b2d3 100644 --- a/src/status_im2/contexts/chat/messages/content/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/view.cljs @@ -3,7 +3,7 @@ [quo2.foundations.colors :as colors] [status-im2.contexts.chat.messages.content.style :as style] [status-im2.contexts.chat.messages.content.pin.view :as pin] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.contexts.chat.messages.content.unknown.view :as content.unknown] [status-im2.contexts.chat.messages.content.text.view :as content.text] [status-im2.contexts.chat.messages.drawers.view :as drawers] diff --git a/src/status_im2/contexts/chat/messages/drawers/view.cljs b/src/status_im2/contexts/chat/messages/drawers/view.cljs index 1d77f9bc7a..8c52379669 100644 --- a/src/status_im2/contexts/chat/messages/drawers/view.cljs +++ b/src/status_im2/contexts/chat/messages/drawers/view.cljs @@ -1,10 +1,10 @@ (ns status-im2.contexts.chat.messages.drawers.view (:require [react-native.core :as rn] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [utils.re-frame :as rf] [quo2.core :as quo] [utils.i18n :as i18n] - [status-im2.setup.config :as config] + [status-im2.config :as config] [status-im.ui.components.react :as react] [status-im.ui2.screens.chat.components.reply.view :as components.reply] [status-im2.common.not-implemented :as not-implemented])) diff --git a/src/status_im2/contexts/chat/messages/list/events.cljs b/src/status_im2/contexts/chat/messages/list/events.cljs index 30880867c8..b583496521 100644 --- a/src/status_im2/contexts/chat/messages/list/events.cljs +++ b/src/status_im2/contexts/chat/messages/list/events.cljs @@ -2,7 +2,7 @@ (:require [utils.red-black-tree :as red-black-tree] [utils.datetime :as datetime] [utils.re-frame :as rf] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (defn- add-datemark [{:keys [whisper-timestamp] :as msg}] diff --git a/src/status_im2/contexts/chat/messages/list/view.cljs b/src/status_im2/contexts/chat/messages/list/view.cljs index fb294ef127..24ab630e24 100644 --- a/src/status_im2/contexts/chat/messages/list/view.cljs +++ b/src/status_im2/contexts/chat/messages/list/view.cljs @@ -8,7 +8,7 @@ [reagent.core :as reagent] [utils.re-frame :as rf] [status-im2.contexts.chat.messages.content.view :as message] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.contexts.chat.messages.content.deleted.view :as content.deleted] [status-im2.common.not-implemented :as not-implemented] [status-im.ui.screens.chat.group :as chat.group] diff --git a/src/status_im2/contexts/chat/messages/pin/events.cljs b/src/status_im2/contexts/chat/messages/pin/events.cljs index 08663b9d0e..f060813476 100644 --- a/src/status_im2/contexts/chat/messages/pin/events.cljs +++ b/src/status_im2/contexts/chat/messages/pin/events.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.chat.messages.pin.events (:require [re-frame.core :as re-frame] [status-im2.contexts.chat.messages.list.events :as message-list] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.data-store.pin-messages :as data-store.pin-messages] [status-im.transport.message.protocol :as protocol] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/chat/messages/view.cljs b/src/status_im2/contexts/chat/messages/view.cljs index 25652465a7..dc695b3508 100644 --- a/src/status_im2/contexts/chat/messages/view.cljs +++ b/src/status_im2/contexts/chat/messages/view.cljs @@ -5,7 +5,7 @@ [react-native.safe-area :as safe-area] [reagent.core :as reagent] [status-im2.contexts.chat.messages.composer.view :as composer] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.contexts.chat.messages.list.view :as messages.list] [status-im2.contexts.chat.messages.contact-requests.bottom-drawer :as contact-requests.bottom-drawer] diff --git a/src/status_im2/contexts/communities/overview/view.cljs b/src/status_im2/contexts/communities/overview/view.cljs index b8513e6a1b..d7251501b9 100644 --- a/src/status_im2/contexts/communities/overview/view.cljs +++ b/src/status_im2/contexts/communities/overview/view.cljs @@ -7,7 +7,7 @@ [react-native.blur :as blur] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.common.scroll-page.view :as scroll-page] [status-im2.contexts.communities.overview.style :as style] [status-im2.contexts.communities.menus.community-options.view :as options] diff --git a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs index 6e2980e43b..159ad9b84b 100644 --- a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs +++ b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs @@ -6,7 +6,7 @@ [reagent.core :as reagent] [utils.i18n :as i18n] [status-im.react-native.resources :as resources] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.contexts.quo-preview.preview :as preview])) (def community-data diff --git a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs index 2bff3c7ce8..d67752c9a0 100644 --- a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs +++ b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs @@ -2,7 +2,7 @@ (:require [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im.react-native.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview] [status-im2.contexts.shell.cards.view :as switcher-cards] diff --git a/src/status_im2/contexts/shell/cards/view.cljs b/src/status_im2/contexts/shell/cards/view.cljs index 403928fc13..17d5b54844 100644 --- a/src/status_im2/contexts/shell/cards/view.cljs +++ b/src/status_im2/contexts/shell/cards/view.cljs @@ -5,7 +5,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.contexts.shell.cards.style :as style] [status-im2.contexts.shell.constants :as shell.constants])) diff --git a/src/status_im2/contexts/shell/events.cljs b/src/status_im2/contexts/shell/events.cljs index 32c2805938..bf975929a2 100644 --- a/src/status_im2/contexts/shell/events.cljs +++ b/src/status_im2/contexts/shell/events.cljs @@ -2,7 +2,7 @@ (:require [utils.re-frame :as rf] [re-frame.core :as re-frame] [status-im.utils.core :as utils] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im2.navigation.events :as navigation] [status-im2.contexts.shell.animation :as animation] [status-im2.contexts.shell.constants :as shell.constants] diff --git a/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs b/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs index 4d89470f8e..c8d5ccc0e3 100644 --- a/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs +++ b/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs @@ -5,7 +5,7 @@ [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] - [status-im.constants :as constants] + [status-im2.constants :as constants] [status-im.ui.components.qr-code-viewer.views :as qr-code-viewer] [utils.re-frame :as rf])) diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs index 76d501a786..5a8d69f139 100644 --- a/src/status_im2/navigation/screens.cljs +++ b/src/status_im2/navigation/screens.cljs @@ -8,7 +8,7 @@ [status-im2.contexts.quo-preview.main :as quo.preview] [status-im2.contexts.shell.view :as shell] [status-im2.contexts.syncing.view :as settings-syncing] - [status-im2.setup.config :as config])) + [status-im2.config :as config])) (def components []) diff --git a/src/status_im2/navigation/view.cljs b/src/status_im2/navigation/view.cljs index 93175c6be4..a85a2ce4a3 100644 --- a/src/status_im2/navigation/view.cljs +++ b/src/status_im2/navigation/view.cljs @@ -13,7 +13,7 @@ [status-im.ui.screens.wallet.send.views :as wallet.send.views] [status-im2.common.toasts.view :as toasts] [status-im2.navigation.screens :as screens] - [status-im2.setup.config :as config] + [status-im2.config :as config] [status-im2.setup.hot-reload :as reloader])) (defn get-screens diff --git a/src/status_im2/setup/core.cljs b/src/status_im2/setup/core.cljs index b8646fd58b..2e15ac808b 100644 --- a/src/status_im2/setup/core.cljs +++ b/src/status_im2/setup/core.cljs @@ -17,7 +17,7 @@ [status-im2.contexts.shell.animation :as animation] status-im2.contexts.syncing.events status-im2.navigation.core - [status-im2.setup.config :as config] + [status-im2.config :as config] [status-im2.setup.dev :as dev] status-im2.setup.events [status-im2.setup.global-error :as global-error] diff --git a/src/status_im2/setup/log.cljs b/src/status_im2/setup/log.cljs index 4fe5d1a3c2..bbd2b407b6 100644 --- a/src/status_im2/setup/log.cljs +++ b/src/status_im2/setup/log.cljs @@ -1,7 +1,7 @@ (ns status-im2.setup.log (:require [clojure.string :as string] [re-frame.core :as re-frame] - [status-im2.setup.config :as config] + [status-im2.config :as config] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/chat/chats.cljs b/src/status_im2/subs/chat/chats.cljs index 40ebd18a6b..fc39662241 100644 --- a/src/status_im2/subs/chat/chats.cljs +++ b/src/status_im2/subs/chat/chats.cljs @@ -10,9 +10,9 @@ [status-im.group-chats.db :as group-chats.db] [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] - [status-im.utils.config :as config] + [status-im2.config :as config] [status-im.utils.image-server :as image-server] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (re-frame/reg-sub :chats/chat diff --git a/src/status_im2/subs/chat/chats_test.cljs b/src/status_im2/subs/chat/chats_test.cljs index dab9835cbd..643730fe39 100644 --- a/src/status_im2/subs/chat/chats_test.cljs +++ b/src/status_im2/subs/chat/chats_test.cljs @@ -2,7 +2,7 @@ (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] [test-helpers.unit :as h] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [utils.re-frame :as rf])) (def public-key "0xpk") diff --git a/src/status_im2/subs/chat/messages.cljs b/src/status_im2/subs/chat/messages.cljs index e2b29b06e0..73b35e5b26 100644 --- a/src/status_im2/subs/chat/messages.cljs +++ b/src/status_im2/subs/chat/messages.cljs @@ -4,7 +4,7 @@ [status-im2.contexts.chat.messages.list.events :as models.message-list] [status-im.chat.models.reactions :as models.reactions] [utils.datetime :as datetime] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (re-frame/reg-sub :chats/chat-messages diff --git a/src/status_im2/subs/chat/messages_test.cljs b/src/status_im2/subs/chat/messages_test.cljs index 9e9ec8bd84..4d6b09735a 100644 --- a/src/status_im2/subs/chat/messages_test.cljs +++ b/src/status_im2/subs/chat/messages_test.cljs @@ -1,7 +1,7 @@ (ns status-im2.subs.chat.messages-test (:require [cljs.test :refer [deftest is testing]] [status-im2.subs.chat.messages :as messages] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (def messages-state [{:message-id "0x111" :album-id "abc" :albumize? true} diff --git a/src/status_im2/subs/communities.cljs b/src/status_im2/subs/communities.cljs index 75688660fd..5b2abf806f 100644 --- a/src/status_im2/subs/communities.cljs +++ b/src/status_im2/subs/communities.cljs @@ -3,7 +3,7 @@ [re-frame.core :as re-frame] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (re-frame/reg-sub :communities diff --git a/src/status_im2/subs/general.cljs b/src/status_im2/subs/general.cljs index 828b7292df..7f0b442250 100644 --- a/src/status_im2/subs/general.cljs +++ b/src/status_im2/subs/general.cljs @@ -5,7 +5,7 @@ [status-im.multiaccounts.model :as multiaccounts.model] [status-im.utils.build :as build] [status-im.utils.mobile-sync :as mobile-network-utils] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (re-frame/reg-sub :visibility-status-updates/visibility-status-update diff --git a/src/status_im2/subs/home.cljs b/src/status_im2/subs/home.cljs index 4123401610..1452d6f122 100644 --- a/src/status_im2/subs/home.cljs +++ b/src/status_im2/subs/home.cljs @@ -1,6 +1,6 @@ (ns status-im2.subs.home (:require [re-frame.core :as re-frame] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (def memo-home-items (atom nil)) diff --git a/src/status_im2/subs/networks.cljs b/src/status_im2/subs/networks.cljs index f27c02b7e2..9578d009bf 100644 --- a/src/status_im2/subs/networks.cljs +++ b/src/status_im2/subs/networks.cljs @@ -1,7 +1,7 @@ (ns status-im2.subs.networks (:require [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] - [status-im.utils.config :as config])) + [status-im2.config :as config])) (defn- filter-networks [network-type] diff --git a/src/status_im2/subs/onboarding.cljs b/src/status_im2/subs/onboarding.cljs index d374f24ec4..c57375ed86 100644 --- a/src/status_im2/subs/onboarding.cljs +++ b/src/status_im2/subs/onboarding.cljs @@ -1,7 +1,7 @@ (ns status-im2.subs.onboarding (:require [re-frame.core :as re-frame] [status-im.multiaccounts.recover.core :as recover] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (re-frame/reg-sub :intro-wizard diff --git a/src/status_im2/subs/shell.cljs b/src/status_im2/subs/shell.cljs index 78896fc5f9..ce3d2ff30c 100644 --- a/src/status_im2/subs/shell.cljs +++ b/src/status_im2/subs/shell.cljs @@ -1,7 +1,7 @@ (ns status-im2.subs.shell (:require [re-frame.core :as re-frame] [utils.datetime :as datetime] - [status-im2.common.constants :as constants] + [status-im2.constants :as constants] [status-im.react-native.resources :as resources])) (defn community-avatar diff --git a/src/status_im2/subs/stickers.cljs b/src/status_im2/subs/stickers.cljs index 6e4c18038e..b2baf8fc41 100644 --- a/src/status_im2/subs/stickers.cljs +++ b/src/status_im2/subs/stickers.cljs @@ -1,6 +1,6 @@ (ns status-im2.subs.stickers (:require [re-frame.core :as re-frame] - [status-im2.common.constants :as constants])) + [status-im2.constants :as constants])) (re-frame/reg-sub :stickers/installed-packs diff --git a/src/status_im2/subs/wallet/wallet.cljs b/src/status_im2/subs/wallet/wallet.cljs index b4c22f685a..ba4b090249 100644 --- a/src/status_im2/subs/wallet/wallet.cljs +++ b/src/status_im2/subs/wallet/wallet.cljs @@ -4,7 +4,7 @@ [status-im.ethereum.core :as ethereum] [status-im.ethereum.tokens :as tokens] [utils.i18n :as i18n] - [status-im.utils.config :as config] + [status-im2.config :as config] [status-im.utils.currency :as currency] [status-im.utils.money :as money]))