diff --git a/src/quo2/components/community/token_gating.cljs b/src/quo2/components/community/token_gating.cljs index f431c51de9..4a7956b7a6 100644 --- a/src/quo2/components/community/token_gating.cljs +++ b/src/quo2/components/community/token_gating.cljs @@ -7,7 +7,7 @@ [quo2.components.markdown.text :as text] [quo2.components.tags.token-tag :as token-tag] [quo2.foundations.colors :as colors] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [react-native.fast-image :as fast-image])) (def ^:private token-tag-horizontal-spacing 7) diff --git a/src/quo2/components/notifications/activity_log/view.cljs b/src/quo2/components/notifications/activity_log/view.cljs index 0247abbbe0..5fd585e0a0 100644 --- a/src/quo2/components/notifications/activity_log/view.cljs +++ b/src/quo2/components/notifications/activity_log/view.cljs @@ -9,7 +9,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n])) + [utils.i18n :as i18n])) (def ^:private max-reply-length 280) diff --git a/src/quo2/components/notifications/toast.cljs b/src/quo2/components/notifications/toast.cljs index dd5f4112cd..6e7ff6a6f6 100644 --- a/src/quo2/components/notifications/toast.cljs +++ b/src/quo2/components/notifications/toast.cljs @@ -1,5 +1,5 @@ (ns quo2.components.notifications.toast - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.components.icon :as icon] [quo2.components.markdown.text :as text] [quo2.components.notifications.count-down-circle :as count-down-circle] diff --git a/src/status_im/add_new/core.cljs b/src/status_im/add_new/core.cljs index 12f8c736a8..fe3161a8a8 100644 --- a/src/status_im/add_new/core.cljs +++ b/src/status_im/add_new/core.cljs @@ -7,7 +7,7 @@ [status-im.ethereum.core :as ethereum] [status-im.ethereum.ens :as ens] [status-im.ethereum.stateofus :as stateofus] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.router.core :as router] [status-im.utils.db :as utils.db] [utils.re-frame :as rf] diff --git a/src/status_im/bootnodes/core.cljs b/src/status_im/bootnodes/core.cljs index b8c1798e8e..76906565d6 100644 --- a/src/status_im/bootnodes/core.cljs +++ b/src/status_im/bootnodes/core.cljs @@ -1,7 +1,7 @@ (ns status-im.bootnodes.core (:require [clojure.string :as string] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [utils.re-frame :as rf] [status-im2.navigation.events :as navigation])) diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs index 5bc80ac816..2dec5cb4f0 100644 --- a/src/status_im/browser/core.cljs +++ b/src/status_im/browser/core.cljs @@ -11,7 +11,7 @@ [status-im.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.ens :as ens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.native-module.core :as status] [status-im.signing.core :as signing] diff --git a/src/status_im/browser/permissions.cljs b/src/status_im/browser/permissions.cljs index 98532aa810..84ddffdccf 100644 --- a/src/status_im/browser/permissions.cljs +++ b/src/status_im/browser/permissions.cljs @@ -1,6 +1,6 @@ (ns status-im.browser.permissions (:require [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [utils.re-frame :as rf] [status-im2.navigation.events :as navigation])) diff --git a/src/status_im/chat/models.cljs b/src/status_im/chat/models.cljs index 6d2881e601..bdcf375bb1 100644 --- a/src/status_im/chat/models.cljs +++ b/src/status_im/chat/models.cljs @@ -8,7 +8,7 @@ [status-im.constants :as constants] [status-im.data-store.chats :as chats-store] [status-im.data-store.contacts :as contacts-store] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.mailserver.core :as mailserver] [status-im.multiaccounts.model :as multiaccounts.model] [status-im2.contexts.chat.messages.list.state :as chat.state] diff --git a/src/status_im/chat/models/images.cljs b/src/status_im/chat/models/images.cljs index aafca3c622..75536ac4aa 100644 --- a/src/status_im/chat/models/images.cljs +++ b/src/status_im/chat/models/images.cljs @@ -4,7 +4,7 @@ [clojure.string :as string] [re-frame.core :as re-frame] [status-im.chat.models :as chat] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.permissions :as permissions] [status-im.ui.components.react :as react] [status-im.utils.config :as config] diff --git a/src/status_im/chat/models/input.cljs b/src/status_im/chat/models/input.cljs index 99cc25dbd1..8004217e35 100644 --- a/src/status_im/chat/models/input.cljs +++ b/src/status_im/chat/models/input.cljs @@ -10,7 +10,7 @@ [status-im.chat.models.message-content :as message-content] [status-im.constants :as constants] [utils.re-frame :as rf] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [utils.datetime :as datetime] [status-im.utils.utils :as utils] [taoensso.timbre :as log] diff --git a/src/status_im/communities/core.cljs b/src/status_im/communities/core.cljs index 6e7dc4e95b..ba00000316 100644 --- a/src/status_im/communities/core.cljs +++ b/src/status_im/communities/core.cljs @@ -4,7 +4,7 @@ [clojure.walk :as walk] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.async-storage.core :as async-storage] [status-im.bottom-sheet.core :as bottom-sheet] [status-im.constants :as constants] diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs index 5607643669..5c67ec5023 100644 --- a/src/status_im/events.cljs +++ b/src/status_im/events.cljs @@ -21,7 +21,7 @@ status-im.ethereum.subscriptions status-im.fleet.core status-im.http.core - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.core :as keycard] status-im.log-level.core status-im.mailserver.constants diff --git a/src/status_im/fleet/core.cljs b/src/status_im/fleet/core.cljs index 00c5bc0e19..ef356a5d90 100644 --- a/src/status_im/fleet/core.cljs +++ b/src/status_im/fleet/core.cljs @@ -1,7 +1,7 @@ (ns status-im.fleet.core (:require [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.node.core :as node] [status-im.utils.config :as config] diff --git a/src/status_im/group_chats/core.cljs b/src/status_im/group_chats/core.cljs index 8b75abe994..6544b367ca 100644 --- a/src/status_im/group_chats/core.cljs +++ b/src/status_im/group_chats/core.cljs @@ -2,7 +2,7 @@ (:refer-clojure :exclude [remove]) (:require [clojure.spec.alpha :as spec] [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [oops.core :as oops] [re-frame.core :as re-frame] [status-im.chat.models :as models.chat] diff --git a/src/status_im/keycard/backup_key.cljs b/src/status_im/keycard/backup_key.cljs index b2abbf2a8a..7da275e6c4 100644 --- a/src/status_im/keycard/backup_key.cljs +++ b/src/status_im/keycard/backup_key.cljs @@ -1,7 +1,7 @@ (ns status-im.keycard.backup-key (:require [re-frame.core :as re-frame] [status-im.ethereum.mnemonic :as mnemonic] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.common :as common] [status-im.multiaccounts.recover.core :as multiaccounts.recover] [status-im.signing.core :as signing.core] diff --git a/src/status_im/keycard/change_pin.cljs b/src/status_im/keycard/change_pin.cljs index 63f12598a2..944edc5010 100644 --- a/src/status_im/keycard/change_pin.cljs +++ b/src/status_im/keycard/change_pin.cljs @@ -1,5 +1,5 @@ (ns status-im.keycard.change-pin - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [status-im.keycard.common :as common] [status-im.keycard.onboarding :as onboarding] [utils.re-frame :as rf] diff --git a/src/status_im/keycard/common.cljs b/src/status_im/keycard/common.cljs index f2b3917c69..5643ef4ec8 100644 --- a/src/status_im/keycard/common.cljs +++ b/src/status_im/keycard/common.cljs @@ -3,7 +3,7 @@ [re-frame.core :as re-frame] [status-im.bottom-sheet.core :as bottom-sheet] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.nfc :as nfc] [status-im.popover.core :as popover] [status-im.ui.screens.keycard.keycard-interaction :as keycard-sheet] diff --git a/src/status_im/keycard/core.cljs b/src/status_im/keycard/core.cljs index 512ac97490..14d7d3f780 100644 --- a/src/status_im/keycard/core.cljs +++ b/src/status_im/keycard/core.cljs @@ -1,6 +1,6 @@ (ns status-im.keycard.core (:require [re-frame.db] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] status-im.keycard.backup-key [status-im.keycard.card :as card] [status-im.keycard.change-pin :as change-pin] diff --git a/src/status_im/keycard/onboarding.cljs b/src/status_im/keycard/onboarding.cljs index b7051df316..a65bb3fb28 100644 --- a/src/status_im/keycard/onboarding.cljs +++ b/src/status_im/keycard/onboarding.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.common :as common] status-im.keycard.fx [status-im.keycard.mnemonic :as mnemonic] diff --git a/src/status_im/keycard/recovery.cljs b/src/status_im/keycard/recovery.cljs index 1f2d15e245..38f9dd9e77 100644 --- a/src/status_im/keycard/recovery.cljs +++ b/src/status_im/keycard/recovery.cljs @@ -5,7 +5,7 @@ [status-im.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.common :as common] status-im.keycard.fx [status-im.multiaccounts.create.core :as multiaccounts.create] diff --git a/src/status_im/keycard/simulated_keycard.cljs b/src/status_im/keycard/simulated_keycard.cljs index b8acb54145..7949349f97 100644 --- a/src/status_im/keycard/simulated_keycard.cljs +++ b/src/status_im/keycard/simulated_keycard.cljs @@ -4,7 +4,7 @@ [re-frame.db :as re-frame.db] [status-im.constants :as constants] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.keycard :as keycard] [status-im.multiaccounts.create.core :as multiaccounts.create] [status-im.native-module.core :as status] diff --git a/src/status_im/keycard/unpair.cljs b/src/status_im/keycard/unpair.cljs index 21f9e8029c..29b1a2c2d3 100644 --- a/src/status_im/keycard/unpair.cljs +++ b/src/status_im/keycard/unpair.cljs @@ -1,6 +1,6 @@ (ns status-im.keycard.unpair (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.common :as common] [status-im.multiaccounts.key-storage.core :as key-storage] [status-im.multiaccounts.update.core :as multiaccounts.update] diff --git a/src/status_im/log_level/core.cljs b/src/status_im/log_level/core.cljs index ffe2798403..f507a42220 100644 --- a/src/status_im/log_level/core.cljs +++ b/src/status_im/log_level/core.cljs @@ -1,6 +1,6 @@ (ns status-im.log-level.core (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.node.core :as node] [utils.re-frame :as rf])) diff --git a/src/status_im/mailserver/core.cljs b/src/status_im/mailserver/core.cljs index f7d192b9dc..c8945c8fa0 100644 --- a/src/status_im/mailserver/core.cljs +++ b/src/status_im/mailserver/core.cljs @@ -1,7 +1,7 @@ (ns ^{:doc "Mailserver events and API"} status-im.mailserver.core (:require [clojure.string :as string] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.node.core :as node] [utils.re-frame :as rf] diff --git a/src/status_im/multiaccounts/biometric/core.cljs b/src/status_im/multiaccounts/biometric/core.cljs index 6d7cd7687a..0037dc05f2 100644 --- a/src/status_im/multiaccounts/biometric/core.cljs +++ b/src/status_im/multiaccounts/biometric/core.cljs @@ -2,7 +2,7 @@ (:require ["react-native-touch-id" :default touchid] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.native-module.core :as status] [status-im.popover.core :as popover] [utils.re-frame :as rf] diff --git a/src/status_im/multiaccounts/create/core.cljs b/src/status_im/multiaccounts/create/core.cljs index effc1b3c24..ce9e1aab1b 100644 --- a/src/status_im/multiaccounts/create/core.cljs +++ b/src/status_im/multiaccounts/create/core.cljs @@ -5,7 +5,7 @@ [status-im.data-store.settings :as data-store.settings] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.native-module.core :as status] [status-im.node.core :as node] [status-im.utils.config :as config] diff --git a/src/status_im/multiaccounts/key_storage/core.cljs b/src/status_im/multiaccounts/key_storage/core.cljs index 4aa24abb4b..738f06fce3 100644 --- a/src/status_im/multiaccounts/key_storage/core.cljs +++ b/src/status_im/multiaccounts/key_storage/core.cljs @@ -4,7 +4,7 @@ [status-im.bottom-sheet.core :as bottom-sheet] [status-im.ethereum.core :as ethereum] [status-im.ethereum.mnemonic :as mnemonic] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.backup-key :as keycard.backup] [status-im.keycard.common :as common] [status-im.multiaccounts.core :as multiaccounts] diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index 657d9e3bd6..9b22c76989 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -16,7 +16,7 @@ [status-im.ethereum.tokens :as tokens] [status-im.ethereum.transactions.core :as transactions] [status-im.fleet.core :as fleet] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.common :as keycard.common] [status-im.mobile-sync-settings.core :as mobile-network] [status-im.multiaccounts.biometric.core :as biometric] diff --git a/src/status_im/multiaccounts/logout/core.cljs b/src/status_im/multiaccounts/logout/core.cljs index 4628a0f4bc..06bc262dc5 100644 --- a/src/status_im/multiaccounts/logout/core.cljs +++ b/src/status_im/multiaccounts/logout/core.cljs @@ -1,6 +1,6 @@ (ns status-im.multiaccounts.logout.core (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.native-module.core :as status] [status-im.notifications.core :as notifications] diff --git a/src/status_im/multiaccounts/recover/core.cljs b/src/status_im/multiaccounts/recover/core.cljs index 2905df0a7c..d092a28005 100644 --- a/src/status_im/multiaccounts/recover/core.cljs +++ b/src/status_im/multiaccounts/recover/core.cljs @@ -5,7 +5,7 @@ [status-im.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.ethereum.mnemonic :as mnemonic] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.nfc :as nfc] [status-im.multiaccounts.core :as multiaccounts] [status-im.multiaccounts.create.core :as multiaccounts.create] diff --git a/src/status_im/native_module/core.cljs b/src/status_im/native_module/core.cljs index 5e76cebd4d..0f5134bc15 100644 --- a/src/status_im/native_module/core.cljs +++ b/src/status_im/native_module/core.cljs @@ -415,13 +415,6 @@ (log/debug "[native-module] set-blank-preview-flag") (.setBlankPreviewFlag ^js (status) flag)) -(defn is24Hour - [] - (log/debug "[native-module] is24Hour") - ;;NOTE: we have to check for status module because of tests - (when (status) - (.-is24Hour ^js (status)))) - (defn get-device-model-info [] (log/debug "[native-module] get-device-model-info") diff --git a/src/status_im/network/core.cljs b/src/status_im/network/core.cljs index 324fd79075..3408d40ffd 100644 --- a/src/status_im/network/core.cljs +++ b/src/status_im/network/core.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.node.core :as node] [utils.re-frame :as rf] [status-im.utils.http :as http] diff --git a/src/status_im/notifications/local.cljs b/src/status_im/notifications/local.cljs index e09dd61c2b..0356f51b59 100644 --- a/src/status_im/notifications/local.cljs +++ b/src/status_im/notifications/local.cljs @@ -8,7 +8,7 @@ [status-im.chat.models :as chat.models] [status-im.ethereum.decode :as decode] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.notifications.android :as pn-android] [utils.re-frame :as rf] [status-im.utils.money :as money] diff --git a/src/status_im/pairing/core.cljs b/src/status_im/pairing/core.cljs index f9ed64c29d..62c131fc5a 100644 --- a/src/status_im/pairing/core.cljs +++ b/src/status_im/pairing/core.cljs @@ -1,6 +1,6 @@ (ns status-im.pairing.core (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.utils.config :as config] [utils.re-frame :as rf] diff --git a/src/status_im/qr_scanner/core.cljs b/src/status_im/qr_scanner/core.cljs index d45603ea06..76cb335b85 100644 --- a/src/status_im/qr_scanner/core.cljs +++ b/src/status_im/qr_scanner/core.cljs @@ -5,7 +5,7 @@ [status-im.chat.models :as chat] [status-im.ethereum.core :as ethereum] [status-im.group-chats.core :as group-chats] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.router.core :as router] [utils.re-frame :as rf] [status-im.utils.utils :as utils] diff --git a/src/status_im/signals/core.cljs b/src/status_im/signals/core.cljs index 6fb1843c00..45e94b06da 100644 --- a/src/status_im/signals/core.cljs +++ b/src/status_im/signals/core.cljs @@ -2,7 +2,7 @@ (:require [status-im.chat.models.link-preview :as link.preview] [status-im.chat.models.message :as models.message] [status-im.ethereum.subscriptions :as ethereum.subscriptions] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.mailserver.core :as mailserver] [status-im.multiaccounts.login.core :as login] [status-im.notifications.local :as local-notifications] diff --git a/src/status_im/signing/core.cljs b/src/status_im/signing/core.cljs index 56bd070c91..c1e479c586 100644 --- a/src/status_im/signing/core.cljs +++ b/src/status_im/signing/core.cljs @@ -6,7 +6,7 @@ [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.card :as keycard.card] [status-im.keycard.common :as keycard.common] [status-im.native-module.core :as status] diff --git a/src/status_im/signing/gas.cljs b/src/status_im/signing/gas.cljs index a06bd0375c..8853f5ded3 100644 --- a/src/status_im/signing/gas.cljs +++ b/src/status_im/signing/gas.cljs @@ -3,7 +3,7 @@ [re-frame.core :as re-frame] [status-im.bottom-sheet.core :as bottom-sheet] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.popover.core :as popover] [status-im.signing.eip1559 :as eip1559] [utils.re-frame :as rf] diff --git a/src/status_im/signing/keycard.cljs b/src/status_im/signing/keycard.cljs index 9b4efa614b..1cae35b8e9 100644 --- a/src/status_im/signing/keycard.cljs +++ b/src/status_im/signing/keycard.cljs @@ -1,6 +1,6 @@ (ns status-im.signing.keycard (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.native-module.core :as status] [utils.re-frame :as rf] [status-im.utils.types :as types] diff --git a/src/status_im/ui/components/action_sheet.cljs b/src/status_im/ui/components/action_sheet.cljs index 623d2b405c..7a2fc2bb67 100644 --- a/src/status_im/ui/components/action_sheet.cljs +++ b/src/status_im/ui/components/action_sheet.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.components.action-sheet (:require ["react-native" :refer (ActionSheetIOS)] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.utils.core :as utils])) (defn- callback diff --git a/src/status_im/ui/components/badge.cljs b/src/status_im/ui/components/badge.cljs index 2e9e92d484..d82f1cc5e8 100644 --- a/src/status_im/ui/components/badge.cljs +++ b/src/status_im/ui/components/badge.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.components.badge (:require [quo.design-system.colors :as colors] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react])) (defn badge diff --git a/src/status_im/ui/components/common/common.cljs b/src/status_im/ui/components/common/common.cljs index 7b2437fe39..2b77d52612 100644 --- a/src/status_im/ui/components/common/common.cljs +++ b/src/status_im/ui/components/common/common.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.components.common.common (:require [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.common.styles :as styles] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react]) diff --git a/src/status_im/ui/components/connectivity/view.cljs b/src/status_im/ui/components/connectivity/view.cljs index a833d01a98..a16dc4769f 100644 --- a/src/status_im/ui/components/connectivity/view.cljs +++ b/src/status_im/ui/components/connectivity/view.cljs @@ -3,7 +3,7 @@ [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.animation :as animation] [status-im.ui.components.react :as react]) (:require-macros [status-im.utils.views :as views :refer [defview letsubs]])) diff --git a/src/status_im/ui/components/copyable_text.cljs b/src/status_im/ui/components/copyable_text.cljs index 5576ad3412..1554eb42ec 100644 --- a/src/status_im/ui/components/copyable_text.cljs +++ b/src/status_im/ui/components/copyable_text.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.components.copyable-text (:require [quo.design-system.colors :as colors] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.animation :as animation] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/components/invite/events.cljs b/src/status_im/ui/components/invite/events.cljs index ae8b60940a..1b58ca62e3 100644 --- a/src/status_im/ui/components/invite/events.cljs +++ b/src/status_im/ui/components/invite/events.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.components.invite.events (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.re-frame :as rf] [status-im.utils.universal-links.utils :as universal-links])) diff --git a/src/status_im/ui/components/invite/views.cljs b/src/status_im/ui/components/invite/views.cljs index 7b6486e18a..d1c1143566 100644 --- a/src/status_im/ui/components/invite/views.cljs +++ b/src/status_im/ui/components/invite/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.components.invite.views (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.invite.events :as invite.events])) (defn button diff --git a/src/status_im/ui/components/list_selection.cljs b/src/status_im/ui/components/list_selection.cljs index 2122373e73..50292670db 100644 --- a/src/status_im/ui/components/list_selection.cljs +++ b/src/status_im/ui/components/list_selection.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.components.list-selection (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.action-sheet :as action-sheet] [status-im.ui.components.dialog :as dialog] [status-im.ui.components.react :as react] @@ -37,4 +37,4 @@ (show {:title (i18n/label :t/browsing-title) :options [{:label (i18n/label (platform-web-browser)) :action #(.openURL ^js react/linking (http/normalize-url link))}] - :cancel-text (i18n/label :t/browsing-cancel)})) \ No newline at end of file + :cancel-text (i18n/label :t/browsing-cancel)})) diff --git a/src/status_im/ui/components/react.cljs b/src/status_im/ui/components/react.cljs index 0580677c79..92f82a4ee6 100644 --- a/src/status_im/ui/components/react.cljs +++ b/src/status_im/ui/components/react.cljs @@ -12,7 +12,7 @@ (SafeAreaProvider SafeAreaInsetsContext)] [quo.design-system.colors :as colors] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.typography :as typography] [status-im.utils.platform :as platform] [status-im.utils.utils :as utils]) diff --git a/src/status_im/ui/components/search_input/view.cljs b/src/status_im/ui/components/search_input/view.cljs index 7db567f7f9..65a9e78e9a 100644 --- a/src/status_im/ui/components/search_input/view.cljs +++ b/src/status_im/ui/components/search_input/view.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [quo2.foundations.colors :as quo2.colors] [reagent.core :as reagent] - [i18n.i18n :as i18n])) + [utils.i18n :as i18n])) (defn search-input [{:keys [search-active?]}] diff --git a/src/status_im/ui/screens/about_app/views.cljs b/src/status_im/ui/screens/about_app/views.cljs index 831acf9685..f3fc286bcb 100644 --- a/src/status_im/ui/screens/about_app/views.cljs +++ b/src/status_im/ui/screens/about_app/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :refer [principles-link privacy-policy-link terms-of-service-link]] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/add_new/new_chat/views.cljs b/src/status_im/ui/screens/add_new/new_chat/views.cljs index 748a841170..8c3f92f1a0 100644 --- a/src/status_im/ui/screens/add_new/new_chat/views.cljs +++ b/src/status_im/ui/screens/add_new/new_chat/views.cljs @@ -8,7 +8,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.ethereum.ens :as ens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.animation :as animation] diff --git a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs index 6a7d5cd2fc..309ddbdbfe 100644 --- a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs +++ b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs @@ -6,7 +6,7 @@ [status-im.react-native.resources :as resources] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] - [i18n.i18n :as i18n]) + [utils.i18n :as i18n]) (:require-macros [status-im.utils.views :as views])) (defn- start-chat diff --git a/src/status_im/ui/screens/advanced_settings/views.cljs b/src/status_im/ui/screens/advanced_settings/views.cljs index 7c6d9910dd..05a70057fa 100644 --- a/src/status_im/ui/screens/advanced_settings/views.cljs +++ b/src/status_im/ui/screens/advanced_settings/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.advanced-settings.views (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.list.views :as list] [status-im2.setup.config :as config]) (:require-macros [status-im.utils.views :as views])) diff --git a/src/status_im/ui/screens/appearance/views.cljs b/src/status_im/ui/screens/appearance/views.cljs index 84f1d496dc..a86ed77cb4 100644 --- a/src/status_im/ui/screens/appearance/views.cljs +++ b/src/status_im/ui/screens/appearance/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] [status-im.utils.config :as config])) diff --git a/src/status_im/ui/screens/backup_settings/view.cljs b/src/status_im/ui/screens/backup_settings/view.cljs index 38656757ad..3076d2b80d 100644 --- a/src/status_im/ui/screens/backup_settings/view.cljs +++ b/src/status_im/ui/screens/backup_settings/view.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.datetime :as datetime])) diff --git a/src/status_im/ui/screens/biometric/views.cljs b/src/status_im/ui/screens/biometric/views.cljs index bcd9ccb4fd..83c6c95bdf 100644 --- a/src/status_im/ui/screens/biometric/views.cljs +++ b/src/status_im/ui/screens/biometric/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.biometric.core :as biometric] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs b/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs index 5b231e4cb2..52cf096e3f 100644 --- a/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs +++ b/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] diff --git a/src/status_im/ui/screens/bootnodes_settings/views.cljs b/src/status_im/ui/screens/bootnodes_settings/views.cljs index 51f0960ee8..f6107c465b 100644 --- a/src/status_im/ui/screens/bootnodes_settings/views.cljs +++ b/src/status_im/ui/screens/bootnodes_settings/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.bootnodes-settings.views (:require-macros [status-im.utils.views :as views]) (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] [status-im.ui.components.topbar :as topbar] diff --git a/src/status_im/ui/screens/browser/accounts.cljs b/src/status_im/ui/screens/browser/accounts.cljs index dabc77fa7d..8af0170978 100644 --- a/src/status_im/ui/screens/browser/accounts.cljs +++ b/src/status_im/ui/screens/browser/accounts.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.browser.accounts (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/browser/bookmarks/views.cljs b/src/status_im/ui/screens/browser/bookmarks/views.cljs index 61d20a6fa7..5b069d7149 100644 --- a/src/status_im/ui/screens/browser/bookmarks/views.cljs +++ b/src/status_im/ui/screens/browser/bookmarks/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] @@ -51,4 +51,4 @@ (defn new-bookmark [] - [screen @(re-frame/subscribe [:get-screen-params])]) \ No newline at end of file + [screen @(re-frame/subscribe [:get-screen-params])]) diff --git a/src/status_im/ui/screens/browser/eip3085/sheet.cljs b/src/status_im/ui/screens/browser/eip3085/sheet.cljs index 507a2f5b45..4664e01cbe 100644 --- a/src/status_im/ui/screens/browser/eip3085/sheet.cljs +++ b/src/status_im/ui/screens/browser/eip3085/sheet.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/browser/eip3326/sheet.cljs b/src/status_im/ui/screens/browser/eip3326/sheet.cljs index 7b755740d0..406d1c7c6f 100644 --- a/src/status_im/ui/screens/browser/eip3326/sheet.cljs +++ b/src/status_im/ui/screens/browser/eip3326/sheet.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.network.core :as network] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/browser/empty_tab/views.cljs b/src/status_im/ui/screens/browser/empty_tab/views.cljs index 2bf29c760c..ca7ba2828d 100644 --- a/src/status_im/ui/screens/browser/empty_tab/views.cljs +++ b/src/status_im/ui/screens/browser/empty_tab/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.common.common :as components.common] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/browser/options/views.cljs b/src/status_im/ui/screens/browser/options/views.cljs index 51340adedf..ae5c83a192 100644 --- a/src/status_im/ui/screens/browser/options/views.cljs +++ b/src/status_im/ui/screens/browser/options/views.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [status-im.browser.core :as browser] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/browser/permissions/views.cljs b/src/status_im/ui/screens/browser/permissions/views.cljs index 2614d99112..48be564845 100644 --- a/src/status_im/ui/screens/browser/permissions/views.cljs +++ b/src/status_im/ui/screens/browser/permissions/views.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.browser.permissions :as browser.permissions] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.animation :as anim] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/browser/site_blocked/views.cljs b/src/status_im/ui/screens/browser/site_blocked/views.cljs index 6041ae53ac..899730e974 100644 --- a/src/status_im/ui/screens/browser/site_blocked/views.cljs +++ b/src/status_im/ui/screens/browser/site_blocked/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.screens.browser.site-blocked.styles :as styles]) diff --git a/src/status_im/ui/screens/browser/tabs/views.cljs b/src/status_im/ui/screens/browser/tabs/views.cljs index 1656bcc9be..d66fea8c64 100644 --- a/src/status_im/ui/screens/browser/tabs/views.cljs +++ b/src/status_im/ui/screens/browser/tabs/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] [status-im.ui.components.plus-button :as components.plus-button] @@ -79,4 +79,4 @@ :render-fn list-item}] [components.plus-button/plus-button-old - {:on-press #(re-frame/dispatch [:browser.ui/open-empty-tab])}]])) \ No newline at end of file + {:on-press #(re-frame/dispatch [:browser.ui/open-empty-tab])}]])) diff --git a/src/status_im/ui/screens/browser/views.cljs b/src/status_im/ui/screens/browser/views.cljs index e069a65553..18cc7a6bd6 100644 --- a/src/status_im/ui/screens/browser/views.cljs +++ b/src/status_im/ui/screens/browser/views.cljs @@ -6,7 +6,7 @@ [reagent.core :as reagent] [status-im.browser.core :as browser] [status-im.browser.webview-ref :as webview-ref] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.connectivity.view :as connectivity] diff --git a/src/status_im/ui/screens/bug_report.cljs b/src/status_im/ui/screens/bug_report.cljs index 107469ce09..308c2861ab 100644 --- a/src/status_im/ui/screens/bug_report.cljs +++ b/src/status_im/ui/screens/bug_report.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.react-native :as react-native] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.topbar :as topbar])) (defn bug-report diff --git a/src/status_im/ui/screens/chat/components/contact_request.cljs b/src/status_im/ui/screens/chat/components/contact_request.cljs index d6165dfa18..11c17035ac 100644 --- a/src/status_im/ui/screens/chat/components/contact_request.cljs +++ b/src/status_im/ui/screens/chat/components/contact_request.cljs @@ -6,7 +6,7 @@ [quo.react-native :as rn] [re-frame.core :as re-frame] [status-im.ethereum.stateofus :as stateofus] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.screens.chat.components.style :as styles]) (:require-macros [status-im.utils.views :refer [defview letsubs]])) diff --git a/src/status_im/ui/screens/chat/components/edit.cljs b/src/status_im/ui/screens/chat/components/edit.cljs index f09d57bc0d..02214e68ba 100644 --- a/src/status_im/ui/screens/chat/components/edit.cljs +++ b/src/status_im/ui/screens/chat/components/edit.cljs @@ -5,7 +5,7 @@ [quo.react :as quo.react] [quo.react-native :as rn] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.screens.chat.components.style :as styles])) diff --git a/src/status_im/ui/screens/chat/components/input.cljs b/src/status_im/ui/screens/chat/components/input.cljs index cca6841d18..b8001fe65d 100644 --- a/src/status_im/ui/screens/chat/components/input.cljs +++ b/src/status_im/ui/screens/chat/components/input.cljs @@ -11,7 +11,7 @@ [reagent.core :as reagent] [status-im2.common.constants :as chat.constants] [status-im.chat.models.mentions :as mentions] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] diff --git a/src/status_im/ui/screens/chat/components/reply.cljs b/src/status_im/ui/screens/chat/components/reply.cljs index 1e7f6f5d57..f47d407810 100644 --- a/src/status_im/ui/screens/chat/components/reply.cljs +++ b/src/status_im/ui/screens/chat/components/reply.cljs @@ -7,7 +7,7 @@ [quo.react-native :as rn] [re-frame.core :as re-frame] [status-im.ethereum.stateofus :as stateofus] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.screens.chat.components.style :as styles])) diff --git a/src/status_im/ui/screens/chat/group.cljs b/src/status_im/ui/screens/chat/group.cljs index bea5601915..359c6baa00 100644 --- a/src/status_im/ui/screens/chat/group.cljs +++ b/src/status_im/ui/screens/chat/group.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.utils.platform :as platform] [utils.debounce :as debounce]) diff --git a/src/status_im/ui/screens/chat/message/gap.cljs b/src/status_im/ui/screens/chat/message/gap.cljs index ffd81eaaa6..7fe7b05ca3 100644 --- a/src/status_im/ui/screens/chat/message/gap.cljs +++ b/src/status_im/ui/screens/chat/message/gap.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :as views]) (:require [quo2.core :as quo2] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.screens.chat.styles.input.gap :as style] [utils.datetime :as datetime])) diff --git a/src/status_im/ui/screens/chat/sheets.cljs b/src/status_im/ui/screens/chat/sheets.cljs index e65a09776a..2438618992 100644 --- a/src/status_im/ui/screens/chat/sheets.cljs +++ b/src/status_im/ui/screens/chat/sheets.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.list-selection :as list-selection] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/chat/stickers/views.cljs b/src/status_im/ui/screens/chat/stickers/views.cljs index 1ab564eba1..016bb6cb3c 100644 --- a/src/status_im/ui/screens/chat/stickers/views.cljs +++ b/src/status_im/ui/screens/chat/stickers/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.fast-image :as fast-image] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/chat/utils.cljs b/src/status_im/ui/screens/chat/utils.cljs index 0efb2e16c0..df7199639d 100644 --- a/src/status_im/ui/screens/chat/utils.cljs +++ b/src/status_im/ui/screens/chat/utils.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.chat.utils (:require [quo.design-system.colors :as colors] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/communities/channel_details.cljs b/src/status_im/ui/screens/communities/channel_details.cljs index a35f48145e..2871d652a5 100644 --- a/src/status_im/ui/screens/communities/channel_details.cljs +++ b/src/status_im/ui/screens/communities/channel_details.cljs @@ -3,7 +3,7 @@ [quo.core :as quo] [re-frame.core :as re-frame] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.profile-header.view :as profile-header] [utils.re-frame :as rf])) diff --git a/src/status_im/ui/screens/communities/community.cljs b/src/status_im/ui/screens/communities/community.cljs index e4acb4d6a4..2c16e24476 100644 --- a/src/status_im/ui/screens/communities/community.cljs +++ b/src/status_im/ui/screens/communities/community.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.communities.community (:require - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo.core :as quo] [quo.design-system.colors :as colors] [quo2.components.community.style :as styles] ;; TODO reimplement with quo2 library and new diff --git a/src/status_im/ui/screens/communities/create.cljs b/src/status_im/ui/screens/communities/create.cljs index d85d152b56..e680d081f3 100644 --- a/src/status_im/ui/screens/communities/create.cljs +++ b/src/status_im/ui/screens/communities/create.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [quo.react-native :as rn] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] diff --git a/src/status_im/ui/screens/communities/create_category.cljs b/src/status_im/ui/screens/communities/create_category.cljs index 76686e1c79..28c060ce2a 100644 --- a/src/status_im/ui/screens/communities/create_category.cljs +++ b/src/status_im/ui/screens/communities/create_category.cljs @@ -3,7 +3,7 @@ [quo.core :as quo] [reagent.core :as reagent] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/communities/create_channel.cljs b/src/status_im/ui/screens/communities/create_channel.cljs index d7b25955fa..bd2cec9e18 100644 --- a/src/status_im/ui/screens/communities/create_channel.cljs +++ b/src/status_im/ui/screens/communities/create_channel.cljs @@ -3,7 +3,7 @@ [quo.core :as quo] [quo.react-native :as rn] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.emoji-thumbnail.preview :as emoji-thumbnail-preview] [status-im.ui.components.emoji-thumbnail.styles :as styles] [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation] diff --git a/src/status_im/ui/screens/communities/edit.cljs b/src/status_im/ui/screens/communities/edit.cljs index d0de4b8db1..caeddb709c 100644 --- a/src/status_im/ui/screens/communities/edit.cljs +++ b/src/status_im/ui/screens/communities/edit.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.communities.edit (:require [quo.core :as quo] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [status-im.ui.screens.communities.create :as community.create] [utils.re-frame :as rf])) diff --git a/src/status_im/ui/screens/communities/edit_channel.cljs b/src/status_im/ui/screens/communities/edit_channel.cljs index f616efb67d..55904838c6 100644 --- a/src/status_im/ui/screens/communities/edit_channel.cljs +++ b/src/status_im/ui/screens/communities/edit_channel.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [quo.core :as quo] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [status-im.ui.screens.communities.create-channel :as create-channel] [utils.re-frame :as rf] diff --git a/src/status_im/ui/screens/communities/import.cljs b/src/status_im/ui/screens/communities/import.cljs index 4635553af3..46168f1b6b 100644 --- a/src/status_im/ui/screens/communities/import.cljs +++ b/src/status_im/ui/screens/communities/import.cljs @@ -3,7 +3,7 @@ [quo.react-native :as rn] [reagent.core :as reagent] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [utils.re-frame :as rf])) diff --git a/src/status_im/ui/screens/communities/invite.cljs b/src/status_im/ui/screens/communities/invite.cljs index e5159fdc94..e48555cd79 100644 --- a/src/status_im/ui/screens/communities/invite.cljs +++ b/src/status_im/ui/screens/communities/invite.cljs @@ -5,7 +5,7 @@ [reagent.core :as reagent] [status-im.communities.core :as communities] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.toolbar :as toolbar] diff --git a/src/status_im/ui/screens/communities/members.cljs b/src/status_im/ui/screens/communities/members.cljs index 283f5ca957..2254191c79 100644 --- a/src/status_im/ui/screens/communities/members.cljs +++ b/src/status_im/ui/screens/communities/members.cljs @@ -4,7 +4,7 @@ [reagent.core :as reagent] [status-im.communities.core :as communities] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/communities/membership.cljs b/src/status_im/ui/screens/communities/membership.cljs index e699b4c92b..67d52af596 100644 --- a/src/status_im/ui/screens/communities/membership.cljs +++ b/src/status_im/ui/screens/communities/membership.cljs @@ -3,7 +3,7 @@ [quo.react-native :as rn] [status-im.communities.core :as communities] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [utils.re-frame :as rf])) diff --git a/src/status_im/ui/screens/communities/profile.cljs b/src/status_im/ui/screens/communities/profile.cljs index f569690ee3..065dda99e8 100644 --- a/src/status_im/ui/screens/communities/profile.cljs +++ b/src/status_im/ui/screens/communities/profile.cljs @@ -6,7 +6,7 @@ [reagent.core :as reagent] [status-im.communities.core :as communities] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.profile-header.view :as profile-header] diff --git a/src/status_im/ui/screens/communities/reorder_categories.cljs b/src/status_im/ui/screens/communities/reorder_categories.cljs index 12c357fb84..fa64786f8d 100644 --- a/src/status_im/ui/screens/communities/reorder_categories.cljs +++ b/src/status_im/ui/screens/communities/reorder_categories.cljs @@ -9,7 +9,7 @@ [reagent.core :as reagent] [status-im.communities.core :as communities] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.components.tabs :as tabs] diff --git a/src/status_im/ui/screens/communities/requests_to_join.cljs b/src/status_im/ui/screens/communities/requests_to_join.cljs index a46edea66f..6626a687c0 100644 --- a/src/status_im/ui/screens/communities/requests_to_join.cljs +++ b/src/status_im/ui/screens/communities/requests_to_join.cljs @@ -6,7 +6,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/communities/select_category.cljs b/src/status_im/ui/screens/communities/select_category.cljs index c9fc1fdc72..db46fac13d 100644 --- a/src/status_im/ui/screens/communities/select_category.cljs +++ b/src/status_im/ui/screens/communities/select_category.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [reagent.core :as reagent] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/communities/views.cljs b/src/status_im/ui/screens/communities/views.cljs index 5adacfbfbb..2962426c0f 100644 --- a/src/status_im/ui/screens/communities/views.cljs +++ b/src/status_im/ui/screens/communities/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as quo.colors] [status-im.communities.core :as communities] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.badge :as badge] [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.list.views :as list] diff --git a/src/status_im/ui/screens/contacts_list/views.cljs b/src/status_im/ui/screens/contacts_list/views.cljs index 3149304307..f72e165507 100644 --- a/src/status_im/ui/screens/contacts_list/views.cljs +++ b/src/status_im/ui/screens/contacts_list/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.invite.views :as invite] diff --git a/src/status_im/ui/screens/dapps_permissions/views.cljs b/src/status_im/ui/screens/dapps_permissions/views.cljs index abddc2b205..bc56460bf5 100644 --- a/src/status_im/ui/screens/dapps_permissions/views.cljs +++ b/src/status_im/ui/screens/dapps_permissions/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/default_sync_period_settings/view.cljs b/src/status_im/ui/screens/default_sync_period_settings/view.cljs index 282beb92cd..420b2f19f9 100644 --- a/src/status_im/ui/screens/default_sync_period_settings/view.cljs +++ b/src/status_im/ui/screens/default_sync_period_settings/view.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.utils.config :as config])) diff --git a/src/status_im/ui/screens/ens/views.cljs b/src/status_im/ui/screens/ens/views.cljs index 0bb9f19fef..dd95c5a1e9 100644 --- a/src/status_im/ui/screens/ens/views.cljs +++ b/src/status_im/ui/screens/ens/views.cljs @@ -10,7 +10,7 @@ [status-im.ethereum.ens :as ethereum.ens] [status-im.ethereum.stateofus :as stateofus] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.react-native.resources :as resources] [status-im.ui.components.chat-icon.screen :as chat-icon] diff --git a/src/status_im/ui/screens/glossary/view.cljs b/src/status_im/ui/screens/glossary/view.cljs index a2803ee3ad..4d6ac2ed34 100644 --- a/src/status_im/ui/screens/glossary/view.cljs +++ b/src/status_im/ui/screens/glossary/view.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.glossary.view (:require [quo.design-system.colors :as colors] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/group/views.cljs b/src/status_im/ui/screens/group/views.cljs index ccf7ded73f..76a55d2b9c 100644 --- a/src/status_im/ui/screens/group/views.cljs +++ b/src/status_im/ui/screens/group/views.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.invite.views :as invite] diff --git a/src/status_im/ui/screens/help_center/views.cljs b/src/status_im/ui/screens/help_center/views.cljs index 0b53629420..57ba1f14f8 100644 --- a/src/status_im/ui/screens/help_center/views.cljs +++ b/src/status_im/ui/screens/help_center/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/home/sheet/views.cljs b/src/status_im/ui/screens/home/sheet/views.cljs index 20dd90008b..07347d65f2 100644 --- a/src/status_im/ui/screens/home/sheet/views.cljs +++ b/src/status_im/ui/screens/home/sheet/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo2.foundations.colors :as colors] [re-frame.core :as rf] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.invite.views :as invite] [status-im.ui.components.react :as rn] @@ -83,8 +83,8 @@ (js/setTimeout #(rf/dispatch [:bottom-sheet/show-sheet {:content new-chat-aio/contact-selection-list}]) - 1000)) - }] + 1000))}] + [quo2/menu-item {:theme :main :title (i18n/label :t/add-a-contact) diff --git a/src/status_im/ui/screens/home/views.cljs b/src/status_im/ui/screens/home/views.cljs index 9e9e2fe927..a6484f6a18 100644 --- a/src/status_im/ui/screens/home/views.cljs +++ b/src/status_im/ui/screens/home/views.cljs @@ -9,7 +9,7 @@ [reagent.core :as reagent] [status-im.add-new.core :as new-chat] [status-im.add-new.db :as db] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [status-im.react-native.resources :as resources] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs index f727da7fb9..395e58d66c 100644 --- a/src/status_im/ui/screens/home/views/inner_item.cljs +++ b/src/status_im/ui/screens/home/views/inner_item.cljs @@ -6,7 +6,7 @@ [quo2.foundations.colors :as quo2.colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.badge :as badge] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.chat-icon.styles :as chat-icon.styles] diff --git a/src/status_im/ui/screens/keycard/authentication_method/views.cljs b/src/status_im/ui/screens/keycard/authentication_method/views.cljs index 42d09b51a0..a547a63004 100644 --- a/src/status_im/ui/screens/keycard/authentication_method/views.cljs +++ b/src/status_im/ui/screens/keycard/authentication_method/views.cljs @@ -2,7 +2,7 @@ (:require [quo.components.separator :as separator] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/keycard/components/turn_nfc.cljs b/src/status_im/ui/screens/keycard/components/turn_nfc.cljs index 420cd77703..f10d1578de 100644 --- a/src/status_im/ui/screens/keycard/components/turn_nfc.cljs +++ b/src/status_im/ui/screens/keycard/components/turn_nfc.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.screens.keycard.components.style :as styles])) diff --git a/src/status_im/ui/screens/keycard/frozen_card/view.cljs b/src/status_im/ui/screens/keycard/frozen_card/view.cljs index c34da955ec..e63d2ed4a9 100644 --- a/src/status_im/ui/screens/keycard/frozen_card/view.cljs +++ b/src/status_im/ui/screens/keycard/frozen_card/view.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.login :as login] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/keycard/keycard_interaction.cljs b/src/status_im/ui/screens/keycard/keycard_interaction.cljs index 5d54426ca7..1913a045d1 100644 --- a/src/status_im/ui/screens/keycard/keycard_interaction.cljs +++ b/src/status_im/ui/screens/keycard/keycard_interaction.cljs @@ -2,7 +2,7 @@ (:require [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.screens.keycard.components.description :as description] [status-im.ui.screens.keycard.components.keycard-animation :refer [animated-circles]] diff --git a/src/status_im/ui/screens/keycard/onboarding/views.cljs b/src/status_im/ui/screens/keycard/onboarding/views.cljs index 717b489d29..ffcdf6e861 100644 --- a/src/status_im/ui/screens/keycard/onboarding/views.cljs +++ b/src/status_im/ui/screens/keycard/onboarding/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.onboarding :as keycard.onboarding] [status-im.react-native.resources :as resources] [status-im.ui.components.checkbox.view :as checkbox] diff --git a/src/status_im/ui/screens/keycard/pairing/views.cljs b/src/status_im/ui/screens/keycard/pairing/views.cljs index ce9a40467b..872b2d0249 100644 --- a/src/status_im/ui/screens/keycard/pairing/views.cljs +++ b/src/status_im/ui/screens/keycard/pairing/views.cljs @@ -3,7 +3,7 @@ [quo.react-native :as rn] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [utils.security.core :as security])) diff --git a/src/status_im/ui/screens/keycard/pin/views.cljs b/src/status_im/ui/screens/keycard/pin/views.cljs index 7b86cff7cb..231654d2c9 100644 --- a/src/status_im/ui/screens/keycard/pin/views.cljs +++ b/src/status_im/ui/screens/keycard/pin/views.cljs @@ -3,7 +3,7 @@ (:require [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.animation :as animation] [status-im.ui.components.checkbox.view :as checkbox] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/keycard/recovery/views.cljs b/src/status_im/ui/screens/keycard/recovery/views.cljs index 5f4d182b6b..e2d4565d1a 100644 --- a/src/status_im/ui/screens/keycard/recovery/views.cljs +++ b/src/status_im/ui/screens/keycard/recovery/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.recovery :as keycard.recovery] [status-im.react-native.resources :as resources] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/keycard/settings/views.cljs b/src/status_im/ui/screens/keycard/settings/views.cljs index 0aae7cd95a..f1e50f1f92 100644 --- a/src/status_im/ui/screens/keycard/settings/views.cljs +++ b/src/status_im/ui/screens/keycard/settings/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] [status-im.ui.screens.keycard.views :as keycard.views])) diff --git a/src/status_im/ui/screens/keycard/views.cljs b/src/status_im/ui/screens/keycard/views.cljs index 04dcaad07d..eb84329d79 100644 --- a/src/status_im/ui/screens/keycard/views.cljs +++ b/src/status_im/ui/screens/keycard/views.cljs @@ -6,7 +6,7 @@ [reagent.core :as reagent] [status-im.bottom-sheet.core :as bottom-sheet] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.login :as keycard.login] [status-im.multiaccounts.core :as multiaccounts] [status-im.multiaccounts.create.core :as multiaccounts.create] diff --git a/src/status_im/ui/screens/link_previews_settings/views.cljs b/src/status_im/ui/screens/link_previews_settings/views.cljs index 9b95b4a8a9..68cb582c04 100644 --- a/src/status_im/ui/screens/link_previews_settings/views.cljs +++ b/src/status_im/ui/screens/link_previews_settings/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [status-im.chat.models.link-preview :as link-preview] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/mobile_network_settings/sheets.cljs b/src/status_im/ui/screens/mobile_network_settings/sheets.cljs index 00e5df70b1..57cd487133 100644 --- a/src/status_im/ui/screens/mobile_network_settings/sheets.cljs +++ b/src/status_im/ui/screens/mobile_network_settings/sheets.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :as views]) (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.checkbox.view :as checkbox] [status-im.ui.components.react :as react] [status-im.ui.screens.mobile-network-settings.sheets-styles :as styles])) diff --git a/src/status_im/ui/screens/mobile_network_settings/view.cljs b/src/status_im/ui/screens/mobile_network_settings/view.cljs index 1305c45fc2..10134b1ec6 100644 --- a/src/status_im/ui/screens/mobile_network_settings/view.cljs +++ b/src/status_im/ui/screens/mobile_network_settings/view.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.mobile-network-settings.view (:require-macros [status-im.utils.views :as views]) (:require [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] status-im.mobile-sync-settings.core [status-im.ui.components.react :as react] [status-im.ui.screens.mobile-network-settings.sheets :as sheets] diff --git a/src/status_im/ui/screens/multiaccounts/key_storage/views.cljs b/src/status_im/ui/screens/multiaccounts/key_storage/views.cljs index 47f6dfd90f..8d9050d95a 100644 --- a/src/status_im/ui/screens/multiaccounts/key_storage/views.cljs +++ b/src/status_im/ui/screens/multiaccounts/key_storage/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [re-frame.db] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.multiaccounts.key-storage.core :as multiaccounts.key-storage] [status-im.react-native.resources :as resources] diff --git a/src/status_im/ui/screens/multiaccounts/login/views.cljs b/src/status_im/ui/screens/multiaccounts/login/views.cljs index 8f441c456f..3eed24446c 100644 --- a/src/status_im/ui/screens/multiaccounts/login/views.cljs +++ b/src/status_im/ui/screens/multiaccounts/login/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.checkbox.view :as checkbox] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/multiaccounts/recover/views.cljs b/src/status_im/ui/screens/multiaccounts/recover/views.cljs index 0f5130a85e..dfac598130 100644 --- a/src/status_im/ui/screens/multiaccounts/recover/views.cljs +++ b/src/status_im/ui/screens/multiaccounts/recover/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.recovery :as keycard] [status-im.multiaccounts.key-storage.core :as multiaccounts.key-storage] [status-im.multiaccounts.recover.core :as multiaccounts.recover] diff --git a/src/status_im/ui/screens/multiaccounts/sheets.cljs b/src/status_im/ui/screens/multiaccounts/sheets.cljs index 9e49e335d7..0bc1dd3e3b 100644 --- a/src/status_im/ui/screens/multiaccounts/sheets.cljs +++ b/src/status_im/ui/screens/multiaccounts/sheets.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.multiaccounts.sheets (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n])) + [utils.i18n :as i18n])) (defn actions-sheet [] diff --git a/src/status_im/ui/screens/multiaccounts/views.cljs b/src/status_im/ui/screens/multiaccounts/views.cljs index f746ba803b..851688f8be 100644 --- a/src/status_im/ui/screens/multiaccounts/views.cljs +++ b/src/status_im/ui/screens/multiaccounts/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.react-native.resources :as resources] [status-im.ui.components.list.views :as list] diff --git a/src/status_im/ui/screens/network/edit_network/views.cljs b/src/status_im/ui/screens/network/edit_network/views.cljs index 1079e59dac..55bfb5bdc8 100644 --- a/src/status_im/ui/screens/network/edit_network/views.cljs +++ b/src/status_im/ui/screens/network/edit_network/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.network.edit-network.views (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.network.core :as network] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/network/network_details/views.cljs b/src/status_im/ui/screens/network/network_details/views.cljs index d4c3ec5983..b75f841ca2 100644 --- a/src/status_im/ui/screens/network/network_details/views.cljs +++ b/src/status_im/ui/screens/network/network_details/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.network.network-details.views (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.network.core :as network] [status-im.ui.components.react :as react] [status-im.ui.screens.network.styles :as st] diff --git a/src/status_im/ui/screens/network/views.cljs b/src/status_im/ui/screens/network/views.cljs index ee27174ef4..4903ff01c3 100644 --- a/src/status_im/ui/screens/network/views.cljs +++ b/src/status_im/ui/screens/network/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.network.core :as network] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] diff --git a/src/status_im/ui/screens/notifications_settings/views.cljs b/src/status_im/ui/screens/notifications_settings/views.cljs index 359c634499..4f8e85854d 100644 --- a/src/status_im/ui/screens/notifications_settings/views.cljs +++ b/src/status_im/ui/screens/notifications_settings/views.cljs @@ -5,7 +5,7 @@ [quo.platform :as platform] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.notifications.core :as notifications] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs b/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs index 71f5e785d6..4ec211eb23 100644 --- a/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs +++ b/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs @@ -3,7 +3,7 @@ (:require [clojure.string :as string] [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] diff --git a/src/status_im/ui/screens/offline_messaging_settings/views.cljs b/src/status_im/ui/screens/offline_messaging_settings/views.cljs index 3dda76f608..615374a146 100644 --- a/src/status_im/ui/screens/offline_messaging_settings/views.cljs +++ b/src/status_im/ui/screens/offline_messaging_settings/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/onboarding/intro/views.cljs b/src/status_im/ui/screens/onboarding/intro/views.cljs index 5dda706129..c65be2ba92 100644 --- a/src/status_im/ui/screens/onboarding/intro/views.cljs +++ b/src/status_im/ui/screens/onboarding/intro/views.cljs @@ -6,7 +6,7 @@ [quo.react-native :as rn] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] [status-im.ui.screens.onboarding.intro.styles :as styles])) diff --git a/src/status_im/ui/screens/onboarding/keys/views.cljs b/src/status_im/ui/screens/onboarding/keys/views.cljs index b95b087147..584ecca97b 100644 --- a/src/status_im/ui/screens/onboarding/keys/views.cljs +++ b/src/status_im/ui/screens/onboarding/keys/views.cljs @@ -3,7 +3,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] [status-im.ui.components.topbar :as topbar] diff --git a/src/status_im/ui/screens/onboarding/notifications/views.cljs b/src/status_im/ui/screens/onboarding/notifications/views.cljs index 90830331f1..eb9e9db7ac 100644 --- a/src/status_im/ui/screens/onboarding/notifications/views.cljs +++ b/src/status_im/ui/screens/onboarding/notifications/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [quo.platform :as platform] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.notifications.core :as notifications] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/onboarding/password/views.cljs b/src/status_im/ui/screens/onboarding/password/views.cljs index e54fef126b..9f75ee5778 100644 --- a/src/status_im/ui/screens/onboarding/password/views.cljs +++ b/src/status_im/ui/screens/onboarding/password/views.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.constants :as const] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.toolbar :as toolbar] [utils.security.core :as security])) diff --git a/src/status_im/ui/screens/onboarding/phrase/view.cljs b/src/status_im/ui/screens/onboarding/phrase/view.cljs index 4370903770..537b128306 100644 --- a/src/status_im/ui/screens/onboarding/phrase/view.cljs +++ b/src/status_im/ui/screens/onboarding/phrase/view.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.screens.onboarding.views :as ui] [utils.datetime :as datetime] diff --git a/src/status_im/ui/screens/onboarding/storage/views.cljs b/src/status_im/ui/screens/onboarding/storage/views.cljs index 0bee58b171..fe06f3980c 100644 --- a/src/status_im/ui/screens/onboarding/storage/views.cljs +++ b/src/status_im/ui/screens/onboarding/storage/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.onboarding.storage.views (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.screens.onboarding.views :as ui] [utils.debounce :refer [dispatch-and-chill]]) diff --git a/src/status_im/ui/screens/onboarding/views.cljs b/src/status_im/ui/screens/onboarding/views.cljs index 6d38152d6c..2dfb676d7d 100644 --- a/src/status_im/ui/screens/onboarding/views.cljs +++ b/src/status_im/ui/screens/onboarding/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] [status-im.ui.screens.onboarding.styles :as styles])) @@ -41,4 +41,4 @@ :type :secondary :disabled disabled :after :main-icons/next} - (i18n/label :t/next)]}]) \ No newline at end of file + (i18n/label :t/next)]}]) diff --git a/src/status_im/ui/screens/onboarding/welcome/views.cljs b/src/status_im/ui/screens/onboarding/welcome/views.cljs index e2027ad82b..faa25843e2 100644 --- a/src/status_im/ui/screens/onboarding/welcome/views.cljs +++ b/src/status_im/ui/screens/onboarding/welcome/views.cljs @@ -3,7 +3,7 @@ [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.react :as react] [status-im.ui.screens.onboarding.welcome.styles :as styles])) @@ -37,4 +37,4 @@ [quo/button {:on-press #(re-frame/dispatch [:welcome-lets-go]) :accessibility-label :lets-go-button} - (i18n/label :t/lets-go)]]]) \ No newline at end of file + (i18n/label :t/lets-go)]]]) diff --git a/src/status_im/ui/screens/pairing/views.cljs b/src/status_im/ui/screens/pairing/views.cljs index da5b738422..d5f1dafc70 100644 --- a/src/status_im/ui/screens/pairing/views.cljs +++ b/src/status_im/ui/screens/pairing/views.cljs @@ -4,7 +4,7 @@ [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/peers_stats.cljs b/src/status_im/ui/screens/peers_stats.cljs index 4dc14757c6..1dc1e2018b 100644 --- a/src/status_im/ui/screens/peers_stats.cljs +++ b/src/status_im/ui/screens/peers_stats.cljs @@ -1,6 +1,6 @@ (ns status-im.ui.screens.peers-stats (:require [react-native.core :as react-native.core] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [utils.re-frame :as re-frame])) (defn peers-stats diff --git a/src/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs b/src/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs index c1ff7c5eb9..70c5f9a404 100644 --- a/src/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs +++ b/src/status_im/ui/screens/privacy_and_security_settings/delete_profile.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] status-im.keycard.delete-key [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon.screen] diff --git a/src/status_im/ui/screens/privacy_and_security_settings/events.cljs b/src/status_im/ui/screens/privacy_and_security_settings/events.cljs index bf4e082f87..eede26e6cc 100644 --- a/src/status_im/ui/screens/privacy_and_security_settings/events.cljs +++ b/src/status_im/ui/screens/privacy_and_security_settings/events.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.native-module.core :as status] [utils.re-frame :as rf] [status-im.utils.types :as types] diff --git a/src/status_im/ui/screens/privacy_and_security_settings/messages_from_contacts_only.cljs b/src/status_im/ui/screens/privacy_and_security_settings/messages_from_contacts_only.cljs index 9b9a794e90..de5f6006c7 100644 --- a/src/status_im/ui/screens/privacy_and_security_settings/messages_from_contacts_only.cljs +++ b/src/status_im/ui/screens/privacy_and_security_settings/messages_from_contacts_only.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :as views]) (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.ui.components.react :as react] [utils.re-frame :as rf])) diff --git a/src/status_im/ui/screens/privacy_and_security_settings/views.cljs b/src/status_im/ui/screens/privacy_and_security_settings/views.cljs index 75eb8f7d19..f26db8eee4 100644 --- a/src/status_im/ui/screens/privacy_and_security_settings/views.cljs +++ b/src/status_im/ui/screens/privacy_and_security_settings/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.biometric.core :as biometric] [status-im.multiaccounts.key-storage.core :as key-storage] [status-im.multiaccounts.reset-password.core :as reset-password] diff --git a/src/status_im/ui/screens/profile/components/sheets.cljs b/src/status_im/ui/screens/profile/components/sheets.cljs index 2b388283ea..9e01aba3d9 100644 --- a/src/status_im/ui/screens/profile/components/sheets.cljs +++ b/src/status_im/ui/screens/profile/components/sheets.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.screens.profile.components.styles :as styles]) (:require-macros [status-im.utils.views :as views])) diff --git a/src/status_im/ui/screens/profile/components/views.cljs b/src/status_im/ui/screens/profile/components/views.cljs index dd21acbaed..3ffe80500d 100644 --- a/src/status_im/ui/screens/profile/components/views.cljs +++ b/src/status_im/ui/screens/profile/components/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.profile.components.views (:require [clojure.string :as string] [quo.design-system.colors :as colors] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.screens.profile.components.styles :as styles])) diff --git a/src/status_im/ui/screens/profile/contact/views.cljs b/src/status_im/ui/screens/profile/contact/views.cljs index 4e9fb22bb6..f3cf0544e0 100644 --- a/src/status_im/ui/screens/profile/contact/views.cljs +++ b/src/status_im/ui/screens/profile/contact/views.cljs @@ -6,7 +6,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.chat.models :as chat.models] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/profile/group_chat/views.cljs b/src/status_im/ui/screens/profile/group_chat/views.cljs index 96800a9177..e065da9128 100644 --- a/src/status_im/ui/screens/profile/group_chat/views.cljs +++ b/src/status_im/ui/screens/profile/group_chat/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.common.common :as components.common] diff --git a/src/status_im/ui/screens/profile/seed/views.cljs b/src/status_im/ui/screens/profile/seed/views.cljs index ee3c99d68b..45bce41fa1 100644 --- a/src/status_im/ui/screens/profile/seed/views.cljs +++ b/src/status_im/ui/screens/profile/seed/views.cljs @@ -4,7 +4,7 @@ [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.common.styles :as components.common.styles] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/profile/user/edit_picture.cljs b/src/status_im/ui/screens/profile/user/edit_picture.cljs index 6ba2c2a7cb..3081bbe1a7 100644 --- a/src/status_im/ui/screens/profile/user/edit_picture.cljs +++ b/src/status_im/ui/screens/profile/user/edit_picture.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.profile.user.edit-picture (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.react :as react] [status-im.utils.config :as config])) diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index 958f83f2b8..e5ff42de8d 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -5,7 +5,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.ethereum.stateofus :as stateofus] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.common.common :as components.common] [status-im.ui.components.copyable-text :as copyable-text] diff --git a/src/status_im/ui/screens/profile/visibility_status/utils.cljs b/src/status_im/ui/screens/profile/visibility_status/utils.cljs index 4ca78d9666..77435fa450 100644 --- a/src/status_im/ui/screens/profile/visibility_status/utils.cljs +++ b/src/status_im/ui/screens/profile/visibility_status/utils.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [quo2.foundations.colors :as quo2.colors] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.screens.profile.visibility-status.styles :as styles] [utils.datetime :as datetime] [utils.re-frame :as rf])) diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs index 426adac9ba..0ae3df94bf 100644 --- a/src/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/status_im/ui/screens/qr_scanner/views.cljs @@ -6,7 +6,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.components.topbar :as topbar] [status-im.ui.screens.qr-scanner.styles :as styles] diff --git a/src/status_im/ui/screens/reset_password/views.cljs b/src/status_im/ui/screens/reset_password/views.cljs index 435a2c9b3d..b5ffd6f414 100644 --- a/src/status_im/ui/screens/reset_password/views.cljs +++ b/src/status_im/ui/screens/reset_password/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.reset-password.core :as reset-password] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/rpc_usage_info.cljs b/src/status_im/ui/screens/rpc_usage_info.cljs index 98e27a3295..2577edd8a1 100644 --- a/src/status_im/ui/screens/rpc_usage_info.cljs +++ b/src/status_im/ui/screens/rpc_usage_info.cljs @@ -5,7 +5,7 @@ [quo.react-native :as quo.react-native] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.re-frame :as rf] [status-im.utils.utils :as utils] diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs index b16404e3b6..416e4b2a47 100644 --- a/src/status_im/ui/screens/screens.cljs +++ b/src/status_im/ui/screens/screens.cljs @@ -2,7 +2,7 @@ (:require [quo.design-system.colors :as colors] [status-im.add-new.core :as new-chat.events] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.screens.about-app.views :as about-app] [status-im.ui.screens.add-new.new-chat.views :as new-chat] diff --git a/src/status_im/ui/screens/signing/sheets.cljs b/src/status_im/ui/screens/signing/sheets.cljs index da0d6bacf1..67f9849a00 100644 --- a/src/status_im/ui/screens/signing/sheets.cljs +++ b/src/status_im/ui/screens/signing/sheets.cljs @@ -5,7 +5,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.signing.gas :as gas] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/signing/views.cljs b/src/status_im/ui/screens/signing/views.cljs index 2876e31b14..caa4288ad4 100644 --- a/src/status_im/ui/screens/signing/views.cljs +++ b/src/status_im/ui/screens/signing/views.cljs @@ -8,7 +8,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.common :as keycard.common] [status-im.multiaccounts.core :as multiaccounts] [status-im.react-native.resources :as resources] diff --git a/src/status_im/ui/screens/stickers/views.cljs b/src/status_im/ui/screens/stickers/views.cljs index af2c533eaa..cd9ec13e0e 100644 --- a/src/status_im/ui/screens/stickers/views.cljs +++ b/src/status_im/ui/screens/stickers/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.stickers.views (:require [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.fast-image :as fast-image] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/sync_settings/views.cljs b/src/status_im/ui/screens/sync_settings/views.cljs index fa0a95d1bf..8d237e18e1 100644 --- a/src/status_im/ui/screens/sync_settings/views.cljs +++ b/src/status_im/ui/screens/sync_settings/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react])) (views/defview sync-settings diff --git a/src/status_im/ui/screens/terms_of_service/views.cljs b/src/status_im/ui/screens/terms_of_service/views.cljs index 325738b676..e3f552fa2b 100644 --- a/src/status_im/ui/screens/terms_of_service/views.cljs +++ b/src/status_im/ui/screens/terms_of_service/views.cljs @@ -5,7 +5,7 @@ [quo.design-system.typography :as typography] [re-frame.core :as re-frame] [status-im.constants :refer [docs-link]] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/wakuv2_settings/edit_node/views.cljs b/src/status_im/ui/screens/wakuv2_settings/edit_node/views.cljs index 44d8e83180..8773df6207 100644 --- a/src/status_im/ui/screens/wakuv2_settings/edit_node/views.cljs +++ b/src/status_im/ui/screens/wakuv2_settings/edit_node/views.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] [status-im.ui.components.topbar :as topbar] diff --git a/src/status_im/ui/screens/wakuv2_settings/views.cljs b/src/status_im/ui/screens/wakuv2_settings/views.cljs index 564a7e130b..2990831216 100644 --- a/src/status_im/ui/screens/wakuv2_settings/views.cljs +++ b/src/status_im/ui/screens/wakuv2_settings/views.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :as views]) (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] diff --git a/src/status_im/ui/screens/wallet/account/views.cljs b/src/status_im/ui/screens/wallet/account/views.cljs index 088ebd7bb7..71bc0fc570 100644 --- a/src/status_im/ui/screens/wallet/account/views.cljs +++ b/src/status_im/ui/screens/wallet/account/views.cljs @@ -10,7 +10,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.animation :as animation] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/wallet/account_settings/views.cljs b/src/status_im/ui/screens/wallet/account_settings/views.cljs index 80c08d77cc..45305e387b 100644 --- a/src/status_im/ui/screens/wallet/account_settings/views.cljs +++ b/src/status_im/ui/screens/wallet/account_settings/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/wallet/accounts/sheets.cljs b/src/status_im/ui/screens/wallet/accounts/sheets.cljs index ca33ea9086..691bfbe373 100644 --- a/src/status_im/ui/screens/wallet/accounts/sheets.cljs +++ b/src/status_im/ui/screens/wallet/accounts/sheets.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.wallet.accounts.sheets (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react])) (defn hide-sheet-and-dispatch diff --git a/src/status_im/ui/screens/wallet/accounts/views.cljs b/src/status_im/ui/screens/wallet/accounts/views.cljs index afdf4b3e5f..8e188437a4 100644 --- a/src/status_im/ui/screens/wallet/accounts/views.cljs +++ b/src/status_im/ui/screens/wallet/accounts/views.cljs @@ -8,7 +8,7 @@ [quo2.foundations.colors :as quo2.colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.keycard.login :as keycard.login] [status-im.qr-scanner.core :as qr-scanner] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/wallet/add_new/views.cljs b/src/status_im/ui/screens/wallet/add_new/views.cljs index e5b61ec2ba..0e3ea3b966 100644 --- a/src/status_im/ui/screens/wallet/add_new/views.cljs +++ b/src/status_im/ui/screens/wallet/add_new/views.cljs @@ -7,7 +7,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.db :as multiaccounts.db] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/wallet/buy_crypto/views.cljs b/src/status_im/ui/screens/wallet/buy_crypto/views.cljs index 001b13a7ed..0fa3c929c1 100644 --- a/src/status_im/ui/screens/wallet/buy_crypto/views.cljs +++ b/src/status_im/ui/screens/wallet/buy_crypto/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/wallet/collectibles/views.cljs b/src/status_im/ui/screens/wallet/collectibles/views.cljs index 2bc24803df..3839996aeb 100644 --- a/src/status_im/ui/screens/wallet/collectibles/views.cljs +++ b/src/status_im/ui/screens/wallet/collectibles/views.cljs @@ -5,7 +5,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.react-native.resources :as resources] diff --git a/src/status_im/ui/screens/wallet/custom_tokens/views.cljs b/src/status_im/ui/screens/wallet/custom_tokens/views.cljs index 7483a30c87..82d7660cd8 100644 --- a/src/status_im/ui/screens/wallet/custom_tokens/views.cljs +++ b/src/status_im/ui/screens/wallet/custom_tokens/views.cljs @@ -4,7 +4,7 @@ [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [status-im.ui.components.toolbar :as toolbar] [status-im.ui.components.topbar :as topbar])) diff --git a/src/status_im/ui/screens/wallet/recipient/views.cljs b/src/status_im/ui/screens/wallet/recipient/views.cljs index 518db9b3b0..132705eb48 100644 --- a/src/status_im/ui/screens/wallet/recipient/views.cljs +++ b/src/status_im/ui/screens/wallet/recipient/views.cljs @@ -6,7 +6,7 @@ [reagent.core :as reagent] [status-im.ethereum.core :as ethereum] [status-im.ethereum.stateofus :as stateofus] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.icons.icons :as icons] diff --git a/src/status_im/ui/screens/wallet/request/views.cljs b/src/status_im/ui/screens/wallet/request/views.cljs index 9f380bb431..5e8b562f24 100644 --- a/src/status_im/ui/screens/wallet/request/views.cljs +++ b/src/status_im/ui/screens/wallet/request/views.cljs @@ -4,7 +4,7 @@ [reagent.core :as reagent] [status-im.ethereum.eip55 :as eip55] [status-im.ethereum.eip681 :as eip681] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.qr-code-viewer.views :as qr-code-viewer] [status-im.ui.components.react :as react]) diff --git a/src/status_im/ui/screens/wallet/send/sheets.cljs b/src/status_im/ui/screens/wallet/send/sheets.cljs index 153071d619..b35d9766fb 100644 --- a/src/status_im/ui/screens/wallet/send/sheets.cljs +++ b/src/status_im/ui/screens/wallet/send/sheets.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :as views]) (:require [quo.core :as quo] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/wallet/send/views.cljs b/src/status_im/ui/screens/wallet/send/views.cljs index c961e5ac1d..625386ea7a 100644 --- a/src/status_im/ui/screens/wallet/send/views.cljs +++ b/src/status_im/ui/screens/wallet/send/views.cljs @@ -5,7 +5,7 @@ [re-frame.core :as re-frame] [status-im.commands.core :as commands] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.ui.components.bottom-panel.views :as bottom-panel] [status-im.ui.components.chat-icon.screen :as chat-icon] @@ -299,4 +299,4 @@ (if (and (not request?) from-chat? (not to-norm)) (i18n/label :t/wallet-send) - (i18n/label :t/next))]}]]]))) \ No newline at end of file + (i18n/label :t/next))]}]]]))) diff --git a/src/status_im/ui/screens/wallet/settings/views.cljs b/src/status_im/ui/screens/wallet/settings/views.cljs index 50bd1da732..03468cb8fa 100644 --- a/src/status_im/ui/screens/wallet/settings/views.cljs +++ b/src/status_im/ui/screens/wallet/settings/views.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui/screens/wallet/signing_phrase/views.cljs b/src/status_im/ui/screens/wallet/signing_phrase/views.cljs index 8ac589decd..4acca09b15 100644 --- a/src/status_im/ui/screens/wallet/signing_phrase/views.cljs +++ b/src/status_im/ui/screens/wallet/signing_phrase/views.cljs @@ -3,7 +3,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react])) diff --git a/src/status_im/ui/screens/wallet/swap/views.cljs b/src/status_im/ui/screens/wallet/swap/views.cljs index a12e8befad..7b9b717967 100644 --- a/src/status_im/ui/screens/wallet/swap/views.cljs +++ b/src/status_im/ui/screens/wallet/swap/views.cljs @@ -4,7 +4,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.chat-icon.screen :as chat-icon] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation] diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs index f2e83d5a99..55d7842fd7 100644 --- a/src/status_im/ui/screens/wallet/transactions/views.cljs +++ b/src/status_im/ui/screens/wallet/transactions/views.cljs @@ -2,7 +2,7 @@ (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list-selection :as list-selection] [status-im.ui.components.list.views :as list] diff --git a/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs b/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs index 2ad17c33ab..0f587a40de 100644 --- a/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs +++ b/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs @@ -7,7 +7,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.bottom-panel.views :as bottom-panel] [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.list.views :as list] diff --git a/src/status_im/ui2/screens/chat/components/edit/view.cljs b/src/status_im/ui2/screens/chat/components/edit/view.cljs index 52f098f9b7..6de19bd8c8 100644 --- a/src/status_im/ui2/screens/chat/components/edit/view.cljs +++ b/src/status_im/ui2/screens/chat/components/edit/view.cljs @@ -1,5 +1,5 @@ (ns status-im.ui2.screens.chat.components.edit.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo.gesture-handler :as gesture-handler] [quo2.core :as quo] [quo2.foundations.colors :as colors] diff --git a/src/status_im/ui2/screens/chat/components/new_chat/view.cljs b/src/status_im/ui2/screens/chat/components/new_chat/view.cljs index 42e56f8bb1..dc6f9cf710 100644 --- a/src/status_im/ui2/screens/chat/components/new_chat/view.cljs +++ b/src/status_im/ui2/screens/chat/components/new_chat/view.cljs @@ -5,7 +5,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.re-frame :as rf] [status-im.ui.screens.chat.sheets :refer [hide-sheet-and-dispatch]] diff --git a/src/status_im/ui2/screens/chat/components/reply/view.cljs b/src/status_im/ui2/screens/chat/components/reply/view.cljs index 0106317e01..e584f95231 100644 --- a/src/status_im/ui2/screens/chat/components/reply/view.cljs +++ b/src/status_im/ui2/screens/chat/components/reply/view.cljs @@ -1,6 +1,6 @@ (ns status-im.ui2.screens.chat.components.reply.view (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo.react-native :as rn] [quo2.components.buttons.button :as quo2.button] [quo2.components.icon :as quo2.icon] diff --git a/src/status_im/ui2/screens/chat/composer/input.cljs b/src/status_im/ui2/screens/chat/composer/input.cljs index 309b08f27b..9926615304 100644 --- a/src/status_im/ui2/screens/chat/composer/input.cljs +++ b/src/status_im/ui2/screens/chat/composer/input.cljs @@ -10,7 +10,7 @@ [reagent.core :as reagent] [status-im2.common.constants :as chat.constants] [status-im.chat.models.mentions :as mentions] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.re-frame :as rf] [status-im.utils.platform :as platform] diff --git a/src/status_im/ui2/screens/chat/messages/message.cljs b/src/status_im/ui2/screens/chat/messages/message.cljs index 6f7a581e45..c1af273914 100644 --- a/src/status_im/ui2/screens/chat/messages/message.cljs +++ b/src/status_im/ui2/screens/chat/messages/message.cljs @@ -9,7 +9,7 @@ [re-frame.core :as re-frame] [reagent.core :as reagent] [status-im.constants :as constants] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im.ui.components.fast-image :as fast-image] [status-im.ui.components.react :as react] diff --git a/src/status_im/ui2/screens/chat/pin_limit_popover/view.cljs b/src/status_im/ui2/screens/chat/pin_limit_popover/view.cljs index fe9b743ac5..4438999471 100644 --- a/src/status_im/ui2/screens/chat/pin_limit_popover/view.cljs +++ b/src/status_im/ui2/screens/chat/pin_limit_popover/view.cljs @@ -1,5 +1,5 @@ (ns status-im.ui2.screens.chat.pin-limit-popover.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo.react :as react] [quo2.core :as quo] [quo2.foundations.colors :as colors] diff --git a/src/status_im/utils/currency.cljs b/src/status_im/utils/currency.cljs index f1ac0cf673..6f1518d6dc 100644 --- a/src/status_im/utils/currency.cljs +++ b/src/status_im/utils/currency.cljs @@ -1,5 +1,5 @@ (ns status-im.utils.currency - (:require [i18n.i18n :as i18n])) + (:require [utils.i18n :as i18n])) (def currencies {:aed {:id :aed :code "AED" :display-name (i18n/label :t/currency-display-name-aed) :symbol "د.إ"} @@ -80,4 +80,4 @@ :usd {:id :usd :code "USD" :display-name (i18n/label :t/currency-display-name-usd) :symbol "$"} :vef {:id :vef :code "VEF" :display-name (i18n/label :t/currency-display-name-vef) :symbol "Bs"} :vnd {:id :vnd :code "VND" :display-name (i18n/label :t/currency-display-name-vnd) :symbol "₫"} - :zar {:id :zar :code "ZAR" :display-name (i18n/label :t/currency-display-name-zar) :symbol "R"}}) \ No newline at end of file + :zar {:id :zar :code "ZAR" :display-name (i18n/label :t/currency-display-name-zar) :symbol "R"}}) diff --git a/src/status_im/utils/label.cljs b/src/status_im/utils/label.cljs index 987489b881..24765cc24e 100644 --- a/src/status_im/utils/label.cljs +++ b/src/status_im/utils/label.cljs @@ -1,5 +1,5 @@ (ns status-im.utils.label - (:require [i18n.i18n :as i18n])) + (:require [utils.i18n :as i18n])) (defn stringify [keyword-or-number] @@ -21,4 +21,4 @@ (number? keyword-or-number) (str keyword-or-number) - :else nil)) \ No newline at end of file + :else nil)) diff --git a/src/status_im/utils/logging/core.cljs b/src/status_im/utils/logging/core.cljs index aaa29c43d8..750cc1d959 100644 --- a/src/status_im/utils/logging/core.cljs +++ b/src/status_im/utils/logging/core.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [react-native.mail :as react-native-mail] [status-im.bottom-sheet.core :as bottom-sheet] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.native-module.core :as status] [status-im.transport.utils :as transport.utils] [status-im.ui.components.react :as react] diff --git a/src/status_im/utils/money.cljs b/src/status_im/utils/money.cljs index c35f228125..6026023d6f 100644 --- a/src/status_im/utils/money.cljs +++ b/src/status_im/utils/money.cljs @@ -1,7 +1,7 @@ (ns status-im.utils.money (:require ["bignumber.js" :as BigNumber] [clojure.string :as string] - [i18n.i18n :as i18n])) + [utils.i18n :as i18n])) ;; The BigNumber version included in web3 sometimes hangs when dividing large ;; numbers Hence we want to use these functions instead of fromWei etc, which diff --git a/src/status_im/utils/universal_links/core.cljs b/src/status_im/utils/universal_links/core.cljs index 085272c59d..95dbd4f4e1 100644 --- a/src/status_im/utils/universal_links/core.cljs +++ b/src/status_im/utils/universal_links/core.cljs @@ -7,7 +7,7 @@ [status-im.constants :as constants] [status-im.ethereum.core :as ethereum] [status-im.group-chats.core :as group-chats] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.model :as multiaccounts.model] [status-im.router.core :as router] [status-im.ui.components.react :as react] @@ -77,14 +77,14 @@ (rf/defn handle-community [cofx {:keys [community-id]}] (log/info "universal-links: handling community" community-id) - (navigation/navigate-to-cofx cofx :community {:community-id community-id}) -) + (navigation/navigate-to-cofx cofx :community {:community-id community-id})) + (rf/defn handle-navigation-to-desktop-community-from-mobile {:events [:handle-navigation-to-desktop-community-from-mobile]} [{:keys [db]} cofx deserialized-key] - (navigation/navigate-to-cofx cofx :community {:community-id deserialized-key}) -) + (navigation/navigate-to-cofx cofx :community {:community-id deserialized-key})) + (rf/defn handle-desktop-community [cofx {:keys [community-id]}] diff --git a/src/status_im/utils/utils.cljs b/src/status_im/utils/utils.cljs index 96a29f75d6..4409c41334 100644 --- a/src/status_im/utils/utils.cljs +++ b/src/status_im/utils/utils.cljs @@ -6,7 +6,7 @@ [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] - [i18n.i18n :as i18n])) + [utils.i18n :as i18n])) ;;TODO (14/11/22 flexsurfer) .-Alert usage code has been moved to the status-im2 namespace, we keep this ;;only for old (status 1.0) code, diff --git a/src/status_im/waku/core.cljs b/src/status_im/waku/core.cljs index 7a29fcfa54..54fc33857b 100644 --- a/src/status_im/waku/core.cljs +++ b/src/status_im/waku/core.cljs @@ -1,7 +1,7 @@ (ns status-im.waku.core (:require [clojure.string :as string] [re-frame.core :as re-frame] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.node.core :as node] [utils.re-frame :as rf] diff --git a/src/status_im/wallet/accounts/core.cljs b/src/status_im/wallet/accounts/core.cljs index ee10668fb0..1b090743fe 100644 --- a/src/status_im/wallet/accounts/core.cljs +++ b/src/status_im/wallet/accounts/core.cljs @@ -10,7 +10,7 @@ [status-im.ethereum.eip681 :as eip681] [status-im.ethereum.mnemonic :as mnemonic] [status-im.ethereum.stateofus :as stateofus] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.multiaccounts.key-storage.core :as key-storage] [status-im.multiaccounts.update.core :as multiaccounts.update] diff --git a/src/status_im/wallet/choose_recipient/core.cljs b/src/status_im/wallet/choose_recipient/core.cljs index 5bdbeb27e0..a0b02d29d0 100644 --- a/src/status_im/wallet/choose_recipient/core.cljs +++ b/src/status_im/wallet/choose_recipient/core.cljs @@ -5,7 +5,7 @@ [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip681 :as eip681] [status-im.ethereum.ens :as ens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.qr-scanner.core :as qr-scaner] [status-im.router.core :as router] [utils.re-frame :as rf] diff --git a/src/status_im/wallet/core.cljs b/src/status_im/wallet/core.cljs index 0eb874d5fc..296377f35c 100644 --- a/src/status_im/wallet/core.cljs +++ b/src/status_im/wallet/core.cljs @@ -11,7 +11,7 @@ [status-im.ethereum.ens :as ens] [status-im.ethereum.stateofus :as stateofus] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.popover.core :as popover.core] [status-im.qr-scanner.core :as qr-scaner] diff --git a/src/status_im/wallet/custom_tokens/core.cljs b/src/status_im/wallet/custom_tokens/core.cljs index 978cc92985..9d28f9c7d4 100644 --- a/src/status_im/wallet/custom_tokens/core.cljs +++ b/src/status_im/wallet/custom_tokens/core.cljs @@ -3,7 +3,7 @@ [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.re-frame :as rf] [status-im.wallet.core :as wallet] diff --git a/src/status_im/wallet/db.cljs b/src/status_im/wallet/db.cljs index 295c604439..113f837877 100644 --- a/src/status_im/wallet/db.cljs +++ b/src/status_im/wallet/db.cljs @@ -1,5 +1,5 @@ (ns status-im.wallet.db - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [status-im.utils.money :as money] [status-im.utils.priority-map :refer [empty-transaction-map]])) diff --git a/src/status_im/wallet/db_test.cljs b/src/status_im/wallet/db_test.cljs index 4ccecfe11f..908a48ff80 100644 --- a/src/status_im/wallet/db_test.cljs +++ b/src/status_im/wallet/db_test.cljs @@ -1,6 +1,6 @@ (ns status-im.wallet.db-test (:require [cljs.test :refer-macros [deftest is testing]] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.utils.money :as money] [status-im.wallet.db :as wallet.db])) diff --git a/src/status_im/wallet/recipient/core.cljs b/src/status_im/wallet/recipient/core.cljs index dbf671f34b..5821592320 100644 --- a/src/status_im/wallet/recipient/core.cljs +++ b/src/status_im/wallet/recipient/core.cljs @@ -5,7 +5,7 @@ [status-im.ethereum.eip55 :as eip55] [status-im.ethereum.ens :as ens] [status-im.ethereum.stateofus :as stateofus] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui.components.react :as react] [utils.re-frame :as rf] [status-im.utils.random :as random] diff --git a/src/status_im2/common/alert/events.cljs b/src/status_im2/common/alert/events.cljs index c59ae693f6..bb0906843a 100644 --- a/src/status_im2/common/alert/events.cljs +++ b/src/status_im2/common/alert/events.cljs @@ -1,5 +1,5 @@ (ns status-im2.common.alert.events - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [re-frame.core :as re-frame] [react-native.core :as rn])) diff --git a/src/status_im2/common/confirmation_drawer/view.cljs b/src/status_im2/common/confirmation_drawer/view.cljs index 4be00a08d8..ecaf2b3e31 100644 --- a/src/status_im2/common/confirmation_drawer/view.cljs +++ b/src/status_im2/common/confirmation_drawer/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.common.confirmation-drawer.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] diff --git a/src/status_im2/common/home/actions/view.cljs b/src/status_im2/common/home/actions/view.cljs index e0dca46683..9cb01664ea 100644 --- a/src/status_im2/common/home/actions/view.cljs +++ b/src/status_im2/common/home/actions/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.common.home.actions.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.components.drawers.action-drawers :as drawer] [status-im.chat.models :as chat.models] [status-im2.common.confirmation-drawer.view :as confirmation-drawer] ;;TODO move to diff --git a/src/status_im2/contexts/activity_center/notification/admin/view.cljs b/src/status_im2/contexts/activity_center/notification/admin/view.cljs index b575bc80d5..d6a05afb8b 100644 --- a/src/status_im2/contexts/activity_center/notification/admin/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/admin/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.activity-center.notification.admin.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] [status-im2.common.constants :as constants] diff --git a/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs b/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs index deef292242..86d01f7195 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.activity-center.notification.contact-request.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [react-native.core :as rn] [status-im.constants :as constants] diff --git a/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs b/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs index abcdbd25b3..8392a09b36 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/contact_verification/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.activity-center.notification.contact-verification.view (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo2.core :as quo] [status-im.constants :as constants] [utils.datetime :as datetime] diff --git a/src/status_im2/contexts/activity_center/notification/mentions/view.cljs b/src/status_im2/contexts/activity_center/notification/mentions/view.cljs index 415b341582..98ef916652 100644 --- a/src/status_im2/contexts/activity_center/notification/mentions/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/mentions/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.activity-center.notification.mentions.view (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] diff --git a/src/status_im2/contexts/activity_center/notification/reply/view.cljs b/src/status_im2/contexts/activity_center/notification/reply/view.cljs index 74b80db555..582bdc44ed 100644 --- a/src/status_im2/contexts/activity_center/notification/reply/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/reply/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.activity-center.notification.reply.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] diff --git a/src/status_im2/contexts/activity_center/view.cljs b/src/status_im2/contexts/activity_center/view.cljs index d0a929c8d8..8e298a9ec4 100644 --- a/src/status_im2/contexts/activity_center/view.cljs +++ b/src/status_im2/contexts/activity_center/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.activity-center.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo.react :as react] [quo2.core :as quo] [react-native.core :as rn] diff --git a/src/status_im2/contexts/chat/group_details/view.cljs b/src/status_im2/contexts/chat/group_details/view.cljs index b624f4cfdd..48940fd828 100644 --- a/src/status_im2/contexts/chat/group_details/view.cljs +++ b/src/status_im2/contexts/chat/group_details/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.chat.group-details.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo.components.safe-area :as safe-area] [quo2.core :as quo2] [quo2.foundations.colors :as colors] diff --git a/src/status_im2/contexts/chat/home/contact_request/view.cljs b/src/status_im2/contexts/chat/home/contact_request/view.cljs index 9f36238b01..7d2df16be6 100644 --- a/src/status_im2/contexts/chat/home/contact_request/view.cljs +++ b/src/status_im2/contexts/chat/home/contact_request/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.home.contact-request.view (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] diff --git a/src/status_im2/contexts/chat/home/view.cljs b/src/status_im2/contexts/chat/home/view.cljs index 9917711516..44ca7d16b9 100644 --- a/src/status_im2/contexts/chat/home/view.cljs +++ b/src/status_im2/contexts/chat/home/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.chat.home.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [re-frame.core :as re-frame] [react-native.core :as rn] diff --git a/src/status_im2/contexts/chat/messages/composer/controls/view.cljs b/src/status_im2/contexts/chat/messages/composer/controls/view.cljs index c1e5042fe6..2f02ccce29 100644 --- a/src/status_im2/contexts/chat/messages/composer/controls/view.cljs +++ b/src/status_im2/contexts/chat/messages/composer/controls/view.cljs @@ -2,7 +2,7 @@ (:require [react-native.core :as rn] [react-native.background-timer :as background-timer] [utils.re-frame :as rf] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo2.core :as quo] [status-im2.common.not-implemented :as not-implemented] [status-im2.contexts.chat.photo-selector.view :as photo-selector] diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs index 0cb60e04c9..fe48f05821 100644 --- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs +++ b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.contact-requests.bottom-drawer (:require - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [utils.re-frame :as rf] [quo2.core :as quo] [quo2.components.drawers.permission-context.view :as permission-context] diff --git a/src/status_im2/contexts/chat/messages/content/deleted/view.cljs b/src/status_im2/contexts/chat/messages/content/deleted/view.cljs index 99910a25c3..5192deca74 100644 --- a/src/status_im2/contexts/chat/messages/content/deleted/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/deleted/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.chat.messages.content.deleted.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo])) (defn deleted-message diff --git a/src/status_im2/contexts/chat/messages/content/pin/view.cljs b/src/status_im2/contexts/chat/messages/content/pin/view.cljs index fe69637f35..a6b2001dc5 100644 --- a/src/status_im2/contexts/chat/messages/content/pin/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/pin/view.cljs @@ -4,7 +4,7 @@ [quo2.core :as quo] [quo2.foundations.colors :as colors] [utils.re-frame :as rf] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.ui2.screens.chat.messages.message :as old-message] [status-im.ui.screens.chat.styles.message.message :as old-style])) diff --git a/src/status_im2/contexts/chat/messages/delete_message/events.cljs b/src/status_im2/contexts/chat/messages/delete_message/events.cljs index b96b4e99fb..62decae908 100644 --- a/src/status_im2/contexts/chat/messages/delete_message/events.cljs +++ b/src/status_im2/contexts/chat/messages/delete_message/events.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.delete-message.events (:require - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo2.foundations.colors :as colors] [status-im2.contexts.chat.messages.list.events :as message-list] [taoensso.timbre :as log] diff --git a/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs b/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs index b48ba1ecd3..b188b53a8e 100644 --- a/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs +++ b/src/status_im2/contexts/chat/messages/delete_message_for_me/events.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.chat.messages.delete-message-for-me.events (:require - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo2.foundations.colors :as colors] [status-im2.contexts.chat.messages.list.events :as message-list] [taoensso.timbre :as log] diff --git a/src/status_im2/contexts/chat/messages/drawers/view.cljs b/src/status_im2/contexts/chat/messages/drawers/view.cljs index 5aa92e8d8a..1d77f9bc7a 100644 --- a/src/status_im2/contexts/chat/messages/drawers/view.cljs +++ b/src/status_im2/contexts/chat/messages/drawers/view.cljs @@ -3,7 +3,7 @@ [status-im2.common.constants :as constants] [utils.re-frame :as rf] [quo2.core :as quo] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.setup.config :as config] [status-im.ui.components.react :as react] [status-im.ui2.screens.chat.components.reply.view :as components.reply] diff --git a/src/status_im2/contexts/chat/messages/list/view.cljs b/src/status_im2/contexts/chat/messages/list/view.cljs index b886806226..fb294ef127 100644 --- a/src/status_im2/contexts/chat/messages/list/view.cljs +++ b/src/status_im2/contexts/chat/messages/list/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.chat.messages.list.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [oops.core :as oops] [quo2.core :as quo] [react-native.background-timer :as background-timer] diff --git a/src/status_im2/contexts/chat/messages/pin/list/view.cljs b/src/status_im2/contexts/chat/messages/pin/list/view.cljs index c0ed68b248..c6e6b8e366 100644 --- a/src/status_im2/contexts/chat/messages/pin/list/view.cljs +++ b/src/status_im2/contexts/chat/messages/pin/list/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.chat.messages.pin.list.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] diff --git a/src/status_im2/contexts/chat/photo_selector/view.cljs b/src/status_im2/contexts/chat/photo_selector/view.cljs index 068ce55386..a78b1bfdcc 100644 --- a/src/status_im2/contexts/chat/photo_selector/view.cljs +++ b/src/status_im2/contexts/chat/photo_selector/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.chat.photo-selector.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo.components.safe-area :as safe-area] [quo2.components.notifications.info-count :as info-count] [quo2.core :as quo] diff --git a/src/status_im2/contexts/communities/discover/view.cljs b/src/status_im2/contexts/communities/discover/view.cljs index 8608a842fa..da7706970f 100644 --- a/src/status_im2/contexts/communities/discover/view.cljs +++ b/src/status_im2/contexts/communities/discover/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.communities.discover.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [oops.core :as oops] ;; TODO move to status-im2 [quo2.core :as quo] [quo2.foundations.colors :as colors] diff --git a/src/status_im2/contexts/communities/home/view.cljs b/src/status_im2/contexts/communities/home/view.cljs index 8e805a7cad..ef97c9a591 100644 --- a/src/status_im2/contexts/communities/home/view.cljs +++ b/src/status_im2/contexts/communities/home/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.communities.home.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] diff --git a/src/status_im2/contexts/communities/menus/community_options/component_spec.cljs b/src/status_im2/contexts/communities/menus/community_options/component_spec.cljs index 0fdf97cc21..a1fe218a5d 100644 --- a/src/status_im2/contexts/communities/menus/community_options/component_spec.cljs +++ b/src/status_im2/contexts/communities/menus/community_options/component_spec.cljs @@ -2,7 +2,7 @@ (ns status-im2.contexts.communities.menus.community-options.component-spec (:require [re-frame.core :as re-frame] [test-helpers.component :as h] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.setup.i18n-resources :as i18n-resources] [status-im2.contexts.communities.menus.community-options.view :as options])) diff --git a/src/status_im2/contexts/communities/menus/community_options/view.cljs b/src/status_im2/contexts/communities/menus/community_options/view.cljs index d598e915e3..66e17109cb 100644 --- a/src/status_im2/contexts/communities/menus/community_options/view.cljs +++ b/src/status_im2/contexts/communities/menus/community_options/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.communities.menus.community-options.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [utils.re-frame :as rf] [quo2.core :as quo] [status-im2.contexts.communities.menus.leave.view :as leave-menu])) diff --git a/src/status_im2/contexts/communities/menus/leave/view.cljs b/src/status_im2/contexts/communities/menus/leave/view.cljs index 0aca1c9dc4..9f8829fd1a 100644 --- a/src/status_im2/contexts/communities/menus/leave/view.cljs +++ b/src/status_im2/contexts/communities/menus/leave/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.communities.menus.leave.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [status-im2.contexts.communities.menus.leave.style :as style] [react-native.core :as rn] diff --git a/src/status_im2/contexts/communities/menus/request_to_join/view.cljs b/src/status_im2/contexts/communities/menus/request_to_join/view.cljs index 753df1960e..40a0ca05cb 100644 --- a/src/status_im2/contexts/communities/menus/request_to_join/view.cljs +++ b/src/status_im2/contexts/communities/menus/request_to_join/view.cljs @@ -3,7 +3,7 @@ [quo2.core :as quo] [reagent.core :as reagent] [status-im.communities.core :as communities] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im2.contexts.communities.menus.request-to-join.style :as style] [utils.re-frame :as rf] diff --git a/src/status_im2/contexts/communities/overview/view.cljs b/src/status_im2/contexts/communities/overview/view.cljs index ae09638860..b8513e6a1b 100644 --- a/src/status_im2/contexts/communities/overview/view.cljs +++ b/src/status_im2/contexts/communities/overview/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.communities.overview.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [oops.core :as oops] [quo2.core :as quo] [quo2.foundations.colors :as colors] diff --git a/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs b/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs index 03a2f5afc6..1b261fd3cc 100644 --- a/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs +++ b/src/status_im2/contexts/quo_preview/buttons/dynamic_button.cljs @@ -3,7 +3,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs index 9c66fc65b5..6e2980e43b 100644 --- a/src/status_im2/contexts/quo_preview/community/community_card_view.cljs +++ b/src/status_im2/contexts/quo_preview/community/community_card_view.cljs @@ -4,7 +4,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im2.common.constants :as constants] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/community/data.cljs b/src/status_im2/contexts/quo_preview/community/data.cljs index 618bc9f555..6f02c9964e 100644 --- a/src/status_im2/contexts/quo_preview/community/data.cljs +++ b/src/status_im2/contexts/quo_preview/community/data.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.quo-preview.community.data (:require [quo.design-system.colors :as quo.colors] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources])) (def thumbnail diff --git a/src/status_im2/contexts/quo_preview/community/discover_card.cljs b/src/status_im2/contexts/quo_preview/community/discover_card.cljs index 3d34988f9a..c4df9e9dec 100644 --- a/src/status_im2/contexts/quo_preview/community/discover_card.cljs +++ b/src/status_im2/contexts/quo_preview/community/discover_card.cljs @@ -4,7 +4,7 @@ [quo2.components.community.discover-card :as discover-card] [quo2.foundations.colors :as colors] [reagent.core :as reagent] - [i18n.i18n :as i18n])) + [utils.i18n :as i18n])) (def descriptor [{:label "Joined:" diff --git a/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs b/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs index f5c89950ee..d0e9006744 100644 --- a/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs +++ b/src/status_im2/contexts/quo_preview/dividers/new_messages.cljs @@ -3,7 +3,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs b/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs index 37a323692d..46d5484984 100644 --- a/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs +++ b/src/status_im2/contexts/quo_preview/list_items/preview_lists.cljs @@ -3,7 +3,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/messages/gap.cljs b/src/status_im2/contexts/quo_preview/messages/gap.cljs index 8cb1e9365e..d215ea6199 100644 --- a/src/status_im2/contexts/quo_preview/messages/gap.cljs +++ b/src/status_im2/contexts/quo_preview/messages/gap.cljs @@ -2,7 +2,7 @@ (:require [quo2.components.messages.gap :as gap] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/messages/system_message.cljs b/src/status_im2/contexts/quo_preview/messages/system_message.cljs index 14473afcd8..b52cf703db 100644 --- a/src/status_im2/contexts/quo_preview/messages/system_message.cljs +++ b/src/status_im2/contexts/quo_preview/messages/system_message.cljs @@ -3,7 +3,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.react-native.resources :as resources] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs b/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs index 72d5613aa2..0331f1f220 100644 --- a/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/floating_shell_button.cljs @@ -4,7 +4,7 @@ [react-native.core :as rn] [react-native.reanimated :as reanimated] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/tags/status_tags.cljs b/src/status_im2/contexts/quo_preview/tags/status_tags.cljs index 17690e0f03..9198322121 100644 --- a/src/status_im2/contexts/quo_preview/tags/status_tags.cljs +++ b/src/status_im2/contexts/quo_preview/tags/status_tags.cljs @@ -3,7 +3,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.contexts.quo-preview.preview :as preview])) (def status-tags-options diff --git a/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs b/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs index aa23429d49..dce630fb6e 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/network_amount.cljs @@ -4,7 +4,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.contexts.quo-preview.preview :as preview])) (def ^:private networks diff --git a/src/status_im2/contexts/quo_preview/wallet/network_breakdown.cljs b/src/status_im2/contexts/quo_preview/wallet/network_breakdown.cljs index 1d97b0e2e9..2c04bfcc45 100644 --- a/src/status_im2/contexts/quo_preview/wallet/network_breakdown.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/network_breakdown.cljs @@ -4,7 +4,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.contexts.quo-preview.preview :as preview])) (def descriptor diff --git a/src/status_im2/contexts/quo_preview/wallet/token_overview.cljs b/src/status_im2/contexts/quo_preview/wallet/token_overview.cljs index f57a83cb65..82c99464ae 100644 --- a/src/status_im2/contexts/quo_preview/wallet/token_overview.cljs +++ b/src/status_im2/contexts/quo_preview/wallet/token_overview.cljs @@ -3,7 +3,7 @@ [quo2.foundations.colors :as colors] [react-native.core :as rn] [reagent.core :as reagent] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.utils.currency :as currencies] [status-im2.contexts.quo-preview.preview :as preview])) diff --git a/src/status_im2/contexts/shell/cards/view.cljs b/src/status_im2/contexts/shell/cards/view.cljs index 6607471f90..403928fc13 100644 --- a/src/status_im2/contexts/shell/cards/view.cljs +++ b/src/status_im2/contexts/shell/cards/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.shell.cards.view (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] diff --git a/src/status_im2/contexts/shell/view.cljs b/src/status_im2/contexts/shell/view.cljs index 3630bd4615..32d2bc578e 100644 --- a/src/status_im2/contexts/shell/view.cljs +++ b/src/status_im2/contexts/shell/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.shell.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [oops.core :refer [oget]] [quo2.foundations.colors :as colors] diff --git a/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs b/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs index 3ed57a9901..4d89470f8e 100644 --- a/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs +++ b/src/status_im2/contexts/syncing/sheets/enter_password/view.cljs @@ -1,6 +1,6 @@ (ns status-im2.contexts.syncing.sheets.enter-password.view (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [quo.core :as quo-old] [quo2.core :as quo] [quo2.foundations.colors :as colors] diff --git a/src/status_im2/contexts/syncing/sheets/sync_device_notice/view.cljs b/src/status_im2/contexts/syncing/sheets/sync_device_notice/view.cljs index 7f1db2accc..1d4d332523 100644 --- a/src/status_im2/contexts/syncing/sheets/sync_device_notice/view.cljs +++ b/src/status_im2/contexts/syncing/sheets/sync_device_notice/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.syncing.sheets.sync-device-notice.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [react-native.core :as rn] [status-im2.contexts.syncing.sheets.enter-password.view :as enter-password] diff --git a/src/status_im2/contexts/syncing/view.cljs b/src/status_im2/contexts/syncing/view.cljs index 0429dcaf62..5575e15fe9 100644 --- a/src/status_im2/contexts/syncing/view.cljs +++ b/src/status_im2/contexts/syncing/view.cljs @@ -1,5 +1,5 @@ (ns status-im2.contexts.syncing.view - (:require [i18n.i18n :as i18n] + (:require [utils.i18n :as i18n] [quo2.core :as quo] [quo2.foundations.colors :as colors] [react-native.core :as rn] diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs index 52aa5aaac6..76d501a786 100644 --- a/src/status_im2/navigation/screens.cljs +++ b/src/status_im2/navigation/screens.cljs @@ -1,5 +1,5 @@ (ns status-im2.navigation.screens - (:require [i18n.i18n :as i18n] ;; TODO remove when not used anymore + (:require [utils.i18n :as i18n] ;; TODO remove when not used anymore [status-im.ui.screens.screens :as old-screens] [status-im2.contexts.activity-center.view :as activity-center] [status-im2.contexts.chat.messages.view :as chat] diff --git a/src/status_im2/setup/core.cljs b/src/status_im2/setup/core.cljs index 2b79e501b8..b8646fd58b 100644 --- a/src/status_im2/setup/core.cljs +++ b/src/status_im2/setup/core.cljs @@ -1,6 +1,6 @@ (ns status-im2.setup.core (:require - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.setup.i18n-resources :as i18n-resources] [re-frame.core :as re-frame] [re-frame.interop :as interop] @@ -20,7 +20,6 @@ [status-im2.setup.config :as config] [status-im2.setup.dev :as dev] status-im2.setup.events - status-im2.setup.datetime [status-im2.setup.global-error :as global-error] [status-im2.setup.log :as log] status-im2.subs.root)) diff --git a/src/status_im2/setup/datetime.cljs b/src/status_im2/setup/datetime.cljs deleted file mode 100644 index 2f106163a0..0000000000 --- a/src/status_im2/setup/datetime.cljs +++ /dev/null @@ -1,8 +0,0 @@ -(ns status-im2.setup.datetime - (:require [re-frame.core :as re-frame] - [utils.datetime :as datetime])) - -(re-frame/reg-cofx - :now - (fn [coeffects _] - (assoc coeffects :now (datetime/timestamp)))) \ No newline at end of file diff --git a/src/status_im2/setup/events.cljs b/src/status_im2/setup/events.cljs index 4ff6c961d4..330dac23a9 100644 --- a/src/status_im2/setup/events.cljs +++ b/src/status_im2/setup/events.cljs @@ -11,7 +11,13 @@ [status-im2.common.toasts.events] [status-im2.navigation.events :as navigation] [status-im2.setup.db :as db] - [utils.re-frame :as rf])) + [utils.re-frame :as rf] + [utils.datetime :as datetime])) + +(re-frame/reg-cofx + :now + (fn [coeffects _] + (assoc coeffects :now (datetime/timestamp)))) (re-frame/reg-fx :setup/open-multiaccounts diff --git a/src/status_im2/setup/global_error.cljs b/src/status_im2/setup/global_error.cljs index a3484c1c91..ee015a1474 100644 --- a/src/status_im2/setup/global_error.cljs +++ b/src/status_im2/setup/global_error.cljs @@ -1,6 +1,6 @@ (ns status-im2.setup.global-error (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [re-frame.core :as re-frame] [status-im2.common.alert.events :as alert])) diff --git a/src/status_im2/setup/i18n_resources.cljs b/src/status_im2/setup/i18n_resources.cljs index 164912116c..cad97bcc9b 100644 --- a/src/status_im2/setup/i18n_resources.cljs +++ b/src/status_im2/setup/i18n_resources.cljs @@ -1,6 +1,6 @@ (ns status-im2.setup.i18n-resources (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [react-native.languages :as react-native-languages])) (def default-device-language (react-native-languages/get-lang-keyword)) diff --git a/src/status_im2/setup/i18n_test.cljs b/src/status_im2/setup/i18n_test.cljs index 3671c02660..e51e13def9 100644 --- a/src/status_im2/setup/i18n_test.cljs +++ b/src/status_im2/setup/i18n_test.cljs @@ -3,7 +3,7 @@ [cljs.test :refer-macros [deftest is]] [clojure.set :as set] [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im2.setup.i18n-resources :as i18n-resources])) ;; english as source of truth diff --git a/src/status_im2/subs/chat/chats.cljs b/src/status_im2/subs/chat/chats.cljs index c63a2d8cac..40ebd18a6b 100644 --- a/src/status_im2/subs/chat/chats.cljs +++ b/src/status_im2/subs/chat/chats.cljs @@ -8,7 +8,7 @@ [status-im.communities.core :as communities] [status-im.group-chats.core :as group-chat] [status-im.group-chats.db :as group-chats.db] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.multiaccounts.core :as multiaccounts] [status-im.utils.config :as config] [status-im.utils.image-server :as image-server] diff --git a/src/status_im2/subs/contact.cljs b/src/status_im2/subs/contact.cljs index 61bb7f2381..50e608fbbe 100644 --- a/src/status_im2/subs/contact.cljs +++ b/src/status_im2/subs/contact.cljs @@ -1,6 +1,6 @@ (ns status-im2.subs.contact (:require [clojure.string :as string] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [re-frame.core :as re-frame] [status-im.contact.db :as contact.db] [status-im.ethereum.core :as ethereum] diff --git a/src/status_im2/subs/wallet/signing.cljs b/src/status_im2/subs/wallet/signing.cljs index 08b2bffdd3..022f14b73d 100644 --- a/src/status_im2/subs/wallet/signing.cljs +++ b/src/status_im2/subs/wallet/signing.cljs @@ -3,7 +3,7 @@ [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.signing.gas :as signing.gas] [status-im.utils.money :as money] [status-im.wallet.db :as wallet.db])) @@ -229,4 +229,4 @@ from (nil? amount-error) (not (nil? amount)) - (not offline?)))))) \ No newline at end of file + (not offline?)))))) diff --git a/src/status_im2/subs/wallet/transactions.cljs b/src/status_im2/subs/wallet/transactions.cljs index 0f5be4124d..760087e72a 100644 --- a/src/status_im2/subs/wallet/transactions.cljs +++ b/src/status_im2/subs/wallet/transactions.cljs @@ -1,7 +1,7 @@ (ns status-im2.subs.wallet.transactions (:require [re-frame.core :as re-frame] [status-im.ethereum.transactions.core :as transactions] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.notifications.core :as notifications] [utils.datetime :as datetime] [status-im.utils.money :as money] @@ -244,4 +244,4 @@ {:service "wallet" :event "transaction" :identifier "all"}) - pref)))) \ No newline at end of file + pref)))) diff --git a/src/status_im2/subs/wallet/wallet.cljs b/src/status_im2/subs/wallet/wallet.cljs index 74952c029a..b4c22f685a 100644 --- a/src/status_im2/subs/wallet/wallet.cljs +++ b/src/status_im2/subs/wallet/wallet.cljs @@ -3,7 +3,7 @@ [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] [status-im.ethereum.tokens :as tokens] - [i18n.i18n :as i18n] + [utils.i18n :as i18n] [status-im.utils.config :as config] [status-im.utils.currency :as currency] [status-im.utils.money :as money])) @@ -289,4 +289,4 @@ :wallet/fetching-assets-by-collectible-slug :<- [:wallet/fetching-collection-assets] (fn [fetching-collection-assets [_ collectible-slug]] - (get fetching-collection-assets collectible-slug false))) \ No newline at end of file + (get fetching-collection-assets collectible-slug false))) diff --git a/src/utils/datetime.cljs b/src/utils/datetime.cljs index c6360e87a9..33df841aa0 100644 --- a/src/utils/datetime.cljs +++ b/src/utils/datetime.cljs @@ -4,11 +4,9 @@ [goog.string :as gstring] [cljs-time.format :as t.format] [clojure.string :as string] - [i18n.i18n :as i18n] - [status-im.goog.i18n :as goog.18n] - [status-im.native-module.core :as status])) + [utils.i18n :as i18n] + [utils.i18n-goog :as i18n-goog])) -;;;; Datetime constants (defn now [] (t/now)) (def one-second 1000) @@ -38,9 +36,7 @@ "Returns is24Hour from device or from given locale symbols. Whenever we get non-nil value use it, else calculate it from the given locale symbol." [^js locsym] - (if-some [fromdev (status/is24Hour)] - fromdev - (is-24-hour-locsym locsym))) + (is-24-hour-locsym locsym)) ;;;; Time formats (defn- short-time-format @@ -81,7 +77,7 @@ (fn [] (or @formatter (reset! formatter - (goog.18n/mk-fmt i18n/locale format)))))) + (i18n-goog/mk-fmt i18n/locale format)))))) (def date-time-fmt (get-formatter-fn medium-date-time-format)) (def date-fmt (get-formatter-fn medium-date-format)) diff --git a/src/utils/datetime_test.cljs b/src/utils/datetime_test.cljs index eb8d6c4b7e..77e07680ec 100644 --- a/src/utils/datetime_test.cljs +++ b/src/utils/datetime_test.cljs @@ -2,13 +2,12 @@ (:require [cljs-time.coerce :as time-coerce] [cljs-time.core :as t] [cljs.test :refer-macros [deftest testing is]] - [status-im.goog.i18n :as i18n] - status-im2.setup.datetime + [utils.i18n-goog :as i18n-goog] [utils.datetime :as datetime])) (defn match [name symbols] - (is (identical? (.-dateTimeSymbols_ (i18n/mk-fmt name #'utils.datetime/medium-date-format)) + (is (identical? (.-dateTimeSymbols_ (i18n-goog/mk-fmt name #'utils.datetime/medium-date-format)) symbols))) (deftest date-time-formatter-test @@ -26,18 +25,18 @@ (def epoch-plus-3d 172800000) (deftest is-24-hour-locale-en-test - (is (= (#'utils.datetime/is-24-hour-locsym (i18n/locale-symbols "en")) false))) + (is (= (#'utils.datetime/is-24-hour-locsym (i18n-goog/locale-symbols "en")) false))) (deftest is-24-hour-locale-it-test - (is (= (#'utils.datetime/is-24-hour-locsym (i18n/locale-symbols "it")) true))) + (is (= (#'utils.datetime/is-24-hour-locsym (i18n-goog/locale-symbols "it")) true))) (deftest is-24-hour-locale-nb-test - (is (= (#'utils.datetime/is-24-hour-locsym (i18n/locale-symbols "nb-NO")) true))) + (is (= (#'utils.datetime/is-24-hour-locsym (i18n-goog/locale-symbols "nb-NO")) true))) (deftest to-short-str-today-test (with-redefs [t/*ms-fn* (constantly epoch-plus-3d) datetime/time-fmt (fn [] - (i18n/mk-fmt "us" #'utils.datetime/short-time-format)) + (i18n-goog/mk-fmt "us" #'utils.datetime/short-time-format)) datetime/time-zone-offset (t/period :hours 0)] (is (= (datetime/to-short-str epoch-plus-3d) "12:00 AM")))) @@ -59,13 +58,14 @@ (with-redefs [t/*ms-fn* (constantly epoch-plus-3d) datetime/time-zone-offset (t/period :hours 0) datetime/date-fmt (fn [] - (i18n/mk-fmt "us" #'utils.datetime/medium-date-format))] + (i18n-goog/mk-fmt "us" #'utils.datetime/medium-date-format))] (is (= (datetime/to-short-str epoch) "Jan 1, 1970")))) (deftest to-short-str-before-yesterday-nb-test (with-redefs [datetime/time-zone-offset (t/period :hours 0) datetime/date-fmt (fn [] - (i18n/mk-fmt "nb-NO" #'utils.datetime/medium-date-format)) + (i18n-goog/mk-fmt "nb-NO" + #'utils.datetime/medium-date-format)) t/*ms-fn* (constantly epoch-plus-3d)] (is (= (datetime/to-short-str epoch) "1. jan. 1970")))) @@ -73,16 +73,16 @@ (with-redefs [t/*ms-fn* (constantly epoch-plus-3d) datetime/time-zone-offset (t/period :hours 0) datetime/date-fmt (fn [] - (i18n/mk-fmt "us" - #'utils.datetime/medium-date-time-format))] + (i18n-goog/mk-fmt "us" + #'utils.datetime/medium-date-time-format))] (is (= (datetime/day-relative epoch) "Jan 1, 1970, 12:00:00 AM")))) (deftest day-relative-before-yesterday-nb-test (with-redefs [t/*ms-fn* (constantly epoch-plus-3d) datetime/time-zone-offset (t/period :hours 0) datetime/date-fmt (fn [] - (i18n/mk-fmt "nb-NO" - #'utils.datetime/medium-date-time-format))] + (i18n-goog/mk-fmt "nb-NO" + #'utils.datetime/medium-date-time-format))] (is (= (datetime/day-relative epoch) "1. jan. 1970, 00:00:00")))) (deftest current-year?-test diff --git a/src/i18n/i18n.cljs b/src/utils/i18n.cljs similarity index 94% rename from src/i18n/i18n.cljs rename to src/utils/i18n.cljs index 6eb7ef6c51..677e94e8d9 100644 --- a/src/i18n/i18n.cljs +++ b/src/utils/i18n.cljs @@ -1,7 +1,7 @@ -(ns i18n.i18n +(ns utils.i18n (:require ["i18n-js" :as i18n] [clojure.string :as string] - [status-im.goog.i18n :as goog.i18n])) + [utils.i18n-goog :as i18n-goog])) (defn setup [default-device-language translations-by-locale] @@ -69,4 +69,4 @@ (def locale (.-locale i18n)) -(def format-currency goog.i18n/format-currency) +(def format-currency i18n-goog/format-currency) diff --git a/src/status_im/goog/i18n.cljs b/src/utils/i18n_goog.cljs similarity index 99% rename from src/status_im/goog/i18n.cljs rename to src/utils/i18n_goog.cljs index 388498f4e0..6e4485fc4a 100644 --- a/src/status_im/goog/i18n.cljs +++ b/src/utils/i18n_goog.cljs @@ -1,4 +1,4 @@ -(ns status-im.goog.i18n +(ns utils.i18n-goog (:require [clojure.string :as string] goog.i18n.CompactNumberFormatSymbols @@ -443,4 +443,4 @@ (new ^js goog.i18n.NumberFormat (let [pattern (.-CURRENCY_PATTERN ^js nfs)] (string/replace pattern #"\s*¤\s*" ""))) - value))) \ No newline at end of file + value)))