From d962fae9eb60a3acad0e73c5555877a8f23ec194 Mon Sep 17 00:00:00 2001 From: Julien Eluard Date: Wed, 17 Oct 2018 11:59:08 +0200 Subject: [PATCH] Fixed ignored event argument during env replacement --- src/pluto/js.cljs | 3 +-- src/pluto/reader/types.cljc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pluto/js.cljs b/src/pluto/js.cljs index 7864e1e..a7fb987 100644 --- a/src/pluto/js.cljs +++ b/src/pluto/js.cljs @@ -19,7 +19,7 @@ 'text {:value component} 'view {:value component} 'token-selector {:value component} 'asset-selector {:value component} 'transaction-status {:value component :properties {:outgoing :string :tx-hash :string}} 'nft-token-viewer {:value component :properties {:token :string}}} - :queries {'get-collectible-token {:value :get-collectible-token :arguments {:token :string :symbol :string}} + :queries {'wallet/collectibles {:value :get-collectible-token :arguments {:token :string :symbol :string}} 'store/get {:value :store/get :arguments {:key :string}}} :events {'alert {:permissions [:read] @@ -75,7 +75,6 @@ :value? :string :data? :string :block :string}} - 'ethereum/logs {:arguments {:from? :string diff --git a/src/pluto/reader/types.cljc b/src/pluto/reader/types.cljc index 0c4f2b6..15651f3 100644 --- a/src/pluto/reader/types.cljc +++ b/src/pluto/reader/types.cljc @@ -97,7 +97,7 @@ (defn event-after-env [ref data args bindings] (fn [o env] - (let [env (merge env (:data (destructuring/destructure bindings args))) + (let [env (merge env (reduce-kv #(assoc %1 (symbol (name %2)) %3) {} o) (:data (destructuring/destructure bindings args))) dic (reduce-kv #(assoc %1 %2 (if (contains? env %3) (get env %3) %3)) {} env)] [ref (merge o (reduce-kv #(assoc %1 %2 (replace-atom dic %3)) {} data))])))