From 69c90c25abbf94671d76dea2a20f3d7ad30808ec Mon Sep 17 00:00:00 2001 From: yqrashawn Date: Wed, 21 Dec 2022 16:43:38 +0800 Subject: [PATCH] fix: fx merge error on ::json-rpc/call (#14594) --- src/status_im/utils/fx.cljs | 4 +++- src/status_im2/setup/dev.cljs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/status_im/utils/fx.cljs b/src/status_im/utils/fx.cljs index f8593f38fa..22258c193f 100644 --- a/src/status_im/utils/fx.cljs +++ b/src/status_im/utils/fx.cljs @@ -2,6 +2,7 @@ (:require-macros status-im.utils.fx) (:require [status-im.ethereum.json-rpc :as json-rpc] [status-im.utils.handlers :as handlers] + [status-im2.common.json-rpc.events :as json-rpc-status-im2] [taoensso.timbre :as log]) (:refer-clojure :exclude [merge reduce])) @@ -21,7 +22,8 @@ :transport/confirm-messages-processed :group-chats/extract-membership-signature :utils/dispatch-later - ::json-rpc/call}) + ::json-rpc/call + ::json-rpc-status-im2/call}) (defn- safe-merge [fx new-fx] diff --git a/src/status_im2/setup/dev.cljs b/src/status_im2/setup/dev.cljs index 8f22075e14..8695eb3c18 100644 --- a/src/status_im2/setup/dev.cljs +++ b/src/status_im2/setup/dev.cljs @@ -2,6 +2,7 @@ (:require ["react-native" :refer (DevSettings LogBox)] [react-native.platform :as platform] [status-im.ethereum.json-rpc :as json-rpc] + [status-im2.common.json-rpc.events :as json-rpc-status-im2] [utils.re-frame :as rf])) ;; Ignore all logs, because there are lots of temporary warnings when developing and hot reloading @@ -43,7 +44,8 @@ :transport/confirm-messages-processed :group-chats/extract-membership-signature :utils/dispatch-later - ::json-rpc/call}) + ::json-rpc/call + ::json-rpc-status-im2/call}) (when (and js/goog.DEBUG platform/ios? DevSettings) ;;on Android this method doesn't work