Fix postMessage/onMessage handling

status-im · Mar 17, 2020 · 25fe775 · 25fe775
1 parent d3d59d6
commit 25fe775
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs
@@ -420,11 +420,10 @@
  :browser/send-to-bridge
  (fn [{:keys [message webview]}]
    (when (and message webview)
-     (.injectJavaScript webview
-                        (str "(function() {"
-                             "window.ReactNativeWebView.onMessage(\""
-                             (types/clj->json message)
-                             "\")})")))))
+     (let [msg (str "ReactNativeWebView.onMessage('"
+                    (types/clj->json message)
+                    "');")]
+       (.injectJavaScript webview msg)))))
 
 (re-frame/reg-fx
  :browser/call-rpc

diff --git a/src/status_im/ui/screens/browser/views.cljs b/src/status_im/ui/screens/browser/views.cljs
@@ -133,7 +133,9 @@
                                                        (debounce/debounce-and-dispatch
                                                         [:browser/navigation-state-changed % error?]
                                                         500))
-        :on-message                                 #(re-frame/dispatch [:browser/bridge-message-received %])
+                                                    ;; Extract event data here due to 
+                                                    ;; https://reactjs.org/docs/events.html#event-pooling
+        :on-message                                 #(re-frame/dispatch [:browser/bridge-message-received (.. % -nativeEvent -data)])
         :on-load                                    #(re-frame/dispatch [:browser/loading-started])
         :on-error                                   #(re-frame/dispatch [:browser/error-occured])
         :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))