Skip to content

improvement on snackbar by considering login time #9941

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

Merged
merged 1 commit into from
Feb 17, 2020
Merged

improvement on snackbar by considering login time #9941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/status_im/multiaccounts/login/core.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
(boolean (get-in cofx [:db :hardwallet :flow])))

(fx/defn multiaccount-login-success
[{:keys [db] :as cofx}]
[{:keys [db now] :as cofx}]
(let [{:keys [key-uid password save-password? creating?]} (:multiaccounts/login db)
recovering? (get-in db [:intro-wizard :recovering?])
login-only? (not (or creating?
Expand All @@ -294,12 +294,13 @@
"recovering?" recovering?)
(fx/merge cofx
{:db (-> db
(dissoc :multiaccounts/login)
(dissoc :multiaccounts/login :connectivity/ui-status-properties)
(update :hardwallet dissoc
:on-card-read
:card-read-in-progress?
:pin
:multiaccount))
:multiaccount)
(assoc :logged-in-since now))
::json-rpc/call
[{:method "web3_clientVersion"
:on-success #(re-frame/dispatch [::initialize-web3-client-version %])}]}
Expand Down
8 changes: 5 additions & 3 deletions src/status_im/subs.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
(reg-root-key-sub :supported-biometric-auth :supported-biometric-auth)
(reg-root-key-sub :app-active-since :app-active-since)
(reg-root-key-sub :connectivity/ui-status-properties :connectivity/ui-status-properties)
(reg-root-key-sub :logged-in-since :logged-in-since)

;;NOTE this one is not related to ethereum network
;; it is about cellular network/ wifi network
Expand Down Expand Up @@ -1574,11 +1575,12 @@
disconnected?
:t/offline

:else nil)]
:else nil)
connected? (and (nil? error-label) (not= :mobile-network error-label))]
{:message (or error-label :t/connected)
:connected? (and (nil? error-label) (not= :mobile-network error-label))
:connected? connected?
:connecting? (= error-label :t/connecting)
:loading-indicator? mailserver-fetching?
:loading-indicator? (and mailserver-fetching? connected?)
:on-press-event (cond
mailserver-connection-error?
:mailserver.ui/reconnect-mailserver-pressed
Expand Down
80 changes: 36 additions & 44 deletions src/status_im/ui/components/connectivity/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,19 @@
[status-im.ui.components.animation :as animation]
[status-im.utils.utils :as utils]
[status-im.utils.datetime :as datetime]
[status-im.utils.platform :as platform]))
[status-im.utils.platform :as platform]
[taoensso.timbre :as log]))

(def connectivity-bar-height 36)
(def neg-connectivity-bar-height (- connectivity-bar-height))

;; ui-connectivity-status delays
(def standard-delay 1000)
(def long-delay 5000)

;; millisec window from foreground\login within which use long delay
(def timewindow-for-long-delay 5000)

(defn easing [direction n]
{:toValue n
:easing ((if (= :in direction)
Expand Down Expand Up @@ -175,50 +183,32 @@ all connectivity views (we have at least one view in home and one in chat)"
(defn propagate-status
"Smoothly propagate from :connectivity/status-properties subscription to
:ui-status-properties db. UI components will render based on :ui-status-properties"
[{:keys [status-properties app-active-since ui-status-properties]}]
(let [;; enqueued or immediate?
;; send immediately if we are transitioning to an offline state
enqueue? (cond
(and
(or
(nil? @enqueued-connectivity-status-properties)
(:connected? @enqueued-connectivity-status-properties)
(:connecting? @enqueued-connectivity-status-properties))
(not
(or (:connected? status-properties)
(:connecting? status-properties))))
false

:else
true)]
(if enqueue?
(when (or (and (nil? @enqueued-connectivity-status-properties)
(not= status-properties ui-status-properties))
(and (some? @enqueued-connectivity-status-properties)
(not= status-properties @enqueued-connectivity-status-properties)))
;; reset queued with new state and start a timer if not yet started
(reset! enqueued-connectivity-status-properties status-properties)
(when-not @timer
(reset! timer (utils/set-timeout #(do
(reset! timer nil)
(when @enqueued-connectivity-status-properties
(re-frame/dispatch [:set :connectivity/ui-status-properties @enqueued-connectivity-status-properties])
(reset! enqueued-connectivity-status-properties nil)))
[{:keys [status-properties app-active-since logged-in-since ui-status-properties]}]
(when (or (and (nil? @enqueued-connectivity-status-properties)
(not= status-properties ui-status-properties))
(and (some? @enqueued-connectivity-status-properties)
(not= status-properties @enqueued-connectivity-status-properties)))
;; reset queued with new state and start a timer if not yet started
(reset! enqueued-connectivity-status-properties status-properties)
(when-not @timer
(reset! timer (utils/set-timeout #(do
(reset! timer nil)
(when @enqueued-connectivity-status-properties
(re-frame/dispatch [:set :connectivity/ui-status-properties @enqueued-connectivity-status-properties])
(reset! enqueued-connectivity-status-properties nil)))

;; if the app is in foreground for less than 5s, postpone state changes for 5s otherwise 1s
(if
(and app-active-since
(< (- (datetime/timestamp) app-active-since)
5000))
5000
1000)))))
(when (not= status-properties ui-status-properties)
;; send immediately
(reset! enqueued-connectivity-status-properties nil)
(re-frame/dispatch [:set :connectivity/ui-status-properties status-properties])
(when @timer
(utils/clear-timeout @timer)
(reset! timer nil))))))
;; timeout choice:
;; if the app is in foreground or logged-in for less than <timeframe>,
;; postpone state changes for <long> otherwise <short>
(let [ts (max
(or logged-in-since 0)
(or app-active-since 0))
ts-diff (- (datetime/timestamp) ts)
timeout (if (< ts-diff timewindow-for-long-delay)
long-delay
standard-delay)]
(log/debug "propagate-status set-timeout: " logged-in-since app-active-since ts-diff timeout)
timeout))))))

(defn status-propagator-dummy-view
"this empty view is needed to react propagate status-properties to ui-status-properties"
Expand All @@ -236,6 +226,7 @@ all connectivity views (we have at least one view in home and one in chat)"
(defview connectivity-view [anim-translate-y]
(letsubs [status-properties [:connectivity/status-properties]
app-active-since [:app-active-since]
logged-in-since [:logged-in-since]
ui-status-properties [:connectivity/ui-status-properties]
status-hidden (reagent/atom true)
view-id [:view-id]
Expand Down Expand Up @@ -267,6 +258,7 @@ all connectivity views (we have at least one view in home and one in chat)"
status-hidden]
[status-propagator-dummy-view {:status-properties status-properties
:app-active-since app-active-since
:logged-in-since logged-in-since
:ui-status-properties ui-status-properties}]])))

;; "push?" determines whether "content" gets pushed down when disconnected
Expand Down
2 changes: 2 additions & 0 deletions src/status_im/ui/screens/db.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
(spec/def ::app-state string?)
(spec/def ::app-in-background-since (spec/nilable number?))
(spec/def ::app-active-since (spec/nilable number?))
(spec/def ::logged-in-since (spec/nilable number?))

;;;;NODE

Expand Down Expand Up @@ -276,6 +277,7 @@
::app-state
::app-in-background-since
::app-active-since
::logged-in-since
::hardwallet
::auth-method
:multiaccount/multiaccount
Expand Down