diff --git a/.carve_ignore b/.carve_ignore index 2ad267a697..4c31c0d303 100644 --- a/.carve_ignore +++ b/.carve_ignore @@ -1,7 +1,7 @@ legacy.status-im.utils.build/warning-handler legacy.status-im.utils.build/get-current-sha -status-im2.constants/spacing-char -status-im2.constants/arg-wrapping-char +status-im.constants/spacing-char +status-im.constants/arg-wrapping-char legacy.status-im.ios.core/init legacy.status-im.ui.components.camera/aspects legacy.status-im.ui.components.camera/capture-targets @@ -46,8 +46,8 @@ legacy.status-im.utils.handlers/logged-in legacy.status-im.multiaccounts.model/credentials legacy.status-im.multiaccounts.login.core/contract-fleet? legacy.status-im.multiaccounts.login.core/fetch-nodes -status-im2.config/rpc-networks-only? -status-im2.config/waku-enabled? +status-im.config/rpc-networks-only? +status-im.config/waku-enabled? legacy.status-im.utils.pairing/has-paired-installations? legacy.status-im.tribute-to-talk.core-test/user-cofx mocks.js-dependencies/action-button @@ -108,40 +108,40 @@ legacy.status-im.ethereum.ens/name-hash legacy.status-im.ethereum.ens/ABI-hash legacy.status-im.ethereum.ens/pubkey-hash legacy.status-im.network.core/get-network -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.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 legacy.status-im.multiaccounts.update.publisher/publish-update! legacy.status-im.utils.async/task-queue legacy.status-im.utils.async/async-periodic-run! diff --git a/Makefile b/Makefile index 0b9bdfe619..1b27dad2bb 100644 --- a/Makefile +++ b/Makefile @@ -327,7 +327,7 @@ lint-fix: ##@test Run code style checks and fix issues ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \ zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \ zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \ - clojure-lsp --ns-exclude-regex ".*/src/status_im2/core\.cljs$$" clean-ns && \ + clojure-lsp --ns-exclude-regex ".*/src/status_im/core\.cljs$$" clean-ns && \ sh scripts/lint/trailing-newline.sh --fix && \ node_modules/.bin/prettier --write . diff --git a/scripts/lint/require-i18n-resource-first.sh b/scripts/lint/require-i18n-resource-first.sh index 65c094c2d9..2b8ff885e8 100755 --- a/scripts/lint/require-i18n-resource-first.sh +++ b/scripts/lint/require-i18n-resource-first.sh @@ -1,9 +1,9 @@ #!/usr/bin/env sh -if rg --quiet --multiline '^\(ns.*\n^\s*\(:require\n(^\s*(;|#_).*\n)*(^\s*\[status-im2\.setup\.i18n-resources\W)' src/status_im2/core.cljs; then +if rg --quiet --multiline '^\(ns.*\n^\s*\(:require\n(^\s*(;|#_).*\n)*(^\s*\[status-im\.setup\.i18n-resources\W)' src/status_im/core.cljs; then exit 0 elif [ $? -eq 1 ]; then - echo "status-im2.setup.i18n-resources must be loaded first (be the first one in ns :require form) in status-im2.core" + echo "status-im.setup.i18n-resources must be loaded first (be the first one in ns :require form) in status-im.core" echo "For more info, check the comment here https://github.com/status-im/status-mobile/pull/17618#discussion_r1361275489" else exit $? diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 688e219f73..03e9d71823 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -44,29 +44,29 @@ {:target :react-native ;; To match the folder created by Nix build of JSBundle. :output-dir "result" - :init-fn status-im2.core/init + :init-fn status-im.core/init ;; When false, the Shadow-CLJS watcher won't automatically refresh ;; the target files (a.k.a hot reload). When false, you can manually ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`. :devtools {:autobuild #shadow/env ["SHADOW_AUTOBUILD_ENABLED" :default true :as :bool]} - :dev {:devtools {:before-load-async status-im2.setup.hot-reload/before-reload - :after-load-async status-im2.setup.hot-reload/reload - :build-notify status-im2.setup.hot-reload/build-notify + :dev {:devtools {:before-load-async status-im.setup.hot-reload/before-reload + :after-load-async status-im.setup.hot-reload/reload + :build-notify status-im.setup.hot-reload/build-notify :preloads [re-frisk-remote.preload - status-im2.setup.schema-preload + status-im.setup.schema-preload ;; In order to use component test helpers in the REPL we ;; need to preload namespaces that are not normally required ;; by production code, such as ;; @testing-library/react-native. test-helpers.component]} :closure-defines - {status-im2.config/POKT_TOKEN #shadow/env "POKT_TOKEN" - status-im2.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" - status-im2.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" - status-im2.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN" - status-im2.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN" - status-im2.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN" - status-im2.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"} + {status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN" + status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" + status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" + status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN" + status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN" + status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN" + status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"} :compiler-options {:output-feature-set :es5 ;; We disable `:fn-deprecated` warnings because we ;; are managing deprecation via clj-kondo and we @@ -87,13 +87,13 @@ :chunks {:fleets legacy.status-im.fleet.default-fleet/default-fleets} :release {:closure-defines - {status-im2.config/POKT_TOKEN #shadow/env "POKT_TOKEN" - status-im2.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" - status-im2.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" - status-im2.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN" - status-im2.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN" - status-im2.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN" - status-im2.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"} + {status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN" + status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" + status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" + status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN" + status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN" + status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN" + status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"} :compiler-options {:output-feature-set :es6 ;;disable for android build as there ;;is an intermittent warning with deftype @@ -112,21 +112,21 @@ :output-dir "target/test" :optimizations :simple :target :node-test - :dev {:devtools {:preloads [status-im2.setup.schema-preload]}} + :dev {:devtools {:preloads [status-im.setup.schema-preload]}} ;; Uncomment line below to `make test-watch` a specific file - ;; :ns-regexp "status-im2.subs.messages-test$" + ;; :ns-regexp "status-im.subs.messages-test$" :main legacy.status-im.test-runner/main ;; set :ui-driven to true to let shadow-cljs inject node-repl :ui-driven true :closure-defines - {schema.core/throw-on-error? true - status-im2.config/POKT_TOKEN #shadow/env "POKT_TOKEN" - status-im2.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" - status-im2.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" - status-im2.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN" - status-im2.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN" - status-im2.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN" - status-im2.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"} + {schema.core/throw-on-error? true + status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN" + status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" + status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" + status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN" + status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN" + status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN" + status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"} :compiler-options {;; needed because we override require and it ;; messes with source-map which reports callstack @@ -153,10 +153,10 @@ ;; the preloads namespace because it will ;; be used directly by Jest in the option ;; setupFilesAfterEnv. - status-im2.setup.schema-preload + status-im.setup.schema-preload ;;quo.core-spec - status-im2.core-spec] + status-im.core-spec] :ns-regexp "component-spec$" :output-dir "component-spec" :closure-defines {schema.core/throw-on-error? true} diff --git a/src/legacy/status_im/bootnodes/core.cljs b/src/legacy/status_im/bootnodes/core.cljs index 1945836a69..4d482aad87 100644 --- a/src/legacy/status_im/bootnodes/core.cljs +++ b/src/legacy/status_im/bootnodes/core.cljs @@ -3,7 +3,7 @@ [clojure.string :as string] [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/browser/core.cljs b/src/legacy/status_im/browser/core.cljs index 15dc817c80..56d5566c7b 100644 --- a/src/legacy/status_im/browser/core.cljs +++ b/src/legacy/status_im/browser/core.cljs @@ -16,9 +16,9 @@ [native-module.core :as native-module] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.constants :as constants] - [status-im2.contexts.chat.events :as chat.events] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.contexts.chat.events :as chat.events] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.address :as address] [utils.debounce :as debounce] diff --git a/src/legacy/status_im/browser/eip3085.cljs b/src/legacy/status_im/browser/eip3085.cljs index f2c85a16e6..8a26cd14d3 100644 --- a/src/legacy/status_im/browser/eip3085.cljs +++ b/src/legacy/status_im/browser/eip3085.cljs @@ -7,7 +7,7 @@ [legacy.status-im.ui.screens.browser.eip3085.sheet :as sheet] [legacy.status-im.utils.random :as random] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/browser/eip3326.cljs b/src/legacy/status_im/browser/eip3326.cljs index 64412098e1..9655442a12 100644 --- a/src/legacy/status_im/browser/eip3326.cljs +++ b/src/legacy/status_im/browser/eip3326.cljs @@ -3,7 +3,7 @@ (ns legacy.status-im.browser.eip3326 (:require [legacy.status-im.ui.screens.browser.eip3326.sheet :as sheet] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.ethereum.chain :as chain] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/browser/permissions.cljs b/src/legacy/status_im/browser/permissions.cljs index dd5fb6d9e7..893a1873f9 100644 --- a/src/legacy/status_im/browser/permissions.cljs +++ b/src/legacy/status_im/browser/permissions.cljs @@ -1,8 +1,8 @@ (ns legacy.status-im.browser.permissions (:require [legacy.status-im.qr-scanner.core :as qr-scanner] - [status-im2.constants :as constants] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.navigation.events :as navigation] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/chat/models/loading.cljs b/src/legacy/status_im/chat/models/loading.cljs index 2d7715e5c6..43878c0a48 100644 --- a/src/legacy/status_im/chat/models/loading.cljs +++ b/src/legacy/status_im/chat/models/loading.cljs @@ -3,8 +3,8 @@ [legacy.status-im.data-store.chats :as data-store.chats] [legacy.status-im.data-store.messages :as data-store.messages] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.list.events :as message-list] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.list.events :as message-list] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/chat/models/message.cljs b/src/legacy/status_im/chat/models/message.cljs index 08c8dd50d7..19ac79e78d 100644 --- a/src/legacy/status_im/chat/models/message.cljs +++ b/src/legacy/status_im/chat/models/message.cljs @@ -6,9 +6,9 @@ [legacy.status-im.utils.deprecated-types :as types] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.contexts.chat.messages.delete-message.events :as delete-message] - [status-im2.contexts.chat.messages.list.events :as message-list] - [status-im2.contexts.chat.messages.list.state :as view.state] + [status-im.contexts.chat.messages.delete-message.events :as delete-message] + [status-im.contexts.chat.messages.list.events :as message-list] + [status-im.contexts.chat.messages.list.state :as view.state] [utils.re-frame :as rf])) (defn- message-loaded? diff --git a/src/legacy/status_im/chat/models/message_test.cljs b/src/legacy/status_im/chat/models/message_test.cljs index 12ae067e40..d2049f4c3c 100644 --- a/src/legacy/status_im/chat/models/message_test.cljs +++ b/src/legacy/status_im/chat/models/message_test.cljs @@ -3,7 +3,7 @@ [cljs.test :refer-macros [deftest is testing]] [legacy.status-im.chat.models.loading :as loading] [legacy.status-im.chat.models.message :as message] - [status-im2.contexts.chat.messages.list.state :as list.state])) + [status-im.contexts.chat.messages.list.state :as list.state])) (deftest add-received-message-test (with-redefs [message/add-message #(identity %1)] diff --git a/src/legacy/status_im/communities/core.cljs b/src/legacy/status_im/communities/core.cljs index 1ac469cc8e..24c69dac6e 100644 --- a/src/legacy/status_im/communities/core.cljs +++ b/src/legacy/status_im/communities/core.cljs @@ -4,8 +4,8 @@ [legacy.status-im.bottom-sheet.events :as bottom-sheet] legacy.status-im.communities.e2e [re-frame.core :as re-frame] - [status-im2.contexts.shell.activity-center.events :as activity-center] - [status-im2.navigation.events :as navigation] + [status-im.contexts.shell.activity-center.events :as activity-center] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/contact/block.cljs b/src/legacy/status_im/contact/block.cljs index 48dfe1a45d..0498c77224 100644 --- a/src/legacy/status_im/contact/block.cljs +++ b/src/legacy/status_im/contact/block.cljs @@ -4,10 +4,10 @@ [legacy.status-im.data-store.chats :as chats-store] [legacy.status-im.utils.deprecated-types :as types] [re-frame.core :as re-frame] - [status-im2.contexts.chat.messages.list.events :as message-list] - [status-im2.contexts.contacts.events :as contacts-store] - [status-im2.contexts.shell.activity-center.events :as activity-center] - [status-im2.navigation.events :as navigation] + [status-im.contexts.chat.messages.list.events :as message-list] + [status-im.contexts.contacts.events :as contacts-store] + [status-im.contexts.shell.activity-center.events :as activity-center] + [status-im.navigation.events :as navigation] [utils.re-frame :as rf])) (rf/defn clean-up-chat diff --git a/src/legacy/status_im/contact/db.cljs b/src/legacy/status_im/contact/db.cljs index 15b8fc6bc9..e026cbfcad 100644 --- a/src/legacy/status_im/contact/db.cljs +++ b/src/legacy/status_im/contact/db.cljs @@ -2,7 +2,7 @@ (:require [clojure.set :as set] [clojure.string :as string] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.address :as address])) (defn public-key-and-ens-name->new-contact diff --git a/src/legacy/status_im/data_store/activities.cljs b/src/legacy/status_im/data_store/activities.cljs index 65a0df3e8c..8ca8865e3e 100644 --- a/src/legacy/status_im/data_store/activities.cljs +++ b/src/legacy/status_im/data_store/activities.cljs @@ -2,8 +2,8 @@ (:require [clojure.set :as set] [legacy.status-im.data-store.messages :as messages] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification-types :as notification-types])) + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification-types :as notification-types])) (defn mark-notifications-as-read [notifications] diff --git a/src/legacy/status_im/data_store/activities_test.cljs b/src/legacy/status_im/data_store/activities_test.cljs index 96871b4926..9d417c76bd 100644 --- a/src/legacy/status_im/data_store/activities_test.cljs +++ b/src/legacy/status_im/data_store/activities_test.cljs @@ -2,8 +2,8 @@ (:require [cljs.test :refer [deftest is testing]] [legacy.status-im.data-store.activities :as store] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification-types :as notification-types])) + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification-types :as notification-types])) (def chat-id "0x04c66155") diff --git a/src/legacy/status_im/data_store/chats.cljs b/src/legacy/status_im/data_store/chats.cljs index 51288dfe8e..2a42a8dd3c 100644 --- a/src/legacy/status_im/data_store/chats.cljs +++ b/src/legacy/status_im/data_store/chats.cljs @@ -3,7 +3,7 @@ [clojure.set :as set] [legacy.status-im.data-store.messages :as messages] [legacy.status-im.utils.deprecated-types :as types] - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/data_store/settings.cljs b/src/legacy/status_im/data_store/settings.cljs index df4b7cc543..90f3af65ae 100644 --- a/src/legacy/status_im/data_store/settings.cljs +++ b/src/legacy/status_im/data_store/settings.cljs @@ -2,7 +2,7 @@ (:require [clojure.set :as set] [legacy.status-im.data-store.visibility-status-updates :as visibility-status-updates] - [status-im2.config :as config] + [status-im.config :as config] [utils.ethereum.eip.eip55 :as eip55])) (defn rpc->networks diff --git a/src/legacy/status_im/ens/core.cljs b/src/legacy/status_im/ens/core.cljs index 9b3e53106c..4199d5e7ab 100644 --- a/src/legacy/status_im/ens/core.cljs +++ b/src/legacy/status_im/ens/core.cljs @@ -9,8 +9,8 @@ [legacy.status-im.utils.random :as random] [legacy.status-im.wallet.utils :as wallet.utils] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.datetime :as datetime] [utils.ens.core :as utils.ens] diff --git a/src/legacy/status_im/ethereum/ens.cljs b/src/legacy/status_im/ethereum/ens.cljs index 48c6f5ab74..582608d218 100644 --- a/src/legacy/status_im/ethereum/ens.cljs +++ b/src/legacy/status_im/ethereum/ens.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.ethereum.ens (:require [native-module.core :as native-module] - [status-im2.common.json-rpc.events :as json-rpc] + [status-im.common.json-rpc.events :as json-rpc] [utils.ens.core :as utils.ens])) (defn address diff --git a/src/legacy/status_im/ethereum/transactions/core.cljs b/src/legacy/status_im/ethereum/transactions/core.cljs index 3fc75499a2..b2463fabff 100644 --- a/src/legacy/status_im/ethereum/transactions/core.cljs +++ b/src/legacy/status_im/ethereum/transactions/core.cljs @@ -6,7 +6,7 @@ [legacy.status-im.utils.mobile-sync :as utils.mobile-sync] [legacy.status-im.wallet.core :as wallet] [re-frame.core :as re-frame] - [status-im2.common.json-rpc.events :as json-rpc] + [status-im.common.json-rpc.events :as json-rpc] [taoensso.timbre :as log] [utils.ethereum.chain :as chain] [utils.ethereum.eip.eip55 :as eip55] diff --git a/src/legacy/status_im/events.cljs b/src/legacy/status_im/events.cljs index 06d9b6bc69..87e8e33d47 100644 --- a/src/legacy/status_im/events.cljs +++ b/src/legacy/status_im/events.cljs @@ -42,17 +42,17 @@ [react-native.core :as rn] [react-native.permissions :as permissions] [react-native.platform :as platform] - [status-im2.common.biometric.events :as biometric] - status-im2.common.standard-authentication.events - [status-im2.common.theme.core :as theme] - [status-im2.common.universal-links :as universal-links] - [status-im2.constants :as constants] - status-im2.contexts.chat.home.events - status-im2.contexts.communities.home.events - status-im2.contexts.onboarding.events - status-im2.contexts.shell.activity-center.events - status-im2.contexts.shell.activity-center.notification.contact-requests.events - status-im2.contexts.shell.jump-to.events + [status-im.common.biometric.events :as biometric] + status-im.common.standard-authentication.events + [status-im.common.theme.core :as theme] + [status-im.common.universal-links :as universal-links] + [status-im.constants :as constants] + status-im.contexts.chat.home.events + status-im.contexts.communities.home.events + status-im.contexts.onboarding.events + status-im.contexts.shell.activity-center.events + status-im.contexts.shell.activity-center.notification.contact-requests.events + status-im.contexts.shell.jump-to.events [utils.i18n :as i18n] [utils.re-frame :as rf])) @@ -110,7 +110,7 @@ [{:keys [db] :as cofx} _] (let [current-theme-type (get-in cofx [:db :profile/profile :appearance])] (when (and (multiaccounts.model/logged-in? db) - (= current-theme-type status-im2.constants/theme-type-system)) + (= current-theme-type status-im.constants/theme-type-system)) {:profile.settings/switch-theme-fx [(get-in db [:profile/profile :appearance]) (:view-id db) true]}))) diff --git a/src/legacy/status_im/fleet/core.cljs b/src/legacy/status_im/fleet/core.cljs index cd93864b22..3da8318f40 100644 --- a/src/legacy/status_im/fleet/core.cljs +++ b/src/legacy/status_im/fleet/core.cljs @@ -3,8 +3,8 @@ [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [legacy.status-im.node.core :as node] [re-frame.core :as re-frame] - [status-im2.config :as config] - [status-im2.constants :as constants] + [status-im.config :as config] + [status-im.constants :as constants] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/fleet/core_test.cljs b/src/legacy/status_im/fleet/core_test.cljs index eca4189431..929e0ff1e6 100644 --- a/src/legacy/status_im/fleet/core_test.cljs +++ b/src/legacy/status_im/fleet/core_test.cljs @@ -2,7 +2,7 @@ (:require [cljs.test :refer-macros [deftest is testing]] [legacy.status-im.fleet.core :as fleet] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) #_(deftest fleets-test (testing "not passing any extra fleet" diff --git a/src/legacy/status_im/group_chats/core.cljs b/src/legacy/status_im/group_chats/core.cljs index ece7632784..ab9b694d87 100644 --- a/src/legacy/status_im/group_chats/core.cljs +++ b/src/legacy/status_im/group_chats/core.cljs @@ -6,10 +6,10 @@ [legacy.status-im.data-store.invitations :as data-store.invitations] [oops.core :as oops] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.contexts.chat.events :as chat.events] - [status-im2.contexts.shell.activity-center.events :as activity-center] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.contexts.chat.events :as chat.events] + [status-im.contexts.shell.activity-center.events :as activity-center] + [status-im.navigation.events :as navigation] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/keycard/backup_key.cljs b/src/legacy/status_im/keycard/backup_key.cljs index 4f025da621..0efd3d78c0 100644 --- a/src/legacy/status_im/keycard/backup_key.cljs +++ b/src/legacy/status_im/keycard/backup_key.cljs @@ -6,7 +6,7 @@ [legacy.status-im.signing.core :as signing.core] [legacy.status-im.utils.utils :as utils] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/keycard/card.cljs b/src/legacy/status_im/keycard/card.cljs index 30f2b194a8..322cd30daa 100644 --- a/src/legacy/status_im/keycard/card.cljs +++ b/src/legacy/status_im/keycard/card.cljs @@ -4,7 +4,7 @@ [legacy.status-im.keycard.real-keycard :as real-keycard] [legacy.status-im.keycard.simulated-keycard :as simulated-keycard] [re-frame.core :as re-frame] - [status-im2.config :as config] + [status-im.config :as config] [taoensso.timbre :as log])) (defonce card diff --git a/src/legacy/status_im/keycard/change_pin.cljs b/src/legacy/status_im/keycard/change_pin.cljs index a9d682796d..ed0d491038 100644 --- a/src/legacy/status_im/keycard/change_pin.cljs +++ b/src/legacy/status_im/keycard/change_pin.cljs @@ -2,7 +2,7 @@ (:require [legacy.status-im.keycard.common :as common] [legacy.status-im.keycard.onboarding :as onboarding] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/legacy/status_im/keycard/common.cljs b/src/legacy/status_im/keycard/common.cljs index 719d6f62ae..3ef8057563 100644 --- a/src/legacy/status_im/keycard/common.cljs +++ b/src/legacy/status_im/keycard/common.cljs @@ -9,7 +9,7 @@ [legacy.status-im.utils.keychain.core :as keychain] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.address :as address] [utils.datetime :as datetime] diff --git a/src/legacy/status_im/keycard/core.cljs b/src/legacy/status_im/keycard/core.cljs index 1c929bf930..bb3e9494d0 100644 --- a/src/legacy/status_im/keycard/core.cljs +++ b/src/legacy/status_im/keycard/core.cljs @@ -15,7 +15,7 @@ [legacy.status-im.keycard.wallet :as wallet] [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [re-frame.db] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.datetime :as datetime] [utils.i18n :as i18n] diff --git a/src/legacy/status_im/keycard/delete_key.cljs b/src/legacy/status_im/keycard/delete_key.cljs index 6b544bda6c..84a750d514 100644 --- a/src/legacy/status_im/keycard/delete_key.cljs +++ b/src/legacy/status_im/keycard/delete_key.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.keycard.delete-key (:require [legacy.status-im.keycard.common :as common] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [utils.re-frame :as rf])) (rf/defn reset-card-pressed diff --git a/src/legacy/status_im/keycard/login.cljs b/src/legacy/status_im/keycard/login.cljs index 34afdbbc0a..1b0a99f228 100644 --- a/src/legacy/status_im/keycard/login.cljs +++ b/src/legacy/status_im/keycard/login.cljs @@ -7,7 +7,7 @@ [legacy.status-im.keycard.recovery :as recovery] [legacy.status-im.signing.core :as signing.core] [legacy.status-im.utils.deprecated-types :as types] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.address :as address] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/keycard/mnemonic.cljs b/src/legacy/status_im/keycard/mnemonic.cljs index 1c9e60260f..5393490c19 100644 --- a/src/legacy/status_im/keycard/mnemonic.cljs +++ b/src/legacy/status_im/keycard/mnemonic.cljs @@ -2,7 +2,7 @@ (:require [legacy.status-im.keycard.common :as common] legacy.status-im.keycard.fx - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/keycard/onboarding.cljs b/src/legacy/status_im/keycard/onboarding.cljs index d3c226c258..9c4b90f018 100644 --- a/src/legacy/status_im/keycard/onboarding.cljs +++ b/src/legacy/status_im/keycard/onboarding.cljs @@ -7,8 +7,8 @@ [legacy.status-im.ui.components.react :as react] [legacy.status-im.utils.utils :as utils] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/keycard/recovery.cljs b/src/legacy/status_im/keycard/recovery.cljs index dc3d04819c..372d781bd5 100644 --- a/src/legacy/status_im/keycard/recovery.cljs +++ b/src/legacy/status_im/keycard/recovery.cljs @@ -11,8 +11,8 @@ [native-module.core :as native-module] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.constants :as constants] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.address :as address] [utils.datetime :as datetime] diff --git a/src/legacy/status_im/keycard/simulated_keycard.cljs b/src/legacy/status_im/keycard/simulated_keycard.cljs index 9e10ea1d5d..fba157f747 100644 --- a/src/legacy/status_im/keycard/simulated_keycard.cljs +++ b/src/legacy/status_im/keycard/simulated_keycard.cljs @@ -9,7 +9,7 @@ [native-module.core :as native-module] [re-frame.core :as re-frame] [re-frame.db :as re-frame.db] - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.address :as address] [utils.i18n :as i18n])) diff --git a/src/legacy/status_im/keycard/unpair.cljs b/src/legacy/status_im/keycard/unpair.cljs index ada1230a4a..b6ece9eaf6 100644 --- a/src/legacy/status_im/keycard/unpair.cljs +++ b/src/legacy/status_im/keycard/unpair.cljs @@ -3,7 +3,7 @@ [legacy.status-im.keycard.common :as common] [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/keycard/wallet.cljs b/src/legacy/status_im/keycard/wallet.cljs index 009978d765..f6cc062106 100644 --- a/src/legacy/status_im/keycard/wallet.cljs +++ b/src/legacy/status_im/keycard/wallet.cljs @@ -5,7 +5,7 @@ [legacy.status-im.ui.screens.wallet.add-new.views :as add-new.views] [legacy.status-im.utils.hex :as utils.hex] [native-module.core :as native-module] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.ethereum.eip.eip55 :as eip55] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/mailserver/core.cljs b/src/legacy/status_im/mailserver/core.cljs index e70d2d4a08..11e006d963 100644 --- a/src/legacy/status_im/mailserver/core.cljs +++ b/src/legacy/status_im/mailserver/core.cljs @@ -5,7 +5,7 @@ [legacy.status-im.node.core :as node] [legacy.status-im.utils.mobile-sync :as mobile-network-utils] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/mobile_sync_settings/core.cljs b/src/legacy/status_im/mobile_sync_settings/core.cljs index a7db63e37e..0d634726ff 100644 --- a/src/legacy/status_im/mobile_sync_settings/core.cljs +++ b/src/legacy/status_im/mobile_sync_settings/core.cljs @@ -6,8 +6,8 @@ [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [legacy.status-im.utils.mobile-sync :as utils] [legacy.status-im.wallet.core :as wallet] - [status-im2.contexts.add-new-contact.events :as add-new-contact] - [status-im2.navigation.events :as navigation] + [status-im.contexts.add-new-contact.events :as add-new-contact] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/multiaccounts/create/core.cljs b/src/legacy/status_im/multiaccounts/create/core.cljs index 72c8e8c0ee..d72fa40aa8 100644 --- a/src/legacy/status_im/multiaccounts/create/core.cljs +++ b/src/legacy/status_im/multiaccounts/create/core.cljs @@ -7,8 +7,8 @@ [legacy.status-im.utils.signing-phrase.core :as signing-phrase] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.config :as config] - [status-im2.constants :as constants] + [status-im.config :as config] + [status-im.constants :as constants] [utils.ethereum.eip.eip55 :as eip55] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/legacy/status_im/multiaccounts/db.cljs b/src/legacy/status_im/multiaccounts/db.cljs index aadc1d50d7..2c1d83e045 100644 --- a/src/legacy/status_im/multiaccounts/db.cljs +++ b/src/legacy/status_im/multiaccounts/db.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.multiaccounts.db (:require [cljs.spec.alpha :as spec] - [status-im2.constants :as const])) + [status-im.constants :as const])) (defn valid-length? [password] diff --git a/src/legacy/status_im/multiaccounts/logout/core.cljs b/src/legacy/status_im/multiaccounts/logout/core.cljs index 2fb369e7ba..20c12a473d 100644 --- a/src/legacy/status_im/multiaccounts/logout/core.cljs +++ b/src/legacy/status_im/multiaccounts/logout/core.cljs @@ -3,8 +3,8 @@ [legacy.status-im.wallet.core :as wallet] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.common.keychain.events :as keychain] - [status-im2.db :as db] + [status-im.common.keychain.events :as keychain] + [status-im.db :as db] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/multiaccounts/recover/core.cljs b/src/legacy/status_im/multiaccounts/recover/core.cljs index fc1b1bf634..d1c08f30b8 100644 --- a/src/legacy/status_im/multiaccounts/recover/core.cljs +++ b/src/legacy/status_im/multiaccounts/recover/core.cljs @@ -4,7 +4,7 @@ [legacy.status-im.utils.deprecated-types :as types] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log])) (re-frame/reg-fx diff --git a/src/legacy/status_im/multiaccounts/update/core.cljs b/src/legacy/status_im/multiaccounts/update/core.cljs index ceb04fc3c1..9c94d8edf7 100644 --- a/src/legacy/status_im/multiaccounts/update/core.cljs +++ b/src/legacy/status_im/multiaccounts/update/core.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.multiaccounts.update.core (:require [legacy.status-im.utils.deprecated-types :as types] - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.ens.core :as utils.ens] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/network/core.cljs b/src/legacy/status_im/network/core.cljs index e52fb539e9..019496e2e7 100644 --- a/src/legacy/status_im/network/core.cljs +++ b/src/legacy/status_im/network/core.cljs @@ -3,7 +3,7 @@ [clojure.string :as string] [legacy.status-im.node.core :as node] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [utils.ethereum.chain :as chain] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/node/core.cljs b/src/legacy/status_im/node/core.cljs index 441d6a0f2f..86aef936a5 100644 --- a/src/legacy/status_im/node/core.cljs +++ b/src/legacy/status_im/node/core.cljs @@ -5,7 +5,7 @@ [native-module.core :as native-module] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.config :as config] + [status-im.config :as config] [utils.re-frame :as rf])) (defn- add-custom-bootnodes diff --git a/src/legacy/status_im/pairing/core.cljs b/src/legacy/status_im/pairing/core.cljs index e5d9778da0..916ab2de3d 100644 --- a/src/legacy/status_im/pairing/core.cljs +++ b/src/legacy/status_im/pairing/core.cljs @@ -3,9 +3,9 @@ [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [re-frame.core :as re-frame] [react-native.platform :as utils.platform] - [status-im2.common.json-rpc.events :as json-rpc] - [status-im2.config :as config] - [status-im2.navigation.events :as navigation] + [status-im.common.json-rpc.events :as json-rpc] + [status-im.config :as config] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/qr_scanner/core.cljs b/src/legacy/status_im/qr_scanner/core.cljs index 8313581565..ff04091b6f 100644 --- a/src/legacy/status_im/qr_scanner/core.cljs +++ b/src/legacy/status_im/qr_scanner/core.cljs @@ -3,7 +3,7 @@ [legacy.status-im.group-chats.core :as group-chats] [legacy.status-im.utils.utils :as utils] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.ethereum.chain :as chain] [utils.i18n :as i18n] diff --git a/src/legacy/status_im/signing/core.cljs b/src/legacy/status_im/signing/core.cljs index 05e8477c2b..1ab51d6723 100644 --- a/src/legacy/status_im/signing/core.cljs +++ b/src/legacy/status_im/signing/core.cljs @@ -15,8 +15,8 @@ [legacy.status-im.wallet.utils :as wallet.utils] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.common.json-rpc.events :as json-rpc] - [status-im2.constants :as constants] + [status-im.common.json-rpc.events :as json-rpc] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.address :as address] [utils.ethereum.chain :as chain] diff --git a/src/legacy/status_im/signing/eip1559.cljs b/src/legacy/status_im/signing/eip1559.cljs index fc1f140d34..ad328d932f 100644 --- a/src/legacy/status_im/signing/eip1559.cljs +++ b/src/legacy/status_im/signing/eip1559.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.signing.eip1559 (:require [re-frame.core :as re-frame] - [status-im2.common.json-rpc.events :as json-rpc])) + [status-im.common.json-rpc.events :as json-rpc])) (defonce london-activated? (atom false)) diff --git a/src/legacy/status_im/signing/gas.cljs b/src/legacy/status_im/signing/gas.cljs index 415b237a22..eecb68f43f 100644 --- a/src/legacy/status_im/signing/gas.cljs +++ b/src/legacy/status_im/signing/gas.cljs @@ -5,7 +5,7 @@ [legacy.status-im.popover.core :as popover] [legacy.status-im.signing.eip1559 :as eip1559] [re-frame.core :as re-frame] - [status-im2.common.json-rpc.events :as json-rpc] + [status-im.common.json-rpc.events :as json-rpc] [taoensso.timbre :as log] [utils.ethereum.chain :as chain] [utils.i18n :as i18n] diff --git a/src/legacy/status_im/stickers/core.cljs b/src/legacy/status_im/stickers/core.cljs index aab6d33c16..709f61573a 100644 --- a/src/legacy/status_im/stickers/core.cljs +++ b/src/legacy/status_im/stickers/core.cljs @@ -3,7 +3,7 @@ [legacy.status-im.utils.utils :as utils] [legacy.status-im.wallet.utils :as wallet.utils] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.ethereum.chain :as chain] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/subs/networks.cljs b/src/legacy/status_im/subs/networks.cljs index f1fd79ed4c..5fa2213407 100644 --- a/src/legacy/status_im/subs/networks.cljs +++ b/src/legacy/status_im/subs/networks.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.subs.networks (:require [re-frame.core :as re-frame] - [status-im2.config :as config] + [status-im.config :as config] [utils.ethereum.chain :as chain])) (defn- filter-networks diff --git a/src/legacy/status_im/subs/stickers.cljs b/src/legacy/status_im/subs/stickers.cljs index 74378e4d60..d6fdcef654 100644 --- a/src/legacy/status_im/subs/stickers.cljs +++ b/src/legacy/status_im/subs/stickers.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.subs.stickers (:require [re-frame.core :as re-frame] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) (re-frame/reg-sub :stickers/installed-packs diff --git a/src/legacy/status_im/subs/wallet/wallet.cljs b/src/legacy/status_im/subs/wallet/wallet.cljs index 7abbb50e71..8cd04f5f05 100644 --- a/src/legacy/status_im/subs/wallet/wallet.cljs +++ b/src/legacy/status_im/subs/wallet/wallet.cljs @@ -5,7 +5,7 @@ [legacy.status-im.utils.currency :as currency] [legacy.status-im.wallet.utils :as wallet.utils] [re-frame.core :as re-frame] - [status-im2.config :as config] + [status-im.config :as config] [utils.i18n :as i18n] [utils.money :as money])) diff --git a/src/legacy/status_im/test_runner.cljs b/src/legacy/status_im/test_runner.cljs index 6906875169..01ef27a684 100644 --- a/src/legacy/status_im/test_runner.cljs +++ b/src/legacy/status_im/test_runner.cljs @@ -6,10 +6,10 @@ legacy.status-im.subs.root [shadow.test :as st] [shadow.test.env :as env] - status-im2.setup.i18n-resources - [status-im2.setup.interceptors :as interceptors] - [status-im2.setup.schema :as schema] - status-im2.subs.root + status-im.setup.i18n-resources + [status-im.setup.interceptors :as interceptors] + [status-im.setup.schema :as schema] + status-im.subs.root [utils.re-frame :as rf])) (defonce repl? (atom false)) diff --git a/src/legacy/status_im/ui/components/chat_icon/screen.cljs b/src/legacy/status_im/ui/components/chat_icon/screen.cljs index 1be0b18ae9..f1cc9efcd8 100644 --- a/src/legacy/status_im/ui/components/chat_icon/screen.cljs +++ b/src/legacy/status_im/ui/components/chat_icon/screen.cljs @@ -11,7 +11,7 @@ [quo.theme :as theme] [re-frame.core :as re-frame.core] [react-native.core :as rn] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.contexts.profile.utils :as profile.utils] [utils.ens.core :as utils.ens])) ;;TODO REWORK THIS NAMESPACE diff --git a/src/legacy/status_im/ui/components/tooltip/styles.cljs b/src/legacy/status_im/ui/components/tooltip/styles.cljs index a813d02eab..0974a54c8a 100644 --- a/src/legacy/status_im/ui/components/tooltip/styles.cljs +++ b/src/legacy/status_im/ui/components/tooltip/styles.cljs @@ -2,7 +2,7 @@ (:require [legacy.status-im.ui.components.colors :as colors] [legacy.status-im.utils.styles :as styles] - [status-im2.config :as config])) + [status-im.config :as config])) (def tooltip-container (merge diff --git a/src/legacy/status_im/ui/components/webview.cljs b/src/legacy/status_im/ui/components/webview.cljs index 6bcabb5c8a..c482b70f3a 100644 --- a/src/legacy/status_im/ui/components/webview.cljs +++ b/src/legacy/status_im/ui/components/webview.cljs @@ -3,7 +3,7 @@ ["react-native-webview" :default rn-webview] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.config :as config])) + [status-im.config :as config])) (def webview-class (reagent/adapt-react-class rn-webview)) diff --git a/src/legacy/status_im/ui/screens/about_app/views.cljs b/src/legacy/status_im/ui/screens/about_app/views.cljs index b8b20b36bf..cabec2633e 100644 --- a/src/legacy/status_im/ui/screens/about_app/views.cljs +++ b/src/legacy/status_im/ui/screens/about_app/views.cljs @@ -7,7 +7,7 @@ [legacy.status-im.ui.components.react :as react] [legacy.status-im.ui.components.webview :refer [webview]] [re-frame.core :as re-frame] - [status-im2.constants :refer + [status-im.constants :refer [principles-link privacy-policy-link terms-of-service-link]] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :as views])) diff --git a/src/legacy/status_im/ui/screens/browser/options/views.cljs b/src/legacy/status_im/ui/screens/browser/options/views.cljs index b06d0c727d..0d965710cb 100644 --- a/src/legacy/status_im/ui/screens/browser/options/views.cljs +++ b/src/legacy/status_im/ui/screens/browser/options/views.cljs @@ -11,7 +11,7 @@ [legacy.status-im.ui.screens.wallet.components.views :as components] [legacy.status-im.utils.utils :as utils] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n] [utils.url :as url])) diff --git a/src/legacy/status_im/ui/screens/chat/group.cljs b/src/legacy/status_im/ui/screens/chat/group.cljs index 89cda4b982..840aec5720 100644 --- a/src/legacy/status_im/ui/screens/chat/group.cljs +++ b/src/legacy/status_im/ui/screens/chat/group.cljs @@ -5,7 +5,7 @@ [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]])) diff --git a/src/legacy/status_im/ui/screens/chat/message/legacy_style.cljs b/src/legacy/status_im/ui/screens/chat/message/legacy_style.cljs index 6f90bc1bf7..2774b21c34 100644 --- a/src/legacy/status_im/ui/screens/chat/message/legacy_style.cljs +++ b/src/legacy/status_im/ui/screens/chat/message/legacy_style.cljs @@ -4,7 +4,7 @@ [legacy.status-im.ui.components.react :as react] [quo.foundations.colors :as quo.colors] [quo.foundations.typography :as typography] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) (defn style-message-text [] diff --git a/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs b/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs index 8a3270d292..cd35bd4ee5 100644 --- a/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs +++ b/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs @@ -8,9 +8,9 @@ [quo.foundations.colors :as colors] [quo.foundations.typography :as typography] [react-native.core :as rn] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.delete-message-for-me.events] - [status-im2.contexts.chat.messages.delete-message.events] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.delete-message-for-me.events] + [status-im.contexts.chat.messages.delete-message.events] [utils.i18n :as i18n] [utils.re-frame :as rf]) (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]])) diff --git a/src/legacy/status_im/ui/screens/communities/invite.cljs b/src/legacy/status_im/ui/screens/communities/invite.cljs index da3cf732a8..18519d8661 100644 --- a/src/legacy/status_im/ui/screens/communities/invite.cljs +++ b/src/legacy/status_im/ui/screens/communities/invite.cljs @@ -9,7 +9,7 @@ [legacy.status-im.ui.components.topbar :as topbar] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/ui/screens/communities/members.cljs b/src/legacy/status_im/ui/screens/communities/members.cljs index feb62a3e05..10fa051fb2 100644 --- a/src/legacy/status_im/ui/screens/communities/members.cljs +++ b/src/legacy/status_im/ui/screens/communities/members.cljs @@ -9,8 +9,8 @@ [legacy.status-im.ui.components.unviewed-indicator :as unviewed-indicator] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.constants :as constants] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/ui/screens/contacts_list/views.cljs b/src/legacy/status_im/ui/screens/contacts_list/views.cljs index 9d3077f2fe..b6ab2814f6 100644 --- a/src/legacy/status_im/ui/screens/contacts_list/views.cljs +++ b/src/legacy/status_im/ui/screens/contacts_list/views.cljs @@ -7,7 +7,7 @@ [legacy.status-im.ui.components.list.views :as list.views] [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]])) diff --git a/src/legacy/status_im/ui/screens/dapps_permissions/views.cljs b/src/legacy/status_im/ui/screens/dapps_permissions/views.cljs index da63a1f766..25d0d27d61 100644 --- a/src/legacy/status_im/ui/screens/dapps_permissions/views.cljs +++ b/src/legacy/status_im/ui/screens/dapps_permissions/views.cljs @@ -10,7 +10,7 @@ [legacy.status-im.ui.components.topbar :as topbar] [legacy.status-im.ui.screens.dapps-permissions.styles :as styles] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n])) (defn d-icon diff --git a/src/legacy/status_im/ui/screens/default_sync_period_settings/view.cljs b/src/legacy/status_im/ui/screens/default_sync_period_settings/view.cljs index 565a3a5864..4b2819f334 100644 --- a/src/legacy/status_im/ui/screens/default_sync_period_settings/view.cljs +++ b/src/legacy/status_im/ui/screens/default_sync_period_settings/view.cljs @@ -4,8 +4,8 @@ [legacy.status-im.ui.components.list.item :as list.item] [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] - [status-im2.config :as config] - [status-im2.constants :as constants] + [status-im.config :as config] + [status-im.constants :as constants] [utils.i18n :as i18n])) (def titles diff --git a/src/legacy/status_im/ui/screens/ens/views.cljs b/src/legacy/status_im/ui/screens/ens/views.cljs index 700aa31faa..0bbc10c949 100644 --- a/src/legacy/status_im/ui/screens/ens/views.cljs +++ b/src/legacy/status_im/ui/screens/ens/views.cljs @@ -20,7 +20,7 @@ [legacy.status-im.utils.utils :as utils] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.config :as config] + [status-im.config :as config] [utils.address :as address] [utils.debounce :as debounce] [utils.ens.core :as utils.ens] diff --git a/src/legacy/status_im/ui/screens/group/views.cljs b/src/legacy/status_im/ui/screens/group/views.cljs index 1ebf46c9d3..94cd8d41f9 100644 --- a/src/legacy/status_im/ui/screens/group/views.cljs +++ b/src/legacy/status_im/ui/screens/group/views.cljs @@ -14,7 +14,7 @@ [legacy.status-im.ui.screens.group.styles :as styles] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.debounce :as debounce] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :as views])) diff --git a/src/legacy/status_im/ui/screens/help_center/views.cljs b/src/legacy/status_im/ui/screens/help_center/views.cljs index 47f198f702..04b781e460 100644 --- a/src/legacy/status_im/ui/screens/help_center/views.cljs +++ b/src/legacy/status_im/ui/screens/help_center/views.cljs @@ -4,7 +4,7 @@ [legacy.status-im.ui.components.list.views :as list] [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n])) (def data diff --git a/src/legacy/status_im/ui/screens/home/views/inner_item.cljs b/src/legacy/status_im/ui/screens/home/views/inner_item.cljs index 0cab3bcd0c..9c6cef0247 100644 --- a/src/legacy/status_im/ui/screens/home/views/inner_item.cljs +++ b/src/legacy/status_im/ui/screens/home/views/inner_item.cljs @@ -14,7 +14,7 @@ [quo.core :as quo] [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.datetime :as datetime] [utils.i18n :as i18n])) diff --git a/src/legacy/status_im/ui/screens/keycard/onboarding/views.cljs b/src/legacy/status_im/ui/screens/keycard/onboarding/views.cljs index 4701de674c..b9d489f177 100644 --- a/src/legacy/status_im/ui/screens/keycard/onboarding/views.cljs +++ b/src/legacy/status_im/ui/screens/keycard/onboarding/views.cljs @@ -13,7 +13,7 @@ [legacy.status-im.ui.screens.keycard.pin.views :as pin.views] [legacy.status-im.ui.screens.keycard.styles :as styles] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n] [utils.re-frame :as rf]) (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]])) diff --git a/src/legacy/status_im/ui/screens/keycard/recovery/views.cljs b/src/legacy/status_im/ui/screens/keycard/recovery/views.cljs index f53beb90de..bc4aadcd2a 100644 --- a/src/legacy/status_im/ui/screens/keycard/recovery/views.cljs +++ b/src/legacy/status_im/ui/screens/keycard/recovery/views.cljs @@ -14,7 +14,7 @@ [legacy.status-im.ui.screens.keycard.views :as keycard.views] [legacy.status-im.utils.core :as utils.core] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]])) diff --git a/src/legacy/status_im/ui/screens/keycard/settings/views.cljs b/src/legacy/status_im/ui/screens/keycard/settings/views.cljs index c1914354ed..e453e614bf 100644 --- a/src/legacy/status_im/ui/screens/keycard/settings/views.cljs +++ b/src/legacy/status_im/ui/screens/keycard/settings/views.cljs @@ -8,7 +8,7 @@ [legacy.status-im.ui.components.react :as react] [legacy.status-im.ui.screens.keycard.views :as keycard.views] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n])) (defn- activity-indicator diff --git a/src/legacy/status_im/ui/screens/keycard/views.cljs b/src/legacy/status_im/ui/screens/keycard/views.cljs index 7651a2bee2..b53004a54f 100644 --- a/src/legacy/status_im/ui/screens/keycard/views.cljs +++ b/src/legacy/status_im/ui/screens/keycard/views.cljs @@ -17,9 +17,9 @@ [legacy.status-im.ui.screens.keycard.styles :as styles] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.profile.utils :as profile.utils] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.contexts.profile.utils :as profile.utils] + [status-im.navigation.events :as navigation] [utils.i18n :as i18n] [utils.re-frame :as rf]) (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]])) diff --git a/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs b/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs index 6f56367cf1..a1efcafa57 100644 --- a/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs +++ b/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs @@ -8,7 +8,7 @@ [legacy.status-im.ui.components.react :as react] [legacy.status-im.ui.screens.link-previews-settings.styles :as styles] [re-frame.core :as re-frame] - [status-im2.contexts.chat.messages.link-preview.events] + [status-im.contexts.chat.messages.link-preview.events] [utils.i18n :as i18n])) (defn prepare-urls-items-data diff --git a/src/legacy/status_im/ui/screens/network_info/views.cljs b/src/legacy/status_im/ui/screens/network_info/views.cljs index e4c6ed7a0f..1de9496bae 100644 --- a/src/legacy/status_im/ui/screens/network_info/views.cljs +++ b/src/legacy/status_im/ui/screens/network_info/views.cljs @@ -5,7 +5,7 @@ [native-module.core :as native-module] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.common.json-rpc.events :as json-rpc] + [status-im.common.json-rpc.events :as json-rpc] [utils.datetime :as datetime])) (defn get-block diff --git a/src/legacy/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs b/src/legacy/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs index 6827ce0874..72e79ba505 100644 --- a/src/legacy/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs +++ b/src/legacy/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs @@ -8,7 +8,7 @@ [legacy.status-im.ui.screens.privacy-and-security-settings.events :as delete-profile] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n] [utils.security.core :as security])) diff --git a/src/legacy/status_im/ui/screens/privacy_and_security_settings/views.cljs b/src/legacy/status_im/ui/screens/privacy_and_security_settings/views.cljs index 79586fa5e1..d5af3fb316 100644 --- a/src/legacy/status_im/ui/screens/privacy_and_security_settings/views.cljs +++ b/src/legacy/status_im/ui/screens/privacy_and_security_settings/views.cljs @@ -8,8 +8,8 @@ [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.config :as config] - [status-im2.constants :as constants] + [status-im.config :as config] + [status-im.constants :as constants] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :as views])) diff --git a/src/legacy/status_im/ui/screens/profile/contact/views.cljs b/src/legacy/status_im/ui/screens/profile/contact/views.cljs index 973e21b070..deea93e5a4 100644 --- a/src/legacy/status_im/ui/screens/profile/contact/views.cljs +++ b/src/legacy/status_im/ui/screens/profile/contact/views.cljs @@ -14,8 +14,8 @@ [quo.theme :as theme] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.constants :as constants] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/ui/screens/profile/group_chat/views.cljs b/src/legacy/status_im/ui/screens/profile/group_chat/views.cljs index d7237171f7..3b55896a80 100644 --- a/src/legacy/status_im/ui/screens/profile/group_chat/views.cljs +++ b/src/legacy/status_im/ui/screens/profile/group_chat/views.cljs @@ -13,8 +13,8 @@ [legacy.status-im.ui.screens.chat.utils :as chat.utils] [legacy.status-im.ui.screens.profile.components.styles :as profile.components.styles] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.constants :as constants] + [status-im.contexts.profile.utils :as profile.utils] [utils.debounce :as debounce] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]])) diff --git a/src/legacy/status_im/ui/screens/profile/user/edit_picture.cljs b/src/legacy/status_im/ui/screens/profile/user/edit_picture.cljs index 70a645ed35..3605a02be3 100644 --- a/src/legacy/status_im/ui/screens/profile/user/edit_picture.cljs +++ b/src/legacy/status_im/ui/screens/profile/user/edit_picture.cljs @@ -3,8 +3,8 @@ [legacy.status-im.ui.components.list.item :as list.item] [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] - [status-im2.config :as config] - [status-im2.contexts.profile.settings.events] + [status-im.config :as config] + [status-im.contexts.profile.settings.events] [utils.i18n :as i18n])) (def crop-size 1000) diff --git a/src/legacy/status_im/ui/screens/profile/user/views.cljs b/src/legacy/status_im/ui/screens/profile/user/views.cljs index 3bb01a2a16..a5a2b6ac75 100644 --- a/src/legacy/status_im/ui/screens/profile/user/views.cljs +++ b/src/legacy/status_im/ui/screens/profile/user/views.cljs @@ -17,9 +17,9 @@ [quo.theme :as theme] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.common.qr-codes.view :as qr-codes] - [status-im2.config :as config] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.common.qr-codes.view :as qr-codes] + [status-im.config :as config] + [status-im.contexts.profile.utils :as profile.utils] [utils.ens.stateofus :as stateofus] [utils.i18n :as i18n]) (:require-macros [legacy.status-im.utils.views :as views])) diff --git a/src/legacy/status_im/ui/screens/profile/visibility_status/utils.cljs b/src/legacy/status_im/ui/screens/profile/visibility_status/utils.cljs index 4a286cb6d8..5d10d4bf1b 100644 --- a/src/legacy/status_im/ui/screens/profile/visibility_status/utils.cljs +++ b/src/legacy/status_im/ui/screens/profile/visibility_status/utils.cljs @@ -3,7 +3,7 @@ [legacy.status-im.ui.components.colors :as colors] [legacy.status-im.ui.screens.profile.visibility-status.styles :as styles] [quo.foundations.colors :as quo.colors] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/ui/screens/profile/visibility_status/views.cljs b/src/legacy/status_im/ui/screens/profile/visibility_status/views.cljs index 19ab2ad3bd..0402dc7018 100644 --- a/src/legacy/status_im/ui/screens/profile/visibility_status/views.cljs +++ b/src/legacy/status_im/ui/screens/profile/visibility_status/views.cljs @@ -12,7 +12,7 @@ [react-native.core :as rn] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.re-frame :as rf])) ;; === Code Related to visibility-status-button === diff --git a/src/legacy/status_im/ui/screens/qr_scanner/views.cljs b/src/legacy/status_im/ui/screens/qr_scanner/views.cljs index 1b3e380bf9..288ddfe07b 100644 --- a/src/legacy/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/legacy/status_im/ui/screens/qr_scanner/views.cljs @@ -10,7 +10,7 @@ [react-native.camera-kit :as camera-kit] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.config :as config] + [status-im.config :as config] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/ui/screens/rpc_usage_info.cljs b/src/legacy/status_im/ui/screens/rpc_usage_info.cljs index 3d386d828f..1a3a3061ba 100644 --- a/src/legacy/status_im/ui/screens/rpc_usage_info.cljs +++ b/src/legacy/status_im/ui/screens/rpc_usage_info.cljs @@ -8,7 +8,7 @@ [re-frame.core :as re-frame] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.json-rpc.events :as json-rpc] + [status-im.common.json-rpc.events :as json-rpc] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/ui/screens/screens.cljs b/src/legacy/status_im/ui/screens/screens.cljs index 70f10060b7..b8e22dd4f6 100644 --- a/src/legacy/status_im/ui/screens/screens.cljs +++ b/src/legacy/status_im/ui/screens/screens.cljs @@ -69,7 +69,7 @@ [legacy.status-im.ui.screens.wallet.settings.views :as wallet-settings] [legacy.status-im.ui.screens.wallet.swap.views :as wallet.swap] [legacy.status-im.ui.screens.wallet.transactions.views :as wallet-transactions] - [status-im2.contexts.chat.group-details.view :as group-details] + [status-im.contexts.chat.group-details.view :as group-details] [utils.i18n :as i18n])) (defn right-button-options diff --git a/src/legacy/status_im/ui/screens/signing/views.cljs b/src/legacy/status_im/ui/screens/signing/views.cljs index da02e8b8be..762d9b019b 100644 --- a/src/legacy/status_im/ui/screens/signing/views.cljs +++ b/src/legacy/status_im/ui/screens/signing/views.cljs @@ -25,7 +25,7 @@ [re-frame.core :as re-frame] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n] [utils.security.core :as security])) diff --git a/src/legacy/status_im/ui/screens/sync_settings/views.cljs b/src/legacy/status_im/ui/screens/sync_settings/views.cljs index c4ca40c528..2d9c0c0e7b 100644 --- a/src/legacy/status_im/ui/screens/sync_settings/views.cljs +++ b/src/legacy/status_im/ui/screens/sync_settings/views.cljs @@ -6,7 +6,7 @@ [legacy.status-im.ui.components.list.item :as list.item] [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n])) (views/defview sync-settings diff --git a/src/legacy/status_im/ui/screens/wallet/account/views.cljs b/src/legacy/status_im/ui/screens/wallet/account/views.cljs index d75936eadb..32604b31fe 100644 --- a/src/legacy/status_im/ui/screens/wallet/account/views.cljs +++ b/src/legacy/status_im/ui/screens/wallet/account/views.cljs @@ -18,7 +18,7 @@ [quo.foundations.colors :as quo.colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.config :as config] + [status-im.config :as config] [utils.address :as address] [utils.i18n :as i18n] [utils.re-frame :as rf]) diff --git a/src/legacy/status_im/ui/screens/wallet/request/views.cljs b/src/legacy/status_im/ui/screens/wallet/request/views.cljs index 1e8db85c1c..18157dd297 100644 --- a/src/legacy/status_im/ui/screens/wallet/request/views.cljs +++ b/src/legacy/status_im/ui/screens/wallet/request/views.cljs @@ -5,7 +5,7 @@ [legacy.status-im.ui.components.react :as react] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.common.qr-codes.view :as qr-codes] + [status-im.common.qr-codes.view :as qr-codes] [utils.ethereum.eip.eip55 :as eip55] [utils.ethereum.eip.eip681 :as eip681] [utils.i18n :as i18n]) diff --git a/src/legacy/status_im/ui/screens/wallet/send/views.cljs b/src/legacy/status_im/ui/screens/wallet/send/views.cljs index 8ab9f99700..c8bd0a57e6 100644 --- a/src/legacy/status_im/ui/screens/wallet/send/views.cljs +++ b/src/legacy/status_im/ui/screens/wallet/send/views.cljs @@ -17,7 +17,7 @@ [legacy.status-im.wallet.utils :as wallet.utils] [quo.core :as quo] [re-frame.core :as re-frame] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.contexts.profile.utils :as profile.utils] [utils.address :as address] [utils.i18n :as i18n] [utils.money :as money])) diff --git a/src/legacy/status_im/utils/js_resources.cljs b/src/legacy/status_im/utils/js_resources.cljs index 80d0d083cd..e6cad669a9 100644 --- a/src/legacy/status_im/utils/js_resources.cljs +++ b/src/legacy/status_im/utils/js_resources.cljs @@ -1,7 +1,7 @@ (ns legacy.status-im.utils.js-resources (:require-macros [legacy.status-im.utils.slurp :refer [slurp]]) (:require - [status-im2.config :as config])) + [status-im.config :as config])) (def provider-file (slurp "resources/js/provider.js")) (defn ethereum-provider diff --git a/src/legacy/status_im/utils/logging/core.cljs b/src/legacy/status_im/utils/logging/core.cljs index c6d8a4a311..4ee13a662b 100644 --- a/src/legacy/status_im/utils/logging/core.cljs +++ b/src/legacy/status_im/utils/logging/core.cljs @@ -10,8 +10,8 @@ [re-frame.core :as re-frame] [react-native.mail :as react-native-mail] [react-native.platform :as platform] - [status-im2.common.log :as log] - [status-im2.config :as config] + [status-im.common.log :as log] + [status-im.config :as config] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/utils/prices.cljs b/src/legacy/status_im/utils/prices.cljs index 7fef3c5920..71b43df6f8 100644 --- a/src/legacy/status_im/utils/prices.cljs +++ b/src/legacy/status_im/utils/prices.cljs @@ -1,6 +1,6 @@ (ns legacy.status-im.utils.prices (:require - [status-im2.common.json-rpc.events :as json-rpc])) + [status-im.common.json-rpc.events :as json-rpc])) (defn- format-price-resp [resp to mainnet?] diff --git a/src/legacy/status_im/visibility_status_updates/core.cljs b/src/legacy/status_im/visibility_status_updates/core.cljs index e9480f9d99..6a3bc254b5 100644 --- a/src/legacy/status_im/visibility_status_updates/core.cljs +++ b/src/legacy/status_im/visibility_status_updates/core.cljs @@ -3,7 +3,7 @@ [legacy.status-im.data-store.visibility-status-updates :as visibility-status-updates-store] [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [legacy.status-im.ui.screens.profile.visibility-status.utils :as utils] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.datetime :as datetime] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/waku/core.cljs b/src/legacy/status_im/waku/core.cljs index 2b8bf5da12..d2a0f4d331 100644 --- a/src/legacy/status_im/waku/core.cljs +++ b/src/legacy/status_im/waku/core.cljs @@ -4,7 +4,7 @@ [legacy.status-im.multiaccounts.update.core :as multiaccounts.update] [legacy.status-im.node.core :as node] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/legacy/status_im/wallet/accounts/core.cljs b/src/legacy/status_im/wallet/accounts/core.cljs index c7d2d94fac..2269310350 100644 --- a/src/legacy/status_im/wallet/accounts/core.cljs +++ b/src/legacy/status_im/wallet/accounts/core.cljs @@ -13,8 +13,8 @@ [legacy.status-im.wallet.prices :as prices] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.navigation.events :as navigation] + [status-im.constants :as constants] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.address :as address] [utils.ens.stateofus :as stateofus] diff --git a/src/legacy/status_im/wallet/choose_recipient/core.cljs b/src/legacy/status_im/wallet/choose_recipient/core.cljs index 079a59c8a9..d1d2f26366 100644 --- a/src/legacy/status_im/wallet/choose_recipient/core.cljs +++ b/src/legacy/status_im/wallet/choose_recipient/core.cljs @@ -8,8 +8,8 @@ [legacy.status-im.qr-scanner.core :as qr-scaner] [legacy.status-im.wallet.utils :as wallet.utils] [re-frame.core :as re-frame] - [status-im2.common.router :as router] - [status-im2.navigation.events :as navigation] + [status-im.common.router :as router] + [status-im.navigation.events :as navigation] [utils.ethereum.chain :as chain] [utils.i18n :as i18n] [utils.money :as money] diff --git a/src/legacy/status_im/wallet/core.cljs b/src/legacy/status_im/wallet/core.cljs index 2d397e5387..266c8ce4dd 100644 --- a/src/legacy/status_im/wallet/core.cljs +++ b/src/legacy/status_im/wallet/core.cljs @@ -21,9 +21,9 @@ [native-module.core :as native-module] [re-frame.core :as re-frame] [react-native.async-storage :as async-storage] - [status-im2.common.json-rpc.events :as json-rpc] - [status-im2.config :as config] - [status-im2.navigation.events :as navigation] + [status-im.common.json-rpc.events :as json-rpc] + [status-im.config :as config] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.datetime :as datetime] [utils.ens.stateofus :as stateofus] diff --git a/src/legacy/status_im/wallet/custom_tokens/core.cljs b/src/legacy/status_im/wallet/custom_tokens/core.cljs index 1e2396bee2..6e02310836 100644 --- a/src/legacy/status_im/wallet/custom_tokens/core.cljs +++ b/src/legacy/status_im/wallet/custom_tokens/core.cljs @@ -6,7 +6,7 @@ [legacy.status-im.wallet.core :as wallet] [legacy.status-im.wallet.prices :as prices] [re-frame.core :as re-frame] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [utils.address :as address] [utils.ethereum.chain :as chain] [utils.i18n :as i18n] diff --git a/src/legacy/status_im/wallet/recipient/core.cljs b/src/legacy/status_im/wallet/recipient/core.cljs index 888ce0942b..7de0b04301 100644 --- a/src/legacy/status_im/wallet/recipient/core.cljs +++ b/src/legacy/status_im/wallet/recipient/core.cljs @@ -6,8 +6,8 @@ [legacy.status-im.utils.random :as random] [legacy.status-im.utils.utils :as utils] [re-frame.core :as re-frame] - [status-im2.common.json-rpc.events :as json-rpc] - [status-im2.navigation.events :as navigation] + [status-im.common.json-rpc.events :as json-rpc] + [status-im.navigation.events :as navigation] [utils.address :as address] [utils.ens.core :as utils.ens] [utils.ens.stateofus :as stateofus] diff --git a/src/legacy/status_im/wallet/swap/core.cljs b/src/legacy/status_im/wallet/swap/core.cljs index bcf01330f3..17e61a2320 100644 --- a/src/legacy/status_im/wallet/swap/core.cljs +++ b/src/legacy/status_im/wallet/swap/core.cljs @@ -2,7 +2,7 @@ (:require [re-frame.core :as re-frame] [re-frame.db :as re-frame.db] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [utils.re-frame :as rf])) ;; "source? true" means we are selecting the source asset. false implies diff --git a/src/quo/README.md b/src/quo/README.md index d2bb142321..5ef3e5a7ca 100644 --- a/src/quo/README.md +++ b/src/quo/README.md @@ -199,7 +199,7 @@ file. ## Preview screens Every component should be accompanied by a preview screen in -`src/status_im2/contexts/quo_preview/`. Ideally, **all possible variations in +`src/status_im/contexts/quo_preview/`. Ideally, **all possible variations in Figma should be achievable in the preview screen** by changing the input values without resorting to code changes. Designers will also use this capability to review components in PR builds. diff --git a/src/status_im2/common/alert/effects.cljs b/src/status_im/common/alert/effects.cljs similarity index 98% rename from src/status_im2/common/alert/effects.cljs rename to src/status_im/common/alert/effects.cljs index a511308b53..ded9469c8b 100644 --- a/src/status_im2/common/alert/effects.cljs +++ b/src/status_im/common/alert/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.alert.effects +(ns status-im.common.alert.effects (:require [react-native.core :as rn] [utils.i18n :as i18n] diff --git a/src/status_im2/common/async_storage/effects.cljs b/src/status_im/common/async_storage/effects.cljs similarity index 85% rename from src/status_im2/common/async_storage/effects.cljs rename to src/status_im/common/async_storage/effects.cljs index 9943a2ecca..9ee9722ee3 100644 --- a/src/status_im2/common/async_storage/effects.cljs +++ b/src/status_im/common/async_storage/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.async-storage.effects +(ns status-im.common.async-storage.effects (:require [react-native.async-storage :as async-storage] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/biometric/events.cljs b/src/status_im/common/biometric/events.cljs similarity index 98% rename from src/status_im2/common/biometric/events.cljs rename to src/status_im/common/biometric/events.cljs index 30fbe694cc..0c95eabcb9 100644 --- a/src/status_im2/common/biometric/events.cljs +++ b/src/status_im/common/biometric/events.cljs @@ -1,11 +1,11 @@ -(ns status-im2.common.biometric.events +(ns status-im.common.biometric.events (:require [native-module.core :as native-module] [re-frame.core :as re-frame] [react-native.async-storage :as async-storage] [react-native.platform :as platform] [react-native.touch-id :as touch-id] - [status-im2.common.keychain.events :as keychain] + [status-im.common.keychain.events :as keychain] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/bottom_sheet/style.cljs b/src/status_im/common/bottom_sheet/style.cljs similarity index 97% rename from src/status_im2/common/bottom_sheet/style.cljs rename to src/status_im/common/bottom_sheet/style.cljs index bc8333f0cd..57d32ad859 100644 --- a/src/status_im2/common/bottom_sheet/style.cljs +++ b/src/status_im/common/bottom_sheet/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.bottom-sheet.style +(ns status-im.common.bottom-sheet.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/common/bottom_sheet/view.cljs b/src/status_im/common/bottom_sheet/view.cljs similarity index 98% rename from src/status_im2/common/bottom_sheet/view.cljs rename to src/status_im/common/bottom_sheet/view.cljs index 896a8c5cc3..bfea473eff 100644 --- a/src/status_im2/common/bottom_sheet/view.cljs +++ b/src/status_im/common/bottom_sheet/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.bottom-sheet.view +(ns status-im.common.bottom-sheet.view (:require [oops.core :as oops] [quo.core :as quo] @@ -10,7 +10,7 @@ [react-native.hooks :as hooks] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.common.bottom-sheet.style :as style] + [status-im.common.bottom-sheet.style :as style] [utils.re-frame :as rf])) (def duration 450) diff --git a/src/status_im2/common/bottom_sheet_screen/style.cljs b/src/status_im/common/bottom_sheet_screen/style.cljs similarity index 96% rename from src/status_im2/common/bottom_sheet_screen/style.cljs rename to src/status_im/common/bottom_sheet_screen/style.cljs index 3510ec8fc7..710c65dd22 100644 --- a/src/status_im2/common/bottom_sheet_screen/style.cljs +++ b/src/status_im/common/bottom_sheet_screen/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.bottom-sheet-screen.style +(ns status-im.common.bottom-sheet-screen.style (:require [quo.foundations.colors :as colors] [quo.theme :as theme] diff --git a/src/status_im2/common/bottom_sheet_screen/view.cljs b/src/status_im/common/bottom_sheet_screen/view.cljs similarity index 97% rename from src/status_im2/common/bottom_sheet_screen/view.cljs rename to src/status_im/common/bottom_sheet_screen/view.cljs index e7f1706141..b1a240a276 100644 --- a/src/status_im2/common/bottom_sheet_screen/view.cljs +++ b/src/status_im/common/bottom_sheet_screen/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.bottom-sheet-screen.view +(ns status-im.common.bottom-sheet-screen.view (:require [oops.core :as oops] [quo.theme :as theme] @@ -9,7 +9,7 @@ [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.bottom-sheet-screen.style :as style] + [status-im.common.bottom-sheet-screen.style :as style] [utils.re-frame :as rf])) (def ^:const drag-threshold 200) diff --git a/src/status_im2/common/confirmation_drawer/style.cljs b/src/status_im/common/confirmation_drawer/style.cljs similarity index 90% rename from src/status_im2/common/confirmation_drawer/style.cljs rename to src/status_im/common/confirmation_drawer/style.cljs index 2170a37255..f81af5d98c 100644 --- a/src/status_im2/common/confirmation_drawer/style.cljs +++ b/src/status_im/common/confirmation_drawer/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.confirmation-drawer.style +(ns status-im.common.confirmation-drawer.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/common/confirmation_drawer/view.cljs b/src/status_im/common/confirmation_drawer/view.cljs similarity index 96% rename from src/status_im2/common/confirmation_drawer/view.cljs rename to src/status_im/common/confirmation_drawer/view.cljs index 395375d625..658a7c4d7b 100644 --- a/src/status_im2/common/confirmation_drawer/view.cljs +++ b/src/status_im/common/confirmation_drawer/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.common.confirmation-drawer.view +(ns status-im.common.confirmation-drawer.view (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.confirmation-drawer.style :as style] + [status-im.common.confirmation-drawer.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/contact_list/view.cljs b/src/status_im/common/contact_list/view.cljs similarity index 74% rename from src/status_im2/common/contact_list/view.cljs rename to src/status_im/common/contact_list/view.cljs index 614ca6c8cd..7391a9ae60 100644 --- a/src/status_im2/common/contact_list/view.cljs +++ b/src/status_im/common/contact_list/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.contact-list.view +(ns status-im.common.contact-list.view (:require [quo.core :as quo])) diff --git a/src/status_im2/common/contact_list_item/view.cljs b/src/status_im/common/contact_list_item/view.cljs similarity index 94% rename from src/status_im2/common/contact_list_item/view.cljs rename to src/status_im/common/contact_list_item/view.cljs index 1e087c56dd..01863dc120 100644 --- a/src/status_im2/common/contact_list_item/view.cljs +++ b/src/status_im/common/contact_list_item/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.contact-list-item.view +(ns status-im.common.contact-list-item.view (:require [quo.core :as quo] [utils.address :as address] diff --git a/src/status_im2/common/data_store/wallet.cljs b/src/status_im/common/data_store/wallet.cljs similarity index 96% rename from src/status_im2/common/data_store/wallet.cljs rename to src/status_im/common/data_store/wallet.cljs index b57fa63a02..936a210668 100644 --- a/src/status_im2/common/data_store/wallet.cljs +++ b/src/status_im/common/data_store/wallet.cljs @@ -1,8 +1,8 @@ -(ns status-im2.common.data-store.wallet +(ns status-im.common.data-store.wallet (:require [clojure.set :as set] [clojure.string :as string] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.number :as utils.number])) (defn chain-ids-string->set diff --git a/src/status_im2/common/device_permissions.cljs b/src/status_im/common/device_permissions.cljs similarity index 92% rename from src/status_im2/common/device_permissions.cljs rename to src/status_im/common/device_permissions.cljs index bf1143dd46..6cca1465bb 100644 --- a/src/status_im2/common/device_permissions.cljs +++ b/src/status_im/common/device_permissions.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.device-permissions +(ns status-im.common.device-permissions (:require [quo.foundations.colors :as colors] [utils.i18n :as i18n] diff --git a/src/status_im2/common/floating_button_page/component_spec.cljs b/src/status_im/common/floating_button_page/component_spec.cljs similarity index 90% rename from src/status_im2/common/floating_button_page/component_spec.cljs rename to src/status_im/common/floating_button_page/component_spec.cljs index 16e3d80b41..aa7ff9951f 100644 --- a/src/status_im2/common/floating_button_page/component_spec.cljs +++ b/src/status_im/common/floating_button_page/component_spec.cljs @@ -1,6 +1,6 @@ -(ns status-im2.common.floating-button-page.component-spec +(ns status-im.common.floating-button-page.component-spec (:require [quo.core :as quo] - [status-im2.common.floating-button-page.view :as floating-button-page] + [status-im.common.floating-button-page.view :as floating-button-page] [test-helpers.component :as h])) (h/describe "floating button page" diff --git a/src/status_im2/common/floating_button_page/floating_container/style.cljs b/src/status_im/common/floating_button_page/floating_container/style.cljs similarity index 89% rename from src/status_im2/common/floating_button_page/floating_container/style.cljs rename to src/status_im/common/floating_button_page/floating_container/style.cljs index d82b63c6cc..58c59c8a48 100644 --- a/src/status_im2/common/floating_button_page/floating_container/style.cljs +++ b/src/status_im/common/floating_button_page/floating_container/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.floating-button-page.floating-container.style +(ns status-im.common.floating-button-page.floating-container.style (:require [react-native.safe-area :as safe-area])) (defn content-container diff --git a/src/status_im2/common/floating_button_page/floating_container/view.cljs b/src/status_im/common/floating_button_page/floating_container/view.cljs similarity index 79% rename from src/status_im2/common/floating_button_page/floating_container/view.cljs rename to src/status_im/common/floating_button_page/floating_container/view.cljs index e176c721ec..e069909f44 100644 --- a/src/status_im2/common/floating_button_page/floating_container/view.cljs +++ b/src/status_im/common/floating_button_page/floating_container/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.common.floating-button-page.floating-container.view +(ns status-im.common.floating-button-page.floating-container.view (:require [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] - [status-im2.common.floating-button-page.floating-container.style :as style])) + [status-im.common.floating-button-page.floating-container.style :as style])) (defn- blur-container [child theme] diff --git a/src/status_im2/common/floating_button_page/style.cljs b/src/status_im/common/floating_button_page/style.cljs similarity index 81% rename from src/status_im2/common/floating_button_page/style.cljs rename to src/status_im/common/floating_button_page/style.cljs index d6e530676f..27bf4be28e 100644 --- a/src/status_im2/common/floating_button_page/style.cljs +++ b/src/status_im/common/floating_button_page/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.floating-button-page.style) +(ns status-im.common.floating-button-page.style) (def page-container {:position :absolute diff --git a/src/status_im2/common/floating_button_page/view.cljs b/src/status_im/common/floating_button_page/view.cljs similarity index 96% rename from src/status_im2/common/floating_button_page/view.cljs rename to src/status_im/common/floating_button_page/view.cljs index 19ebe8285d..f4ef017e73 100644 --- a/src/status_im2/common/floating_button_page/view.cljs +++ b/src/status_im/common/floating_button_page/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.common.floating-button-page.view +(ns status-im.common.floating-button-page.view (:require [oops.core :as oops] [react-native.core :as rn] [react-native.platform :as platform] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.floating-button-page.floating-container.view :as floating-container] - [status-im2.common.floating-button-page.style :as style])) + [status-im.common.floating-button-page.floating-container.view :as floating-container] + [status-im.common.floating-button-page.style :as style])) (defn- show-background [{:keys [window-height keyboard-height footer-container-height content-scroll-y diff --git a/src/status_im2/common/font/effects.cljs b/src/status_im/common/font/effects.cljs similarity index 84% rename from src/status_im2/common/font/effects.cljs rename to src/status_im/common/font/effects.cljs index 894016653e..169729bc0f 100644 --- a/src/status_im2/common/font/effects.cljs +++ b/src/status_im/common/font/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.font.effects +(ns status-im.common.font.effects (:require utils.image-server [utils.re-frame :as rf])) diff --git a/src/status_im2/common/font/events.cljs b/src/status_im/common/font/events.cljs similarity index 82% rename from src/status_im2/common/font/events.cljs rename to src/status_im/common/font/events.cljs index 863ef38e7d..e54d882b8e 100644 --- a/src/status_im2/common/font/events.cljs +++ b/src/status_im/common/font/events.cljs @@ -1,7 +1,7 @@ -(ns status-im2.common.font.events +(ns status-im.common.font.events (:require [clojure.string :as string] - status-im2.common.font.effects + status-im.common.font.effects [utils.re-frame :as rf])) (rf/defn init-abs-root-path diff --git a/src/status_im2/common/home/actions/view.cljs b/src/status_im/common/home/actions/view.cljs similarity index 97% rename from src/status_im2/common/home/actions/view.cljs rename to src/status_im/common/home/actions/view.cljs index 3e4a21f4c2..9a46193cab 100644 --- a/src/status_im2/common/home/actions/view.cljs +++ b/src/status_im/common/home/actions/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.common.home.actions.view +(ns status-im.common.home.actions.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] - [status-im2.common.confirmation-drawer.view :as confirmation-drawer] - [status-im2.common.mute-drawer.view :as mute-drawer] - [status-im2.common.muting.helpers :refer [format-mute-till]] - [status-im2.constants :as constants] - [status-im2.contexts.communities.actions.chat.view :as chat-actions] - [status-im2.contexts.contacts.drawers.nickname-drawer.view :as nickname-drawer] + [status-im.common.confirmation-drawer.view :as confirmation-drawer] + [status-im.common.mute-drawer.view :as mute-drawer] + [status-im.common.muting.helpers :refer [format-mute-till]] + [status-im.constants :as constants] + [status-im.contexts.communities.actions.chat.view :as chat-actions] + [status-im.contexts.contacts.drawers.nickname-drawer.view :as nickname-drawer] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/home/banner/style.cljs b/src/status_im/common/home/banner/style.cljs similarity index 98% rename from src/status_im2/common/home/banner/style.cljs rename to src/status_im/common/home/banner/style.cljs index deedcc9529..eb19fec314 100644 --- a/src/status_im2/common/home/banner/style.cljs +++ b/src/status_im/common/home/banner/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.home.banner.style +(ns status-im.common.home.banner.style (:require [react-native.platform :as platform] [react-native.reanimated :as reanimated] diff --git a/src/status_im2/common/home/banner/view.cljs b/src/status_im/common/home/banner/view.cljs similarity index 94% rename from src/status_im2/common/home/banner/view.cljs rename to src/status_im/common/home/banner/view.cljs index 976ffe92d0..3a90532080 100644 --- a/src/status_im2/common/home/banner/view.cljs +++ b/src/status_im/common/home/banner/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.home.banner.view +(ns status-im.common.home.banner.view (:require [oops.core :as oops] [quo.core :as quo] @@ -9,9 +9,9 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.common.home.banner.style :as style] - [status-im2.common.home.title-column.view :as title-column] - [status-im2.common.home.top-nav.view :as top-nav] + [status-im.common.home.banner.style :as style] + [status-im.common.home.title-column.view :as title-column] + [status-im.common.home.top-nav.view :as top-nav] [utils.re-frame :as rf])) (def card-banner-overflow-threshold 3) diff --git a/src/status_im/common/home/constants.cljs b/src/status_im/common/home/constants.cljs new file mode 100644 index 0000000000..c0a66c0012 --- /dev/null +++ b/src/status_im/common/home/constants.cljs @@ -0,0 +1,3 @@ +(ns status-im.common.home.constants) + +(def header-height 245) diff --git a/src/status_im2/common/home/empty_state/style.cljs b/src/status_im/common/home/empty_state/style.cljs similarity index 69% rename from src/status_im2/common/home/empty_state/style.cljs rename to src/status_im/common/home/empty_state/style.cljs index 805efcb2b3..dacd6303f5 100644 --- a/src/status_im2/common/home/empty_state/style.cljs +++ b/src/status_im/common/home/empty_state/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.common.home.empty-state.style +(ns status-im.common.home.empty-state.style (:require [react-native.safe-area :as safe-area] - [status-im2.common.home.constants :as constants])) + [status-im.common.home.constants :as constants])) (defn empty-state-container [] diff --git a/src/status_im2/common/home/empty_state/view.cljs b/src/status_im/common/home/empty_state/view.cljs similarity index 84% rename from src/status_im2/common/home/empty_state/view.cljs rename to src/status_im/common/home/empty_state/view.cljs index ba026fd6d3..24de84275a 100644 --- a/src/status_im2/common/home/empty_state/view.cljs +++ b/src/status_im/common/home/empty_state/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.common.home.empty-state.view +(ns status-im.common.home.empty-state.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.common.home.empty-state.style :as style] + [status-im.common.home.empty-state.style :as style] [utils.re-frame :as rf])) (defn view diff --git a/src/status_im2/common/home/header_spacing/style.cljs b/src/status_im/common/home/header_spacing/style.cljs similarity index 58% rename from src/status_im2/common/home/header_spacing/style.cljs rename to src/status_im/common/home/header_spacing/style.cljs index 90c562c33f..81a732fb7a 100644 --- a/src/status_im2/common/home/header_spacing/style.cljs +++ b/src/status_im/common/home/header_spacing/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.common.home.header-spacing.style +(ns status-im.common.home.header-spacing.style (:require [react-native.safe-area :as safe-area] - [status-im2.common.home.constants :as constants])) + [status-im.common.home.constants :as constants])) (defn header-spacing [] diff --git a/src/status_im/common/home/header_spacing/view.cljs b/src/status_im/common/home/header_spacing/view.cljs new file mode 100644 index 0000000000..efb9551285 --- /dev/null +++ b/src/status_im/common/home/header_spacing/view.cljs @@ -0,0 +1,8 @@ +(ns status-im.common.home.header-spacing.view + (:require + [react-native.core :as rn] + [status-im.common.home.header-spacing.style :as style])) + +(defn view + [] + [rn/view {:style (style/header-spacing)}]) diff --git a/src/status_im2/common/home/title_column/style.cljs b/src/status_im/common/home/title_column/style.cljs similarity index 88% rename from src/status_im2/common/home/title_column/style.cljs rename to src/status_im/common/home/title_column/style.cljs index 9b135e2d9e..37b2ebc2c4 100644 --- a/src/status_im2/common/home/title_column/style.cljs +++ b/src/status_im/common/home/title_column/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.home.title-column.style) +(ns status-im.common.home.title-column.style) (def title-column {:flex-direction :row diff --git a/src/status_im2/common/home/title_column/view.cljs b/src/status_im/common/home/title_column/view.cljs similarity index 72% rename from src/status_im2/common/home/title_column/view.cljs rename to src/status_im/common/home/title_column/view.cljs index 5fd16ca5af..907314f59b 100644 --- a/src/status_im2/common/home/title_column/view.cljs +++ b/src/status_im/common/home/title_column/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.common.home.title-column.view +(ns status-im.common.home.title-column.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.common.home.title-column.style :as style] - [status-im2.common.plus-button.view :as plus-button])) + [status-im.common.home.title-column.style :as style] + [status-im.common.plus-button.view :as plus-button])) (defn view [{:keys [label handler accessibility-label customization-color]}] diff --git a/src/status_im2/common/home/top_nav/style.cljs b/src/status_im/common/home/top_nav/style.cljs similarity index 61% rename from src/status_im2/common/home/top_nav/style.cljs rename to src/status_im/common/home/top_nav/style.cljs index 652eb92745..3d39525211 100644 --- a/src/status_im2/common/home/top_nav/style.cljs +++ b/src/status_im/common/home/top_nav/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.home.top-nav.style) +(ns status-im.common.home.top-nav.style) (def top-nav-container {:margin-left 20 diff --git a/src/status_im2/common/home/top_nav/view.cljs b/src/status_im/common/home/top_nav/view.cljs similarity index 92% rename from src/status_im2/common/home/top_nav/view.cljs rename to src/status_im/common/home/top_nav/view.cljs index 0d7008cc2a..fcea870bd4 100644 --- a/src/status_im2/common/home/top_nav/view.cljs +++ b/src/status_im/common/home/top_nav/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.common.home.top-nav.view +(ns status-im.common.home.top-nav.view (:require [quo.core :as quo] - [status-im2.common.home.top-nav.style :as style] - [status-im2.constants :as constants] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.common.home.top-nav.style :as style] + [status-im.constants :as constants] + [status-im.contexts.profile.utils :as profile.utils] [utils.debounce :refer [dispatch-and-chill]] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/json_rpc/events.cljs b/src/status_im/common/json_rpc/events.cljs similarity index 98% rename from src/status_im2/common/json_rpc/events.cljs rename to src/status_im/common/json_rpc/events.cljs index 97a1af9a8e..bf7c8f5a61 100644 --- a/src/status_im2/common/json_rpc/events.cljs +++ b/src/status_im/common/json_rpc/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.json-rpc.events +(ns status-im.common.json-rpc.events (:require [clojure.string :as string] [native-module.core :as native-module] diff --git a/src/status_im2/common/keychain/events.cljs b/src/status_im/common/keychain/events.cljs similarity index 99% rename from src/status_im2/common/keychain/events.cljs rename to src/status_im/common/keychain/events.cljs index f6eb8e2b27..ae3fd41320 100644 --- a/src/status_im2/common/keychain/events.cljs +++ b/src/status_im/common/keychain/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.keychain.events +(ns status-im.common.keychain.events (:require [native-module.core :as native-module] [oops.core :as oops] diff --git a/src/status_im2/common/log.cljs b/src/status_im/common/log.cljs similarity index 97% rename from src/status_im2/common/log.cljs rename to src/status_im/common/log.cljs index bdc3cbee57..29e620a7a4 100644 --- a/src/status_im2/common/log.cljs +++ b/src/status_im/common/log.cljs @@ -1,10 +1,10 @@ -(ns status-im2.common.log +(ns status-im.common.log (:require [clojure.pprint :as p] [clojure.string :as string] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.config :as config] + [status-im.config :as config] [taoensso.timbre :as log] [utils.re-frame :as rf] [utils.transforms :as transforms])) diff --git a/src/status_im2/common/mute_drawer/style.cljs b/src/status_im/common/mute_drawer/style.cljs similarity index 83% rename from src/status_im2/common/mute_drawer/style.cljs rename to src/status_im/common/mute_drawer/style.cljs index 1b5af913c7..565e46a877 100644 --- a/src/status_im2/common/mute_drawer/style.cljs +++ b/src/status_im/common/mute_drawer/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.mute-drawer.style +(ns status-im.common.mute-drawer.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/common/mute_drawer/view.cljs b/src/status_im/common/mute_drawer/view.cljs similarity index 97% rename from src/status_im2/common/mute_drawer/view.cljs rename to src/status_im/common/mute_drawer/view.cljs index 7c52643a39..3f688750b9 100644 --- a/src/status_im2/common/mute_drawer/view.cljs +++ b/src/status_im/common/mute_drawer/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.common.mute-drawer.view +(ns status-im.common.mute-drawer.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.common.mute-drawer.style :as style] - [status-im2.constants :as constants] + [status-im.common.mute-drawer.style :as style] + [status-im.constants :as constants] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/muting/helpers.cljs b/src/status_im/common/muting/helpers.cljs similarity index 98% rename from src/status_im2/common/muting/helpers.cljs rename to src/status_im/common/muting/helpers.cljs index 46ba529419..818f3531ea 100644 --- a/src/status_im2/common/muting/helpers.cljs +++ b/src/status_im/common/muting/helpers.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.muting.helpers +(ns status-im.common.muting.helpers (:require [cljs-time.core :as t] [utils.datetime :refer diff --git a/src/status_im2/common/muting/helpers_test.cljs b/src/status_im/common/muting/helpers_test.cljs similarity index 98% rename from src/status_im2/common/muting/helpers_test.cljs rename to src/status_im/common/muting/helpers_test.cljs index f44d9ef727..3f85850990 100644 --- a/src/status_im2/common/muting/helpers_test.cljs +++ b/src/status_im/common/muting/helpers_test.cljs @@ -1,11 +1,11 @@ -(ns status-im2.common.muting.helpers-test +(ns status-im.common.muting.helpers-test (:require [cljs-time.coerce :as time-coerce] [cljs-time.core :as t] [cljs-time.format :as t.format] [cljs.test :refer-macros [deftest testing is are]] [clojure.string :as string] - [status-im2.common.muting.helpers :as muting] + [status-im.common.muting.helpers :as muting] [utils.datetime :as datetime])) (def mock-current-time-epoch 1655731506000) diff --git a/src/status_im2/common/not_implemented.cljs b/src/status_im/common/not_implemented.cljs similarity index 85% rename from src/status_im2/common/not_implemented.cljs rename to src/status_im/common/not_implemented.cljs index 46a4f75327..2977d2c1e4 100644 --- a/src/status_im2/common/not_implemented.cljs +++ b/src/status_im/common/not_implemented.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.not-implemented +(ns status-im.common.not-implemented (:require [react-native.core :as rn])) diff --git a/src/status_im2/common/pairing/events.cljs b/src/status_im/common/pairing/events.cljs similarity index 96% rename from src/status_im2/common/pairing/events.cljs rename to src/status_im/common/pairing/events.cljs index 0d10e83681..4af115d84b 100644 --- a/src/status_im2/common/pairing/events.cljs +++ b/src/status_im/common/pairing/events.cljs @@ -1,8 +1,8 @@ -(ns status-im2.common.pairing.events +(ns status-im.common.pairing.events (:require [quo.foundations.colors :as colors] - [status-im2.constants :as constants] - [status-im2.contexts.communities.discover.events] + [status-im.constants :as constants] + [status-im.contexts.communities.discover.events] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/parallax/component_spec.cljs b/src/status_im/common/parallax/component_spec.cljs similarity index 100% rename from src/status_im2/common/parallax/component_spec.cljs rename to src/status_im/common/parallax/component_spec.cljs diff --git a/src/status_im2/common/parallax/style.cljs b/src/status_im/common/parallax/style.cljs similarity index 93% rename from src/status_im2/common/parallax/style.cljs rename to src/status_im/common/parallax/style.cljs index 107bc59cc7..2a2b5c4db8 100644 --- a/src/status_im2/common/parallax/style.cljs +++ b/src/status_im/common/parallax/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.parallax.style +(ns status-im.common.parallax.style (:require [react-native.core :as rn] [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/common/parallax/view.cljs b/src/status_im/common/parallax/view.cljs similarity index 95% rename from src/status_im2/common/parallax/view.cljs rename to src/status_im/common/parallax/view.cljs index 480dd757c1..daf1f32add 100644 --- a/src/status_im2/common/parallax/view.cljs +++ b/src/status_im/common/parallax/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.common.parallax.view +(ns status-im.common.parallax.view (:require [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.transparent-video :as transparent-video] - [status-im2.common.parallax.style :as style] + [status-im.common.parallax.style :as style] [utils.worklets.parallax :as worklets.parallax])) (defn f-sensor-animated-video diff --git a/src/status_im2/common/parallax/whitelist.cljs b/src/status_im/common/parallax/whitelist.cljs similarity index 90% rename from src/status_im2/common/parallax/whitelist.cljs rename to src/status_im/common/parallax/whitelist.cljs index af98ea9a08..efa8ebac5d 100644 --- a/src/status_im2/common/parallax/whitelist.cljs +++ b/src/status_im/common/parallax/whitelist.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.parallax.whitelist +(ns status-im.common.parallax.whitelist (:require [clojure.string :as string] [native-module.core :as native-module])) diff --git a/src/status_im2/common/password_authentication/events.cljs b/src/status_im/common/password_authentication/events.cljs similarity index 76% rename from src/status_im2/common/password_authentication/events.cljs rename to src/status_im/common/password_authentication/events.cljs index 42fa1fc00e..bb5f6c976a 100644 --- a/src/status_im2/common/password_authentication/events.cljs +++ b/src/status_im/common/password_authentication/events.cljs @@ -1,6 +1,6 @@ -(ns status-im2.common.password-authentication.events +(ns status-im.common.password-authentication.events (:require - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [utils.re-frame :as rf])) (rf/defn close diff --git a/src/status_im2/common/password_authentication/view.cljs b/src/status_im/common/password_authentication/view.cljs similarity index 93% rename from src/status_im2/common/password_authentication/view.cljs rename to src/status_im/common/password_authentication/view.cljs index ee3d988f90..c4e609990b 100644 --- a/src/status_im2/common/password_authentication/view.cljs +++ b/src/status_im/common/password_authentication/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.common.password-authentication.view +(ns status-im.common.password-authentication.view (:require [native-module.core :as native-module] [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/pixel_ratio.cljs b/src/status_im/common/pixel_ratio.cljs similarity index 68% rename from src/status_im2/common/pixel_ratio.cljs rename to src/status_im/common/pixel_ratio.cljs index c37f1254f5..6670e1d7f8 100644 --- a/src/status_im2/common/pixel_ratio.cljs +++ b/src/status_im/common/pixel_ratio.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.pixel-ratio +(ns status-im.common.pixel-ratio (:require ["react-native" :as rn])) diff --git a/src/status_im2/common/plus_button/view.cljs b/src/status_im/common/plus_button/view.cljs similarity index 90% rename from src/status_im2/common/plus_button/view.cljs rename to src/status_im/common/plus_button/view.cljs index dc3dda5830..b09f030810 100644 --- a/src/status_im2/common/plus_button/view.cljs +++ b/src/status_im/common/plus_button/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.plus-button.view +(ns status-im.common.plus-button.view (:require [quo.core :as quo])) diff --git a/src/status_im2/common/qr_codes/view.cljs b/src/status_im/common/qr_codes/view.cljs similarity index 99% rename from src/status_im2/common/qr_codes/view.cljs rename to src/status_im/common/qr_codes/view.cljs index 0aa1a6da5c..fa7adce7ad 100644 --- a/src/status_im2/common/qr_codes/view.cljs +++ b/src/status_im/common/qr_codes/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.qr-codes.view +(ns status-im.common.qr-codes.view (:require [quo.core :as quo] [utils.image-server :as image-server] diff --git a/src/status_im2/common/resources.cljs b/src/status_im/common/resources.cljs similarity index 99% rename from src/status_im2/common/resources.cljs rename to src/status_im/common/resources.cljs index 4b3bac8dc0..0b5b989bb7 100644 --- a/src/status_im2/common/resources.cljs +++ b/src/status_im/common/resources.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.resources) +(ns status-im.common.resources) (def ui {:add-new-contact (js/require "../resources/images/ui2/add-contact.png") diff --git a/src/status_im2/common/router.cljs b/src/status_im/common/router.cljs similarity index 98% rename from src/status_im2/common/router.cljs rename to src/status_im/common/router.cljs index bb24294e54..78fe0d09e6 100644 --- a/src/status_im2/common/router.cljs +++ b/src/status_im/common/router.cljs @@ -1,12 +1,12 @@ -(ns status-im2.common.router +(ns status-im.common.router (:require [bidi.bidi :as bidi] [clojure.string :as string] [legacy.status-im.ethereum.ens :as ens] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.contexts.chat.events :as chat.events] + [status-im.constants :as constants] + [status-im.contexts.chat.events :as chat.events] [taoensso.timbre :as log] [utils.address :as address] [utils.ens.core :as utils.ens] diff --git a/src/status_im2/common/router_test.cljs b/src/status_im/common/router_test.cljs similarity index 98% rename from src/status_im2/common/router_test.cljs rename to src/status_im/common/router_test.cljs index ca7bb71306..b9832602cd 100644 --- a/src/status_im2/common/router_test.cljs +++ b/src/status_im/common/router_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.common.router-test +(ns status-im.common.router-test (:require [cljs.test :refer [are deftest]] - [status-im2.common.router :as router])) + [status-im.common.router :as router])) (def public-key "0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073") diff --git a/src/status_im2/common/scan_qr_code/style.cljs b/src/status_im/common/scan_qr_code/style.cljs similarity index 99% rename from src/status_im2/common/scan_qr_code/style.cljs rename to src/status_im/common/scan_qr_code/style.cljs index 5c66a9f1ad..1fc3bde2d0 100644 --- a/src/status_im2/common/scan_qr_code/style.cljs +++ b/src/status_im/common/scan_qr_code/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.scan-qr-code.style +(ns status-im.common.scan-qr-code.style (:require [quo.foundations.colors :as colors])) (def background diff --git a/src/status_im2/common/scan_qr_code/view.cljs b/src/status_im/common/scan_qr_code/view.cljs similarity index 98% rename from src/status_im2/common/scan_qr_code/view.cljs rename to src/status_im/common/scan_qr_code/view.cljs index e4321c2db8..4333cfa618 100644 --- a/src/status_im2/common/scan_qr_code/view.cljs +++ b/src/status_im/common/scan_qr_code/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.scan-qr-code.view +(ns status-im.common.scan-qr-code.view (:require [clojure.string :as string] [oops.core :as oops] [quo.core :as quo] @@ -11,8 +11,8 @@ [react-native.permissions :as permissions] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.device-permissions :as device-permissions] - [status-im2.common.scan-qr-code.style :as style] + [status-im.common.device-permissions :as device-permissions] + [status-im.common.scan-qr-code.style :as style] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/common/scroll_page/style.cljs b/src/status_im/common/scroll_page/style.cljs similarity index 98% rename from src/status_im2/common/scroll_page/style.cljs rename to src/status_im/common/scroll_page/style.cljs index 4daccd8311..aabf6d152c 100644 --- a/src/status_im2/common/scroll_page/style.cljs +++ b/src/status_im/common/scroll_page/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.scroll-page.style +(ns status-im.common.scroll-page.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform] diff --git a/src/status_im2/common/scroll_page/view.cljs b/src/status_im/common/scroll_page/view.cljs similarity index 98% rename from src/status_im2/common/scroll_page/view.cljs rename to src/status_im/common/scroll_page/view.cljs index 5dfd20f8d6..c1f673dffe 100644 --- a/src/status_im2/common/scroll_page/view.cljs +++ b/src/status_im/common/scroll_page/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.common.scroll-page.view +(ns status-im.common.scroll-page.view (:require [oops.core :as oops] [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.common.scroll-page.style :as style] + [status-im.common.scroll-page.style :as style] [utils.re-frame :as rf])) (def negative-scroll-position-0 0) diff --git a/src/status_im2/common/signals/events.cljs b/src/status_im/common/signals/events.cljs similarity index 93% rename from src/status_im2/common/signals/events.cljs rename to src/status_im/common/signals/events.cljs index da05d8bdb7..dc5b57c517 100644 --- a/src/status_im2/common/signals/events.cljs +++ b/src/status_im/common/signals/events.cljs @@ -1,15 +1,15 @@ -(ns status-im2.common.signals.events +(ns status-im.common.signals.events (:require [legacy.status-im.chat.models.message :as models.message] [legacy.status-im.ethereum.subscriptions :as ethereum.subscriptions] [legacy.status-im.mailserver.core :as mailserver] [legacy.status-im.visibility-status-updates.core :as visibility-status-updates] - [status-im2.common.pairing.events :as pairing] - [status-im2.contexts.chat.messages.link-preview.events :as link-preview] - [status-im2.contexts.chat.messages.transport.events :as messages.transport] - [status-im2.contexts.communities.discover.events] - [status-im2.contexts.profile.login.events :as profile.login] - [status-im2.contexts.push-notifications.local.events :as local-notifications] + [status-im.common.pairing.events :as pairing] + [status-im.contexts.chat.messages.link-preview.events :as link-preview] + [status-im.contexts.chat.messages.transport.events :as messages.transport] + [status-im.contexts.communities.discover.events] + [status-im.contexts.profile.login.events :as profile.login] + [status-im.contexts.push-notifications.local.events :as local-notifications] [taoensso.timbre :as log] [utils.re-frame :as rf] [utils.transforms :as transforms])) diff --git a/src/status_im/common/standard_authentication/core.cljs b/src/status_im/common/standard_authentication/core.cljs new file mode 100644 index 0000000000..951238270f --- /dev/null +++ b/src/status_im/common/standard_authentication/core.cljs @@ -0,0 +1,7 @@ +(ns status-im.common.standard-authentication.core + (:require + status-im.common.standard-authentication.password-input.view + status-im.common.standard-authentication.standard-auth.slide-button.view)) + +(def password-input status-im.common.standard-authentication.password-input.view/view) +(def slide-button status-im.common.standard-authentication.standard-auth.slide-button.view/view) diff --git a/src/status_im2/common/standard_authentication/enter_password/style.cljs b/src/status_im/common/standard_authentication/enter_password/style.cljs similarity index 84% rename from src/status_im2/common/standard_authentication/enter_password/style.cljs rename to src/status_im/common/standard_authentication/enter_password/style.cljs index d7668897cc..a691bd5788 100644 --- a/src/status_im2/common/standard_authentication/enter_password/style.cljs +++ b/src/status_im/common/standard_authentication/enter_password/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.standard-authentication.enter-password.style) +(ns status-im.common.standard-authentication.enter-password.style) (def enter-password-container {:margin-horizontal 20 diff --git a/src/status_im2/common/standard_authentication/enter_password/view.cljs b/src/status_im/common/standard_authentication/enter_password/view.cljs similarity index 87% rename from src/status_im2/common/standard_authentication/enter_password/view.cljs rename to src/status_im/common/standard_authentication/enter_password/view.cljs index 124fe931a3..28897ba107 100644 --- a/src/status_im2/common/standard_authentication/enter_password/view.cljs +++ b/src/status_im/common/standard_authentication/enter_password/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.common.standard-authentication.enter-password.view +(ns status-im.common.standard-authentication.enter-password.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.common.standard-authentication.enter-password.style :as style] - [status-im2.common.standard-authentication.password-input.view :as password-input] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.common.standard-authentication.enter-password.style :as style] + [status-im.common.standard-authentication.password-input.view :as password-input] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/standard_authentication/events.cljs b/src/status_im/common/standard_authentication/events.cljs similarity index 82% rename from src/status_im2/common/standard_authentication/events.cljs rename to src/status_im/common/standard_authentication/events.cljs index cdee99547d..96793574b3 100644 --- a/src/status_im2/common/standard_authentication/events.cljs +++ b/src/status_im/common/standard_authentication/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.standard-authentication.events +(ns status-im.common.standard-authentication.events (:require [utils.re-frame :as rf])) diff --git a/src/status_im2/common/standard_authentication/forgot_password_doc/style.cljs b/src/status_im/common/standard_authentication/forgot_password_doc/style.cljs similarity index 70% rename from src/status_im2/common/standard_authentication/forgot_password_doc/style.cljs rename to src/status_im/common/standard_authentication/forgot_password_doc/style.cljs index 1a8ca24dd9..cca8434ce1 100644 --- a/src/status_im2/common/standard_authentication/forgot_password_doc/style.cljs +++ b/src/status_im/common/standard_authentication/forgot_password_doc/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.standard-authentication.forgot-password-doc.style) +(ns status-im.common.standard-authentication.forgot-password-doc.style) (def container {:margin-right 16}) (def step-container {:flex-direction :row :margin-top 14}) diff --git a/src/status_im2/common/standard_authentication/forgot_password_doc/view.cljs b/src/status_im/common/standard_authentication/forgot_password_doc/view.cljs similarity index 92% rename from src/status_im2/common/standard_authentication/forgot_password_doc/view.cljs rename to src/status_im/common/standard_authentication/forgot_password_doc/view.cljs index e472c7cdb3..938c4686a0 100644 --- a/src/status_im2/common/standard_authentication/forgot_password_doc/view.cljs +++ b/src/status_im/common/standard_authentication/forgot_password_doc/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.common.standard-authentication.forgot-password-doc.view +(ns status-im.common.standard-authentication.forgot-password-doc.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.common.standard-authentication.forgot-password-doc.style :as style] + [status-im.common.standard-authentication.forgot-password-doc.style :as style] [utils.i18n :as i18n])) (defn view diff --git a/src/status_im2/common/standard_authentication/password_input/style.cljs b/src/status_im/common/standard_authentication/password_input/style.cljs similarity index 69% rename from src/status_im2/common/standard_authentication/password_input/style.cljs rename to src/status_im/common/standard_authentication/password_input/style.cljs index 2a7c1b4170..ed17677e68 100644 --- a/src/status_im2/common/standard_authentication/password_input/style.cljs +++ b/src/status_im/common/standard_authentication/password_input/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.standard-authentication.password-input.style) +(ns status-im.common.standard-authentication.password-input.style) (def error-message {:margin-top 8 diff --git a/src/status_im2/common/standard_authentication/password_input/view.cljs b/src/status_im/common/standard_authentication/password_input/view.cljs similarity index 91% rename from src/status_im2/common/standard_authentication/password_input/view.cljs rename to src/status_im/common/standard_authentication/password_input/view.cljs index e4914adc40..e3e1834e5d 100644 --- a/src/status_im2/common/standard_authentication/password_input/view.cljs +++ b/src/status_im/common/standard_authentication/password_input/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.common.standard-authentication.password-input.view +(ns status-im.common.standard-authentication.password-input.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [quo.theme :as quo.theme] [react-native.core :as rn] - [status-im2.common.standard-authentication.forgot-password-doc.view :as forgot-password-doc] - [status-im2.common.standard-authentication.password-input.style :as style] + [status-im.common.standard-authentication.forgot-password-doc.view :as forgot-password-doc] + [status-im.common.standard-authentication.password-input.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.security.core :as security])) diff --git a/src/status_im2/common/standard_authentication/standard_auth/authorize.cljs b/src/status_im/common/standard_authentication/standard_auth/authorize.cljs similarity index 95% rename from src/status_im2/common/standard_authentication/standard_auth/authorize.cljs rename to src/status_im/common/standard_authentication/standard_auth/authorize.cljs index bc913a29c6..13e15e2a84 100644 --- a/src/status_im2/common/standard_authentication/standard_auth/authorize.cljs +++ b/src/status_im/common/standard_authentication/standard_auth/authorize.cljs @@ -1,8 +1,8 @@ -(ns status-im2.common.standard-authentication.standard-auth.authorize +(ns status-im.common.standard-authentication.standard-auth.authorize (:require [native-module.core :as native-module] [react-native.touch-id :as biometric] - [status-im2.common.standard-authentication.enter-password.view :as enter-password] + [status-im.common.standard-authentication.enter-password.view :as enter-password] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/common/standard_authentication/standard_auth/slide_button/view.cljs b/src/status_im/common/standard_authentication/standard_auth/slide_button/view.cljs similarity index 92% rename from src/status_im2/common/standard_authentication/standard_auth/slide_button/view.cljs rename to src/status_im/common/standard_authentication/standard_auth/slide_button/view.cljs index 30944ed503..f64ae926c6 100644 --- a/src/status_im2/common/standard_authentication/standard_auth/slide_button/view.cljs +++ b/src/status_im/common/standard_authentication/standard_auth/slide_button/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.common.standard-authentication.standard-auth.slide-button.view +(ns status-im.common.standard-authentication.standard-auth.slide-button.view (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.standard-authentication.standard-auth.authorize :as authorize] + [status-im.common.standard-authentication.standard-auth.authorize :as authorize] [utils.re-frame :as rf])) (defn- view-internal diff --git a/src/status_im2/common/theme/core.cljs b/src/status_im/common/theme/core.cljs similarity index 97% rename from src/status_im2/common/theme/core.cljs rename to src/status_im/common/theme/core.cljs index 43381773bb..ed415db4eb 100644 --- a/src/status_im2/common/theme/core.cljs +++ b/src/status_im/common/theme/core.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.theme.core +(ns status-im.common.theme.core (:require [legacy.status-im.ui.components.colors :as legacy-colors] [oops.core :refer [oget]] diff --git a/src/status_im2/common/theme/events.cljs b/src/status_im/common/theme/events.cljs similarity index 62% rename from src/status_im2/common/theme/events.cljs rename to src/status_im/common/theme/events.cljs index 22600d10d6..01d256ffff 100644 --- a/src/status_im2/common/theme/events.cljs +++ b/src/status_im/common/theme/events.cljs @@ -1,7 +1,7 @@ -(ns status-im2.common.theme.events +(ns status-im.common.theme.events (:require [re-frame.core :as re-frame] - [status-im2.common.theme.core :as theme])) + [status-im.common.theme.core :as theme])) (re-frame/reg-fx :theme/init-theme diff --git a/src/status_im2/common/timer/events.cljs b/src/status_im/common/timer/events.cljs similarity index 92% rename from src/status_im2/common/timer/events.cljs rename to src/status_im/common/timer/events.cljs index b72d1e0ca0..18caa871fb 100644 --- a/src/status_im2/common/timer/events.cljs +++ b/src/status_im/common/timer/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.timer.events +(ns status-im.common.timer.events (:require [re-frame.core :as re-frame] [react-native.background-timer :as background-timer])) diff --git a/src/status_im2/common/toasts/animation.cljs b/src/status_im/common/toasts/animation.cljs similarity index 97% rename from src/status_im2/common/toasts/animation.cljs rename to src/status_im/common/toasts/animation.cljs index 23bbc24b45..efb389956b 100644 --- a/src/status_im2/common/toasts/animation.cljs +++ b/src/status_im/common/toasts/animation.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.toasts.animation +(ns status-im.common.toasts.animation (:require [react-native.gesture :as gesture] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/common/toasts/events.cljs b/src/status_im/common/toasts/events.cljs similarity index 98% rename from src/status_im2/common/toasts/events.cljs rename to src/status_im/common/toasts/events.cljs index bc8931c715..7f66bc48f1 100644 --- a/src/status_im2/common/toasts/events.cljs +++ b/src/status_im/common/toasts/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.toasts.events +(ns status-im.common.toasts.events (:require [utils.re-frame :as rf])) diff --git a/src/status_im2/common/toasts/style.cljs b/src/status_im/common/toasts/style.cljs similarity index 88% rename from src/status_im2/common/toasts/style.cljs rename to src/status_im/common/toasts/style.cljs index 8179f1c85e..9965f10540 100644 --- a/src/status_im2/common/toasts/style.cljs +++ b/src/status_im/common/toasts/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.toasts.style) +(ns status-im.common.toasts.style) (def outmost-transparent-container {:elevation 2 diff --git a/src/status_im2/common/toasts/view.cljs b/src/status_im/common/toasts/view.cljs similarity index 95% rename from src/status_im2/common/toasts/view.cljs rename to src/status_im/common/toasts/view.cljs index 28106c7420..0c473526e5 100644 --- a/src/status_im2/common/toasts/view.cljs +++ b/src/status_im/common/toasts/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.toasts.view +(ns status-im.common.toasts.view (:require [quo.core :as quo] [react-native.background-timer :as background-timer] @@ -6,8 +6,8 @@ [react-native.gesture :as gesture] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.common.toasts.animation :as animation] - [status-im2.common.toasts.style :as style] + [status-im.common.toasts.animation :as animation] + [status-im.common.toasts.style :as style] [utils.re-frame :as rf])) (defn toast diff --git a/src/status_im2/common/universal_links.cljs b/src/status_im/common/universal_links.cljs similarity index 99% rename from src/status_im2/common/universal_links.cljs rename to src/status_im/common/universal_links.cljs index 706feda151..22d8c5cccc 100644 --- a/src/status_im2/common/universal_links.cljs +++ b/src/status_im/common/universal_links.cljs @@ -1,4 +1,4 @@ -(ns status-im2.common.universal-links +(ns status-im.common.universal-links (:require [clojure.string :as string] [native-module.core :as native-module] @@ -6,7 +6,7 @@ [react-native.async-storage :as async-storage] [react-native.core :as rn] [schema.core :as schema] - [status-im2.navigation.events :as navigation] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.ethereum.chain :as chain] [utils.i18n :as i18n] diff --git a/src/status_im2/common/universal_links_test.cljs b/src/status_im/common/universal_links_test.cljs similarity index 98% rename from src/status_im2/common/universal_links_test.cljs rename to src/status_im/common/universal_links_test.cljs index d784440527..2782af0e67 100644 --- a/src/status_im2/common/universal_links_test.cljs +++ b/src/status_im/common/universal_links_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.common.universal-links-test +(ns status-im.common.universal-links-test (:require [cljs.test :refer-macros [deftest is are testing]] [re-frame.core :as re-frame] - [status-im2.common.universal-links :as links])) + [status-im.common.universal-links :as links])) (deftest handle-url-test (testing "the user is not logged in" diff --git a/src/status_im2/config.cljs b/src/status_im/config.cljs similarity index 99% rename from src/status_im2/config.cljs rename to src/status_im/config.cljs index f43b78006c..5cb887d4a4 100644 --- a/src/status_im2/config.cljs +++ b/src/status_im/config.cljs @@ -1,4 +1,4 @@ -(ns status-im2.config +(ns status-im.config (:require [clojure.string :as string] [react-native.config :as react-native-config] diff --git a/src/status_im2/constants.cljs b/src/status_im/constants.cljs similarity index 99% rename from src/status_im2/constants.cljs rename to src/status_im/constants.cljs index 30d8c5fa7e..e13d537396 100644 --- a/src/status_im2/constants.cljs +++ b/src/status_im/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.constants) +(ns status-im.constants) (def ^:const ms-in-bg-for-require-bioauth 5000) diff --git a/src/status_im2/contexts/add_new_contact/effects.cljs b/src/status_im/contexts/add_new_contact/effects.cljs similarity index 88% rename from src/status_im2/contexts/add_new_contact/effects.cljs rename to src/status_im/contexts/add_new_contact/effects.cljs index aa99ec7aee..4ba9c716b6 100644 --- a/src/status_im2/contexts/add_new_contact/effects.cljs +++ b/src/status_im/contexts/add_new_contact/effects.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.add-new-contact.effects +(ns status-im.contexts.add-new-contact.effects (:require [legacy.status-im.ethereum.ens :as ens] [native-module.core :as native-module] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.re-frame :as rf] [utils.transforms :as transforms])) diff --git a/src/status_im2/contexts/add_new_contact/events.cljs b/src/status_im/contexts/add_new_contact/events.cljs similarity index 96% rename from src/status_im2/contexts/add_new_contact/events.cljs rename to src/status_im/contexts/add_new_contact/events.cljs index cb7d91976b..403ffdc0bc 100644 --- a/src/status_im2/contexts/add_new_contact/events.cljs +++ b/src/status_im/contexts/add_new_contact/events.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.add-new-contact.events +(ns status-im.contexts.add-new-contact.events (:require [clojure.string :as string] - status-im2.contexts.add-new-contact.effects - [status-im2.contexts.contacts.events :as data-store.contacts] - [status-im2.navigation.events :as navigation] + status-im.contexts.add-new-contact.effects + [status-im.contexts.contacts.events :as data-store.contacts] + [status-im.navigation.events :as navigation] [utils.ens.stateofus :as stateofus] [utils.ethereum.chain :as chain] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/add_new_contact/events_test.cljs b/src/status_im/contexts/add_new_contact/events_test.cljs similarity index 98% rename from src/status_im2/contexts/add_new_contact/events_test.cljs rename to src/status_im/contexts/add_new_contact/events_test.cljs index fb79020cf4..a2b1e88107 100644 --- a/src/status_im2/contexts/add_new_contact/events_test.cljs +++ b/src/status_im/contexts/add_new_contact/events_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.add-new-contact.events-test +(ns status-im.contexts.add-new-contact.events-test (:require [cljs.test :refer-macros [deftest are]] matcher-combinators.test - [status-im2.contexts.add-new-contact.events :as events])) + [status-im.contexts.add-new-contact.events :as events])) (def user-ukey "0x04ca27ed9c7c4099d230c6d8853ad0cfaf084a019c543e9e433d3c04fac6de9147cf572b10e247cfe52f396b5aa10456b56dd1cf1d8a681e2b93993d44594b2e85") diff --git a/src/status_im2/contexts/add_new_contact/scan/scan_profile_qr_page.cljs b/src/status_im/contexts/add_new_contact/scan/scan_profile_qr_page.cljs similarity index 79% rename from src/status_im2/contexts/add_new_contact/scan/scan_profile_qr_page.cljs rename to src/status_im/contexts/add_new_contact/scan/scan_profile_qr_page.cljs index f7f6973d3e..f91a8101c5 100644 --- a/src/status_im2/contexts/add_new_contact/scan/scan_profile_qr_page.cljs +++ b/src/status_im/contexts/add_new_contact/scan/scan_profile_qr_page.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.add-new-contact.scan.scan-profile-qr-page +(ns status-im.contexts.add-new-contact.scan.scan-profile-qr-page (:require [react-native.core :as rn] [react-native.hooks :as hooks] - [status-im2.common.scan-qr-code.view :as scan-qr-code] + [status-im.common.scan-qr-code.view :as scan-qr-code] [utils.debounce :as debounce] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/add_new_contact/style.cljs b/src/status_im/contexts/add_new_contact/style.cljs similarity index 98% rename from src/status_im2/contexts/add_new_contact/style.cljs rename to src/status_im/contexts/add_new_contact/style.cljs index cd8def4786..471490c3fd 100644 --- a/src/status_im2/contexts/add_new_contact/style.cljs +++ b/src/status_im/contexts/add_new_contact/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.add-new-contact.style +(ns status-im.contexts.add-new-contact.style (:require [quo.foundations.colors :as colors] [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/add_new_contact/views.cljs b/src/status_im/contexts/add_new_contact/views.cljs similarity index 98% rename from src/status_im2/contexts/add_new_contact/views.cljs rename to src/status_im/contexts/add_new_contact/views.cljs index 052f1f2ffa..d0bb606397 100644 --- a/src/status_im2/contexts/add_new_contact/views.cljs +++ b/src/status_im/contexts/add_new_contact/views.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.add-new-contact.views +(ns status-im.contexts.add-new-contact.views (:require [clojure.string :as string] [quo.core :as quo] [react-native.clipboard :as clipboard] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.add-new-contact.style :as style] + [status-im.contexts.add-new-contact.style :as style] [utils.address :as address] [utils.debounce :as debounce] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/actions/view.cljs b/src/status_im/contexts/chat/actions/view.cljs similarity index 94% rename from src/status_im2/contexts/chat/actions/view.cljs rename to src/status_im/contexts/chat/actions/view.cljs index 7a57534385..5898afc543 100644 --- a/src/status_im2/contexts/chat/actions/view.cljs +++ b/src/status_im/contexts/chat/actions/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.actions.view +(ns status-im.contexts.chat.actions.view (:require [quo.core :as quo] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/camera/style.cljs b/src/status_im/contexts/chat/camera/style.cljs similarity index 98% rename from src/status_im2/contexts/chat/camera/style.cljs rename to src/status_im/contexts/chat/camera/style.cljs index 4da4270a1e..89758afd8b 100644 --- a/src/status_im2/contexts/chat/camera/style.cljs +++ b/src/status_im/contexts/chat/camera/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.camera.style +(ns status-im.contexts.chat.camera.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/chat/camera/view.cljs b/src/status_im/contexts/chat/camera/view.cljs similarity index 98% rename from src/status_im2/contexts/chat/camera/view.cljs rename to src/status_im/contexts/chat/camera/view.cljs index 49a7a0ecc7..842491df98 100644 --- a/src/status_im2/contexts/chat/camera/view.cljs +++ b/src/status_im/contexts/chat/camera/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.camera.view +(ns status-im.contexts.chat.camera.view (:require [oops.core :refer [oget]] [quo.core :as quo] @@ -11,7 +11,7 @@ [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.chat.camera.style :as style] + [status-im.contexts.chat.camera.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/actions/style.cljs b/src/status_im/contexts/chat/composer/actions/style.cljs similarity index 86% rename from src/status_im2/contexts/chat/composer/actions/style.cljs rename to src/status_im/contexts/chat/composer/actions/style.cljs index f3a1e25d74..a49030edd1 100644 --- a/src/status_im2/contexts/chat/composer/actions/style.cljs +++ b/src/status_im/contexts/chat/composer/actions/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.composer.actions.style +(ns status-im.contexts.chat.composer.actions.style (:require [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants])) + [status-im.contexts.chat.composer.constants :as constants])) (def actions-container {:height constants/actions-container-height diff --git a/src/status_im2/contexts/chat/composer/actions/view.cljs b/src/status_im/contexts/chat/composer/actions/view.cljs similarity index 97% rename from src/status_im2/contexts/chat/composer/actions/view.cljs rename to src/status_im/contexts/chat/composer/actions/view.cljs index 970b792f8c..b084f7e6ca 100644 --- a/src/status_im2/contexts/chat/composer/actions/view.cljs +++ b/src/status_im/contexts/chat/composer/actions/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.actions.view +(ns status-im.contexts.chat.composer.actions.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -7,11 +7,11 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.common.alert.effects :as alert.effects] - [status-im2.common.device-permissions :as device-permissions] - [status-im2.constants :as constants] - [status-im2.contexts.chat.composer.actions.style :as style] - [status-im2.contexts.chat.composer.constants :as comp-constants] + [status-im.common.alert.effects :as alert.effects] + [status-im.common.device-permissions :as device-permissions] + [status-im.constants :as constants] + [status-im.contexts.chat.composer.actions.style :as style] + [status-im.contexts.chat.composer.constants :as comp-constants] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/constants.cljs b/src/status_im/contexts/chat/composer/constants.cljs similarity index 96% rename from src/status_im2/contexts/chat/composer/constants.cljs rename to src/status_im/contexts/chat/composer/constants.cljs index d101cea05a..6b593ea316 100644 --- a/src/status_im2/contexts/chat/composer/constants.cljs +++ b/src/status_im/contexts/chat/composer/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.constants +(ns status-im.contexts.chat.composer.constants (:require [quo.foundations.typography :as typography] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/chat/composer/edit/style.cljs b/src/status_im/contexts/chat/composer/edit/style.cljs similarity index 88% rename from src/status_im2/contexts/chat/composer/edit/style.cljs rename to src/status_im/contexts/chat/composer/edit/style.cljs index c5c2f5f12e..3ae9becee4 100644 --- a/src/status_im2/contexts/chat/composer/edit/style.cljs +++ b/src/status_im/contexts/chat/composer/edit/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.edit.style) +(ns status-im.contexts.chat.composer.edit.style) (def container {:flex-direction :row diff --git a/src/status_im2/contexts/chat/composer/edit/view.cljs b/src/status_im/contexts/chat/composer/edit/view.cljs similarity index 86% rename from src/status_im2/contexts/chat/composer/edit/view.cljs rename to src/status_im/contexts/chat/composer/edit/view.cljs index 526b3303e4..d2ef69982f 100644 --- a/src/status_im2/contexts/chat/composer/edit/view.cljs +++ b/src/status_im/contexts/chat/composer/edit/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.chat.composer.edit.view +(ns status-im.contexts.chat.composer.edit.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.edit.style :as style] - [status-im2.contexts.chat.composer.utils :as utils] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.edit.style :as style] + [status-im.contexts.chat.composer.utils :as utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/effects.cljs b/src/status_im/contexts/chat/composer/effects.cljs similarity index 97% rename from src/status_im2/contexts/chat/composer/effects.cljs rename to src/status_im/contexts/chat/composer/effects.cljs index 326a05170c..110c1ef926 100644 --- a/src/status_im2/contexts/chat/composer/effects.cljs +++ b/src/status_im/contexts/chat/composer/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.effects +(ns status-im.contexts.chat.composer.effects (:require [clojure.string :as string] [oops.core :as oops] @@ -7,9 +7,9 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.keyboard :as kb] - [status-im2.contexts.chat.composer.utils :as utils] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.keyboard :as kb] + [status-im.contexts.chat.composer.utils :as utils] [utils.number] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/events.cljs b/src/status_im/contexts/chat/composer/events.cljs similarity index 97% rename from src/status_im2/contexts/chat/composer/events.cljs rename to src/status_im/contexts/chat/composer/events.cljs index c5fe437682..0cd274bf84 100644 --- a/src/status_im2/contexts/chat/composer/events.cljs +++ b/src/status_im/contexts/chat/composer/events.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.composer.events +(ns status-im.contexts.chat.composer.events (:require [clojure.string :as string] [legacy.status-im.chat.models.mentions :as mentions] [legacy.status-im.data-store.messages :as data-store-messages] - [status-im2.constants :as constants] - [status-im2.contexts.chat.composer.link-preview.events :as link-preview] - [status-im2.contexts.chat.messages.transport.events :as messages.transport] + [status-im.constants :as constants] + [status-im.contexts.chat.composer.link-preview.events :as link-preview] + [status-im.contexts.chat.messages.transport.events :as messages.transport] [taoensso.timbre :as log] [utils.emojilib :as emoji] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/composer/gesture.cljs b/src/status_im/contexts/chat/composer/gesture.cljs similarity index 97% rename from src/status_im2/contexts/chat/composer/gesture.cljs rename to src/status_im/contexts/chat/composer/gesture.cljs index bc737963a4..1a86184992 100644 --- a/src/status_im2/contexts/chat/composer/gesture.cljs +++ b/src/status_im/contexts/chat/composer/gesture.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.composer.gesture +(ns status-im.contexts.chat.composer.gesture (:require [oops.core :as oops] [react-native.gesture :as gesture] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.utils :as utils] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.utils :as utils] [utils.number] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/gradients/style.cljs b/src/status_im/contexts/chat/composer/gradients/style.cljs similarity index 91% rename from src/status_im2/contexts/chat/composer/gradients/style.cljs rename to src/status_im/contexts/chat/composer/gradients/style.cljs index 54796ba3e2..71cd12dccf 100644 --- a/src/status_im2/contexts/chat/composer/gradients/style.cljs +++ b/src/status_im/contexts/chat/composer/gradients/style.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.chat.composer.gradients.style +(ns status-im.contexts.chat.composer.gradients.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants])) + [status-im.contexts.chat.composer.constants :as constants])) (defn- top-gradient-style [opacity z-index showing-extra-space?] diff --git a/src/status_im2/contexts/chat/composer/gradients/view.cljs b/src/status_im/contexts/chat/composer/gradients/view.cljs similarity index 88% rename from src/status_im2/contexts/chat/composer/gradients/view.cljs rename to src/status_im/contexts/chat/composer/gradients/view.cljs index 165b24c069..e7be37926b 100644 --- a/src/status_im2/contexts/chat/composer/gradients/view.cljs +++ b/src/status_im/contexts/chat/composer/gradients/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.chat.composer.gradients.view +(ns status-im.contexts.chat.composer.gradients.view (:require [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.gradients.style :as style] + [status-im.contexts.chat.composer.gradients.style :as style] [utils.re-frame :as rf])) (defn f-view diff --git a/src/status_im2/contexts/chat/composer/handlers.cljs b/src/status_im/contexts/chat/composer/handlers.cljs similarity index 96% rename from src/status_im2/contexts/chat/composer/handlers.cljs rename to src/status_im/contexts/chat/composer/handlers.cljs index 1231df45cd..733a62326f 100644 --- a/src/status_im2/contexts/chat/composer/handlers.cljs +++ b/src/status_im/contexts/chat/composer/handlers.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.chat.composer.handlers +(ns status-im.contexts.chat.composer.handlers (:require [clojure.string :as string] [oops.core :as oops] [react-native.core :as rn] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.keyboard :as kb] - [status-im2.contexts.chat.composer.selection :as selection] - [status-im2.contexts.chat.composer.utils :as utils] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.keyboard :as kb] + [status-im.contexts.chat.composer.selection :as selection] + [status-im.contexts.chat.composer.utils :as utils] [utils.debounce :as debounce] [utils.number] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/images/style.cljs b/src/status_im/contexts/chat/composer/images/style.cljs similarity index 87% rename from src/status_im2/contexts/chat/composer/images/style.cljs rename to src/status_im/contexts/chat/composer/images/style.cljs index 5657a39cdd..1a8330066a 100644 --- a/src/status_im2/contexts/chat/composer/images/style.cljs +++ b/src/status_im/contexts/chat/composer/images/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.composer.images.style +(ns status-im.contexts.chat.composer.images.style (:require [quo.foundations.colors :as colors] - [status-im2.contexts.chat.composer.constants :as constants])) + [status-im.contexts.chat.composer.constants :as constants])) (def image-container {:padding-top constants/images-padding-top diff --git a/src/status_im2/contexts/chat/composer/images/view.cljs b/src/status_im/contexts/chat/composer/images/view.cljs similarity index 91% rename from src/status_im2/contexts/chat/composer/images/view.cljs rename to src/status_im/contexts/chat/composer/images/view.cljs index bba5725308..0ffbdf4482 100644 --- a/src/status_im2/contexts/chat/composer/images/view.cljs +++ b/src/status_im/contexts/chat/composer/images/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.images.view +(ns status-im.contexts.chat.composer.images.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,8 +6,8 @@ [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.images.style :as style] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.images.style :as style] [utils.re-frame :as rf])) (defn image diff --git a/src/status_im2/contexts/chat/composer/keyboard.cljs b/src/status_im/contexts/chat/composer/keyboard.cljs similarity index 97% rename from src/status_im2/contexts/chat/composer/keyboard.cljs rename to src/status_im/contexts/chat/composer/keyboard.cljs index 352e6b6061..9359cfe6bf 100644 --- a/src/status_im2/contexts/chat/composer/keyboard.cljs +++ b/src/status_im/contexts/chat/composer/keyboard.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.chat.composer.keyboard +(ns status-im.contexts.chat.composer.keyboard (:require [oops.core :as oops] [react-native.async-storage :as async-storage] [react-native.core :as rn] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.utils :as utils])) + [status-im.contexts.chat.composer.utils :as utils])) (defn get-kb-height [curr-height default-height] diff --git a/src/status_im2/contexts/chat/composer/link_preview/events.cljs b/src/status_im/contexts/chat/composer/link_preview/events.cljs similarity index 98% rename from src/status_im2/contexts/chat/composer/link_preview/events.cljs rename to src/status_im/contexts/chat/composer/link_preview/events.cljs index 2a2a73b4f4..3c3af767f6 100644 --- a/src/status_im2/contexts/chat/composer/link_preview/events.cljs +++ b/src/status_im/contexts/chat/composer/link_preview/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.link-preview.events +(ns status-im.contexts.chat.composer.link-preview.events (:require [clojure.set :as set] [clojure.string :as string] diff --git a/src/status_im2/contexts/chat/composer/link_preview/events_test.cljs b/src/status_im/contexts/chat/composer/link_preview/events_test.cljs similarity index 98% rename from src/status_im2/contexts/chat/composer/link_preview/events_test.cljs rename to src/status_im/contexts/chat/composer/link_preview/events_test.cljs index a45659649d..04d629df44 100644 --- a/src/status_im2/contexts/chat/composer/link_preview/events_test.cljs +++ b/src/status_im/contexts/chat/composer/link_preview/events_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.chat.composer.link-preview.events-test +(ns status-im.contexts.chat.composer.link-preview.events-test (:require [cljs.test :refer [deftest is testing]] matcher-combinators.test - [status-im2.contexts.chat.composer.link-preview.events :as events])) + [status-im.contexts.chat.composer.link-preview.events :as events])) (def url-github "https://github.com") (def url-gitlab "https://gitlab.com") diff --git a/src/status_im2/contexts/chat/composer/link_preview/style.cljs b/src/status_im/contexts/chat/composer/link_preview/style.cljs similarity index 74% rename from src/status_im2/contexts/chat/composer/link_preview/style.cljs rename to src/status_im/contexts/chat/composer/link_preview/style.cljs index 068a13d65b..11ca462ef6 100644 --- a/src/status_im2/contexts/chat/composer/link_preview/style.cljs +++ b/src/status_im/contexts/chat/composer/link_preview/style.cljs @@ -1,5 +1,5 @@ -(ns status-im2.contexts.chat.composer.link-preview.style - (:require [status-im2.contexts.chat.composer.constants :as constants])) +(ns status-im.contexts.chat.composer.link-preview.style + (:require [status-im.contexts.chat.composer.constants :as constants])) (def padding-horizontal 20) (def preview-height 56) diff --git a/src/status_im2/contexts/chat/composer/link_preview/view.cljs b/src/status_im/contexts/chat/composer/link_preview/view.cljs similarity index 87% rename from src/status_im2/contexts/chat/composer/link_preview/view.cljs rename to src/status_im/contexts/chat/composer/link_preview/view.cljs index db9c7d0fed..c802357f65 100644 --- a/src/status_im2/contexts/chat/composer/link_preview/view.cljs +++ b/src/status_im/contexts/chat/composer/link_preview/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.chat.composer.link-preview.view +(ns status-im.contexts.chat.composer.link-preview.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.link-preview.events] - [status-im2.contexts.chat.composer.link-preview.style :as style] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.link-preview.events] + [status-im.contexts.chat.composer.link-preview.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/mentions/style.cljs b/src/status_im/contexts/chat/composer/mentions/style.cljs similarity index 87% rename from src/status_im2/contexts/chat/composer/mentions/style.cljs rename to src/status_im/contexts/chat/composer/mentions/style.cljs index 4a56a669d9..287be0f261 100644 --- a/src/status_im2/contexts/chat/composer/mentions/style.cljs +++ b/src/status_im/contexts/chat/composer/mentions/style.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.chat.composer.mentions.style +(ns status-im.contexts.chat.composer.mentions.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants])) + [status-im.contexts.chat.composer.constants :as constants])) (defn shadow diff --git a/src/status_im2/contexts/chat/composer/mentions/view.cljs b/src/status_im/contexts/chat/composer/mentions/view.cljs similarity index 92% rename from src/status_im2/contexts/chat/composer/mentions/view.cljs rename to src/status_im/contexts/chat/composer/mentions/view.cljs index e4ad797e0b..f20131a6d3 100644 --- a/src/status_im2/contexts/chat/composer/mentions/view.cljs +++ b/src/status_im/contexts/chat/composer/mentions/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.chat.composer.mentions.view +(ns status-im.contexts.chat.composer.mentions.view (:require [react-native.core :as rn] [react-native.platform :as platform] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.contact-list-item.view :as contact-list-item] - [status-im2.contexts.chat.composer.mentions.style :as style] - [status-im2.contexts.chat.composer.utils :as utils] + [status-im.common.contact-list-item.view :as contact-list-item] + [status-im.contexts.chat.composer.mentions.style :as style] + [status-im.contexts.chat.composer.utils :as utils] [utils.re-frame :as rf])) (defn update-cursor diff --git a/src/status_im2/contexts/chat/composer/reply/style.cljs b/src/status_im/contexts/chat/composer/reply/style.cljs similarity index 95% rename from src/status_im2/contexts/chat/composer/reply/style.cljs rename to src/status_im/contexts/chat/composer/reply/style.cljs index 0f2b323ec0..beb9640d7f 100644 --- a/src/status_im2/contexts/chat/composer/reply/style.cljs +++ b/src/status_im/contexts/chat/composer/reply/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.reply.style) +(ns status-im.contexts.chat.composer.reply.style) (defn container diff --git a/src/status_im2/contexts/chat/composer/reply/view.cljs b/src/status_im/contexts/chat/composer/reply/view.cljs similarity index 95% rename from src/status_im2/contexts/chat/composer/reply/view.cljs rename to src/status_im/contexts/chat/composer/reply/view.cljs index 89c32e2a61..da4022ea24 100644 --- a/src/status_im2/contexts/chat/composer/reply/view.cljs +++ b/src/status_im/contexts/chat/composer/reply/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.reply.view +(ns status-im.contexts.chat.composer.reply.view (:require [clojure.string :as string] [quo.core :as quo] @@ -6,10 +6,10 @@ [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.reanimated :as reanimated] - [status-im2.constants :as constant] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.reply.style :as style] - [status-im2.contexts.chat.composer.utils :as utils] + [status-im.constants :as constant] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.reply.style :as style] + [status-im.contexts.chat.composer.utils :as utils] [utils.ens.stateofus :as stateofus] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/selection.cljs b/src/status_im/contexts/chat/composer/selection.cljs similarity index 99% rename from src/status_im2/contexts/chat/composer/selection.cljs rename to src/status_im/contexts/chat/composer/selection.cljs index 554557999a..9b675bd2f6 100644 --- a/src/status_im2/contexts/chat/composer/selection.cljs +++ b/src/status_im/contexts/chat/composer/selection.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.selection +(ns status-im.contexts.chat.composer.selection (:require [clojure.string :as string] [oops.core :as oops] diff --git a/src/status_im2/contexts/chat/composer/style.cljs b/src/status_im/contexts/chat/composer/style.cljs similarity index 97% rename from src/status_im2/contexts/chat/composer/style.cljs rename to src/status_im/contexts/chat/composer/style.cljs index 8b5daa321e..ce39ec1a2d 100644 --- a/src/status_im2/contexts/chat/composer/style.cljs +++ b/src/status_im/contexts/chat/composer/style.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.chat.composer.style +(ns status-im.contexts.chat.composer.style (:require [quo.foundations.colors :as colors] [quo.foundations.typography :as typography] [quo.theme :as quo.theme] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.constants :as constants])) + [status-im.contexts.chat.composer.constants :as constants])) (def border-top-radius 20) diff --git a/src/status_im2/contexts/chat/composer/sub_view.cljs b/src/status_im/contexts/chat/composer/sub_view.cljs similarity index 94% rename from src/status_im2/contexts/chat/composer/sub_view.cljs rename to src/status_im/contexts/chat/composer/sub_view.cljs index ee7b735345..63adb2e654 100644 --- a/src/status_im2/contexts/chat/composer/sub_view.cljs +++ b/src/status_im/contexts/chat/composer/sub_view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.composer.sub-view +(ns status-im.contexts.chat.composer.sub-view (:require [quo.core :as quo] [react-native.blur :as blur] [react-native.core :as rn] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.composer.style :as style] + [status-im.contexts.chat.composer.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/utils.cljs b/src/status_im/contexts/chat/composer/utils.cljs similarity index 98% rename from src/status_im2/contexts/chat/composer/utils.cljs rename to src/status_im/contexts/chat/composer/utils.cljs index 5a4275cda0..1fef9d28c7 100644 --- a/src/status_im2/contexts/chat/composer/utils.cljs +++ b/src/status_im/contexts/chat/composer/utils.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.utils +(ns status-im.contexts.chat.composer.utils (:require [clojure.string :as string] [oops.core :as oops] @@ -6,8 +6,8 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.selection :as selection] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.selection :as selection] [utils.number] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/composer/view.cljs b/src/status_im/contexts/chat/composer/view.cljs similarity index 89% rename from src/status_im2/contexts/chat/composer/view.cljs rename to src/status_im/contexts/chat/composer/view.cljs index 902f95635e..02ca1cb20a 100644 --- a/src/status_im2/contexts/chat/composer/view.cljs +++ b/src/status_im/contexts/chat/composer/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.composer.view +(ns status-im.contexts.chat.composer.view (:require [quo.foundations.colors :as colors] [quo.theme :as quo.theme] @@ -8,22 +8,22 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.contexts.chat.composer.actions.view :as actions] - [status-im2.contexts.chat.composer.constants :as constants] - [status-im2.contexts.chat.composer.edit.view :as edit] - [status-im2.contexts.chat.composer.effects :as effects] - [status-im2.contexts.chat.composer.gesture :as drag-gesture] - [status-im2.contexts.chat.composer.gradients.view :as gradients] - [status-im2.contexts.chat.composer.handlers :as handler] - [status-im2.contexts.chat.composer.images.view :as images] - [status-im2.contexts.chat.composer.link-preview.view :as link-preview] - [status-im2.contexts.chat.composer.mentions.view :as mentions] - [status-im2.contexts.chat.composer.reply.view :as reply] - [status-im2.contexts.chat.composer.selection :as selection] - [status-im2.contexts.chat.composer.style :as style] - [status-im2.contexts.chat.composer.sub-view :as sub-view] - [status-im2.contexts.chat.composer.utils :as utils] - [status-im2.contexts.chat.messages.contact-requests.bottom-drawer.view :as + [status-im.contexts.chat.composer.actions.view :as actions] + [status-im.contexts.chat.composer.constants :as constants] + [status-im.contexts.chat.composer.edit.view :as edit] + [status-im.contexts.chat.composer.effects :as effects] + [status-im.contexts.chat.composer.gesture :as drag-gesture] + [status-im.contexts.chat.composer.gradients.view :as gradients] + [status-im.contexts.chat.composer.handlers :as handler] + [status-im.contexts.chat.composer.images.view :as images] + [status-im.contexts.chat.composer.link-preview.view :as link-preview] + [status-im.contexts.chat.composer.mentions.view :as mentions] + [status-im.contexts.chat.composer.reply.view :as reply] + [status-im.contexts.chat.composer.selection :as selection] + [status-im.contexts.chat.composer.style :as style] + [status-im.contexts.chat.composer.sub-view :as sub-view] + [status-im.contexts.chat.composer.utils :as utils] + [status-im.contexts.chat.messages.contact-requests.bottom-drawer.view :as contact-requests.bottom-drawer] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/effects.cljs b/src/status_im/contexts/chat/effects.cljs similarity index 82% rename from src/status_im2/contexts/chat/effects.cljs rename to src/status_im/contexts/chat/effects.cljs index a9168b0669..57d5dfc28b 100644 --- a/src/status_im2/contexts/chat/effects.cljs +++ b/src/status_im/contexts/chat/effects.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.effects +(ns status-im.contexts.chat.effects (:require [react-native.async-storage :as async-storage] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.constants :as shell.constants] [utils.re-frame :as rf])) (rf/reg-fx :effects.chat/open-last-chat diff --git a/src/status_im2/contexts/chat/events.cljs b/src/status_im/contexts/chat/events.cljs similarity index 96% rename from src/status_im2/contexts/chat/events.cljs rename to src/status_im/contexts/chat/events.cljs index b23e261358..a8220c1804 100644 --- a/src/status_im2/contexts/chat/events.cljs +++ b/src/status_im/contexts/chat/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.events +(ns status-im.contexts.chat.events (:require [clojure.set :as set] [legacy.status-im.chat.models.loading :as loading] @@ -6,17 +6,17 @@ [quo.foundations.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [status-im2.common.muting.helpers :refer [format-mute-till]] - [status-im2.constants :as constants] - [status-im2.contexts.chat.composer.link-preview.events :as link-preview] - status-im2.contexts.chat.effects - status-im2.contexts.chat.lightbox.events - status-im2.contexts.chat.messages.content.reactions.events - [status-im2.contexts.chat.messages.delete-message-for-me.events :as delete-for-me] - [status-im2.contexts.chat.messages.delete-message.events :as delete-message] - [status-im2.contexts.chat.messages.list.state :as chat.state] - [status-im2.contexts.contacts.events :as contacts-store] - [status-im2.navigation.events :as navigation] + [status-im.common.muting.helpers :refer [format-mute-till]] + [status-im.constants :as constants] + [status-im.contexts.chat.composer.link-preview.events :as link-preview] + status-im.contexts.chat.effects + status-im.contexts.chat.lightbox.events + status-im.contexts.chat.messages.content.reactions.events + [status-im.contexts.chat.messages.delete-message-for-me.events :as delete-for-me] + [status-im.contexts.chat.messages.delete-message.events :as delete-message] + [status-im.contexts.chat.messages.list.state :as chat.state] + [status-im.contexts.contacts.events :as contacts-store] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.datetime :as datetime] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/events_test.cljs b/src/status_im/contexts/chat/events_test.cljs similarity index 98% rename from src/status_im2/contexts/chat/events_test.cljs rename to src/status_im/contexts/chat/events_test.cljs index a5c62ab2e1..f433058508 100644 --- a/src/status_im2/contexts/chat/events_test.cljs +++ b/src/status_im/contexts/chat/events_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.events-test +(ns status-im.contexts.chat.events-test (:require [cljs.test :refer-macros [deftest is testing]] - [status-im2.contexts.chat.events :as chat] + [status-im.contexts.chat.events :as chat] [utils.datetime :as datetime])) (deftest clear-history-test diff --git a/src/status_im2/contexts/chat/group_details/style.cljs b/src/status_im/contexts/chat/group_details/style.cljs similarity index 95% rename from src/status_im2/contexts/chat/group_details/style.cljs rename to src/status_im/contexts/chat/group_details/style.cljs index c3d595b82f..6c460ace98 100644 --- a/src/status_im2/contexts/chat/group_details/style.cljs +++ b/src/status_im/contexts/chat/group_details/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.group-details.style +(ns status-im.contexts.chat.group-details.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/chat/group_details/view.cljs b/src/status_im/contexts/chat/group_details/view.cljs similarity index 96% rename from src/status_im2/contexts/chat/group_details/view.cljs rename to src/status_im/contexts/chat/group_details/view.cljs index ae5b4b9471..8db6e0fc8f 100644 --- a/src/status_im2/contexts/chat/group_details/view.cljs +++ b/src/status_im/contexts/chat/group_details/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.chat.group-details.view +(ns status-im.contexts.chat.group-details.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.contact-list-item.view :as contact-list-item] - [status-im2.common.contact-list.view :as contact-list] - [status-im2.common.home.actions.view :as actions] - [status-im2.constants :as constants] - [status-im2.contexts.chat.group-details.style :as style] + [status-im.common.contact-list-item.view :as contact-list-item] + [status-im.common.contact-list.view :as contact-list] + [status-im.common.home.actions.view :as actions] + [status-im.constants :as constants] + [status-im.contexts.chat.group-details.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/home/chat_list_item/style.cljs b/src/status_im/contexts/chat/home/chat_list_item/style.cljs similarity index 93% rename from src/status_im2/contexts/chat/home/chat_list_item/style.cljs rename to src/status_im/contexts/chat/home/chat_list_item/style.cljs index 782094d675..2e814b9c6b 100644 --- a/src/status_im2/contexts/chat/home/chat_list_item/style.cljs +++ b/src/status_im/contexts/chat/home/chat_list_item/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.home.chat-list-item.style +(ns status-im.contexts.chat.home.chat-list-item.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs b/src/status_im/contexts/chat/home/chat_list_item/view.cljs similarity index 98% rename from src/status_im2/contexts/chat/home/chat_list_item/view.cljs rename to src/status_im/contexts/chat/home/chat_list_item/view.cljs index 99e0b662e6..d49da12d06 100644 --- a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs +++ b/src/status_im/contexts/chat/home/chat_list_item/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.chat.home.chat-list-item.view +(ns status-im.contexts.chat.home.chat-list-item.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] - [status-im2.common.home.actions.view :as actions] - [status-im2.constants :as constants] - [status-im2.contexts.chat.home.chat-list-item.style :as style] + [status-im.common.home.actions.view :as actions] + [status-im.constants :as constants] + [status-im.contexts.chat.home.chat-list-item.style :as style] [utils.datetime :as datetime] [utils.debounce :as debounce] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/home/contact_request/style.cljs b/src/status_im/contexts/chat/home/contact_request/style.cljs similarity index 89% rename from src/status_im2/contexts/chat/home/contact_request/style.cljs rename to src/status_im/contexts/chat/home/contact_request/style.cljs index bc417a43fc..810d0545a2 100644 --- a/src/status_im2/contexts/chat/home/contact_request/style.cljs +++ b/src/status_im/contexts/chat/home/contact_request/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.home.contact-request.style +(ns status-im.contexts.chat.home.contact-request.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/chat/home/contact_request/view.cljs b/src/status_im/contexts/chat/home/contact_request/view.cljs similarity index 91% rename from src/status_im2/contexts/chat/home/contact_request/view.cljs rename to src/status_im/contexts/chat/home/contact_request/view.cljs index 5e155c18b1..a8dad53a1f 100644 --- a/src/status_im2/contexts/chat/home/contact_request/view.cljs +++ b/src/status_im/contexts/chat/home/contact_request/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.chat.home.contact-request.view +(ns status-im.contexts.chat.home.contact-request.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [quo.theme :as quo.theme] [react-native.core :as rn] - [status-im2.contexts.chat.home.contact-request.style :as style] - [status-im2.contexts.shell.activity-center.notification-types :as notification-types] + [status-im.contexts.chat.home.contact-request.style :as style] + [status-im.contexts.shell.activity-center.notification-types :as notification-types] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/home/events.cljs b/src/status_im/contexts/chat/home/events.cljs similarity index 82% rename from src/status_im2/contexts/chat/home/events.cljs rename to src/status_im/contexts/chat/home/events.cljs index 7c9f542d52..778e3be7eb 100644 --- a/src/status_im2/contexts/chat/home/events.cljs +++ b/src/status_im/contexts/chat/home/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.home.events +(ns status-im.contexts.chat.home.events (:require [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/home/style.cljs b/src/status_im/contexts/chat/home/style.cljs similarity index 92% rename from src/status_im2/contexts/chat/home/style.cljs rename to src/status_im/contexts/chat/home/style.cljs index ce115e3967..58735c9ea1 100644 --- a/src/status_im2/contexts/chat/home/style.cljs +++ b/src/status_im/contexts/chat/home/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.home.style +(ns status-im.contexts.chat.home.style (:require [react-native.platform :as platform] [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/chat/home/view.cljs b/src/status_im/contexts/chat/home/view.cljs similarity index 90% rename from src/status_im2/contexts/chat/home/view.cljs rename to src/status_im/contexts/chat/home/view.cljs index bfa62e4f77..53e3fbe30c 100644 --- a/src/status_im2/contexts/chat/home/view.cljs +++ b/src/status_im/contexts/chat/home/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.home.view +(ns status-im.contexts.chat.home.view (:require [oops.core :as oops] [quo.theme :as quo.theme] @@ -6,17 +6,17 @@ [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.share :as share] - [status-im2.common.contact-list-item.view :as contact-list-item] - [status-im2.common.contact-list.view :as contact-list] - [status-im2.common.home.actions.view :as actions] - [status-im2.common.home.banner.view :as common.banner] - [status-im2.common.home.empty-state.view :as common.empty-state] - [status-im2.common.home.header-spacing.view :as common.header-spacing] - [status-im2.common.resources :as resources] - [status-im2.contexts.chat.actions.view :as chat.actions.view] - [status-im2.contexts.chat.home.chat-list-item.view :as chat-list-item] - [status-im2.contexts.chat.home.contact-request.view :as contact-request] - [status-im2.contexts.shell.jump-to.constants :as jump-to.constants] + [status-im.common.contact-list-item.view :as contact-list-item] + [status-im.common.contact-list.view :as contact-list] + [status-im.common.home.actions.view :as actions] + [status-im.common.home.banner.view :as common.banner] + [status-im.common.home.empty-state.view :as common.empty-state] + [status-im.common.home.header-spacing.view :as common.header-spacing] + [status-im.common.resources :as resources] + [status-im.contexts.chat.actions.view :as chat.actions.view] + [status-im.contexts.chat.home.chat-list-item.view :as chat-list-item] + [status-im.contexts.chat.home.contact-request.view :as contact-request] + [status-im.contexts.shell.jump-to.constants :as jump-to.constants] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/lightbox/animations.cljs b/src/status_im/contexts/chat/lightbox/animations.cljs similarity index 93% rename from src/status_im2/contexts/chat/lightbox/animations.cljs rename to src/status_im/contexts/chat/lightbox/animations.cljs index d9fa9d5cf0..4e3d29fccf 100644 --- a/src/status_im2/contexts/chat/lightbox/animations.cljs +++ b/src/status_im/contexts/chat/lightbox/animations.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.animations +(ns status-im.contexts.chat.lightbox.animations (:require [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/chat/lightbox/bottom_view.cljs b/src/status_im/contexts/chat/lightbox/bottom_view.cljs similarity index 92% rename from src/status_im2/contexts/chat/lightbox/bottom_view.cljs rename to src/status_im/contexts/chat/lightbox/bottom_view.cljs index 1170449975..b24c8137ec 100644 --- a/src/status_im2/contexts/chat/lightbox/bottom_view.cljs +++ b/src/status_im/contexts/chat/lightbox/bottom_view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.chat.lightbox.bottom-view +(ns status-im.contexts.chat.lightbox.bottom-view (:require [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.lightbox.animations :as anim] - [status-im2.contexts.chat.lightbox.constants :as c] - [status-im2.contexts.chat.lightbox.style :as style] - [status-im2.contexts.chat.lightbox.text-sheet.view :as text-sheet] + [status-im.contexts.chat.lightbox.animations :as anim] + [status-im.contexts.chat.lightbox.constants :as c] + [status-im.contexts.chat.lightbox.style :as style] + [status-im.contexts.chat.lightbox.text-sheet.view :as text-sheet] [utils.re-frame :as rf])) (defn get-small-item-layout diff --git a/src/status_im2/contexts/chat/lightbox/constants.cljs b/src/status_im/contexts/chat/lightbox/constants.cljs similarity index 91% rename from src/status_im2/contexts/chat/lightbox/constants.cljs rename to src/status_im/contexts/chat/lightbox/constants.cljs index 1fbd74c313..f659e75467 100644 --- a/src/status_im2/contexts/chat/lightbox/constants.cljs +++ b/src/status_im/contexts/chat/lightbox/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.constants) +(ns status-im.contexts.chat.lightbox.constants) (def ^:const small-image-size 40) (def ^:const focused-extra-size 16) diff --git a/src/status_im2/contexts/chat/lightbox/effects.cljs b/src/status_im/contexts/chat/lightbox/effects.cljs similarity index 95% rename from src/status_im2/contexts/chat/lightbox/effects.cljs rename to src/status_im/contexts/chat/lightbox/effects.cljs index b291cf244d..0a0171648d 100644 --- a/src/status_im2/contexts/chat/lightbox/effects.cljs +++ b/src/status_im/contexts/chat/lightbox/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.effects +(ns status-im.contexts.chat.lightbox.effects (:require [react-native.blob :as blob] [react-native.cameraroll :as cameraroll] [react-native.fs :as fs] diff --git a/src/status_im2/contexts/chat/lightbox/events.cljs b/src/status_im/contexts/chat/lightbox/events.cljs similarity index 87% rename from src/status_im2/contexts/chat/lightbox/events.cljs rename to src/status_im/contexts/chat/lightbox/events.cljs index 178daf9c7a..3f23b53a11 100644 --- a/src/status_im2/contexts/chat/lightbox/events.cljs +++ b/src/status_im/contexts/chat/lightbox/events.cljs @@ -1,5 +1,5 @@ -(ns status-im2.contexts.chat.lightbox.events - (:require status-im2.contexts.chat.lightbox.effects +(ns status-im.contexts.chat.lightbox.events + (:require status-im.contexts.chat.lightbox.effects [utils.re-frame :as rf])) (rf/reg-event-fx :chat.ui/clear-sending-images diff --git a/src/status_im2/contexts/chat/lightbox/style.cljs b/src/status_im/contexts/chat/lightbox/style.cljs similarity index 96% rename from src/status_im2/contexts/chat/lightbox/style.cljs rename to src/status_im/contexts/chat/lightbox/style.cljs index f9af3ee7e4..9ef96aeb05 100644 --- a/src/status_im2/contexts/chat/lightbox/style.cljs +++ b/src/status_im/contexts/chat/lightbox/style.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.chat.lightbox.style +(ns status-im.contexts.chat.lightbox.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.lightbox.constants :as c])) + [status-im.contexts.chat.lightbox.constants :as c])) ;;;; VIEW (defn image diff --git a/src/status_im2/contexts/chat/lightbox/text_sheet/style.cljs b/src/status_im/contexts/chat/lightbox/text_sheet/style.cljs similarity index 94% rename from src/status_im2/contexts/chat/lightbox/text_sheet/style.cljs rename to src/status_im/contexts/chat/lightbox/text_sheet/style.cljs index 71cbde2209..45115fa353 100644 --- a/src/status_im2/contexts/chat/lightbox/text_sheet/style.cljs +++ b/src/status_im/contexts/chat/lightbox/text_sheet/style.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.chat.lightbox.text-sheet.style +(ns status-im.contexts.chat.lightbox.text-sheet.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.lightbox.constants :as constants])) + [status-im.contexts.chat.lightbox.constants :as constants])) (defn sheet-container [{:keys [height top]}] diff --git a/src/status_im2/contexts/chat/lightbox/text_sheet/utils.cljs b/src/status_im/contexts/chat/lightbox/text_sheet/utils.cljs similarity index 97% rename from src/status_im2/contexts/chat/lightbox/text_sheet/utils.cljs rename to src/status_im/contexts/chat/lightbox/text_sheet/utils.cljs index 095e66fead..b5dde07a97 100644 --- a/src/status_im2/contexts/chat/lightbox/text_sheet/utils.cljs +++ b/src/status_im/contexts/chat/lightbox/text_sheet/utils.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.lightbox.text-sheet.utils +(ns status-im.contexts.chat.lightbox.text-sheet.utils (:require [oops.core :as oops] [react-native.gesture :as gesture] [react-native.reanimated :as reanimated] [reagent.core :as r] - [status-im2.contexts.chat.lightbox.constants :as constants])) + [status-im.contexts.chat.lightbox.constants :as constants])) (defn- collapse-sheet [{:keys [derived-value overlay-opacity saved-top expanded? overlay-z-index]}] diff --git a/src/status_im2/contexts/chat/lightbox/text_sheet/view.cljs b/src/status_im/contexts/chat/lightbox/text_sheet/view.cljs similarity index 93% rename from src/status_im2/contexts/chat/lightbox/text_sheet/view.cljs rename to src/status_im/contexts/chat/lightbox/text_sheet/view.cljs index 1831dd8627..2fef4ffdec 100644 --- a/src/status_im2/contexts/chat/lightbox/text_sheet/view.cljs +++ b/src/status_im/contexts/chat/lightbox/text_sheet/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.text-sheet.view +(ns status-im.contexts.chat.lightbox.text-sheet.view (:require [quo.foundations.colors :as colors] [react-native.core :as rn] @@ -8,10 +8,10 @@ [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.chat.lightbox.constants :as constants] - [status-im2.contexts.chat.lightbox.text-sheet.style :as style] - [status-im2.contexts.chat.lightbox.text-sheet.utils :as utils] - [status-im2.contexts.chat.messages.content.text.view :as message-view])) + [status-im.contexts.chat.lightbox.constants :as constants] + [status-im.contexts.chat.lightbox.text-sheet.style :as style] + [status-im.contexts.chat.lightbox.text-sheet.utils :as utils] + [status-im.contexts.chat.messages.content.text.view :as message-view])) (defn- text-sheet [messages overlay-opacity overlay-z-index text-sheet-lock?] diff --git a/src/status_im2/contexts/chat/lightbox/top_view.cljs b/src/status_im/contexts/chat/lightbox/top_view.cljs similarity index 95% rename from src/status_im2/contexts/chat/lightbox/top_view.cljs rename to src/status_im/contexts/chat/lightbox/top_view.cljs index e4c266995d..b86fc83574 100644 --- a/src/status_im2/contexts/chat/lightbox/top_view.cljs +++ b/src/status_im/contexts/chat/lightbox/top_view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.top-view +(ns status-im.contexts.chat.lightbox.top-view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,9 +6,9 @@ [react-native.orientation :as orientation] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.lightbox.animations :as anim] - [status-im2.contexts.chat.lightbox.constants :as c] - [status-im2.contexts.chat.lightbox.style :as style] + [status-im.contexts.chat.lightbox.animations :as anim] + [status-im.contexts.chat.lightbox.constants :as c] + [status-im.contexts.chat.lightbox.style :as style] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/chat/lightbox/utils.cljs b/src/status_im/contexts/chat/lightbox/utils.cljs similarity index 97% rename from src/status_im2/contexts/chat/lightbox/utils.cljs rename to src/status_im/contexts/chat/lightbox/utils.cljs index 60b95af16f..eb0ece41ba 100644 --- a/src/status_im2/contexts/chat/lightbox/utils.cljs +++ b/src/status_im/contexts/chat/lightbox/utils.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.utils +(ns status-im.contexts.chat.lightbox.utils (:require [clojure.string :as string] [oops.core :as oops] @@ -9,9 +9,9 @@ [react-native.platform :as platform] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.chat.lightbox.animations :as anim] - [status-im2.contexts.chat.lightbox.constants :as constants] - [status-im2.contexts.chat.lightbox.top-view :as top-view] + [status-im.contexts.chat.lightbox.animations :as anim] + [status-im.contexts.chat.lightbox.constants :as constants] + [status-im.contexts.chat.lightbox.top-view :as top-view] [utils.re-frame :as rf] [utils.worklets.chat.lightbox :as worklet])) diff --git a/src/status_im2/contexts/chat/lightbox/view.cljs b/src/status_im/contexts/chat/lightbox/view.cljs similarity index 93% rename from src/status_im2/contexts/chat/lightbox/view.cljs rename to src/status_im/contexts/chat/lightbox/view.cljs index 048ba69f96..81eb4b643a 100644 --- a/src/status_im2/contexts/chat/lightbox/view.cljs +++ b/src/status_im/contexts/chat/lightbox/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.view +(ns status-im.contexts.chat.lightbox.view (:require [clojure.string :as string] [oops.core :as oops] @@ -9,13 +9,13 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.contexts.chat.lightbox.animations :as anim] - [status-im2.contexts.chat.lightbox.bottom-view :as bottom-view] - [status-im2.contexts.chat.lightbox.constants :as constants] - [status-im2.contexts.chat.lightbox.style :as style] - [status-im2.contexts.chat.lightbox.top-view :as top-view] - [status-im2.contexts.chat.lightbox.utils :as utils] - [status-im2.contexts.chat.lightbox.zoomable-image.view :as zoomable-image] + [status-im.contexts.chat.lightbox.animations :as anim] + [status-im.contexts.chat.lightbox.bottom-view :as bottom-view] + [status-im.contexts.chat.lightbox.constants :as constants] + [status-im.contexts.chat.lightbox.style :as style] + [status-im.contexts.chat.lightbox.top-view :as top-view] + [status-im.contexts.chat.lightbox.utils :as utils] + [status-im.contexts.chat.lightbox.zoomable-image.view :as zoomable-image] [utils.re-frame :as rf])) (defn get-item-layout diff --git a/src/status_im2/contexts/chat/lightbox/zoomable_image/constants.cljs b/src/status_im/contexts/chat/lightbox/zoomable_image/constants.cljs similarity index 81% rename from src/status_im2/contexts/chat/lightbox/zoomable_image/constants.cljs rename to src/status_im/contexts/chat/lightbox/zoomable_image/constants.cljs index 5f06c5c76b..b297f92a8e 100644 --- a/src/status_im2/contexts/chat/lightbox/zoomable_image/constants.cljs +++ b/src/status_im/contexts/chat/lightbox/zoomable_image/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.zoomable-image.constants) +(ns status-im.contexts.chat.lightbox.zoomable-image.constants) (def ^:const min-scale 1) diff --git a/src/status_im2/contexts/chat/lightbox/zoomable_image/style.cljs b/src/status_im/contexts/chat/lightbox/zoomable_image/style.cljs similarity index 94% rename from src/status_im2/contexts/chat/lightbox/zoomable_image/style.cljs rename to src/status_im/contexts/chat/lightbox/zoomable_image/style.cljs index 55649d9efe..a228596d7d 100644 --- a/src/status_im2/contexts/chat/lightbox/zoomable_image/style.cljs +++ b/src/status_im/contexts/chat/lightbox/zoomable_image/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.zoomable-image.style +(ns status-im.contexts.chat.lightbox.zoomable-image.style (:require [react-native.platform :as platform] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/chat/lightbox/zoomable_image/utils.cljs b/src/status_im/contexts/chat/lightbox/zoomable_image/utils.cljs similarity index 98% rename from src/status_im2/contexts/chat/lightbox/zoomable_image/utils.cljs rename to src/status_im/contexts/chat/lightbox/zoomable_image/utils.cljs index ac2b8283f1..510603d120 100644 --- a/src/status_im2/contexts/chat/lightbox/zoomable_image/utils.cljs +++ b/src/status_im/contexts/chat/lightbox/zoomable_image/utils.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.zoomable-image.utils +(ns status-im.contexts.chat.lightbox.zoomable-image.utils (:require [clojure.string :as string] [react-native.core :as rn] @@ -6,8 +6,8 @@ [react-native.orientation :as orientation] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.contexts.chat.lightbox.animations :as anim] - [status-im2.contexts.chat.lightbox.zoomable-image.constants :as constants] + [status-im.contexts.chat.lightbox.animations :as anim] + [status-im.contexts.chat.lightbox.zoomable-image.constants :as constants] [utils.re-frame :as rf])) ;;; Helpers diff --git a/src/status_im2/contexts/chat/lightbox/zoomable_image/view.cljs b/src/status_im/contexts/chat/lightbox/zoomable_image/view.cljs similarity index 97% rename from src/status_im2/contexts/chat/lightbox/zoomable_image/view.cljs rename to src/status_im/contexts/chat/lightbox/zoomable_image/view.cljs index d4269d09b3..f6bb14cb4b 100644 --- a/src/status_im2/contexts/chat/lightbox/zoomable_image/view.cljs +++ b/src/status_im/contexts/chat/lightbox/zoomable_image/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.lightbox.zoomable-image.view +(ns status-im.contexts.chat.lightbox.zoomable-image.view (:require [oops.core :refer [oget]] [react-native.core :as rn] @@ -7,10 +7,10 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [reagent.core :as r] - [status-im2.contexts.chat.lightbox.animations :as anim] - [status-im2.contexts.chat.lightbox.zoomable-image.constants :as c] - [status-im2.contexts.chat.lightbox.zoomable-image.style :as style] - [status-im2.contexts.chat.lightbox.zoomable-image.utils :as utils] + [status-im.contexts.chat.lightbox.animations :as anim] + [status-im.contexts.chat.lightbox.zoomable-image.constants :as c] + [status-im.contexts.chat.lightbox.zoomable-image.style :as style] + [status-im.contexts.chat.lightbox.zoomable-image.utils :as utils] [utils.re-frame :as rf] [utils.url :as url])) diff --git a/src/status_im2/contexts/chat/menus/pinned_messages/style.cljs b/src/status_im/contexts/chat/menus/pinned_messages/style.cljs similarity index 96% rename from src/status_im2/contexts/chat/menus/pinned_messages/style.cljs rename to src/status_im/contexts/chat/menus/pinned_messages/style.cljs index 67746fbffd..13a98c22a6 100644 --- a/src/status_im2/contexts/chat/menus/pinned_messages/style.cljs +++ b/src/status_im/contexts/chat/menus/pinned_messages/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.menus.pinned-messages.style +(ns status-im.contexts.chat.menus.pinned-messages.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/chat/menus/pinned_messages/view.cljs b/src/status_im/contexts/chat/menus/pinned_messages/view.cljs similarity index 93% rename from src/status_im2/contexts/chat/menus/pinned_messages/view.cljs rename to src/status_im/contexts/chat/menus/pinned_messages/view.cljs index 01ae9138b9..4c26c9f41d 100644 --- a/src/status_im2/contexts/chat/menus/pinned_messages/view.cljs +++ b/src/status_im/contexts/chat/menus/pinned_messages/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.chat.menus.pinned-messages.view +(ns status-im.contexts.chat.menus.pinned-messages.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image] [react-native.gesture :as gesture] - [status-im2.contexts.chat.menus.pinned-messages.style :as style] - [status-im2.contexts.chat.messages.content.view :as message] + [status-im.contexts.chat.menus.pinned-messages.style :as style] + [status-im.contexts.chat.messages.content.view :as message] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/avatar/view.cljs b/src/status_im/contexts/chat/messages/avatar/view.cljs similarity index 93% rename from src/status_im2/contexts/chat/messages/avatar/view.cljs rename to src/status_im/contexts/chat/messages/avatar/view.cljs index b1d0e09720..0fc187ae9b 100644 --- a/src/status_im2/contexts/chat/messages/avatar/view.cljs +++ b/src/status_im/contexts/chat/messages/avatar/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.avatar.view +(ns status-im.contexts.chat.messages.avatar.view (:require [quo.core :as quo] [react-native.core :as rn] diff --git a/src/status_im2/contexts/chat/messages/constants.cljs b/src/status_im/contexts/chat/messages/constants.cljs similarity index 92% rename from src/status_im2/contexts/chat/messages/constants.cljs rename to src/status_im/contexts/chat/messages/constants.cljs index ded9d7d6b4..0516eac7bf 100644 --- a/src/status_im2/contexts/chat/messages/constants.cljs +++ b/src/status_im/contexts/chat/messages/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.constants) +(ns status-im.contexts.chat.messages.constants) ;;;; Navigation (def ^:const top-bar-height 56) diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs b/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs similarity index 53% rename from src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs rename to src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs index d7c5d7693b..033c8c4818 100644 --- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs +++ b/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.contact-requests.bottom-drawer.style) +(ns status-im.contexts.chat.messages.contact-requests.bottom-drawer.style) (def container {:position :absolute diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs b/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs similarity index 85% rename from src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs rename to src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs index 14121b15e3..e43207a223 100644 --- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs +++ b/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.messages.contact-requests.bottom-drawer.view +(ns status-im.contexts.chat.messages.contact-requests.bottom-drawer.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.contact-requests.bottom-drawer.style :as style] - [status-im2.contexts.shell.jump-to.constants :as jump-to.constants] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.contact-requests.bottom-drawer.style :as style] + [status-im.contexts.shell.jump-to.constants :as jump-to.constants] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/content/album/style.cljs b/src/status_im/contexts/chat/messages/content/album/style.cljs similarity index 90% rename from src/status_im2/contexts/chat/messages/content/album/style.cljs rename to src/status_im/contexts/chat/messages/content/album/style.cljs index a67bfe8e79..89b14337d0 100644 --- a/src/status_im2/contexts/chat/messages/content/album/style.cljs +++ b/src/status_im/contexts/chat/messages/content/album/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.content.album.style +(ns status-im.contexts.chat.messages.content.album.style (:require [quo.foundations.colors :as colors] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) (def max-album-height 292) diff --git a/src/status_im2/contexts/chat/messages/content/album/view.cljs b/src/status_im/contexts/chat/messages/content/album/view.cljs similarity index 92% rename from src/status_im2/contexts/chat/messages/content/album/view.cljs rename to src/status_im/contexts/chat/messages/content/album/view.cljs index 772ebee91a..0ab04e9b7d 100644 --- a/src/status_im2/contexts/chat/messages/content/album/view.cljs +++ b/src/status_im/contexts/chat/messages/content/album/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.chat.messages.content.album.view +(ns status-im.contexts.chat.messages.content.album.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.content.album.style :as style] - [status-im2.contexts.chat.messages.content.image.view :as image] - [status-im2.contexts.chat.messages.content.text.view :as text] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.content.album.style :as style] + [status-im.contexts.chat.messages.content.image.view :as image] + [status-im.contexts.chat.messages.content.text.view :as text] [utils.re-frame :as rf] [utils.url :as url])) diff --git a/src/status_im2/contexts/chat/messages/content/audio/component_spec.cljs b/src/status_im/contexts/chat/messages/content/audio/component_spec.cljs similarity index 93% rename from src/status_im2/contexts/chat/messages/content/audio/component_spec.cljs rename to src/status_im/contexts/chat/messages/content/audio/component_spec.cljs index f8788e266d..3d6bae4947 100644 --- a/src/status_im2/contexts/chat/messages/content/audio/component_spec.cljs +++ b/src/status_im/contexts/chat/messages/content/audio/component_spec.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.chat.messages.content.audio.component-spec +(ns status-im.contexts.chat.messages.content.audio.component-spec (:require [re-frame.core :as re-frame] [react-native.audio-toolkit :as audio] - [status-im2.contexts.chat.messages.content.audio.view :as audio-message] + [status-im.contexts.chat.messages.content.audio.view :as audio-message] [test-helpers.component :as h])) (def message diff --git a/src/status_im2/contexts/chat/messages/content/audio/style.cljs b/src/status_im/contexts/chat/messages/content/audio/style.cljs similarity index 94% rename from src/status_im2/contexts/chat/messages/content/audio/style.cljs rename to src/status_im/contexts/chat/messages/content/audio/style.cljs index ab33555f2c..53f3cf9dce 100644 --- a/src/status_im2/contexts/chat/messages/content/audio/style.cljs +++ b/src/status_im/contexts/chat/messages/content/audio/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.audio.style +(ns status-im.contexts.chat.messages.content.audio.style (:require [quo.foundations.colors :as colors] [quo.theme :as theme])) diff --git a/src/status_im2/contexts/chat/messages/content/audio/view.cljs b/src/status_im/contexts/chat/messages/content/audio/view.cljs similarity index 98% rename from src/status_im2/contexts/chat/messages/content/audio/view.cljs rename to src/status_im/contexts/chat/messages/content/audio/view.cljs index fe08e99eeb..a27700dbe7 100644 --- a/src/status_im2/contexts/chat/messages/content/audio/view.cljs +++ b/src/status_im/contexts/chat/messages/content/audio/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.audio.view +(ns status-im.contexts.chat.messages.content.audio.view (:require ["react-native-blob-util" :default ReactNativeBlobUtil] [goog.string :as gstring] @@ -8,8 +8,8 @@ [react-native.core :as rn] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.content.audio.style :as style] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.content.audio.style :as style] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/content/deleted/view.cljs b/src/status_im/contexts/chat/messages/content/deleted/view.cljs similarity index 98% rename from src/status_im2/contexts/chat/messages/content/deleted/view.cljs rename to src/status_im/contexts/chat/messages/content/deleted/view.cljs index 0287fd56b3..800b062901 100644 --- a/src/status_im2/contexts/chat/messages/content/deleted/view.cljs +++ b/src/status_im/contexts/chat/messages/content/deleted/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.deleted.view +(ns status-im.contexts.chat.messages.content.deleted.view (:require [quo.core :as quo] [react-native.core :as rn] diff --git a/src/status_im2/contexts/chat/messages/content/image/view.cljs b/src/status_im/contexts/chat/messages/content/image/view.cljs similarity index 94% rename from src/status_im2/contexts/chat/messages/content/image/view.cljs rename to src/status_im/contexts/chat/messages/content/image/view.cljs index c2103fd81b..fbd8f2f5c7 100644 --- a/src/status_im2/contexts/chat/messages/content/image/view.cljs +++ b/src/status_im/contexts/chat/messages/content/image/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.messages.content.image.view +(ns status-im.contexts.chat.messages.content.image.view (:require [react-native.core :as rn] [react-native.fast-image :as fast-image] [react-native.safe-area :as safe-area] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.content.text.view :as text] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.content.text.view :as text] [utils.re-frame :as rf] [utils.url :as url])) diff --git a/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs b/src/status_im/contexts/chat/messages/content/link_preview/view.cljs similarity index 92% rename from src/status_im2/contexts/chat/messages/content/link_preview/view.cljs rename to src/status_im/contexts/chat/messages/content/link_preview/view.cljs index 04a6df7916..957c7f565d 100644 --- a/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs +++ b/src/status_im/contexts/chat/messages/content/link_preview/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.link-preview.view +(ns status-im.contexts.chat.messages.content.link-preview.view (:require [quo.core :as quo] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/content/link_preview/view_test.cljs b/src/status_im/contexts/chat/messages/content/link_preview/view_test.cljs similarity index 70% rename from src/status_im2/contexts/chat/messages/content/link_preview/view_test.cljs rename to src/status_im/contexts/chat/messages/content/link_preview/view_test.cljs index ecf374d9a7..b5e8314027 100644 --- a/src/status_im2/contexts/chat/messages/content/link_preview/view_test.cljs +++ b/src/status_im/contexts/chat/messages/content/link_preview/view_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.content.link-preview.view-test +(ns status-im.contexts.chat.messages.content.link-preview.view-test (:require [cljs.test :refer [are deftest is]] - [status-im2.contexts.chat.messages.content.link-preview.view :as view])) + [status-im.contexts.chat.messages.content.link-preview.view :as view])) (deftest nearly-square?-test (are [pred width height] (is (pred (view/nearly-square? {:width width :height height}))) diff --git a/src/status_im2/contexts/chat/messages/content/pin/style.cljs b/src/status_im/contexts/chat/messages/content/pin/style.cljs similarity index 94% rename from src/status_im2/contexts/chat/messages/content/pin/style.cljs rename to src/status_im/contexts/chat/messages/content/pin/style.cljs index 9fa0fd9390..abcb7a8eb2 100644 --- a/src/status_im2/contexts/chat/messages/content/pin/style.cljs +++ b/src/status_im/contexts/chat/messages/content/pin/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.pin.style +(ns status-im.contexts.chat.messages.content.pin.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/chat/messages/content/pin/view.cljs b/src/status_im/contexts/chat/messages/content/pin/view.cljs similarity index 87% rename from src/status_im2/contexts/chat/messages/content/pin/view.cljs rename to src/status_im/contexts/chat/messages/content/pin/view.cljs index e7b8157a13..9bb5c4a850 100644 --- a/src/status_im2/contexts/chat/messages/content/pin/view.cljs +++ b/src/status_im/contexts/chat/messages/content/pin/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.messages.content.pin.view +(ns status-im.contexts.chat.messages.content.pin.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] - [status-im2.contexts.chat.composer.reply.view :as reply] - [status-im2.contexts.chat.messages.content.pin.style :as style] + [status-im.contexts.chat.composer.reply.view :as reply] + [status-im.contexts.chat.messages.content.pin.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/content/reactions/events.cljs b/src/status_im/contexts/chat/messages/content/reactions/events.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/content/reactions/events.cljs rename to src/status_im/contexts/chat/messages/content/reactions/events.cljs index 62ee564847..aaaab2d037 100644 --- a/src/status_im2/contexts/chat/messages/content/reactions/events.cljs +++ b/src/status_im/contexts/chat/messages/content/reactions/events.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.chat.messages.content.reactions.events +(ns status-im.contexts.chat.messages.content.reactions.events (:require [clojure.set :as set] - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/content/reactions/view.cljs b/src/status_im/contexts/chat/messages/content/reactions/view.cljs similarity index 95% rename from src/status_im2/contexts/chat/messages/content/reactions/view.cljs rename to src/status_im/contexts/chat/messages/content/reactions/view.cljs index 91a1812f9d..518b3d778e 100644 --- a/src/status_im2/contexts/chat/messages/content/reactions/view.cljs +++ b/src/status_im/contexts/chat/messages/content/reactions/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.chat.messages.content.reactions.view +(ns status-im.contexts.chat.messages.content.reactions.view (:require [quo.core :as quo] [quo.theme :as quo.theme] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.drawers.view :as drawers] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.drawers.view :as drawers] [utils.re-frame :as rf])) (defn- on-press diff --git a/src/status_im2/contexts/chat/messages/content/status/style.cljs b/src/status_im/contexts/chat/messages/content/status/style.cljs similarity index 81% rename from src/status_im2/contexts/chat/messages/content/status/style.cljs rename to src/status_im/contexts/chat/messages/content/status/style.cljs index ba7d654b52..7eb1bb1ead 100644 --- a/src/status_im2/contexts/chat/messages/content/status/style.cljs +++ b/src/status_im/contexts/chat/messages/content/status/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.status.style +(ns status-im.contexts.chat.messages.content.status.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/chat/messages/content/status/view.cljs b/src/status_im/contexts/chat/messages/content/status/view.cljs similarity index 82% rename from src/status_im2/contexts/chat/messages/content/status/view.cljs rename to src/status_im/contexts/chat/messages/content/status/view.cljs index 5aa05e88d8..e219fbe93b 100644 --- a/src/status_im2/contexts/chat/messages/content/status/view.cljs +++ b/src/status_im/contexts/chat/messages/content/status/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.chat.messages.content.status.view +(ns status-im.contexts.chat.messages.content.status.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] - [status-im2.contexts.chat.messages.content.status.style :as style] + [status-im.contexts.chat.messages.content.status.style :as style] [utils.i18n :as i18n])) (defn status diff --git a/src/status_im2/contexts/chat/messages/content/style.cljs b/src/status_im/contexts/chat/messages/content/style.cljs similarity index 93% rename from src/status_im2/contexts/chat/messages/content/style.cljs rename to src/status_im/contexts/chat/messages/content/style.cljs index bb90f92fc1..124c4cae7b 100644 --- a/src/status_im2/contexts/chat/messages/content/style.cljs +++ b/src/status_im/contexts/chat/messages/content/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.style +(ns status-im.contexts.chat.messages.content.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/chat/messages/content/system/text/view.cljs b/src/status_im/contexts/chat/messages/content/system/text/view.cljs similarity index 80% rename from src/status_im2/contexts/chat/messages/content/system/text/view.cljs rename to src/status_im/contexts/chat/messages/content/system/text/view.cljs index 0bbbb20039..5a29879efe 100644 --- a/src/status_im2/contexts/chat/messages/content/system/text/view.cljs +++ b/src/status_im/contexts/chat/messages/content/system/text/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.system.text.view +(ns status-im.contexts.chat.messages.content.system.text.view (:require [legacy.status-im.ui.screens.chat.message.legacy-view :as old-message] [react-native.core :as rn])) diff --git a/src/status_im2/contexts/chat/messages/content/text/style.cljs b/src/status_im/contexts/chat/messages/content/text/style.cljs similarity index 95% rename from src/status_im2/contexts/chat/messages/content/text/style.cljs rename to src/status_im/contexts/chat/messages/content/text/style.cljs index 065b56ed91..0a57af3770 100644 --- a/src/status_im2/contexts/chat/messages/content/text/style.cljs +++ b/src/status_im/contexts/chat/messages/content/text/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.text.style +(ns status-im.contexts.chat.messages.content.text.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/chat/messages/content/text/view.cljs b/src/status_im/contexts/chat/messages/content/text/view.cljs similarity index 96% rename from src/status_im2/contexts/chat/messages/content/text/view.cljs rename to src/status_im/contexts/chat/messages/content/text/view.cljs index ec29fdc202..477affea4f 100644 --- a/src/status_im2/contexts/chat/messages/content/text/view.cljs +++ b/src/status_im/contexts/chat/messages/content/text/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.chat.messages.content.text.view +(ns status-im.contexts.chat.messages.content.text.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.platform :as platform] - [status-im2.contexts.chat.messages.content.link-preview.view :as link-preview] - [status-im2.contexts.chat.messages.content.text.style :as style] + [status-im.contexts.chat.messages.content.link-preview.view :as link-preview] + [status-im.contexts.chat.messages.content.text.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/content/unknown/view.cljs b/src/status_im/contexts/chat/messages/content/unknown/view.cljs similarity index 78% rename from src/status_im2/contexts/chat/messages/content/unknown/view.cljs rename to src/status_im/contexts/chat/messages/content/unknown/view.cljs index f8f9e5b906..e54b7300a0 100644 --- a/src/status_im2/contexts/chat/messages/content/unknown/view.cljs +++ b/src/status_im/contexts/chat/messages/content/unknown/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.unknown.view +(ns status-im.contexts.chat.messages.content.unknown.view (:require [react-native.core :as rn])) diff --git a/src/status_im2/contexts/chat/messages/content/view.cljs b/src/status_im/contexts/chat/messages/content/view.cljs similarity index 91% rename from src/status_im2/contexts/chat/messages/content/view.cljs rename to src/status_im/contexts/chat/messages/content/view.cljs index ca363f4d24..aadf109b61 100644 --- a/src/status_im2/contexts/chat/messages/content/view.cljs +++ b/src/status_im/contexts/chat/messages/content/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.content.view +(ns status-im.contexts.chat.messages.content.view (:require [legacy.status-im.ui.screens.chat.message.legacy-view :as old-message] [quo.core :as quo] @@ -8,22 +8,22 @@ [react-native.gesture :as gesture] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.common.not-implemented :as not-implemented] - [status-im2.constants :as constants] - [status-im2.contexts.chat.composer.reply.view :as reply] - [status-im2.contexts.chat.messages.avatar.view :as avatar] - [status-im2.contexts.chat.messages.content.album.view :as album] - [status-im2.contexts.chat.messages.content.audio.view :as audio] - [status-im2.contexts.chat.messages.content.deleted.view :as content.deleted] - [status-im2.contexts.chat.messages.content.image.view :as image] - [status-im2.contexts.chat.messages.content.pin.view :as pin] - [status-im2.contexts.chat.messages.content.reactions.view :as reactions] - [status-im2.contexts.chat.messages.content.status.view :as status] - [status-im2.contexts.chat.messages.content.style :as style] - [status-im2.contexts.chat.messages.content.system.text.view :as system.text] - [status-im2.contexts.chat.messages.content.text.view :as content.text] - [status-im2.contexts.chat.messages.content.unknown.view :as content.unknown] - [status-im2.contexts.chat.messages.drawers.view :as drawers] + [status-im.common.not-implemented :as not-implemented] + [status-im.constants :as constants] + [status-im.contexts.chat.composer.reply.view :as reply] + [status-im.contexts.chat.messages.avatar.view :as avatar] + [status-im.contexts.chat.messages.content.album.view :as album] + [status-im.contexts.chat.messages.content.audio.view :as audio] + [status-im.contexts.chat.messages.content.deleted.view :as content.deleted] + [status-im.contexts.chat.messages.content.image.view :as image] + [status-im.contexts.chat.messages.content.pin.view :as pin] + [status-im.contexts.chat.messages.content.reactions.view :as reactions] + [status-im.contexts.chat.messages.content.status.view :as status] + [status-im.contexts.chat.messages.content.style :as style] + [status-im.contexts.chat.messages.content.system.text.view :as system.text] + [status-im.contexts.chat.messages.content.text.view :as content.text] + [status-im.contexts.chat.messages.content.unknown.view :as content.unknown] + [status-im.contexts.chat.messages.drawers.view :as drawers] [utils.address :as address] [utils.datetime :as datetime] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/delete_message/events.cljs b/src/status_im/contexts/chat/messages/delete_message/events.cljs similarity index 98% rename from src/status_im2/contexts/chat/messages/delete_message/events.cljs rename to src/status_im/contexts/chat/messages/delete_message/events.cljs index 0b9146318f..b246b35822 100644 --- a/src/status_im2/contexts/chat/messages/delete_message/events.cljs +++ b/src/status_im/contexts/chat/messages/delete_message/events.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.delete-message.events +(ns status-im.contexts.chat.messages.delete-message.events (:require [quo.foundations.colors :as colors] - [status-im2.contexts.chat.messages.list.events :as message-list] + [status-im.contexts.chat.messages.list.events :as message-list] [taoensso.timbre :as log] [utils.datetime :as datetime] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/messages/delete_message/events_test.cljs b/src/status_im/contexts/chat/messages/delete_message/events_test.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/delete_message/events_test.cljs rename to src/status_im/contexts/chat/messages/delete_message/events_test.cljs index a1f5938bf2..3254e74688 100644 --- a/src/status_im2/contexts/chat/messages/delete_message/events_test.cljs +++ b/src/status_im/contexts/chat/messages/delete_message/events_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.delete-message.events-test +(ns status-im.contexts.chat.messages.delete-message.events-test (:require [cljs.test :refer-macros [deftest is testing]] - [status-im2.contexts.chat.messages.delete-message.events :as delete-message] + [status-im.contexts.chat.messages.delete-message.events :as delete-message] [utils.datetime :as datetime])) (def mid "message-id") diff --git a/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs b/src/status_im/contexts/chat/messages/delete_message_for_me/events.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs rename to src/status_im/contexts/chat/messages/delete_message_for_me/events.cljs index 5855745433..118712db47 100644 --- a/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs +++ b/src/status_im/contexts/chat/messages/delete_message_for_me/events.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.delete-message-for-me.events +(ns status-im.contexts.chat.messages.delete-message-for-me.events (:require [quo.foundations.colors :as colors] - [status-im2.contexts.chat.messages.list.events :as message-list] + [status-im.contexts.chat.messages.list.events :as message-list] [taoensso.timbre :as log] [utils.datetime :as datetime] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/chat/messages/delete_message_for_me/events_test.cljs b/src/status_im/contexts/chat/messages/delete_message_for_me/events_test.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/delete_message_for_me/events_test.cljs rename to src/status_im/contexts/chat/messages/delete_message_for_me/events_test.cljs index e9564b99f4..6aea15f038 100644 --- a/src/status_im2/contexts/chat/messages/delete_message_for_me/events_test.cljs +++ b/src/status_im/contexts/chat/messages/delete_message_for_me/events_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.delete-message-for-me.events-test +(ns status-im.contexts.chat.messages.delete-message-for-me.events-test (:require [cljs.test :refer-macros [deftest is testing]] - [status-im2.contexts.chat.messages.delete-message-for-me.events :as + [status-im.contexts.chat.messages.delete-message-for-me.events :as delete-message-for-me] [utils.datetime :as datetime])) diff --git a/src/status_im2/contexts/chat/messages/drawers/style.cljs b/src/status_im/contexts/chat/messages/drawers/style.cljs similarity index 90% rename from src/status_im2/contexts/chat/messages/drawers/style.cljs rename to src/status_im/contexts/chat/messages/drawers/style.cljs index f31cf572fa..dfb77dd4f3 100644 --- a/src/status_im2/contexts/chat/messages/drawers/style.cljs +++ b/src/status_im/contexts/chat/messages/drawers/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.drawers.style +(ns status-im.contexts.chat.messages.drawers.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/chat/messages/drawers/view.cljs b/src/status_im/contexts/chat/messages/drawers/view.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/drawers/view.cljs rename to src/status_im/contexts/chat/messages/drawers/view.cljs index c50f3eb3fd..2e99b7f6af 100644 --- a/src/status_im2/contexts/chat/messages/drawers/view.cljs +++ b/src/status_im/contexts/chat/messages/drawers/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.drawers.view +(ns status-im.contexts.chat.messages.drawers.view (:require [quo.components.selectors.reaction-resource :as reactions.resource] [quo.core :as quo] @@ -6,10 +6,10 @@ [react-native.core :as rn] [react-native.gesture :as gesture] [reagent.core :as reagent] - [status-im2.common.contact-list-item.view :as contact-list-item] - [status-im2.constants :as constants] - [status-im2.contexts.chat.composer.reply.view :as reply] - [status-im2.contexts.chat.messages.drawers.style :as style] + [status-im.common.contact-list-item.view :as contact-list-item] + [status-im.constants :as constants] + [status-im.contexts.chat.composer.reply.view :as reply] + [status-im.contexts.chat.messages.drawers.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/link_preview/events.cljs b/src/status_im/contexts/chat/messages/link_preview/events.cljs similarity index 95% rename from src/status_im2/contexts/chat/messages/link_preview/events.cljs rename to src/status_im/contexts/chat/messages/link_preview/events.cljs index 399a6c599d..98ad436873 100644 --- a/src/status_im2/contexts/chat/messages/link_preview/events.cljs +++ b/src/status_im/contexts/chat/messages/link_preview/events.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.chat.messages.link-preview.events +(ns status-im.contexts.chat.messages.link-preview.events (:require [camel-snake-kebab.core :as csk] - [status-im2.contexts.communities.events :as communities] - [status-im2.contexts.profile.settings.events :as profile.settings.events] + [status-im.contexts.communities.events :as communities] + [status-im.contexts.profile.settings.events :as profile.settings.events] [taoensso.timbre :as log] [utils.collection] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/link_preview/style.cljs b/src/status_im/contexts/chat/messages/link_preview/style.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/link_preview/style.cljs rename to src/status_im/contexts/chat/messages/link_preview/style.cljs index 5f9dd46d52..1b9aaafe41 100644 --- a/src/status_im2/contexts/chat/messages/link_preview/style.cljs +++ b/src/status_im/contexts/chat/messages/link_preview/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.link-preview.style +(ns status-im.contexts.chat.messages.link-preview.style (:require [quo.foundations.colors :as colors] [quo.foundations.typography :as typography] diff --git a/src/status_im2/contexts/chat/messages/link_preview/view.cljs b/src/status_im/contexts/chat/messages/link_preview/view.cljs similarity index 96% rename from src/status_im2/contexts/chat/messages/link_preview/view.cljs rename to src/status_im/contexts/chat/messages/link_preview/view.cljs index 9f061cd6ad..a351329c23 100644 --- a/src/status_im2/contexts/chat/messages/link_preview/view.cljs +++ b/src/status_im/contexts/chat/messages/link_preview/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.chat.messages.link-preview.view +(ns status-im.contexts.chat.messages.link-preview.view (:require [clojure.string :as string] [quo.core :as quo] [react-native.core :as rn] [react-native.fast-image :as fast-image] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.link-preview.events] - [status-im2.contexts.chat.messages.link-preview.style :as style] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.link-preview.events] + [status-im.contexts.chat.messages.link-preview.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.security.core :as security])) diff --git a/src/status_im2/contexts/chat/messages/list/events.cljs b/src/status_im/contexts/chat/messages/list/events.cljs similarity index 98% rename from src/status_im2/contexts/chat/messages/list/events.cljs rename to src/status_im/contexts/chat/messages/list/events.cljs index dc979f909a..b9c9fa5071 100644 --- a/src/status_im2/contexts/chat/messages/list/events.cljs +++ b/src/status_im/contexts/chat/messages/list/events.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.chat.messages.list.events +(ns status-im.contexts.chat.messages.list.events (:require - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.datetime :as datetime] [utils.re-frame :as rf] [utils.red-black-tree :as red-black-tree])) diff --git a/src/status_im2/contexts/chat/messages/list/events_test.cljs b/src/status_im/contexts/chat/messages/list/events_test.cljs similarity index 98% rename from src/status_im2/contexts/chat/messages/list/events_test.cljs rename to src/status_im/contexts/chat/messages/list/events_test.cljs index 3778edd8a1..bed155efbf 100644 --- a/src/status_im2/contexts/chat/messages/list/events_test.cljs +++ b/src/status_im/contexts/chat/messages/list/events_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.list.events-test +(ns status-im.contexts.chat.messages.list.events-test (:require [cljs.test :refer-macros [deftest is testing]] - [status-im2.contexts.chat.messages.list.events :as s] + [status-im.contexts.chat.messages.list.events :as s] [taoensso.tufte :as tufte :refer-macros [defnp profile]])) (deftest message-stream-tests diff --git a/src/status_im2/contexts/chat/messages/list/state.cljs b/src/status_im/contexts/chat/messages/list/state.cljs similarity index 83% rename from src/status_im2/contexts/chat/messages/list/state.cljs rename to src/status_im/contexts/chat/messages/list/state.cljs index 6e19c93547..9ecc88735a 100644 --- a/src/status_im2/contexts/chat/messages/list/state.cljs +++ b/src/status_im/contexts/chat/messages/list/state.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.list.state) +(ns status-im.contexts.chat.messages.list.state) (defonce first-not-visible-item (atom nil)) diff --git a/src/status_im2/contexts/chat/messages/list/style.cljs b/src/status_im/contexts/chat/messages/list/style.cljs similarity index 91% rename from src/status_im2/contexts/chat/messages/list/style.cljs rename to src/status_im/contexts/chat/messages/list/style.cljs index d32a6b6a96..9e34ca2eff 100644 --- a/src/status_im2/contexts/chat/messages/list/style.cljs +++ b/src/status_im/contexts/chat/messages/list/style.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.chat.messages.list.style +(ns status-im.contexts.chat.messages.list.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.messages.constants :as messages.constants])) + [status-im.contexts.chat.messages.constants :as messages.constants])) (def keyboard-avoiding-container {:flex 1 diff --git a/src/status_im2/contexts/chat/messages/list/view.cljs b/src/status_im/contexts/chat/messages/list/view.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/list/view.cljs rename to src/status_im/contexts/chat/messages/list/view.cljs index 287737bdbd..3389a63b79 100644 --- a/src/status_im2/contexts/chat/messages/list/view.cljs +++ b/src/status_im/contexts/chat/messages/list/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.list.view +(ns status-im.contexts.chat.messages.list.view (:require [legacy.status-im.ui.screens.chat.group :as chat.group] [oops.core :as oops] @@ -11,14 +11,14 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.common.home.actions.view :as home.actions] - [status-im2.constants :as constants] - [status-im2.contexts.chat.composer.constants :as composer.constants] - [status-im2.contexts.chat.messages.constants :as messages.constants] - [status-im2.contexts.chat.messages.content.view :as message] - [status-im2.contexts.chat.messages.list.state :as state] - [status-im2.contexts.chat.messages.list.style :as style] - [status-im2.contexts.shell.jump-to.constants :as jump-to.constants] + [status-im.common.home.actions.view :as home.actions] + [status-im.constants :as constants] + [status-im.contexts.chat.composer.constants :as composer.constants] + [status-im.contexts.chat.messages.constants :as messages.constants] + [status-im.contexts.chat.messages.content.view :as message] + [status-im.contexts.chat.messages.list.state :as state] + [status-im.contexts.chat.messages.list.style :as style] + [status-im.contexts.shell.jump-to.constants :as jump-to.constants] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.worklets.chat.messages :as worklets])) diff --git a/src/status_im2/contexts/chat/messages/navigation/style.cljs b/src/status_im/contexts/chat/messages/navigation/style.cljs similarity index 96% rename from src/status_im2/contexts/chat/messages/navigation/style.cljs rename to src/status_im/contexts/chat/messages/navigation/style.cljs index ab5a2767ca..c07f6c94ec 100644 --- a/src/status_im2/contexts/chat/messages/navigation/style.cljs +++ b/src/status_im/contexts/chat/messages/navigation/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.navigation.style +(ns status-im.contexts.chat.messages.navigation.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/chat/messages/navigation/view.cljs b/src/status_im/contexts/chat/messages/navigation/view.cljs similarity index 94% rename from src/status_im2/contexts/chat/messages/navigation/view.cljs rename to src/status_im/contexts/chat/messages/navigation/view.cljs index 12108ca00d..d858d38e1b 100644 --- a/src/status_im2/contexts/chat/messages/navigation/view.cljs +++ b/src/status_im/contexts/chat/messages/navigation/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.navigation.view +(ns status-im.contexts.chat.messages.navigation.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -8,11 +8,11 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.common.home.actions.view :as actions] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.constants :as messages.constants] - [status-im2.contexts.chat.messages.navigation.style :as style] - [status-im2.contexts.chat.messages.pin.banner.view :as pin.banner] + [status-im.common.home.actions.view :as actions] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.constants :as messages.constants] + [status-im.contexts.chat.messages.navigation.style :as style] + [status-im.contexts.chat.messages.pin.banner.view :as pin.banner] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.worklets.chat.messages :as worklets])) diff --git a/src/status_im2/contexts/chat/messages/pin/banner/style.cljs b/src/status_im/contexts/chat/messages/pin/banner/style.cljs similarity index 74% rename from src/status_im2/contexts/chat/messages/pin/banner/style.cljs rename to src/status_im/contexts/chat/messages/pin/banner/style.cljs index 6f964ed78a..a1b6385a0e 100644 --- a/src/status_im2/contexts/chat/messages/pin/banner/style.cljs +++ b/src/status_im/contexts/chat/messages/pin/banner/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.pin.banner.style +(ns status-im.contexts.chat.messages.pin.banner.style (:require [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.messages.constants :as messages.constants])) + [status-im.contexts.chat.messages.constants :as messages.constants])) (def container {:position :absolute diff --git a/src/status_im2/contexts/chat/messages/pin/banner/view.cljs b/src/status_im/contexts/chat/messages/pin/banner/view.cljs similarity index 90% rename from src/status_im2/contexts/chat/messages/pin/banner/view.cljs rename to src/status_im/contexts/chat/messages/pin/banner/view.cljs index 873999886a..bc3493ca98 100644 --- a/src/status_im2/contexts/chat/messages/pin/banner/view.cljs +++ b/src/status_im/contexts/chat/messages/pin/banner/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.chat.messages.pin.banner.view +(ns status-im.contexts.chat.messages.pin.banner.view (:require [quo.core :as quo] [quo.theme :as theme] [react-native.blur :as blur] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.messages.pin.banner.style :as style] + [status-im.contexts.chat.messages.pin.banner.style :as style] [utils.re-frame :as rf])) (defn f-banner diff --git a/src/status_im2/contexts/chat/messages/pin/events.cljs b/src/status_im/contexts/chat/messages/pin/events.cljs similarity index 94% rename from src/status_im2/contexts/chat/messages/pin/events.cljs rename to src/status_im/contexts/chat/messages/pin/events.cljs index 447250e607..47a1cc9d1b 100644 --- a/src/status_im2/contexts/chat/messages/pin/events.cljs +++ b/src/status_im/contexts/chat/messages/pin/events.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.chat.messages.pin.events +(ns status-im.contexts.chat.messages.pin.events (:require [legacy.status-im.data-store.messages :as data-store.messages] [legacy.status-im.data-store.pin-messages :as data-store.pin-messages] [quo.foundations.colors :as colors] [re-frame.core :as re-frame] - [status-im2.common.toasts.events :as toasts] - [status-im2.constants :as constants] - [status-im2.contexts.chat.menus.pinned-messages.view :as pinned-messages-menu] - [status-im2.contexts.chat.messages.list.events :as message-list] - [status-im2.navigation.events :as navigation] + [status-im.common.toasts.events :as toasts] + [status-im.constants :as constants] + [status-im.contexts.chat.menus.pinned-messages.view :as pinned-messages-menu] + [status-im.contexts.chat.messages.list.events :as message-list] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/pin/events_test.cljs b/src/status_im/contexts/chat/messages/pin/events_test.cljs similarity index 93% rename from src/status_im2/contexts/chat/messages/pin/events_test.cljs rename to src/status_im/contexts/chat/messages/pin/events_test.cljs index f72a66fcde..a147bd6b2a 100644 --- a/src/status_im2/contexts/chat/messages/pin/events_test.cljs +++ b/src/status_im/contexts/chat/messages/pin/events_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.pin.events-test +(ns status-im.contexts.chat.messages.pin.events-test (:require [cljs.test :refer-macros [deftest is testing]] - [status-im2.contexts.chat.messages.pin.events :as events])) + [status-im.contexts.chat.messages.pin.events :as events])) (deftest receive-signal-test (let [chat-id "chat-id" @@ -30,8 +30,8 @@ :pinnedBy "0x1" :message message-3}}]) actual (events/receive-signal {:db db} - pinned-messages-signal) - ] + pinned-messages-signal)] + (is (not (get-in actual [:db :pin-messages chat-id message-id-2]))) (is (get-in actual [:db :pin-messages chat-id message-id-1 :message-id])) (is (get-in actual [:db :pin-messages chat-id message-id-3 :message-id])))))) diff --git a/src/status_im2/contexts/chat/messages/resolver/message_resolver.cljs b/src/status_im/contexts/chat/messages/resolver/message_resolver.cljs similarity index 88% rename from src/status_im2/contexts/chat/messages/resolver/message_resolver.cljs rename to src/status_im/contexts/chat/messages/resolver/message_resolver.cljs index d498f74726..03d9fe2a7b 100644 --- a/src/status_im2/contexts/chat/messages/resolver/message_resolver.cljs +++ b/src/status_im/contexts/chat/messages/resolver/message_resolver.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.resolver.message-resolver +(ns status-im.contexts.chat.messages.resolver.message-resolver (:require [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/resolver/message_resolver_test.cljs b/src/status_im/contexts/chat/messages/resolver/message_resolver_test.cljs similarity index 84% rename from src/status_im2/contexts/chat/messages/resolver/message_resolver_test.cljs rename to src/status_im/contexts/chat/messages/resolver/message_resolver_test.cljs index 879b239360..85663eea4f 100644 --- a/src/status_im2/contexts/chat/messages/resolver/message_resolver_test.cljs +++ b/src/status_im/contexts/chat/messages/resolver/message_resolver_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.messages.resolver.message-resolver-test +(ns status-im.contexts.chat.messages.resolver.message-resolver-test (:require [cljs.test :as t] - [status-im2.contexts.chat.messages.resolver.message-resolver :as resolver] + [status-im.contexts.chat.messages.resolver.message-resolver :as resolver] [utils.re-frame :as rf])) (def mentions diff --git a/src/status_im2/contexts/chat/messages/transport/events.cljs b/src/status_im/contexts/chat/messages/transport/events.cljs similarity index 97% rename from src/status_im2/contexts/chat/messages/transport/events.cljs rename to src/status_im/contexts/chat/messages/transport/events.cljs index 1720e0af56..3af5732809 100644 --- a/src/status_im2/contexts/chat/messages/transport/events.cljs +++ b/src/status_im/contexts/chat/messages/transport/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.messages.transport.events +(ns status-im.contexts.chat.messages.transport.events (:require [clojure.set :as set] [clojure.string :as string] @@ -13,13 +13,13 @@ [legacy.status-im.utils.deprecated-types :as types] [legacy.status-im.visibility-status-updates.core :as models.visibility-status-updates] [legacy.status-im.wallet.core :as wallet] - [status-im2.constants :as constants] - [status-im2.contexts.chat.events :as chat.events] - [status-im2.contexts.chat.messages.content.reactions.events :as reactions] - [status-im2.contexts.chat.messages.pin.events :as messages.pin] - [status-im2.contexts.communities.events :as communities] - [status-im2.contexts.contacts.events :as models.contact] - [status-im2.contexts.shell.activity-center.events :as activity-center] + [status-im.constants :as constants] + [status-im.contexts.chat.events :as chat.events] + [status-im.contexts.chat.messages.content.reactions.events :as reactions] + [status-im.contexts.chat.messages.pin.events :as messages.pin] + [status-im.contexts.communities.events :as communities] + [status-im.contexts.contacts.events :as models.contact] + [status-im.contexts.shell.activity-center.events :as activity-center] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/messages/view.cljs b/src/status_im/contexts/chat/messages/view.cljs similarity index 86% rename from src/status_im2/contexts/chat/messages/view.cljs rename to src/status_im/contexts/chat/messages/view.cljs index af16367f0f..e63726aacf 100644 --- a/src/status_im2/contexts/chat/messages/view.cljs +++ b/src/status_im/contexts/chat/messages/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.chat.messages.view +(ns status-im.contexts.chat.messages.view (:require [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.chat.composer.view :as composer.view] - [status-im2.contexts.chat.messages.list.style :as style] - [status-im2.contexts.chat.messages.list.view :as list.view] - [status-im2.contexts.chat.messages.navigation.view :as messages.navigation] - [status-im2.contexts.chat.placeholder.view :as placeholder.view] + [status-im.contexts.chat.composer.view :as composer.view] + [status-im.contexts.chat.messages.list.style :as style] + [status-im.contexts.chat.messages.list.view :as list.view] + [status-im.contexts.chat.messages.navigation.view :as messages.navigation] + [status-im.contexts.chat.placeholder.view :as placeholder.view] [utils.re-frame :as rf])) ;; NOTE(parvesh) - I am working on refactoring/optimization of the chat screen for performance diff --git a/src/status_im2/contexts/chat/new_chat/styles.cljs b/src/status_im/contexts/chat/new_chat/styles.cljs similarity index 91% rename from src/status_im2/contexts/chat/new_chat/styles.cljs rename to src/status_im/contexts/chat/new_chat/styles.cljs index 69153c45be..2697d93938 100644 --- a/src/status_im2/contexts/chat/new_chat/styles.cljs +++ b/src/status_im/contexts/chat/new_chat/styles.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.new-chat.styles +(ns status-im.contexts.chat.new-chat.styles (:require [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/chat/new_chat/view.cljs b/src/status_im/contexts/chat/new_chat/view.cljs similarity index 93% rename from src/status_im2/contexts/chat/new_chat/view.cljs rename to src/status_im/contexts/chat/new_chat/view.cljs index b5d7c76082..2cb6f3c290 100644 --- a/src/status_im2/contexts/chat/new_chat/view.cljs +++ b/src/status_im/contexts/chat/new_chat/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.new-chat.view +(ns status-im.contexts.chat.new-chat.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,11 +6,11 @@ [re-frame.core :as re-frame] [react-native.core :as rn] [react-native.gesture :as gesture] - [status-im2.common.contact-list-item.view :as contact-list-item] - [status-im2.common.contact-list.view :as contact-list] - [status-im2.common.resources :as resources] - [status-im2.constants :as constants] - [status-im2.contexts.chat.new-chat.styles :as style] + [status-im.common.contact-list-item.view :as contact-list-item] + [status-im.common.contact-list.view :as contact-list] + [status-im.common.resources :as resources] + [status-im.constants :as constants] + [status-im.contexts.chat.new-chat.styles :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs b/src/status_im/contexts/chat/photo_selector/album_selector/style.cljs similarity index 94% rename from src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs rename to src/status_im/contexts/chat/photo_selector/album_selector/style.cljs index dafb2aab97..d48704baf6 100644 --- a/src/status_im2/contexts/chat/photo_selector/album_selector/style.cljs +++ b/src/status_im/contexts/chat/photo_selector/album_selector/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.photo-selector.album-selector.style +(ns status-im.contexts.chat.photo-selector.album-selector.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/chat/photo_selector/album_selector/view.cljs b/src/status_im/contexts/chat/photo_selector/album_selector/view.cljs similarity index 96% rename from src/status_im2/contexts/chat/photo_selector/album_selector/view.cljs rename to src/status_im/contexts/chat/photo_selector/album_selector/view.cljs index 8d3302ab47..319d5f8bc4 100644 --- a/src/status_im2/contexts/chat/photo_selector/album_selector/view.cljs +++ b/src/status_im/contexts/chat/photo_selector/album_selector/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.photo-selector.album-selector.view +(ns status-im.contexts.chat.photo-selector.album-selector.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,7 +6,7 @@ [react-native.gesture :as gesture] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.photo-selector.album-selector.style :as style] + [status-im.contexts.chat.photo-selector.album-selector.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/photo_selector/effects.cljs b/src/status_im/contexts/chat/photo_selector/effects.cljs similarity index 98% rename from src/status_im2/contexts/chat/photo_selector/effects.cljs rename to src/status_im/contexts/chat/photo_selector/effects.cljs index a960abbf67..6a2c0effaf 100644 --- a/src/status_im2/contexts/chat/photo_selector/effects.cljs +++ b/src/status_im/contexts/chat/photo_selector/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.photo-selector.effects +(ns status-im.contexts.chat.photo-selector.effects (:require [clojure.string :as string] [react-native.cameraroll :as cameraroll] diff --git a/src/status_im2/contexts/chat/photo_selector/events.cljs b/src/status_im/contexts/chat/photo_selector/events.cljs similarity index 94% rename from src/status_im2/contexts/chat/photo_selector/events.cljs rename to src/status_im/contexts/chat/photo_selector/events.cljs index ecdd92fb54..a2382c545c 100644 --- a/src/status_im2/contexts/chat/photo_selector/events.cljs +++ b/src/status_im/contexts/chat/photo_selector/events.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.chat.photo-selector.events +(ns status-im.contexts.chat.photo-selector.events (:require - [status-im2.constants :as constants] - status-im2.contexts.chat.photo-selector.effects + [status-im.constants :as constants] + status-im.contexts.chat.photo-selector.effects [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/photo_selector/style.cljs b/src/status_im/contexts/chat/photo_selector/style.cljs similarity index 97% rename from src/status_im2/contexts/chat/photo_selector/style.cljs rename to src/status_im/contexts/chat/photo_selector/style.cljs index e555e2dd61..c126023bc6 100644 --- a/src/status_im2/contexts/chat/photo_selector/style.cljs +++ b/src/status_im/contexts/chat/photo_selector/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.photo-selector.style +(ns status-im.contexts.chat.photo-selector.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/chat/photo_selector/view.cljs b/src/status_im/contexts/chat/photo_selector/view.cljs similarity index 96% rename from src/status_im2/contexts/chat/photo_selector/view.cljs rename to src/status_im/contexts/chat/photo_selector/view.cljs index cd5801678d..69cdeaea6d 100644 --- a/src/status_im2/contexts/chat/photo_selector/view.cljs +++ b/src/status_im/contexts/chat/photo_selector/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.photo-selector.view +(ns status-im.contexts.chat.photo-selector.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -9,9 +9,9 @@ [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.chat.photo-selector.album-selector.view :as album-selector] - [status-im2.contexts.chat.photo-selector.style :as style] + [status-im.constants :as constants] + [status-im.contexts.chat.photo-selector.album-selector.view :as album-selector] + [status-im.contexts.chat.photo-selector.style :as style] utils.collection [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/chat/placeholder/style.cljs b/src/status_im/contexts/chat/placeholder/style.cljs similarity index 90% rename from src/status_im2/contexts/chat/placeholder/style.cljs rename to src/status_im/contexts/chat/placeholder/style.cljs index 9a0b243837..a0e853ecb9 100644 --- a/src/status_im2/contexts/chat/placeholder/style.cljs +++ b/src/status_im/contexts/chat/placeholder/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.chat.placeholder.style +(ns status-im.contexts.chat.placeholder.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/chat/placeholder/view.cljs b/src/status_im/contexts/chat/placeholder/view.cljs similarity index 86% rename from src/status_im2/contexts/chat/placeholder/view.cljs rename to src/status_im/contexts/chat/placeholder/view.cljs index b15cb908aa..6b97073e62 100644 --- a/src/status_im2/contexts/chat/placeholder/view.cljs +++ b/src/status_im/contexts/chat/placeholder/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.chat.placeholder.view +(ns status-im.contexts.chat.placeholder.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.contexts.chat.placeholder.style :as style] + [status-im.contexts.chat.placeholder.style :as style] [utils.worklets.chat.messages :as worklets])) (defn- loading-skeleton diff --git a/src/status_im2/contexts/communities/actions/accounts_selection/style.cljs b/src/status_im/contexts/communities/actions/accounts_selection/style.cljs similarity index 90% rename from src/status_im2/contexts/communities/actions/accounts_selection/style.cljs rename to src/status_im/contexts/communities/actions/accounts_selection/style.cljs index 5cd7b9fdcf..19fffacaff 100644 --- a/src/status_im2/contexts/communities/actions/accounts_selection/style.cljs +++ b/src/status_im/contexts/communities/actions/accounts_selection/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.accounts-selection.style +(ns status-im.contexts.communities.actions.accounts-selection.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/communities/actions/accounts_selection/view.cljs b/src/status_im/contexts/communities/actions/accounts_selection/view.cljs similarity index 90% rename from src/status_im2/contexts/communities/actions/accounts_selection/view.cljs rename to src/status_im/contexts/communities/actions/accounts_selection/view.cljs index 6fdee13e80..1727fb56e5 100644 --- a/src/status_im2/contexts/communities/actions/accounts_selection/view.cljs +++ b/src/status_im/contexts/communities/actions/accounts_selection/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.communities.actions.accounts-selection.view +(ns status-im.contexts.communities.actions.accounts-selection.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] - [status-im2.common.not-implemented :as not-implemented] - [status-im2.common.password-authentication.view :as password-authentication] - [status-im2.contexts.communities.actions.accounts-selection.style :as style] - [status-im2.contexts.communities.actions.community-rules.view :as community-rules] + [status-im.common.not-implemented :as not-implemented] + [status-im.common.password-authentication.view :as password-authentication] + [status-im.contexts.communities.actions.accounts-selection.style :as style] + [status-im.contexts.communities.actions.community-rules.view :as community-rules] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/addresses_for_permissions/style.cljs b/src/status_im/contexts/communities/actions/addresses_for_permissions/style.cljs similarity index 87% rename from src/status_im2/contexts/communities/actions/addresses_for_permissions/style.cljs rename to src/status_im/contexts/communities/actions/addresses_for_permissions/style.cljs index 66c8c0fbc0..feb29be371 100644 --- a/src/status_im2/contexts/communities/actions/addresses_for_permissions/style.cljs +++ b/src/status_im/contexts/communities/actions/addresses_for_permissions/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.addresses-for-permissions.style +(ns status-im.contexts.communities.actions.addresses-for-permissions.style (:require [quo.foundations.colors :as colors])) (def container {:flex 1}) diff --git a/src/status_im2/contexts/communities/actions/addresses_for_permissions/view.cljs b/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs similarity index 88% rename from src/status_im2/contexts/communities/actions/addresses_for_permissions/view.cljs rename to src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs index 997fb068ff..e35006f7cf 100644 --- a/src/status_im2/contexts/communities/actions/addresses_for_permissions/view.cljs +++ b/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.communities.actions.addresses-for-permissions.view +(ns status-im.contexts.communities.actions.addresses-for-permissions.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.common.not-implemented :as not-implemented] - [status-im2.contexts.communities.actions.addresses-for-permissions.style :as style] + [status-im.common.not-implemented :as not-implemented] + [status-im.contexts.communities.actions.addresses-for-permissions.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/chat/view.cljs b/src/status_im/contexts/communities/actions/chat/view.cljs similarity index 95% rename from src/status_im2/contexts/communities/actions/chat/view.cljs rename to src/status_im/contexts/communities/actions/chat/view.cljs index 0dc75d4170..02228c4584 100644 --- a/src/status_im2/contexts/communities/actions/chat/view.cljs +++ b/src/status_im/contexts/communities/actions/chat/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.communities.actions.chat.view +(ns status-im.contexts.communities.actions.chat.view (:require [quo.core :as quo] - [status-im2.common.mute-drawer.view :as mute-drawer] - [status-im2.common.muting.helpers :refer [format-mute-till]] - [status-im2.common.not-implemented :as not-implemented] + [status-im.common.mute-drawer.view :as mute-drawer] + [status-im.common.muting.helpers :refer [format-mute-till]] + [status-im.common.not-implemented :as not-implemented] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/community_options/component_spec.cljs b/src/status_im/contexts/communities/actions/community_options/component_spec.cljs similarity index 98% rename from src/status_im2/contexts/communities/actions/community_options/component_spec.cljs rename to src/status_im/contexts/communities/actions/community_options/component_spec.cljs index 7b9a2a6fe9..a0c3407ecf 100644 --- a/src/status_im2/contexts/communities/actions/community_options/component_spec.cljs +++ b/src/status_im/contexts/communities/actions/community_options/component_spec.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.communities.actions.community-options.component-spec +(ns status-im.contexts.communities.actions.community-options.component-spec (:require [re-frame.core :as re-frame] - [status-im2.contexts.communities.actions.community-options.view :as options] + [status-im.contexts.communities.actions.community-options.view :as options] [test-helpers.component :as h])) (defn setup-subs diff --git a/src/status_im2/contexts/communities/actions/community_options/events.cljs b/src/status_im/contexts/communities/actions/community_options/events.cljs similarity index 94% rename from src/status_im2/contexts/communities/actions/community_options/events.cljs rename to src/status_im/contexts/communities/actions/community_options/events.cljs index 395585e901..7aa0cd3644 100644 --- a/src/status_im2/contexts/communities/actions/community_options/events.cljs +++ b/src/status_im/contexts/communities/actions/community_options/events.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.communities.actions.community-options.events +(ns status-im.contexts.communities.actions.community-options.events (:require [quo.foundations.colors :as quo.colors] - [status-im2.common.muting.helpers :as muting.helpers] + [status-im.common.muting.helpers :as muting.helpers] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/community_options/view.cljs b/src/status_im/contexts/communities/actions/community_options/view.cljs similarity index 93% rename from src/status_im2/contexts/communities/actions/community_options/view.cljs rename to src/status_im/contexts/communities/actions/community_options/view.cljs index 58bb6b4c87..ab94b38040 100644 --- a/src/status_im2/contexts/communities/actions/community_options/view.cljs +++ b/src/status_im/contexts/communities/actions/community_options/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.communities.actions.community-options.view +(ns status-im.contexts.communities.actions.community-options.view (:require [quo.core :as quo] - [status-im2.common.mute-drawer.view :as mute-options] - [status-im2.common.muting.helpers :refer [format-mute-till]] - [status-im2.constants :as constants] - [status-im2.contexts.communities.actions.leave.view :as leave-menu] - [status-im2.contexts.communities.actions.see-rules.view :as see-rules] - [status-im2.contexts.communities.actions.token-gating.view :as token-gating] + [status-im.common.mute-drawer.view :as mute-options] + [status-im.common.muting.helpers :refer [format-mute-till]] + [status-im.constants :as constants] + [status-im.contexts.communities.actions.leave.view :as leave-menu] + [status-im.contexts.communities.actions.see-rules.view :as see-rules] + [status-im.contexts.communities.actions.token-gating.view :as token-gating] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/community_rules/style.cljs b/src/status_im/contexts/communities/actions/community_rules/style.cljs similarity index 66% rename from src/status_im2/contexts/communities/actions/community_rules/style.cljs rename to src/status_im/contexts/communities/actions/community_rules/style.cljs index d50f00e7eb..6a2b39621d 100644 --- a/src/status_im2/contexts/communities/actions/community_rules/style.cljs +++ b/src/status_im/contexts/communities/actions/community_rules/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.community-rules.style) +(ns status-im.contexts.communities.actions.community-rules.style) (def community-rule {:flex 1 diff --git a/src/status_im2/contexts/communities/actions/community_rules/view.cljs b/src/status_im/contexts/communities/actions/community_rules/view.cljs similarity index 66% rename from src/status_im2/contexts/communities/actions/community_rules/view.cljs rename to src/status_im/contexts/communities/actions/community_rules/view.cljs index 0006cb02b5..f89b122e65 100644 --- a/src/status_im2/contexts/communities/actions/community_rules/view.cljs +++ b/src/status_im/contexts/communities/actions/community_rules/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.communities.actions.community-rules.view +(ns status-im.contexts.communities.actions.community-rules.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.communities.actions.community-rules.style :as style] + [status-im.contexts.communities.actions.community-rules.style :as style] [utils.re-frame :as rf])) (defn view diff --git a/src/status_im2/contexts/communities/actions/community_rules_list/style.cljs b/src/status_im/contexts/communities/actions/community_rules_list/style.cljs similarity index 76% rename from src/status_im2/contexts/communities/actions/community_rules_list/style.cljs rename to src/status_im/contexts/communities/actions/community_rules_list/style.cljs index 70d81425a9..f656d64b7a 100644 --- a/src/status_im2/contexts/communities/actions/community_rules_list/style.cljs +++ b/src/status_im/contexts/communities/actions/community_rules_list/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.community-rules-list.style) +(ns status-im.contexts.communities.actions.community-rules-list.style) (def community-rule {:flex-direction :row diff --git a/src/status_im2/contexts/communities/actions/community_rules_list/view.cljs b/src/status_im/contexts/communities/actions/community_rules_list/view.cljs similarity index 92% rename from src/status_im2/contexts/communities/actions/community_rules_list/view.cljs rename to src/status_im/contexts/communities/actions/community_rules_list/view.cljs index c549dff224..722f076def 100644 --- a/src/status_im2/contexts/communities/actions/community_rules_list/view.cljs +++ b/src/status_im/contexts/communities/actions/community_rules_list/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.communities.actions.community-rules-list.view +(ns status-im.contexts.communities.actions.community-rules-list.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.communities.actions.community-rules-list.style :as style])) + [status-im.contexts.communities.actions.community-rules-list.style :as style])) (def standard-rules [{:index 1 diff --git a/src/status_im2/contexts/communities/actions/generic_menu/style.cljs b/src/status_im/contexts/communities/actions/generic_menu/style.cljs similarity index 82% rename from src/status_im2/contexts/communities/actions/generic_menu/style.cljs rename to src/status_im/contexts/communities/actions/generic_menu/style.cljs index c9fd575757..d9f6512054 100644 --- a/src/status_im2/contexts/communities/actions/generic_menu/style.cljs +++ b/src/status_im/contexts/communities/actions/generic_menu/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.generic-menu.style) +(ns status-im.contexts.communities.actions.generic-menu.style) (def container {:flex 1 diff --git a/src/status_im2/contexts/communities/actions/generic_menu/view.cljs b/src/status_im/contexts/communities/actions/generic_menu/view.cljs similarity index 83% rename from src/status_im2/contexts/communities/actions/generic_menu/view.cljs rename to src/status_im/contexts/communities/actions/generic_menu/view.cljs index 54a620e39e..d7c29b10ab 100644 --- a/src/status_im2/contexts/communities/actions/generic_menu/view.cljs +++ b/src/status_im/contexts/communities/actions/generic_menu/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.communities.actions.generic-menu.view +(ns status-im.contexts.communities.actions.generic-menu.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.communities.actions.generic-menu.style :as style] + [status-im.contexts.communities.actions.generic-menu.style :as style] [utils.re-frame :as rf])) (defn view diff --git a/src/status_im2/contexts/communities/actions/home_plus/view.cljs b/src/status_im/contexts/communities/actions/home_plus/view.cljs similarity index 93% rename from src/status_im2/contexts/communities/actions/home_plus/view.cljs rename to src/status_im/contexts/communities/actions/home_plus/view.cljs index 9f123fe39c..e29531a04e 100644 --- a/src/status_im2/contexts/communities/actions/home_plus/view.cljs +++ b/src/status_im/contexts/communities/actions/home_plus/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.home-plus.view +(ns status-im.contexts.communities.actions.home-plus.view (:require [quo.core :as quo] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/leave/events.cljs b/src/status_im/contexts/communities/actions/leave/events.cljs similarity index 97% rename from src/status_im2/contexts/communities/actions/leave/events.cljs rename to src/status_im/contexts/communities/actions/leave/events.cljs index 931dadec57..7cb935a89d 100644 --- a/src/status_im2/contexts/communities/actions/leave/events.cljs +++ b/src/status_im/contexts/communities/actions/leave/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.leave.events +(ns status-im.contexts.communities.actions.leave.events (:require [legacy.status-im.ui.components.colors :as colors] [taoensso.timbre :as log] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/communities/actions/leave/style.cljs b/src/status_im/contexts/communities/actions/leave/style.cljs similarity index 82% rename from src/status_im2/contexts/communities/actions/leave/style.cljs rename to src/status_im/contexts/communities/actions/leave/style.cljs index 8e977c77c1..1b9ebf0d76 100644 --- a/src/status_im2/contexts/communities/actions/leave/style.cljs +++ b/src/status_im/contexts/communities/actions/leave/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.leave.style) +(ns status-im.contexts.communities.actions.leave.style) (def button-container {:margin-top 20 diff --git a/src/status_im2/contexts/communities/actions/leave/view.cljs b/src/status_im/contexts/communities/actions/leave/view.cljs similarity index 89% rename from src/status_im2/contexts/communities/actions/leave/view.cljs rename to src/status_im/contexts/communities/actions/leave/view.cljs index 866ee319a0..207b787e12 100644 --- a/src/status_im2/contexts/communities/actions/leave/view.cljs +++ b/src/status_im/contexts/communities/actions/leave/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.communities.actions.leave.view +(ns status-im.contexts.communities.actions.leave.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.communities.actions.generic-menu.view :as generic-menu] - [status-im2.contexts.communities.actions.leave.style :as style] + [status-im.contexts.communities.actions.generic-menu.view :as generic-menu] + [status-im.contexts.communities.actions.leave.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/actions/request_to_join/style.cljs b/src/status_im/contexts/communities/actions/request_to_join/style.cljs similarity index 93% rename from src/status_im2/contexts/communities/actions/request_to_join/style.cljs rename to src/status_im/contexts/communities/actions/request_to_join/style.cljs index c819cb7a0b..a235d90174 100644 --- a/src/status_im2/contexts/communities/actions/request_to_join/style.cljs +++ b/src/status_im/contexts/communities/actions/request_to_join/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.request-to-join.style +(ns status-im.contexts.communities.actions.request-to-join.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/communities/actions/request_to_join/view.cljs b/src/status_im/contexts/communities/actions/request_to_join/view.cljs similarity index 88% rename from src/status_im2/contexts/communities/actions/request_to_join/view.cljs rename to src/status_im/contexts/communities/actions/request_to_join/view.cljs index 576a95934c..f79040b175 100644 --- a/src/status_im2/contexts/communities/actions/request_to_join/view.cljs +++ b/src/status_im/contexts/communities/actions/request_to_join/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.communities.actions.request-to-join.view +(ns status-im.contexts.communities.actions.request-to-join.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] - [status-im2.common.password-authentication.view :as password-authentication] - [status-im2.contexts.communities.actions.community-rules-list.view :as community-rules] - [status-im2.contexts.communities.actions.request-to-join.style :as style] + [status-im.common.password-authentication.view :as password-authentication] + [status-im.contexts.communities.actions.community-rules-list.view :as community-rules] + [status-im.contexts.communities.actions.request-to-join.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/communities/actions/see_rules/view.cljs b/src/status_im/contexts/communities/actions/see_rules/view.cljs new file mode 100644 index 0000000000..3e680e5557 --- /dev/null +++ b/src/status_im/contexts/communities/actions/see_rules/view.cljs @@ -0,0 +1,13 @@ +(ns status-im.contexts.communities.actions.see-rules.view + (:require + [status-im.contexts.communities.actions.community-rules-list.view :as community-rules] + [status-im.contexts.communities.actions.generic-menu.view :as generic-menu] + [utils.i18n :as i18n])) + +(defn view + [id] + [generic-menu/view + {:id id + :title (i18n/label :t/community-rules)} + + [community-rules/view community-rules/standard-rules]]) diff --git a/src/status_im2/contexts/communities/actions/token_gating/view.cljs b/src/status_im/contexts/communities/actions/token_gating/view.cljs similarity index 93% rename from src/status_im2/contexts/communities/actions/token_gating/view.cljs rename to src/status_im/contexts/communities/actions/token_gating/view.cljs index 2f0cfdc960..8725aeb875 100644 --- a/src/status_im2/contexts/communities/actions/token_gating/view.cljs +++ b/src/status_im/contexts/communities/actions/token_gating/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.actions.token-gating.view +(ns status-im.contexts.communities.actions.token-gating.view (:require [quo.core :as quo] [react-native.core :as rn] diff --git a/src/status_im2/contexts/communities/discover/events.cljs b/src/status_im/contexts/communities/discover/events.cljs similarity index 98% rename from src/status_im2/contexts/communities/discover/events.cljs rename to src/status_im/contexts/communities/discover/events.cljs index a3bf20846b..060259b741 100644 --- a/src/status_im2/contexts/communities/discover/events.cljs +++ b/src/status_im/contexts/communities/discover/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.discover.events +(ns status-im.contexts.communities.discover.events (:require [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/discover/events_test.cljs b/src/status_im/contexts/communities/discover/events_test.cljs similarity index 97% rename from src/status_im2/contexts/communities/discover/events_test.cljs rename to src/status_im/contexts/communities/discover/events_test.cljs index db4f80f064..27091f7686 100644 --- a/src/status_im2/contexts/communities/discover/events_test.cljs +++ b/src/status_im/contexts/communities/discover/events_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.communities.discover.events-test +(ns status-im.contexts.communities.discover.events-test (:require [cljs.test :refer-macros [deftest are]] matcher-combinators.test - [status-im2.contexts.communities.discover.events :as events])) + [status-im.contexts.communities.discover.events :as events])) (deftest rename-contract-community-key-test (are [i e] (= (events/rename-contract-community-key i) e) diff --git a/src/status_im2/contexts/communities/discover/style.cljs b/src/status_im/contexts/communities/discover/style.cljs similarity index 93% rename from src/status_im2/contexts/communities/discover/style.cljs rename to src/status_im/contexts/communities/discover/style.cljs index 3eb92b5590..3bccc24e76 100644 --- a/src/status_im2/contexts/communities/discover/style.cljs +++ b/src/status_im/contexts/communities/discover/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.communities.discover.style +(ns status-im.contexts.communities.discover.style (:require [react-native.platform :as platform] - [status-im2.contexts.shell.jump-to.constants :as jump-to.constants])) + [status-im.contexts.shell.jump-to.constants :as jump-to.constants])) (def screen-title-container {:height 56 diff --git a/src/status_im2/contexts/communities/discover/view.cljs b/src/status_im/contexts/communities/discover/view.cljs similarity index 97% rename from src/status_im2/contexts/communities/discover/view.cljs rename to src/status_im/contexts/communities/discover/view.cljs index d6ce0475c3..7d632bf656 100644 --- a/src/status_im2/contexts/communities/discover/view.cljs +++ b/src/status_im/contexts/communities/discover/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.discover.view +(ns status-im.contexts.communities.discover.view (:require [oops.core :as oops] [quo.core :as quo] @@ -6,9 +6,9 @@ [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.scroll-page.view :as scroll-page] - [status-im2.contexts.communities.actions.community-options.view :as options] - [status-im2.contexts.communities.discover.style :as style] + [status-im.common.scroll-page.view :as scroll-page] + [status-im.contexts.communities.actions.community-options.view :as options] + [status-im.contexts.communities.discover.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/events.cljs b/src/status_im/contexts/communities/events.cljs similarity index 97% rename from src/status_im2/contexts/communities/events.cljs rename to src/status_im/contexts/communities/events.cljs index 19834b0084..b3be55baec 100644 --- a/src/status_im2/contexts/communities/events.cljs +++ b/src/status_im/contexts/communities/events.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.communities.events +(ns status-im.contexts.communities.events (:require [clojure.set :as set] [clojure.walk :as walk] [legacy.status-im.ui.components.colors :as colors] - [status-im2.constants :as constants] - status-im2.contexts.communities.actions.community-options.events - status-im2.contexts.communities.actions.leave.events + [status-im.constants :as constants] + status-im.contexts.communities.actions.community-options.events + status-im.contexts.communities.actions.leave.events [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/home/events.cljs b/src/status_im/contexts/communities/home/events.cljs similarity index 79% rename from src/status_im2/contexts/communities/home/events.cljs rename to src/status_im/contexts/communities/home/events.cljs index f5c80f1172..3d2b6468e0 100644 --- a/src/status_im2/contexts/communities/home/events.cljs +++ b/src/status_im/contexts/communities/home/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.home.events +(ns status-im.contexts.communities.home.events (:require [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/communities/home/style.cljs b/src/status_im/contexts/communities/home/style.cljs similarity index 97% rename from src/status_im2/contexts/communities/home/style.cljs rename to src/status_im/contexts/communities/home/style.cljs index 2f4fe485b3..241030ed39 100644 --- a/src/status_im2/contexts/communities/home/style.cljs +++ b/src/status_im/contexts/communities/home/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.home.style +(ns status-im.contexts.communities.home.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/communities/home/view.cljs b/src/status_im/contexts/communities/home/view.cljs similarity index 90% rename from src/status_im2/contexts/communities/home/view.cljs rename to src/status_im/contexts/communities/home/view.cljs index 8715f11ee5..76dd898665 100644 --- a/src/status_im2/contexts/communities/home/view.cljs +++ b/src/status_im/contexts/communities/home/view.cljs @@ -1,18 +1,18 @@ -(ns status-im2.contexts.communities.home.view +(ns status-im.contexts.communities.home.view (:require [oops.core :as oops] [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.reanimated :as reanimated] - [status-im2.common.home.banner.view :as common.banner] - [status-im2.common.home.empty-state.view :as common.empty-state] - [status-im2.common.home.header-spacing.view :as common.header-spacing] - [status-im2.common.resources :as resources] - [status-im2.config :as config] - [status-im2.contexts.communities.actions.community-options.view :as options] - [status-im2.contexts.communities.actions.home-plus.view :as actions.home-plus] - [status-im2.contexts.shell.jump-to.constants :as jump-to.constants] + [status-im.common.home.banner.view :as common.banner] + [status-im.common.home.empty-state.view :as common.empty-state] + [status-im.common.home.header-spacing.view :as common.header-spacing] + [status-im.common.resources :as resources] + [status-im.config :as config] + [status-im.contexts.communities.actions.community-options.view :as options] + [status-im.contexts.communities.actions.home-plus.view :as actions.home-plus] + [status-im.contexts.shell.jump-to.constants :as jump-to.constants] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.number] diff --git a/src/status_im2/contexts/communities/overview/events.cljs b/src/status_im/contexts/communities/overview/events.cljs similarity index 99% rename from src/status_im2/contexts/communities/overview/events.cljs rename to src/status_im/contexts/communities/overview/events.cljs index 8c64ca3ba4..51ea7a82c6 100644 --- a/src/status_im2/contexts/communities/overview/events.cljs +++ b/src/status_im/contexts/communities/overview/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.overview.events +(ns status-im.contexts.communities.overview.events (:require [legacy.status-im.data-store.communities :as data-store] [legacy.status-im.ui.components.colors :as colors] diff --git a/src/status_im2/contexts/communities/overview/events_test.cljs b/src/status_im/contexts/communities/overview/events_test.cljs similarity index 95% rename from src/status_im2/contexts/communities/overview/events_test.cljs rename to src/status_im/contexts/communities/overview/events_test.cljs index 70eefd757d..2be10a1dda 100644 --- a/src/status_im2/contexts/communities/overview/events_test.cljs +++ b/src/status_im/contexts/communities/overview/events_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.communities.overview.events-test +(ns status-im.contexts.communities.overview.events-test (:require [cljs.test :refer [deftest is]] matcher-combinators.test [native-module.core :as native-module] - [status-im2.contexts.communities.overview.events :as sut])) + [status-im.contexts.communities.overview.events :as sut])) (def password (native-module/sha3 "password123")) (def community-id "0x99") diff --git a/src/status_im2/contexts/communities/overview/style.cljs b/src/status_im/contexts/communities/overview/style.cljs similarity index 91% rename from src/status_im2/contexts/communities/overview/style.cljs rename to src/status_im/contexts/communities/overview/style.cljs index ca6f2b8c03..83b87c6c2a 100644 --- a/src/status_im2/contexts/communities/overview/style.cljs +++ b/src/status_im/contexts/communities/overview/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.communities.overview.style +(ns status-im.contexts.communities.overview.style (:require [quo.foundations.colors :as colors] - [status-im2.contexts.shell.jump-to.constants :as jump-to.constants])) + [status-im.contexts.shell.jump-to.constants :as jump-to.constants])) (def screen-horizontal-padding 20) diff --git a/src/status_im2/contexts/communities/overview/utils.cljs b/src/status_im/contexts/communities/overview/utils.cljs similarity index 93% rename from src/status_im2/contexts/communities/overview/utils.cljs rename to src/status_im/contexts/communities/overview/utils.cljs index 959cb77551..bf105b84a7 100644 --- a/src/status_im2/contexts/communities/overview/utils.cljs +++ b/src/status_im/contexts/communities/overview/utils.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.overview.utils +(ns status-im.contexts.communities.overview.utils (:require [clojure.string :as string] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/communities/overview/view.cljs b/src/status_im/contexts/communities/overview/view.cljs similarity index 95% rename from src/status_im2/contexts/communities/overview/view.cljs rename to src/status_im/contexts/communities/overview/view.cljs index 626c92ab15..c6cb8e050f 100644 --- a/src/status_im2/contexts/communities/overview/view.cljs +++ b/src/status_im/contexts/communities/overview/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.communities.overview.view +(ns status-im.contexts.communities.overview.view (:require [oops.core :as oops] [quo.core :as quo] @@ -6,16 +6,16 @@ [react-native.blur :as blur] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.home.actions.view :as actions] - [status-im2.common.password-authentication.view :as password-authentication] - [status-im2.common.scroll-page.style :as scroll-page.style] - [status-im2.common.scroll-page.view :as scroll-page] - [status-im2.config :as config] - [status-im2.constants :as constants] - [status-im2.contexts.communities.actions.chat.view :as chat-actions] - [status-im2.contexts.communities.actions.community-options.view :as options] - [status-im2.contexts.communities.overview.style :as style] - [status-im2.contexts.communities.overview.utils :as utils] + [status-im.common.home.actions.view :as actions] + [status-im.common.password-authentication.view :as password-authentication] + [status-im.common.scroll-page.style :as scroll-page.style] + [status-im.common.scroll-page.view :as scroll-page] + [status-im.config :as config] + [status-im.constants :as constants] + [status-im.contexts.communities.actions.chat.view :as chat-actions] + [status-im.contexts.communities.actions.community-options.view :as options] + [status-im.contexts.communities.overview.style :as style] + [status-im.contexts.communities.overview.utils :as utils] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs b/src/status_im/contexts/contacts/drawers/nickname_drawer/style.cljs similarity index 93% rename from src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs rename to src/status_im/contexts/contacts/drawers/nickname_drawer/style.cljs index c770d28b7c..65bc1378ff 100644 --- a/src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs +++ b/src/status_im/contexts/contacts/drawers/nickname_drawer/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.contacts.drawers.nickname-drawer.style +(ns status-im.contexts.contacts.drawers.nickname-drawer.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs b/src/status_im/contexts/contacts/drawers/nickname_drawer/view.cljs similarity index 94% rename from src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs rename to src/status_im/contexts/contacts/drawers/nickname_drawer/view.cljs index 8f4f2de2e6..8a699fcf63 100644 --- a/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs +++ b/src/status_im/contexts/contacts/drawers/nickname_drawer/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.contacts.drawers.nickname-drawer.view +(ns status-im.contexts.contacts.drawers.nickname-drawer.view (:require [clojure.string :as string] [quo.core :as quo] @@ -6,8 +6,8 @@ [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.contacts.drawers.nickname-drawer.style :as style] + [status-im.constants :as constants] + [status-im.contexts.contacts.drawers.nickname-drawer.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/contacts/events.cljs b/src/status_im/contexts/contacts/events.cljs similarity index 98% rename from src/status_im2/contexts/contacts/events.cljs rename to src/status_im/contexts/contacts/events.cljs index 61dda3c955..4885065696 100644 --- a/src/status_im2/contexts/contacts/events.cljs +++ b/src/status_im/contexts/contacts/events.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.contacts.events +(ns status-im.contexts.contacts.events (:require [oops.core :as oops] - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/emoji_picker/constants.cljs b/src/status_im/contexts/emoji_picker/constants.cljs similarity index 92% rename from src/status_im2/contexts/emoji_picker/constants.cljs rename to src/status_im/contexts/emoji_picker/constants.cljs index 4c9b9a2c51..3c15514468 100644 --- a/src/status_im2/contexts/emoji_picker/constants.cljs +++ b/src/status_im/contexts/emoji_picker/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.emoji-picker.constants +(ns status-im.contexts.emoji-picker.constants (:require [react-native.core :as rn])) diff --git a/src/status_im2/contexts/emoji_picker/data.cljs b/src/status_im/contexts/emoji_picker/data.cljs similarity index 96% rename from src/status_im2/contexts/emoji_picker/data.cljs rename to src/status_im/contexts/emoji_picker/data.cljs index 4a24d15cbf..28fe419a8d 100644 --- a/src/status_im2/contexts/emoji_picker/data.cljs +++ b/src/status_im/contexts/emoji_picker/data.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.emoji-picker.data +(ns status-im.contexts.emoji-picker.data (:require - [status-im2.contexts.emoji-picker.constants :as constants] + [status-im.contexts.emoji-picker.constants :as constants] [utils.transforms :as transforms])) ;; Emoji data is pulled from the `emojibase` (https://emojibase.dev). diff --git a/src/status_im2/contexts/emoji_picker/events.cljs b/src/status_im/contexts/emoji_picker/events.cljs similarity index 81% rename from src/status_im2/contexts/emoji_picker/events.cljs rename to src/status_im/contexts/emoji_picker/events.cljs index 8aa7865a69..0c6c845297 100644 --- a/src/status_im2/contexts/emoji_picker/events.cljs +++ b/src/status_im/contexts/emoji_picker/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.emoji-picker.events +(ns status-im.contexts.emoji-picker.events (:require [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/emoji_picker/style.cljs b/src/status_im/contexts/emoji_picker/style.cljs similarity index 92% rename from src/status_im2/contexts/emoji_picker/style.cljs rename to src/status_im/contexts/emoji_picker/style.cljs index b6b934a83a..78760b1c27 100644 --- a/src/status_im2/contexts/emoji_picker/style.cljs +++ b/src/status_im/contexts/emoji_picker/style.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.emoji-picker.style +(ns status-im.contexts.emoji-picker.style (:require [quo.foundations.colors :as colors] [react-native.safe-area :as safe-area] - [status-im2.contexts.emoji-picker.constants :as constants])) + [status-im.contexts.emoji-picker.constants :as constants])) (def flex-spacer {:flex 1}) diff --git a/src/status_im2/contexts/emoji_picker/utils.cljs b/src/status_im/contexts/emoji_picker/utils.cljs similarity index 81% rename from src/status_im2/contexts/emoji_picker/utils.cljs rename to src/status_im/contexts/emoji_picker/utils.cljs index f02f4a02ea..65ee025ebd 100644 --- a/src/status_im2/contexts/emoji_picker/utils.cljs +++ b/src/status_im/contexts/emoji_picker/utils.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.emoji-picker.utils +(ns status-im.contexts.emoji-picker.utils (:require [clojure.string :as string] - [status-im2.contexts.emoji-picker.constants :as constants] - [status-im2.contexts.emoji-picker.data :refer [emoji-data]])) + [status-im.contexts.emoji-picker.constants :as constants] + [status-im.contexts.emoji-picker.data :refer [emoji-data]])) (defn search-emoji [search-query] diff --git a/src/status_im2/contexts/emoji_picker/utils_test.cljs b/src/status_im/contexts/emoji_picker/utils_test.cljs similarity index 93% rename from src/status_im2/contexts/emoji_picker/utils_test.cljs rename to src/status_im/contexts/emoji_picker/utils_test.cljs index 208af6ce1b..62546e8a39 100644 --- a/src/status_im2/contexts/emoji_picker/utils_test.cljs +++ b/src/status_im/contexts/emoji_picker/utils_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.emoji-picker.utils-test +(ns status-im.contexts.emoji-picker.utils-test (:require [cljs.test :refer [deftest is testing]] - [status-im2.contexts.emoji-picker.utils :as utils])) + [status-im.contexts.emoji-picker.utils :as utils])) (deftest emoji-search-test (testing "search for emojis with name" diff --git a/src/status_im2/contexts/emoji_picker/view.cljs b/src/status_im/contexts/emoji_picker/view.cljs similarity index 96% rename from src/status_im2/contexts/emoji_picker/view.cljs rename to src/status_im/contexts/emoji_picker/view.cljs index 5a7c407ebd..e3c079ee96 100644 --- a/src/status_im2/contexts/emoji_picker/view.cljs +++ b/src/status_im/contexts/emoji_picker/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.emoji-picker.view +(ns status-im.contexts.emoji-picker.view (:require [clojure.string :as string] [oops.core :as oops] @@ -10,10 +10,10 @@ [react-native.gesture :as gesture] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.contexts.emoji-picker.constants :as constants] - [status-im2.contexts.emoji-picker.data :as emoji-picker.data] - [status-im2.contexts.emoji-picker.style :as style] - [status-im2.contexts.emoji-picker.utils :as emoji-picker.utils] + [status-im.contexts.emoji-picker.constants :as constants] + [status-im.contexts.emoji-picker.data :as emoji-picker.data] + [status-im.contexts.emoji-picker.style :as style] + [status-im.contexts.emoji-picker.utils :as emoji-picker.utils] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/onboarding/common/background/style.cljs b/src/status_im/contexts/onboarding/common/background/style.cljs similarity index 89% rename from src/status_im2/contexts/onboarding/common/background/style.cljs rename to src/status_im/contexts/onboarding/common/background/style.cljs index 6e0a16bf14..fdedf271af 100644 --- a/src/status_im2/contexts/onboarding/common/background/style.cljs +++ b/src/status_im/contexts/onboarding/common/background/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.common.background.style +(ns status-im.contexts.onboarding.common.background.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/onboarding/common/background/view.cljs b/src/status_im/contexts/onboarding/common/background/view.cljs similarity index 89% rename from src/status_im2/contexts/onboarding/common/background/view.cljs rename to src/status_im/contexts/onboarding/common/background/view.cljs index 42398e6c9a..30bacc7d2e 100644 --- a/src/status_im2/contexts/onboarding/common/background/view.cljs +++ b/src/status_im/contexts/onboarding/common/background/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.common.background.view +(ns status-im.contexts.onboarding.common.background.view (:require [oops.core :refer [oget]] [react-native.async-storage :as async-storage] @@ -6,11 +6,11 @@ [react-native.core :as rn] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.common.resources :as resources] - [status-im2.contexts.onboarding.common.background.style :as style] - [status-im2.contexts.onboarding.common.carousel.animation :as carousel.animation] - [status-im2.contexts.onboarding.common.carousel.view :as carousel] - [status-im2.contexts.shell.jump-to.state :as shell.state] + [status-im.common.resources :as resources] + [status-im.contexts.onboarding.common.background.style :as style] + [status-im.contexts.onboarding.common.carousel.animation :as carousel.animation] + [status-im.contexts.onboarding.common.carousel.view :as carousel] + [status-im.contexts.shell.jump-to.state :as shell.state] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/common/carousel/animation.cljs b/src/status_im/contexts/onboarding/common/carousel/animation.cljs similarity index 98% rename from src/status_im2/contexts/onboarding/common/carousel/animation.cljs rename to src/status_im/contexts/onboarding/common/carousel/animation.cljs index 030a6a0bec..d8f726f5fe 100644 --- a/src/status_im2/contexts/onboarding/common/carousel/animation.cljs +++ b/src/status_im/contexts/onboarding/common/carousel/animation.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.common.carousel.animation +(ns status-im.contexts.onboarding.common.carousel.animation (:require [oops.core :as oops] [react-native.core :as rn] diff --git a/src/status_im2/contexts/onboarding/common/carousel/style.cljs b/src/status_im/contexts/onboarding/common/carousel/style.cljs similarity index 97% rename from src/status_im2/contexts/onboarding/common/carousel/style.cljs rename to src/status_im/contexts/onboarding/common/carousel/style.cljs index 2d3120ac15..8c35b15bb7 100644 --- a/src/status_im2/contexts/onboarding/common/carousel/style.cljs +++ b/src/status_im/contexts/onboarding/common/carousel/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.common.carousel.style +(ns status-im.contexts.onboarding.common.carousel.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/onboarding/common/carousel/view.cljs b/src/status_im/contexts/onboarding/common/carousel/view.cljs similarity index 94% rename from src/status_im2/contexts/onboarding/common/carousel/view.cljs rename to src/status_im/contexts/onboarding/common/carousel/view.cljs index e476b30305..8db48ed886 100644 --- a/src/status_im2/contexts/onboarding/common/carousel/view.cljs +++ b/src/status_im/contexts/onboarding/common/carousel/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.onboarding.common.carousel.view +(ns status-im.contexts.onboarding.common.carousel.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.navigation :as navigation] [react-native.reanimated :as reanimated] - [status-im2.contexts.onboarding.common.carousel.animation :as animation] - [status-im2.contexts.onboarding.common.carousel.style :as style] + [status-im.contexts.onboarding.common.carousel.animation :as animation] + [status-im.contexts.onboarding.common.carousel.style :as style] [utils.re-frame :as rf])) (defn header-text-view diff --git a/src/status_im2/contexts/onboarding/common/overlay/events.cljs b/src/status_im/contexts/onboarding/common/overlay/events.cljs similarity index 69% rename from src/status_im2/contexts/onboarding/common/overlay/events.cljs rename to src/status_im/contexts/onboarding/common/overlay/events.cljs index 3cdd35dc82..42f07ade1d 100644 --- a/src/status_im2/contexts/onboarding/common/overlay/events.cljs +++ b/src/status_im/contexts/onboarding/common/overlay/events.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.onboarding.common.overlay.events +(ns status-im.contexts.onboarding.common.overlay.events (:require [re-frame.core :as re-frame] - [status-im2.contexts.onboarding.common.overlay.view :as overlay] - [status-im2.contexts.profile.profiles.view :as profiles] + [status-im.contexts.onboarding.common.overlay.view :as overlay] + [status-im.contexts.profile.profiles.view :as profiles] [utils.re-frame :as rf])) (re-frame/reg-fx diff --git a/src/status_im2/contexts/onboarding/common/overlay/style.cljs b/src/status_im/contexts/onboarding/common/overlay/style.cljs similarity index 87% rename from src/status_im2/contexts/onboarding/common/overlay/style.cljs rename to src/status_im/contexts/onboarding/common/overlay/style.cljs index 2ea7940bab..84069bb447 100644 --- a/src/status_im2/contexts/onboarding/common/overlay/style.cljs +++ b/src/status_im/contexts/onboarding/common/overlay/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.common.overlay.style +(ns status-im.contexts.onboarding.common.overlay.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/onboarding/common/overlay/view.cljs b/src/status_im/contexts/onboarding/common/overlay/view.cljs similarity index 93% rename from src/status_im2/contexts/onboarding/common/overlay/view.cljs rename to src/status_im/contexts/onboarding/common/overlay/view.cljs index 93e12dbe51..3ae44ead9a 100644 --- a/src/status_im2/contexts/onboarding/common/overlay/view.cljs +++ b/src/status_im/contexts/onboarding/common/overlay/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.onboarding.common.overlay.view +(ns status-im.contexts.onboarding.common.overlay.view (:require [react-native.blur :as blur] [react-native.core :as rn] [react-native.platform :as platform] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.onboarding.common.overlay.style :as style])) + [status-im.constants :as constants] + [status-im.contexts.onboarding.common.overlay.style :as style])) (def max-blur-amount 30) diff --git a/src/status_im2/contexts/onboarding/create_password/style.cljs b/src/status_im/contexts/onboarding/create_password/style.cljs similarity index 95% rename from src/status_im2/contexts/onboarding/create_password/style.cljs rename to src/status_im/contexts/onboarding/create_password/style.cljs index 1c4c87b5ec..98dd4bf864 100644 --- a/src/status_im2/contexts/onboarding/create_password/style.cljs +++ b/src/status_im/contexts/onboarding/create_password/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.create-password.style +(ns status-im.contexts.onboarding.create-password.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/onboarding/create_password/view.cljs b/src/status_im/contexts/onboarding/create_password/view.cljs similarity index 98% rename from src/status_im2/contexts/onboarding/create_password/view.cljs rename to src/status_im/contexts/onboarding/create_password/view.cljs index 7134575a4f..7a2df8afef 100644 --- a/src/status_im2/contexts/onboarding/create_password/view.cljs +++ b/src/status_im/contexts/onboarding/create_password/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.onboarding.create-password.view +(ns status-im.contexts.onboarding.create-password.view (:require [oops.core :refer [ocall]] [quo.core :as quo] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.onboarding.create-password.style :as style] + [status-im.contexts.onboarding.create-password.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.security.core :as security] diff --git a/src/status_im2/contexts/onboarding/create_profile/style.cljs b/src/status_im/contexts/onboarding/create_profile/style.cljs similarity index 95% rename from src/status_im2/contexts/onboarding/create_profile/style.cljs rename to src/status_im/contexts/onboarding/create_profile/style.cljs index d59a6f435e..52477b74e5 100644 --- a/src/status_im2/contexts/onboarding/create_profile/style.cljs +++ b/src/status_im/contexts/onboarding/create_profile/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.create-profile.style +(ns status-im.contexts.onboarding.create-profile.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/onboarding/create_profile/view.cljs b/src/status_im/contexts/onboarding/create_profile/view.cljs similarity index 98% rename from src/status_im2/contexts/onboarding/create_profile/view.cljs rename to src/status_im/contexts/onboarding/create_profile/view.cljs index 95cb07ade8..e18a6cb15c 100644 --- a/src/status_im2/contexts/onboarding/create_profile/view.cljs +++ b/src/status_im/contexts/onboarding/create_profile/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.create-profile.view +(ns status-im.contexts.onboarding.create-profile.view (:require [clojure.string :as string] [oops.core :as oops] @@ -10,9 +10,9 @@ [react-native.platform :as platform] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.constants :as c] - [status-im2.contexts.onboarding.create-profile.style :as style] - [status-im2.contexts.onboarding.select-photo.method-menu.view :as method-menu] + [status-im.constants :as c] + [status-im.contexts.onboarding.create-profile.style :as style] + [status-im.contexts.onboarding.select-photo.method-menu.view :as method-menu] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.responsiveness :as responsiveness])) diff --git a/src/status_im2/contexts/onboarding/enable_biometrics/style.cljs b/src/status_im/contexts/onboarding/enable_biometrics/style.cljs similarity index 84% rename from src/status_im2/contexts/onboarding/enable_biometrics/style.cljs rename to src/status_im/contexts/onboarding/enable_biometrics/style.cljs index 0dc3874d10..c271c21f9e 100644 --- a/src/status_im2/contexts/onboarding/enable_biometrics/style.cljs +++ b/src/status_im/contexts/onboarding/enable_biometrics/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.enable-biometrics.style) +(ns status-im.contexts.onboarding.enable-biometrics.style) (def default-margin 20) diff --git a/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs b/src/status_im/contexts/onboarding/enable_biometrics/view.cljs similarity index 87% rename from src/status_im2/contexts/onboarding/enable_biometrics/view.cljs rename to src/status_im/contexts/onboarding/enable_biometrics/view.cljs index d93a6f1abe..b3d473a402 100644 --- a/src/status_im2/contexts/onboarding/enable_biometrics/view.cljs +++ b/src/status_im/contexts/onboarding/enable_biometrics/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.onboarding.enable-biometrics.view +(ns status-im.contexts.onboarding.enable-biometrics.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.safe-area :as safe-area] - [status-im2.common.biometric.events :as biometric] - [status-im2.common.parallax.view :as parallax] - [status-im2.common.parallax.whitelist :as whitelist] - [status-im2.common.resources :as resources] - [status-im2.contexts.onboarding.enable-biometrics.style :as style] - [status-im2.navigation.state :as state] + [status-im.common.biometric.events :as biometric] + [status-im.common.parallax.view :as parallax] + [status-im.common.parallax.whitelist :as whitelist] + [status-im.common.resources :as resources] + [status-im.contexts.onboarding.enable-biometrics.style :as style] + [status-im.navigation.state :as state] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/enable_notifications/style.cljs b/src/status_im/contexts/onboarding/enable_notifications/style.cljs similarity index 84% rename from src/status_im2/contexts/onboarding/enable_notifications/style.cljs rename to src/status_im/contexts/onboarding/enable_notifications/style.cljs index b927063cab..1cd27f137c 100644 --- a/src/status_im2/contexts/onboarding/enable_notifications/style.cljs +++ b/src/status_im/contexts/onboarding/enable_notifications/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.enable-notifications.style) +(ns status-im.contexts.onboarding.enable-notifications.style) (def default-margin 20) diff --git a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs b/src/status_im/contexts/onboarding/enable_notifications/view.cljs similarity index 90% rename from src/status_im2/contexts/onboarding/enable_notifications/view.cljs rename to src/status_im/contexts/onboarding/enable_notifications/view.cljs index 0e49dab89c..279c4bd5d6 100644 --- a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs +++ b/src/status_im/contexts/onboarding/enable_notifications/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.onboarding.enable-notifications.view +(ns status-im.contexts.onboarding.enable-notifications.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.platform :as platform] [react-native.safe-area :as safe-area] - [status-im2.common.parallax.view :as parallax] - [status-im2.common.parallax.whitelist :as whitelist] - [status-im2.common.resources :as resources] - [status-im2.contexts.onboarding.enable-notifications.style :as style] - [status-im2.contexts.shell.jump-to.utils :as shell.utils] + [status-im.common.parallax.view :as parallax] + [status-im.common.parallax.whitelist :as whitelist] + [status-im.common.resources :as resources] + [status-im.contexts.onboarding.enable-notifications.style :as style] + [status-im.contexts.shell.jump-to.utils :as shell.utils] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/enter_seed_phrase/style.cljs b/src/status_im/contexts/onboarding/enter_seed_phrase/style.cljs similarity index 92% rename from src/status_im2/contexts/onboarding/enter_seed_phrase/style.cljs rename to src/status_im/contexts/onboarding/enter_seed_phrase/style.cljs index 66abee3107..c0087bfaa0 100644 --- a/src/status_im2/contexts/onboarding/enter_seed_phrase/style.cljs +++ b/src/status_im/contexts/onboarding/enter_seed_phrase/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.enter-seed-phrase.style +(ns status-im.contexts.onboarding.enter-seed-phrase.style (:require [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/onboarding/enter_seed_phrase/view.cljs b/src/status_im/contexts/onboarding/enter_seed_phrase/view.cljs similarity index 97% rename from src/status_im2/contexts/onboarding/enter_seed_phrase/view.cljs rename to src/status_im/contexts/onboarding/enter_seed_phrase/view.cljs index 94763aea30..eb3deb1f2a 100644 --- a/src/status_im2/contexts/onboarding/enter_seed_phrase/view.cljs +++ b/src/status_im/contexts/onboarding/enter_seed_phrase/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.enter-seed-phrase.view +(ns status-im.contexts.onboarding.enter-seed-phrase.view (:require [clojure.string :as string] [legacy.status-im.ethereum.mnemonic :as mnemonic] @@ -7,8 +7,8 @@ [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.onboarding.enter-seed-phrase.style :as style] + [status-im.constants :as constants] + [status-im.contexts.onboarding.enter-seed-phrase.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.security.core :as security])) diff --git a/src/status_im2/contexts/onboarding/events.cljs b/src/status_im/contexts/onboarding/events.cljs similarity index 96% rename from src/status_im2/contexts/onboarding/events.cljs rename to src/status_im/contexts/onboarding/events.cljs index 1fcd422e50..8329c0c537 100644 --- a/src/status_im2/contexts/onboarding/events.cljs +++ b/src/status_im/contexts/onboarding/events.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.onboarding.events +(ns status-im.contexts.onboarding.events (:require [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.common.biometric.events :as biometric] - [status-im2.constants :as constants] - [status-im2.contexts.profile.create.events :as profile.create] - [status-im2.contexts.profile.recover.events :as profile.recover] + [status-im.common.biometric.events :as biometric] + [status-im.constants :as constants] + [status-im.contexts.profile.create.events :as profile.create] + [status-im.contexts.profile.recover.events :as profile.recover] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/onboarding/generating_keys/style.cljs b/src/status_im/contexts/onboarding/generating_keys/style.cljs similarity index 76% rename from src/status_im2/contexts/onboarding/generating_keys/style.cljs rename to src/status_im/contexts/onboarding/generating_keys/style.cljs index fd3b06e8ac..9136d09e47 100644 --- a/src/status_im2/contexts/onboarding/generating_keys/style.cljs +++ b/src/status_im/contexts/onboarding/generating_keys/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.generating-keys.style) +(ns status-im.contexts.onboarding.generating-keys.style) (defn page-container [insets] diff --git a/src/status_im2/contexts/onboarding/generating_keys/view.cljs b/src/status_im/contexts/onboarding/generating_keys/view.cljs similarity index 95% rename from src/status_im2/contexts/onboarding/generating_keys/view.cljs rename to src/status_im/contexts/onboarding/generating_keys/view.cljs index b8e30367e8..91691a2d57 100644 --- a/src/status_im2/contexts/onboarding/generating_keys/view.cljs +++ b/src/status_im/contexts/onboarding/generating_keys/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.onboarding.generating-keys.view +(ns status-im.contexts.onboarding.generating-keys.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.common.parallax.view :as parallax] - [status-im2.common.parallax.whitelist :as whitelist] - [status-im2.common.resources :as resources] - [status-im2.contexts.onboarding.generating-keys.style :as style] + [status-im.common.parallax.view :as parallax] + [status-im.common.parallax.whitelist :as whitelist] + [status-im.common.resources :as resources] + [status-im.contexts.onboarding.generating-keys.style :as style] [utils.i18n :as i18n])) (def first-title-display-time 3000) diff --git a/src/status_im2/contexts/onboarding/identifiers/profile_card/style.cljs b/src/status_im/contexts/onboarding/identifiers/profile_card/style.cljs similarity index 95% rename from src/status_im2/contexts/onboarding/identifiers/profile_card/style.cljs rename to src/status_im/contexts/onboarding/identifiers/profile_card/style.cljs index a6567739ab..ebc386e77e 100644 --- a/src/status_im2/contexts/onboarding/identifiers/profile_card/style.cljs +++ b/src/status_im/contexts/onboarding/identifiers/profile_card/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.identifiers.profile-card.style +(ns status-im.contexts.onboarding.identifiers.profile-card.style (:require [quo.foundations.colors :as colors] [quo.foundations.typography :as typography] diff --git a/src/status_im2/contexts/onboarding/identifiers/profile_card/view.cljs b/src/status_im/contexts/onboarding/identifiers/profile_card/view.cljs similarity index 95% rename from src/status_im2/contexts/onboarding/identifiers/profile_card/view.cljs rename to src/status_im/contexts/onboarding/identifiers/profile_card/view.cljs index a7d84f810d..d6bd3c0da1 100644 --- a/src/status_im2/contexts/onboarding/identifiers/profile_card/view.cljs +++ b/src/status_im/contexts/onboarding/identifiers/profile_card/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.identifiers.profile-card.view +(ns status-im.contexts.onboarding.identifiers.profile-card.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,7 +6,7 @@ [react-native.masked-view :as masked-view] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.contexts.onboarding.identifiers.profile-card.style :as style] + [status-im.contexts.onboarding.identifiers.profile-card.style :as style] [utils.worklets.identifiers-highlighting :as worklets.identifiers-highlighting])) (defn- f-profile-card-component diff --git a/src/status_im2/contexts/onboarding/identifiers/style.cljs b/src/status_im/contexts/onboarding/identifiers/style.cljs similarity index 83% rename from src/status_im2/contexts/onboarding/identifiers/style.cljs rename to src/status_im/contexts/onboarding/identifiers/style.cljs index 604e8a182e..554c99b9d1 100644 --- a/src/status_im2/contexts/onboarding/identifiers/style.cljs +++ b/src/status_im/contexts/onboarding/identifiers/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.identifiers.style) +(ns status-im.contexts.onboarding.identifiers.style) (def page-container {:flex 1 diff --git a/src/status_im2/contexts/onboarding/identifiers/view.cljs b/src/status_im/contexts/onboarding/identifiers/view.cljs similarity index 86% rename from src/status_im2/contexts/onboarding/identifiers/view.cljs rename to src/status_im/contexts/onboarding/identifiers/view.cljs index fba930de59..20002042b2 100644 --- a/src/status_im2/contexts/onboarding/identifiers/view.cljs +++ b/src/status_im/contexts/onboarding/identifiers/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.onboarding.identifiers.view +(ns status-im.contexts.onboarding.identifiers.view (:require [clojure.string :as string] [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.onboarding.common.carousel.animation :as carousel.animation] - [status-im2.contexts.onboarding.common.carousel.view :as carousel] - [status-im2.contexts.onboarding.identifiers.profile-card.view :as profile-card] - [status-im2.contexts.onboarding.identifiers.style :as style] + [status-im.contexts.onboarding.common.carousel.animation :as carousel.animation] + [status-im.contexts.onboarding.common.carousel.view :as carousel] + [status-im.contexts.onboarding.identifiers.profile-card.view :as profile-card] + [status-im.contexts.onboarding.identifiers.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/intro/style.cljs b/src/status_im/contexts/onboarding/intro/style.cljs similarity index 89% rename from src/status_im2/contexts/onboarding/intro/style.cljs rename to src/status_im/contexts/onboarding/intro/style.cljs index 0be9a68e90..d4c8bdaa90 100644 --- a/src/status_im2/contexts/onboarding/intro/style.cljs +++ b/src/status_im/contexts/onboarding/intro/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.intro.style +(ns status-im.contexts.onboarding.intro.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/onboarding/intro/view.cljs b/src/status_im/contexts/onboarding/intro/view.cljs similarity index 84% rename from src/status_im2/contexts/onboarding/intro/view.cljs rename to src/status_im/contexts/onboarding/intro/view.cljs index 212061d9d0..2d6330210c 100644 --- a/src/status_im2/contexts/onboarding/intro/view.cljs +++ b/src/status_im/contexts/onboarding/intro/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.onboarding.intro.view +(ns status-im.contexts.onboarding.intro.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.constants :as constants] - [status-im2.contexts.onboarding.common.background.view :as background] - [status-im2.contexts.onboarding.common.overlay.view :as overlay] - [status-im2.contexts.onboarding.intro.style :as style] - [status-im2.contexts.syncing.scan-sync-code.view :as scan-sync-code] + [status-im.constants :as constants] + [status-im.contexts.onboarding.common.background.view :as background] + [status-im.contexts.onboarding.common.overlay.view :as overlay] + [status-im.contexts.onboarding.intro.style :as style] + [status-im.contexts.syncing.scan-sync-code.view :as scan-sync-code] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/new_to_status/style.cljs b/src/status_im/contexts/onboarding/new_to_status/style.cljs similarity index 92% rename from src/status_im2/contexts/onboarding/new_to_status/style.cljs rename to src/status_im/contexts/onboarding/new_to_status/style.cljs index 1d3e635bf9..722aeb0b22 100644 --- a/src/status_im2/contexts/onboarding/new_to_status/style.cljs +++ b/src/status_im/contexts/onboarding/new_to_status/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.new-to-status.style +(ns status-im.contexts.onboarding.new-to-status.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/onboarding/new_to_status/view.cljs b/src/status_im/contexts/onboarding/new_to_status/view.cljs similarity index 95% rename from src/status_im2/contexts/onboarding/new_to_status/view.cljs rename to src/status_im/contexts/onboarding/new_to_status/view.cljs index 9cf17705b9..eb431fee4e 100644 --- a/src/status_im2/contexts/onboarding/new_to_status/view.cljs +++ b/src/status_im/contexts/onboarding/new_to_status/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.onboarding.new-to-status.view +(ns status-im.contexts.onboarding.new-to-status.view (:require [legacy.status-im.keycard.recovery :as keycard] [quo.core :as quo] re-frame.db [react-native.core :as rn] [react-native.safe-area :as safe-area] - [status-im2.common.resources :as resources] - [status-im2.config :as config] - [status-im2.contexts.onboarding.new-to-status.style :as style] + [status-im.common.resources :as resources] + [status-im.config :as config] + [status-im.contexts.onboarding.new-to-status.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/select_photo/method_menu/view.cljs b/src/status_im/contexts/onboarding/select_photo/method_menu/view.cljs similarity index 93% rename from src/status_im2/contexts/onboarding/select_photo/method_menu/view.cljs rename to src/status_im/contexts/onboarding/select_photo/method_menu/view.cljs index 71711e6f77..3fe028b4dd 100644 --- a/src/status_im2/contexts/onboarding/select_photo/method_menu/view.cljs +++ b/src/status_im/contexts/onboarding/select_photo/method_menu/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.select-photo.method-menu.view +(ns status-im.contexts.onboarding.select-photo.method-menu.view (:require ["react-native-image-crop-picker" :default image-picker] [quo.core :as quo] @@ -85,5 +85,6 @@ :write-external-storage] :on-allowed (fn [] (pick-pic update-profile-pic-callback)) :on-denied (fn [] - (log/info "user has denied permissions to select picture")) - }))}]]]) + (log/info + "user has denied permissions to select picture"))}))}]]]) + diff --git a/src/status_im2/contexts/onboarding/sign_in/style.cljs b/src/status_im/contexts/onboarding/sign_in/style.cljs similarity index 97% rename from src/status_im2/contexts/onboarding/sign_in/style.cljs rename to src/status_im/contexts/onboarding/sign_in/style.cljs index 190cfa82e4..71171f6bb1 100644 --- a/src/status_im2/contexts/onboarding/sign_in/style.cljs +++ b/src/status_im/contexts/onboarding/sign_in/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.sign-in.style +(ns status-im.contexts.onboarding.sign-in.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/onboarding/sign_in/view.cljs b/src/status_im/contexts/onboarding/sign_in/view.cljs similarity index 71% rename from src/status_im2/contexts/onboarding/sign_in/view.cljs rename to src/status_im/contexts/onboarding/sign_in/view.cljs index 5882003e94..295a1fd6cc 100644 --- a/src/status_im2/contexts/onboarding/sign_in/view.cljs +++ b/src/status_im/contexts/onboarding/sign_in/view.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.onboarding.sign-in.view +(ns status-im.contexts.onboarding.sign-in.view (:require - [status-im2.contexts.onboarding.common.background.view :as background] - [status-im2.contexts.syncing.scan-sync-code.view :as scan-sync-code] + [status-im.contexts.onboarding.common.background.view :as background] + [status-im.contexts.syncing.scan-sync-code.view :as scan-sync-code] [utils.i18n :as i18n])) (defn view diff --git a/src/status_im2/contexts/onboarding/syncing/progress/style.cljs b/src/status_im/contexts/onboarding/syncing/progress/style.cljs similarity index 91% rename from src/status_im2/contexts/onboarding/syncing/progress/style.cljs rename to src/status_im/contexts/onboarding/syncing/progress/style.cljs index 3ba197982b..2704eed627 100644 --- a/src/status_im2/contexts/onboarding/syncing/progress/style.cljs +++ b/src/status_im/contexts/onboarding/syncing/progress/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.syncing.progress.style +(ns status-im.contexts.onboarding.syncing.progress.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/onboarding/syncing/progress/view.cljs b/src/status_im/contexts/onboarding/syncing/progress/view.cljs similarity index 92% rename from src/status_im2/contexts/onboarding/syncing/progress/view.cljs rename to src/status_im/contexts/onboarding/syncing/progress/view.cljs index 83fd956b8a..59292a4e31 100644 --- a/src/status_im2/contexts/onboarding/syncing/progress/view.cljs +++ b/src/status_im/contexts/onboarding/syncing/progress/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.onboarding.syncing.progress.view +(ns status-im.contexts.onboarding.syncing.progress.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.onboarding.common.background.view :as background] - [status-im2.contexts.onboarding.syncing.progress.style :as style] + [status-im.contexts.onboarding.common.background.view :as background] + [status-im.contexts.onboarding.syncing.progress.style :as style] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/syncing/results/style.cljs b/src/status_im/contexts/onboarding/syncing/results/style.cljs similarity index 93% rename from src/status_im2/contexts/onboarding/syncing/results/style.cljs rename to src/status_im/contexts/onboarding/syncing/results/style.cljs index 5ffd147fbc..53e370e86d 100644 --- a/src/status_im2/contexts/onboarding/syncing/results/style.cljs +++ b/src/status_im/contexts/onboarding/syncing/results/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.syncing.results.style +(ns status-im.contexts.onboarding.syncing.results.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/onboarding/syncing/results/view.cljs b/src/status_im/contexts/onboarding/syncing/results/view.cljs similarity index 90% rename from src/status_im2/contexts/onboarding/syncing/results/view.cljs rename to src/status_im/contexts/onboarding/syncing/results/view.cljs index 982b793eb8..36fe212949 100644 --- a/src/status_im2/contexts/onboarding/syncing/results/view.cljs +++ b/src/status_im/contexts/onboarding/syncing/results/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.onboarding.syncing.results.view +(ns status-im.contexts.onboarding.syncing.results.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.constants :as constants] - [status-im2.contexts.onboarding.common.background.view :as background] - [status-im2.contexts.onboarding.syncing.results.style :as style] - [status-im2.contexts.syncing.device.view :as device] + [status-im.constants :as constants] + [status-im.contexts.onboarding.common.background.view :as background] + [status-im.contexts.onboarding.syncing.results.style :as style] + [status-im.contexts.syncing.device.view :as device] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/onboarding/welcome/style.cljs b/src/status_im/contexts/onboarding/welcome/style.cljs similarity index 92% rename from src/status_im2/contexts/onboarding/welcome/style.cljs rename to src/status_im/contexts/onboarding/welcome/style.cljs index bd89caf449..1988a42fcd 100644 --- a/src/status_im2/contexts/onboarding/welcome/style.cljs +++ b/src/status_im/contexts/onboarding/welcome/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.welcome.style) +(ns status-im.contexts.onboarding.welcome.style) (def default-margin 20) diff --git a/src/status_im2/contexts/onboarding/welcome/view.cljs b/src/status_im/contexts/onboarding/welcome/view.cljs similarity index 92% rename from src/status_im2/contexts/onboarding/welcome/view.cljs rename to src/status_im/contexts/onboarding/welcome/view.cljs index 09a4c3e7c7..b0a3dcf2d7 100644 --- a/src/status_im2/contexts/onboarding/welcome/view.cljs +++ b/src/status_im/contexts/onboarding/welcome/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.onboarding.welcome.view +(ns status-im.contexts.onboarding.welcome.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,9 +6,9 @@ [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.safe-area :as safe-area] - [status-im2.common.resources :as resources] - [status-im2.constants :as constants] - [status-im2.contexts.onboarding.welcome.style :as style] + [status-im.common.resources :as resources] + [status-im.constants :as constants] + [status-im.contexts.onboarding.welcome.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/profile/config.cljs b/src/status_im/contexts/profile/config.cljs similarity index 96% rename from src/status_im2/contexts/profile/config.cljs rename to src/status_im/contexts/profile/config.cljs index 5ad914493c..391c46769d 100644 --- a/src/status_im2/contexts/profile/config.cljs +++ b/src/status_im/contexts/profile/config.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.profile.config +(ns status-im.contexts.profile.config (:require [clojure.string :as string] [native-module.core :as native-module] - [status-im2.config :as config] + [status-im.config :as config] [utils.re-frame :as rf] [utils.transforms :as transforms])) diff --git a/src/status_im2/contexts/profile/create/effects.cljs b/src/status_im/contexts/profile/create/effects.cljs similarity index 84% rename from src/status_im2/contexts/profile/create/effects.cljs rename to src/status_im/contexts/profile/create/effects.cljs index 2d9a9f00bf..fbb8f53911 100644 --- a/src/status_im2/contexts/profile/create/effects.cljs +++ b/src/status_im/contexts/profile/create/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.create.effects +(ns status-im.contexts.profile.create.effects (:require [native-module.core :as native-module] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/profile/create/events.cljs b/src/status_im/contexts/profile/create/events.cljs similarity index 78% rename from src/status_im2/contexts/profile/create/events.cljs rename to src/status_im/contexts/profile/create/events.cljs index 2cae6ba8af..3d831cc9cc 100644 --- a/src/status_im2/contexts/profile/create/events.cljs +++ b/src/status_im/contexts/profile/create/events.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.profile.create.events +(ns status-im.contexts.profile.create.events (:require [native-module.core :as native-module] - [status-im2.contexts.emoji-picker.utils :as emoji-picker.utils] - [status-im2.contexts.profile.config :as profile.config] - status-im2.contexts.profile.create.effects + [status-im.contexts.emoji-picker.utils :as emoji-picker.utils] + [status-im.contexts.profile.config :as profile.config] + status-im.contexts.profile.create.effects [utils.re-frame :as rf] [utils.security.core :as security])) diff --git a/src/status_im2/contexts/profile/events.cljs b/src/status_im/contexts/profile/events.cljs similarity index 90% rename from src/status_im2/contexts/profile/events.cljs rename to src/status_im/contexts/profile/events.cljs index d359f21bf0..c1eef3b577 100644 --- a/src/status_im2/contexts/profile/events.cljs +++ b/src/status_im/contexts/profile/events.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.profile.events +(ns status-im.contexts.profile.events (:require [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.contexts.profile.login.events :as profile.login] - [status-im2.contexts.profile.rpc :as profile.rpc] - [status-im2.navigation.events :as navigation] + [status-im.contexts.profile.login.events :as profile.login] + [status-im.contexts.profile.rpc :as profile.rpc] + [status-im.navigation.events :as navigation] [utils.re-frame :as rf])) (re-frame/reg-fx diff --git a/src/status_im2/contexts/profile/login/effects.cljs b/src/status_im/contexts/profile/login/effects.cljs similarity index 80% rename from src/status_im2/contexts/profile/login/effects.cljs rename to src/status_im/contexts/profile/login/effects.cljs index d99fb11cf9..e115ed5bc2 100644 --- a/src/status_im2/contexts/profile/login/effects.cljs +++ b/src/status_im/contexts/profile/login/effects.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.profile.login.effects +(ns status-im.contexts.profile.login.effects (:require [native-module.core :as native-module] - [status-im2.contexts.profile.config :as profile.config] + [status-im.contexts.profile.config :as profile.config] [utils.re-frame :as rf])) (rf/reg-fx :effects.profile/login diff --git a/src/status_im2/contexts/profile/login/events.cljs b/src/status_im/contexts/profile/login/events.cljs similarity index 93% rename from src/status_im2/contexts/profile/login/events.cljs rename to src/status_im/contexts/profile/login/events.cljs index f9631a4d94..6d6fd51ee8 100644 --- a/src/status_im2/contexts/profile/login/events.cljs +++ b/src/status_im/contexts/profile/login/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.login.events +(ns status-im.contexts.profile.login.events (:require [legacy.status-im.browser.core :as browser] [legacy.status-im.data-store.chats :as data-store.chats] @@ -12,19 +12,19 @@ [legacy.status-im.stickers.core :as stickers] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im2.common.keychain.events :as keychain] - [status-im2.common.log :as logging] - [status-im2.common.universal-links :as universal-links] - [status-im2.config :as config] - [status-im2.contexts.chat.messages.link-preview.events :as link-preview] - [status-im2.contexts.contacts.events :as contacts] - [status-im2.contexts.profile.config :as profile.config] - status-im2.contexts.profile.login.effects - [status-im2.contexts.profile.rpc :as profile.rpc] - [status-im2.contexts.profile.settings.events :as profile.settings.events] - [status-im2.contexts.push-notifications.events :as notifications] - [status-im2.contexts.shell.activity-center.events :as activity-center] - [status-im2.navigation.events :as navigation] + [status-im.common.keychain.events :as keychain] + [status-im.common.log :as logging] + [status-im.common.universal-links :as universal-links] + [status-im.config :as config] + [status-im.contexts.chat.messages.link-preview.events :as link-preview] + [status-im.contexts.contacts.events :as contacts] + [status-im.contexts.profile.config :as profile.config] + status-im.contexts.profile.login.effects + [status-im.contexts.profile.rpc :as profile.rpc] + [status-im.contexts.profile.settings.events :as profile.settings.events] + [status-im.contexts.push-notifications.events :as notifications] + [status-im.contexts.shell.activity-center.events :as activity-center] + [status-im.navigation.events :as navigation] [taoensso.timbre :as log] [utils.re-frame :as rf] [utils.security.core :as security])) diff --git a/src/status_im2/contexts/profile/profiles/style.cljs b/src/status_im/contexts/profile/profiles/style.cljs similarity index 96% rename from src/status_im2/contexts/profile/profiles/style.cljs rename to src/status_im/contexts/profile/profiles/style.cljs index d58845148e..1a900a3269 100644 --- a/src/status_im2/contexts/profile/profiles/style.cljs +++ b/src/status_im/contexts/profile/profiles/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.profiles.style +(ns status-im.contexts.profile.profiles.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/profile/profiles/view.cljs b/src/status_im/contexts/profile/profiles/view.cljs similarity index 95% rename from src/status_im2/contexts/profile/profiles/view.cljs rename to src/status_im/contexts/profile/profiles/view.cljs index 11d0338d06..7b52392de9 100644 --- a/src/status_im2/contexts/profile/profiles/view.cljs +++ b/src/status_im/contexts/profile/profiles/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.profiles.view +(ns status-im.contexts.profile.profiles.view (:require [native-module.core :as native-module] [quo.core :as quo] @@ -6,12 +6,12 @@ [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.confirmation-drawer.view :as confirmation-drawer] - [status-im2.common.standard-authentication.core :as standard-authentication] - [status-im2.config :as config] - [status-im2.constants :as constants] - [status-im2.contexts.onboarding.common.background.view :as background] - [status-im2.contexts.profile.profiles.style :as style] + [status-im.common.confirmation-drawer.view :as confirmation-drawer] + [status-im.common.standard-authentication.core :as standard-authentication] + [status-im.config :as config] + [status-im.constants :as constants] + [status-im.contexts.onboarding.common.background.view :as background] + [status-im.contexts.profile.profiles.style :as style] [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/profile/recover/effects.cljs b/src/status_im/contexts/profile/recover/effects.cljs similarity index 84% rename from src/status_im2/contexts/profile/recover/effects.cljs rename to src/status_im/contexts/profile/recover/effects.cljs index ecfb3653c4..a57c8fd735 100644 --- a/src/status_im2/contexts/profile/recover/effects.cljs +++ b/src/status_im/contexts/profile/recover/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.recover.effects +(ns status-im.contexts.profile.recover.effects (:require [native-module.core :as native-module] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/profile/recover/events.cljs b/src/status_im/contexts/profile/recover/events.cljs similarity index 81% rename from src/status_im2/contexts/profile/recover/events.cljs rename to src/status_im/contexts/profile/recover/events.cljs index b2974513f9..caf7c8223d 100644 --- a/src/status_im2/contexts/profile/recover/events.cljs +++ b/src/status_im/contexts/profile/recover/events.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.profile.recover.events +(ns status-im.contexts.profile.recover.events (:require [native-module.core :as native-module] - [status-im2.contexts.emoji-picker.utils :as emoji-picker.utils] - [status-im2.contexts.profile.config :as profile.config] - status-im2.contexts.profile.recover.effects + [status-im.contexts.emoji-picker.utils :as emoji-picker.utils] + [status-im.contexts.profile.config :as profile.config] + status-im.contexts.profile.recover.effects [utils.re-frame :as rf] [utils.security.core :as security])) diff --git a/src/status_im2/contexts/profile/rpc.cljs b/src/status_im/contexts/profile/rpc.cljs similarity index 93% rename from src/status_im2/contexts/profile/rpc.cljs rename to src/status_im/contexts/profile/rpc.cljs index 528c65b800..ee4146bce5 100644 --- a/src/status_im2/contexts/profile/rpc.cljs +++ b/src/status_im/contexts/profile/rpc.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.rpc +(ns status-im.contexts.profile.rpc (:require [clojure.string :as string] [utils.ens.core :as utils.ens])) diff --git a/src/status_im2/contexts/profile/settings/effects.cljs b/src/status_im/contexts/profile/settings/effects.cljs similarity index 83% rename from src/status_im2/contexts/profile/settings/effects.cljs rename to src/status_im/contexts/profile/settings/effects.cljs index 01a7381cdc..d5c296e3c5 100644 --- a/src/status_im2/contexts/profile/settings/effects.cljs +++ b/src/status_im/contexts/profile/settings/effects.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.profile.settings.effects +(ns status-im.contexts.profile.settings.effects (:require [native-module.core :as native-module] [quo.foundations.colors :as colors] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.common.theme.core :as theme] - [status-im2.constants :as constants] - [status-im2.contexts.shell.jump-to.utils :as shell.utils] - [status-im2.setup.hot-reload :as hot-reload])) + [status-im.common.theme.core :as theme] + [status-im.constants :as constants] + [status-im.contexts.shell.jump-to.utils :as shell.utils] + [status-im.setup.hot-reload :as hot-reload])) (re-frame/reg-fx :profile.settings/blank-preview-flag-changed diff --git a/src/status_im2/contexts/profile/settings/events.cljs b/src/status_im/contexts/profile/settings/events.cljs similarity index 97% rename from src/status_im2/contexts/profile/settings/events.cljs rename to src/status_im/contexts/profile/settings/events.cljs index b679472a66..35e8c43d72 100644 --- a/src/status_im2/contexts/profile/settings/events.cljs +++ b/src/status_im/contexts/profile/settings/events.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.profile.settings.events +(ns status-im.contexts.profile.settings.events (:require [clojure.string :as string] [legacy.status-im.bottom-sheet.events :as bottom-sheet.events] - [status-im2.constants :as constants] - status-im2.contexts.profile.settings.effects + [status-im.constants :as constants] + status-im.contexts.profile.settings.effects [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/profile/settings/header/avatar.cljs b/src/status_im/contexts/profile/settings/header/avatar.cljs similarity index 93% rename from src/status_im2/contexts/profile/settings/header/avatar.cljs rename to src/status_im/contexts/profile/settings/header/avatar.cljs index 821ea2627b..a5952b24b7 100644 --- a/src/status_im2/contexts/profile/settings/header/avatar.cljs +++ b/src/status_im/contexts/profile/settings/header/avatar.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.profile.settings.header.avatar +(ns status-im.contexts.profile.settings.header.avatar (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.reanimated :as reanimated] - [status-im2.contexts.profile.settings.header.style :as style])) + [status-im.contexts.profile.settings.header.style :as style])) (def scroll-animation-input-range [0 50]) (def header-extrapolation-option diff --git a/src/status_im2/contexts/profile/settings/header/header_shape.cljs b/src/status_im/contexts/profile/settings/header/header_shape.cljs similarity index 89% rename from src/status_im2/contexts/profile/settings/header/header_shape.cljs rename to src/status_im/contexts/profile/settings/header/header_shape.cljs index ff5ef92c74..71322e324b 100644 --- a/src/status_im2/contexts/profile/settings/header/header_shape.cljs +++ b/src/status_im/contexts/profile/settings/header/header_shape.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.profile.settings.header.header-shape +(ns status-im.contexts.profile.settings.header.header-shape (:require [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.svg :as svg] - [status-im2.contexts.profile.settings.header.style :as style])) + [status-im.contexts.profile.settings.header.style :as style])) (defn left-radius [background-color] diff --git a/src/status_im2/contexts/profile/settings/header/style.cljs b/src/status_im/contexts/profile/settings/header/style.cljs similarity index 96% rename from src/status_im2/contexts/profile/settings/header/style.cljs rename to src/status_im/contexts/profile/settings/header/style.cljs index 8958137a06..7763c17b12 100644 --- a/src/status_im2/contexts/profile/settings/header/style.cljs +++ b/src/status_im/contexts/profile/settings/header/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.settings.header.style +(ns status-im.contexts.profile.settings.header.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/profile/settings/header/view.cljs b/src/status_im/contexts/profile/settings/header/view.cljs similarity index 80% rename from src/status_im2/contexts/profile/settings/header/view.cljs rename to src/status_im/contexts/profile/settings/header/view.cljs index 4ddec3253d..79e5a08a58 100644 --- a/src/status_im2/contexts/profile/settings/header/view.cljs +++ b/src/status_im/contexts/profile/settings/header/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.profile.settings.header.view +(ns status-im.contexts.profile.settings.header.view (:require [clojure.string :as string] [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] - [status-im2.common.not-implemented :as not-implemented] - [status-im2.contexts.profile.settings.header.avatar :as header.avatar] - [status-im2.contexts.profile.settings.header.header-shape :as header.shape] - [status-im2.contexts.profile.settings.header.style :as style] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.common.not-implemented :as not-implemented] + [status-im.contexts.profile.settings.header.avatar :as header.avatar] + [status-im.contexts.profile.settings.header.header-shape :as header.shape] + [status-im.contexts.profile.settings.header.style :as style] + [status-im.contexts.profile.utils :as profile.utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/profile/settings/list_items.cljs b/src/status_im/contexts/profile/settings/list_items.cljs similarity index 95% rename from src/status_im2/contexts/profile/settings/list_items.cljs rename to src/status_im/contexts/profile/settings/list_items.cljs index 069adf8b96..181437cbdc 100644 --- a/src/status_im2/contexts/profile/settings/list_items.cljs +++ b/src/status_im/contexts/profile/settings/list_items.cljs @@ -1,5 +1,5 @@ -(ns status-im2.contexts.profile.settings.list-items - (:require [status-im2.common.not-implemented :as not-implemented] +(ns status-im.contexts.profile.settings.list-items + (:require [status-im.common.not-implemented :as not-implemented] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/profile/settings/style.cljs b/src/status_im/contexts/profile/settings/style.cljs similarity index 86% rename from src/status_im2/contexts/profile/settings/style.cljs rename to src/status_im/contexts/profile/settings/style.cljs index d60f70a475..bb1ea855a6 100644 --- a/src/status_im2/contexts/profile/settings/style.cljs +++ b/src/status_im/contexts/profile/settings/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.settings.style +(ns status-im.contexts.profile.settings.style (:require [quo.foundations.colors :as colors])) (defn navigation-wrapper diff --git a/src/status_im2/contexts/profile/settings/view.cljs b/src/status_im/contexts/profile/settings/view.cljs similarity index 87% rename from src/status_im2/contexts/profile/settings/view.cljs rename to src/status_im/contexts/profile/settings/view.cljs index 819a1243f7..7bc542e2df 100644 --- a/src/status_im2/contexts/profile/settings/view.cljs +++ b/src/status_im/contexts/profile/settings/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.profile.settings.view +(ns status-im.contexts.profile.settings.view (:require [oops.core :as oops] [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.common.not-implemented :as not-implemented] - [status-im2.contexts.profile.settings.header.view :as settings.header] - [status-im2.contexts.profile.settings.list-items :as settings.items] - [status-im2.contexts.profile.settings.style :as style] + [status-im.common.not-implemented :as not-implemented] + [status-im.contexts.profile.settings.header.view :as settings.header] + [status-im.contexts.profile.settings.list-items :as settings.items] + [status-im.contexts.profile.settings.style :as style] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/profile/utils.cljs b/src/status_im/contexts/profile/utils.cljs similarity index 95% rename from src/status_im2/contexts/profile/utils.cljs rename to src/status_im/contexts/profile/utils.cljs index 095cb04ec8..9d6ce859d2 100644 --- a/src/status_im2/contexts/profile/utils.cljs +++ b/src/status_im/contexts/profile/utils.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.profile.utils +(ns status-im.contexts.profile.utils (:require [clojure.string :as string])) (defn displayed-name diff --git a/src/status_im2/contexts/push_notifications/effects.cljs b/src/status_im/contexts/push_notifications/effects.cljs similarity index 97% rename from src/status_im2/contexts/push_notifications/effects.cljs rename to src/status_im/contexts/push_notifications/effects.cljs index b22f42ffc1..40f85e0df0 100644 --- a/src/status_im2/contexts/push_notifications/effects.cljs +++ b/src/status_im/contexts/push_notifications/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.push-notifications.effects +(ns status-im.contexts.push-notifications.effects (:require [native-module.push-notifications :as native-module.pn] [react-native.platform :as platform] diff --git a/src/status_im2/contexts/push_notifications/events.cljs b/src/status_im/contexts/push_notifications/events.cljs similarity index 94% rename from src/status_im2/contexts/push_notifications/events.cljs rename to src/status_im/contexts/push_notifications/events.cljs index d2c00177ba..2ec50ec81e 100644 --- a/src/status_im2/contexts/push_notifications/events.cljs +++ b/src/status_im/contexts/push_notifications/events.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.push-notifications.events +(ns status-im.contexts.push-notifications.events (:require [cljs-bean.core :as bean] [native-module.push-notifications :as native-module.pn] [react-native.async-storage :as async-storage] [react-native.platform :as platform] [react-native.push-notification-ios :as pn-ios] - [status-im2.config :as config] - status-im2.contexts.push-notifications.effects + [status-im.config :as config] + status-im.contexts.push-notifications.effects [taoensso.timbre :as log] [utils.re-frame :as rf] [utils.transforms :as transforms])) diff --git a/src/status_im2/contexts/push_notifications/local/effects.cljs b/src/status_im/contexts/push_notifications/local/effects.cljs similarity index 93% rename from src/status_im2/contexts/push_notifications/local/effects.cljs rename to src/status_im/contexts/push_notifications/local/effects.cljs index 7ebd59d8a9..440dbaa3d5 100644 --- a/src/status_im2/contexts/push_notifications/local/effects.cljs +++ b/src/status_im/contexts/push_notifications/local/effects.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.push-notifications.local.effects +(ns status-im.contexts.push-notifications.local.effects (:require [cljs-bean.core :as bean] [native-module.push-notifications :as native-module.pn] diff --git a/src/status_im2/contexts/push_notifications/local/events.cljs b/src/status_im/contexts/push_notifications/local/events.cljs similarity index 91% rename from src/status_im2/contexts/push_notifications/local/events.cljs rename to src/status_im/contexts/push_notifications/local/events.cljs index b6717cced5..792a3ce8d7 100644 --- a/src/status_im2/contexts/push_notifications/local/events.cljs +++ b/src/status_im/contexts/push_notifications/local/events.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.push-notifications.local.events +(ns status-im.contexts.push-notifications.local.events (:require [legacy.status-im.notifications.wallet :as notifications.wallet] [react-native.platform :as platform] - status-im2.contexts.push-notifications.local.effects + status-im.contexts.push-notifications.local.effects [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs b/src/status_im/contexts/quo_preview/animated_header_list/animated_header_list.cljs similarity index 96% rename from src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs rename to src/status_im/contexts/quo_preview/animated_header_list/animated_header_list.cljs index 1269d83886..0666cf0f78 100644 --- a/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs +++ b/src/status_im/contexts/quo_preview/animated_header_list/animated_header_list.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.animated-header-list.animated-header-list +(ns status-im.contexts.quo-preview.animated-header-list.animated-header-list (:require [quo.core :as quo] [quo.foundations.colors :as colors] diff --git a/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs b/src/status_im/contexts/quo_preview/avatars/account_avatar.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs rename to src/status_im/contexts/quo_preview/avatars/account_avatar.cljs index 2ce2814cf6..fd50f6048d 100644 --- a/src/status_im2/contexts/quo_preview/avatars/account_avatar.cljs +++ b/src/status_im/contexts/quo_preview/avatars/account_avatar.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.avatars.account-avatar +(ns status-im.contexts.quo-preview.avatars.account-avatar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs b/src/status_im/contexts/quo_preview/avatars/channel_avatar.cljs similarity index 90% rename from src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs rename to src/status_im/contexts/quo_preview/avatars/channel_avatar.cljs index 5ea7cad83e..31be304c0f 100644 --- a/src/status_im2/contexts/quo_preview/avatars/channel_avatar.cljs +++ b/src/status_im/contexts/quo_preview/avatars/channel_avatar.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.avatars.channel-avatar +(ns status-im.contexts.quo-preview.avatars.channel-avatar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/avatars/collection_avatar.cljs b/src/status_im/contexts/quo_preview/avatars/collection_avatar.cljs similarity index 78% rename from src/status_im2/contexts/quo_preview/avatars/collection_avatar.cljs rename to src/status_im/contexts/quo_preview/avatars/collection_avatar.cljs index aa3d5052e4..b382219b59 100644 --- a/src/status_im2/contexts/quo_preview/avatars/collection_avatar.cljs +++ b/src/status_im/contexts/quo_preview/avatars/collection_avatar.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.avatars.collection-avatar +(ns status-im.contexts.quo-preview.avatars.collection-avatar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :image diff --git a/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs b/src/status_im/contexts/quo_preview/avatars/group_avatar.cljs similarity index 85% rename from src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs rename to src/status_im/contexts/quo_preview/avatars/group_avatar.cljs index 514c3d863a..a2ebbc972b 100644 --- a/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs +++ b/src/status_im/contexts/quo_preview/avatars/group_avatar.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.avatars.group-avatar +(ns status-im.contexts.quo-preview.avatars.group-avatar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs b/src/status_im/contexts/quo_preview/avatars/icon_avatar.cljs similarity index 86% rename from src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs rename to src/status_im/contexts/quo_preview/avatars/icon_avatar.cljs index c2ecdd30a4..0ac66d1b6a 100644 --- a/src/status_im2/contexts/quo_preview/avatars/icon_avatar.cljs +++ b/src/status_im/contexts/quo_preview/avatars/icon_avatar.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.avatars.icon-avatar +(ns status-im.contexts.quo-preview.avatars.icon-avatar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs b/src/status_im/contexts/quo_preview/avatars/user_avatar.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs rename to src/status_im/contexts/quo_preview/avatars/user_avatar.cljs index 5997038ae1..0a39b170fa 100644 --- a/src/status_im2/contexts/quo_preview/avatars/user_avatar.cljs +++ b/src/status_im/contexts/quo_preview/avatars/user_avatar.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.avatars.user-avatar +(ns status-im.contexts.quo-preview.avatars.user-avatar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs b/src/status_im/contexts/quo_preview/avatars/wallet_user_avatar.cljs similarity index 85% rename from src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs rename to src/status_im/contexts/quo_preview/avatars/wallet_user_avatar.cljs index 9e9f3ec8fe..ea898a980c 100644 --- a/src/status_im2/contexts/quo_preview/avatars/wallet_user_avatar.cljs +++ b/src/status_im/contexts/quo_preview/avatars/wallet_user_avatar.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.avatars.wallet-user-avatar +(ns status-im.contexts.quo-preview.avatars.wallet-user-avatar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :full-name diff --git a/src/status_im2/contexts/quo_preview/banners/banner.cljs b/src/status_im/contexts/quo_preview/banners/banner.cljs similarity index 83% rename from src/status_im2/contexts/quo_preview/banners/banner.cljs rename to src/status_im/contexts/quo_preview/banners/banner.cljs index b2bb94235e..0281d2d987 100644 --- a/src/status_im2/contexts/quo_preview/banners/banner.cljs +++ b/src/status_im/contexts/quo_preview/banners/banner.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.banners.banner +(ns status-im.contexts.quo-preview.banners.banner (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :latest-pin-text diff --git a/src/status_im2/contexts/quo_preview/browser/browser_input.cljs b/src/status_im/contexts/quo_preview/browser/browser_input.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/browser/browser_input.cljs rename to src/status_im/contexts/quo_preview/browser/browser_input.cljs index fd786ffc13..8aa154913e 100644 --- a/src/status_im2/contexts/quo_preview/browser/browser_input.cljs +++ b/src/status_im/contexts/quo_preview/browser/browser_input.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.browser.browser-input +(ns status-im.contexts.quo-preview.browser.browser-input (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :favicon? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/buttons/button.cljs b/src/status_im/contexts/quo_preview/buttons/button.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/buttons/button.cljs rename to src/status_im/contexts/quo_preview/buttons/button.cljs index da176125ae..cccf708b38 100644 --- a/src/status_im2/contexts/quo_preview/buttons/button.cljs +++ b/src/status_im/contexts/quo_preview/buttons/button.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.buttons.button +(ns status-im.contexts.quo-preview.buttons.button (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/buttons/composer_button.cljs b/src/status_im/contexts/quo_preview/buttons/composer_button.cljs similarity index 84% rename from src/status_im2/contexts/quo_preview/buttons/composer_button.cljs rename to src/status_im/contexts/quo_preview/buttons/composer_button.cljs index 1695e6ff3f..0b7858b926 100644 --- a/src/status_im2/contexts/quo_preview/buttons/composer_button.cljs +++ b/src/status_im/contexts/quo_preview/buttons/composer_button.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.buttons.composer-button +(ns status-im.contexts.quo-preview.buttons.composer-button (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? diff --git a/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs b/src/status_im/contexts/quo_preview/buttons/dynamic_button.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs rename to src/status_im/contexts/quo_preview/buttons/dynamic_button.cljs index 4755a32f23..03241d46ab 100644 --- a/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs +++ b/src/status_im/contexts/quo_preview/buttons/dynamic_button.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.buttons.dynamic-button +(ns status-im.contexts.quo-preview.buttons.dynamic-button (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/buttons/predictive_keyboard.cljs b/src/status_im/contexts/quo_preview/buttons/predictive_keyboard.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/buttons/predictive_keyboard.cljs rename to src/status_im/contexts/quo_preview/buttons/predictive_keyboard.cljs index e836dc520e..284f50c42d 100644 --- a/src/status_im2/contexts/quo_preview/buttons/predictive_keyboard.cljs +++ b/src/status_im/contexts/quo_preview/buttons/predictive_keyboard.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.buttons.predictive-keyboard +(ns status-im.contexts.quo-preview.buttons.predictive-keyboard (:require [quo.core :as quo] [quo.foundations.colors :as colors] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/buttons/slide_button.cljs b/src/status_im/contexts/quo_preview/buttons/slide_button.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/buttons/slide_button.cljs rename to src/status_im/contexts/quo_preview/buttons/slide_button.cljs index 265784f3b3..43c15d5aeb 100644 --- a/src/status_im2/contexts/quo_preview/buttons/slide_button.cljs +++ b/src/status_im/contexts/quo_preview/buttons/slide_button.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.buttons.slide-button +(ns status-im.contexts.quo-preview.buttons.slide-button (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/buttons/wallet_button.cljs b/src/status_im/contexts/quo_preview/buttons/wallet_button.cljs similarity index 82% rename from src/status_im2/contexts/quo_preview/buttons/wallet_button.cljs rename to src/status_im/contexts/quo_preview/buttons/wallet_button.cljs index adef68e714..32a96728c9 100644 --- a/src/status_im2/contexts/quo_preview/buttons/wallet_button.cljs +++ b/src/status_im/contexts/quo_preview/buttons/wallet_button.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.buttons.wallet-button +(ns status-im.contexts.quo-preview.buttons.wallet-button (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :disabled? :type :boolean}]) diff --git a/src/status_im2/contexts/quo_preview/buttons/wallet_ctas.cljs b/src/status_im/contexts/quo_preview/buttons/wallet_ctas.cljs similarity index 74% rename from src/status_im2/contexts/quo_preview/buttons/wallet_ctas.cljs rename to src/status_im/contexts/quo_preview/buttons/wallet_ctas.cljs index 9680288722..9bb306434e 100644 --- a/src/status_im2/contexts/quo_preview/buttons/wallet_ctas.cljs +++ b/src/status_im/contexts/quo_preview/buttons/wallet_ctas.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.quo-preview.buttons.wallet-ctas +(ns status-im.contexts.quo-preview.buttons.wallet-ctas (:require [quo.core :as quo] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (defn view [] diff --git a/src/status_im2/contexts/quo_preview/calendar/calendar.cljs b/src/status_im/contexts/quo_preview/calendar/calendar.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/calendar/calendar.cljs rename to src/status_im/contexts/quo_preview/calendar/calendar.cljs index eef42d8c96..8e072a14ab 100644 --- a/src/status_im2/contexts/quo_preview/calendar/calendar.cljs +++ b/src/status_im/contexts/quo_preview/calendar/calendar.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.calendar.calendar +(ns status-im.contexts.quo-preview.calendar.calendar (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.datetime :as datetime])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/calendar/calendar_day.cljs b/src/status_im/contexts/quo_preview/calendar/calendar_day.cljs similarity index 82% rename from src/status_im2/contexts/quo_preview/calendar/calendar_day.cljs rename to src/status_im/contexts/quo_preview/calendar/calendar_day.cljs index 55189dcef2..ae56f8ee58 100644 --- a/src/status_im2/contexts/quo_preview/calendar/calendar_day.cljs +++ b/src/status_im/contexts/quo_preview/calendar/calendar_day.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.calendar.calendar-day +(ns status-im.contexts.quo-preview.calendar.calendar-day (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [(preview/customization-color-option) diff --git a/src/status_im2/contexts/quo_preview/calendar/calendar_year.cljs b/src/status_im/contexts/quo_preview/calendar/calendar_year.cljs similarity index 76% rename from src/status_im2/contexts/quo_preview/calendar/calendar_year.cljs rename to src/status_im/contexts/quo_preview/calendar/calendar_year.cljs index a05a8f468d..375d6b8f0e 100644 --- a/src/status_im2/contexts/quo_preview/calendar/calendar_year.cljs +++ b/src/status_im/contexts/quo_preview/calendar/calendar_year.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.calendar.calendar-year +(ns status-im.contexts.quo-preview.calendar.calendar-year (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :selected? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/code/snippet.cljs b/src/status_im/contexts/quo_preview/code/snippet.cljs similarity index 96% rename from src/status_im2/contexts/quo_preview/code/snippet.cljs rename to src/status_im/contexts/quo_preview/code/snippet.cljs index f71dc7bd61..0f342f9082 100644 --- a/src/status_im2/contexts/quo_preview/code/snippet.cljs +++ b/src/status_im/contexts/quo_preview/code/snippet.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.code.snippet +(ns status-im.contexts.quo-preview.code.snippet (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def go-example "func (s *Server) listenAndServe() { diff --git a/src/status_im2/contexts/quo_preview/code/snippet_preview.cljs b/src/status_im/contexts/quo_preview/code/snippet_preview.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/code/snippet_preview.cljs rename to src/status_im/contexts/quo_preview/code/snippet_preview.cljs index 5983b40da8..c0b66916e7 100644 --- a/src/status_im2/contexts/quo_preview/code/snippet_preview.cljs +++ b/src/status_im/contexts/quo_preview/code/snippet_preview.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.code.snippet-preview +(ns status-im.contexts.quo-preview.code.snippet-preview (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def go-example "for(let ind") diff --git a/src/status_im2/contexts/quo_preview/colors/color.cljs b/src/status_im/contexts/quo_preview/colors/color.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/colors/color.cljs rename to src/status_im/contexts/quo_preview/colors/color.cljs index 257775c556..add13c0bc4 100644 --- a/src/status_im2/contexts/quo_preview/colors/color.cljs +++ b/src/status_im/contexts/quo_preview/colors/color.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.colors.color +(ns status-im.contexts.quo-preview.colors.color (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [(preview/customization-color-option {:feng-shui? true}) diff --git a/src/status_im2/contexts/quo_preview/colors/color_picker.cljs b/src/status_im/contexts/quo_preview/colors/color_picker.cljs similarity index 90% rename from src/status_im2/contexts/quo_preview/colors/color_picker.cljs rename to src/status_im/contexts/quo_preview/colors/color_picker.cljs index 3077ead499..5dfa55da0c 100644 --- a/src/status_im2/contexts/quo_preview/colors/color_picker.cljs +++ b/src/status_im/contexts/quo_preview/colors/color_picker.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.colors.color-picker +(ns status-im.contexts.quo-preview.colors.color-picker (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? diff --git a/src/status_im2/contexts/quo_preview/common.cljs b/src/status_im/contexts/quo_preview/common.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/common.cljs rename to src/status_im/contexts/quo_preview/common.cljs index 6fb22ce59f..2fb3c7dcfb 100644 --- a/src/status_im2/contexts/quo_preview/common.cljs +++ b/src/status_im/contexts/quo_preview/common.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.common +(ns status-im.contexts.quo-preview.common (:require [quo.core :as quo] [quo.theme :as quo.theme] diff --git a/src/status_im2/contexts/quo_preview/community/channel_actions.cljs b/src/status_im/contexts/quo_preview/community/channel_actions.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/community/channel_actions.cljs rename to src/status_im/contexts/quo_preview/community/channel_actions.cljs index eb7d1dfbbe..4a53fa14d1 100644 --- a/src/status_im2/contexts/quo_preview/community/channel_actions.cljs +++ b/src/status_im/contexts/quo_preview/community/channel_actions.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.community.channel-actions +(ns status-im.contexts.quo-preview.community.channel-actions (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (defn view [] diff --git a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs b/src/status_im/contexts/quo_preview/community/community_card_view.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/community/community_card_view.cljs rename to src/status_im/contexts/quo_preview/community/community_card_view.cljs index e4b6df37e7..8f8e5fa156 100644 --- a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs +++ b/src/status_im/contexts/quo_preview/community/community_card_view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.community.community-card-view +(ns status-im.contexts.quo-preview.community.community-card-view (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) (def community-data diff --git a/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs b/src/status_im/contexts/quo_preview/community/community_membership_list_view.cljs similarity index 83% rename from src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs rename to src/status_im/contexts/quo_preview/community/community_membership_list_view.cljs index a73e362d02..3fea705404 100644 --- a/src/status_im2/contexts/quo_preview/community/community_membership_list_view.cljs +++ b/src/status_im/contexts/quo_preview/community/community_membership_list_view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.community.community-membership-list-view +(ns status-im.contexts.quo-preview.community.community-membership-list-view (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.community.data :as data] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.community.data :as data] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :notifications diff --git a/src/status_im2/contexts/quo_preview/community/community_stat.cljs b/src/status_im/contexts/quo_preview/community/community_stat.cljs similarity index 79% rename from src/status_im2/contexts/quo_preview/community/community_stat.cljs rename to src/status_im/contexts/quo_preview/community/community_stat.cljs index 4d9891f698..f786ad0923 100644 --- a/src/status_im2/contexts/quo_preview/community/community_stat.cljs +++ b/src/status_im/contexts/quo_preview/community/community_stat.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.community.community-stat +(ns status-im.contexts.quo-preview.community.community-stat (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :value diff --git a/src/status_im2/contexts/quo_preview/community/data.cljs b/src/status_im/contexts/quo_preview/community/data.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/community/data.cljs rename to src/status_im/contexts/quo_preview/community/data.cljs index d06cd88206..fed67dc1e9 100644 --- a/src/status_im2/contexts/quo_preview/community/data.cljs +++ b/src/status_im/contexts/quo_preview/community/data.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.quo-preview.community.data +(ns status-im.contexts.quo-preview.community.data (:require - [status-im2.common.resources :as resources] + [status-im.common.resources :as resources] [utils.i18n :as i18n])) (def thumbnail diff --git a/src/status_im2/contexts/quo_preview/community/discover_card.cljs b/src/status_im/contexts/quo_preview/community/discover_card.cljs similarity index 79% rename from src/status_im2/contexts/quo_preview/community/discover_card.cljs rename to src/status_im/contexts/quo_preview/community/discover_card.cljs index 0125729c17..91b34f7fa5 100644 --- a/src/status_im2/contexts/quo_preview/community/discover_card.cljs +++ b/src/status_im/contexts/quo_preview/community/discover_card.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.community.discover-card +(ns status-im.contexts.quo-preview.community.discover-card (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :title :type :text} diff --git a/src/status_im2/contexts/quo_preview/community/token_gating.cljs b/src/status_im/contexts/quo_preview/community/token_gating.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/community/token_gating.cljs rename to src/status_im/contexts/quo_preview/community/token_gating.cljs index 43848f9f68..657a6f43a1 100644 --- a/src/status_im2/contexts/quo_preview/community/token_gating.cljs +++ b/src/status_im/contexts/quo_preview/community/token_gating.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.community.token-gating +(ns status-im.contexts.quo-preview.community.token-gating (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:label "Tokens sufficient?" diff --git a/src/status_im2/contexts/quo_preview/component_preview/events.cljs b/src/status_im/contexts/quo_preview/component_preview/events.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/component_preview/events.cljs rename to src/status_im/contexts/quo_preview/component_preview/events.cljs index 60b54899a2..53ff0d03d4 100644 --- a/src/status_im2/contexts/quo_preview/component_preview/events.cljs +++ b/src/status_im/contexts/quo_preview/component_preview/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.component-preview.events +(ns status-im.contexts.quo-preview.component-preview.events (:require [quo.core :as quo] [re-frame.core :as re-frame])) diff --git a/src/status_im2/contexts/quo_preview/component_preview/view.cljs b/src/status_im/contexts/quo_preview/component_preview/view.cljs similarity index 85% rename from src/status_im2/contexts/quo_preview/component_preview/view.cljs rename to src/status_im/contexts/quo_preview/component_preview/view.cljs index bdd3360b4f..2a05cd2af3 100644 --- a/src/status_im2/contexts/quo_preview/component_preview/view.cljs +++ b/src/status_im/contexts/quo_preview/component_preview/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.component-preview.view +(ns status-im.contexts.quo-preview.component-preview.view (:require [react-native.core :as rn] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/quo_preview/counter/counter.cljs b/src/status_im/contexts/quo_preview/counter/counter.cljs similarity index 83% rename from src/status_im2/contexts/quo_preview/counter/counter.cljs rename to src/status_im/contexts/quo_preview/counter/counter.cljs index 5f74fd7727..33f929604d 100644 --- a/src/status_im2/contexts/quo_preview/counter/counter.cljs +++ b/src/status_im/contexts/quo_preview/counter/counter.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.counter.counter +(ns status-im.contexts.quo-preview.counter.counter (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/counter/step.cljs b/src/status_im/contexts/quo_preview/counter/step.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/counter/step.cljs rename to src/status_im/contexts/quo_preview/counter/step.cljs index e22635eb5b..f989c90fc6 100644 --- a/src/status_im2/contexts/quo_preview/counter/step.cljs +++ b/src/status_im/contexts/quo_preview/counter/step.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.counter.step +(ns status-im.contexts.quo-preview.counter.step (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/dividers/date.cljs b/src/status_im/contexts/quo_preview/dividers/date.cljs similarity index 73% rename from src/status_im2/contexts/quo_preview/dividers/date.cljs rename to src/status_im/contexts/quo_preview/dividers/date.cljs index b0a7b7d175..9be89d3e98 100644 --- a/src/status_im2/contexts/quo_preview/dividers/date.cljs +++ b/src/status_im/contexts/quo_preview/dividers/date.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.dividers.date +(ns status-im.contexts.quo-preview.dividers.date (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :label :type :text}]) diff --git a/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs b/src/status_im/contexts/quo_preview/dividers/divider_label.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/dividers/divider_label.cljs rename to src/status_im/contexts/quo_preview/dividers/divider_label.cljs index a230c0272c..73846a4f73 100644 --- a/src/status_im2/contexts/quo_preview/dividers/divider_label.cljs +++ b/src/status_im/contexts/quo_preview/dividers/divider_label.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.dividers.divider-label +(ns status-im.contexts.quo-preview.dividers.divider-label (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :label diff --git a/src/status_im2/contexts/quo_preview/dividers/divider_line.cljs b/src/status_im/contexts/quo_preview/dividers/divider_line.cljs similarity index 78% rename from src/status_im2/contexts/quo_preview/dividers/divider_line.cljs rename to src/status_im/contexts/quo_preview/dividers/divider_line.cljs index ba53999276..45a5104188 100644 --- a/src/status_im2/contexts/quo_preview/dividers/divider_line.cljs +++ b/src/status_im/contexts/quo_preview/dividers/divider_line.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.dividers.divider-line +(ns status-im.contexts.quo-preview.dividers.divider-line (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? diff --git a/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs b/src/status_im/contexts/quo_preview/dividers/new_messages.cljs similarity index 76% rename from src/status_im2/contexts/quo_preview/dividers/new_messages.cljs rename to src/status_im/contexts/quo_preview/dividers/new_messages.cljs index cc9525db8d..78501228d6 100644 --- a/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs +++ b/src/status_im/contexts/quo_preview/dividers/new_messages.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.dividers.new-messages +(ns status-im.contexts.quo-preview.dividers.new-messages (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :label diff --git a/src/status_im2/contexts/quo_preview/dividers/strength_divider.cljs b/src/status_im/contexts/quo_preview/dividers/strength_divider.cljs similarity index 85% rename from src/status_im2/contexts/quo_preview/dividers/strength_divider.cljs rename to src/status_im/contexts/quo_preview/dividers/strength_divider.cljs index ad4253cf60..85a50a96ef 100644 --- a/src/status_im2/contexts/quo_preview/dividers/strength_divider.cljs +++ b/src/status_im/contexts/quo_preview/dividers/strength_divider.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.dividers.strength-divider +(ns status-im.contexts.quo-preview.dividers.strength-divider (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs b/src/status_im/contexts/quo_preview/drawers/action_drawers.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs rename to src/status_im/contexts/quo_preview/drawers/action_drawers.cljs index b17b341c0f..5dcc82210a 100644 --- a/src/status_im2/contexts/quo_preview/drawers/action_drawers.cljs +++ b/src/status_im/contexts/quo_preview/drawers/action_drawers.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.drawers.action-drawers +(ns status-im.contexts.quo-preview.drawers.action-drawers (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/drawers/bottom_actions.cljs b/src/status_im/contexts/quo_preview/drawers/bottom_actions.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/drawers/bottom_actions.cljs rename to src/status_im/contexts/quo_preview/drawers/bottom_actions.cljs index 46ceb9c8fd..8bea6617af 100644 --- a/src/status_im2/contexts/quo_preview/drawers/bottom_actions.cljs +++ b/src/status_im/contexts/quo_preview/drawers/bottom_actions.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.drawers.bottom-actions +(ns status-im.contexts.quo-preview.drawers.bottom-actions (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def button-two "Cancel") (def button-one "Request to join") diff --git a/src/status_im2/contexts/quo_preview/drawers/documentation_drawers.cljs b/src/status_im/contexts/quo_preview/drawers/documentation_drawers.cljs similarity index 98% rename from src/status_im2/contexts/quo_preview/drawers/documentation_drawers.cljs rename to src/status_im/contexts/quo_preview/drawers/documentation_drawers.cljs index bcfe566ba2..7d55224370 100644 --- a/src/status_im2/contexts/quo_preview/drawers/documentation_drawers.cljs +++ b/src/status_im/contexts/quo_preview/drawers/documentation_drawers.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.drawers.documentation-drawers +(ns status-im.contexts.quo-preview.drawers.documentation-drawers (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/drawers/drawer_buttons.cljs b/src/status_im/contexts/quo_preview/drawers/drawer_buttons.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/drawers/drawer_buttons.cljs rename to src/status_im/contexts/quo_preview/drawers/drawer_buttons.cljs index 2c356b7d98..0574f9e322 100644 --- a/src/status_im2/contexts/quo_preview/drawers/drawer_buttons.cljs +++ b/src/status_im/contexts/quo_preview/drawers/drawer_buttons.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.drawers.drawer-buttons +(ns status-im.contexts.quo-preview.drawers.drawer-buttons (:require [quo.core :as quo] [quo.foundations.colors :as colors] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :top-heading diff --git a/src/status_im2/contexts/quo_preview/drawers/drawer_top.cljs b/src/status_im/contexts/quo_preview/drawers/drawer_top.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/drawers/drawer_top.cljs rename to src/status_im/contexts/quo_preview/drawers/drawer_top.cljs index 99277ee63a..3427f80de4 100644 --- a/src/status_im2/contexts/quo_preview/drawers/drawer_top.cljs +++ b/src/status_im/contexts/quo_preview/drawers/drawer_top.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.drawers.drawer-top +(ns status-im.contexts.quo-preview.drawers.drawer-top (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.profile.utils :as profile.utils] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.resources :as resources] + [status-im.contexts.profile.utils :as profile.utils] + [status-im.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/drawers/permission_drawers.cljs b/src/status_im/contexts/quo_preview/drawers/permission_drawers.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/drawers/permission_drawers.cljs rename to src/status_im/contexts/quo_preview/drawers/permission_drawers.cljs index b7c36c7683..d1d3b7ba4f 100644 --- a/src/status_im2/contexts/quo_preview/drawers/permission_drawers.cljs +++ b/src/status_im/contexts/quo_preview/drawers/permission_drawers.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.drawers.permission-drawers +(ns status-im.contexts.quo-preview.drawers.permission-drawers (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] - [status-im2.common.resources :as resources])) + [status-im.common.resources :as resources])) (def token-icon (resources/get-mock-image :status-logo)) diff --git a/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs b/src/status_im/contexts/quo_preview/dropdowns/dropdown.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs rename to src/status_im/contexts/quo_preview/dropdowns/dropdown.cljs index 658da2bc16..f4c4b7ed8d 100644 --- a/src/status_im2/contexts/quo_preview/dropdowns/dropdown.cljs +++ b/src/status_im/contexts/quo_preview/dropdowns/dropdown.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.dropdowns.dropdown +(ns status-im.contexts.quo-preview.dropdowns.dropdown (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/dropdowns/dropdown_input.cljs b/src/status_im/contexts/quo_preview/dropdowns/dropdown_input.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/dropdowns/dropdown_input.cljs rename to src/status_im/contexts/quo_preview/dropdowns/dropdown_input.cljs index ddbf374e9e..80514d7057 100644 --- a/src/status_im2/contexts/quo_preview/dropdowns/dropdown_input.cljs +++ b/src/status_im/contexts/quo_preview/dropdowns/dropdown_input.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.dropdowns.dropdown-input +(ns status-im.contexts.quo-preview.dropdowns.dropdown-input (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :state diff --git a/src/status_im2/contexts/quo_preview/dropdowns/network_dropdown.cljs b/src/status_im/contexts/quo_preview/dropdowns/network_dropdown.cljs similarity index 90% rename from src/status_im2/contexts/quo_preview/dropdowns/network_dropdown.cljs rename to src/status_im/contexts/quo_preview/dropdowns/network_dropdown.cljs index 39e782acb0..d1cb705bef 100644 --- a/src/status_im2/contexts/quo_preview/dropdowns/network_dropdown.cljs +++ b/src/status_im/contexts/quo_preview/dropdowns/network_dropdown.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.dropdowns.network-dropdown +(ns status-im.contexts.quo-preview.dropdowns.network-dropdown (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :state diff --git a/src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs b/src/status_im/contexts/quo_preview/empty_state/empty_state.cljs similarity index 90% rename from src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs rename to src/status_im/contexts/quo_preview/empty_state/empty_state.cljs index 8d6a6d2bfd..683890e49b 100644 --- a/src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs +++ b/src/status_im/contexts/quo_preview/empty_state/empty_state.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.empty-state.empty-state +(ns status-im.contexts.quo-preview.empty-state.empty-state (:require [quo.core :as quo] [quo.theme] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :title diff --git a/src/status_im2/contexts/quo_preview/foundations/shadows.cljs b/src/status_im/contexts/quo_preview/foundations/shadows.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/foundations/shadows.cljs rename to src/status_im/contexts/quo_preview/foundations/shadows.cljs index 0d4c2965c2..786f52004d 100644 --- a/src/status_im2/contexts/quo_preview/foundations/shadows.cljs +++ b/src/status_im/contexts/quo_preview/foundations/shadows.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.foundations.shadows +(ns status-im.contexts.quo-preview.foundations.shadows (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,7 +6,7 @@ [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (defn demo-box [shadow? description shadow-style] diff --git a/src/status_im2/contexts/quo_preview/gradient/gradient_cover.cljs b/src/status_im/contexts/quo_preview/gradient/gradient_cover.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/gradient/gradient_cover.cljs rename to src/status_im/contexts/quo_preview/gradient/gradient_cover.cljs index bce45daec2..df68770935 100644 --- a/src/status_im2/contexts/quo_preview/gradient/gradient_cover.cljs +++ b/src/status_im/contexts/quo_preview/gradient/gradient_cover.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.quo-preview.gradient.gradient-cover +(ns status-im.contexts.quo-preview.gradient.gradient-cover (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) (defn render-action-sheet diff --git a/src/status_im2/contexts/quo_preview/graph/interactive_graph.cljs b/src/status_im/contexts/quo_preview/graph/interactive_graph.cljs similarity index 97% rename from src/status_im2/contexts/quo_preview/graph/interactive_graph.cljs rename to src/status_im/contexts/quo_preview/graph/interactive_graph.cljs index 9142a982f5..d6065aefb4 100644 --- a/src/status_im2/contexts/quo_preview/graph/interactive_graph.cljs +++ b/src/status_im/contexts/quo_preview/graph/interactive_graph.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.graph.interactive-graph +(ns status-im.contexts.quo-preview.graph.interactive-graph (:require [goog.string :as gstring] [quo.components.graph.utils :as utils] @@ -6,7 +6,7 @@ [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def weekly-data [{:value 123 diff --git a/src/status_im2/contexts/quo_preview/graph/wallet_graph.cljs b/src/status_im/contexts/quo_preview/graph/wallet_graph.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/graph/wallet_graph.cljs rename to src/status_im/contexts/quo_preview/graph/wallet_graph.cljs index c4b8b42f3f..7639ee655a 100644 --- a/src/status_im2/contexts/quo_preview/graph/wallet_graph.cljs +++ b/src/status_im/contexts/quo_preview/graph/wallet_graph.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.graph.wallet-graph +(ns status-im.contexts.quo-preview.graph.wallet-graph (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (defn generate-crypto-token-prices [num-elements volatility] diff --git a/src/status_im2/contexts/quo_preview/info/info_message.cljs b/src/status_im/contexts/quo_preview/info/info_message.cljs similarity index 86% rename from src/status_im2/contexts/quo_preview/info/info_message.cljs rename to src/status_im/contexts/quo_preview/info/info_message.cljs index 33eaa0c3c5..d2509c1401 100644 --- a/src/status_im2/contexts/quo_preview/info/info_message.cljs +++ b/src/status_im/contexts/quo_preview/info/info_message.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.info.info-message +(ns status-im.contexts.quo-preview.info.info-message (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/info/information_box.cljs b/src/status_im/contexts/quo_preview/info/information_box.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/info/information_box.cljs rename to src/status_im/contexts/quo_preview/info/information_box.cljs index 8a3907260c..8afc39ed2b 100644 --- a/src/status_im2/contexts/quo_preview/info/information_box.cljs +++ b/src/status_im/contexts/quo_preview/info/information_box.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.info.information-box +(ns status-im.contexts.quo-preview.info.information-box (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/inputs/address_input.cljs b/src/status_im/contexts/quo_preview/inputs/address_input.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/inputs/address_input.cljs rename to src/status_im/contexts/quo_preview/inputs/address_input.cljs index bad8699bcf..2919e981f4 100644 --- a/src/status_im2/contexts/quo_preview/inputs/address_input.cljs +++ b/src/status_im/contexts/quo_preview/inputs/address_input.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.inputs.address-input +(ns status-im.contexts.quo-preview.inputs.address-input (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.constants :as constants] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:label "Scanned value:" diff --git a/src/status_im2/contexts/quo_preview/inputs/input.cljs b/src/status_im/contexts/quo_preview/inputs/input.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/inputs/input.cljs rename to src/status_im/contexts/quo_preview/inputs/input.cljs index d4608f9335..a1b0415e7f 100644 --- a/src/status_im2/contexts/quo_preview/inputs/input.cljs +++ b/src/status_im/contexts/quo_preview/inputs/input.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.inputs.input +(ns status-im.contexts.quo-preview.inputs.input (:require [clojure.string :as string] [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/inputs/locked_input.cljs b/src/status_im/contexts/quo_preview/inputs/locked_input.cljs similarity index 85% rename from src/status_im2/contexts/quo_preview/inputs/locked_input.cljs rename to src/status_im/contexts/quo_preview/inputs/locked_input.cljs index 756acd4082..a136607416 100644 --- a/src/status_im2/contexts/quo_preview/inputs/locked_input.cljs +++ b/src/status_im/contexts/quo_preview/inputs/locked_input.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.inputs.locked-input +(ns status-im.contexts.quo-preview.inputs.locked-input (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :icon :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/inputs/profile_input.cljs b/src/status_im/contexts/quo_preview/inputs/profile_input.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/inputs/profile_input.cljs rename to src/status_im/contexts/quo_preview/inputs/profile_input.cljs index 9d29cafd8e..0131882f3b 100644 --- a/src/status_im2/contexts/quo_preview/inputs/profile_input.cljs +++ b/src/status_im/contexts/quo_preview/inputs/profile_input.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.inputs.profile-input +(ns status-im.contexts.quo-preview.inputs.profile-input (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :disabled? diff --git a/src/status_im2/contexts/quo_preview/inputs/recovery_phrase_input.cljs b/src/status_im/contexts/quo_preview/inputs/recovery_phrase_input.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/inputs/recovery_phrase_input.cljs rename to src/status_im/contexts/quo_preview/inputs/recovery_phrase_input.cljs index c589df8670..6ca5d0ab5a 100644 --- a/src/status_im2/contexts/quo_preview/inputs/recovery_phrase_input.cljs +++ b/src/status_im/contexts/quo_preview/inputs/recovery_phrase_input.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.inputs.recovery-phrase-input +(ns status-im.contexts.quo-preview.inputs.recovery-phrase-input (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :text diff --git a/src/status_im2/contexts/quo_preview/inputs/search_input.cljs b/src/status_im/contexts/quo_preview/inputs/search_input.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/inputs/search_input.cljs rename to src/status_im/contexts/quo_preview/inputs/search_input.cljs index 2f44f50d96..c8455aec7e 100644 --- a/src/status_im2/contexts/quo_preview/inputs/search_input.cljs +++ b/src/status_im/contexts/quo_preview/inputs/search_input.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.inputs.search-input +(ns status-im.contexts.quo-preview.inputs.search-input (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :value diff --git a/src/status_im2/contexts/quo_preview/inputs/title_input.cljs b/src/status_im/contexts/quo_preview/inputs/title_input.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/inputs/title_input.cljs rename to src/status_im/contexts/quo_preview/inputs/title_input.cljs index 4f69a53af0..fe18822eaf 100644 --- a/src/status_im2/contexts/quo_preview/inputs/title_input.cljs +++ b/src/status_im/contexts/quo_preview/inputs/title_input.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.inputs.title-input +(ns status-im.contexts.quo-preview.inputs.title-input (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :disabled? diff --git a/src/status_im/contexts/quo_preview/ios/drawer_bar.cljs b/src/status_im/contexts/quo_preview/ios/drawer_bar.cljs new file mode 100644 index 0000000000..0e362096e7 --- /dev/null +++ b/src/status_im/contexts/quo_preview/ios/drawer_bar.cljs @@ -0,0 +1,9 @@ +(ns status-im.contexts.quo-preview.ios.drawer-bar + (:require + [quo.core :as quo] + [status-im.contexts.quo-preview.preview :as preview])) + +(defn view + [] + [preview/preview-container {} + [quo/drawer-bar]]) diff --git a/src/status_im2/contexts/quo_preview/keycard/keycard.cljs b/src/status_im/contexts/quo_preview/keycard/keycard.cljs similarity index 77% rename from src/status_im2/contexts/quo_preview/keycard/keycard.cljs rename to src/status_im/contexts/quo_preview/keycard/keycard.cljs index 21cd243331..6f064c413e 100644 --- a/src/status_im2/contexts/quo_preview/keycard/keycard.cljs +++ b/src/status_im/contexts/quo_preview/keycard/keycard.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.keycard.keycard +(ns status-im.contexts.quo-preview.keycard.keycard (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :holder-name :type :text} diff --git a/src/status_im2/contexts/quo_preview/links/link_preview.cljs b/src/status_im/contexts/quo_preview/links/link_preview.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/links/link_preview.cljs rename to src/status_im/contexts/quo_preview/links/link_preview.cljs index a570364536..3c93130bdd 100644 --- a/src/status_im2/contexts/quo_preview/links/link_preview.cljs +++ b/src/status_im/contexts/quo_preview/links/link_preview.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.links.link-preview +(ns status-im.contexts.quo-preview.links.link-preview (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:type :text :key :title} diff --git a/src/status_im2/contexts/quo_preview/links/url_preview.cljs b/src/status_im/contexts/quo_preview/links/url_preview.cljs similarity index 86% rename from src/status_im2/contexts/quo_preview/links/url_preview.cljs rename to src/status_im/contexts/quo_preview/links/url_preview.cljs index 222b45044f..1d8143cb71 100644 --- a/src/status_im2/contexts/quo_preview/links/url_preview.cljs +++ b/src/status_im/contexts/quo_preview/links/url_preview.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.links.url-preview +(ns status-im.contexts.quo-preview.links.url-preview (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:type :text :key :title} diff --git a/src/status_im2/contexts/quo_preview/links/url_preview_list.cljs b/src/status_im/contexts/quo_preview/links/url_preview_list.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/links/url_preview_list.cljs rename to src/status_im/contexts/quo_preview/links/url_preview_list.cljs index e926f16a4c..c70aabd74c 100644 --- a/src/status_im2/contexts/quo_preview/links/url_preview_list.cljs +++ b/src/status_im/contexts/quo_preview/links/url_preview_list.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.links.url-preview-list +(ns status-im.contexts.quo-preview.links.url-preview-list (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:type :number :key :previews-length}]) diff --git a/src/status_im2/contexts/quo_preview/list_items/account.cljs b/src/status_im/contexts/quo_preview/list_items/account.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/list_items/account.cljs rename to src/status_im/contexts/quo_preview/list_items/account.cljs index af9fe164a0..0652b7a4c1 100644 --- a/src/status_im2/contexts/quo_preview/list_items/account.cljs +++ b/src/status_im/contexts/quo_preview/list_items/account.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.list-items.account +(ns status-im.contexts.quo-preview.list-items.account (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/list_items/account_list_card.cljs b/src/status_im/contexts/quo_preview/list_items/account_list_card.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/list_items/account_list_card.cljs rename to src/status_im/contexts/quo_preview/list_items/account_list_card.cljs index 3176af12ed..ee28ae0f16 100644 --- a/src/status_im2/contexts/quo_preview/list_items/account_list_card.cljs +++ b/src/status_im/contexts/quo_preview/list_items/account_list_card.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.list-items.account-list-card +(ns status-im.contexts.quo-preview.list-items.account-list-card (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :action diff --git a/src/status_im2/contexts/quo_preview/list_items/address.cljs b/src/status_im/contexts/quo_preview/list_items/address.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/list_items/address.cljs rename to src/status_im/contexts/quo_preview/list_items/address.cljs index 8a36272f53..a09aacd0fd 100644 --- a/src/status_im2/contexts/quo_preview/list_items/address.cljs +++ b/src/status_im/contexts/quo_preview/list_items/address.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.list-items.address +(ns status-im.contexts.quo-preview.list-items.address (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :active-state? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/list_items/channel.cljs b/src/status_im/contexts/quo_preview/list_items/channel.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/list_items/channel.cljs rename to src/status_im/contexts/quo_preview/list_items/channel.cljs index 624daf64d4..115af5c9be 100644 --- a/src/status_im2/contexts/quo_preview/list_items/channel.cljs +++ b/src/status_im/contexts/quo_preview/list_items/channel.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.list-items.channel +(ns status-im.contexts.quo-preview.list-items.channel (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :name diff --git a/src/status_im2/contexts/quo_preview/list_items/community_list.cljs b/src/status_im/contexts/quo_preview/list_items/community_list.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/list_items/community_list.cljs rename to src/status_im/contexts/quo_preview/list_items/community_list.cljs index a518853373..fac0ad5d66 100644 --- a/src/status_im2/contexts/quo_preview/list_items/community_list.cljs +++ b/src/status_im/contexts/quo_preview/list_items/community_list.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.list-items.community-list +(ns status-im.contexts.quo-preview.list-items.community-list (:require [quo.core :as quo] [quo.theme :as quo.theme] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.community.data :as data] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.community.data :as data] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor-type {:type :select diff --git a/src/status_im2/contexts/quo_preview/list_items/dapp.cljs b/src/status_im/contexts/quo_preview/list_items/dapp.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/list_items/dapp.cljs rename to src/status_im/contexts/quo_preview/list_items/dapp.cljs index 0942202d88..61fc2dc931 100644 --- a/src/status_im2/contexts/quo_preview/list_items/dapp.cljs +++ b/src/status_im/contexts/quo_preview/list_items/dapp.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.list-items.dapp +(ns status-im.contexts.quo-preview.list-items.dapp (:require [quo.core :as quo] [quo.foundations.resources :as resources] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :state diff --git a/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs b/src/status_im/contexts/quo_preview/list_items/preview_lists.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs rename to src/status_im/contexts/quo_preview/list_items/preview_lists.cljs index 0e7badf225..3edfbabc5d 100644 --- a/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs +++ b/src/status_im/contexts/quo_preview/list_items/preview_lists.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.list-items.preview-lists +(ns status-im.contexts.quo-preview.list-items.preview-lists (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/list_items/saved_address.cljs b/src/status_im/contexts/quo_preview/list_items/saved_address.cljs similarity index 90% rename from src/status_im2/contexts/quo_preview/list_items/saved_address.cljs rename to src/status_im/contexts/quo_preview/list_items/saved_address.cljs index ef9a3d1c31..388fa22dd0 100644 --- a/src/status_im2/contexts/quo_preview/list_items/saved_address.cljs +++ b/src/status_im/contexts/quo_preview/list_items/saved_address.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.list-items.saved-address +(ns status-im.contexts.quo-preview.list-items.saved-address (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [(preview/customization-color-option {:key :account-color}) diff --git a/src/status_im2/contexts/quo_preview/list_items/saved_contact_address.cljs b/src/status_im/contexts/quo_preview/list_items/saved_contact_address.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/list_items/saved_contact_address.cljs rename to src/status_im/contexts/quo_preview/list_items/saved_contact_address.cljs index 3c349aa83f..210f54047f 100644 --- a/src/status_im2/contexts/quo_preview/list_items/saved_contact_address.cljs +++ b/src/status_im/contexts/quo_preview/list_items/saved_contact_address.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.list-items.saved-contact-address +(ns status-im.contexts.quo-preview.list-items.saved-contact-address (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :accounts-number :type :number} diff --git a/src/status_im2/contexts/quo_preview/list_items/token_network.cljs b/src/status_im/contexts/quo_preview/list_items/token_network.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/list_items/token_network.cljs rename to src/status_im/contexts/quo_preview/list_items/token_network.cljs index 6163c6c3cd..6b5a054fab 100644 --- a/src/status_im2/contexts/quo_preview/list_items/token_network.cljs +++ b/src/status_im/contexts/quo_preview/list_items/token_network.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.list-items.token-network +(ns status-im.contexts.quo-preview.list-items.token-network (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def networks-list [{:source (quo.resources/get-network :ethereum)} diff --git a/src/status_im2/contexts/quo_preview/list_items/token_value.cljs b/src/status_im/contexts/quo_preview/list_items/token_value.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/list_items/token_value.cljs rename to src/status_im/contexts/quo_preview/list_items/token_value.cljs index 90f72c74c7..63bdb4e621 100644 --- a/src/status_im2/contexts/quo_preview/list_items/token_value.cljs +++ b/src/status_im/contexts/quo_preview/list_items/token_value.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.list-items.token-value +(ns status-im.contexts.quo-preview.list-items.token-value (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :token diff --git a/src/status_im2/contexts/quo_preview/list_items/user_list.cljs b/src/status_im/contexts/quo_preview/list_items/user_list.cljs similarity index 90% rename from src/status_im2/contexts/quo_preview/list_items/user_list.cljs rename to src/status_im/contexts/quo_preview/list_items/user_list.cljs index 3a9395361b..0de8719b3e 100644 --- a/src/status_im2/contexts/quo_preview/list_items/user_list.cljs +++ b/src/status_im/contexts/quo_preview/list_items/user_list.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.list-items.user-list +(ns status-im.contexts.quo-preview.list-items.user-list (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview] [utils.address :as address])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/loaders/skeleton_list.cljs b/src/status_im/contexts/quo_preview/loaders/skeleton_list.cljs similarity index 84% rename from src/status_im2/contexts/quo_preview/loaders/skeleton_list.cljs rename to src/status_im/contexts/quo_preview/loaders/skeleton_list.cljs index bd9e15da49..a332e6391f 100644 --- a/src/status_im2/contexts/quo_preview/loaders/skeleton_list.cljs +++ b/src/status_im/contexts/quo_preview/loaders/skeleton_list.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.loaders.skeleton-list +(ns status-im.contexts.quo-preview.loaders.skeleton-list (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :content diff --git a/src/status_im2/contexts/quo_preview/main.cljs b/src/status_im/contexts/quo_preview/main.cljs similarity index 61% rename from src/status_im2/contexts/quo_preview/main.cljs rename to src/status_im/contexts/quo_preview/main.cljs index 1bbf71f176..f390834830 100644 --- a/src/status_im2/contexts/quo_preview/main.cljs +++ b/src/status_im/contexts/quo_preview/main.cljs @@ -1,191 +1,191 @@ -(ns status-im2.contexts.quo-preview.main +(ns status-im.contexts.quo-preview.main (:refer-clojure :exclude [filter]) (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.animated-header-list.animated-header-list + [status-im.contexts.quo-preview.animated-header-list.animated-header-list :as animated-header-list] - [status-im2.contexts.quo-preview.avatars.account-avatar :as account-avatar] - [status-im2.contexts.quo-preview.avatars.channel-avatar :as channel-avatar] - [status-im2.contexts.quo-preview.avatars.collection-avatar :as collection-avatar] - [status-im2.contexts.quo-preview.avatars.group-avatar :as group-avatar] - [status-im2.contexts.quo-preview.avatars.icon-avatar :as icon-avatar] - [status-im2.contexts.quo-preview.avatars.user-avatar :as user-avatar] - [status-im2.contexts.quo-preview.avatars.wallet-user-avatar :as + [status-im.contexts.quo-preview.avatars.account-avatar :as account-avatar] + [status-im.contexts.quo-preview.avatars.channel-avatar :as channel-avatar] + [status-im.contexts.quo-preview.avatars.collection-avatar :as collection-avatar] + [status-im.contexts.quo-preview.avatars.group-avatar :as group-avatar] + [status-im.contexts.quo-preview.avatars.icon-avatar :as icon-avatar] + [status-im.contexts.quo-preview.avatars.user-avatar :as user-avatar] + [status-im.contexts.quo-preview.avatars.wallet-user-avatar :as wallet-user-avatar] - [status-im2.contexts.quo-preview.banners.banner :as banner] - [status-im2.contexts.quo-preview.browser.browser-input :as browser-input] - [status-im2.contexts.quo-preview.buttons.button :as button] - [status-im2.contexts.quo-preview.buttons.composer-button :as + [status-im.contexts.quo-preview.banners.banner :as banner] + [status-im.contexts.quo-preview.browser.browser-input :as browser-input] + [status-im.contexts.quo-preview.buttons.button :as button] + [status-im.contexts.quo-preview.buttons.composer-button :as composer-button] - [status-im2.contexts.quo-preview.buttons.dynamic-button :as dynamic-button] - [status-im2.contexts.quo-preview.buttons.predictive-keyboard :as + [status-im.contexts.quo-preview.buttons.dynamic-button :as dynamic-button] + [status-im.contexts.quo-preview.buttons.predictive-keyboard :as predictive-keyboard] - [status-im2.contexts.quo-preview.buttons.slide-button :as slide-button] - [status-im2.contexts.quo-preview.buttons.wallet-button :as wallet-button] - [status-im2.contexts.quo-preview.buttons.wallet-ctas :as wallet-ctas] - [status-im2.contexts.quo-preview.calendar.calendar :as calendar] - [status-im2.contexts.quo-preview.calendar.calendar-day :as calendar-day] - [status-im2.contexts.quo-preview.calendar.calendar-year :as calendar-year] - [status-im2.contexts.quo-preview.code.snippet :as code-snippet] - [status-im2.contexts.quo-preview.code.snippet-preview :as code-snippet-preview] - [status-im2.contexts.quo-preview.colors.color :as color] - [status-im2.contexts.quo-preview.colors.color-picker :as color-picker] - [status-im2.contexts.quo-preview.common :as common] - [status-im2.contexts.quo-preview.community.channel-actions :as + [status-im.contexts.quo-preview.buttons.slide-button :as slide-button] + [status-im.contexts.quo-preview.buttons.wallet-button :as wallet-button] + [status-im.contexts.quo-preview.buttons.wallet-ctas :as wallet-ctas] + [status-im.contexts.quo-preview.calendar.calendar :as calendar] + [status-im.contexts.quo-preview.calendar.calendar-day :as calendar-day] + [status-im.contexts.quo-preview.calendar.calendar-year :as calendar-year] + [status-im.contexts.quo-preview.code.snippet :as code-snippet] + [status-im.contexts.quo-preview.code.snippet-preview :as code-snippet-preview] + [status-im.contexts.quo-preview.colors.color :as color] + [status-im.contexts.quo-preview.colors.color-picker :as color-picker] + [status-im.contexts.quo-preview.common :as common] + [status-im.contexts.quo-preview.community.channel-actions :as channel-actions] - [status-im2.contexts.quo-preview.community.community-card-view :as + [status-im.contexts.quo-preview.community.community-card-view :as community-card] - [status-im2.contexts.quo-preview.community.community-membership-list-view + [status-im.contexts.quo-preview.community.community-membership-list-view :as community-membership-list-view] - [status-im2.contexts.quo-preview.community.community-stat :as community-stat] - [status-im2.contexts.quo-preview.community.discover-card :as discover-card] - [status-im2.contexts.quo-preview.community.token-gating :as token-gating] - [status-im2.contexts.quo-preview.counter.counter :as counter] - [status-im2.contexts.quo-preview.counter.step :as step] - [status-im2.contexts.quo-preview.dividers.date :as divider-date] - [status-im2.contexts.quo-preview.dividers.divider-label :as divider-label] - [status-im2.contexts.quo-preview.dividers.divider-line :as divider-line] - [status-im2.contexts.quo-preview.dividers.new-messages :as new-messages] - [status-im2.contexts.quo-preview.dividers.strength-divider :as + [status-im.contexts.quo-preview.community.community-stat :as community-stat] + [status-im.contexts.quo-preview.community.discover-card :as discover-card] + [status-im.contexts.quo-preview.community.token-gating :as token-gating] + [status-im.contexts.quo-preview.counter.counter :as counter] + [status-im.contexts.quo-preview.counter.step :as step] + [status-im.contexts.quo-preview.dividers.date :as divider-date] + [status-im.contexts.quo-preview.dividers.divider-label :as divider-label] + [status-im.contexts.quo-preview.dividers.divider-line :as divider-line] + [status-im.contexts.quo-preview.dividers.new-messages :as new-messages] + [status-im.contexts.quo-preview.dividers.strength-divider :as strength-divider] - [status-im2.contexts.quo-preview.drawers.action-drawers :as action-drawers] - [status-im2.contexts.quo-preview.drawers.bottom-actions :as bottom-actions] - [status-im2.contexts.quo-preview.drawers.documentation-drawers :as documentation-drawers] - [status-im2.contexts.quo-preview.drawers.drawer-buttons :as drawer-buttons] - [status-im2.contexts.quo-preview.drawers.drawer-top :as drawer-top] - [status-im2.contexts.quo-preview.drawers.permission-drawers :as + [status-im.contexts.quo-preview.drawers.action-drawers :as action-drawers] + [status-im.contexts.quo-preview.drawers.bottom-actions :as bottom-actions] + [status-im.contexts.quo-preview.drawers.documentation-drawers :as documentation-drawers] + [status-im.contexts.quo-preview.drawers.drawer-buttons :as drawer-buttons] + [status-im.contexts.quo-preview.drawers.drawer-top :as drawer-top] + [status-im.contexts.quo-preview.drawers.permission-drawers :as permission-drawers] - [status-im2.contexts.quo-preview.dropdowns.dropdown :as dropdown] - [status-im2.contexts.quo-preview.dropdowns.dropdown-input :as + [status-im.contexts.quo-preview.dropdowns.dropdown :as dropdown] + [status-im.contexts.quo-preview.dropdowns.dropdown-input :as dropdown-input] - [status-im2.contexts.quo-preview.dropdowns.network-dropdown :as + [status-im.contexts.quo-preview.dropdowns.network-dropdown :as network-dropdown] - [status-im2.contexts.quo-preview.empty-state.empty-state :as empty-state] - [status-im2.contexts.quo-preview.foundations.shadows :as shadows] - [status-im2.contexts.quo-preview.gradient.gradient-cover :as gradient-cover] - [status-im2.contexts.quo-preview.graph.interactive-graph :as + [status-im.contexts.quo-preview.empty-state.empty-state :as empty-state] + [status-im.contexts.quo-preview.foundations.shadows :as shadows] + [status-im.contexts.quo-preview.gradient.gradient-cover :as gradient-cover] + [status-im.contexts.quo-preview.graph.interactive-graph :as interactive-graph] - [status-im2.contexts.quo-preview.graph.wallet-graph :as wallet-graph] - [status-im2.contexts.quo-preview.info.info-message :as info-message] - [status-im2.contexts.quo-preview.info.information-box :as information-box] - [status-im2.contexts.quo-preview.inputs.address-input :as address-input] - [status-im2.contexts.quo-preview.inputs.input :as input] - [status-im2.contexts.quo-preview.inputs.locked-input :as locked-input] - [status-im2.contexts.quo-preview.inputs.profile-input :as profile-input] - [status-im2.contexts.quo-preview.inputs.recovery-phrase-input :as + [status-im.contexts.quo-preview.graph.wallet-graph :as wallet-graph] + [status-im.contexts.quo-preview.info.info-message :as info-message] + [status-im.contexts.quo-preview.info.information-box :as information-box] + [status-im.contexts.quo-preview.inputs.address-input :as address-input] + [status-im.contexts.quo-preview.inputs.input :as input] + [status-im.contexts.quo-preview.inputs.locked-input :as locked-input] + [status-im.contexts.quo-preview.inputs.profile-input :as profile-input] + [status-im.contexts.quo-preview.inputs.recovery-phrase-input :as recovery-phrase-input] - [status-im2.contexts.quo-preview.inputs.search-input :as search-input] - [status-im2.contexts.quo-preview.inputs.title-input :as title-input] - [status-im2.contexts.quo-preview.ios.drawer-bar :as drawer-bar] - [status-im2.contexts.quo-preview.keycard.keycard :as keycard] - [status-im2.contexts.quo-preview.links.link-preview :as link-preview] - [status-im2.contexts.quo-preview.links.url-preview :as url-preview] - [status-im2.contexts.quo-preview.links.url-preview-list :as + [status-im.contexts.quo-preview.inputs.search-input :as search-input] + [status-im.contexts.quo-preview.inputs.title-input :as title-input] + [status-im.contexts.quo-preview.ios.drawer-bar :as drawer-bar] + [status-im.contexts.quo-preview.keycard.keycard :as keycard] + [status-im.contexts.quo-preview.links.link-preview :as link-preview] + [status-im.contexts.quo-preview.links.url-preview :as url-preview] + [status-im.contexts.quo-preview.links.url-preview-list :as url-preview-list] - [status-im2.contexts.quo-preview.list-items.account :as + [status-im.contexts.quo-preview.list-items.account :as account-item] - [status-im2.contexts.quo-preview.list-items.account-list-card :as + [status-im.contexts.quo-preview.list-items.account-list-card :as account-list-card] - [status-im2.contexts.quo-preview.list-items.address :as address] - [status-im2.contexts.quo-preview.list-items.channel :as channel] - [status-im2.contexts.quo-preview.list-items.community-list :as + [status-im.contexts.quo-preview.list-items.address :as address] + [status-im.contexts.quo-preview.list-items.channel :as channel] + [status-im.contexts.quo-preview.list-items.community-list :as community-list] - [status-im2.contexts.quo-preview.list-items.dapp :as dapp] - [status-im2.contexts.quo-preview.list-items.preview-lists :as preview-lists] - [status-im2.contexts.quo-preview.list-items.saved-address :as saved-address] - [status-im2.contexts.quo-preview.list-items.saved-contact-address :as saved-contact-address] - [status-im2.contexts.quo-preview.list-items.token-network :as token-network] - [status-im2.contexts.quo-preview.list-items.token-value :as token-value] - [status-im2.contexts.quo-preview.list-items.user-list :as user-list] - [status-im2.contexts.quo-preview.loaders.skeleton-list :as skeleton-list] - [status-im2.contexts.quo-preview.markdown.list :as markdown-list] - [status-im2.contexts.quo-preview.markdown.text :as text] - [status-im2.contexts.quo-preview.messages.author :as messages-author] - [status-im2.contexts.quo-preview.messages.gap :as messages-gap] - [status-im2.contexts.quo-preview.messages.system-message :as system-message] - [status-im2.contexts.quo-preview.navigation.bottom-nav-tab :as + [status-im.contexts.quo-preview.list-items.dapp :as dapp] + [status-im.contexts.quo-preview.list-items.preview-lists :as preview-lists] + [status-im.contexts.quo-preview.list-items.saved-address :as saved-address] + [status-im.contexts.quo-preview.list-items.saved-contact-address :as saved-contact-address] + [status-im.contexts.quo-preview.list-items.token-network :as token-network] + [status-im.contexts.quo-preview.list-items.token-value :as token-value] + [status-im.contexts.quo-preview.list-items.user-list :as user-list] + [status-im.contexts.quo-preview.loaders.skeleton-list :as skeleton-list] + [status-im.contexts.quo-preview.markdown.list :as markdown-list] + [status-im.contexts.quo-preview.markdown.text :as text] + [status-im.contexts.quo-preview.messages.author :as messages-author] + [status-im.contexts.quo-preview.messages.gap :as messages-gap] + [status-im.contexts.quo-preview.messages.system-message :as system-message] + [status-im.contexts.quo-preview.navigation.bottom-nav-tab :as bottom-nav-tab] - [status-im2.contexts.quo-preview.navigation.floating-shell-button :as + [status-im.contexts.quo-preview.navigation.floating-shell-button :as floating-shell-button] - [status-im2.contexts.quo-preview.navigation.page-nav :as page-nav] - [status-im2.contexts.quo-preview.navigation.top-nav :as top-nav] - [status-im2.contexts.quo-preview.notifications.activity-logs :as + [status-im.contexts.quo-preview.navigation.page-nav :as page-nav] + [status-im.contexts.quo-preview.navigation.top-nav :as top-nav] + [status-im.contexts.quo-preview.notifications.activity-logs :as activity-logs] - [status-im2.contexts.quo-preview.notifications.activity-logs-photos :as + [status-im.contexts.quo-preview.notifications.activity-logs-photos :as activity-logs-photos] - [status-im2.contexts.quo-preview.notifications.notification :as + [status-im.contexts.quo-preview.notifications.notification :as notification] - [status-im2.contexts.quo-preview.notifications.toast :as toast] - [status-im2.contexts.quo-preview.numbered-keyboard.keyboard-key :as + [status-im.contexts.quo-preview.notifications.toast :as toast] + [status-im.contexts.quo-preview.numbered-keyboard.keyboard-key :as keyboard-key] - [status-im2.contexts.quo-preview.numbered-keyboard.numbered-keyboard :as + [status-im.contexts.quo-preview.numbered-keyboard.numbered-keyboard :as numbered-keyboard] - [status-im2.contexts.quo-preview.onboarding.small-option-card :as + [status-im.contexts.quo-preview.onboarding.small-option-card :as small-option-card] - [status-im2.contexts.quo-preview.password.tips :as tips] - [status-im2.contexts.quo-preview.profile.collectible :as collectible] - [status-im2.contexts.quo-preview.profile.profile-card :as profile-card] - [status-im2.contexts.quo-preview.profile.select-profile :as select-profile] - [status-im2.contexts.quo-preview.profile.showcase-nav :as showcase-nav] - [status-im2.contexts.quo-preview.record-audio.record-audio :as record-audio] - [status-im2.contexts.quo-preview.selectors.disclaimer :as disclaimer] - [status-im2.contexts.quo-preview.selectors.filter :as filter] - [status-im2.contexts.quo-preview.selectors.react :as react] - [status-im2.contexts.quo-preview.selectors.react-selector :as react-selector] - [status-im2.contexts.quo-preview.selectors.reactions-selector :as reactions-selector] - [status-im2.contexts.quo-preview.selectors.selectors :as selectors] - [status-im2.contexts.quo-preview.settings.accounts :as accounts] - [status-im2.contexts.quo-preview.settings.category :as category] - [status-im2.contexts.quo-preview.settings.data-item :as data-item] - [status-im2.contexts.quo-preview.settings.privacy-option :as privacy-option] - [status-im2.contexts.quo-preview.settings.reorder-item :as reorder-item] - [status-im2.contexts.quo-preview.settings.section-label :as section-label] - [status-im2.contexts.quo-preview.settings.settings-item :as settings-item] - [status-im2.contexts.quo-preview.share.qr-code :as qr-code] - [status-im2.contexts.quo-preview.share.share-qr-code :as share-qr-code] - [status-im2.contexts.quo-preview.style :as style] - [status-im2.contexts.quo-preview.switcher.group-messaging-card :as group-messaging-card] - [status-im2.contexts.quo-preview.switcher.switcher-cards :as switcher-cards] - [status-im2.contexts.quo-preview.tabs.account-selector :as account-selector] - [status-im2.contexts.quo-preview.tabs.segmented-tab :as segmented] - [status-im2.contexts.quo-preview.tabs.tabs :as tabs] - [status-im2.contexts.quo-preview.tags.context-tags :as context-tags] - [status-im2.contexts.quo-preview.tags.network-tags :as network-tags] - [status-im2.contexts.quo-preview.tags.number-tag :as number-tag] - [status-im2.contexts.quo-preview.tags.permission-tag :as permission-tag] - [status-im2.contexts.quo-preview.tags.status-tags :as status-tags] - [status-im2.contexts.quo-preview.tags.summary-tag :as summary-tag] - [status-im2.contexts.quo-preview.tags.tag :as tag] - [status-im2.contexts.quo-preview.tags.tags :as tags] - [status-im2.contexts.quo-preview.tags.tiny-tag :as tiny-tag] - [status-im2.contexts.quo-preview.tags.token-tag :as token-tag] - [status-im2.contexts.quo-preview.text-combinations.channel-name :as + [status-im.contexts.quo-preview.password.tips :as tips] + [status-im.contexts.quo-preview.profile.collectible :as collectible] + [status-im.contexts.quo-preview.profile.profile-card :as profile-card] + [status-im.contexts.quo-preview.profile.select-profile :as select-profile] + [status-im.contexts.quo-preview.profile.showcase-nav :as showcase-nav] + [status-im.contexts.quo-preview.record-audio.record-audio :as record-audio] + [status-im.contexts.quo-preview.selectors.disclaimer :as disclaimer] + [status-im.contexts.quo-preview.selectors.filter :as filter] + [status-im.contexts.quo-preview.selectors.react :as react] + [status-im.contexts.quo-preview.selectors.react-selector :as react-selector] + [status-im.contexts.quo-preview.selectors.reactions-selector :as reactions-selector] + [status-im.contexts.quo-preview.selectors.selectors :as selectors] + [status-im.contexts.quo-preview.settings.accounts :as accounts] + [status-im.contexts.quo-preview.settings.category :as category] + [status-im.contexts.quo-preview.settings.data-item :as data-item] + [status-im.contexts.quo-preview.settings.privacy-option :as privacy-option] + [status-im.contexts.quo-preview.settings.reorder-item :as reorder-item] + [status-im.contexts.quo-preview.settings.section-label :as section-label] + [status-im.contexts.quo-preview.settings.settings-item :as settings-item] + [status-im.contexts.quo-preview.share.qr-code :as qr-code] + [status-im.contexts.quo-preview.share.share-qr-code :as share-qr-code] + [status-im.contexts.quo-preview.style :as style] + [status-im.contexts.quo-preview.switcher.group-messaging-card :as group-messaging-card] + [status-im.contexts.quo-preview.switcher.switcher-cards :as switcher-cards] + [status-im.contexts.quo-preview.tabs.account-selector :as account-selector] + [status-im.contexts.quo-preview.tabs.segmented-tab :as segmented] + [status-im.contexts.quo-preview.tabs.tabs :as tabs] + [status-im.contexts.quo-preview.tags.context-tags :as context-tags] + [status-im.contexts.quo-preview.tags.network-tags :as network-tags] + [status-im.contexts.quo-preview.tags.number-tag :as number-tag] + [status-im.contexts.quo-preview.tags.permission-tag :as permission-tag] + [status-im.contexts.quo-preview.tags.status-tags :as status-tags] + [status-im.contexts.quo-preview.tags.summary-tag :as summary-tag] + [status-im.contexts.quo-preview.tags.tag :as tag] + [status-im.contexts.quo-preview.tags.tags :as tags] + [status-im.contexts.quo-preview.tags.tiny-tag :as tiny-tag] + [status-im.contexts.quo-preview.tags.token-tag :as token-tag] + [status-im.contexts.quo-preview.text-combinations.channel-name :as channel-name] - [status-im2.contexts.quo-preview.text-combinations.preview :as + [status-im.contexts.quo-preview.text-combinations.preview :as text-combinations] - [status-im2.contexts.quo-preview.text-combinations.standard-title :as standard-title] - [status-im2.contexts.quo-preview.text-combinations.username :as username] - [status-im2.contexts.quo-preview.wallet.account-card :as account-card] - [status-im2.contexts.quo-preview.wallet.account-origin :as account-origin] - [status-im2.contexts.quo-preview.wallet.account-overview :as + [status-im.contexts.quo-preview.text-combinations.standard-title :as standard-title] + [status-im.contexts.quo-preview.text-combinations.username :as username] + [status-im.contexts.quo-preview.wallet.account-card :as account-card] + [status-im.contexts.quo-preview.wallet.account-origin :as account-origin] + [status-im.contexts.quo-preview.wallet.account-overview :as account-overview] - [status-im2.contexts.quo-preview.wallet.confirmation-progress :as confirmation-progress] - [status-im2.contexts.quo-preview.wallet.keypair :as keypair] - [status-im2.contexts.quo-preview.wallet.network-amount :as network-amount] - [status-im2.contexts.quo-preview.wallet.network-bridge :as network-bridge] - [status-im2.contexts.quo-preview.wallet.network-link :as network-link] - [status-im2.contexts.quo-preview.wallet.network-routing :as network-routing] - [status-im2.contexts.quo-preview.wallet.progress-bar :as progress-bar] - [status-im2.contexts.quo-preview.wallet.required-tokens :as required-tokens] - [status-im2.contexts.quo-preview.wallet.summary-info :as summary-info] - [status-im2.contexts.quo-preview.wallet.token-input :as token-input] - [status-im2.contexts.quo-preview.wallet.transaction-progress :as transaction-progress] - [status-im2.contexts.quo-preview.wallet.transaction-summary :as + [status-im.contexts.quo-preview.wallet.confirmation-progress :as confirmation-progress] + [status-im.contexts.quo-preview.wallet.keypair :as keypair] + [status-im.contexts.quo-preview.wallet.network-amount :as network-amount] + [status-im.contexts.quo-preview.wallet.network-bridge :as network-bridge] + [status-im.contexts.quo-preview.wallet.network-link :as network-link] + [status-im.contexts.quo-preview.wallet.network-routing :as network-routing] + [status-im.contexts.quo-preview.wallet.progress-bar :as progress-bar] + [status-im.contexts.quo-preview.wallet.required-tokens :as required-tokens] + [status-im.contexts.quo-preview.wallet.summary-info :as summary-info] + [status-im.contexts.quo-preview.wallet.token-input :as token-input] + [status-im.contexts.quo-preview.wallet.transaction-progress :as transaction-progress] + [status-im.contexts.quo-preview.wallet.transaction-summary :as transaction-summary] - [status-im2.contexts.quo-preview.wallet.wallet-activity :as wallet-activity] - [status-im2.contexts.quo-preview.wallet.wallet-overview :as wallet-overview] + [status-im.contexts.quo-preview.wallet.wallet-activity :as wallet-activity] + [status-im.contexts.quo-preview.wallet.wallet-overview :as wallet-overview] [utils.re-frame :as rf])) (def screens-categories diff --git a/src/status_im2/contexts/quo_preview/markdown/list.cljs b/src/status_im/contexts/quo_preview/markdown/list.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/markdown/list.cljs rename to src/status_im/contexts/quo_preview/markdown/list.cljs index d75689247f..a1475e1632 100644 --- a/src/status_im2/contexts/quo_preview/markdown/list.cljs +++ b/src/status_im/contexts/quo_preview/markdown/list.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.markdown.list +(ns status-im.contexts.quo-preview.markdown.list (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :title :type :text} diff --git a/src/status_im2/contexts/quo_preview/markdown/text.cljs b/src/status_im/contexts/quo_preview/markdown/text.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/markdown/text.cljs rename to src/status_im/contexts/quo_preview/markdown/text.cljs index 642f8cdd2b..1d95c7ca59 100644 --- a/src/status_im2/contexts/quo_preview/markdown/text.cljs +++ b/src/status_im/contexts/quo_preview/markdown/text.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.markdown.text +(ns status-im.contexts.quo-preview.markdown.text (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/messages/author.cljs b/src/status_im/contexts/quo_preview/messages/author.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/messages/author.cljs rename to src/status_im/contexts/quo_preview/messages/author.cljs index 02dadcb5dc..1575f9593f 100644 --- a/src/status_im2/contexts/quo_preview/messages/author.cljs +++ b/src/status_im/contexts/quo_preview/messages/author.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.messages.author +(ns status-im.contexts.quo-preview.messages.author (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :primary-name :type :text :limit 24} diff --git a/src/status_im2/contexts/quo_preview/messages/gap.cljs b/src/status_im/contexts/quo_preview/messages/gap.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/messages/gap.cljs rename to src/status_im/contexts/quo_preview/messages/gap.cljs index e2f4201573..a87d4fbf99 100644 --- a/src/status_im2/contexts/quo_preview/messages/gap.cljs +++ b/src/status_im/contexts/quo_preview/messages/gap.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.messages.gap +(ns status-im.contexts.quo-preview.messages.gap (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/messages/system_message.cljs b/src/status_im/contexts/quo_preview/messages/system_message.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/messages/system_message.cljs rename to src/status_im/contexts/quo_preview/messages/system_message.cljs index 49c8bdc2e8..66f38e0063 100644 --- a/src/status_im2/contexts/quo_preview/messages/system_message.cljs +++ b/src/status_im/contexts/quo_preview/messages/system_message.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.messages.system-message +(ns status-im.contexts.quo-preview.messages.system-message (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:label "Message Content" diff --git a/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs b/src/status_im/contexts/quo_preview/navigation/bottom_nav_tab.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs rename to src/status_im/contexts/quo_preview/navigation/bottom_nav_tab.cljs index e3d7a7aedb..ce5743e568 100644 --- a/src/status_im2/contexts/quo_preview/navigation/bottom_nav_tab.cljs +++ b/src/status_im/contexts/quo_preview/navigation/bottom_nav_tab.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.navigation.bottom-nav-tab +(ns status-im.contexts.quo-preview.navigation.bottom-nav-tab (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :icon diff --git a/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs b/src/status_im/contexts/quo_preview/navigation/floating_shell_button.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs rename to src/status_im/contexts/quo_preview/navigation/floating_shell_button.cljs index 38defce135..d12d6bae99 100644 --- a/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs +++ b/src/status_im/contexts/quo_preview/navigation/floating_shell_button.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.navigation.floating-shell-button +(ns status-im.contexts.quo-preview.navigation.floating-shell-button (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs b/src/status_im/contexts/quo_preview/navigation/page_nav.cljs similarity index 98% rename from src/status_im2/contexts/quo_preview/navigation/page_nav.cljs rename to src/status_im/contexts/quo_preview/navigation/page_nav.cljs index 35c941528b..ebe91b857a 100644 --- a/src/status_im2/contexts/quo_preview/navigation/page_nav.cljs +++ b/src/status_im/contexts/quo_preview/navigation/page_nav.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.navigation.page-nav +(ns status-im.contexts.quo-preview.navigation.page-nav (:require [clojure.string :as string] [quo.core :as quo] @@ -6,8 +6,8 @@ [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def ^:private networks [{:source (quo.resources/get-network :ethereum)} diff --git a/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs b/src/status_im/contexts/quo_preview/navigation/top_nav.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/navigation/top_nav.cljs rename to src/status_im/contexts/quo_preview/navigation/top_nav.cljs index 0e0afc7f00..5314bf72d9 100644 --- a/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs +++ b/src/status_im/contexts/quo_preview/navigation/top_nav.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.navigation.top-nav +(ns status-im.contexts.quo-preview.navigation.top-nav (:require [quo.core :as quo] [quo.foundations.colors :as colors] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :notification diff --git a/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs b/src/status_im/contexts/quo_preview/notifications/activity_logs.cljs similarity index 96% rename from src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs rename to src/status_im/contexts/quo_preview/notifications/activity_logs.cljs index f85510ab9b..bb4167b6d0 100644 --- a/src/status_im2/contexts/quo_preview/notifications/activity_logs.cljs +++ b/src/status_im/contexts/quo_preview/notifications/activity_logs.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.quo-preview.notifications.activity-logs +(ns status-im.contexts.quo-preview.notifications.activity-logs (:require [quo.core :as quo] [quo.foundations.colors :as colors] [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] - [status-im2.contexts.quo-preview.tags.status-tags :as status-tags])) + [status-im.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.tags.status-tags :as status-tags])) (def descriptor [{:label "Unread?" diff --git a/src/status_im2/contexts/quo_preview/notifications/activity_logs_photos.cljs b/src/status_im/contexts/quo_preview/notifications/activity_logs_photos.cljs similarity index 85% rename from src/status_im2/contexts/quo_preview/notifications/activity_logs_photos.cljs rename to src/status_im/contexts/quo_preview/notifications/activity_logs_photos.cljs index 246606eb7c..213f1bfd4a 100644 --- a/src/status_im2/contexts/quo_preview/notifications/activity_logs_photos.cljs +++ b/src/status_im/contexts/quo_preview/notifications/activity_logs_photos.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.notifications.activity-logs-photos +(ns status-im.contexts.quo-preview.notifications.activity-logs-photos (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:label "Photos Count:" diff --git a/src/status_im2/contexts/quo_preview/notifications/notification.cljs b/src/status_im/contexts/quo_preview/notifications/notification.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/notifications/notification.cljs rename to src/status_im/contexts/quo_preview/notifications/notification.cljs index 234f7fb0b2..5d1a80477d 100644 --- a/src/status_im2/contexts/quo_preview/notifications/notification.cljs +++ b/src/status_im/contexts/quo_preview/notifications/notification.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.notifications.notification +(ns status-im.contexts.quo-preview.notifications.notification (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.quo-preview.code.snippet :as snippet-preview] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.code.snippet :as snippet-preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) (defn notification-button diff --git a/src/status_im2/contexts/quo_preview/notifications/toast.cljs b/src/status_im/contexts/quo_preview/notifications/toast.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/notifications/toast.cljs rename to src/status_im/contexts/quo_preview/notifications/toast.cljs index 4b8ba0c161..9bab82f61f 100644 --- a/src/status_im2/contexts/quo_preview/notifications/toast.cljs +++ b/src/status_im/contexts/quo_preview/notifications/toast.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.notifications.toast +(ns status-im.contexts.quo-preview.notifications.toast (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview] [utils.re-frame :as rf])) (defn toast-button diff --git a/src/status_im2/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs b/src/status_im/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs rename to src/status_im/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs index 14b223923d..2160f4cb1c 100644 --- a/src/status_im2/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs +++ b/src/status_im/contexts/quo_preview/numbered_keyboard/keyboard_key.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.numbered-keyboard.keyboard-key +(ns status-im.contexts.quo-preview.numbered-keyboard.keyboard-key (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs b/src/status_im/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs rename to src/status_im/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs index 5157c5482d..292c9ed3ea 100644 --- a/src/status_im2/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs +++ b/src/status_im/contexts/quo_preview/numbered_keyboard/numbered_keyboard.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.numbered-keyboard.numbered-keyboard +(ns status-im.contexts.quo-preview.numbered-keyboard.numbered-keyboard (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/onboarding/small_option_card.cljs b/src/status_im/contexts/quo_preview/onboarding/small_option_card.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/onboarding/small_option_card.cljs rename to src/status_im/contexts/quo_preview/onboarding/small_option_card.cljs index 86a6a1faf7..f5c059e2b0 100644 --- a/src/status_im2/contexts/quo_preview/onboarding/small_option_card.cljs +++ b/src/status_im/contexts/quo_preview/onboarding/small_option_card.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.onboarding.small-option-card +(ns status-im.contexts.quo-preview.onboarding.small-option-card (:require [quo.core :as quo] [quo.foundations.colors :as colors] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :variant diff --git a/src/status_im2/contexts/quo_preview/password/tips.cljs b/src/status_im/contexts/quo_preview/password/tips.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/password/tips.cljs rename to src/status_im/contexts/quo_preview/password/tips.cljs index eb58c658de..d0cd789955 100644 --- a/src/status_im2/contexts/quo_preview/password/tips.cljs +++ b/src/status_im/contexts/quo_preview/password/tips.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.password.tips +(ns status-im.contexts.quo-preview.password.tips (:require [quo.core :as quo] [quo.foundations.colors :as colors] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :text :type :text} diff --git a/src/status_im2/contexts/quo_preview/preview.clj b/src/status_im/contexts/quo_preview/preview.clj similarity index 83% rename from src/status_im2/contexts/quo_preview/preview.clj rename to src/status_im/contexts/quo_preview/preview.clj index 45e3340ac5..e684360dc8 100644 --- a/src/status_im2/contexts/quo_preview/preview.clj +++ b/src/status_im/contexts/quo_preview/preview.clj @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.preview) +(ns status-im.contexts.quo-preview.preview) (defmacro list-comp [[the-binding seq-expr & bindings] body-expr] diff --git a/src/status_im2/contexts/quo_preview/preview.cljs b/src/status_im/contexts/quo_preview/preview.cljs similarity index 98% rename from src/status_im2/contexts/quo_preview/preview.cljs rename to src/status_im/contexts/quo_preview/preview.cljs index dd667dab6a..24d827900a 100644 --- a/src/status_im2/contexts/quo_preview/preview.cljs +++ b/src/status_im/contexts/quo_preview/preview.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.preview +(ns status-im.contexts.quo-preview.preview (:require [camel-snake-kebab.core :as camel-snake-kebab] [clojure.string :as string] @@ -10,11 +10,11 @@ [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.common :as common] - [status-im2.contexts.quo-preview.style :as style] + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.common :as common] + [status-im.contexts.quo-preview.style :as style] utils.number) - (:require-macros status-im2.contexts.quo-preview.preview)) + (:require-macros status-im.contexts.quo-preview.preview)) (defn- label-view [_ label] diff --git a/src/status_im2/contexts/quo_preview/profile/collectible.cljs b/src/status_im/contexts/quo_preview/profile/collectible.cljs similarity index 83% rename from src/status_im2/contexts/quo_preview/profile/collectible.cljs rename to src/status_im/contexts/quo_preview/profile/collectible.cljs index 57e76bd085..530352784f 100644 --- a/src/status_im2/contexts/quo_preview/profile/collectible.cljs +++ b/src/status_im/contexts/quo_preview/profile/collectible.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.profile.collectible +(ns status-im.contexts.quo-preview.profile.collectible (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (defonce test-image (resources/get-mock-image :collectible)) (def test-images (repeat 10 test-image)) diff --git a/src/status_im2/contexts/quo_preview/profile/profile_card.cljs b/src/status_im/contexts/quo_preview/profile/profile_card.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/profile/profile_card.cljs rename to src/status_im/contexts/quo_preview/profile/profile_card.cljs index ac8fb4daec..664b5e6f0a 100644 --- a/src/status_im2/contexts/quo_preview/profile/profile_card.cljs +++ b/src/status_im/contexts/quo_preview/profile/profile_card.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.profile.profile-card +(ns status-im.contexts.quo-preview.profile.profile-card (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :keycard-account? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/profile/select_profile.cljs b/src/status_im/contexts/quo_preview/profile/select_profile.cljs similarity index 83% rename from src/status_im2/contexts/quo_preview/profile/select_profile.cljs rename to src/status_im/contexts/quo_preview/profile/select_profile.cljs index 054061f418..96db065dc2 100644 --- a/src/status_im2/contexts/quo_preview/profile/select_profile.cljs +++ b/src/status_im/contexts/quo_preview/profile/select_profile.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.profile.select-profile +(ns status-im.contexts.quo-preview.profile.select-profile (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [(preview/customization-color-option) diff --git a/src/status_im2/contexts/quo_preview/profile/showcase_nav.cljs b/src/status_im/contexts/quo_preview/profile/showcase_nav.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/profile/showcase_nav.cljs rename to src/status_im/contexts/quo_preview/profile/showcase_nav.cljs index a9439925bf..c50d7517e3 100644 --- a/src/status_im2/contexts/quo_preview/profile/showcase_nav.cljs +++ b/src/status_im/contexts/quo_preview/profile/showcase_nav.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.profile.showcase-nav +(ns status-im.contexts.quo-preview.profile.showcase-nav (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def generate-nav-data (->> (range 15) diff --git a/src/status_im2/contexts/quo_preview/record_audio/record_audio.cljs b/src/status_im/contexts/quo_preview/record_audio/record_audio.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/record_audio/record_audio.cljs rename to src/status_im/contexts/quo_preview/record_audio/record_audio.cljs index ca10f93654..ec50846bd3 100644 --- a/src/status_im2/contexts/quo_preview/record_audio/record_audio.cljs +++ b/src/status_im/contexts/quo_preview/record_audio/record_audio.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.quo-preview.record-audio.record-audio +(ns status-im.contexts.quo-preview.record-audio.record-audio (:require [quo.core :as quo] [react-native.core :as rn] [react-native.permissions :as permissions] [reagent.core :as reagent] - [status-im2.common.alert.effects :as alert.effects] - [status-im2.constants :as constants] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.alert.effects :as alert.effects] + [status-im.constants :as constants] + [status-im.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs b/src/status_im/contexts/quo_preview/selectors/disclaimer.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs rename to src/status_im/contexts/quo_preview/selectors/disclaimer.cljs index 107a90c434..941cfdf0d8 100644 --- a/src/status_im2/contexts/quo_preview/selectors/disclaimer.cljs +++ b/src/status_im/contexts/quo_preview/selectors/disclaimer.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.selectors.disclaimer +(ns status-im.contexts.quo-preview.selectors.disclaimer (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :checked? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/selectors/filter.cljs b/src/status_im/contexts/quo_preview/selectors/filter.cljs similarity index 81% rename from src/status_im2/contexts/quo_preview/selectors/filter.cljs rename to src/status_im/contexts/quo_preview/selectors/filter.cljs index a4117716f7..c8ab26cdd0 100644 --- a/src/status_im2/contexts/quo_preview/selectors/filter.cljs +++ b/src/status_im/contexts/quo_preview/selectors/filter.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.selectors.filter +(ns status-im.contexts.quo-preview.selectors.filter (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? :type :boolean}]) diff --git a/src/status_im2/contexts/quo_preview/selectors/react.cljs b/src/status_im/contexts/quo_preview/selectors/react.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/selectors/react.cljs rename to src/status_im/contexts/quo_preview/selectors/react.cljs index 1bf7e01f47..335fb511e8 100644 --- a/src/status_im2/contexts/quo_preview/selectors/react.cljs +++ b/src/status_im/contexts/quo_preview/selectors/react.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.quo-preview.selectors.react +(ns status-im.contexts.quo-preview.selectors.react (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.constants :as constants] + [status-im.contexts.quo-preview.preview :as preview])) (defn- gen-quantity [max-count _] diff --git a/src/status_im2/contexts/quo_preview/selectors/react_selector.cljs b/src/status_im/contexts/quo_preview/selectors/react_selector.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/selectors/react_selector.cljs rename to src/status_im/contexts/quo_preview/selectors/react_selector.cljs index 02ebdb4eb6..7ffd90c112 100644 --- a/src/status_im2/contexts/quo_preview/selectors/react_selector.cljs +++ b/src/status_im/contexts/quo_preview/selectors/react_selector.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.quo-preview.selectors.react-selector +(ns status-im.contexts.quo-preview.selectors.react-selector (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.constants :as constants] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :clicks diff --git a/src/status_im2/contexts/quo_preview/selectors/reactions_selector.cljs b/src/status_im/contexts/quo_preview/selectors/reactions_selector.cljs similarity index 79% rename from src/status_im2/contexts/quo_preview/selectors/reactions_selector.cljs rename to src/status_im/contexts/quo_preview/selectors/reactions_selector.cljs index a95f15d3df..8ebd4a2580 100644 --- a/src/status_im2/contexts/quo_preview/selectors/reactions_selector.cljs +++ b/src/status_im/contexts/quo_preview/selectors/reactions_selector.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.selectors.reactions-selector +(ns status-im.contexts.quo-preview.selectors.reactions-selector (:require [clojure.string :as string] [quo.core :as quo] [react-native.core :as rn] [reagent.core :as r] - [status-im2.constants :as constants] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.constants :as constants] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :emoji diff --git a/src/status_im2/contexts/quo_preview/selectors/selectors.cljs b/src/status_im/contexts/quo_preview/selectors/selectors.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/selectors/selectors.cljs rename to src/status_im/contexts/quo_preview/selectors/selectors.cljs index dc1eae21a1..f9667b0f05 100644 --- a/src/status_im2/contexts/quo_preview/selectors/selectors.cljs +++ b/src/status_im/contexts/quo_preview/selectors/selectors.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.selectors.selectors +(ns status-im.contexts.quo-preview.selectors.selectors (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :disabled? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/settings/accounts.cljs b/src/status_im/contexts/quo_preview/settings/accounts.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/settings/accounts.cljs rename to src/status_im/contexts/quo_preview/settings/accounts.cljs index c0d7d9eca8..5e5f3fc497 100644 --- a/src/status_im2/contexts/quo_preview/settings/accounts.cljs +++ b/src/status_im/contexts/quo_preview/settings/accounts.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.settings.accounts +(ns status-im.contexts.quo-preview.settings.accounts (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [(preview/customization-color-option) diff --git a/src/status_im2/contexts/quo_preview/settings/category.cljs b/src/status_im/contexts/quo_preview/settings/category.cljs similarity index 88% rename from src/status_im2/contexts/quo_preview/settings/category.cljs rename to src/status_im/contexts/quo_preview/settings/category.cljs index 6ce1dc5267..8605ec5570 100644 --- a/src/status_im2/contexts/quo_preview/settings/category.cljs +++ b/src/status_im/contexts/quo_preview/settings/category.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.settings.category +(ns status-im.contexts.quo-preview.settings.category (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (defn create-item-array [n] diff --git a/src/status_im2/contexts/quo_preview/settings/data_item.cljs b/src/status_im/contexts/quo_preview/settings/data_item.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/settings/data_item.cljs rename to src/status_im/contexts/quo_preview/settings/data_item.cljs index 1df25f498f..16d4767a6d 100644 --- a/src/status_im2/contexts/quo_preview/settings/data_item.cljs +++ b/src/status_im/contexts/quo_preview/settings/data_item.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.settings.data-item +(ns status-im.contexts.quo-preview.settings.data-item (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/settings/privacy_option.cljs b/src/status_im/contexts/quo_preview/settings/privacy_option.cljs similarity index 96% rename from src/status_im2/contexts/quo_preview/settings/privacy_option.cljs rename to src/status_im/contexts/quo_preview/settings/privacy_option.cljs index 7776e99693..7c9ae158fc 100644 --- a/src/status_im2/contexts/quo_preview/settings/privacy_option.cljs +++ b/src/status_im/contexts/quo_preview/settings/privacy_option.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.settings.privacy-option +(ns status-im.contexts.quo-preview.settings.privacy-option (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :header :type :text} diff --git a/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs b/src/status_im/contexts/quo_preview/settings/reorder_item.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/settings/reorder_item.cljs rename to src/status_im/contexts/quo_preview/settings/reorder_item.cljs index ffcb7ac0af..1e674f79d3 100644 --- a/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs +++ b/src/status_im/contexts/quo_preview/settings/reorder_item.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.settings.reorder-item +(ns status-im.contexts.quo-preview.settings.reorder-item (:require [quo.components.settings.reorder-item.types :as types] [quo.core :as quo] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def mock-data [{:id 1 diff --git a/src/status_im2/contexts/quo_preview/settings/section_label.cljs b/src/status_im/contexts/quo_preview/settings/section_label.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/settings/section_label.cljs rename to src/status_im/contexts/quo_preview/settings/section_label.cljs index d07675395a..d7b201b185 100644 --- a/src/status_im2/contexts/quo_preview/settings/section_label.cljs +++ b/src/status_im/contexts/quo_preview/settings/section_label.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.settings.section-label +(ns status-im.contexts.quo-preview.settings.section-label (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def ^:private descriptor [{:key :section diff --git a/src/status_im2/contexts/quo_preview/settings/settings_item.cljs b/src/status_im/contexts/quo_preview/settings/settings_item.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/settings/settings_item.cljs rename to src/status_im/contexts/quo_preview/settings/settings_item.cljs index fe711d2239..409a266138 100644 --- a/src/status_im2/contexts/quo_preview/settings/settings_item.cljs +++ b/src/status_im/contexts/quo_preview/settings/settings_item.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.settings.settings-item +(ns status-im.contexts.quo-preview.settings.settings-item (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :title diff --git a/src/status_im2/contexts/quo_preview/share/qr_code.cljs b/src/status_im/contexts/quo_preview/share/qr_code.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/share/qr_code.cljs rename to src/status_im/contexts/quo_preview/share/qr_code.cljs index e6eb59528f..bb4e3f9c4f 100644 --- a/src/status_im2/contexts/quo_preview/share/qr_code.cljs +++ b/src/status_im/contexts/quo_preview/share/qr_code.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.share.qr-code +(ns status-im.contexts.quo-preview.share.qr-code (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview] [utils.image-server :as image-server] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/quo_preview/share/share_qr_code.cljs b/src/status_im/contexts/quo_preview/share/share_qr_code.cljs similarity index 97% rename from src/status_im2/contexts/quo_preview/share/share_qr_code.cljs rename to src/status_im/contexts/quo_preview/share/share_qr_code.cljs index d107c47c05..d85022b9fc 100644 --- a/src/status_im2/contexts/quo_preview/share/share_qr_code.cljs +++ b/src/status_im/contexts/quo_preview/share/share_qr_code.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.share.share-qr-code +(ns status-im.contexts.quo-preview.share.share-qr-code (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview] [utils.image-server :as image-server] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/quo_preview/style.cljs b/src/status_im/contexts/quo_preview/style.cljs similarity index 99% rename from src/status_im2/contexts/quo_preview/style.cljs rename to src/status_im/contexts/quo_preview/style.cljs index 6f20d5a832..98711df4c3 100644 --- a/src/status_im2/contexts/quo_preview/style.cljs +++ b/src/status_im/contexts/quo_preview/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.quo-preview.style +(ns status-im.contexts.quo-preview.style (:require [quo.foundations.colors :as colors] [quo.foundations.typography :as typography])) diff --git a/src/status_im2/contexts/quo_preview/switcher/group_messaging_card.cljs b/src/status_im/contexts/quo_preview/switcher/group_messaging_card.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/switcher/group_messaging_card.cljs rename to src/status_im/contexts/quo_preview/switcher/group_messaging_card.cljs index a9537b5567..4a14c78425 100644 --- a/src/status_im2/contexts/quo_preview/switcher/group_messaging_card.cljs +++ b/src/status_im/contexts/quo_preview/switcher/group_messaging_card.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.switcher.group-messaging-card +(ns status-im.contexts.quo-preview.switcher.group-messaging-card (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :title :type :text} diff --git a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs b/src/status_im/contexts/quo_preview/switcher/switcher_cards.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs rename to src/status_im/contexts/quo_preview/switcher/switcher_cards.cljs index a50e88ba70..6e75ef9f27 100644 --- a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs +++ b/src/status_im/contexts/quo_preview/switcher/switcher_cards.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.quo-preview.switcher.switcher-cards +(ns status-im.contexts.quo-preview.switcher.switcher-cards (:require [quo.foundations.colors :as colors] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.constants :as constants] - [status-im2.contexts.quo-preview.preview :as preview] - [status-im2.contexts.shell.jump-to.components.switcher-cards.view :as switcher-cards] - [status-im2.contexts.shell.jump-to.constants :as shell.constants])) + [status-im.common.resources :as resources] + [status-im.constants :as constants] + [status-im.contexts.quo-preview.preview :as preview] + [status-im.contexts.shell.jump-to.components.switcher-cards.view :as switcher-cards] + [status-im.contexts.shell.jump-to.constants :as shell.constants])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs b/src/status_im/contexts/quo_preview/tabs/account_selector.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/tabs/account_selector.cljs rename to src/status_im/contexts/quo_preview/tabs/account_selector.cljs index 1377b7913b..1b9c7b0a48 100644 --- a/src/status_im2/contexts/quo_preview/tabs/account_selector.cljs +++ b/src/status_im/contexts/quo_preview/tabs/account_selector.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.tabs.account-selector +(ns status-im.contexts.quo-preview.tabs.account-selector (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :show-label? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs b/src/status_im/contexts/quo_preview/tabs/segmented_tab.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs rename to src/status_im/contexts/quo_preview/tabs/segmented_tab.cljs index cf27684905..659895e28d 100644 --- a/src/status_im2/contexts/quo_preview/tabs/segmented_tab.cljs +++ b/src/status_im/contexts/quo_preview/tabs/segmented_tab.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.tabs.segmented-tab +(ns status-im.contexts.quo-preview.tabs.segmented-tab (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/tabs/tabs.cljs b/src/status_im/contexts/quo_preview/tabs/tabs.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/tabs/tabs.cljs rename to src/status_im/contexts/quo_preview/tabs/tabs.cljs index b346f08ee8..b397eb44bd 100644 --- a/src/status_im2/contexts/quo_preview/tabs/tabs.cljs +++ b/src/status_im/contexts/quo_preview/tabs/tabs.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.tabs.tabs +(ns status-im.contexts.quo-preview.tabs.tabs (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/tags/context_tags.cljs b/src/status_im/contexts/quo_preview/tags/context_tags.cljs similarity index 97% rename from src/status_im2/contexts/quo_preview/tags/context_tags.cljs rename to src/status_im/contexts/quo_preview/tags/context_tags.cljs index a8b1bd35cc..b7aa81a217 100644 --- a/src/status_im2/contexts/quo_preview/tags/context_tags.cljs +++ b/src/status_im/contexts/quo_preview/tags/context_tags.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.tags.context-tags +(ns status-im.contexts.quo-preview.tags.context-tags (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def example-pk "0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917") diff --git a/src/status_im2/contexts/quo_preview/tags/network_tags.cljs b/src/status_im/contexts/quo_preview/tags/network_tags.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/tags/network_tags.cljs rename to src/status_im/contexts/quo_preview/tags/network_tags.cljs index fb4462d534..a09090c9b6 100644 --- a/src/status_im2/contexts/quo_preview/tags/network_tags.cljs +++ b/src/status_im/contexts/quo_preview/tags/network_tags.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.tags.network-tags +(ns status-im.contexts.quo-preview.tags.network-tags (:require [quo.core :as quo] [quo.foundations.resources :as resources] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def community-networks [[{:source (resources/get-network :ethereum)}] diff --git a/src/status_im2/contexts/quo_preview/tags/number_tag.cljs b/src/status_im/contexts/quo_preview/tags/number_tag.cljs similarity index 90% rename from src/status_im2/contexts/quo_preview/tags/number_tag.cljs rename to src/status_im/contexts/quo_preview/tags/number_tag.cljs index cc5a2378d4..c60677b59f 100644 --- a/src/status_im2/contexts/quo_preview/tags/number_tag.cljs +++ b/src/status_im/contexts/quo_preview/tags/number_tag.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.tags.number-tag +(ns status-im.contexts.quo-preview.tags.number-tag (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs b/src/status_im/contexts/quo_preview/tags/permission_tag.cljs similarity index 98% rename from src/status_im2/contexts/quo_preview/tags/permission_tag.cljs rename to src/status_im/contexts/quo_preview/tags/permission_tag.cljs index 5f063dda9e..daa214f576 100644 --- a/src/status_im2/contexts/quo_preview/tags/permission_tag.cljs +++ b/src/status_im/contexts/quo_preview/tags/permission_tag.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.tags.permission-tag +(ns status-im.contexts.quo-preview.tags.permission-tag (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/tags/status_tags.cljs b/src/status_im/contexts/quo_preview/tags/status_tags.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/tags/status_tags.cljs rename to src/status_im/contexts/quo_preview/tags/status_tags.cljs index 3d8ee495f2..73ae38030e 100644 --- a/src/status_im2/contexts/quo_preview/tags/status_tags.cljs +++ b/src/status_im/contexts/quo_preview/tags/status_tags.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.tags.status-tags +(ns status-im.contexts.quo-preview.tags.status-tags (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.i18n :as i18n])) (def status-tags-options diff --git a/src/status_im2/contexts/quo_preview/tags/summary_tag.cljs b/src/status_im/contexts/quo_preview/tags/summary_tag.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/tags/summary_tag.cljs rename to src/status_im/contexts/quo_preview/tags/summary_tag.cljs index cd52b315a9..b8925ae39a 100644 --- a/src/status_im2/contexts/quo_preview/tags/summary_tag.cljs +++ b/src/status_im/contexts/quo_preview/tags/summary_tag.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.tags.summary-tag +(ns status-im.contexts.quo-preview.tags.summary-tag (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (defn data [type] diff --git a/src/status_im2/contexts/quo_preview/tags/tag.cljs b/src/status_im/contexts/quo_preview/tags/tag.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/tags/tag.cljs rename to src/status_im/contexts/quo_preview/tags/tag.cljs index 4bc00bcf7f..9a049c1cf2 100644 --- a/src/status_im2/contexts/quo_preview/tags/tag.cljs +++ b/src/status_im/contexts/quo_preview/tags/tag.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.tags.tag +(ns status-im.contexts.quo-preview.tags.tag (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/tags/tags.cljs b/src/status_im/contexts/quo_preview/tags/tags.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/tags/tags.cljs rename to src/status_im/contexts/quo_preview/tags/tags.cljs index 4f71b68e1e..33b55012b7 100644 --- a/src/status_im2/contexts/quo_preview/tags/tags.cljs +++ b/src/status_im/contexts/quo_preview/tags/tags.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.tags.tags +(ns status-im.contexts.quo-preview.tags.tags (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/tags/tiny_tag.cljs b/src/status_im/contexts/quo_preview/tags/tiny_tag.cljs similarity index 83% rename from src/status_im2/contexts/quo_preview/tags/tiny_tag.cljs rename to src/status_im/contexts/quo_preview/tags/tiny_tag.cljs index b723c498b0..994f97662c 100644 --- a/src/status_im2/contexts/quo_preview/tags/tiny_tag.cljs +++ b/src/status_im/contexts/quo_preview/tags/tiny_tag.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.tags.tiny-tag +(ns status-im.contexts.quo-preview.tags.tiny-tag (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :blur? :type :boolean} diff --git a/src/status_im2/contexts/quo_preview/tags/token_tag.cljs b/src/status_im/contexts/quo_preview/tags/token_tag.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/tags/token_tag.cljs rename to src/status_im/contexts/quo_preview/tags/token_tag.cljs index 805ffbfd35..dadfb24ef9 100644 --- a/src/status_im2/contexts/quo_preview/tags/token_tag.cljs +++ b/src/status_im/contexts/quo_preview/tags/token_tag.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.tags.token-tag +(ns status-im.contexts.quo-preview.tags.token-tag (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :size diff --git a/src/status_im2/contexts/quo_preview/text_combinations/channel_name.cljs b/src/status_im/contexts/quo_preview/text_combinations/channel_name.cljs similarity index 83% rename from src/status_im2/contexts/quo_preview/text_combinations/channel_name.cljs rename to src/status_im/contexts/quo_preview/text_combinations/channel_name.cljs index f4976b2694..7b9d001592 100644 --- a/src/status_im2/contexts/quo_preview/text_combinations/channel_name.cljs +++ b/src/status_im/contexts/quo_preview/text_combinations/channel_name.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.quo-preview.text-combinations.channel-name +(ns status-im.contexts.quo-preview.text-combinations.channel-name (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs b/src/status_im/contexts/quo_preview/text_combinations/preview.cljs similarity index 86% rename from src/status_im2/contexts/quo_preview/text_combinations/preview.cljs rename to src/status_im/contexts/quo_preview/text_combinations/preview.cljs index 661b39c07e..7d8b0816b0 100644 --- a/src/status_im2/contexts/quo_preview/text_combinations/preview.cljs +++ b/src/status_im/contexts/quo_preview/text_combinations/preview.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.text-combinations.preview +(ns status-im.contexts.quo-preview.text-combinations.preview (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :title :type :text} diff --git a/src/status_im2/contexts/quo_preview/text_combinations/standard_title.cljs b/src/status_im/contexts/quo_preview/text_combinations/standard_title.cljs similarity index 93% rename from src/status_im2/contexts/quo_preview/text_combinations/standard_title.cljs rename to src/status_im/contexts/quo_preview/text_combinations/standard_title.cljs index 87e249a9aa..9e31cb5543 100644 --- a/src/status_im2/contexts/quo_preview/text_combinations/standard_title.cljs +++ b/src/status_im/contexts/quo_preview/text_combinations/standard_title.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.quo-preview.text-combinations.standard-title +(ns status-im.contexts.quo-preview.text-combinations.standard-title (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :title :type :text} diff --git a/src/status_im2/contexts/quo_preview/text_combinations/username.cljs b/src/status_im/contexts/quo_preview/text_combinations/username.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/text_combinations/username.cljs rename to src/status_im/contexts/quo_preview/text_combinations/username.cljs index 5db53001da..4456c51643 100644 --- a/src/status_im2/contexts/quo_preview/text_combinations/username.cljs +++ b/src/status_im/contexts/quo_preview/text_combinations/username.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.quo-preview.text-combinations.username +(ns status-im.contexts.quo-preview.text-combinations.username (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :name-type diff --git a/src/status_im2/contexts/quo_preview/wallet/account_card.cljs b/src/status_im/contexts/quo_preview/wallet/account_card.cljs similarity index 95% rename from src/status_im2/contexts/quo_preview/wallet/account_card.cljs rename to src/status_im/contexts/quo_preview/wallet/account_card.cljs index a1fd1ae419..1149cb4598 100644 --- a/src/status_im2/contexts/quo_preview/wallet/account_card.cljs +++ b/src/status_im/contexts/quo_preview/wallet/account_card.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.account-card +(ns status-im.contexts.quo-preview.wallet.account-card (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview] + [status-im.contexts.quo-preview.preview :as preview] [utils.collection])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/wallet/account_origin.cljs b/src/status_im/contexts/quo_preview/wallet/account_origin.cljs similarity index 84% rename from src/status_im2/contexts/quo_preview/wallet/account_origin.cljs rename to src/status_im/contexts/quo_preview/wallet/account_origin.cljs index 725db6f29c..69f0aee9f1 100644 --- a/src/status_im2/contexts/quo_preview/wallet/account_origin.cljs +++ b/src/status_im/contexts/quo_preview/wallet/account_origin.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.account-origin +(ns status-im.contexts.quo-preview.wallet.account-origin (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:type :select diff --git a/src/status_im2/contexts/quo_preview/wallet/account_overview.cljs b/src/status_im/contexts/quo_preview/wallet/account_overview.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/wallet/account_overview.cljs rename to src/status_im/contexts/quo_preview/wallet/account_overview.cljs index 5867c1cebf..e1cd3ec36f 100644 --- a/src/status_im2/contexts/quo_preview/wallet/account_overview.cljs +++ b/src/status_im/contexts/quo_preview/wallet/account_overview.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.wallet.account-overview +(ns status-im.contexts.quo-preview.wallet.account-overview (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :time-frame-string :type :text} diff --git a/src/status_im2/contexts/quo_preview/wallet/confirmation_progress.cljs b/src/status_im/contexts/quo_preview/wallet/confirmation_progress.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/wallet/confirmation_progress.cljs rename to src/status_im/contexts/quo_preview/wallet/confirmation_progress.cljs index 5a5a99f7a3..68efbaf326 100644 --- a/src/status_im2/contexts/quo_preview/wallet/confirmation_progress.cljs +++ b/src/status_im/contexts/quo_preview/wallet/confirmation_progress.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.confirmation-progress +(ns status-im.contexts.quo-preview.wallet.confirmation-progress (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:type :text diff --git a/src/status_im2/contexts/quo_preview/wallet/keypair.cljs b/src/status_im/contexts/quo_preview/wallet/keypair.cljs similarity index 97% rename from src/status_im2/contexts/quo_preview/wallet/keypair.cljs rename to src/status_im/contexts/quo_preview/wallet/keypair.cljs index cd3983dbfd..cfc58a82d8 100644 --- a/src/status_im2/contexts/quo_preview/wallet/keypair.cljs +++ b/src/status_im/contexts/quo_preview/wallet/keypair.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.keypair +(ns status-im.contexts.quo-preview.wallet.keypair (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def accounts [{:account-props {:customization-color :turquoise diff --git a/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs b/src/status_im/contexts/quo_preview/wallet/network_amount.cljs similarity index 82% rename from src/status_im2/contexts/quo_preview/wallet/network_amount.cljs rename to src/status_im/contexts/quo_preview/wallet/network_amount.cljs index ef67cec42d..bce247bec6 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs +++ b/src/status_im/contexts/quo_preview/wallet/network_amount.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.wallet.network-amount +(ns status-im.contexts.quo-preview.wallet.network-amount (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/wallet/network_bridge.cljs b/src/status_im/contexts/quo_preview/wallet/network_bridge.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/wallet/network_bridge.cljs rename to src/status_im/contexts/quo_preview/wallet/network_bridge.cljs index 940881e9a7..3f34786208 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_bridge.cljs +++ b/src/status_im/contexts/quo_preview/wallet/network_bridge.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.wallet.network-bridge +(ns status-im.contexts.quo-preview.wallet.network-bridge (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/wallet/network_link.cljs b/src/status_im/contexts/quo_preview/wallet/network_link.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/wallet/network_link.cljs rename to src/status_im/contexts/quo_preview/wallet/network_link.cljs index c81181f8d8..344ac86525 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_link.cljs +++ b/src/status_im/contexts/quo_preview/wallet/network_link.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.quo-preview.wallet.network-link +(ns status-im.contexts.quo-preview.wallet.network-link (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def networks [{:key :ethereum diff --git a/src/status_im2/contexts/quo_preview/wallet/network_routing.cljs b/src/status_im/contexts/quo_preview/wallet/network_routing.cljs similarity index 97% rename from src/status_im2/contexts/quo_preview/wallet/network_routing.cljs rename to src/status_im/contexts/quo_preview/wallet/network_routing.cljs index c20a75c6e3..feb4f588d9 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_routing.cljs +++ b/src/status_im/contexts/quo_preview/wallet/network_routing.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.network-routing +(ns status-im.contexts.quo-preview.wallet.network-routing (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :number-networks diff --git a/src/status_im2/contexts/quo_preview/wallet/progress_bar.cljs b/src/status_im/contexts/quo_preview/wallet/progress_bar.cljs similarity index 89% rename from src/status_im2/contexts/quo_preview/wallet/progress_bar.cljs rename to src/status_im/contexts/quo_preview/wallet/progress_bar.cljs index eec0741ed4..d3bf0aa982 100644 --- a/src/status_im2/contexts/quo_preview/wallet/progress_bar.cljs +++ b/src/status_im/contexts/quo_preview/wallet/progress_bar.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.progress-bar +(ns status-im.contexts.quo-preview.wallet.progress-bar (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :state diff --git a/src/status_im2/contexts/quo_preview/wallet/required_tokens.cljs b/src/status_im/contexts/quo_preview/wallet/required_tokens.cljs similarity index 87% rename from src/status_im2/contexts/quo_preview/wallet/required_tokens.cljs rename to src/status_im/contexts/quo_preview/wallet/required_tokens.cljs index 1480788176..5c57508c1d 100644 --- a/src/status_im2/contexts/quo_preview/wallet/required_tokens.cljs +++ b/src/status_im/contexts/quo_preview/wallet/required_tokens.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.required-tokens +(ns status-im.contexts.quo-preview.wallet.required-tokens (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :type diff --git a/src/status_im2/contexts/quo_preview/wallet/summary_info.cljs b/src/status_im/contexts/quo_preview/wallet/summary_info.cljs similarity index 92% rename from src/status_im2/contexts/quo_preview/wallet/summary_info.cljs rename to src/status_im/contexts/quo_preview/wallet/summary_info.cljs index d0a90da0be..06fc13034b 100644 --- a/src/status_im2/contexts/quo_preview/wallet/summary_info.cljs +++ b/src/status_im/contexts/quo_preview/wallet/summary_info.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.summary-info +(ns status-im.contexts.quo-preview.wallet.summary-info (:require [quo.core :as quo] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/wallet/token_input.cljs b/src/status_im/contexts/quo_preview/wallet/token_input.cljs similarity index 91% rename from src/status_im2/contexts/quo_preview/wallet/token_input.cljs rename to src/status_im/contexts/quo_preview/wallet/token_input.cljs index 97701ed5c0..3de5659a58 100644 --- a/src/status_im2/contexts/quo_preview/wallet/token_input.cljs +++ b/src/status_im/contexts/quo_preview/wallet/token_input.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.token-input +(ns status-im.contexts.quo-preview.wallet.token-input (:require [quo.core :as quo] [quo.foundations.resources :as resources] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def networks [{:source (resources/get-network :arbitrum)} diff --git a/src/status_im2/contexts/quo_preview/wallet/transaction_progress.cljs b/src/status_im/contexts/quo_preview/wallet/transaction_progress.cljs similarity index 96% rename from src/status_im2/contexts/quo_preview/wallet/transaction_progress.cljs rename to src/status_im/contexts/quo_preview/wallet/transaction_progress.cljs index ad66ad4197..4611300451 100644 --- a/src/status_im2/contexts/quo_preview/wallet/transaction_progress.cljs +++ b/src/status_im/contexts/quo_preview/wallet/transaction_progress.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.wallet.transaction-progress +(ns status-im.contexts.quo-preview.wallet.transaction-progress (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:type :text diff --git a/src/status_im2/contexts/quo_preview/wallet/transaction_summary.cljs b/src/status_im/contexts/quo_preview/wallet/transaction_summary.cljs similarity index 97% rename from src/status_im2/contexts/quo_preview/wallet/transaction_summary.cljs rename to src/status_im/contexts/quo_preview/wallet/transaction_summary.cljs index f82f256ed1..8441d93b11 100644 --- a/src/status_im2/contexts/quo_preview/wallet/transaction_summary.cljs +++ b/src/status_im/contexts/quo_preview/wallet/transaction_summary.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.quo-preview.wallet.transaction-summary +(ns status-im.contexts.quo-preview.wallet.transaction-summary (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def asset-snt {:size 24 diff --git a/src/status_im2/contexts/quo_preview/wallet/wallet_activity.cljs b/src/status_im/contexts/quo_preview/wallet/wallet_activity.cljs similarity index 97% rename from src/status_im2/contexts/quo_preview/wallet/wallet_activity.cljs rename to src/status_im/contexts/quo_preview/wallet/wallet_activity.cljs index 15bcfef6f6..fdbe8cb130 100644 --- a/src/status_im2/contexts/quo_preview/wallet/wallet_activity.cljs +++ b/src/status_im/contexts/quo_preview/wallet/wallet_activity.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.quo-preview.wallet.wallet-activity +(ns status-im.contexts.quo-preview.wallet.wallet-activity (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.common.resources :as resources] + [status-im.contexts.quo-preview.preview :as preview])) (def asset-snt {:size 24 diff --git a/src/status_im2/contexts/quo_preview/wallet/wallet_overview.cljs b/src/status_im/contexts/quo_preview/wallet/wallet_overview.cljs similarity index 94% rename from src/status_im2/contexts/quo_preview/wallet/wallet_overview.cljs rename to src/status_im/contexts/quo_preview/wallet/wallet_overview.cljs index 2b535f52e1..7e7fd3d22c 100644 --- a/src/status_im2/contexts/quo_preview/wallet/wallet_overview.cljs +++ b/src/status_im/contexts/quo_preview/wallet/wallet_overview.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.quo-preview.wallet.wallet-overview +(ns status-im.contexts.quo-preview.wallet.wallet-overview (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.preview :as preview])) + [status-im.contexts.quo-preview.preview :as preview])) (def descriptor [{:key :state diff --git a/src/status_im2/contexts/shell/activity_center/drawer/view.cljs b/src/status_im/contexts/shell/activity_center/drawer/view.cljs similarity index 94% rename from src/status_im2/contexts/shell/activity_center/drawer/view.cljs rename to src/status_im/contexts/shell/activity_center/drawer/view.cljs index 0f2491ea5f..8e9d6db269 100644 --- a/src/status_im2/contexts/shell/activity_center/drawer/view.cljs +++ b/src/status_im/contexts/shell/activity_center/drawer/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.activity-center.drawer.view +(ns status-im.contexts.shell.activity-center.drawer.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] diff --git a/src/status_im2/contexts/shell/activity_center/events.cljs b/src/status_im/contexts/shell/activity_center/events.cljs similarity index 99% rename from src/status_im2/contexts/shell/activity_center/events.cljs rename to src/status_im/contexts/shell/activity_center/events.cljs index 9fd29eb86a..a7fadcbfef 100644 --- a/src/status_im2/contexts/shell/activity_center/events.cljs +++ b/src/status_im/contexts/shell/activity_center/events.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.shell.activity-center.events +(ns status-im.contexts.shell.activity-center.events (:require [legacy.status-im.data-store.activities :as activities] [legacy.status-im.data-store.chats :as data-store.chats] [quo.foundations.colors :as colors] [re-frame.core :as re-frame] - [status-im2.common.toasts.events :as toasts] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification-types :as types] + [status-im.common.toasts.events :as toasts] + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification-types :as types] [taoensso.timbre :as log] [utils.collection :as collection] [utils.i18n :as i18n] diff --git a/src/status_im2/contexts/shell/activity_center/events_test.cljs b/src/status_im/contexts/shell/activity_center/events_test.cljs similarity index 97% rename from src/status_im2/contexts/shell/activity_center/events_test.cljs rename to src/status_im/contexts/shell/activity_center/events_test.cljs index 8f0028e24a..32f8100fc1 100644 --- a/src/status_im2/contexts/shell/activity_center/events_test.cljs +++ b/src/status_im/contexts/shell/activity_center/events_test.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.shell.activity-center.events-test +(ns status-im.contexts.shell.activity-center.events-test (:require [cljs.test :refer [deftest is testing]] matcher-combinators.test - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.events :as events] - [status-im2.contexts.shell.activity-center.notification-types :as types] + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.events :as events] + [status-im.contexts.shell.activity-center.notification-types :as types] [test-helpers.unit :as h])) (h/use-log-fixture) @@ -285,8 +285,8 @@ [new-notif-2 ; will be removed because it's read new-notif-3 ; will be inserted new-notif-4 ; will be ignored because it's read - (assoc notif-5 :deleted true) ; will be removed - ]))))) + (assoc notif-5 :deleted true)]))))) ; will be removed + (testing "Contact request tab + All filter" (let [notif-1 {:id "0x1" :read true :type types/contact-request} @@ -308,8 +308,8 @@ [new-notif-2 ; will be updated new-notif-3 ; will be inserted new-notif-4 ; will be ignored because it's not a contact request - (assoc notif-5 :deleted true) ; will be removed - ]))))) + (assoc notif-5 :deleted true)]))))) ; will be removed + (testing "Contact request tab + Unread filter" (let [notif-1 {:id "0x1" :read false :type types/contact-request} @@ -335,8 +335,8 @@ new-notif-3 ; will be inserted new-notif-4 ; will be ignored because it's read new-notif-5 ; will be ignored because it's not a contact request - (assoc notif-6 :deleted true) ; will be removed - ]))))) + (assoc notif-6 :deleted true)]))))) ; will be removed + ;; Sorting by timestamp and ID is compatible with what the backend does when ;; returning paginated results. @@ -371,8 +371,8 @@ {:notifications [notif-3 ; will be ignored because it's not a contact request notif-2 ; will be removed - notif-1 ; will be ignored because it's not from the same author - ]}}}] + notif-1]}}}] ; will be ignored because it's not from the same author + (is (match? {:db {:activity-center {:notifications [notif-3 notif-1]}}} (events/notifications-remove-pending-contact-request cofx author)))))) diff --git a/src/status_im2/contexts/shell/activity_center/header/view.cljs b/src/status_im/contexts/shell/activity_center/header/view.cljs similarity index 88% rename from src/status_im2/contexts/shell/activity_center/header/view.cljs rename to src/status_im/contexts/shell/activity_center/header/view.cljs index 27f11735c3..8a40d42ab6 100644 --- a/src/status_im2/contexts/shell/activity_center/header/view.cljs +++ b/src/status_im/contexts/shell/activity_center/header/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.shell.activity-center.header.view +(ns status-im.contexts.shell.activity-center.header.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.shell.activity-center.drawer.view :as drawer] - [status-im2.contexts.shell.activity-center.style :as style] - [status-im2.contexts.shell.activity-center.tabs.view :as tabs] + [status-im.contexts.shell.activity-center.drawer.view :as drawer] + [status-im.contexts.shell.activity-center.style :as style] + [status-im.contexts.shell.activity-center.tabs.view :as tabs] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs b/src/status_im/contexts/shell/activity_center/notification/admin/view.cljs similarity index 94% rename from src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/admin/view.cljs index 97224b8c5b..7bfe39151e 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/admin/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/admin/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.shell.activity-center.notification.admin.view +(ns status-im.contexts.shell.activity-center.notification.admin.view (:require [quo.core :as quo] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs b/src/status_im/contexts/shell/activity_center/notification/common/style.cljs similarity index 95% rename from src/status_im2/contexts/shell/activity_center/notification/common/style.cljs rename to src/status_im/contexts/shell/activity_center/notification/common/style.cljs index a16075b536..1a54e11691 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/common/style.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/common/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.activity-center.notification.common.style +(ns status-im.contexts.shell.activity-center.notification.common.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs b/src/status_im/contexts/shell/activity_center/notification/common/view.cljs similarity index 96% rename from src/status_im2/contexts/shell/activity_center/notification/common/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/common/view.cljs index 1342f274cc..f8a65ca7e7 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/common/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/common/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.shell.activity-center.notification.common.view +(ns status-im.contexts.shell.activity-center.notification.common.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.gesture :as gesture] - [status-im2.contexts.profile.utils :as profile.utils] - [status-im2.contexts.shell.activity-center.notification.common.style :as style] + [status-im.contexts.profile.utils :as profile.utils] + [status-im.contexts.shell.activity-center.notification.common.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs b/src/status_im/contexts/shell/activity_center/notification/community_kicked/view.cljs similarity index 88% rename from src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/community_kicked/view.cljs index 2584ce48a2..0fc0021d6a 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/community_kicked/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/community_kicked/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.shell.activity-center.notification.community-kicked.view +(ns status-im.contexts.shell.activity-center.notification.community-kicked.view (:require [quo.core :as quo] [react-native.gesture :as gesture] - [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs b/src/status_im/contexts/shell/activity_center/notification/community_request/view.cljs similarity index 92% rename from src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/community_request/view.cljs index b14ffc9308..147c62a69e 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/community_request/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/community_request/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.shell.activity-center.notification.community-request.view +(ns status-im.contexts.shell.activity-center.notification.community-request.view (:require [quo.core :as quo] [react-native.gesture :as gesture] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/contact_requests/events.cljs b/src/status_im/contexts/shell/activity_center/notification/contact_requests/events.cljs similarity index 94% rename from src/status_im2/contexts/shell/activity_center/notification/contact_requests/events.cljs rename to src/status_im/contexts/shell/activity_center/notification/contact_requests/events.cljs index 65c5bb041e..2d504d0245 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/contact_requests/events.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/contact_requests/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.activity-center.notification.contact-requests.events +(ns status-im.contexts.shell.activity-center.notification.contact-requests.events (:require [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs b/src/status_im/contexts/shell/activity_center/notification/contact_requests/view.cljs similarity index 95% rename from src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/contact_requests/view.cljs index 7dd62d86d7..1eba8965f8 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/contact_requests/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/contact_requests/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.shell.activity-center.notification.contact-requests.view +(ns status-im.contexts.shell.activity-center.notification.contact-requests.view (:require [quo.core :as quo] [react-native.gesture :as gesture] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs b/src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs similarity index 97% rename from src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs index 8a518a72e5..1b091ff1a3 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/contact_verification/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.shell.activity-center.notification.contact-verification.view +(ns status-im.contexts.shell.activity-center.notification.contact-verification.view (:require [clojure.string :as string] [quo.core :as quo] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs b/src/status_im/contexts/shell/activity_center/notification/membership/view.cljs similarity index 93% rename from src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/membership/view.cljs index df3817369b..11cd253bde 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/membership/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.shell.activity-center.notification.membership.view +(ns status-im.contexts.shell.activity-center.notification.membership.view (:require [quo.core :as quo] [react-native.gesture :as gesture] - [status-im2.contexts.shell.activity-center.notification.common.style :as common-style] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] + [status-im.contexts.shell.activity-center.notification.common.style :as common-style] + [status-im.contexts.shell.activity-center.notification.common.view :as common] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs b/src/status_im/contexts/shell/activity_center/notification/mentions/style.cljs similarity index 80% rename from src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs rename to src/status_im/contexts/shell/activity_center/notification/mentions/style.cljs index e257691276..195eebb840 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/mentions/style.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/mentions/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.activity-center.notification.mentions.style +(ns status-im.contexts.shell.activity-center.notification.mentions.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs b/src/status_im/contexts/shell/activity_center/notification/mentions/view.cljs similarity index 93% rename from src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/mentions/view.cljs index 3b4c18b667..052e4b8f54 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/mentions/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.shell.activity-center.notification.mentions.view +(ns status-im.contexts.shell.activity-center.notification.mentions.view (:require [clojure.string :as string] [quo.core :as quo] [react-native.gesture :as gesture] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] - [status-im2.contexts.shell.activity-center.notification.mentions.style :as style] + [status-im.contexts.shell.activity-center.notification.common.view :as common] + [status-im.contexts.shell.activity-center.notification.mentions.style :as style] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs b/src/status_im/contexts/shell/activity_center/notification/reply/style.cljs similarity index 76% rename from src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs rename to src/status_im/contexts/shell/activity_center/notification/reply/style.cljs index 74c8404ce4..bee0c602c5 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/reply/style.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/reply/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.activity-center.notification.reply.style +(ns status-im.contexts.shell.activity-center.notification.reply.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs b/src/status_im/contexts/shell/activity_center/notification/reply/view.cljs similarity index 94% rename from src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs rename to src/status_im/contexts/shell/activity_center/notification/reply/view.cljs index d0bf235646..7210fd5222 100644 --- a/src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/reply/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.shell.activity-center.notification.reply.view +(ns status-im.contexts.shell.activity-center.notification.reply.view (:require [clojure.string :as string] [legacy.status-im.ui.screens.chat.message.legacy-view :as old-message] [quo.core :as quo] [react-native.gesture :as gesture] - [status-im2.common.not-implemented :as not-implemented] - [status-im2.constants :as constants] - [status-im2.contexts.shell.activity-center.notification.common.view :as common] - [status-im2.contexts.shell.activity-center.notification.reply.style :as style] + [status-im.common.not-implemented :as not-implemented] + [status-im.constants :as constants] + [status-im.contexts.shell.activity-center.notification.common.view :as common] + [status-im.contexts.shell.activity-center.notification.reply.style :as style] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/shell/activity_center/notification_types.cljs b/src/status_im/contexts/shell/activity_center/notification_types.cljs similarity index 93% rename from src/status_im2/contexts/shell/activity_center/notification_types.cljs rename to src/status_im/contexts/shell/activity_center/notification_types.cljs index 2062ed7c3a..c24ef2ca5c 100644 --- a/src/status_im2/contexts/shell/activity_center/notification_types.cljs +++ b/src/status_im/contexts/shell/activity_center/notification_types.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.activity-center.notification-types) +(ns status-im.contexts.shell.activity-center.notification-types) (def ^:const no-type 0) (def ^:const one-to-one-chat 1) diff --git a/src/status_im2/contexts/shell/activity_center/style.cljs b/src/status_im/contexts/shell/activity_center/style.cljs similarity index 96% rename from src/status_im2/contexts/shell/activity_center/style.cljs rename to src/status_im/contexts/shell/activity_center/style.cljs index c13d5977c3..b5be388c9f 100644 --- a/src/status_im2/contexts/shell/activity_center/style.cljs +++ b/src/status_im/contexts/shell/activity_center/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.activity-center.style +(ns status-im.contexts.shell.activity-center.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs b/src/status_im/contexts/shell/activity_center/tabs/empty_tab/view.cljs similarity index 84% rename from src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs rename to src/status_im/contexts/shell/activity_center/tabs/empty_tab/view.cljs index 208172dec6..a91eeb1a0b 100644 --- a/src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs +++ b/src/status_im/contexts/shell/activity_center/tabs/empty_tab/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.shell.activity-center.tabs.empty-tab.view +(ns status-im.contexts.shell.activity-center.tabs.empty-tab.view (:require [quo.core :as quo] [quo.theme] [react-native.core :as rn] - [status-im2.common.resources :as resources] - [status-im2.contexts.shell.activity-center.notification-types :as types] - [status-im2.contexts.shell.activity-center.style :as style] + [status-im.common.resources :as resources] + [status-im.contexts.shell.activity-center.notification-types :as types] + [status-im.contexts.shell.activity-center.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/tabs/view.cljs b/src/status_im/contexts/shell/activity_center/tabs/view.cljs similarity index 95% rename from src/status_im2/contexts/shell/activity_center/tabs/view.cljs rename to src/status_im/contexts/shell/activity_center/tabs/view.cljs index 3ce6c5692b..934224476d 100644 --- a/src/status_im2/contexts/shell/activity_center/tabs/view.cljs +++ b/src/status_im/contexts/shell/activity_center/tabs/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.shell.activity-center.tabs.view +(ns status-im.contexts.shell.activity-center.tabs.view (:require [clojure.set :as set] [quo.core :as quo] - [status-im2.contexts.shell.activity-center.notification-types :as types] - [status-im2.contexts.shell.activity-center.style :as style] + [status-im.contexts.shell.activity-center.notification-types :as types] + [status-im.contexts.shell.activity-center.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/activity_center/view.cljs b/src/status_im/contexts/shell/activity_center/view.cljs similarity index 72% rename from src/status_im2/contexts/shell/activity_center/view.cljs rename to src/status_im/contexts/shell/activity_center/view.cljs index 7f2b386fcb..f987de763f 100644 --- a/src/status_im2/contexts/shell/activity_center/view.cljs +++ b/src/status_im/contexts/shell/activity_center/view.cljs @@ -1,25 +1,25 @@ -(ns status-im2.contexts.shell.activity-center.view +(ns status-im.contexts.shell.activity-center.view (:require [oops.core :as oops] [react-native.blur :as blur] [react-native.core :as rn] [react-native.navigation :as navigation] - [status-im2.contexts.shell.activity-center.header.view :as header] - [status-im2.contexts.shell.activity-center.notification-types :as types] - [status-im2.contexts.shell.activity-center.notification.admin.view :as admin] - [status-im2.contexts.shell.activity-center.notification.community-kicked.view :as + [status-im.contexts.shell.activity-center.header.view :as header] + [status-im.contexts.shell.activity-center.notification-types :as types] + [status-im.contexts.shell.activity-center.notification.admin.view :as admin] + [status-im.contexts.shell.activity-center.notification.community-kicked.view :as community-kicked] - [status-im2.contexts.shell.activity-center.notification.community-request.view :as + [status-im.contexts.shell.activity-center.notification.community-request.view :as community-request] - [status-im2.contexts.shell.activity-center.notification.contact-requests.view :as + [status-im.contexts.shell.activity-center.notification.contact-requests.view :as contact-requests] - [status-im2.contexts.shell.activity-center.notification.contact-verification.view :as + [status-im.contexts.shell.activity-center.notification.contact-verification.view :as contact-verification] - [status-im2.contexts.shell.activity-center.notification.membership.view :as membership] - [status-im2.contexts.shell.activity-center.notification.mentions.view :as mentions] - [status-im2.contexts.shell.activity-center.notification.reply.view :as reply] - [status-im2.contexts.shell.activity-center.style :as style] - [status-im2.contexts.shell.activity-center.tabs.empty-tab.view :as empty-tab] + [status-im.contexts.shell.activity-center.notification.membership.view :as membership] + [status-im.contexts.shell.activity-center.notification.mentions.view :as mentions] + [status-im.contexts.shell.activity-center.notification.reply.view :as reply] + [status-im.contexts.shell.activity-center.style :as style] + [status-im.contexts.shell.activity-center.tabs.empty-tab.view :as empty-tab] [utils.re-frame :as rf])) (defn notification-component diff --git a/src/status_im2/contexts/shell/jump_to/animation.cljs b/src/status_im/contexts/shell/jump_to/animation.cljs similarity index 95% rename from src/status_im2/contexts/shell/jump_to/animation.cljs rename to src/status_im/contexts/shell/jump_to/animation.cljs index 641dd8bd4e..9ebbcfcca5 100644 --- a/src/status_im2/contexts/shell/jump_to/animation.cljs +++ b/src/status_im/contexts/shell/jump_to/animation.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.shell.jump-to.animation +(ns status-im.contexts.shell.jump-to.animation (:require [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as utils] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as utils] [utils.re-frame :as rf])) ;;;; Home stack diff --git a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs b/src/status_im/contexts/shell/jump_to/components/bottom_tabs/style.cljs similarity index 90% rename from src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs rename to src/status_im/contexts/shell/jump_to/components/bottom_tabs/style.cljs index e387cb06bf..bd6e8d78a4 100644 --- a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs +++ b/src/status_im/contexts/shell/jump_to/components/bottom_tabs/style.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.shell.jump-to.components.bottom-tabs.style +(ns status-im.contexts.shell.jump-to.components.bottom-tabs.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.shell.jump-to.utils :as utils])) + [status-im.contexts.shell.jump-to.utils :as utils])) (defn bottom-tabs-container [pass-through? height] diff --git a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs b/src/status_im/contexts/shell/jump_to/components/bottom_tabs/view.cljs similarity index 89% rename from src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs rename to src/status_im/contexts/shell/jump_to/components/bottom_tabs/view.cljs index 44ceff3215..5ae0bffb4e 100644 --- a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs +++ b/src/status_im/contexts/shell/jump_to/components/bottom_tabs/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.jump-to.components.bottom-tabs.view +(ns status-im.contexts.shell.jump-to.components.bottom-tabs.view (:require [quo.core :as quo] [quo.theme :as quo.theme] @@ -6,11 +6,11 @@ [react-native.gesture :as gesture] [react-native.platform :as platform] [react-native.reanimated :as reanimated] - [status-im2.contexts.shell.jump-to.animation :as animation] - [status-im2.contexts.shell.jump-to.components.bottom-tabs.style :as style] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as utils] + [status-im.contexts.shell.jump-to.animation :as animation] + [status-im.contexts.shell.jump-to.components.bottom-tabs.style :as style] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as utils] [utils.re-frame :as rf])) (defn blur-overlay-params diff --git a/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs b/src/status_im/contexts/shell/jump_to/components/floating_screens/style.cljs similarity index 89% rename from src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs rename to src/status_im/contexts/shell/jump_to/components/floating_screens/style.cljs index 8e429c72ef..ef24410e4c 100644 --- a/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs +++ b/src/status_im/contexts/shell/jump_to/components/floating_screens/style.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.shell.jump-to.components.floating-screens.style +(ns status-im.contexts.shell.jump-to.components.floating-screens.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] - [status-im2.contexts.shell.jump-to.constants :as shell.constants])) + [status-im.contexts.shell.jump-to.constants :as shell.constants])) (defn screen [{:keys [screen-left screen-top screen-width screen-height screen-border-radius screen-z-index]} diff --git a/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs b/src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs similarity index 73% rename from src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs rename to src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs index dd380262ff..6f5f6d4d18 100644 --- a/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs +++ b/src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs @@ -1,16 +1,16 @@ -(ns status-im2.contexts.shell.jump-to.components.floating-screens.view +(ns status-im.contexts.shell.jump-to.components.floating-screens.view (:require [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.messages.view :as chat] - [status-im2.contexts.communities.discover.view :as communities.discover] - [status-im2.contexts.communities.overview.view :as communities.overview] - [status-im2.contexts.shell.jump-to.animation :as animation] - [status-im2.contexts.shell.jump-to.components.floating-screens.style :as style] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as utils] + [status-im.contexts.chat.messages.view :as chat] + [status-im.contexts.communities.discover.view :as communities.discover] + [status-im.contexts.communities.overview.view :as communities.overview] + [status-im.contexts.shell.jump-to.animation :as animation] + [status-im.contexts.shell.jump-to.components.floating-screens.style :as style] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as utils] [utils.re-frame :as rf])) (def screens-map diff --git a/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs b/src/status_im/contexts/shell/jump_to/components/home_stack/style.cljs similarity index 90% rename from src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs rename to src/status_im/contexts/shell/jump_to/components/home_stack/style.cljs index 9f3df13b90..c8d386cf00 100644 --- a/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs +++ b/src/status_im/contexts/shell/jump_to/components/home_stack/style.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.shell.jump-to.components.home-stack.style +(ns status-im.contexts.shell.jump-to.components.home-stack.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] - [status-im2.contexts.shell.jump-to.utils :as utils])) + [status-im.contexts.shell.jump-to.utils :as utils])) (defn home-stack [shared-values {:keys [width height theme]}] diff --git a/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs b/src/status_im/contexts/shell/jump_to/components/home_stack/view.cljs similarity index 75% rename from src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs rename to src/status_im/contexts/shell/jump_to/components/home_stack/view.cljs index dcb1fbd0fc..0706232088 100644 --- a/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs +++ b/src/status_im/contexts/shell/jump_to/components/home_stack/view.cljs @@ -1,15 +1,15 @@ -(ns status-im2.contexts.shell.jump-to.components.home-stack.view +(ns status-im.contexts.shell.jump-to.components.home-stack.view (:require [legacy.status-im.ui.screens.browser.stack :as browser.stack] [quo.theme :as quo.theme] [react-native.reanimated :as reanimated] - [status-im2.contexts.chat.home.view :as chat] - [status-im2.contexts.communities.home.view :as communities] - [status-im2.contexts.shell.jump-to.components.home-stack.style :as style] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as utils] - [status-im2.contexts.wallet.home.view :as wallet-new])) + [status-im.contexts.chat.home.view :as chat] + [status-im.contexts.communities.home.view :as communities] + [status-im.contexts.shell.jump-to.components.home-stack.style :as style] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as utils] + [status-im.contexts.wallet.home.view :as wallet-new])) (defn load-stack? [stack-id] diff --git a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs b/src/status_im/contexts/shell/jump_to/components/jump_to_screen/style.cljs similarity index 92% rename from src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs rename to src/status_im/contexts/shell/jump_to/components/jump_to_screen/style.cljs index 69d6b3ee86..fcbff6e044 100644 --- a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs +++ b/src/status_im/contexts/shell/jump_to/components/jump_to_screen/style.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.shell.jump-to.components.jump-to-screen.style +(ns status-im.contexts.shell.jump-to.components.jump-to-screen.style (:require [quo.foundations.colors :as colors] - [status-im2.contexts.shell.jump-to.utils :as utils])) + [status-im.contexts.shell.jump-to.utils :as utils])) ;;;; Placeholder (defn placeholder-container diff --git a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs b/src/status_im/contexts/shell/jump_to/components/jump_to_screen/view.cljs similarity index 87% rename from src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs rename to src/status_im/contexts/shell/jump_to/components/jump_to_screen/view.cljs index 8a7e141744..219c1058da 100644 --- a/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs +++ b/src/status_im/contexts/shell/jump_to/components/jump_to_screen/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.jump-to.components.jump-to-screen.view +(ns status-im.contexts.shell.jump-to.components.jump-to-screen.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -7,13 +7,13 @@ [react-native.core :as rn] [react-native.linear-gradient :as linear-gradient] [react-native.safe-area :as safe-area] - [status-im2.common.home.top-nav.view :as common.top-nav] - [status-im2.contexts.shell.jump-to.components.bottom-tabs.view :as bottom-tabs] - [status-im2.contexts.shell.jump-to.components.jump-to-screen.style :as style] - [status-im2.contexts.shell.jump-to.components.switcher-cards.view :as switcher-cards] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as utils] + [status-im.common.home.top-nav.view :as common.top-nav] + [status-im.contexts.shell.jump-to.components.bottom-tabs.view :as bottom-tabs] + [status-im.contexts.shell.jump-to.components.jump-to-screen.style :as style] + [status-im.contexts.shell.jump-to.components.switcher-cards.view :as switcher-cards] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs b/src/status_im/contexts/shell/jump_to/components/switcher_cards/style.cljs similarity index 97% rename from src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs rename to src/status_im/contexts/shell/jump_to/components/switcher_cards/style.cljs index 7509612d78..f432077c03 100644 --- a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs +++ b/src/status_im/contexts/shell/jump_to/components/switcher_cards/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.jump-to.components.switcher-cards.style +(ns status-im.contexts.shell.jump-to.components.switcher-cards.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs b/src/status_im/contexts/shell/jump_to/components/switcher_cards/view.cljs similarity index 95% rename from src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs rename to src/status_im/contexts/shell/jump_to/components/switcher_cards/view.cljs index 5790e65be2..1ac4d88a39 100644 --- a/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs +++ b/src/status_im/contexts/shell/jump_to/components/switcher_cards/view.cljs @@ -1,15 +1,15 @@ -(ns status-im2.contexts.shell.jump-to.components.switcher-cards.view +(ns status-im.contexts.shell.jump-to.components.switcher-cards.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [react-native.fast-image :as fast-image] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.resolver.message-resolver :as resolver] - [status-im2.contexts.shell.jump-to.animation :as animation] - [status-im2.contexts.shell.jump-to.components.switcher-cards.style :as style] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.resolver.message-resolver :as resolver] + [status-im.contexts.shell.jump-to.animation :as animation] + [status-im.contexts.shell.jump-to.components.switcher-cards.style :as style] + [status-im.contexts.shell.jump-to.constants :as shell.constants] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/jump_to/constants.cljs b/src/status_im/contexts/shell/jump_to/constants.cljs similarity index 98% rename from src/status_im2/contexts/shell/jump_to/constants.cljs rename to src/status_im/contexts/shell/jump_to/constants.cljs index f4768b81b4..c7bdfa5957 100644 --- a/src/status_im2/contexts/shell/jump_to/constants.cljs +++ b/src/status_im/contexts/shell/jump_to/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.jump-to.constants) +(ns status-im.contexts.shell.jump-to.constants) (def ^:const shell-animation-time 200) (def ^:const switcher-card-size 160) diff --git a/src/status_im2/contexts/shell/jump_to/effects.cljs b/src/status_im/contexts/shell/jump_to/effects.cljs similarity index 75% rename from src/status_im2/contexts/shell/jump_to/effects.cljs rename to src/status_im/contexts/shell/jump_to/effects.cljs index 099d0f5a73..07603e4d17 100644 --- a/src/status_im2/contexts/shell/jump_to/effects.cljs +++ b/src/status_im/contexts/shell/jump_to/effects.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.shell.jump-to.effects +(ns status-im.contexts.shell.jump-to.effects (:require - [status-im2.contexts.shell.jump-to.animation :as animation] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as shell.utils] + [status-im.contexts.shell.jump-to.animation :as animation] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as shell.utils] [utils.re-frame :as rf])) (rf/reg-fx :effects.shell/change-tab diff --git a/src/status_im2/contexts/shell/jump_to/events.cljs b/src/status_im/contexts/shell/jump_to/events.cljs similarity index 96% rename from src/status_im2/contexts/shell/jump_to/events.cljs rename to src/status_im/contexts/shell/jump_to/events.cljs index 0a185090c6..eb5020504f 100644 --- a/src/status_im2/contexts/shell/jump_to/events.cljs +++ b/src/status_im/contexts/shell/jump_to/events.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.shell.jump-to.events +(ns status-im.contexts.shell.jump-to.events (:require [legacy.status-im.data-store.switcher-cards :as switcher-cards-store] [legacy.status-im.utils.core :as utils] - [status-im2.constants :as constants] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - status-im2.contexts.shell.jump-to.effects - [status-im2.contexts.shell.jump-to.utils :as shell.utils] - [status-im2.navigation.state :as navigation.state] + [status-im.constants :as constants] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + status-im.contexts.shell.jump-to.effects + [status-im.contexts.shell.jump-to.utils :as shell.utils] + [status-im.navigation.state :as navigation.state] [utils.re-frame :as rf])) ;;;; Events diff --git a/src/status_im2/contexts/shell/jump_to/gesture.cljs b/src/status_im/contexts/shell/jump_to/gesture.cljs similarity index 87% rename from src/status_im2/contexts/shell/jump_to/gesture.cljs rename to src/status_im/contexts/shell/jump_to/gesture.cljs index 4d0fa8b0af..595f547625 100644 --- a/src/status_im2/contexts/shell/jump_to/gesture.cljs +++ b/src/status_im/contexts/shell/jump_to/gesture.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.shell.jump-to.gesture +(ns status-im.contexts.shell.jump-to.gesture (:require [react-native.gesture :as gesture] - [status-im2.contexts.shell.jump-to.constants :as constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as utils] + [status-im.contexts.shell.jump-to.constants :as constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as utils] [utils.re-frame :as rf] [utils.worklets.shell :as worklets.shell])) diff --git a/src/status_im2/contexts/shell/jump_to/shared_values.cljs b/src/status_im/contexts/shell/jump_to/shared_values.cljs similarity index 96% rename from src/status_im2/contexts/shell/jump_to/shared_values.cljs rename to src/status_im/contexts/shell/jump_to/shared_values.cljs index 7df9914a1a..0f5b0abc90 100644 --- a/src/status_im2/contexts/shell/jump_to/shared_values.cljs +++ b/src/status_im/contexts/shell/jump_to/shared_values.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.shell.jump-to.shared-values +(ns status-im.contexts.shell.jump-to.shared-values (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] - [status-im2.contexts.shell.jump-to.utils :as utils] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.utils :as utils] [utils.worklets.shell :as worklets.shell])) (defn calculate-home-stack-position diff --git a/src/status_im2/contexts/shell/jump_to/state.cljs b/src/status_im/contexts/shell/jump_to/state.cljs similarity index 82% rename from src/status_im2/contexts/shell/jump_to/state.cljs rename to src/status_im/contexts/shell/jump_to/state.cljs index 2a6775c963..fb08e4cf7d 100644 --- a/src/status_im2/contexts/shell/jump_to/state.cljs +++ b/src/status_im/contexts/shell/jump_to/state.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.shell.jump-to.state +(ns status-im.contexts.shell.jump-to.state (:require [reagent.core :as reagent] - [status-im2.contexts.shell.jump-to.constants :as shell.constants])) + [status-im.contexts.shell.jump-to.constants :as shell.constants])) ;; Atoms (def selected-stack-id (atom nil)) diff --git a/src/status_im2/contexts/shell/jump_to/utils.cljs b/src/status_im/contexts/shell/jump_to/utils.cljs similarity index 96% rename from src/status_im2/contexts/shell/jump_to/utils.cljs rename to src/status_im/contexts/shell/jump_to/utils.cljs index 5863f32c3f..4f4ad885e4 100644 --- a/src/status_im2/contexts/shell/jump_to/utils.cljs +++ b/src/status_im/contexts/shell/jump_to/utils.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.jump-to.utils +(ns status-im.contexts.shell.jump-to.utils (:require [quo.theme :as quo.theme] [react-native.async-storage :as async-storage] @@ -6,8 +6,8 @@ [react-native.platform :as platform] [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] - [status-im2.contexts.shell.jump-to.state :as state] + [status-im.contexts.shell.jump-to.constants :as shell.constants] + [status-im.contexts.shell.jump-to.state :as state] [utils.re-frame :as rf])) ;;;; Helper Functions diff --git a/src/status_im2/contexts/shell/jump_to/view.cljs b/src/status_im/contexts/shell/jump_to/view.cljs similarity index 64% rename from src/status_im2/contexts/shell/jump_to/view.cljs rename to src/status_im/contexts/shell/jump_to/view.cljs index e2e7f89d75..c4ab7fac93 100644 --- a/src/status_im2/contexts/shell/jump_to/view.cljs +++ b/src/status_im/contexts/shell/jump_to/view.cljs @@ -1,15 +1,15 @@ -(ns status-im2.contexts.shell.jump-to.view +(ns status-im.contexts.shell.jump-to.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.shell.jump-to.animation :as animation] - [status-im2.contexts.shell.jump-to.components.bottom-tabs.view :as bottom-tabs] - [status-im2.contexts.shell.jump-to.components.floating-screens.view :as floating-screens] - [status-im2.contexts.shell.jump-to.components.home-stack.view :as home-stack] - [status-im2.contexts.shell.jump-to.components.jump-to-screen.view :as jump-to-screen] - [status-im2.contexts.shell.jump-to.shared-values :as shared-values] - [status-im2.contexts.shell.jump-to.utils :as utils] - [status-im2.navigation.state :as navigation.state] + [status-im.contexts.shell.jump-to.animation :as animation] + [status-im.contexts.shell.jump-to.components.bottom-tabs.view :as bottom-tabs] + [status-im.contexts.shell.jump-to.components.floating-screens.view :as floating-screens] + [status-im.contexts.shell.jump-to.components.home-stack.view :as home-stack] + [status-im.contexts.shell.jump-to.components.jump-to-screen.view :as jump-to-screen] + [status-im.contexts.shell.jump-to.shared-values :as shared-values] + [status-im.contexts.shell.jump-to.utils :as utils] + [status-im.navigation.state :as navigation.state] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/shell/share/events.cljs b/src/status_im/contexts/shell/share/events.cljs similarity index 85% rename from src/status_im2/contexts/shell/share/events.cljs rename to src/status_im/contexts/shell/share/events.cljs index 32e4251cac..0c22893bd6 100644 --- a/src/status_im2/contexts/shell/share/events.cljs +++ b/src/status_im/contexts/shell/share/events.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.shell.share.events +(ns status-im.contexts.shell.share.events (:require [quo.foundations.colors :as colors] - [status-im2.common.toasts.events :as toasts] + [status-im.common.toasts.events :as toasts] [utils.re-frame :as rf])) (rf/defn copy-text-and-show-toast diff --git a/src/status_im2/contexts/shell/share/style.cljs b/src/status_im/contexts/shell/share/style.cljs similarity index 98% rename from src/status_im2/contexts/shell/share/style.cljs rename to src/status_im/contexts/shell/share/style.cljs index e7519e6ec8..a1ee2876a3 100644 --- a/src/status_im2/contexts/shell/share/style.cljs +++ b/src/status_im/contexts/shell/share/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.share.style +(ns status-im.contexts.shell.share.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/shell/share/view.cljs b/src/status_im/contexts/shell/share/view.cljs similarity index 96% rename from src/status_im2/contexts/shell/share/view.cljs rename to src/status_im/contexts/shell/share/view.cljs index 74356b3665..09128cc285 100644 --- a/src/status_im2/contexts/shell/share/view.cljs +++ b/src/status_im/contexts/shell/share/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.shell.share.view +(ns status-im.contexts.shell.share.view (:require [clojure.string :as string] [legacy.status-im.ui.components.list-selection :as list-selection] @@ -9,9 +9,9 @@ [react-native.platform :as platform] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.qr-codes.view :as qr-codes] - [status-im2.contexts.profile.utils :as profile.utils] - [status-im2.contexts.shell.share.style :as style] + [status-im.common.qr-codes.view :as qr-codes] + [status-im.contexts.profile.utils :as profile.utils] + [status-im.contexts.shell.share.style :as style] [utils.address :as address] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/status_im_preview/common/floating_button_page/style.cljs b/src/status_im/contexts/status_im_preview/common/floating_button_page/style.cljs similarity index 86% rename from src/status_im2/contexts/status_im_preview/common/floating_button_page/style.cljs rename to src/status_im/contexts/status_im_preview/common/floating_button_page/style.cljs index 020fe2fcda..362b8aab7f 100644 --- a/src/status_im2/contexts/status_im_preview/common/floating_button_page/style.cljs +++ b/src/status_im/contexts/status_im_preview/common/floating_button_page/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.status-im-preview.common.floating-button-page.style +(ns status-im.contexts.status-im-preview.common.floating-button-page.style (:require [quo.foundations.colors :as colors] [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/status_im_preview/common/floating_button_page/view.cljs b/src/status_im/contexts/status_im_preview/common/floating_button_page/view.cljs similarity index 86% rename from src/status_im2/contexts/status_im_preview/common/floating_button_page/view.cljs rename to src/status_im/contexts/status_im_preview/common/floating_button_page/view.cljs index b7f5cf6054..04eb4eb62d 100644 --- a/src/status_im2/contexts/status_im_preview/common/floating_button_page/view.cljs +++ b/src/status_im/contexts/status_im_preview/common/floating_button_page/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.status-im-preview.common.floating-button-page.view +(ns status-im.contexts.status-im-preview.common.floating-button-page.view (:require [quo.core :as quo] [re-frame.core :as rf] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.floating-button-page.view :as floating-button-page] - [status-im2.common.resources :as resources] - [status-im2.contexts.status-im-preview.common.floating-button-page.style :as style])) + [status-im.common.floating-button-page.view :as floating-button-page] + [status-im.common.resources :as resources] + [status-im.contexts.status-im-preview.common.floating-button-page.style :as style])) (defn view [] diff --git a/src/status_im2/contexts/status_im_preview/main.cljs b/src/status_im/contexts/status_im_preview/main.cljs similarity index 85% rename from src/status_im2/contexts/status_im_preview/main.cljs rename to src/status_im/contexts/status_im_preview/main.cljs index b41830ba00..cbc0a448d8 100644 --- a/src/status_im2/contexts/status_im_preview/main.cljs +++ b/src/status_im/contexts/status_im_preview/main.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.status-im-preview.main +(ns status-im.contexts.status-im-preview.main (:refer-clojure :exclude [filter]) (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.quo-preview.common :as common] - [status-im2.contexts.status-im-preview.common.floating-button-page.view :as floating-button-page] - [status-im2.contexts.status-im-preview.style :as style] + [status-im.contexts.quo-preview.common :as common] + [status-im.contexts.status-im-preview.common.floating-button-page.view :as floating-button-page] + [status-im.contexts.status-im-preview.style :as style] [utils.re-frame :as rf])) (def screens-categories diff --git a/src/status_im2/contexts/status_im_preview/style.cljs b/src/status_im/contexts/status_im_preview/style.cljs similarity index 82% rename from src/status_im2/contexts/status_im_preview/style.cljs rename to src/status_im/contexts/status_im_preview/style.cljs index 5dbc217b62..a4c2bfa389 100644 --- a/src/status_im2/contexts/status_im_preview/style.cljs +++ b/src/status_im/contexts/status_im_preview/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.status-im-preview.style +(ns status-im.contexts.status-im-preview.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/syncing/device/style.cljs b/src/status_im/contexts/syncing/device/style.cljs similarity index 79% rename from src/status_im2/contexts/syncing/device/style.cljs rename to src/status_im/contexts/syncing/device/style.cljs index ffab94b025..1aa696bb0e 100644 --- a/src/status_im2/contexts/syncing/device/style.cljs +++ b/src/status_im/contexts/syncing/device/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.device.style +(ns status-im.contexts.syncing.device.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/syncing/device/view.cljs b/src/status_im/contexts/syncing/device/view.cljs similarity index 93% rename from src/status_im2/contexts/syncing/device/view.cljs rename to src/status_im/contexts/syncing/device/view.cljs index c92025fdf1..d03cd6856a 100644 --- a/src/status_im2/contexts/syncing/device/view.cljs +++ b/src/status_im/contexts/syncing/device/view.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.syncing.device.view +(ns status-im.contexts.syncing.device.view (:require [quo.core :as quo] - [status-im2.contexts.syncing.device.style :as style] + [status-im.contexts.syncing.device.style :as style] [utils.i18n :as i18n])) (defn view diff --git a/src/status_im2/contexts/syncing/enter_sync_code/style.cljs b/src/status_im/contexts/syncing/enter_sync_code/style.cljs similarity index 96% rename from src/status_im2/contexts/syncing/enter_sync_code/style.cljs rename to src/status_im/contexts/syncing/enter_sync_code/style.cljs index 32960ef30f..783a542657 100644 --- a/src/status_im2/contexts/syncing/enter_sync_code/style.cljs +++ b/src/status_im/contexts/syncing/enter_sync_code/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.enter-sync-code.style +(ns status-im.contexts.syncing.enter-sync-code.style (:require [quo.foundations.colors :as colors] [quo.foundations.typography :as typography])) diff --git a/src/status_im2/contexts/syncing/enter_sync_code/view.cljs b/src/status_im/contexts/syncing/enter_sync_code/view.cljs similarity index 95% rename from src/status_im2/contexts/syncing/enter_sync_code/view.cljs rename to src/status_im/contexts/syncing/enter_sync_code/view.cljs index 5bceb9c32e..4b36372c61 100644 --- a/src/status_im2/contexts/syncing/enter_sync_code/view.cljs +++ b/src/status_im/contexts/syncing/enter_sync_code/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.enter-sync-code.view +(ns status-im.contexts.syncing.enter-sync-code.view (:require [clojure.string :as string] [quo.core :as quo] @@ -6,8 +6,8 @@ [react-native.clipboard :as clipboard] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.syncing.enter-sync-code.style :as style] - [status-im2.contexts.syncing.utils :as sync-utils] + [status-im.contexts.syncing.enter-sync-code.style :as style] + [status-im.contexts.syncing.utils :as sync-utils] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/syncing/events.cljs b/src/status_im/contexts/syncing/events.cljs similarity index 96% rename from src/status_im2/contexts/syncing/events.cljs rename to src/status_im/contexts/syncing/events.cljs index 2725215443..003c09a3c2 100644 --- a/src/status_im2/contexts/syncing/events.cljs +++ b/src/status_im/contexts/syncing/events.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.events +(ns status-im.contexts.syncing.events (:require [clojure.string :as string] [legacy.status-im.data-store.settings :as data-store.settings] @@ -7,9 +7,9 @@ [quo.foundations.colors :as colors] [re-frame.core :as re-frame] [react-native.platform :as platform] - [status-im2.config :as config] - [status-im2.constants :as constants] - [status-im2.contexts.syncing.utils :as sync-utils] + [status-im.config :as config] + [status-im.constants :as constants] + [status-im.contexts.syncing.utils :as sync-utils] [taoensso.timbre :as log] [utils.re-frame :as rf] [utils.transforms :as transforms])) diff --git a/src/status_im2/contexts/syncing/find_sync_code/view.cljs b/src/status_im/contexts/syncing/find_sync_code/view.cljs similarity index 91% rename from src/status_im2/contexts/syncing/find_sync_code/view.cljs rename to src/status_im/contexts/syncing/find_sync_code/view.cljs index d23be7996b..780c30b842 100644 --- a/src/status_im2/contexts/syncing/find_sync_code/view.cljs +++ b/src/status_im/contexts/syncing/find_sync_code/view.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.syncing.find-sync-code.view +(ns status-im.contexts.syncing.find-sync-code.view (:require - [status-im2.contexts.syncing.syncing-instructions.view :as syncing-instructions])) + [status-im.contexts.syncing.syncing-instructions.view :as syncing-instructions])) (defn view [] diff --git a/src/status_im2/contexts/syncing/how_to_pair/view.cljs b/src/status_im/contexts/syncing/how_to_pair/view.cljs similarity index 95% rename from src/status_im2/contexts/syncing/how_to_pair/view.cljs rename to src/status_im/contexts/syncing/how_to_pair/view.cljs index 60799670f9..4057023c89 100644 --- a/src/status_im2/contexts/syncing/how_to_pair/view.cljs +++ b/src/status_im/contexts/syncing/how_to_pair/view.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.syncing.how-to-pair.view +(ns status-im.contexts.syncing.how-to-pair.view (:require - [status-im2.contexts.syncing.syncing-instructions.view :as syncing-instructions])) + [status-im.contexts.syncing.syncing-instructions.view :as syncing-instructions])) (defn view [] diff --git a/src/status_im2/contexts/syncing/scan_sync_code/animation.cljs b/src/status_im/contexts/syncing/scan_sync_code/animation.cljs similarity index 93% rename from src/status_im2/contexts/syncing/scan_sync_code/animation.cljs rename to src/status_im/contexts/syncing/scan_sync_code/animation.cljs index 5b25dabad3..59020e5d3b 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/animation.cljs +++ b/src/status_im/contexts/syncing/scan_sync_code/animation.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.syncing.scan-sync-code.animation +(ns status-im.contexts.syncing.scan-sync-code.animation (:require [react-native.reanimated :as reanimated] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) (defn animate-subtitle [subtitle-opacity] diff --git a/src/status_im2/contexts/syncing/scan_sync_code/style.cljs b/src/status_im/contexts/syncing/scan_sync_code/style.cljs similarity index 98% rename from src/status_im2/contexts/syncing/scan_sync_code/style.cljs rename to src/status_im/contexts/syncing/scan_sync_code/style.cljs index 348e68bbe3..4c24cf8d86 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/style.cljs +++ b/src/status_im/contexts/syncing/scan_sync_code/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.scan-sync-code.style +(ns status-im.contexts.syncing.scan-sync-code.style (:require [quo.foundations.colors :as colors] [react-native.reanimated :as reanimated])) diff --git a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs b/src/status_im/contexts/syncing/scan_sync_code/view.cljs similarity index 97% rename from src/status_im2/contexts/syncing/scan_sync_code/view.cljs rename to src/status_im/contexts/syncing/scan_sync_code/view.cljs index 642b1d38df..b1a9665009 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs +++ b/src/status_im/contexts/syncing/scan_sync_code/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.scan-sync-code.view +(ns status-im.contexts.syncing.scan-sync-code.view (:require [clojure.string :as string] [oops.core :as oops] @@ -13,12 +13,12 @@ [react-native.reanimated :as reanimated] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.device-permissions :as device-permissions] - [status-im2.constants :as constants] - [status-im2.contexts.syncing.enter-sync-code.view :as enter-sync-code] - [status-im2.contexts.syncing.scan-sync-code.animation :as animation] - [status-im2.contexts.syncing.scan-sync-code.style :as style] - [status-im2.contexts.syncing.utils :as sync-utils] + [status-im.common.device-permissions :as device-permissions] + [status-im.constants :as constants] + [status-im.contexts.syncing.enter-sync-code.view :as enter-sync-code] + [status-im.contexts.syncing.scan-sync-code.animation :as animation] + [status-im.contexts.syncing.scan-sync-code.style :as style] + [status-im.contexts.syncing.utils :as sync-utils] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/syncing/scan_sync_code_page/style.cljs b/src/status_im/contexts/syncing/scan_sync_code_page/style.cljs similarity index 80% rename from src/status_im2/contexts/syncing/scan_sync_code_page/style.cljs rename to src/status_im/contexts/syncing/scan_sync_code_page/style.cljs index 3cbaf21e74..c2edb812d4 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code_page/style.cljs +++ b/src/status_im/contexts/syncing/scan_sync_code_page/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.scan-sync-code-page.style +(ns status-im.contexts.syncing.scan-sync-code-page.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/syncing/scan_sync_code_page/view.cljs b/src/status_im/contexts/syncing/scan_sync_code_page/view.cljs similarity index 58% rename from src/status_im2/contexts/syncing/scan_sync_code_page/view.cljs rename to src/status_im/contexts/syncing/scan_sync_code_page/view.cljs index b8b22e52d4..764771e833 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code_page/view.cljs +++ b/src/status_im/contexts/syncing/scan_sync_code_page/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.syncing.scan-sync-code-page.view +(ns status-im.contexts.syncing.scan-sync-code-page.view (:require [react-native.core :as rn] - [status-im2.contexts.syncing.scan-sync-code-page.style :as style] - [status-im2.contexts.syncing.scan-sync-code.view :as scan-sync-code] + [status-im.contexts.syncing.scan-sync-code-page.style :as style] + [status-im.contexts.syncing.scan-sync-code.view :as scan-sync-code] [utils.i18n :as i18n])) (defn view diff --git a/src/status_im2/contexts/syncing/setup_syncing/style.cljs b/src/status_im/contexts/syncing/setup_syncing/style.cljs similarity index 93% rename from src/status_im2/contexts/syncing/setup_syncing/style.cljs rename to src/status_im/contexts/syncing/setup_syncing/style.cljs index c2dd66ad4d..4fe95e2f3f 100644 --- a/src/status_im2/contexts/syncing/setup_syncing/style.cljs +++ b/src/status_im/contexts/syncing/setup_syncing/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.setup-syncing.style +(ns status-im.contexts.syncing.setup-syncing.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/syncing/setup_syncing/view.cljs b/src/status_im/contexts/syncing/setup_syncing/view.cljs similarity index 94% rename from src/status_im2/contexts/syncing/setup_syncing/view.cljs rename to src/status_im/contexts/syncing/setup_syncing/view.cljs index 453d0ea26b..097fb44d5e 100644 --- a/src/status_im2/contexts/syncing/setup_syncing/view.cljs +++ b/src/status_im/contexts/syncing/setup_syncing/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.setup-syncing.view +(ns status-im.contexts.syncing.setup-syncing.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] @@ -6,11 +6,11 @@ [react-native.core :as rn] [react-native.hooks :as hooks] [reagent.core :as reagent] - [status-im2.common.qr-codes.view :as qr-codes] - [status-im2.common.resources :as resources] - [status-im2.common.standard-authentication.core :as standard-auth] - [status-im2.contexts.syncing.setup-syncing.style :as style] - [status-im2.contexts.syncing.utils :as sync-utils] + [status-im.common.qr-codes.view :as qr-codes] + [status-im.common.resources :as resources] + [status-im.common.standard-authentication.core :as standard-auth] + [status-im.contexts.syncing.setup-syncing.style :as style] + [status-im.contexts.syncing.utils :as sync-utils] [utils.datetime :as datetime] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/syncing/syncing_devices_list/style.cljs b/src/status_im/contexts/syncing/syncing_devices_list/style.cljs similarity index 89% rename from src/status_im2/contexts/syncing/syncing_devices_list/style.cljs rename to src/status_im/contexts/syncing/syncing_devices_list/style.cljs index ff5a2ae2dc..6b4b6f8513 100644 --- a/src/status_im2/contexts/syncing/syncing_devices_list/style.cljs +++ b/src/status_im/contexts/syncing/syncing_devices_list/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.syncing-devices-list.style +(ns status-im.contexts.syncing.syncing-devices-list.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs b/src/status_im/contexts/syncing/syncing_devices_list/view.cljs similarity index 92% rename from src/status_im2/contexts/syncing/syncing_devices_list/view.cljs rename to src/status_im/contexts/syncing/syncing_devices_list/view.cljs index 67da3c186e..0087cd36cc 100644 --- a/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs +++ b/src/status_im/contexts/syncing/syncing_devices_list/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.syncing.syncing-devices-list.view +(ns status-im.contexts.syncing.syncing-devices-list.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] - [status-im2.contexts.syncing.device.view :as device] - [status-im2.contexts.syncing.syncing-devices-list.style :as style] + [status-im.contexts.syncing.device.view :as device] + [status-im.contexts.syncing.syncing-devices-list.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/syncing/syncing_instructions/style.cljs b/src/status_im/contexts/syncing/syncing_instructions/style.cljs similarity index 96% rename from src/status_im2/contexts/syncing/syncing_instructions/style.cljs rename to src/status_im/contexts/syncing/syncing_instructions/style.cljs index cc887ea827..fb47e518c9 100644 --- a/src/status_im2/contexts/syncing/syncing_instructions/style.cljs +++ b/src/status_im/contexts/syncing/syncing_instructions/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.syncing.syncing-instructions.style +(ns status-im.contexts.syncing.syncing-instructions.style (:require [quo.foundations.colors :as colors] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/syncing/syncing_instructions/view.cljs b/src/status_im/contexts/syncing/syncing_instructions/view.cljs similarity index 95% rename from src/status_im2/contexts/syncing/syncing_instructions/view.cljs rename to src/status_im/contexts/syncing/syncing_instructions/view.cljs index fdf15145cc..36520de6fb 100644 --- a/src/status_im2/contexts/syncing/syncing_instructions/view.cljs +++ b/src/status_im/contexts/syncing/syncing_instructions/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.syncing.syncing-instructions.view +(ns status-im.contexts.syncing.syncing-instructions.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.gesture :as gesture] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.syncing.syncing-instructions.style :as style] + [status-im.common.resources :as resources] + [status-im.contexts.syncing.syncing-instructions.style :as style] [utils.i18n :as i18n])) (defn- render-element diff --git a/src/status_im2/contexts/syncing/utils.cljs b/src/status_im/contexts/syncing/utils.cljs similarity index 74% rename from src/status_im2/contexts/syncing/utils.cljs rename to src/status_im/contexts/syncing/utils.cljs index 8364abf459..8805f5b325 100644 --- a/src/status_im2/contexts/syncing/utils.cljs +++ b/src/status_im/contexts/syncing/utils.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.syncing.utils +(ns status-im.contexts.syncing.utils (:require [clojure.string :as string] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) (defn valid-connection-string? [connection-string] diff --git a/src/status_im2/contexts/wallet/account/bridge/style.cljs b/src/status_im/contexts/wallet/account/bridge/style.cljs similarity index 82% rename from src/status_im2/contexts/wallet/account/bridge/style.cljs rename to src/status_im/contexts/wallet/account/bridge/style.cljs index cea6ad623e..a436a57baa 100644 --- a/src/status_im2/contexts/wallet/account/bridge/style.cljs +++ b/src/status_im/contexts/wallet/account/bridge/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.account.bridge.style) +(ns status-im.contexts.wallet.account.bridge.style) (def header-container {:padding-horizontal 20 diff --git a/src/status_im2/contexts/wallet/account/bridge/view.cljs b/src/status_im/contexts/wallet/account/bridge/view.cljs similarity index 80% rename from src/status_im2/contexts/wallet/account/bridge/view.cljs rename to src/status_im/contexts/wallet/account/bridge/view.cljs index bae5a81aad..be0df3d02d 100644 --- a/src/status_im2/contexts/wallet/account/bridge/view.cljs +++ b/src/status_im/contexts/wallet/account/bridge/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.wallet.account.bridge.view +(ns status-im.contexts.wallet.account.bridge.view (:require [quo.core :as quo] [quo.foundations.resources :as quo.resources] [react-native.core :as rn] - [status-im2.contexts.wallet.account.bridge.style :as style] - [status-im2.contexts.wallet.common.account-switcher.view :as account-switcher] - [status-im2.contexts.wallet.common.temp :as temp] + [status-im.contexts.wallet.account.bridge.style :as style] + [status-im.contexts.wallet.common.account-switcher.view :as account-switcher] + [status-im.contexts.wallet.common.temp :as temp] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/account/style.cljs b/src/status_im/contexts/wallet/account/style.cljs similarity index 57% rename from src/status_im2/contexts/wallet/account/style.cljs rename to src/status_im/contexts/wallet/account/style.cljs index bf878cbcd7..d53d7a1c46 100644 --- a/src/status_im2/contexts/wallet/account/style.cljs +++ b/src/status_im/contexts/wallet/account/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.account.style) +(ns status-im.contexts.wallet.account.style) (def tabs {:padding-left 20 diff --git a/src/status_im2/contexts/wallet/account/tabs/about/style.cljs b/src/status_im/contexts/wallet/account/tabs/about/style.cljs similarity index 62% rename from src/status_im2/contexts/wallet/account/tabs/about/style.cljs rename to src/status_im/contexts/wallet/account/tabs/about/style.cljs index a87bb22804..f91e97e932 100644 --- a/src/status_im2/contexts/wallet/account/tabs/about/style.cljs +++ b/src/status_im/contexts/wallet/account/tabs/about/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.account.tabs.about.style) +(ns status-im.contexts.wallet.account.tabs.about.style) (def about-tab {:flex 1 diff --git a/src/status_im2/contexts/wallet/account/tabs/about/view.cljs b/src/status_im/contexts/wallet/account/tabs/about/view.cljs similarity index 95% rename from src/status_im2/contexts/wallet/account/tabs/about/view.cljs rename to src/status_im/contexts/wallet/account/tabs/about/view.cljs index 50c7a9c7bd..fdedb0194e 100644 --- a/src/status_im2/contexts/wallet/account/tabs/about/view.cljs +++ b/src/status_im/contexts/wallet/account/tabs/about/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.wallet.account.tabs.about.view +(ns status-im.contexts.wallet.account.tabs.about.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.platform :as platform] [react-native.share :as share] - [status-im2.contexts.profile.utils :as profile.utils] - [status-im2.contexts.wallet.account.tabs.about.style :as style] + [status-im.contexts.profile.utils :as profile.utils] + [status-im.contexts.wallet.account.tabs.about.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/account/tabs/dapps/style.cljs b/src/status_im/contexts/wallet/account/tabs/dapps/style.cljs similarity index 88% rename from src/status_im2/contexts/wallet/account/tabs/dapps/style.cljs rename to src/status_im/contexts/wallet/account/tabs/dapps/style.cljs index 416ee92f8f..f5fde1c6ed 100644 --- a/src/status_im2/contexts/wallet/account/tabs/dapps/style.cljs +++ b/src/status_im/contexts/wallet/account/tabs/dapps/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.account.tabs.dapps.style +(ns status-im.contexts.wallet.account.tabs.dapps.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs b/src/status_im/contexts/wallet/account/tabs/dapps/view.cljs similarity index 82% rename from src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs rename to src/status_im/contexts/wallet/account/tabs/dapps/view.cljs index 57f0c6fe8a..8c798e69b8 100644 --- a/src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs +++ b/src/status_im/contexts/wallet/account/tabs/dapps/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.wallet.account.tabs.dapps.view +(ns status-im.contexts.wallet.account.tabs.dapps.view (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] - [status-im2.common.resources :as resources] - [status-im2.contexts.wallet.account.tabs.dapps.style :as style] - [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab] + [status-im.common.resources :as resources] + [status-im.contexts.wallet.account.tabs.dapps.style :as style] + [status-im.contexts.wallet.common.empty-tab.view :as empty-tab] [utils.i18n :as i18n])) (defn dapp-options diff --git a/src/status_im2/contexts/wallet/account/tabs/view.cljs b/src/status_im/contexts/wallet/account/tabs/view.cljs similarity index 64% rename from src/status_im2/contexts/wallet/account/tabs/view.cljs rename to src/status_im/contexts/wallet/account/tabs/view.cljs index eb08cb4e82..e105d3dcc1 100644 --- a/src/status_im2/contexts/wallet/account/tabs/view.cljs +++ b/src/status_im/contexts/wallet/account/tabs/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.wallet.account.tabs.view +(ns status-im.contexts.wallet.account.tabs.view (:require [react-native.core :as rn] - [status-im2.contexts.wallet.account.tabs.about.view :as about] - [status-im2.contexts.wallet.account.tabs.dapps.view :as dapps] - [status-im2.contexts.wallet.common.activity-tab.view :as activity] - [status-im2.contexts.wallet.common.collectibles-tab.view :as collectibles] - [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab] - [status-im2.contexts.wallet.common.token-value.view :as token-value] + [status-im.contexts.wallet.account.tabs.about.view :as about] + [status-im.contexts.wallet.account.tabs.dapps.view :as dapps] + [status-im.contexts.wallet.common.activity-tab.view :as activity] + [status-im.contexts.wallet.common.collectibles-tab.view :as collectibles] + [status-im.contexts.wallet.common.empty-tab.view :as empty-tab] + [status-im.contexts.wallet.common.token-value.view :as token-value] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/account/view.cljs b/src/status_im/contexts/wallet/account/view.cljs similarity index 87% rename from src/status_im2/contexts/wallet/account/view.cljs rename to src/status_im/contexts/wallet/account/view.cljs index a5d987f411..47b0e3d806 100644 --- a/src/status_im2/contexts/wallet/account/view.cljs +++ b/src/status_im/contexts/wallet/account/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.wallet.account.view +(ns status-im.contexts.wallet.account.view (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.wallet.account.style :as style] - [status-im2.contexts.wallet.account.tabs.view :as tabs] - [status-im2.contexts.wallet.common.account-switcher.view :as account-switcher] - [status-im2.contexts.wallet.common.temp :as temp] - [status-im2.contexts.wallet.common.utils :as utils] + [status-im.contexts.wallet.account.style :as style] + [status-im.contexts.wallet.account.tabs.view :as tabs] + [status-im.contexts.wallet.common.account-switcher.view :as account-switcher] + [status-im.contexts.wallet.common.temp :as temp] + [status-im.contexts.wallet.common.utils :as utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/component_spec.cljs b/src/status_im/contexts/wallet/add_address_to_watch/component_spec.cljs similarity index 91% rename from src/status_im2/contexts/wallet/add_address_to_watch/component_spec.cljs rename to src/status_im/contexts/wallet/add_address_to_watch/component_spec.cljs index 4deddd3809..3d60887783 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/component_spec.cljs +++ b/src/status_im/contexts/wallet/add_address_to_watch/component_spec.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.wallet.add-address-to-watch.component-spec +(ns status-im.contexts.wallet.add-address-to-watch.component-spec (:require [re-frame.core :as re-frame] - [status-im2.contexts.wallet.add-address-to-watch.view :as add-address-to-watch] + [status-im.contexts.wallet.add-address-to-watch.view :as add-address-to-watch] [test-helpers.component :as h])) (defn setup-subs diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/component_spec.cljs b/src/status_im/contexts/wallet/add_address_to_watch/confirm_address/component_spec.cljs similarity index 83% rename from src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/component_spec.cljs rename to src/status_im/contexts/wallet/add_address_to_watch/confirm_address/component_spec.cljs index 66905ec94a..81cae06d38 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/component_spec.cljs +++ b/src/status_im/contexts/wallet/add_address_to_watch/confirm_address/component_spec.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.wallet.add-address-to-watch.confirm-address.component-spec +(ns status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec (:require [re-frame.core :as re-frame] - [status-im2.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address] + [status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address] [test-helpers.component :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/style.cljs b/src/status_im/contexts/wallet/add_address_to_watch/confirm_address/style.cljs similarity index 62% rename from src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/style.cljs rename to src/status_im/contexts/wallet/add_address_to_watch/confirm_address/style.cljs index c322816c9a..e807808a27 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/style.cljs +++ b/src/status_im/contexts/wallet/add_address_to_watch/confirm_address/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.add-address-to-watch.confirm-address.style) +(ns status-im.contexts.wallet.add-address-to-watch.confirm-address.style) (def container {:flex 1}) diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/view.cljs b/src/status_im/contexts/wallet/add_address_to_watch/confirm_address/view.cljs similarity index 91% rename from src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/view.cljs rename to src/status_im/contexts/wallet/add_address_to_watch/confirm_address/view.cljs index 755a1ae926..bda93cb1c5 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/confirm_address/view.cljs +++ b/src/status_im/contexts/wallet/add_address_to_watch/confirm_address/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.wallet.add-address-to-watch.confirm-address.view +(ns status-im.contexts.wallet.add-address-to-watch.confirm-address.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.emoji-picker.utils :as emoji-picker.utils] - [status-im2.contexts.wallet.add-address-to-watch.confirm-address.style :as style] - [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view :as + [status-im.contexts.emoji-picker.utils :as emoji-picker.utils] + [status-im.contexts.wallet.add-address-to-watch.confirm-address.style :as style] + [status-im.contexts.wallet.common.screen-base.create-or-edit-account.view :as create-or-edit-account] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/style.cljs b/src/status_im/contexts/wallet/add_address_to_watch/style.cljs similarity index 84% rename from src/status_im2/contexts/wallet/add_address_to_watch/style.cljs rename to src/status_im/contexts/wallet/add_address_to_watch/style.cljs index 4dc271f798..b08c4128da 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/style.cljs +++ b/src/status_im/contexts/wallet/add_address_to_watch/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.add-address-to-watch.style) +(ns status-im.contexts.wallet.add-address-to-watch.style) (def header-container {:margin-horizontal 20 diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/view.cljs b/src/status_im/contexts/wallet/add_address_to_watch/view.cljs similarity index 96% rename from src/status_im2/contexts/wallet/add_address_to_watch/view.cljs rename to src/status_im/contexts/wallet/add_address_to_watch/view.cljs index 02386fde4d..5dc0086ff0 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/view.cljs +++ b/src/status_im/contexts/wallet/add_address_to_watch/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.wallet.add-address-to-watch.view +(ns status-im.contexts.wallet.add-address-to-watch.view (:require [clojure.string :as string] [quo.core :as quo] [react-native.clipboard :as clipboard] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.floating-button-page.view :as floating-button-page] - [status-im2.contexts.wallet.add-address-to-watch.style :as style] - [status-im2.contexts.wallet.common.validation :as validation] + [status-im.common.floating-button-page.view :as floating-button-page] + [status-im.contexts.wallet.add-address-to-watch.style :as style] + [status-im.contexts.wallet.common.validation :as validation] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/collectible/style.cljs b/src/status_im/contexts/wallet/collectible/style.cljs similarity index 95% rename from src/status_im2/contexts/wallet/collectible/style.cljs rename to src/status_im/contexts/wallet/collectible/style.cljs index 50c6a0cb44..b9f5c7cf82 100644 --- a/src/status_im2/contexts/wallet/collectible/style.cljs +++ b/src/status_im/contexts/wallet/collectible/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.collectible.style) +(ns status-im.contexts.wallet.collectible.style) (def container {:margin-top 100 diff --git a/src/status_im2/contexts/wallet/collectible/view.cljs b/src/status_im/contexts/wallet/collectible/view.cljs similarity index 97% rename from src/status_im2/contexts/wallet/collectible/view.cljs rename to src/status_im/contexts/wallet/collectible/view.cljs index 4e62dbe5e9..4ce18aed2e 100644 --- a/src/status_im2/contexts/wallet/collectible/view.cljs +++ b/src/status_im/contexts/wallet/collectible/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.wallet.collectible.view +(ns status-im.contexts.wallet.collectible.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.resources :as quo.resources] [quo.theme :as quo.theme] [react-native.core :as rn] - [status-im2.common.scroll-page.view :as scroll-page] - [status-im2.contexts.wallet.collectible.style :as style] + [status-im.common.scroll-page.view :as scroll-page] + [status-im.contexts.wallet.collectible.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/common/account_switcher/view.cljs b/src/status_im/contexts/wallet/common/account_switcher/view.cljs similarity index 84% rename from src/status_im2/contexts/wallet/common/account_switcher/view.cljs rename to src/status_im/contexts/wallet/common/account_switcher/view.cljs index 2b0c58016d..a5fb849bb1 100644 --- a/src/status_im2/contexts/wallet/common/account_switcher/view.cljs +++ b/src/status_im/contexts/wallet/common/account_switcher/view.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.wallet.common.account-switcher.view +(ns status-im.contexts.wallet.common.account-switcher.view (:require [quo.core :as quo] - [status-im2.contexts.wallet.common.sheets.account-options.view :as account-options] - [status-im2.contexts.wallet.common.sheets.select-account.view :as select-account] + [status-im.contexts.wallet.common.sheets.account-options.view :as account-options] + [status-im.contexts.wallet.common.sheets.select-account.view :as select-account] [utils.re-frame :as rf])) (defn get-bottom-sheet-args diff --git a/src/status_im2/contexts/wallet/common/activity_tab/view.cljs b/src/status_im/contexts/wallet/common/activity_tab/view.cljs similarity index 81% rename from src/status_im2/contexts/wallet/common/activity_tab/view.cljs rename to src/status_im/contexts/wallet/common/activity_tab/view.cljs index 6744d674d4..75b8632ce1 100644 --- a/src/status_im2/contexts/wallet/common/activity_tab/view.cljs +++ b/src/status_im/contexts/wallet/common/activity_tab/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.wallet.common.activity-tab.view +(ns status-im.contexts.wallet.common.activity-tab.view (:require [quo.core :as quo] [quo.theme] [react-native.core :as rn] - [status-im2.common.resources :as resources] - [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab] + [status-im.common.resources :as resources] + [status-im.contexts.wallet.common.empty-tab.view :as empty-tab] [utils.i18n :as i18n])) (defn activity-item diff --git a/src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs b/src/status_im/contexts/wallet/common/collectibles_tab/view.cljs similarity index 87% rename from src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs rename to src/status_im/contexts/wallet/common/collectibles_tab/view.cljs index 4f0dddeedb..e514fabd99 100644 --- a/src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs +++ b/src/status_im/contexts/wallet/common/collectibles_tab/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.wallet.common.collectibles-tab.view +(ns status-im.contexts.wallet.common.collectibles-tab.view (:require [quo.core :as quo] [quo.theme] [react-native.core :as rn] - [status-im2.common.resources :as resources] - [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab] + [status-im.common.resources :as resources] + [status-im.contexts.wallet.common.empty-tab.view :as empty-tab] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/common/empty_tab/style.cljs b/src/status_im/contexts/wallet/common/empty_tab/style.cljs similarity index 65% rename from src/status_im2/contexts/wallet/common/empty_tab/style.cljs rename to src/status_im/contexts/wallet/common/empty_tab/style.cljs index af2c08ca1c..e43773b853 100644 --- a/src/status_im2/contexts/wallet/common/empty_tab/style.cljs +++ b/src/status_im/contexts/wallet/common/empty_tab/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.common.empty-tab.style) +(ns status-im.contexts.wallet.common.empty-tab.style) (def empty-container-style {:justify-content :center diff --git a/src/status_im2/contexts/wallet/common/empty_tab/view.cljs b/src/status_im/contexts/wallet/common/empty_tab/view.cljs similarity index 53% rename from src/status_im2/contexts/wallet/common/empty_tab/view.cljs rename to src/status_im/contexts/wallet/common/empty_tab/view.cljs index 041dcb6887..3ee724dbb4 100644 --- a/src/status_im2/contexts/wallet/common/empty_tab/view.cljs +++ b/src/status_im/contexts/wallet/common/empty_tab/view.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.wallet.common.empty-tab.view +(ns status-im.contexts.wallet.common.empty-tab.view (:require [quo.core :as quo] - [status-im2.contexts.wallet.common.empty-tab.style :as style])) + [status-im.contexts.wallet.common.empty-tab.style :as style])) (defn view [props] diff --git a/src/status_im2/contexts/wallet/common/screen_base/create_or_edit_account/style.cljs b/src/status_im/contexts/wallet/common/screen_base/create_or_edit_account/style.cljs similarity index 92% rename from src/status_im2/contexts/wallet/common/screen_base/create_or_edit_account/style.cljs rename to src/status_im/contexts/wallet/common/screen_base/create_or_edit_account/style.cljs index 99561c94ba..5b306198e3 100644 --- a/src/status_im2/contexts/wallet/common/screen_base/create_or_edit_account/style.cljs +++ b/src/status_im/contexts/wallet/common/screen_base/create_or_edit_account/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.common.screen-base.create-or-edit-account.style) +(ns status-im.contexts.wallet.common.screen-base.create-or-edit-account.style) (defn root-container [top] diff --git a/src/status_im2/contexts/wallet/common/screen_base/create_or_edit_account/view.cljs b/src/status_im/contexts/wallet/common/screen_base/create_or_edit_account/view.cljs similarity index 93% rename from src/status_im2/contexts/wallet/common/screen_base/create_or_edit_account/view.cljs rename to src/status_im/contexts/wallet/common/screen_base/create_or_edit_account/view.cljs index 7609dfd681..0dc7cca68c 100644 --- a/src/status_im2/contexts/wallet/common/screen_base/create_or_edit_account/view.cljs +++ b/src/status_im/contexts/wallet/common/screen_base/create_or_edit_account/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view +(ns status-im.contexts.wallet.common.screen-base.create-or-edit-account.view (:require [quo.core :as quo] [react-native.core :as rn] [react-native.safe-area :as safe-area] - [status-im2.constants :as constants] - [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.style :as style] + [status-im.constants :as constants] + [status-im.contexts.wallet.common.screen-base.create-or-edit-account.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/common/sheets/account_options/style.cljs b/src/status_im/contexts/wallet/common/sheets/account_options/style.cljs similarity index 89% rename from src/status_im2/contexts/wallet/common/sheets/account_options/style.cljs rename to src/status_im/contexts/wallet/common/sheets/account_options/style.cljs index 77001a7ec6..6528684982 100644 --- a/src/status_im2/contexts/wallet/common/sheets/account_options/style.cljs +++ b/src/status_im/contexts/wallet/common/sheets/account_options/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.common.sheets.account-options.style) +(ns status-im.contexts.wallet.common.sheets.account-options.style) (def drawer-section-label {:padding-horizontal 20 diff --git a/src/status_im2/contexts/wallet/common/sheets/account_options/view.cljs b/src/status_im/contexts/wallet/common/sheets/account_options/view.cljs similarity index 96% rename from src/status_im2/contexts/wallet/common/sheets/account_options/view.cljs rename to src/status_im/contexts/wallet/common/sheets/account_options/view.cljs index 37e245c2d8..6c0eafb980 100644 --- a/src/status_im2/contexts/wallet/common/sheets/account_options/view.cljs +++ b/src/status_im/contexts/wallet/common/sheets/account_options/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.common.sheets.account-options.view +(ns status-im.contexts.wallet.common.sheets.account-options.view (:require [oops.core :as oops] [quo.core :as quo] [quo.foundations.colors :as colors] @@ -9,7 +9,7 @@ [react-native.gesture :as gesture] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im2.contexts.wallet.common.sheets.account-options.style :as style] + [status-im.contexts.wallet.common.sheets.account-options.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/common/sheets/network_preferences/style.cljs b/src/status_im/contexts/wallet/common/sheets/network_preferences/style.cljs new file mode 100644 index 0000000000..db3312130b --- /dev/null +++ b/src/status_im/contexts/wallet/common/sheets/network_preferences/style.cljs @@ -0,0 +1,5 @@ +(ns status-im.contexts.wallet.common.sheets.network-preferences.style) + +(def data-item + {:margin-horizontal 20 + :margin-vertical 8}) diff --git a/src/status_im2/contexts/wallet/common/sheets/network_preferences/view.cljs b/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs similarity index 97% rename from src/status_im2/contexts/wallet/common/sheets/network_preferences/view.cljs rename to src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs index 89bfb2ac40..5b8cf52630 100644 --- a/src/status_im2/contexts/wallet/common/sheets/network_preferences/view.cljs +++ b/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs @@ -1,11 +1,11 @@ -(ns status-im2.contexts.wallet.common.sheets.network-preferences.view +(ns status-im.contexts.wallet.common.sheets.network-preferences.view (:require [clojure.string :as string] [quo.core :as quo] [quo.foundations.colors :as colors] [quo.foundations.resources :as resources] [quo.theme :as quo.theme] [reagent.core :as reagent] - [status-im2.contexts.wallet.common.sheets.network-preferences.style :as style] + [status-im.contexts.wallet.common.sheets.network-preferences.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/common/sheets/select_account/style.cljs b/src/status_im/contexts/wallet/common/sheets/select_account/style.cljs new file mode 100644 index 0000000000..58a08cc0f0 --- /dev/null +++ b/src/status_im/contexts/wallet/common/sheets/select_account/style.cljs @@ -0,0 +1,4 @@ +(ns status-im.contexts.wallet.common.sheets.select-account.style) + +(def list-container + {:margin-horizontal 8}) diff --git a/src/status_im2/contexts/wallet/common/sheets/select_account/view.cljs b/src/status_im/contexts/wallet/common/sheets/select_account/view.cljs similarity index 90% rename from src/status_im2/contexts/wallet/common/sheets/select_account/view.cljs rename to src/status_im/contexts/wallet/common/sheets/select_account/view.cljs index 0ff206bd03..70f467b6ff 100644 --- a/src/status_im2/contexts/wallet/common/sheets/select_account/view.cljs +++ b/src/status_im/contexts/wallet/common/sheets/select_account/view.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.wallet.common.sheets.select-account.view +(ns status-im.contexts.wallet.common.sheets.select-account.view (:require [quo.core :as quo] quo.theme [react-native.gesture :as gesture] - [status-im2.contexts.wallet.common.sheets.select-account.style :as style] + [status-im.contexts.wallet.common.sheets.select-account.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/common/temp.cljs b/src/status_im/contexts/wallet/common/temp.cljs similarity index 97% rename from src/status_im2/contexts/wallet/common/temp.cljs rename to src/status_im/contexts/wallet/common/temp.cljs index 1b52814e2f..16a8618281 100644 --- a/src/status_im2/contexts/wallet/common/temp.cljs +++ b/src/status_im/contexts/wallet/common/temp.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.wallet.common.temp +(ns status-im.contexts.wallet.common.temp (:require [react-native.core :as rn] - [status-im2.common.resources :as status.resources] + [status-im.common.resources :as status.resources] [utils.i18n :as i18n])) (defn wallet-overview-state diff --git a/src/status_im2/contexts/wallet/common/token_value/view.cljs b/src/status_im/contexts/wallet/common/token_value/view.cljs similarity index 95% rename from src/status_im2/contexts/wallet/common/token_value/view.cljs rename to src/status_im/contexts/wallet/common/token_value/view.cljs index ed96c2ade4..98c2c0cb03 100644 --- a/src/status_im2/contexts/wallet/common/token_value/view.cljs +++ b/src/status_im/contexts/wallet/common/token_value/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.common.token-value.view +(ns status-im.contexts.wallet.common.token-value.view (:require [quo.core :as quo] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/common/utils.cljs b/src/status_im/contexts/wallet/common/utils.cljs similarity index 97% rename from src/status_im2/contexts/wallet/common/utils.cljs rename to src/status_im/contexts/wallet/common/utils.cljs index f396ec8071..b7c4329547 100644 --- a/src/status_im2/contexts/wallet/common/utils.cljs +++ b/src/status_im/contexts/wallet/common/utils.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.wallet.common.utils +(ns status-im.contexts.wallet.common.utils (:require [clojure.string :as string] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.money :as money] [utils.number])) diff --git a/src/status_im2/contexts/wallet/common/validation.cljs b/src/status_im/contexts/wallet/common/validation.cljs similarity index 52% rename from src/status_im2/contexts/wallet/common/validation.cljs rename to src/status_im/contexts/wallet/common/validation.cljs index eb793c52f5..2e9ab0d379 100644 --- a/src/status_im2/contexts/wallet/common/validation.cljs +++ b/src/status_im/contexts/wallet/common/validation.cljs @@ -1,5 +1,5 @@ -(ns status-im2.contexts.wallet.common.validation - (:require [status-im2.constants :as constants])) +(ns status-im.contexts.wallet.common.validation + (:require [status-im.constants :as constants])) (defn ens-name? [s] (re-find constants/regx-ens s)) (defn eth-address? [s] (re-find constants/regx-address s)) diff --git a/src/status_im2/contexts/wallet/create_account/backup_recovery_phrase/style.cljs b/src/status_im/contexts/wallet/create_account/backup_recovery_phrase/style.cljs similarity index 95% rename from src/status_im2/contexts/wallet/create_account/backup_recovery_phrase/style.cljs rename to src/status_im/contexts/wallet/create_account/backup_recovery_phrase/style.cljs index 5cda62a059..b094592947 100644 --- a/src/status_im2/contexts/wallet/create_account/backup_recovery_phrase/style.cljs +++ b/src/status_im/contexts/wallet/create_account/backup_recovery_phrase/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.create-account.backup-recovery-phrase.style +(ns status-im.contexts.wallet.create-account.backup-recovery-phrase.style (:require [quo.foundations.colors :as colors] [quo.theme :as quo.theme] diff --git a/src/status_im2/contexts/wallet/create_account/backup_recovery_phrase/view.cljs b/src/status_im/contexts/wallet/create_account/backup_recovery_phrase/view.cljs similarity index 94% rename from src/status_im2/contexts/wallet/create_account/backup_recovery_phrase/view.cljs rename to src/status_im/contexts/wallet/create_account/backup_recovery_phrase/view.cljs index 62da279257..4444821de4 100644 --- a/src/status_im2/contexts/wallet/create_account/backup_recovery_phrase/view.cljs +++ b/src/status_im/contexts/wallet/create_account/backup_recovery_phrase/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.wallet.create-account.backup-recovery-phrase.view +(ns status-im.contexts.wallet.create-account.backup-recovery-phrase.view (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.blur :as blur] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.wallet.common.temp :as temp] - [status-im2.contexts.wallet.create-account.backup-recovery-phrase.style :as style] + [status-im.contexts.wallet.common.temp :as temp] + [status-im.contexts.wallet.create-account.backup-recovery-phrase.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/create_account/edit_derivation_path/component_spec.cljs b/src/status_im/contexts/wallet/create_account/edit_derivation_path/component_spec.cljs similarity index 86% rename from src/status_im2/contexts/wallet/create_account/edit_derivation_path/component_spec.cljs rename to src/status_im/contexts/wallet/create_account/edit_derivation_path/component_spec.cljs index 3047e28a2f..48cfe8f2ee 100644 --- a/src/status_im2/contexts/wallet/create_account/edit_derivation_path/component_spec.cljs +++ b/src/status_im/contexts/wallet/create_account/edit_derivation_path/component_spec.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.wallet.create-account.edit-derivation-path.component-spec +(ns status-im.contexts.wallet.create-account.edit-derivation-path.component-spec (:require - [status-im2.contexts.wallet.create-account.edit-derivation-path.view :as edit-derivation-path] + [status-im.contexts.wallet.create-account.edit-derivation-path.view :as edit-derivation-path] [test-helpers.component :as h])) (h/describe "Edit derivation path page" diff --git a/src/status_im2/contexts/wallet/create_account/edit_derivation_path/style.cljs b/src/status_im/contexts/wallet/create_account/edit_derivation_path/style.cljs similarity index 93% rename from src/status_im2/contexts/wallet/create_account/edit_derivation_path/style.cljs rename to src/status_im/contexts/wallet/create_account/edit_derivation_path/style.cljs index 82b928498e..1bf011d421 100644 --- a/src/status_im2/contexts/wallet/create_account/edit_derivation_path/style.cljs +++ b/src/status_im/contexts/wallet/create_account/edit_derivation_path/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.create-account.edit-derivation-path.style +(ns status-im.contexts.wallet.create-account.edit-derivation-path.style (:require [quo.foundations.colors :as colors])) (defn screen diff --git a/src/status_im2/contexts/wallet/create_account/edit_derivation_path/view.cljs b/src/status_im/contexts/wallet/create_account/edit_derivation_path/view.cljs similarity index 94% rename from src/status_im2/contexts/wallet/create_account/edit_derivation_path/view.cljs rename to src/status_im/contexts/wallet/create_account/edit_derivation_path/view.cljs index ba69ba8f0b..210c0d54aa 100644 --- a/src/status_im2/contexts/wallet/create_account/edit_derivation_path/view.cljs +++ b/src/status_im/contexts/wallet/create_account/edit_derivation_path/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.wallet.create-account.edit-derivation-path.view +(ns status-im.contexts.wallet.create-account.edit-derivation-path.view (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.wallet.common.temp :as temp] - [status-im2.contexts.wallet.common.utils :as utils] - [status-im2.contexts.wallet.create-account.edit-derivation-path.style :as style] + [status-im.contexts.wallet.common.temp :as temp] + [status-im.contexts.wallet.common.utils :as utils] + [status-im.contexts.wallet.create-account.edit-derivation-path.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/create_account/select_keypair/style.cljs b/src/status_im/contexts/wallet/create_account/select_keypair/style.cljs similarity index 74% rename from src/status_im2/contexts/wallet/create_account/select_keypair/style.cljs rename to src/status_im/contexts/wallet/create_account/select_keypair/style.cljs index f29ed26c6c..9057d08f09 100644 --- a/src/status_im2/contexts/wallet/create_account/select_keypair/style.cljs +++ b/src/status_im/contexts/wallet/create_account/select_keypair/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.create-account.select-keypair.style) +(ns status-im.contexts.wallet.create-account.select-keypair.style) (def header-container {:margin-horizontal 20 diff --git a/src/status_im2/contexts/wallet/create_account/select_keypair/view.cljs b/src/status_im/contexts/wallet/create_account/select_keypair/view.cljs similarity index 94% rename from src/status_im2/contexts/wallet/create_account/select_keypair/view.cljs rename to src/status_im/contexts/wallet/create_account/select_keypair/view.cljs index e749908555..cef2cb115b 100644 --- a/src/status_im2/contexts/wallet/create_account/select_keypair/view.cljs +++ b/src/status_im/contexts/wallet/create_account/select_keypair/view.cljs @@ -1,9 +1,9 @@ -(ns status-im2.contexts.wallet.create-account.select-keypair.view +(ns status-im.contexts.wallet.create-account.select-keypair.view (:require [quo.core :as quo] [react-native.core :as rn] - [status-im2.contexts.profile.utils :as profile.utils] - [status-im2.contexts.wallet.create-account.select-keypair.style :as style] + [status-im.contexts.profile.utils :as profile.utils] + [status-im.contexts.wallet.create-account.select-keypair.style :as style] [utils.address :as utils] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/create_account/style.cljs b/src/status_im/contexts/wallet/create_account/style.cljs similarity index 94% rename from src/status_im2/contexts/wallet/create_account/style.cljs rename to src/status_im/contexts/wallet/create_account/style.cljs index b7185bcf95..31d5fe948b 100644 --- a/src/status_im2/contexts/wallet/create_account/style.cljs +++ b/src/status_im/contexts/wallet/create_account/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.create-account.style +(ns status-im.contexts.wallet.create-account.style (:require [quo.foundations.colors :as colors])) diff --git a/src/status_im2/contexts/wallet/create_account/view.cljs b/src/status_im/contexts/wallet/create_account/view.cljs similarity index 94% rename from src/status_im2/contexts/wallet/create_account/view.cljs rename to src/status_im/contexts/wallet/create_account/view.cljs index 9aa9d74e19..755fd3e769 100644 --- a/src/status_im2/contexts/wallet/create_account/view.cljs +++ b/src/status_im/contexts/wallet/create_account/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.create-account.view +(ns status-im.contexts.wallet.create-account.view (:require [clojure.string :as string] [quo.core :as quo] @@ -7,11 +7,11 @@ [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.standard-authentication.core :as standard-auth] - [status-im2.constants :as constants] - [status-im2.contexts.emoji-picker.utils :as emoji-picker.utils] - [status-im2.contexts.wallet.common.utils :as utils] - [status-im2.contexts.wallet.create-account.style :as style] + [status-im.common.standard-authentication.core :as standard-auth] + [status-im.constants :as constants] + [status-im.contexts.emoji-picker.utils :as emoji-picker.utils] + [status-im.contexts.wallet.common.utils :as utils] + [status-im.contexts.wallet.create-account.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.responsiveness :refer [iphone-11-Pro-20-pixel-from-width]] diff --git a/src/status_im2/contexts/wallet/edit_account/style.cljs b/src/status_im/contexts/wallet/edit_account/style.cljs similarity index 56% rename from src/status_im2/contexts/wallet/edit_account/style.cljs rename to src/status_im/contexts/wallet/edit_account/style.cljs index b9de37aded..a00dfffbd3 100644 --- a/src/status_im2/contexts/wallet/edit_account/style.cljs +++ b/src/status_im/contexts/wallet/edit_account/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.edit-account.style) +(ns status-im.contexts.wallet.edit-account.style) (def data-item {:margin-horizontal 20 diff --git a/src/status_im2/contexts/wallet/edit_account/view.cljs b/src/status_im/contexts/wallet/edit_account/view.cljs similarity index 95% rename from src/status_im2/contexts/wallet/edit_account/view.cljs rename to src/status_im/contexts/wallet/edit_account/view.cljs index 31e2917852..3abfdb9b51 100644 --- a/src/status_im2/contexts/wallet/edit_account/view.cljs +++ b/src/status_im/contexts/wallet/edit_account/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.wallet.edit-account.view +(ns status-im.contexts.wallet.edit-account.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [quo.theme :as quo.theme] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view + [status-im.contexts.wallet.common.screen-base.create-or-edit-account.view :as create-or-edit-account] - [status-im2.contexts.wallet.common.sheets.network-preferences.view + [status-im.contexts.wallet.common.sheets.network-preferences.view :as network-preferences] - [status-im2.contexts.wallet.edit-account.style :as style] + [status-im.contexts.wallet.edit-account.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/events.cljs b/src/status_im/contexts/wallet/events.cljs similarity index 98% rename from src/status_im2/contexts/wallet/events.cljs rename to src/status_im/contexts/wallet/events.cljs index 6c4391f662..848b51d149 100644 --- a/src/status_im2/contexts/wallet/events.cljs +++ b/src/status_im/contexts/wallet/events.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.wallet.events +(ns status-im.contexts.wallet.events (:require [camel-snake-kebab.core :as csk] [camel-snake-kebab.extras :as cske] [clojure.string :as string] [quo.foundations.colors :as colors] [react-native.background-timer :as background-timer] - [status-im2.common.data-store.wallet :as data-store] - [status-im2.contexts.wallet.item-types :as item-types] - [status-im2.contexts.wallet.temp :as temp] + [status-im.common.data-store.wallet :as data-store] + [status-im.contexts.wallet.item-types :as item-types] + [status-im.contexts.wallet.temp :as temp] [taoensso.timbre :as log] [utils.ethereum.chain :as chain] [utils.ethereum.eip.eip55 :as eip55] diff --git a/src/status_im2/contexts/wallet/events_test.cljs b/src/status_im/contexts/wallet/events_test.cljs similarity index 97% rename from src/status_im2/contexts/wallet/events_test.cljs rename to src/status_im/contexts/wallet/events_test.cljs index e3ef3429bf..cbdd2caf56 100644 --- a/src/status_im2/contexts/wallet/events_test.cljs +++ b/src/status_im/contexts/wallet/events_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.contexts.wallet.events-test +(ns status-im.contexts.wallet.events-test (:require [cljs.test :refer-macros [deftest is testing]] matcher-combinators.test - [status-im2.contexts.wallet.events :as events])) + [status-im.contexts.wallet.events :as events])) (def address "0x2f88d65f3cb52605a54a833ae118fb1363acccd2") diff --git a/src/status_im2/contexts/wallet/home/style.cljs b/src/status_im/contexts/wallet/home/style.cljs similarity index 92% rename from src/status_im2/contexts/wallet/home/style.cljs rename to src/status_im/contexts/wallet/home/style.cljs index 62f6b6c95d..25690816ba 100644 --- a/src/status_im2/contexts/wallet/home/style.cljs +++ b/src/status_im/contexts/wallet/home/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.home.style +(ns status-im.contexts.wallet.home.style (:require [react-native.safe-area :as safe-area])) diff --git a/src/status_im2/contexts/wallet/home/view.cljs b/src/status_im/contexts/wallet/home/view.cljs similarity index 89% rename from src/status_im2/contexts/wallet/home/view.cljs rename to src/status_im/contexts/wallet/home/view.cljs index 5467dfb4b5..82aafc26fb 100644 --- a/src/status_im2/contexts/wallet/home/view.cljs +++ b/src/status_im/contexts/wallet/home/view.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.wallet.home.view +(ns status-im.contexts.wallet.home.view (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.common.home.top-nav.view :as common.top-nav] - [status-im2.contexts.wallet.common.activity-tab.view :as activity] - [status-im2.contexts.wallet.common.collectibles-tab.view :as collectibles] - [status-im2.contexts.wallet.common.temp :as temp] - [status-im2.contexts.wallet.home.style :as style] + [status-im.common.home.top-nav.view :as common.top-nav] + [status-im.contexts.wallet.common.activity-tab.view :as activity] + [status-im.contexts.wallet.common.collectibles-tab.view :as collectibles] + [status-im.contexts.wallet.common.temp :as temp] + [status-im.contexts.wallet.home.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/item_types.cljs b/src/status_im/contexts/wallet/item_types.cljs similarity index 84% rename from src/status_im2/contexts/wallet/item_types.cljs rename to src/status_im/contexts/wallet/item_types.cljs index 0436d9d3ab..b7b7502dac 100644 --- a/src/status_im2/contexts/wallet/item_types.cljs +++ b/src/status_im/contexts/wallet/item_types.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.item-types) +(ns status-im.contexts.wallet.item-types) (def ^:const no-type 0) (def ^:const account 1) diff --git a/src/status_im2/contexts/wallet/saved_address/view.cljs b/src/status_im/contexts/wallet/saved_address/view.cljs similarity index 87% rename from src/status_im2/contexts/wallet/saved_address/view.cljs rename to src/status_im/contexts/wallet/saved_address/view.cljs index e430de4f36..29868dc72e 100644 --- a/src/status_im2/contexts/wallet/saved_address/view.cljs +++ b/src/status_im/contexts/wallet/saved_address/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.saved-address.view +(ns status-im.contexts.wallet.saved-address.view (:require [quo.core :as quo] [re-frame.core :as rf] diff --git a/src/status_im2/contexts/wallet/saved_addresses/view.cljs b/src/status_im/contexts/wallet/saved_addresses/view.cljs similarity index 90% rename from src/status_im2/contexts/wallet/saved_addresses/view.cljs rename to src/status_im/contexts/wallet/saved_addresses/view.cljs index 15cdbe1573..79b82a731a 100644 --- a/src/status_im2/contexts/wallet/saved_addresses/view.cljs +++ b/src/status_im/contexts/wallet/saved_addresses/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.saved-addresses.view +(ns status-im.contexts.wallet.saved-addresses.view (:require [quo.core :as quo] [re-frame.core :as rf] diff --git a/src/status_im2/contexts/wallet/scan_account/view.cljs b/src/status_im/contexts/wallet/scan_account/view.cljs similarity index 82% rename from src/status_im2/contexts/wallet/scan_account/view.cljs rename to src/status_im/contexts/wallet/scan_account/view.cljs index 78cfcfa897..707995187e 100644 --- a/src/status_im2/contexts/wallet/scan_account/view.cljs +++ b/src/status_im/contexts/wallet/scan_account/view.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.wallet.scan-account.view - (:require [status-im2.common.scan-qr-code.view :as scan-qr-code] - [status-im2.constants :as constants] +(ns status-im.contexts.wallet.scan-account.view + (:require [status-im.common.scan-qr-code.view :as scan-qr-code] + [status-im.constants :as constants] [utils.debounce :as debounce] [utils.i18n :as i18n])) diff --git a/src/status_im2/contexts/wallet/send/events.cljs b/src/status_im/contexts/wallet/send/events.cljs similarity index 98% rename from src/status_im2/contexts/wallet/send/events.cljs rename to src/status_im/contexts/wallet/send/events.cljs index 0de18827e8..e6c528038f 100644 --- a/src/status_im2/contexts/wallet/send/events.cljs +++ b/src/status_im/contexts/wallet/send/events.cljs @@ -1,6 +1,6 @@ -(ns status-im2.contexts.wallet.send.events +(ns status-im.contexts.wallet.send.events (:require - [status-im2.constants :as constants] + [status-im.constants :as constants] [taoensso.timbre :as log] [utils.money :as money] [utils.number] diff --git a/src/status_im2/contexts/wallet/send/input_amount/component_spec.cljs b/src/status_im/contexts/wallet/send/input_amount/component_spec.cljs similarity index 97% rename from src/status_im2/contexts/wallet/send/input_amount/component_spec.cljs rename to src/status_im/contexts/wallet/send/input_amount/component_spec.cljs index 2a69c5867f..76bdccef22 100644 --- a/src/status_im2/contexts/wallet/send/input_amount/component_spec.cljs +++ b/src/status_im/contexts/wallet/send/input_amount/component_spec.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.wallet.send.input-amount.component-spec +(ns status-im.contexts.wallet.send.input-amount.component-spec (:require [re-frame.core :as re-frame] - [status-im2.contexts.wallet.send.input-amount.view :as input-amount] + [status-im.contexts.wallet.send.input-amount.view :as input-amount] [test-helpers.component :as h])) (defn setup-subs diff --git a/src/status_im2/contexts/wallet/send/input_amount/style.cljs b/src/status_im/contexts/wallet/send/input_amount/style.cljs similarity index 73% rename from src/status_im2/contexts/wallet/send/input_amount/style.cljs rename to src/status_im/contexts/wallet/send/input_amount/style.cljs index 315dc5ca1b..0f9b1d2971 100644 --- a/src/status_im2/contexts/wallet/send/input_amount/style.cljs +++ b/src/status_im/contexts/wallet/send/input_amount/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.send.input-amount.style) +(ns status-im.contexts.wallet.send.input-amount.style) (def screen {:flex 1}) diff --git a/src/status_im2/contexts/wallet/send/input_amount/view.cljs b/src/status_im/contexts/wallet/send/input_amount/view.cljs similarity index 97% rename from src/status_im2/contexts/wallet/send/input_amount/view.cljs rename to src/status_im/contexts/wallet/send/input_amount/view.cljs index eefabd678a..43d7dace14 100644 --- a/src/status_im2/contexts/wallet/send/input_amount/view.cljs +++ b/src/status_im/contexts/wallet/send/input_amount/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.send.input-amount.view +(ns status-im.contexts.wallet.send.input-amount.view (:require [clojure.string :as string] [quo.core :as quo] @@ -6,8 +6,8 @@ [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.wallet.common.account-switcher.view :as account-switcher] - [status-im2.contexts.wallet.send.input-amount.style :as style] + [status-im.contexts.wallet.common.account-switcher.view :as account-switcher] + [status-im.contexts.wallet.send.input-amount.style :as style] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/send/select_address/style.cljs b/src/status_im/contexts/wallet/send/select_address/style.cljs similarity index 84% rename from src/status_im2/contexts/wallet/send/select_address/style.cljs rename to src/status_im/contexts/wallet/send/select_address/style.cljs index a3ff3771b0..b081b5e8fc 100644 --- a/src/status_im2/contexts/wallet/send/select_address/style.cljs +++ b/src/status_im/contexts/wallet/send/select_address/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.send.select-address.style) +(ns status-im.contexts.wallet.send.select-address.style) (def container {:flex 1}) diff --git a/src/status_im2/contexts/wallet/send/select_address/tabs/style.cljs b/src/status_im/contexts/wallet/send/select_address/tabs/style.cljs similarity index 73% rename from src/status_im2/contexts/wallet/send/select_address/tabs/style.cljs rename to src/status_im/contexts/wallet/send/select_address/tabs/style.cljs index 7d8a35430a..f0a879d205 100644 --- a/src/status_im2/contexts/wallet/send/select_address/tabs/style.cljs +++ b/src/status_im/contexts/wallet/send/select_address/tabs/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.send.select-address.tabs.style) +(ns status-im.contexts.wallet.send.select-address.tabs.style) (def empty-container-style {:justify-content :center diff --git a/src/status_im2/contexts/wallet/send/select_address/tabs/view.cljs b/src/status_im/contexts/wallet/send/select_address/tabs/view.cljs similarity index 93% rename from src/status_im2/contexts/wallet/send/select_address/tabs/view.cljs rename to src/status_im/contexts/wallet/send/select_address/tabs/view.cljs index a0be1c07ac..ef3aa7a54d 100644 --- a/src/status_im2/contexts/wallet/send/select_address/tabs/view.cljs +++ b/src/status_im/contexts/wallet/send/select_address/tabs/view.cljs @@ -1,10 +1,10 @@ -(ns status-im2.contexts.wallet.send.select-address.tabs.view +(ns status-im.contexts.wallet.send.select-address.tabs.view (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.gesture :as gesture] - [status-im2.common.resources :as resources] - [status-im2.contexts.wallet.send.select-address.tabs.style :as style] + [status-im.common.resources :as resources] + [status-im.contexts.wallet.send.select-address.tabs.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/send/select_address/view.cljs b/src/status_im/contexts/wallet/send/select_address/view.cljs similarity index 95% rename from src/status_im2/contexts/wallet/send/select_address/view.cljs rename to src/status_im/contexts/wallet/send/select_address/view.cljs index 7d3cc1f3a4..1b9605b075 100644 --- a/src/status_im2/contexts/wallet/send/select_address/view.cljs +++ b/src/status_im/contexts/wallet/send/select_address/view.cljs @@ -1,14 +1,14 @@ -(ns status-im2.contexts.wallet.send.select-address.view +(ns status-im.contexts.wallet.send.select-address.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [status-im2.constants :as constants] - [status-im2.contexts.wallet.common.account-switcher.view :as account-switcher] - [status-im2.contexts.wallet.item-types :as types] - [status-im2.contexts.wallet.send.select-address.style :as style] - [status-im2.contexts.wallet.send.select-address.tabs.view :as tabs] + [status-im.constants :as constants] + [status-im.contexts.wallet.common.account-switcher.view :as account-switcher] + [status-im.contexts.wallet.item-types :as types] + [status-im.contexts.wallet.send.select-address.style :as style] + [status-im.contexts.wallet.send.select-address.tabs.view :as tabs] [utils.debounce :as debounce] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/send/select_asset/style.cljs b/src/status_im/contexts/wallet/send/select_asset/style.cljs similarity index 90% rename from src/status_im2/contexts/wallet/send/select_asset/style.cljs rename to src/status_im/contexts/wallet/send/select_asset/style.cljs index a1fa91402a..0da8a3d3e5 100644 --- a/src/status_im2/contexts/wallet/send/select_asset/style.cljs +++ b/src/status_im/contexts/wallet/send/select_asset/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.send.select-asset.style +(ns status-im.contexts.wallet.send.select-asset.style (:require [react-native.navigation :as navigation] [react-native.platform :as platform])) diff --git a/src/status_im2/contexts/wallet/send/select_asset/view.cljs b/src/status_im/contexts/wallet/send/select_asset/view.cljs similarity index 94% rename from src/status_im2/contexts/wallet/send/select_asset/view.cljs rename to src/status_im/contexts/wallet/send/select_asset/view.cljs index 05016b166a..bc63cc75c8 100644 --- a/src/status_im2/contexts/wallet/send/select_asset/view.cljs +++ b/src/status_im/contexts/wallet/send/select_asset/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.wallet.send.select-asset.view +(ns status-im.contexts.wallet.send.select-asset.view (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.contexts.wallet.common.account-switcher.view :as account-switcher] - [status-im2.contexts.wallet.send.select-asset.style :as style] + [status-im.contexts.wallet.common.account-switcher.view :as account-switcher] + [status-im.contexts.wallet.send.select-asset.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/send/transaction_confirmation/style.cljs b/src/status_im/contexts/wallet/send/transaction_confirmation/style.cljs similarity index 93% rename from src/status_im2/contexts/wallet/send/transaction_confirmation/style.cljs rename to src/status_im/contexts/wallet/send/transaction_confirmation/style.cljs index be2bdf4f61..799e98c0fc 100644 --- a/src/status_im2/contexts/wallet/send/transaction_confirmation/style.cljs +++ b/src/status_im/contexts/wallet/send/transaction_confirmation/style.cljs @@ -1,4 +1,4 @@ -(ns status-im2.contexts.wallet.send.transaction-confirmation.style +(ns status-im.contexts.wallet.send.transaction-confirmation.style (:require [quo.foundations.colors :as colors])) (defn container diff --git a/src/status_im2/contexts/wallet/send/transaction_confirmation/view.cljs b/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs similarity index 97% rename from src/status_im2/contexts/wallet/send/transaction_confirmation/view.cljs rename to src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs index a7429b2176..5f8ce268cc 100644 --- a/src/status_im2/contexts/wallet/send/transaction_confirmation/view.cljs +++ b/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs @@ -1,12 +1,12 @@ -(ns status-im2.contexts.wallet.send.transaction-confirmation.view +(ns status-im.contexts.wallet.send.transaction-confirmation.view (:require [quo.core :as quo] [quo.theme :as quo.theme] [react-native.core :as rn] [react-native.safe-area :as safe-area] [reagent.core :as reagent] - [status-im2.common.resources :as resources] - [status-im2.contexts.wallet.send.transaction-confirmation.style :as style] + [status-im.common.resources :as resources] + [status-im.contexts.wallet.send.transaction-confirmation.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/contexts/wallet/temp.cljs b/src/status_im/contexts/wallet/temp.cljs similarity index 93% rename from src/status_im2/contexts/wallet/temp.cljs rename to src/status_im/contexts/wallet/temp.cljs index 7262e2b106..e6ed0e7eca 100644 --- a/src/status_im2/contexts/wallet/temp.cljs +++ b/src/status_im/contexts/wallet/temp.cljs @@ -1,7 +1,7 @@ -(ns status-im2.contexts.wallet.temp +(ns status-im.contexts.wallet.temp (:require [clojure.string :as string] - [status-im2.common.resources :as resources] - [status-im2.contexts.wallet.item-types :as types])) + [status-im.common.resources :as resources] + [status-im.contexts.wallet.item-types :as types])) (def ens-local-suggestion-saved-address-mock {:type types/saved-address diff --git a/src/status_im2/core.cljs b/src/status_im/core.cljs similarity index 70% rename from src/status_im2/core.cljs rename to src/status_im/core.cljs index 23b4726e5f..a733a1a94b 100644 --- a/src/status_im2/core.cljs +++ b/src/status_im/core.cljs @@ -1,8 +1,10 @@ -(ns status-im2.core +(ns status-im.core (:require ;; NOTE: Do NOT sort i18n-resources because it MUST be loaded first. - [status-im2.setup.i18n-resources :as i18n-resources] + [status-im.setup.i18n-resources :as i18n-resources] #_{:clj-kondo/ignore [:unsorted-required-namespaces]} + legacy.status-im.events + legacy.status-im.subs.root [native-module.core :as native-module] [re-frame.core :as re-frame] [re-frame.interop :as interop] @@ -11,20 +13,18 @@ [react-native.platform :as platform] [react-native.shake :as react-native-shake] [reagent.impl.batching :as batching] - legacy.status-im.events - legacy.status-im.subs.root - [status-im2.common.log :as log] - [status-im2.common.universal-links :as universal-links] - [status-im2.config :as config] - [status-im2.contexts.push-notifications.events :as notifications] - [status-im2.contexts.shell.jump-to.state :as shell.state] - [status-im2.contexts.shell.jump-to.utils :as shell.utils] - status-im2.events - status-im2.navigation.core - [status-im2.setup.dev :as dev] - [status-im2.setup.global-error :as global-error] - [status-im2.setup.interceptors :as interceptors] - status-im2.subs.root + [status-im.common.log :as log] + [status-im.common.universal-links :as universal-links] + [status-im.config :as config] + [status-im.contexts.push-notifications.events :as notifications] + [status-im.contexts.shell.jump-to.state :as shell.state] + [status-im.contexts.shell.jump-to.utils :as shell.utils] + status-im.events + status-im.navigation.core + [status-im.setup.dev :as dev] + [status-im.setup.global-error :as global-error] + [status-im.setup.interceptors :as interceptors] + status-im.subs.root [utils.i18n :as i18n])) ;;;; re-frame RN setup diff --git a/src/status_im/core_spec.cljs b/src/status_im/core_spec.cljs new file mode 100644 index 0000000000..e9431afab6 --- /dev/null +++ b/src/status_im/core_spec.cljs @@ -0,0 +1,9 @@ +(ns status-im.core-spec + (:require + [status-im.common.floating-button-page.component-spec] + [status-im.contexts.chat.messages.content.audio.component-spec] + [status-im.contexts.communities.actions.community-options.component-spec] + [status-im.contexts.wallet.add-address-to-watch.component-spec] + [status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec] + [status-im.contexts.wallet.create-account.edit-derivation-path.component-spec] + [status-im.contexts.wallet.send.input-amount.component-spec])) diff --git a/src/status_im2/db.cljs b/src/status_im/db.cljs similarity index 95% rename from src/status_im2/db.cljs rename to src/status_im/db.cljs index 3304409f5a..a660890e4f 100644 --- a/src/status_im2/db.cljs +++ b/src/status_im/db.cljs @@ -1,9 +1,9 @@ -(ns status-im2.db +(ns status-im.db (:require [legacy.status-im.fleet.core :as fleet] [legacy.status-im.wallet.db :as wallet.db] [react-native.core :as rn] - [status-im2.contexts.shell.activity-center.events :as activity-center])) + [status-im.contexts.shell.activity-center.events :as activity-center])) ;; initial state of app-db (def app-db diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs new file mode 100644 index 0000000000..a55f29dacd --- /dev/null +++ b/src/status_im/events.cljs @@ -0,0 +1,44 @@ +(ns status-im.events + (:require + [legacy.status-im.bottom-sheet.events] + [legacy.status-im.keycard.core :as keycard] + status-im.common.alert.effects + status-im.common.async-storage.effects + status-im.common.font.events + [status-im.common.json-rpc.events] + status-im.common.password-authentication.events + status-im.common.signals.events + status-im.common.theme.events + [status-im.common.toasts.events] + [status-im.contexts.add-new-contact.events] + status-im.contexts.chat.composer.events + status-im.contexts.chat.events + status-im.contexts.chat.photo-selector.events + status-im.contexts.communities.events + status-im.contexts.communities.overview.events + status-im.contexts.emoji-picker.events + status-im.contexts.onboarding.common.overlay.events + status-im.contexts.onboarding.events + status-im.contexts.profile.events + status-im.contexts.profile.settings.events + status-im.contexts.shell.share.events + status-im.contexts.syncing.events + status-im.contexts.wallet.events + status-im.contexts.wallet.send.events + [status-im.db :as db] + [utils.re-frame :as rf])) + +(rf/defn start-app + {:events [:app-started]} + [cofx] + (rf/merge + cofx + {:db db/app-db + :theme/init-theme nil + :network/listen-to-network-info nil + :biometric/get-supported-biometric-type nil + ;;app starting flow continues in get-profiles-overview + :profile/get-profiles-overview #(rf/dispatch [:profile/get-profiles-overview-success %]) + :effects.font/get-font-file-for-initials-avatar + #(rf/dispatch [:font/init-font-file-for-initials-avatar %])} + (keycard/init))) diff --git a/src/status_im2/integration_test/chat_test.cljs b/src/status_im/integration_test/chat_test.cljs similarity index 95% rename from src/status_im2/integration_test/chat_test.cljs rename to src/status_im/integration_test/chat_test.cljs index 402e11c301..35cf7dd74d 100644 --- a/src/status_im2/integration_test/chat_test.cljs +++ b/src/status_im/integration_test/chat_test.cljs @@ -1,4 +1,4 @@ -(ns status-im2.integration-test.chat-test +(ns status-im.integration-test.chat-test (:require [cljs.test :refer [deftest is]] [day8.re-frame.test :as rf-test] @@ -6,10 +6,10 @@ [legacy.status-im.multiaccounts.logout.core :as logout] legacy.status-im.subs.root [re-frame.core :as rf] - [status-im2.constants :as constants] - status-im2.events - status-im2.navigation.core - status-im2.subs.root + [status-im.constants :as constants] + status-im.events + status-im.navigation.core + status-im.subs.root [test-helpers.integration :as h])) (def chat-id diff --git a/src/status_im2/integration_test/constants.cljs b/src/status_im/integration_test/constants.cljs similarity index 74% rename from src/status_im2/integration_test/constants.cljs rename to src/status_im/integration_test/constants.cljs index 373b227f5c..eb935081f3 100644 --- a/src/status_im2/integration_test/constants.cljs +++ b/src/status_im/integration_test/constants.cljs @@ -1,4 +1,4 @@ -(ns status-im2.integration-test.constants) +(ns status-im.integration-test.constants) (def password "testabc") diff --git a/src/status_im2/integration_test/core_test.cljs b/src/status_im/integration_test/core_test.cljs similarity index 89% rename from src/status_im2/integration_test/core_test.cljs rename to src/status_im/integration_test/core_test.cljs index 621b56c2ff..0cf7a1d23f 100644 --- a/src/status_im2/integration_test/core_test.cljs +++ b/src/status_im/integration_test/core_test.cljs @@ -1,4 +1,4 @@ -(ns status-im2.integration-test.core-test +(ns status-im.integration-test.core-test (:require [cljs.test :refer [deftest]] [day8.re-frame.test :as rf-test] @@ -7,9 +7,9 @@ legacy.status-im.subs.root [legacy.status-im.utils.test :as utils.test] [re-frame.core :as rf] - status-im2.events - status-im2.navigation.core - status-im2.subs.root + status-im.events + status-im.navigation.core + status-im.subs.root [test-helpers.integration :as h])) (deftest initialize-app-test diff --git a/src/status_im2/integration_test/wallet_test.cljs b/src/status_im/integration_test/wallet_test.cljs similarity index 94% rename from src/status_im2/integration_test/wallet_test.cljs rename to src/status_im/integration_test/wallet_test.cljs index f87ca354df..026b68658b 100644 --- a/src/status_im2/integration_test/wallet_test.cljs +++ b/src/status_im/integration_test/wallet_test.cljs @@ -1,4 +1,4 @@ -(ns status-im2.integration-test.wallet-test +(ns status-im.integration-test.wallet-test (:require [cljs.test :refer [is]] [clojure.string :as string] @@ -7,9 +7,9 @@ [legacy.status-im.multiaccounts.logout.core :as logout] legacy.status-im.subs.root [re-frame.core :as rf] - status-im2.events - status-im2.navigation.core - status-im2.subs.root + status-im.events + status-im.navigation.core + status-im.subs.root [test-helpers.integration :as h])) ;; Workaround to skip test. Switch to `deftest` when test is fixed. diff --git a/src/status_im2/navigation/core.cljs b/src/status_im/navigation/core.cljs similarity index 93% rename from src/status_im2/navigation/core.cljs rename to src/status_im/navigation/core.cljs index e54e96df4c..a81fd375d8 100644 --- a/src/status_im2/navigation/core.cljs +++ b/src/status_im/navigation/core.cljs @@ -1,14 +1,14 @@ -(ns status-im2.navigation.core +(ns status-im.navigation.core (:require [re-frame.core :as re-frame] [react-native.core :as rn] [react-native.gesture :as gesture] [react-native.navigation :as navigation] - [status-im2.common.theme.core :as theme] - [status-im2.navigation.effects :as effects] - [status-im2.navigation.options :as options] - [status-im2.navigation.state :as state] - [status-im2.navigation.view :as views] + [status-im.common.theme.core :as theme] + [status-im.navigation.effects :as effects] + [status-im.navigation.options :as options] + [status-im.navigation.state :as state] + [status-im.navigation.view :as views] [utils.re-frame :as rf])) (navigation/set-lazy-component-registrator diff --git a/src/status_im2/navigation/effects.cljs b/src/status_im/navigation/effects.cljs similarity index 97% rename from src/status_im2/navigation/effects.cljs rename to src/status_im/navigation/effects.cljs index cd0f35ff89..b6dc872e92 100644 --- a/src/status_im2/navigation/effects.cljs +++ b/src/status_im/navigation/effects.cljs @@ -1,10 +1,10 @@ -(ns status-im2.navigation.effects +(ns status-im.navigation.effects (:require [react-native.navigation :as navigation] - [status-im2.navigation.options :as options] - [status-im2.navigation.roots :as roots] - [status-im2.navigation.state :as state] - [status-im2.navigation.view :as views] + [status-im.navigation.options :as options] + [status-im.navigation.roots :as roots] + [status-im.navigation.state :as state] + [status-im.navigation.view :as views] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im2/navigation/events.cljs b/src/status_im/navigation/events.cljs similarity index 95% rename from src/status_im2/navigation/events.cljs rename to src/status_im/navigation/events.cljs index 56e694fa9f..aae59916d4 100644 --- a/src/status_im2/navigation/events.cljs +++ b/src/status_im/navigation/events.cljs @@ -1,9 +1,9 @@ -(ns status-im2.navigation.events +(ns status-im.navigation.events (:require [re-frame.core :as re-frame] - [status-im2.contexts.shell.jump-to.events :as shell.events] - [status-im2.contexts.shell.jump-to.state :as shell.state] - [status-im2.contexts.shell.jump-to.utils :as shell.utils] + [status-im.contexts.shell.jump-to.events :as shell.events] + [status-im.contexts.shell.jump-to.state :as shell.state] + [status-im.contexts.shell.jump-to.utils :as shell.utils] [utils.re-frame :as rf])) (defn- all-screens-params diff --git a/src/status_im2/navigation/options.cljs b/src/status_im/navigation/options.cljs similarity index 99% rename from src/status_im2/navigation/options.cljs rename to src/status_im/navigation/options.cljs index 4785b5cb52..f3d9fb8427 100644 --- a/src/status_im2/navigation/options.cljs +++ b/src/status_im/navigation/options.cljs @@ -1,4 +1,4 @@ -(ns status-im2.navigation.options +(ns status-im.navigation.options (:require [quo.foundations.colors :as colors] [quo.theme :as quo.theme] diff --git a/src/status_im2/navigation/roots.cljs b/src/status_im/navigation/roots.cljs similarity index 97% rename from src/status_im2/navigation/roots.cljs rename to src/status_im/navigation/roots.cljs index a399555804..740d0ae883 100644 --- a/src/status_im2/navigation/roots.cljs +++ b/src/status_im/navigation/roots.cljs @@ -1,10 +1,10 @@ -(ns status-im2.navigation.roots +(ns status-im.navigation.roots (:require [quo.foundations.colors :as colors] [quo.theme :as quo.theme] - [status-im2.constants :as constants] - [status-im2.navigation.options :as options] - [status-im2.navigation.view :as views])) + [status-im.constants :as constants] + [status-im.navigation.options :as options] + [status-im.navigation.view :as views])) (defn get-screen-options [screen] diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im/navigation/screens.cljs similarity index 71% rename from src/status_im2/navigation/screens.cljs rename to src/status_im/navigation/screens.cljs index 4426dbb4da..f80d39ecf7 100644 --- a/src/status_im2/navigation/screens.cljs +++ b/src/status_im/navigation/screens.cljs @@ -1,67 +1,67 @@ -(ns status-im2.navigation.screens +(ns status-im.navigation.screens (:require [legacy.status-im.ui.screens.screens :as old-screens] - [status-im2.config :as config] - [status-im2.contexts.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page] - [status-im2.contexts.add-new-contact.views :as add-new-contact] - [status-im2.contexts.chat.camera.view :as camera-screen] - [status-im2.contexts.chat.group-details.view :as group-details] - [status-im2.contexts.chat.lightbox.view :as lightbox] - [status-im2.contexts.chat.messages.view :as chat] - [status-im2.contexts.chat.new-chat.view :as new-chat] - [status-im2.contexts.chat.photo-selector.view :as photo-selector] - [status-im2.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection] - [status-im2.contexts.communities.actions.addresses-for-permissions.view :as + [status-im.config :as config] + [status-im.contexts.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page] + [status-im.contexts.add-new-contact.views :as add-new-contact] + [status-im.contexts.chat.camera.view :as camera-screen] + [status-im.contexts.chat.group-details.view :as group-details] + [status-im.contexts.chat.lightbox.view :as lightbox] + [status-im.contexts.chat.messages.view :as chat] + [status-im.contexts.chat.new-chat.view :as new-chat] + [status-im.contexts.chat.photo-selector.view :as photo-selector] + [status-im.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection] + [status-im.contexts.communities.actions.addresses-for-permissions.view :as addresses-for-permissions] - [status-im2.contexts.communities.actions.request-to-join.view :as join-menu] - [status-im2.contexts.communities.discover.view :as communities.discover] - [status-im2.contexts.communities.overview.view :as communities.overview] - [status-im2.contexts.emoji-picker.view :as emoji-picker] - [status-im2.contexts.onboarding.create-password.view :as create-password] - [status-im2.contexts.onboarding.create-profile.view :as create-profile] - [status-im2.contexts.onboarding.enable-biometrics.view :as enable-biometrics] - [status-im2.contexts.onboarding.enable-notifications.view :as enable-notifications] - [status-im2.contexts.onboarding.enter-seed-phrase.view :as enter-seed-phrase] - [status-im2.contexts.onboarding.generating-keys.view :as generating-keys] - [status-im2.contexts.onboarding.identifiers.view :as identifiers] - [status-im2.contexts.onboarding.intro.view :as intro] - [status-im2.contexts.onboarding.new-to-status.view :as new-to-status] - [status-im2.contexts.onboarding.sign-in.view :as sign-in] - [status-im2.contexts.onboarding.syncing.progress.view :as syncing-devices] - [status-im2.contexts.onboarding.syncing.results.view :as syncing-results] - [status-im2.contexts.onboarding.welcome.view :as welcome] - [status-im2.contexts.profile.profiles.view :as profiles] - [status-im2.contexts.profile.settings.view :as settings] - [status-im2.contexts.quo-preview.component-preview.view :as component-preview] - [status-im2.contexts.quo-preview.main :as quo.preview] - [status-im2.contexts.shell.activity-center.view :as activity-center] - [status-im2.contexts.shell.jump-to.view :as shell] - [status-im2.contexts.shell.share.view :as share] - [status-im2.contexts.status-im-preview.main :as status-im-preview] - [status-im2.contexts.syncing.find-sync-code.view :as find-sync-code] - [status-im2.contexts.syncing.how-to-pair.view :as how-to-pair] - [status-im2.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page] - [status-im2.contexts.syncing.setup-syncing.view :as settings-setup-syncing] - [status-im2.contexts.syncing.syncing-devices-list.view :as settings-syncing] - [status-im2.contexts.wallet.account.bridge.view :as bridge] - [status-im2.contexts.wallet.account.view :as wallet-accounts] - [status-im2.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address-to-watch] - [status-im2.contexts.wallet.add-address-to-watch.view :as add-address-to-watch] - [status-im2.contexts.wallet.collectible.view :as wallet-collectible] - [status-im2.contexts.wallet.create-account.backup-recovery-phrase.view :as + [status-im.contexts.communities.actions.request-to-join.view :as join-menu] + [status-im.contexts.communities.discover.view :as communities.discover] + [status-im.contexts.communities.overview.view :as communities.overview] + [status-im.contexts.emoji-picker.view :as emoji-picker] + [status-im.contexts.onboarding.create-password.view :as create-password] + [status-im.contexts.onboarding.create-profile.view :as create-profile] + [status-im.contexts.onboarding.enable-biometrics.view :as enable-biometrics] + [status-im.contexts.onboarding.enable-notifications.view :as enable-notifications] + [status-im.contexts.onboarding.enter-seed-phrase.view :as enter-seed-phrase] + [status-im.contexts.onboarding.generating-keys.view :as generating-keys] + [status-im.contexts.onboarding.identifiers.view :as identifiers] + [status-im.contexts.onboarding.intro.view :as intro] + [status-im.contexts.onboarding.new-to-status.view :as new-to-status] + [status-im.contexts.onboarding.sign-in.view :as sign-in] + [status-im.contexts.onboarding.syncing.progress.view :as syncing-devices] + [status-im.contexts.onboarding.syncing.results.view :as syncing-results] + [status-im.contexts.onboarding.welcome.view :as welcome] + [status-im.contexts.profile.profiles.view :as profiles] + [status-im.contexts.profile.settings.view :as settings] + [status-im.contexts.quo-preview.component-preview.view :as component-preview] + [status-im.contexts.quo-preview.main :as quo.preview] + [status-im.contexts.shell.activity-center.view :as activity-center] + [status-im.contexts.shell.jump-to.view :as shell] + [status-im.contexts.shell.share.view :as share] + [status-im.contexts.status-im-preview.main :as status-im-preview] + [status-im.contexts.syncing.find-sync-code.view :as find-sync-code] + [status-im.contexts.syncing.how-to-pair.view :as how-to-pair] + [status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page] + [status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing] + [status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing] + [status-im.contexts.wallet.account.bridge.view :as bridge] + [status-im.contexts.wallet.account.view :as wallet-accounts] + [status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address-to-watch] + [status-im.contexts.wallet.add-address-to-watch.view :as add-address-to-watch] + [status-im.contexts.wallet.collectible.view :as wallet-collectible] + [status-im.contexts.wallet.create-account.backup-recovery-phrase.view :as wallet-backup-recovery-phrase] - [status-im2.contexts.wallet.create-account.edit-derivation-path.view :as wallet-edit-derivation-path] - [status-im2.contexts.wallet.create-account.select-keypair.view :as wallet-select-keypair] - [status-im2.contexts.wallet.create-account.view :as wallet-create-account] - [status-im2.contexts.wallet.edit-account.view :as wallet-edit-account] - [status-im2.contexts.wallet.saved-addresses.view :as wallet-saved-addresses] - [status-im2.contexts.wallet.scan-account.view :as scan-address] - [status-im2.contexts.wallet.send.input-amount.view :as wallet-send-input-amount] - [status-im2.contexts.wallet.send.select-address.view :as wallet-select-address] - [status-im2.contexts.wallet.send.select-asset.view :as wallet-select-asset] - [status-im2.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation] - [status-im2.navigation.options :as options] - [status-im2.navigation.transitions :as transitions])) + [status-im.contexts.wallet.create-account.edit-derivation-path.view :as wallet-edit-derivation-path] + [status-im.contexts.wallet.create-account.select-keypair.view :as wallet-select-keypair] + [status-im.contexts.wallet.create-account.view :as wallet-create-account] + [status-im.contexts.wallet.edit-account.view :as wallet-edit-account] + [status-im.contexts.wallet.saved-addresses.view :as wallet-saved-addresses] + [status-im.contexts.wallet.scan-account.view :as scan-address] + [status-im.contexts.wallet.send.input-amount.view :as wallet-send-input-amount] + [status-im.contexts.wallet.send.select-address.view :as wallet-select-address] + [status-im.contexts.wallet.send.select-asset.view :as wallet-select-asset] + [status-im.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation] + [status-im.navigation.options :as options] + [status-im.navigation.transitions :as transitions])) (defn screens [] diff --git a/src/status_im2/navigation/state.cljs b/src/status_im/navigation/state.cljs similarity index 83% rename from src/status_im2/navigation/state.cljs rename to src/status_im/navigation/state.cljs index 11f49580cf..cfa7e6f144 100644 --- a/src/status_im2/navigation/state.cljs +++ b/src/status_im/navigation/state.cljs @@ -1,4 +1,4 @@ -(ns status-im2.navigation.state) +(ns status-im.navigation.state) (defonce root-id (atom nil)) (defonce pushed-screen-id (atom nil)) diff --git a/src/status_im2/navigation/transitions.cljs b/src/status_im/navigation/transitions.cljs similarity index 96% rename from src/status_im2/navigation/transitions.cljs rename to src/status_im/navigation/transitions.cljs index 1de647d85c..5caf24015c 100644 --- a/src/status_im2/navigation/transitions.cljs +++ b/src/status_im/navigation/transitions.cljs @@ -1,7 +1,7 @@ -(ns status-im2.navigation.transitions +(ns status-im.navigation.transitions (:require [react-native.core :as rn] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) (def sign-in-modal-animations {:showModal {:translationY {:from (:height (rn/get-window)) diff --git a/src/status_im2/navigation/view.cljs b/src/status_im/navigation/view.cljs similarity index 93% rename from src/status_im2/navigation/view.cljs rename to src/status_im/navigation/view.cljs index 9eee266b87..c63a449eae 100644 --- a/src/status_im2/navigation/view.cljs +++ b/src/status_im/navigation/view.cljs @@ -1,4 +1,4 @@ -(ns status-im2.navigation.view +(ns status-im.navigation.view (:require [legacy.status-im.bottom-sheet.sheets :as bottom-sheets-old] [legacy.status-im.ui.screens.popover.views :as popover] @@ -10,11 +10,11 @@ [react-native.safe-area :as safe-area] [reagent.core :as reagent] schema.view - [status-im2.common.bottom-sheet-screen.view :as bottom-sheet-screen] - [status-im2.common.bottom-sheet.view :as bottom-sheet] - [status-im2.common.toasts.view :as toasts] - [status-im2.navigation.screens :as screens] - [status-im2.setup.hot-reload :as reloader] + [status-im.common.bottom-sheet-screen.view :as bottom-sheet-screen] + [status-im.common.bottom-sheet.view :as bottom-sheet] + [status-im.common.toasts.view :as toasts] + [status-im.navigation.screens :as screens] + [status-im.setup.hot-reload :as reloader] [utils.re-frame :as rf])) (defn get-screens diff --git a/src/status_im2/setup/dev.cljs b/src/status_im/setup/dev.cljs similarity index 97% rename from src/status_im2/setup/dev.cljs rename to src/status_im/setup/dev.cljs index 9500316bb5..f679034800 100644 --- a/src/status_im2/setup/dev.cljs +++ b/src/status_im/setup/dev.cljs @@ -1,8 +1,8 @@ -(ns status-im2.setup.dev +(ns status-im.setup.dev (:require ["react-native" :refer (DevSettings LogBox)] [react-native.platform :as platform] - [status-im2.setup.schema :as schema] + [status-im.setup.schema :as schema] [utils.re-frame :as rf])) ;; Ignore all logs, because there are lots of temporary warnings when developing and hot reloading diff --git a/src/status_im2/setup/global_error.cljs b/src/status_im/setup/global_error.cljs similarity index 96% rename from src/status_im2/setup/global_error.cljs rename to src/status_im/setup/global_error.cljs index f02876ae0e..eece4cbc80 100644 --- a/src/status_im2/setup/global_error.cljs +++ b/src/status_im/setup/global_error.cljs @@ -1,8 +1,8 @@ -(ns status-im2.setup.global-error +(ns status-im.setup.global-error (:require [clojure.string :as string] [re-frame.core :as re-frame] - [status-im2.common.alert.effects :as alert.effects] + [status-im.common.alert.effects :as alert.effects] [utils.i18n :as i18n])) ;; Error handling code based on https://gist.github.com/pesterhazy/e6846be1b6712a9038537022d131ce46 diff --git a/src/status_im2/setup/hot_reload.cljs b/src/status_im/setup/hot_reload.cljs similarity index 97% rename from src/status_im2/setup/hot_reload.cljs rename to src/status_im/setup/hot_reload.cljs index 38e83963b1..3be6729fa3 100644 --- a/src/status_im2/setup/hot_reload.cljs +++ b/src/status_im/setup/hot_reload.cljs @@ -1,10 +1,10 @@ -(ns status-im2.setup.hot-reload +(ns status-im.setup.hot-reload (:require [re-frame.core :as re-frame] [react-native.core :as rn] [reagent.core :as reagent] schema.state - [status-im2.setup.schema :as schema])) + [status-im.setup.schema :as schema])) (defonce cnt (reagent/atom 0)) (defonce reload-locked? (atom false)) diff --git a/src/status_im2/setup/i18n_resources.cljs b/src/status_im/setup/i18n_resources.cljs similarity index 98% rename from src/status_im2/setup/i18n_resources.cljs rename to src/status_im/setup/i18n_resources.cljs index 7fb1f366e4..cd931194bc 100644 --- a/src/status_im2/setup/i18n_resources.cljs +++ b/src/status_im/setup/i18n_resources.cljs @@ -1,4 +1,4 @@ -(ns status-im2.setup.i18n-resources +(ns status-im.setup.i18n-resources (:require [clojure.string :as string] [utils.i18n :as i18n])) diff --git a/src/status_im2/setup/interceptors.cljs b/src/status_im/setup/interceptors.cljs similarity index 95% rename from src/status_im2/setup/interceptors.cljs rename to src/status_im/setup/interceptors.cljs index d435408c21..8310f413cd 100644 --- a/src/status_im2/setup/interceptors.cljs +++ b/src/status_im/setup/interceptors.cljs @@ -1,4 +1,4 @@ -(ns status-im2.setup.interceptors +(ns status-im.setup.interceptors (:require [re-frame.core :as re-frame] [re-frame.std-interceptors :as std-interceptors] diff --git a/src/status_im2/setup/schema.cljs b/src/status_im/setup/schema.cljs similarity index 99% rename from src/status_im2/setup/schema.cljs rename to src/status_im/setup/schema.cljs index 92352cc1a9..a8a7d2f329 100644 --- a/src/status_im2/setup/schema.cljs +++ b/src/status_im/setup/schema.cljs @@ -1,4 +1,4 @@ -(ns status-im2.setup.schema +(ns status-im.setup.schema (:require [malli.core :as malli] [malli.dev.cljs :as malli.dev] diff --git a/src/status_im2/setup/schema_preload.cljs b/src/status_im/setup/schema_preload.cljs similarity index 55% rename from src/status_im2/setup/schema_preload.cljs rename to src/status_im/setup/schema_preload.cljs index 928ff0e587..48724d30ac 100644 --- a/src/status_im2/setup/schema_preload.cljs +++ b/src/status_im/setup/schema_preload.cljs @@ -1,6 +1,6 @@ -(ns status-im2.setup.schema-preload +(ns status-im.setup.schema-preload ":dev/always is needed so that the compiler doesn't cache this file." {:dev/always true} - (:require [status-im2.setup.schema :as schema])) + (:require [status-im.setup.schema :as schema])) (schema/setup!) diff --git a/src/status_im2/subs/activity_center.cljs b/src/status_im/subs/activity_center.cljs similarity index 94% rename from src/status_im2/subs/activity_center.cljs rename to src/status_im/subs/activity_center.cljs index cf7b1de4a5..4e34f1f5aa 100644 --- a/src/status_im2/subs/activity_center.cljs +++ b/src/status_im/subs/activity_center.cljs @@ -1,7 +1,7 @@ -(ns status-im2.subs.activity-center +(ns status-im.subs.activity-center (:require [re-frame.core :as re-frame] - [status-im2.contexts.shell.activity-center.notification-types :as types])) + [status-im.contexts.shell.activity-center.notification-types :as types])) (re-frame/reg-sub :activity-center/notifications diff --git a/src/status_im2/subs/activity_center_test.cljs b/src/status_im/subs/activity_center_test.cljs similarity index 95% rename from src/status_im2/subs/activity_center_test.cljs rename to src/status_im/subs/activity_center_test.cljs index 4f13472aa5..8f18321702 100644 --- a/src/status_im2/subs/activity_center_test.cljs +++ b/src/status_im/subs/activity_center_test.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.activity-center-test +(ns status-im.subs.activity-center-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - [status-im2.contexts.shell.activity-center.notification-types :as types] - status-im2.subs.activity-center + [status-im.contexts.shell.activity-center.notification-types :as types] + status-im.subs.activity-center [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/chats.cljs b/src/status_im/subs/chats.cljs similarity index 98% rename from src/status_im2/subs/chats.cljs rename to src/status_im/subs/chats.cljs index ad7b940092..9aa4493a34 100644 --- a/src/status_im2/subs/chats.cljs +++ b/src/status_im/subs/chats.cljs @@ -1,13 +1,13 @@ -(ns status-im2.subs.chats +(ns status-im.subs.chats (:require [clojure.string :as string] [legacy.status-im.group-chats.core :as group-chat] [legacy.status-im.group-chats.db :as group-chats.db] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.contexts.chat.composer.constants :as composer.constants] - [status-im2.contexts.chat.events :as chat.events] - [status-im2.contexts.profile.utils :as profile.utils])) + [status-im.constants :as constants] + [status-im.contexts.chat.composer.constants :as composer.constants] + [status-im.contexts.chat.events :as chat.events] + [status-im.contexts.profile.utils :as profile.utils])) (def memo-chats-stack-items (atom nil)) diff --git a/src/status_im2/subs/chats_test.cljs b/src/status_im/subs/chats_test.cljs similarity index 98% rename from src/status_im2/subs/chats_test.cljs rename to src/status_im/subs/chats_test.cljs index 346ce24001..c2be6510e6 100644 --- a/src/status_im2/subs/chats_test.cljs +++ b/src/status_im/subs/chats_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.subs.chats-test +(ns status-im.subs.chats-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - [status-im2.constants :as constants] + [status-im.constants :as constants] [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/communities.cljs b/src/status_im/subs/communities.cljs similarity index 99% rename from src/status_im2/subs/communities.cljs rename to src/status_im/subs/communities.cljs index bf646a4e2d..4a2c720a4b 100644 --- a/src/status_im2/subs/communities.cljs +++ b/src/status_im/subs/communities.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.communities +(ns status-im.subs.communities (:require [clojure.string :as string] [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.i18n :as i18n])) (re-frame/reg-sub diff --git a/src/status_im2/subs/communities_test.cljs b/src/status_im/subs/communities_test.cljs similarity index 99% rename from src/status_im2/subs/communities_test.cljs rename to src/status_im/subs/communities_test.cljs index 222e01ca07..10856b7b51 100644 --- a/src/status_im2/subs/communities_test.cljs +++ b/src/status_im/subs/communities_test.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.communities-test +(ns status-im.subs.communities-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - [status-im2.constants :as constants] - status-im2.subs.communities + [status-im.constants :as constants] + status-im.subs.communities [test-helpers.unit :as h] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/contact.cljs b/src/status_im/subs/contact.cljs similarity index 98% rename from src/status_im2/subs/contact.cljs rename to src/status_im/subs/contact.cljs index dd721b9573..7100f7f586 100644 --- a/src/status_im2/subs/contact.cljs +++ b/src/status_im/subs/contact.cljs @@ -1,12 +1,12 @@ -(ns status-im2.subs.contact +(ns status-im.subs.contact (:require [clojure.string :as string] [legacy.status-im.contact.db :as contact.db] [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils] [quo.theme :as theme] [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.contexts.profile.utils :as profile.utils] + [status-im.constants :as constants] + [status-im.contexts.profile.utils :as profile.utils] [utils.address :as address] [utils.collection] [utils.i18n :as i18n] diff --git a/src/status_im2/subs/contact_test.cljs b/src/status_im/subs/contact_test.cljs similarity index 99% rename from src/status_im2/subs/contact_test.cljs rename to src/status_im/subs/contact_test.cljs index 04d7dc07a2..55a5fbb3e9 100644 --- a/src/status_im2/subs/contact_test.cljs +++ b/src/status_im/subs/contact_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.subs.contact-test +(ns status-im.subs.contact-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - status-im2.subs.contact + status-im.subs.contact [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/general.cljs b/src/status_im/subs/general.cljs similarity index 99% rename from src/status_im2/subs/general.cljs rename to src/status_im/subs/general.cljs index 3e1eb74d07..49917765d8 100644 --- a/src/status_im2/subs/general.cljs +++ b/src/status_im/subs/general.cljs @@ -1,4 +1,4 @@ -(ns status-im2.subs.general +(ns status-im.subs.general (:require [clojure.string :as string] [legacy.status-im.ethereum.tokens :as tokens] @@ -6,7 +6,7 @@ [legacy.status-im.utils.build :as build] [legacy.status-im.utils.mobile-sync :as mobile-network-utils] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.ethereum.chain :as chain])) (re-frame/reg-sub diff --git a/src/status_im2/subs/messages.cljs b/src/status_im/subs/messages.cljs similarity index 97% rename from src/status_im2/subs/messages.cljs rename to src/status_im/subs/messages.cljs index 985e837096..52d4df028f 100644 --- a/src/status_im2/subs/messages.cljs +++ b/src/status_im/subs/messages.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.messages +(ns status-im.subs.messages (:require [re-frame.core :as re-frame] - [status-im2.constants :as constants] - [status-im2.contexts.chat.messages.list.events :as models.message-list] - [status-im2.contexts.chat.messages.resolver.message-resolver :as resolver] + [status-im.constants :as constants] + [status-im.contexts.chat.messages.list.events :as models.message-list] + [status-im.contexts.chat.messages.resolver.message-resolver :as resolver] [utils.i18n :as i18n])) (defn intersperse-datemark diff --git a/src/status_im2/subs/messages_test.cljs b/src/status_im/subs/messages_test.cljs similarity index 98% rename from src/status_im2/subs/messages_test.cljs rename to src/status_im/subs/messages_test.cljs index 8b5225f733..5b7c423492 100644 --- a/src/status_im2/subs/messages_test.cljs +++ b/src/status_im/subs/messages_test.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.messages-test +(ns status-im.subs.messages-test (:require [cljs.test :refer [deftest is testing]] [re-frame.db :as rf-db] - [status-im2.constants :as constants] - [status-im2.subs.messages :as messages] + [status-im.constants :as constants] + [status-im.subs.messages :as messages] [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/onboarding.cljs b/src/status_im/subs/onboarding.cljs similarity index 90% rename from src/status_im2/subs/onboarding.cljs rename to src/status_im/subs/onboarding.cljs index 815331d0c3..42264ae4e5 100644 --- a/src/status_im2/subs/onboarding.cljs +++ b/src/status_im/subs/onboarding.cljs @@ -1,4 +1,4 @@ -(ns status-im2.subs.onboarding +(ns status-im.subs.onboarding (:require [re-frame.core :as re-frame])) diff --git a/src/status_im2/subs/pairing.cljs b/src/status_im/subs/pairing.cljs similarity index 96% rename from src/status_im2/subs/pairing.cljs rename to src/status_im/subs/pairing.cljs index cfc8b224f6..9bff5f8377 100644 --- a/src/status_im2/subs/pairing.cljs +++ b/src/status_im/subs/pairing.cljs @@ -1,4 +1,4 @@ -(ns status-im2.subs.pairing +(ns status-im.subs.pairing (:require [legacy.status-im.pairing.core :as pairing] [re-frame.core :as re-frame])) diff --git a/src/status_im2/subs/profile.cljs b/src/status_im/subs/profile.cljs similarity index 99% rename from src/status_im2/subs/profile.cljs rename to src/status_im/subs/profile.cljs index d816ee8b8a..d3fc07213b 100644 --- a/src/status_im2/subs/profile.cljs +++ b/src/status_im/subs/profile.cljs @@ -1,4 +1,4 @@ -(ns status-im2.subs.profile +(ns status-im.subs.profile (:require [cljs.spec.alpha :as spec] [clojure.string :as string] @@ -8,7 +8,7 @@ [legacy.status-im.wallet.utils :as wallet.utils] [quo.theme :as theme] [re-frame.core :as re-frame] - [status-im2.constants :as constants] + [status-im.constants :as constants] [utils.address :as address] [utils.image-server :as image-server] [utils.security.core :as security])) diff --git a/src/status_im2/subs/profile_test.cljs b/src/status_im/subs/profile_test.cljs similarity index 98% rename from src/status_im2/subs/profile_test.cljs rename to src/status_im/subs/profile_test.cljs index 498c0e4722..e3f6610248 100644 --- a/src/status_im2/subs/profile_test.cljs +++ b/src/status_im/subs/profile_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.subs.profile-test +(ns status-im.subs.profile-test (:require [cljs.test :refer [is testing use-fixtures]] [re-frame.db :as rf-db] - status-im2.subs.root + status-im.subs.root [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/root.cljs b/src/status_im/subs/root.cljs similarity index 93% rename from src/status_im2/subs/root.cljs rename to src/status_im/subs/root.cljs index d96efc9fa5..9802a47931 100644 --- a/src/status_im2/subs/root.cljs +++ b/src/status_im/subs/root.cljs @@ -1,20 +1,20 @@ -(ns status-im2.subs.root +(ns status-im.subs.root (:require [re-frame.core :as re-frame] - status-im2.subs.activity-center - status-im2.subs.chats - status-im2.subs.communities - status-im2.subs.contact - status-im2.subs.general - status-im2.subs.messages - status-im2.subs.onboarding - status-im2.subs.pairing - status-im2.subs.profile - status-im2.subs.shell - status-im2.subs.wallet.collectibles - status-im2.subs.wallet.networks - status-im2.subs.wallet.send - status-im2.subs.wallet.wallet)) + status-im.subs.activity-center + status-im.subs.chats + status-im.subs.communities + status-im.subs.contact + status-im.subs.general + status-im.subs.messages + status-im.subs.onboarding + status-im.subs.pairing + status-im.subs.profile + status-im.subs.shell + status-im.subs.wallet.collectibles + status-im.subs.wallet.networks + status-im.subs.wallet.send + status-im.subs.wallet.wallet)) (defn reg-root-key-sub [sub-name db-key] diff --git a/src/status_im2/subs/shell.cljs b/src/status_im/subs/shell.cljs similarity index 98% rename from src/status_im2/subs/shell.cljs rename to src/status_im/subs/shell.cljs index 451a368505..42a6a73717 100644 --- a/src/status_im2/subs/shell.cljs +++ b/src/status_im/subs/shell.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.shell +(ns status-im.subs.shell (:require [re-frame.core :as re-frame] - [status-im2.common.resources :as resources] - [status-im2.constants :as constants] - [status-im2.contexts.shell.jump-to.constants :as shell.constants] + [status-im.common.resources :as resources] + [status-im.constants :as constants] + [status-im.contexts.shell.jump-to.constants :as shell.constants] [utils.datetime :as datetime] [utils.i18n :as i18n])) diff --git a/src/status_im2/subs/shell_test.cljs b/src/status_im/subs/shell_test.cljs similarity index 97% rename from src/status_im2/subs/shell_test.cljs rename to src/status_im/subs/shell_test.cljs index a43669282a..bd04303779 100644 --- a/src/status_im2/subs/shell_test.cljs +++ b/src/status_im/subs/shell_test.cljs @@ -1,8 +1,8 @@ -(ns status-im2.subs.shell-test +(ns status-im.subs.shell-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - [status-im2.constants :as constants] + [status-im.constants :as constants] [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/wallet/collectibles.cljs b/src/status_im/subs/wallet/collectibles.cljs similarity index 95% rename from src/status_im2/subs/wallet/collectibles.cljs rename to src/status_im/subs/wallet/collectibles.cljs index c2bd40c012..642996b6b7 100644 --- a/src/status_im2/subs/wallet/collectibles.cljs +++ b/src/status_im/subs/wallet/collectibles.cljs @@ -1,4 +1,4 @@ -(ns status-im2.subs.wallet.collectibles +(ns status-im.subs.wallet.collectibles (:require [clojure.string :as string] [re-frame.core :as re-frame])) diff --git a/src/status_im2/subs/wallet/networks.cljs b/src/status_im/subs/wallet/networks.cljs similarity index 95% rename from src/status_im2/subs/wallet/networks.cljs rename to src/status_im/subs/wallet/networks.cljs index 392d9f584a..a518800ffc 100644 --- a/src/status_im2/subs/wallet/networks.cljs +++ b/src/status_im/subs/wallet/networks.cljs @@ -1,7 +1,7 @@ -(ns status-im2.subs.wallet.networks +(ns status-im.subs.wallet.networks (:require [quo.foundations.resources :as resources] [re-frame.core :as re-frame] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) (re-frame/reg-sub :wallet/filtered-networks-by-mode diff --git a/src/status_im2/subs/wallet/networks_test.cljs b/src/status_im/subs/wallet/networks_test.cljs similarity index 93% rename from src/status_im2/subs/wallet/networks_test.cljs rename to src/status_im/subs/wallet/networks_test.cljs index f415094ba8..0dc8d74e24 100644 --- a/src/status_im2/subs/wallet/networks_test.cljs +++ b/src/status_im/subs/wallet/networks_test.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.wallet.networks-test +(ns status-im.subs.wallet.networks-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - status-im2.subs.root - status-im2.subs.wallet.networks + status-im.subs.root + status-im.subs.wallet.networks [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/wallet/send.cljs b/src/status_im/subs/wallet/send.cljs similarity index 83% rename from src/status_im2/subs/wallet/send.cljs rename to src/status_im/subs/wallet/send.cljs index 54696e043a..7cddd0f6ec 100644 --- a/src/status_im2/subs/wallet/send.cljs +++ b/src/status_im/subs/wallet/send.cljs @@ -1,4 +1,4 @@ -(ns status-im2.subs.wallet.send +(ns status-im.subs.wallet.send (:require [re-frame.core :as rf] [utils.number])) diff --git a/src/status_im2/subs/wallet/send_test.cljs b/src/status_im/subs/wallet/send_test.cljs similarity index 79% rename from src/status_im2/subs/wallet/send_test.cljs rename to src/status_im/subs/wallet/send_test.cljs index 4514b893d5..127b91dc13 100644 --- a/src/status_im2/subs/wallet/send_test.cljs +++ b/src/status_im/subs/wallet/send_test.cljs @@ -1,9 +1,9 @@ -(ns status-im2.subs.wallet.send-test +(ns status-im.subs.wallet.send-test (:require [cljs.test :refer [is testing]] [re-frame.db :as rf-db] - status-im2.subs.root - status-im2.subs.wallet.send + status-im.subs.root + status-im.subs.wallet.send [test-helpers.unit :as h] [utils.re-frame :as rf])) diff --git a/src/status_im2/subs/wallet/wallet.cljs b/src/status_im/subs/wallet/wallet.cljs similarity index 97% rename from src/status_im2/subs/wallet/wallet.cljs rename to src/status_im/subs/wallet/wallet.cljs index ac38498204..b23ebc9f9c 100644 --- a/src/status_im2/subs/wallet/wallet.cljs +++ b/src/status_im/subs/wallet/wallet.cljs @@ -1,8 +1,8 @@ -(ns status-im2.subs.wallet.wallet +(ns status-im.subs.wallet.wallet (:require [clojure.string :as string] [re-frame.core :as rf] - [status-im2.constants :as constants] - [status-im2.contexts.wallet.common.utils :as utils] + [status-im.constants :as constants] + [status-im.contexts.wallet.common.utils :as utils] [utils.number])) (defn- filter-networks diff --git a/src/status_im2/subs/wallet/wallet_test.cljs b/src/status_im/subs/wallet/wallet_test.cljs similarity index 99% rename from src/status_im2/subs/wallet/wallet_test.cljs rename to src/status_im/subs/wallet/wallet_test.cljs index ec73519990..fbf5e78a49 100644 --- a/src/status_im2/subs/wallet/wallet_test.cljs +++ b/src/status_im/subs/wallet/wallet_test.cljs @@ -1,7 +1,7 @@ -(ns status-im2.subs.wallet.wallet-test +(ns status-im.subs.wallet.wallet-test (:require [cljs.test :refer [is testing use-fixtures]] [re-frame.db :as rf-db] - [status-im2.subs.root] + [status-im.subs.root] [test-helpers.unit :as h] [utils.money :as money] [utils.re-frame :as rf])) diff --git a/src/status_im2/common/home/constants.cljs b/src/status_im2/common/home/constants.cljs deleted file mode 100644 index 50f6865917..0000000000 --- a/src/status_im2/common/home/constants.cljs +++ /dev/null @@ -1,3 +0,0 @@ -(ns status-im2.common.home.constants) - -(def header-height 245) diff --git a/src/status_im2/common/home/header_spacing/view.cljs b/src/status_im2/common/home/header_spacing/view.cljs deleted file mode 100644 index 5d5575b31c..0000000000 --- a/src/status_im2/common/home/header_spacing/view.cljs +++ /dev/null @@ -1,8 +0,0 @@ -(ns status-im2.common.home.header-spacing.view - (:require - [react-native.core :as rn] - [status-im2.common.home.header-spacing.style :as style])) - -(defn view - [] - [rn/view {:style (style/header-spacing)}]) diff --git a/src/status_im2/common/standard_authentication/core.cljs b/src/status_im2/common/standard_authentication/core.cljs deleted file mode 100644 index 70a1376479..0000000000 --- a/src/status_im2/common/standard_authentication/core.cljs +++ /dev/null @@ -1,7 +0,0 @@ -(ns status-im2.common.standard-authentication.core - (:require - status-im2.common.standard-authentication.password-input.view - status-im2.common.standard-authentication.standard-auth.slide-button.view)) - -(def password-input status-im2.common.standard-authentication.password-input.view/view) -(def slide-button status-im2.common.standard-authentication.standard-auth.slide-button.view/view) diff --git a/src/status_im2/contexts/communities/actions/see_rules/view.cljs b/src/status_im2/contexts/communities/actions/see_rules/view.cljs deleted file mode 100644 index 230f85381b..0000000000 --- a/src/status_im2/contexts/communities/actions/see_rules/view.cljs +++ /dev/null @@ -1,13 +0,0 @@ -(ns status-im2.contexts.communities.actions.see-rules.view - (:require - [status-im2.contexts.communities.actions.community-rules-list.view :as community-rules] - [status-im2.contexts.communities.actions.generic-menu.view :as generic-menu] - [utils.i18n :as i18n])) - -(defn view - [id] - [generic-menu/view - {:id id - :title (i18n/label :t/community-rules)} - - [community-rules/view community-rules/standard-rules]]) diff --git a/src/status_im2/contexts/quo_preview/ios/drawer_bar.cljs b/src/status_im2/contexts/quo_preview/ios/drawer_bar.cljs deleted file mode 100644 index e46676e716..0000000000 --- a/src/status_im2/contexts/quo_preview/ios/drawer_bar.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns status-im2.contexts.quo-preview.ios.drawer-bar - (:require - [quo.core :as quo] - [status-im2.contexts.quo-preview.preview :as preview])) - -(defn view - [] - [preview/preview-container {} - [quo/drawer-bar]]) diff --git a/src/status_im2/contexts/wallet/common/sheets/network_preferences/style.cljs b/src/status_im2/contexts/wallet/common/sheets/network_preferences/style.cljs deleted file mode 100644 index 1eec4dc054..0000000000 --- a/src/status_im2/contexts/wallet/common/sheets/network_preferences/style.cljs +++ /dev/null @@ -1,5 +0,0 @@ -(ns status-im2.contexts.wallet.common.sheets.network-preferences.style) - -(def data-item - {:margin-horizontal 20 - :margin-vertical 8}) diff --git a/src/status_im2/contexts/wallet/common/sheets/select_account/style.cljs b/src/status_im2/contexts/wallet/common/sheets/select_account/style.cljs deleted file mode 100644 index ad15e29f6a..0000000000 --- a/src/status_im2/contexts/wallet/common/sheets/select_account/style.cljs +++ /dev/null @@ -1,4 +0,0 @@ -(ns status-im2.contexts.wallet.common.sheets.select-account.style) - -(def list-container - {:margin-horizontal 8}) diff --git a/src/status_im2/core_spec.cljs b/src/status_im2/core_spec.cljs deleted file mode 100644 index 2af59e4e3a..0000000000 --- a/src/status_im2/core_spec.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns status-im2.core-spec - (:require - [status-im2.common.floating-button-page.component-spec] - [status-im2.contexts.chat.messages.content.audio.component-spec] - [status-im2.contexts.communities.actions.community-options.component-spec] - [status-im2.contexts.wallet.add-address-to-watch.component-spec] - [status-im2.contexts.wallet.add-address-to-watch.confirm-address.component-spec] - [status-im2.contexts.wallet.create-account.edit-derivation-path.component-spec] - [status-im2.contexts.wallet.send.input-amount.component-spec])) diff --git a/src/status_im2/events.cljs b/src/status_im2/events.cljs deleted file mode 100644 index 4001b17a8d..0000000000 --- a/src/status_im2/events.cljs +++ /dev/null @@ -1,44 +0,0 @@ -(ns status-im2.events - (:require - [legacy.status-im.bottom-sheet.events] - [legacy.status-im.keycard.core :as keycard] - status-im2.common.alert.effects - status-im2.common.async-storage.effects - status-im2.common.font.events - [status-im2.common.json-rpc.events] - status-im2.common.password-authentication.events - status-im2.common.signals.events - status-im2.common.theme.events - [status-im2.common.toasts.events] - [status-im2.contexts.add-new-contact.events] - status-im2.contexts.chat.composer.events - status-im2.contexts.chat.events - status-im2.contexts.chat.photo-selector.events - status-im2.contexts.communities.events - status-im2.contexts.communities.overview.events - status-im2.contexts.emoji-picker.events - status-im2.contexts.onboarding.common.overlay.events - status-im2.contexts.onboarding.events - status-im2.contexts.profile.events - status-im2.contexts.profile.settings.events - status-im2.contexts.shell.share.events - status-im2.contexts.syncing.events - status-im2.contexts.wallet.events - status-im2.contexts.wallet.send.events - [status-im2.db :as db] - [utils.re-frame :as rf])) - -(rf/defn start-app - {:events [:app-started]} - [cofx] - (rf/merge - cofx - {:db db/app-db - :theme/init-theme nil - :network/listen-to-network-info nil - :biometric/get-supported-biometric-type nil - ;;app starting flow continues in get-profiles-overview - :profile/get-profiles-overview #(rf/dispatch [:profile/get-profiles-overview-success %]) - :effects.font/get-font-file-for-initials-avatar - #(rf/dispatch [:font/init-font-file-for-initials-avatar %])} - (keycard/init))) diff --git a/src/test_helpers/integration.cljs b/src/test_helpers/integration.cljs index 0bdddaa707..33e45a9f13 100644 --- a/src/test_helpers/integration.cljs +++ b/src/test_helpers/integration.cljs @@ -6,10 +6,10 @@ legacy.status-im.subs.root [native-module.core :as native-module] [re-frame.core :as rf] - status-im2.events - [status-im2.integration-test.constants :as constants] - status-im2.navigation.core - status-im2.subs.root + status-im.events + [status-im.integration-test.constants :as constants] + status-im.navigation.core + status-im.subs.root [taoensso.timbre :as log])) (defn initialize-app! diff --git a/src/utils/image_server.cljs b/src/utils/image_server.cljs index 2fe848705a..7ad6b00af1 100644 --- a/src/utils/image_server.cljs +++ b/src/utils/image_server.cljs @@ -2,8 +2,8 @@ (:require [react-native.fs :as utils.fs] [react-native.platform :as platform] - status-im2.common.pixel-ratio - [status-im2.constants :as constants] + status-im.common.pixel-ratio + [status-im.constants :as constants] [utils.datetime :as datetime])) (def ^:const image-server-uri-prefix "https://localhost:") @@ -82,7 +82,7 @@ "&imageName=" image-name "&size=" - (Math/round (* size status-im2.common.pixel-ratio/ratio)) + (Math/round (* size status-im.common.pixel-ratio/ratio)) "&theme=" (current-theme-index theme) "&clock=" @@ -90,15 +90,15 @@ "&indicatorColor=" (js/encodeURIComponent indicator-color) "&indicatorSize=" - (* indicator-size status-im2.common.pixel-ratio/ratio) + (* indicator-size status-im.common.pixel-ratio/ratio) "&indicatorBorder=" - (* indicator-border status-im2.common.pixel-ratio/ratio) + (* indicator-border status-im.common.pixel-ratio/ratio) "&indicatorCenterToEdge=" - (* indicator-center-to-edge status-im2.common.pixel-ratio/ratio) + (* indicator-center-to-edge status-im.common.pixel-ratio/ratio) "&addRing=" (if ring? 1 0) "&ringWidth=" - (* ring-width status-im2.common.pixel-ratio/ratio))) + (* ring-width status-im.common.pixel-ratio/ratio))) (defn get-account-image-uri-fn "pass the result fn to user-avatar component as `:profile-picture` @@ -153,13 +153,13 @@ "&length=" length "&size=" - (Math/round (* size status-im2.common.pixel-ratio/ratio)) + (Math/round (* size status-im.common.pixel-ratio/ratio)) "&bgColor=" (js/encodeURIComponent background-color) "&color=" (js/encodeURIComponent color) "&fontSize=" - (* font-size status-im2.common.pixel-ratio/ratio) + (* font-size status-im.common.pixel-ratio/ratio) "&fontFile=" (js/encodeURIComponent font-file) "&uppercaseRatio=" @@ -173,15 +173,15 @@ "&indicatorColor=" (js/encodeURIComponent indicator-color) "&indicatorSize=" - (* indicator-size status-im2.common.pixel-ratio/ratio) + (* indicator-size status-im.common.pixel-ratio/ratio) "&indicatorBorder=" - (* indicator-border status-im2.common.pixel-ratio/ratio) + (* indicator-border status-im.common.pixel-ratio/ratio) "&indicatorCenterToEdge=" - (* indicator-center-to-edge status-im2.common.pixel-ratio/ratio) + (* indicator-center-to-edge status-im.common.pixel-ratio/ratio) "&addRing=" (if ring? 1 0) "&ringWidth=" - (* ring-width status-im2.common.pixel-ratio/ratio))) + (* ring-width status-im.common.pixel-ratio/ratio))) (defn get-initials-avatar-uri-fn "return a fn that calls `get-account-initials-uri` @@ -227,7 +227,7 @@ "&imageName=" image-name "&size=" - (Math/round (* size status-im2.common.pixel-ratio/ratio)) + (Math/round (* size status-im.common.pixel-ratio/ratio)) "&theme=" (current-theme-index theme) "&clock=" @@ -235,15 +235,15 @@ "&indicatorColor=" (js/encodeURIComponent indicator-color) "&indicatorSize=" - (* indicator-size status-im2.common.pixel-ratio/ratio) + (* indicator-size status-im.common.pixel-ratio/ratio) "&indicatorBorder=" - (* indicator-border status-im2.common.pixel-ratio/ratio) + (* indicator-border status-im.common.pixel-ratio/ratio) "&indicatorCenterToEdge=" - (* indicator-center-to-edge status-im2.common.pixel-ratio/ratio) + (* indicator-center-to-edge status-im.common.pixel-ratio/ratio) "&addRing=" (if ring? 1 0) "&ringWidth=" - (* ring-width status-im2.common.pixel-ratio/ratio))) + (* ring-width status-im.common.pixel-ratio/ratio))) (defn get-contact-image-uri-fn [{:keys [port public-key image-name theme override-ring? clock]}] diff --git a/src/utils/image_server_test.cljs b/src/utils/image_server_test.cljs index 7594d415ec..e1fe77c891 100644 --- a/src/utils/image_server_test.cljs +++ b/src/utils/image_server_test.cljs @@ -1,14 +1,14 @@ (ns utils.image-server-test (:require [cljs.test :as t] - status-im2.common.pixel-ratio + status-im.common.pixel-ratio [utils.image-server :as sut])) (t/deftest get-account-image-uri (with-redefs - [sut/current-theme-index identity - status-im2.common.pixel-ratio/ratio 2 - sut/timestamp (constantly "timestamp")] + [sut/current-theme-index identity + status-im.common.pixel-ratio/ratio 2 + sut/timestamp (constantly "timestamp")] (t/is (= (sut/get-account-image-uri {:port "port" @@ -25,9 +25,9 @@ (t/deftest get-account-initials-uri (with-redefs - [sut/current-theme-index identity - status-im2.common.pixel-ratio/ratio 2 - sut/timestamp (constantly "timestamp")] + [sut/current-theme-index identity + status-im.common.pixel-ratio/ratio 2 + sut/timestamp (constantly "timestamp")] (t/is (= (sut/get-initials-avatar-uri diff --git a/src/utils/universal_links.cljs b/src/utils/universal_links.cljs index cce5584af6..77261b66b4 100644 --- a/src/utils/universal_links.cljs +++ b/src/utils/universal_links.cljs @@ -1,7 +1,7 @@ (ns utils.universal-links (:require [goog.string :as gstring] - [status-im2.constants :as constants])) + [status-im.constants :as constants])) ;; domains should be without the trailing slash (def domains diff --git a/test/jest/jest.config.js b/test/jest/jest.config.js index 6a95b54867..a21ec73860 100644 --- a/test/jest/jest.config.js +++ b/test/jest/jest.config.js @@ -2,7 +2,7 @@ module.exports = { preset: 'react-native', setupFilesAfterEnv: [ '@testing-library/jest-native/extend-expect', - '../component-spec/status_im2.setup.schema_preload.js', + '../component-spec/status_im.setup.schema_preload.js', '../test/jest/jestSetup.js', ], setupFiles: [],