status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fx merge error on ::json-rpc/call (#14594)

This commit is contained in:
yqrashawn 2022-12-21 16:43:38 +08:00 committed by GitHub
parent 388e5fae22
commit 69c90c25ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/utils/fx.cljs
View File

@ -2,6 +2,7 @@
(:require-macros status-im.utils.fx) (:require-macros status-im.utils.fx)
(:require [status-im.ethereum.json-rpc :as json-rpc] (:require [status-im.ethereum.json-rpc :as json-rpc]
[status-im.utils.handlers :as handlers] [status-im.utils.handlers :as handlers]
[status-im2.common.json-rpc.events :as json-rpc-status-im2]
[taoensso.timbre :as log]) [taoensso.timbre :as log])
(:refer-clojure :exclude [merge reduce])) (:refer-clojure :exclude [merge reduce]))
@ -21,7 +22,8 @@
:transport/confirm-messages-processed :transport/confirm-messages-processed
:group-chats/extract-membership-signature :group-chats/extract-membership-signature
:utils/dispatch-later :utils/dispatch-later
::json-rpc/call}) ::json-rpc/call
::json-rpc-status-im2/call})
(defn- safe-merge (defn- safe-merge
[fx new-fx] [fx new-fx]

4
src/status_im2/setup/dev.cljs
View File

@ -2,6 +2,7 @@
(:require ["react-native" :refer (DevSettings LogBox)] (:require ["react-native" :refer (DevSettings LogBox)]
[react-native.platform :as platform] [react-native.platform :as platform]
[status-im.ethereum.json-rpc :as json-rpc] [status-im.ethereum.json-rpc :as json-rpc]
[status-im2.common.json-rpc.events :as json-rpc-status-im2]
[utils.re-frame :as rf])) [utils.re-frame :as rf]))
;; Ignore all logs, because there are lots of temporary warnings when developing and hot reloading ;; Ignore all logs, because there are lots of temporary warnings when developing and hot reloading
@ -43,7 +44,8 @@
:transport/confirm-messages-processed :transport/confirm-messages-processed
:group-chats/extract-membership-signature :group-chats/extract-membership-signature
:utils/dispatch-later :utils/dispatch-later
::json-rpc/call}) ::json-rpc/call
::json-rpc-status-im2/call})
(when (and js/goog.DEBUG platform/ios? DevSettings) (when (and js/goog.DEBUG platform/ios? DevSettings)
;;on Android this method doesn't work ;;on Android this method doesn't work