[#3558] Show the revision of status-go in the version label
This commit is contained in:
parent
90a508b64f
commit
e2d44a3589
|
@ -57,6 +57,7 @@
|
||||||
(spec/def ::rpc-url (spec/nilable string?))
|
(spec/def ::rpc-url (spec/nilable string?))
|
||||||
;;object? doesn't work
|
;;object? doesn't work
|
||||||
(spec/def ::web3 (spec/nilable any?))
|
(spec/def ::web3 (spec/nilable any?))
|
||||||
|
(spec/def ::web3-node-version (spec/nilable string?))
|
||||||
;;object?
|
;;object?
|
||||||
(spec/def ::webview-bridge (spec/nilable any?))
|
(spec/def ::webview-bridge (spec/nilable any?))
|
||||||
(spec/def ::status-module-initialized? (spec/nilable boolean?))
|
(spec/def ::status-module-initialized? (spec/nilable boolean?))
|
||||||
|
@ -186,6 +187,7 @@
|
||||||
::was-modal?
|
::was-modal?
|
||||||
::rpc-url
|
::rpc-url
|
||||||
::web3
|
::web3
|
||||||
|
::web3-node-version
|
||||||
::webview-bridge
|
::webview-bridge
|
||||||
::status-module-initialized?
|
::status-module-initialized?
|
||||||
::status-node-started?
|
::status-node-started?
|
||||||
|
|
|
@ -302,6 +302,7 @@
|
||||||
(fn [_ [_ address events-after]]
|
(fn [_ [_ address events-after]]
|
||||||
{:dispatch-n (cond-> [[:initialize-account-db address]
|
{:dispatch-n (cond-> [[:initialize-account-db address]
|
||||||
[:initialize-protocol address]
|
[:initialize-protocol address]
|
||||||
|
[:fetch-web3-node-version]
|
||||||
[:initialize-sync-listener]
|
[:initialize-sync-listener]
|
||||||
[:load-contacts]
|
[:load-contacts]
|
||||||
[:load-contact-groups]
|
[:load-contact-groups]
|
||||||
|
@ -340,6 +341,20 @@
|
||||||
(get-in default-networks [default-network :config]))]
|
(get-in default-networks [default-network :config]))]
|
||||||
{:initialize-geth-fx network-config})))
|
{:initialize-geth-fx network-config})))
|
||||||
|
|
||||||
|
(handlers/register-handler-fx
|
||||||
|
:fetch-web3-node-version-callback
|
||||||
|
(fn [{:keys [db]} [_ resp]]
|
||||||
|
(when-let [git-commit (nth (re-find #"-([0-9a-f]{7,})/" resp) 1)]
|
||||||
|
{:db (assoc db :web3-node-version git-commit)})))
|
||||||
|
|
||||||
|
(handlers/register-handler-fx
|
||||||
|
:fetch-web3-node-version
|
||||||
|
(fn [{{:keys [web3] :as db} :db} _]
|
||||||
|
(.. web3 -version (getNode (fn [err resp]
|
||||||
|
(when-not err
|
||||||
|
(re-frame/dispatch [:fetch-web3-node-version-callback resp])))))
|
||||||
|
nil))
|
||||||
|
|
||||||
(handlers/register-handler-fx
|
(handlers/register-handler-fx
|
||||||
:webview-geo-permissions-granted
|
:webview-geo-permissions-granted
|
||||||
(fn [{{:keys [webview-bridge]} :db} _]
|
(fn [{{:keys [webview-bridge]} :db} _]
|
||||||
|
|
|
@ -1,9 +1,15 @@
|
||||||
(ns status-im.ui.screens.profile.subs
|
(ns status-im.ui.screens.profile.subs
|
||||||
(:require [re-frame.core :refer [reg-sub]]
|
(:require [re-frame.core :refer [reg-sub]]
|
||||||
[clojure.string :as string]))
|
[clojure.string :as string]
|
||||||
|
[status-im.utils.build :as build]))
|
||||||
|
|
||||||
(reg-sub
|
(reg-sub
|
||||||
:get-profile-unread-messages-number
|
:get-profile-unread-messages-number
|
||||||
:<- [:get-current-account]
|
:<- [:get-current-account]
|
||||||
(fn [{:keys [seed-backed-up? mnemonic]}]
|
(fn [{:keys [seed-backed-up? mnemonic]}]
|
||||||
(if (or seed-backed-up? (string/blank? mnemonic)) 0 1)))
|
(if (or seed-backed-up? (string/blank? mnemonic)) 0 1)))
|
||||||
|
|
||||||
|
(reg-sub
|
||||||
|
:get-app-version
|
||||||
|
(fn [{:keys [web3-node-version]}]
|
||||||
|
(str build/version " (" (or web3-node-version "N/A") ")")))
|
|
@ -123,7 +123,7 @@
|
||||||
:hide-arrow? true
|
:hide-arrow? true
|
||||||
:action-fn #(handle-logout)}]]
|
:action-fn #(handle-logout)}]]
|
||||||
[react/view styles/my-profile-settings-logout-version
|
[react/view styles/my-profile-settings-logout-version
|
||||||
[react/text build/version]]]]))
|
[react/text @(re-frame/subscribe [:get-app-version])]]]]))
|
||||||
|
|
||||||
(defview advanced [{:keys [network networks dev-mode?]}]
|
(defview advanced [{:keys [network networks dev-mode?]}]
|
||||||
(letsubs [advanced? [:get :my-profile/advanced?]
|
(letsubs [advanced? [:get :my-profile/advanced?]
|
||||||
|
|
Loading…
Reference in New Issue