[#17383] migrate status-im.utils.types (#17389)

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]

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"

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]

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]

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]))
 

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

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]))
 

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

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]))
 

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

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]))

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

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]))
 

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

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

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

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

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]))

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]))
 

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]))
 

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]

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]

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

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]

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]))
 

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]))

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]))
 

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]))
 

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"))
 

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]

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]))
 

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

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])
+  (let [input (get-in db [:contacts/new-identity :input])]
-        resubmit? (and input (= :new-contact (get-in db [:view-id])))]
     (rf/dispatch [:contacts/set-new-identity input])))

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

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")

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)))))))

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))}))

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)))))}])