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

Fix connectivity error view overlay

This commit is contained in:
Vitaliy Vlasov 2018-08-29 17:13:27 +03:00
parent 7bde1ef1f9
commit 08e092c824
No known key found for this signature in database
GPG Key ID: A7D57C347F2B2964
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/status_im/ui/screens/desktop/main/chat/views.cljs
View File

@ -47,6 +47,12 @@
public? public?
[react/text {:style styles/public-chat-text} [react/text {:style styles/public-chat-text}
(i18n/label :t/public-chat)])]] (i18n/label :t/public-chat)])]]
#_[react/view
[react/popup-menu
[react/popup-menu-trigger {:text "Popup"}]
[react/popup-menu-options
[react/popup-menu-option {:text "First"}]
[react/popup-menu-option {:text "Second"}]]]]
[react/view [react/view
(when (and (not group-chat) (not public?)) (when (and (not group-chat) (not public?))
[react/text {:style (styles/profile-actions-text colors/black) [react/text {:style (styles/profile-actions-text colors/black)
@ -153,7 +159,6 @@
(reset! chat-id* chat-id) (reset! chat-id* chat-id)
(js/setTimeout #(when @scroll-ref (.scrollToEnd @scroll-ref)) 400))] (js/setTimeout #(when @scroll-ref (.scrollToEnd @scroll-ref)) 400))]
[react/view {:style styles/messages-view} [react/view {:style styles/messages-view}
[connectivity/error-view]
[react/scroll-view {:scrollEventThrottle 16 [react/scroll-view {:scrollEventThrottle 16
:headerHeight styles/messages-list-vertical-padding :headerHeight styles/messages-list-vertical-padding
:footerWidth styles/messages-list-vertical-padding :footerWidth styles/messages-list-vertical-padding
@ -173,7 +178,8 @@
^{:key message-obj} ^{:key message-obj}
[message content (= from current-public-key) [message content (= from current-public-key)
(assoc message-obj :group-chat group-chat (assoc message-obj :group-chat group-chat
:current-public-key current-public-key)]))]]]))) :current-public-key current-public-key)]))]]
[connectivity/error-view]])))
(views/defview chat-text-input [] (views/defview chat-text-input []
(views/letsubs [inp-ref (atom nil)] (views/letsubs [inp-ref (atom nil)]