fix: fx merge error on ::json-rpc/call (#14594)
This commit is contained in:
parent
388e5fae22
commit
69c90c25ab
|
@ -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]
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue