status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-25 09:05:55 +00:00
Code Issues Projects Releases Wiki Activity

[fix 5688] fix calculating node version

Browse Source 
Signed-off-by: Adam Babik <a.babik@designfortress.com>
This commit is contained in:
Eric Dvorsak 2018-08-29 14:32:42 +02:00 committed by Adam Babik
parent e9399167f6
commit 1fff9d7c19
No known key found for this signature in database
GPG Key ID: ED02515A1FC0D1B4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/init/core.cljs
View File

@ -160,7 +160,9 @@
(defn initialize-account [address {:keys [web3] :as cofx}] (defn initialize-account [address {:keys [web3] :as cofx}]
(handlers-macro/merge-fx cofx (handlers-macro/merge-fx cofx
{:web3/set-default-account [web3 address] {:web3/set-default-account [web3 address]
:web3/fetch-node-version web3 :web3/fetch-node-version [web3
#(re-frame/dispatch
[:web3/fetch-node-version-callback %])]
:notifications/get-fcm-token nil} :notifications/get-fcm-token nil}
(initialize-account-db address) (initialize-account-db address)
(models.protocol/initialize-protocol address) (models.protocol/initialize-protocol address)

8
src/status_im/web3/core.cljs
View File

@ -39,15 +39,15 @@
(ethereum/normalized-address address))) (ethereum/normalized-address address)))
(defn fetch-node-version (defn fetch-node-version
[web3] [web3 cb]
(.. web3 (.. web3
-version -version
(getNode (getNode
(fn [err resp] (fn [err resp]
(when-not err (when-not err
(re-frame/dispatch [:web3/fetch-node-version-callback resp])))))) (cb resp))))))
(defn fetch-node-version-callback (defn fetch-node-version-callback
[resp {:keys [db]}] [resp {:keys [db]}]
(when-let [git-commit (nth (re-find #"-([0-9a-f]{7,})/" resp) 1)] (when-let [node-version (second (re-find #"StatusIM/v(.*)/.*/.*" resp))]
{:db (assoc db :web3-node-version git-commit)})) {:db (assoc db :web3-node-version node-version)}))

3
src/status_im/web3/events.cljs
View File

@ -20,7 +20,8 @@
(re-frame/reg-fx (re-frame/reg-fx
:web3/fetch-node-version :web3/fetch-node-version
web3/fetch-node-version) (fn [[web3 cb]]
(web3/fetch-node-version web3 cb)))
;;;; Events ;;;; Events
(handlers/register-handler-fx (handlers/register-handler-fx