From b2cae88924d8a7a60eabf9a6bf0e905baf395376 Mon Sep 17 00:00:00 2001 From: flexsurfer Date: Mon, 25 Sep 2023 09:32:55 +0200 Subject: [PATCH] [#17383] migrate status-im.utils.types (#17389) --- src/status_im/browser/core.cljs | 2 +- src/status_im/browser/permissions_test.cljs | 2 +- src/status_im/chat/models/message.cljs | 2 +- src/status_im/communities/core.cljs | 2 +- src/status_im/contact/block.cljs | 2 +- src/status_im/data_store/chats.cljs | 2 +- src/status_im/keycard/common.cljs | 2 +- src/status_im/keycard/fx.cljs | 2 +- src/status_im/keycard/login.cljs | 2 +- src/status_im/keycard/real_keycard.cljs | 2 +- src/status_im/keycard/recovery.cljs | 2 +- src/status_im/keycard/sign.cljs | 2 +- src/status_im/keycard/simulated_keycard.cljs | 2 +- src/status_im/multiaccounts/create/core.cljs | 2 +- src/status_im/multiaccounts/login/core.cljs | 2 +- src/status_im/multiaccounts/recover/core.cljs | 2 +- src/status_im/multiaccounts/reset_password/core.cljs | 2 +- src/status_im/multiaccounts/update/core.cljs | 2 +- src/status_im/node/core.cljs | 2 +- src/status_im/notifications/local.cljs | 2 +- src/status_im/router/core.cljs | 2 +- src/status_im/signing/core.cljs | 2 +- src/status_im/signing/keycard.cljs | 2 +- src/status_im/transport/message/core.cljs | 2 +- .../ui/screens/privacy_and_security_settings/events.cljs | 2 +- src/status_im/ui/screens/signing/views.cljs | 2 +- src/status_im/utils/{types.cljs => deprecated_types.cljs} | 3 ++- src/status_im/utils/logging/core.cljs | 2 +- src/status_im/utils/test.cljs | 2 +- src/status_im/wallet/accounts/core.cljs | 2 +- src/status_im/wallet_connect/core.cljs | 2 +- src/status_im2/common/log.cljs | 4 ++-- src/status_im2/contexts/add_new_contact/events.cljs | 7 +++---- src/status_im2/contexts/chat/events.cljs | 4 ++-- src/status_im2/contexts/contacts/events.cljs | 4 ++-- src/status_im2/contexts/onboarding/events.cljs | 4 ++-- src/status_im2/contexts/profile/config.cljs | 4 ++-- src/status_im2/contexts/profile/profiles/view.cljs | 4 ++-- 38 files changed, 47 insertions(+), 47 deletions(-) rename src/status_im/utils/{types.cljs => deprecated_types.cljs} (91%) diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs index 1dad3be275..9addb14eca 100644 --- a/src/status_im/browser/core.cljs +++ b/src/status_im/browser/core.cljs @@ -20,7 +20,7 @@ [utils.url :as url] [react-native.platform :as platform] [status-im.utils.random :as random] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.utils.universal-links.utils :as links] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log] diff --git a/src/status_im/browser/permissions_test.cljs b/src/status_im/browser/permissions_test.cljs index 02c03421e7..191e173858 100644 --- a/src/status_im/browser/permissions_test.cljs +++ b/src/status_im/browser/permissions_test.cljs @@ -3,7 +3,7 @@ [status-im.browser.core :as browser] [status-im.browser.core-test :as core.tests] [status-im.browser.permissions :as permissions] - [status-im.utils.types :as types])) + [status-im.utils.deprecated-types :as types])) (deftest permissions-test (let [dapp-name "test.com" diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs index 37cb760e29..30551f0f2d 100644 --- a/src/status_im/chat/models/message.cljs +++ b/src/status_im/chat/models/message.cljs @@ -5,7 +5,7 @@ [status-im.data-store.messages :as data-store.messages] [status-im.transport.message.protocol :as protocol] [react-native.platform :as platform] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im2.contexts.chat.messages.delete-message.events :as delete-message] [status-im2.contexts.chat.messages.list.events :as message-list] [status-im2.contexts.chat.messages.list.state :as view.state] diff --git a/src/status_im/communities/core.cljs b/src/status_im/communities/core.cljs index 496c107b83..3d4710a1a9 100644 --- a/src/status_im/communities/core.cljs +++ b/src/status_im/communities/core.cljs @@ -5,7 +5,7 @@ [quo.design-system.colors :as colors] [quo2.foundations.colors :as quo2.colors] [re-frame.core :as re-frame] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.async-storage.core :as async-storage] [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles] [status-im.utils.universal-links.core :as universal-links] diff --git a/src/status_im/contact/block.cljs b/src/status_im/contact/block.cljs index 1eb51a27f4..487b76e573 100644 --- a/src/status_im/contact/block.cljs +++ b/src/status_im/contact/block.cljs @@ -5,7 +5,7 @@ [status-im.data-store.chats :as chats-store] [status-im2.contexts.contacts.events :as contacts-store] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im2.contexts.shell.activity-center.events :as activity-center] [status-im2.navigation.events :as navigation])) diff --git a/src/status_im/data_store/chats.cljs b/src/status_im/data_store/chats.cljs index 8afa017f30..df78b99a4d 100644 --- a/src/status_im/data_store/chats.cljs +++ b/src/status_im/data_store/chats.cljs @@ -3,7 +3,7 @@ [status-im2.constants :as constants] [status-im.data-store.messages :as messages] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [taoensso.timbre :as log])) (defn rpc->type diff --git a/src/status_im/keycard/common.cljs b/src/status_im/keycard/common.cljs index 6f9d15d995..14ebbc6242 100644 --- a/src/status_im/keycard/common.cljs +++ b/src/status_im/keycard/common.cljs @@ -11,7 +11,7 @@ [utils.datetime :as datetime] [status-im.utils.keychain.core :as keychain] [react-native.platform :as platform] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log])) diff --git a/src/status_im/keycard/fx.cljs b/src/status_im/keycard/fx.cljs index cc400ffb97..b7527e217f 100644 --- a/src/status_im/keycard/fx.cljs +++ b/src/status_im/keycard/fx.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [status-im.keycard.card :as card] [native-module.core :as native-module] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [taoensso.timbre :as log])) (re-frame/reg-fx diff --git a/src/status_im/keycard/login.cljs b/src/status_im/keycard/login.cljs index 116ab0b9b3..d6b0831b26 100644 --- a/src/status_im/keycard/login.cljs +++ b/src/status_im/keycard/login.cljs @@ -7,7 +7,7 @@ [status-im.keycard.recovery :as recovery] [status-im.signing.core :as signing.core] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log])) diff --git a/src/status_im/keycard/real_keycard.cljs b/src/status_im/keycard/real_keycard.cljs index 37df03a4e0..192906bc7c 100644 --- a/src/status_im/keycard/real_keycard.cljs +++ b/src/status_im/keycard/real_keycard.cljs @@ -6,7 +6,7 @@ [status-im.keycard.keycard :as keycard] [native-module.core :as native-module] [react-native.platform :as platform] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [taoensso.timbre :as log])) (defonce event-emitter diff --git a/src/status_im/keycard/recovery.cljs b/src/status_im/keycard/recovery.cljs index a4ea7b50ac..91a3657503 100644 --- a/src/status_im/keycard/recovery.cljs +++ b/src/status_im/keycard/recovery.cljs @@ -16,7 +16,7 @@ [utils.datetime :as datetime] [status-im.utils.keychain.core :as keychain] [react-native.platform :as platform] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log] [utils.security.core :as security])) diff --git a/src/status_im/keycard/sign.cljs b/src/status_im/keycard/sign.cljs index e16dff8ddb..de7f3d8d9f 100644 --- a/src/status_im/keycard/sign.cljs +++ b/src/status_im/keycard/sign.cljs @@ -5,7 +5,7 @@ [status-im.keycard.common :as common] [utils.re-frame :as rf] [utils.money :as money] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [taoensso.timbre :as log])) (rf/defn sign diff --git a/src/status_im/keycard/simulated_keycard.cljs b/src/status_im/keycard/simulated_keycard.cljs index 979443afb2..7d09ebe49d 100644 --- a/src/status_im/keycard/simulated_keycard.cljs +++ b/src/status_im/keycard/simulated_keycard.cljs @@ -9,7 +9,7 @@ [status-im.multiaccounts.create.core :as multiaccounts.create] [native-module.core :as native-module] [status-im.node.core :as node] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.utils.utils :as utils] [taoensso.timbre :as log])) diff --git a/src/status_im/multiaccounts/create/core.cljs b/src/status_im/multiaccounts/create/core.cljs index 61e8fc9a0a..dc635c09ef 100644 --- a/src/status_im/multiaccounts/create/core.cljs +++ b/src/status_im/multiaccounts/create/core.cljs @@ -11,7 +11,7 @@ [status-im2.config :as config] [utils.re-frame :as rf] [status-im.utils.signing-phrase.core :as signing-phrase] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [utils.security.core :as security])) (defn normalize-derived-data-keys diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index efdfb175c0..33db20de80 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -6,7 +6,7 @@ [status-im.ui.components.react :as react] [utils.re-frame :as rf] [react-native.platform :as platform] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [utils.security.core :as security])) (re-frame/reg-fx diff --git a/src/status_im/multiaccounts/recover/core.cljs b/src/status_im/multiaccounts/recover/core.cljs index 33a30190df..a480d50454 100644 --- a/src/status_im/multiaccounts/recover/core.cljs +++ b/src/status_im/multiaccounts/recover/core.cljs @@ -3,7 +3,7 @@ [status-im2.constants :as constants] [status-im.multiaccounts.create.core :as multiaccounts.create] [native-module.core :as native-module] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [taoensso.timbre :as log])) (re-frame/reg-fx diff --git a/src/status_im/multiaccounts/reset_password/core.cljs b/src/status_im/multiaccounts/reset_password/core.cljs index 3a8c5c99ee..e4c92f7cf2 100644 --- a/src/status_im/multiaccounts/reset_password/core.cljs +++ b/src/status_im/multiaccounts/reset_password/core.cljs @@ -5,7 +5,7 @@ [native-module.core :as native-module] [status-im.popover.core :as popover] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [utils.security.core :as security])) (rf/defn on-input-change diff --git a/src/status_im/multiaccounts/update/core.cljs b/src/status_im/multiaccounts/update/core.cljs index ca1d5a5bb0..120c4680d1 100644 --- a/src/status_im/multiaccounts/update/core.cljs +++ b/src/status_im/multiaccounts/update/core.cljs @@ -1,6 +1,6 @@ (ns status-im.multiaccounts.update.core (:require [status-im.ethereum.ens :as ens] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im2.constants :as constants] [taoensso.timbre :as log] [utils.re-frame :as rf])) diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs index c8d9da2159..d2a6a18527 100644 --- a/src/status_im/node/core.cljs +++ b/src/status_im/node/core.cljs @@ -3,7 +3,7 @@ [native-module.core :as native-module] [status-im2.config :as config] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [clojure.string :as string] [react-native.platform :as platform])) diff --git a/src/status_im/notifications/local.cljs b/src/status_im/notifications/local.cljs index 31b49e8602..06ee95a3b6 100644 --- a/src/status_im/notifications/local.cljs +++ b/src/status_im/notifications/local.cljs @@ -11,7 +11,7 @@ [status-im.notifications.android :as pn-android] [utils.re-frame :as rf] [utils.money :as money] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.utils.utils :as utils] [react-native.core :as rn])) diff --git a/src/status_im/router/core.cljs b/src/status_im/router/core.cljs index ceadb510b4..fa066ba429 100644 --- a/src/status_im/router/core.cljs +++ b/src/status_im/router/core.cljs @@ -7,7 +7,7 @@ [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip681 :as eip681] [status-im.ethereum.ens :as ens] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [native-module.core :as native-module] [status-im.ethereum.stateofus :as stateofus] [utils.validators :as validators] diff --git a/src/status_im/signing/core.cljs b/src/status_im/signing/core.cljs index 0b892c2fc4..908890da89 100644 --- a/src/status_im/signing/core.cljs +++ b/src/status_im/signing/core.cljs @@ -16,7 +16,7 @@ [utils.re-frame :as rf] [status-im.utils.hex :as utils.hex] [utils.money :as money] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.utils.utils :as utils] [status-im.wallet.core :as wallet] [status-im.wallet.prices :as prices] diff --git a/src/status_im/signing/keycard.cljs b/src/status_im/signing/keycard.cljs index 039a78ff5b..0d75a398a7 100644 --- a/src/status_im/signing/keycard.cljs +++ b/src/status_im/signing/keycard.cljs @@ -3,7 +3,7 @@ [utils.i18n :as i18n] [native-module.core :as native-module] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [taoensso.timbre :as log])) (re-frame/reg-fx diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs index e0fa66cb4c..696f82e3bc 100644 --- a/src/status_im/transport/message/core.cljs +++ b/src/status_im/transport/message/core.cljs @@ -16,7 +16,7 @@ [status-im.multiaccounts.update.core :as update.core] [status-im.pairing.core :as models.pairing] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.visibility-status-updates.core :as models.visibility-status-updates] [status-im2.contexts.shell.activity-center.events :as activity-center] [status-im2.contexts.chat.messages.pin.events :as messages.pin] 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 b2e8a506ad..e58180f9da 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 @@ -5,7 +5,7 @@ [utils.i18n :as i18n] [native-module.core :as native-module] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [taoensso.timbre :as log] [utils.security.core :as security])) diff --git a/src/status_im/ui/screens/signing/views.cljs b/src/status_im/ui/screens/signing/views.cljs index 6aae6f7380..b9d59d156f 100644 --- a/src/status_im/ui/screens/signing/views.cljs +++ b/src/status_im/ui/screens/signing/views.cljs @@ -23,7 +23,7 @@ [status-im.ui.screens.signing.styles :as styles] [status-im.ui.screens.wallet.components.views :as wallet.components] [react-native.platform :as platform] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.utils.utils :as utils] [status-im.wallet.utils :as wallet.utils] [utils.security.core :as security])) diff --git a/src/status_im/utils/types.cljs b/src/status_im/utils/deprecated_types.cljs similarity index 91% rename from src/status_im/utils/types.cljs rename to src/status_im/utils/deprecated_types.cljs index 658692d40a..f3a1f4f4e3 100644 --- a/src/status_im/utils/types.cljs +++ b/src/status_im/utils/deprecated_types.cljs @@ -1,4 +1,5 @@ -(ns status-im.utils.types +(ns status-im.utils.deprecated-types + {:deprecated true :superseded-by "utils.transforms"} (:refer-clojure :exclude [js->clj]) (:require [cljs-bean.core :as clj-bean])) diff --git a/src/status_im/utils/logging/core.cljs b/src/status_im/utils/logging/core.cljs index a8ded5c7a9..3ddea330e8 100644 --- a/src/status_im/utils/logging/core.cljs +++ b/src/status_im/utils/logging/core.cljs @@ -12,7 +12,7 @@ [utils.re-frame :as rf] [utils.datetime :as datetime] [react-native.platform :as platform] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im2.common.log :as log] [status-im2.config :as config])) diff --git a/src/status_im/utils/test.cljs b/src/status_im/utils/test.cljs index f968dc618c..322f430492 100644 --- a/src/status_im/utils/test.cljs +++ b/src/status_im/utils/test.cljs @@ -1,6 +1,6 @@ (ns status-im.utils.test (:require [re-frame.core :as re-frame] - [status-im.utils.types :as types])) + [status-im.utils.deprecated-types :as types])) (def native-status (js/require "../../modules/react-native-status/nodejs/bindings")) diff --git a/src/status_im/wallet/accounts/core.cljs b/src/status_im/wallet/accounts/core.cljs index 50b8d9ea2c..943e5dabcb 100644 --- a/src/status_im/wallet/accounts/core.cljs +++ b/src/status_im/wallet/accounts/core.cljs @@ -18,7 +18,7 @@ [utils.re-frame :as rf] [status-im.utils.hex :as hex] [status-im.utils.mobile-sync :as utils.mobile-sync] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.wallet.core :as wallet] [status-im.wallet.prices :as prices] [status-im2.navigation.events :as navigation] diff --git a/src/status_im/wallet_connect/core.cljs b/src/status_im/wallet_connect/core.cljs index a73808ffee..ee394962d7 100644 --- a/src/status_im/wallet_connect/core.cljs +++ b/src/status_im/wallet_connect/core.cljs @@ -7,7 +7,7 @@ [status-im.signing.core :as signing] [status-im2.config :as config] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [status-im.utils.deprecated-types :as types] [status-im.utils.wallet-connect :as wallet-connect] [taoensso.timbre :as log])) diff --git a/src/status_im2/common/log.cljs b/src/status_im2/common/log.cljs index bc2394c60d..316626d131 100644 --- a/src/status_im2/common/log.cljs +++ b/src/status_im2/common/log.cljs @@ -2,7 +2,7 @@ (:require [clojure.string :as string] [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im.utils.types :as types] + [utils.transforms :as transforms] [status-im2.config :as config] [taoensso.timbre :as log] [utils.re-frame :as rf])) @@ -21,7 +21,7 @@ (defn setup [level] (let [handle-error (fn [res] - (let [{:keys [error]} (types/json->clj res)] + (let [{:keys [error]} (transforms/json->clj res)] (when-not (string/blank? error) (log/error "init statusgo logging failed" error)))) logging-params {:enable? true diff --git a/src/status_im2/contexts/add_new_contact/events.cljs b/src/status_im2/contexts/add_new_contact/events.cljs index 826c71467e..69154d096a 100644 --- a/src/status_im2/contexts/add_new_contact/events.cljs +++ b/src/status_im2/contexts/add_new_contact/events.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.add-new-contact.events (:require [clojure.string :as string] [utils.re-frame :as rf] - [status-im.utils.types :as types] + [utils.transforms :as transforms] [re-frame.core :as re-frame] [status-im.ethereum.core :as ethereum] [status-im.ethereum.ens :as ens] @@ -129,7 +129,7 @@ compressed-key constants/deserialization-key (fn [resp] - (let [{:keys [error]} (types/json->clj resp)] + (let [{:keys [error]} (transforms/json->clj resp)] (if error (on-error error) (on-success (str "0x" (subs resp 5))))))))) @@ -194,6 +194,5 @@ (rf/defn set-new-identity-reconnected [{:keys [db]}] - (let [input (get-in db [:contacts/new-identity :input]) - resubmit? (and input (= :new-contact (get-in db [:view-id])))] + (let [input (get-in db [:contacts/new-identity :input])] (rf/dispatch [:contacts/set-new-identity input]))) diff --git a/src/status_im2/contexts/chat/events.cljs b/src/status_im2/contexts/chat/events.cljs index b51cb4b096..3092931e88 100644 --- a/src/status_im2/contexts/chat/events.cljs +++ b/src/status_im2/contexts/chat/events.cljs @@ -14,7 +14,7 @@ [status-im.data-store.chats :as chats-store] [status-im2.contexts.contacts.events :as contacts-store] [status-im.utils.clocks :as utils.clocks] - [status-im.utils.types :as types] + [utils.transforms :as transforms] [reagent.core :as reagent] [quo2.foundations.colors :as colors] [re-frame.core :as re-frame] @@ -234,7 +234,7 @@ (rf/defn handle-one-to-one-chat-created {:events [:chat/one-to-one-chat-created]} [{:keys [db]} chat-id response-js] - (let [chat (chats-store/<-rpc (first (types/js->clj (.-chats ^js response-js)))) + (let [chat (chats-store/<-rpc (first (transforms/js->clj (.-chats ^js response-js)))) contact-js (first (.-contacts ^js response-js)) contact (when contact-js (contacts-store/<-rpc-js contact-js))] {:db (cond-> db diff --git a/src/status_im2/contexts/contacts/events.cljs b/src/status_im2/contexts/contacts/events.cljs index ab437e10c3..e449e8b2d5 100644 --- a/src/status_im2/contexts/contacts/events.cljs +++ b/src/status_im2/contexts/contacts/events.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.contacts.events (:require [oops.core :as oops] - [status-im.utils.types :as types] + [utils.transforms :as transforms] [status-im2.constants :as constants] [taoensso.timbre :as log] [utils.i18n :as i18n] @@ -15,7 +15,7 @@ :secondary-name (.-secondaryName js-contact) :ens-name (.-name js-contact) :nickname (.-localNickname js-contact) - :images (types/js->clj (oops/oget js-contact "images")) + :images (transforms/js->clj (oops/oget js-contact "images")) :ens-verified (oops/oget js-contact "ensVerified") :contact-request-state (oops/oget js-contact "contactRequestState") :last-updated (oops/oget js-contact "lastUpdated") diff --git a/src/status_im2/contexts/onboarding/events.cljs b/src/status_im2/contexts/onboarding/events.cljs index 603672fc79..46bce324e1 100644 --- a/src/status_im2/contexts/onboarding/events.cljs +++ b/src/status_im2/contexts/onboarding/events.cljs @@ -1,7 +1,7 @@ (ns status-im2.contexts.onboarding.events (:require [native-module.core :as native-module] [re-frame.core :as re-frame] - [status-im.utils.types :as types] + [utils.transforms :as transforms] [status-im2.constants :as constants] [taoensso.timbre :as log] [utils.i18n :as i18n] @@ -17,7 +17,7 @@ (native-module/validate-mnemonic (security/safe-unmask-data mnemonic) (fn [result] - (let [{:keys [error keyUID]} (types/json->clj result)] + (let [{:keys [error keyUID]} (transforms/json->clj result)] (if (seq error) (when on-error (on-error error)) (on-success mnemonic keyUID))))))) diff --git a/src/status_im2/contexts/profile/config.cljs b/src/status_im2/contexts/profile/config.cljs index 7a4a6faefe..ddfcbb9618 100644 --- a/src/status_im2/contexts/profile/config.cljs +++ b/src/status_im2/contexts/profile/config.cljs @@ -2,7 +2,7 @@ (:require [status-im2.config :as config] [native-module.core :as native-module] [clojure.string :as string] - [utils.transforms :as types] + [utils.transforms :as transforms] [utils.re-frame :as rf])) (defn login @@ -47,7 +47,7 @@ (rf/defn get-node-config-callback {:events [:profile.config/get-node-config-callback]} [{:keys [db]} node-config-json] - (let [node-config (types/json->clj node-config-json)] + (let [node-config (transforms/json->clj node-config-json)] {:db (assoc-in db [:profile/profile :wakuv2-config] (get node-config :WakuV2Config))})) diff --git a/src/status_im2/contexts/profile/profiles/view.cljs b/src/status_im2/contexts/profile/profiles/view.cljs index ca062fcfea..64275ab83c 100644 --- a/src/status_im2/contexts/profile/profiles/view.cljs +++ b/src/status_im2/contexts/profile/profiles/view.cljs @@ -16,7 +16,7 @@ [utils.i18n :as i18n] [utils.re-frame :as rf] [utils.security.core :as security] - [utils.transforms :as types])) + [utils.transforms :as transforms])) (defonce push-animation-fn-atom (atom nil)) (defonce pop-animation-fn-atom (atom nil)) @@ -77,7 +77,7 @@ (native-module/delete-multiaccount key-uid (fn [result] - (let [{:keys [error]} (types/json->clj result)] + (let [{:keys [error]} (transforms/json->clj result)] (rf/dispatch [:onboarding-2/on-delete-profile-success key-uid]) (log/info "profile deleted: error" error)))))}])