From 174aac90c088e790452feb754a150514673f41f5 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Wed, 25 Apr 2018 15:41:17 +0300 Subject: [PATCH] [#3935] set web3.eth.defaultAccount Signed-off-by: Andrey Shovkoplyas --- resources/js/web3_init.js | 1 + src/status_im/ui/screens/browser/views.cljs | 3 ++- src/status_im/utils/js_resources.cljs | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/js/web3_init.js b/resources/js/web3_init.js index 536cd0e4db..74a01b18f4 100644 --- a/resources/js/web3_init.js +++ b/resources/js/web3_init.js @@ -114,5 +114,6 @@ if (typeof web3 === "undefined") { if (protocol == "https:" || protocol == "http:") { console.log("StatusHttpProvider"); web3 = new Web3(new StatusHttpProvider(address)); + web3.eth.defaultAccount = currentAccountAddress; } } diff --git a/src/status_im/ui/screens/browser/views.cljs b/src/status_im/ui/screens/browser/views.cljs index a9d8f7a4e4..12b13890fb 100644 --- a/src/status_im/ui/screens/browser/views.cljs +++ b/src/status_im/ui/screens/browser/views.cljs @@ -71,6 +71,7 @@ (views/defview browser [] (views/letsubs [webview (atom nil) + {:keys [address]} [:get-current-account] {:keys [dapp? contact url] :as browser} [:get-current-browser] {:keys [can-go-back? can-go-forward?]} [:get :browser/options] extra-js [:web-view-extra-js] @@ -97,7 +98,7 @@ :injected-on-start-loading-java-script (str js-res/web3 js-res/jquery (get-inject-js url) - (js-res/web3-init rpc-url)) + (js-res/web3-init rpc-url address)) :injected-java-script (str js-res/webview-js extra-js)}] [react/view styles/background [react/text (i18n/label :t/enter-dapp-url)]]) diff --git a/src/status_im/utils/js_resources.cljs b/src/status_im/utils/js_resources.cljs index 75aee5b951..51ef59b723 100644 --- a/src/status_im/utils/js_resources.cljs +++ b/src/status_im/utils/js_resources.cljs @@ -37,8 +37,9 @@ (def web3 (str "; if (typeof Web3 == 'undefined') {" (slurp "node_modules/web3/dist/web3.min.js") "}")) -(defn web3-init [provider-address] +(defn web3-init [provider-address current-account-address] (str "var providerAddress = \"" provider-address "\";" + "var currentAccountAddress = \"" current-account-address "\";" (slurp "resources/js/web3_init.js"))) (defn local-storage-data [data]