From e8e78bdec173eae20138b5ba1be5d244416f2457 Mon Sep 17 00:00:00 2001 From: yenda Date: Sat, 14 Sep 2019 15:39:35 +0200 Subject: [PATCH] require handlers in cljs ns for macroexpension --- src/status_im/network/net_info.cljs | 1 - src/status_im/node/core.cljs | 1 - src/status_im/signing/core.cljs | 4 +--- src/status_im/signing/keycard.cljs | 1 - src/status_im/utils/fx.cljs | 3 ++- src/status_im/wallet/choose_recipient/core.cljs | 5 ++--- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/status_im/network/net_info.cljs b/src/status_im/network/net_info.cljs index eb07b65222..950c1b8b8c 100644 --- a/src/status_im/network/net_info.cljs +++ b/src/status_im/network/net_info.cljs @@ -5,7 +5,6 @@ [re-frame.core :as re-frame] [status-im.utils.fx :as fx] [status-im.mailserver.core :as mailserver] - [status-im.utils.handlers :as handlers] [status-im.chaos-mode.core :as chaos-mode] [status-im.native-module.core :as status] [status-im.ui.screens.mobile-network-settings.events :as mobile-network])) diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs index 49c322cd6c..e1195a4212 100644 --- a/src/status_im/node/core.cljs +++ b/src/status_im/node/core.cljs @@ -6,7 +6,6 @@ [status-im.native-module.core :as status] [status-im.utils.config :as config] [status-im.utils.fx :as fx] - [status-im.utils.handlers :as utils.handlers] [status-im.utils.platform :as utils.platform] [status-im.utils.types :as types] [status-im.utils.utils :as utils])) diff --git a/src/status_im/signing/core.cljs b/src/status_im/signing/core.cljs index da84838a54..618c580af9 100644 --- a/src/status_im/signing/core.cljs +++ b/src/status_im/signing/core.cljs @@ -13,9 +13,7 @@ [status-im.utils.money :as money] [status-im.utils.security :as security] [status-im.utils.types :as types] - [status-im.utils.utils :as utils] - ;;don't remove, used in fx macro - [status-im.utils.handlers :as handlers])) + [status-im.utils.utils :as utils])) (re-frame/reg-fx :signing/send-transaction-fx diff --git a/src/status_im/signing/keycard.cljs b/src/status_im/signing/keycard.cljs index b73a7ee312..34ad3b5222 100644 --- a/src/status_im/signing/keycard.cljs +++ b/src/status_im/signing/keycard.cljs @@ -3,7 +3,6 @@ [status-im.utils.fx :as fx] [status-im.native-module.core :as status] [status-im.utils.types :as types] - [status-im.utils.handlers :as utils.handlers] [status-im.ethereum.abi-spec :as abi-spec] [status-im.ethereum.core :as ethereum])) diff --git a/src/status_im/utils/fx.cljs b/src/status_im/utils/fx.cljs index 78ce56f185..34719c777a 100644 --- a/src/status_im/utils/fx.cljs +++ b/src/status_im/utils/fx.cljs @@ -2,7 +2,8 @@ (:require-macros status-im.utils.fx) (:require [clojure.set :as set] [status-im.ethereum.json-rpc :as json-rpc] - [taoensso.timbre :as log]) + [taoensso.timbre :as log] + status-im.utils.handlers) (:refer-clojure :exclude [merge])) (defn- update-db [cofx fx] diff --git a/src/status_im/wallet/choose_recipient/core.cljs b/src/status_im/wallet/choose_recipient/core.cljs index 7f8fd94a51..a3ce4d5916 100644 --- a/src/status_im/wallet/choose_recipient/core.cljs +++ b/src/status_im/wallet/choose_recipient/core.cljs @@ -8,8 +8,7 @@ [status-im.ethereum.ens :as ens] [status-im.i18n :as i18n] [status-im.utils.money :as money] - [status-im.utils.fx :as fx] - [status-im.utils.handlers :as handlers])) + [status-im.utils.fx :as fx])) (fx/defn toggle-flashlight {:events [:wallet/toggle-flashlight]} @@ -120,4 +119,4 @@ {:events [:wallet/fill-request-from-contact]} [{db :db} {:keys [address name public-key]} request?] {:db (fill-request-details db {:address address :name name :public-key public-key} request?) - :dispatch [:navigate-back]}) \ No newline at end of file + :dispatch [:navigate-back]})