status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed browser navigation, changed "<" on "x", do not updated dapp url

This commit is contained in:
Andrey Shovkoplyas 2018-05-16 12:06:34 +03:00 committed by Roman Volosovskyi
parent d304063cda
commit 7cb17511e9
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/status_im/ui/screens/browser/views.cljs
View File

@ -14,7 +14,8 @@
[status-im.ui.components.chat-icon.screen :as chat-icon.screen] [status-im.ui.components.chat-icon.screen :as chat-icon.screen]
[status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.i18n :as i18n] [status-im.i18n :as i18n]
[status-im.utils.ethereum.core :as ethereum])) [status-im.utils.ethereum.core :as ethereum]
[status-im.ui.components.toolbar.actions :as actions]))
(views/defview toolbar-content-dapp [contact-identity] (views/defview toolbar-content-dapp [contact-identity]
(views/letsubs [contact [:get-contact-by-identity contact-identity]] (views/letsubs [contact [:get-contact-by-identity contact-identity]]
@ -67,7 +68,7 @@
(defn on-navigation-change [event browser] (defn on-navigation-change [event browser]
(let [{:strs [url canGoBack canGoForward]} (js->clj event)] (let [{:strs [url canGoBack canGoForward]} (js->clj event)]
(when-not (= "about:blank" url) (when (and (not (:dapp? browser)) (not= "about:blank" url))
(re-frame/dispatch [:update-browser (assoc browser :url url)])) (re-frame/dispatch [:update-browser (assoc browser :url url)]))
(re-frame/dispatch [:update-browser-options {:can-go-back? canGoBack :can-go-forward? canGoForward}]))) (re-frame/dispatch [:update-browser-options {:can-go-back? canGoBack :can-go-forward? canGoForward}])))
@ -86,7 +87,7 @@
[react/keyboard-avoiding-view styles/browser [react/keyboard-avoiding-view styles/browser
[status-bar/status-bar] [status-bar/status-bar]
[toolbar.view/toolbar {} [toolbar.view/toolbar {}
(toolbar.view/nav-back-count) [toolbar.view/nav-button-with-count actions/default-close]
(if dapp? (if dapp?
[toolbar-content-dapp contact] [toolbar-content-dapp contact]
[toolbar-content browser])] [toolbar-content browser])]