Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Connection status info #6865

Merged
merged 4 commits into from
Nov 29, 2018
Merged

Connection status info #6865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d76fcdb
display mailserver state and peers count under advanced settings on
Nov 14, 2018
e9a7696
add subscription for node/status
Nov 25, 2018
b984d10
generate one message for connectivity incorporating adam b's rationale
Nov 26, 2018
c644600
include styling (just margin really) for connection status text
Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/status_im/ui/screens/desktop/main/tabs/profile/styles.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@
{:margin 24
:font-size 20})

(def connection-message-text
{:margin-left 24
:margin-bottom 10})

(def title-separator
{:height 1
:background-color colors/gray-light})
Expand Down
26 changes: 24 additions & 2 deletions src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,37 @@
[pairing.views/sync-devices]
[pairing.views/installations-list installations]])

(defn connection-status
"generates a composite message of the current connection state given peer and mailserver statuses"
[peers-count node-status mailserver-state peers-disconnected?]
;; TODO probably not ideal criteria for searching
;; ask about directly calling rpc method to find discovery.started
(let [searching? (= :starting node-status)
peers-connected? (not peers-disconnected?)
mailserver-connected? (= :connected mailserver-state)]
(cond
(and peers-connected? searching?) "Connected and searching"
(and peers-connected? (not mailserver-connected?)) (str "Connected with " peers-count " peers")
(and peers-connected? mailserver-connected?) (str "Connected with " peers-count " peers including mailserver.")
(and peers-disconnected? searching?) "Disconnected and searching"
:else "Disconnected")))

(views/defview advanced-settings []
(views/letsubs [installations [:pairing/installations]
current-mailserver-id [:mailserver/current-id]
mailservers [:mailserver/fleet-mailservers]]
(let [render-fn (offline-messaging.views/render-row current-mailserver-id)]
mailservers [:mailserver/fleet-mailservers]
mailserver-state [:mailserver/state]
node-status [:node-status]
peers-count [:peers-count]
disconnected [:disconnected?]]
(let [render-fn (offline-messaging.views/render-row current-mailserver-id)
connection-message (connection-status peers-count node-status mailserver-state disconnected)]
[react/scroll-view
[react/text {:style styles/advanced-settings-title
:font :medium}
(i18n/label :advanced-settings)]
[react/view
[react/text {:style styles/connection-message-text} connection-message]]
[react/view {:style styles/title-separator}]
[react/text {:style styles/mailserver-title} (i18n/label :offline-messaging)]
[react/view
Expand Down
1 change: 1 addition & 0 deletions src/status_im/ui/screens/subs.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
(reg-sub :sync-state :sync-state)
(reg-sub :network-status :network-status)
(reg-sub :peers-count :peers-count)
(reg-sub :node-status :node/status)

(reg-sub :offline?
:<- [:network-status]
Expand Down