Use promise resolve value instead of global var
This commit is contained in:
parent
3210411a4c
commit
0dd2ecbf7a
|
@ -3,17 +3,12 @@
|
|||
|
||||
(def dapp-store? (re-find #"#dapp-store" (-> js/window .-location .-href)))
|
||||
|
||||
(def web3 (or dapp-store? (when (exists? js/web3) js/web3)
|
||||
#_(when (exists? js/ethereumBeta)
|
||||
(js/setTimeout (fn []
|
||||
(.then (.send js/ethereumBeta "eth_requestAccounts") #(re-frame/dispatch [:set-default-account]))
|
||||
(when js/ethereumBeta
|
||||
(.then (.getContactCode js/ethereumBeta.status) #(re-frame/dispatch [:on-status-api :contact %]))))
|
||||
100)
|
||||
(js/Web3. js/ethereumBeta))
|
||||
(def web3 (or dapp-store? (when (exists? js/web3)
|
||||
js/web3)
|
||||
(when (exists? js/ethereum)
|
||||
(js/setTimeout (fn []
|
||||
(.then (.enable js/ethereum) #(re-frame/dispatch [:set-default-account]))
|
||||
(.then (.enable js/ethereum)
|
||||
#(re-frame/dispatch [:set-default-account (first %1)]))
|
||||
(when js/ethereum.status
|
||||
(.then (.getContactCode js/ethereum.status) #(re-frame/dispatch [:on-status-api :contact %]))))
|
||||
100)
|
||||
|
@ -213,4 +208,4 @@
|
|||
:dapp-store {:dapps all}
|
||||
:message "Test message"
|
||||
:message-json "{\"types\":{\"EIP712Domain\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"version\",\"type\":\"string\"},{\"name\":\"chainId\",\"type\":\"uint256\"},{\"name\":\"verifyingContract\",\"type\":\"address\"}],\"Person\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"wallet\",\"type\":\"address\"}],\"Mail\":[{\"name\":\"from\",\"type\":\"Person\"},{\"name\":\"to\",\"type\":\"Person\"},{\"name\":\"contents\",\"type\":\"string\"}]},\"primaryType\":\"Mail\",\"domain\":{\"name\":\"Ether Mail\",\"version\":\"1\",\"chainId\":3,\"verifyingContract\":\"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC\"},\"message\":{\"from\":{\"name\":\"Cow\",\"wallet\":\"0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826\"},\"to\":{\"name\":\"Bob\",\"wallet\":\"0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB\"},\"contents\":\"Hello, Bob!\"}}"
|
||||
:tab-view :accounts})
|
||||
:tab-view :accounts})
|
||||
|
|
|
@ -292,6 +292,6 @@
|
|||
|
||||
(re-frame/reg-event-fx
|
||||
:set-default-account
|
||||
(fn [{db :db} _]
|
||||
(set! (.-defaultAccount (.-eth (:web3 db))) js/currentAccountAddress)
|
||||
{:dispatch [:request-web3-async-data]}))
|
||||
(fn [{db :db} [_ current-account-address]]
|
||||
(set! (.-defaultAccount (.-eth (:web3 db))) current-account-address)
|
||||
{:dispatch [:request-web3-async-data]}))
|
||||
|
|
Loading…
Reference in New Issue