chore: delay js transform

status-im · Jan 30, 2024 · 2d88610 · 2d88610
1 parent 8a7836c
commit 2d88610
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 26 deletions.
diff --git a/src/status_im/common/signals/events.cljs b/src/status_im/common/signals/events.cljs
@@ -69,10 +69,7 @@
       "messages.new"               (messages.transport/sanitize-messages-and-process-response cofx
                                                                                               event-js
                                                                                               true)
-      "wallet"                     (rf/dispatch [:wallet/signal-fired
-                                                 (js->clj event-js
-                                                          :keywordize-keys
-                                                          true)])
+      "wallet"                     (rf/dispatch [:wallet/signal-received event-js])
       "local-notifications"        (local-notifications/process cofx
                                                                 (js->clj event-js :keywordize-keys true))
       "community.found"            (link-preview/cache-community-preview-data (js->clj event-js

diff --git a/src/status_im/contexts/wallet/signals.cljs b/src/status_im/contexts/wallet/signals.cljs
@@ -1,7 +1,8 @@
 (ns status-im.contexts.wallet.signals
-  (:require 
-   [taoensso.timbre :as log]
-   [utils.re-frame :as rf]))
+  (:require
+    [oops.core :as oops]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
 
 (rf/reg-event-fx
  :wallet/pending-transaction-status-changed-received
@@ -11,22 +12,35 @@
      {:db (update-in db [:wallet :transactions tx-hash] assoc :status :confirmed :blocks 1)})))
 
 (rf/reg-event-fx
- :wallet/signal-fired
- (fn [_ {:keys [type blockNumber accounts] :as event}]
-   (log/debug "[wallet-subs] new-wallet-event"
-              "event-type"  type
-              "blockNumber" blockNumber
-              "accounts"    accounts)
-   (case type
-     "pending-transaction-status-changed"       {:fx
-                                                 [[:dispatch
-                                                   [:wallet/pending-transaction-status-changed-received
-                                                    event]]]}
-     "wallet-owned-collectibles-filtering-done" {:fx [[:dispatch
-                                                       [:wallet/owned-collectibles-filtering-done
-                                                        event]]]}
-     "wallet-get-collectibles-details-done"     {:fx [[:dispatch
-                                                       [:wallet/get-collectible-details-done
-                                                        event]]]}
-      "wallet-tick-reload"                       {:fx [[:dispatch [:wallet/reload]]]}
-     (log/debug ::unknown-wallet-event :type type :event event))))
+ :wallet/signal-received
+ (fn [_ [event-js]]
+   (let [event-type  (oops/oget event-js "type")
+         blockNumber (oops/oget event-js "blockNumber")
+         accounts    (oops/oget event-js "accounts")]
+     (log/debug "[wallet-subs] New wallet event"
+                {:type         event-type
+                 :block-number blockNumber
+                 :accounts     accounts})
+     (case event-type
+       "pending-transaction-status-changed"       {:fx
+                                                   [[:dispatch
+                                                     [:wallet/pending-transaction-status-changed-received
+                                                      (js->clj event-js
+                                                               :keywordize-keys
+                                                               true)]]]}
+       "wallet-owned-collectibles-filtering-done" {:fx [[:dispatch
+                                                         [:wallet/owned-collectibles-filtering-done
+                                                          (js->clj event-js
+                                                                   :keywordize-keys
+                                                                   true)]]]}
+       "wallet-get-collectibles-details-done"     {:fx [[:dispatch
+                                                         [:wallet/get-collectible-details-done
+                                                          (js->clj event-js
+                                                                   :keywordize-keys
+                                                                   true)]]]}
+       "wallet-tick-reload"                       {:fx [[:dispatch [:wallet/reload]]]}
+       (log/debug ::unknown-wallet-event
+                  :type  type
+                  :event (js->clj event-js
+                                  :keywordize-keys
+                                  true))))))