status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-26 09:35:36 +00:00
Code Issues Projects Releases Wiki Activity

Add new UI for mailserver selection, Add feature to disable mailserver usage

Browse Source
This commit is contained in:
shivekkhurana 2020-09-19 09:32:28 +05:30 committed by Andrea Maria Piana
parent 316c6038d7
commit cf0cd283a6
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
10 changed files with 136 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/status_im/events.cljs
View File

@ -237,6 +237,11 @@
(fn [cofx [_ _]] (fn [cofx [_ _]]
(mailserver/retry-next-messages-request cofx))) (mailserver/retry-next-messages-request cofx)))
(handlers/register-handler-fx
:mailserver.ui/use-history-switch-pressed
(fn [cofx [_ use-mailservers?]]
(mailserver/update-use-mailservers cofx use-mailservers?)))
(handlers/register-handler-fx (handlers/register-handler-fx
:mailserver/check-connection-timeout :mailserver/check-connection-timeout
(fn [cofx _] (fn [cofx _]

8
src/status_im/init/core.cljs
View File

@ -58,10 +58,10 @@
::open-multiaccounts #(re-frame/dispatch [::initialize-multiaccounts % {:logout? false}]) ::open-multiaccounts #(re-frame/dispatch [::initialize-multiaccounts % {:logout? false}])
:ui/listen-to-window-dimensions-change nil :ui/listen-to-window-dimensions-change nil
::network/listen-to-network-info nil ::network/listen-to-network-info nil
:keycard/register-card-events nil :keycard/register-card-events nil
:keycard/check-nfc-support nil :keycard/check-nfc-support nil
:keycard/check-nfc-enabled nil :keycard/check-nfc-enabled nil
:keycard/retrieve-pairings nil} :keycard/retrieve-pairings nil}
(initialize-app-db))) (initialize-app-db)))
(re-frame/reg-fx (re-frame/reg-fx

38
src/status_im/mailserver/core.cljs
View File

@ -220,21 +220,24 @@
Peer summary will change and we will receive a signal from status go when Peer summary will change and we will receive a signal from status go when
this is successful this is successful
A connection-check is made after `connection timeout` is reached and A connection-check is made after `connection timeout` is reached and
mailserver-state is changed to error if it is not connected by then" mailserver-state is changed to error if it is not connected by then
No attempt is made if mailserver usage is disabled"
{:events [:mailserver.ui/reconnect-mailserver-pressed]} {:events [:mailserver.ui/reconnect-mailserver-pressed]}
[{:keys [db] :as cofx}] [{:keys [db] :as cofx}]
(let [{:keys [address]} (fetch-current db) (let [{:keys [address]} (fetch-current db)
{:keys [peers-summary]} db {:keys [peers-summary]} db
added? (registered-peer? peers-summary address) use-mailservers? (get-in db [:multiaccount :use-mailservers?])
gap-request? (executing-gap-request? db)] added? (registered-peer? peers-summary address)
gap-request? (executing-gap-request? db)]
(fx/merge cofx (fx/merge cofx
{:db (cond-> (dissoc db :mailserver/current-request) (when use-mailservers?
gap-request? {:db (cond-> (dissoc db :mailserver/current-request)
(-> (assoc :mailserver/fetching-gaps-in-progress {}) gap-request?
(dissoc :mailserver/planned-gap-requests)))} (-> (assoc :mailserver/fetching-gaps-in-progress {})
(if added? (dissoc :mailserver/planned-gap-requests)))}
(mark-trusted-peer) (if added?
(add-peer))))) (mark-trusted-peer)
(add-peer))))))
(defn pool-size [fleet-size] (defn pool-size [fleet-size]
(.ceil js/Math (/ fleet-size 4))) (.ceil js/Math (/ fleet-size 4)))
@ -299,7 +302,7 @@
(mark-trusted-peer cofx) (mark-trusted-peer cofx)
mailserver-removed? mailserver-removed?
(connect-to-mailserver cofx))) (connect-to-mailserver cofx)))
;; if there is no current mailserver defined, ;; if there is no current mailserver defined
;; we set it first ;; we set it first
(set-current-mailserver cofx)))) (set-current-mailserver cofx))))
@ -489,6 +492,10 @@
dissoc :generating-sym-key?))} dissoc :generating-sym-key?))}
(process-next-messages-request)))) (process-next-messages-request))))
(fx/defn update-use-mailservers
[cofx use-mailservers?]
(multiaccounts.update/multiaccount-update cofx :use-mailservers? use-mailservers? {}))
(fx/defn change-mailserver (fx/defn change-mailserver
"mark mailserver status as `:error` if custom mailserver is used "mark mailserver status as `:error` if custom mailserver is used
otherwise try to reconnect to another mailserver" otherwise try to reconnect to another mailserver"
@ -1124,11 +1131,14 @@
(let [{:keys [address]} (fetch-current db) (let [{:keys [address]} (fetch-current db)
pinned-mailservers (get-in db [:multiaccount :pinned-mailservers]) pinned-mailservers (get-in db [:multiaccount :pinned-mailservers])
;; Check if previous mailserver was pinned ;; Check if previous mailserver was pinned
pinned? (get pinned-mailservers current-fleet)] pinned? (get pinned-mailservers current-fleet)
use-mailservers? (get-in db [:multiaccount :use-mailservers?])]
(fx/merge cofx (fx/merge cofx
{:db (assoc db :mailserver/current-id mailserver-id) {:db (assoc db :mailserver/current-id mailserver-id)
:mailserver/remove-peer address} :mailserver/remove-peer address}
(connect-to-mailserver)
(when use-mailservers? (connect-to-mailserver))
(when pinned? (when pinned?
(multiaccounts.update/multiaccount-update (multiaccounts.update/multiaccount-update
:pinned-mailservers (assoc pinned-mailservers :pinned-mailservers (assoc pinned-mailservers

13
src/status_im/mailserver/core_test.cljs
View File

@ -334,7 +334,8 @@
:peers-summary (if registered-peer? :peers-summary (if registered-peer?
[{:id "mailserver-id" :enode "enode://mailserver-id@ip"}] [{:id "mailserver-id" :enode "enode://mailserver-id@ip"}]
[]) [])
:multiaccount {:fleet :eth.staging} :multiaccount {:fleet :eth.staging
:use-mailservers? true}
:mailserver/current-id "mailserver-a" :mailserver/current-id "mailserver-a"
:mailserver/mailservers {:eth.staging {"mailserver-a" {:sym-key-id sym-key :mailserver/mailservers {:eth.staging {"mailserver-a" {:sym-key-id sym-key
:address "enode://mailserver-id@ip"}}}}}) :address "enode://mailserver-id@ip"}}}}})
@ -611,7 +612,8 @@
:password "mailserver-password"}}} :password "mailserver-password"}}}
:multiaccount :multiaccount
{:fleet :eth.staging {:fleet :eth.staging
:pinned-mailservers {:eth.staging "mailserverid"}}}] :pinned-mailservers {:eth.staging "mailserverid"}
:use-mailservers? true}}]
(testing "it adds the peer" (testing "it adds the peer"
(is (= "mailserver-address" (is (= "mailserver-address"
(:mailserver/add-peer (mailserver/connect-to-mailserver {:db db}))))) (:mailserver/add-peer (mailserver/connect-to-mailserver {:db db})))))
@ -625,7 +627,12 @@
"somesymkeyid")] "somesymkeyid")]
(testing "it does not generate a sym key if already present" (testing "it does not generate a sym key if already present"
(is (not (-> (mailserver/connect-to-mailserver {:db mailserver-with-sym-key-db}) (is (not (-> (mailserver/connect-to-mailserver {:db mailserver-with-sym-key-db})
:shh/generate-sym-key-from-password))))))) :shh/generate-sym-key-from-password)))))
(testing "it returns noops when use-mailservers? is false"
(let [no-mailservers-cofx {:db (assoc-in db [:multiaccount :use-mailservers?] false)}]
(is (= (mailserver/connect-to-mailserver no-mailservers-cofx)
no-mailservers-cofx))))))
(deftest check-existing-gaps (deftest check-existing-gaps
(testing "no gaps" (testing "no gaps"

2
src/status_im/multiaccounts/create/core.cljs
View File

@ -253,6 +253,8 @@
:signing-phrase signing-phrase :signing-phrase signing-phrase
:send-push-notifications? true :send-push-notifications? true
:installation-id (random-guid-generator) :installation-id (random-guid-generator)
;; default mailserver (history node) setting
:use-mailservers? true
:recovered (or recovered (get-in db [:intro-wizard :recovering?]))} :recovered (or recovered (get-in db [:intro-wizard :recovering?]))}
constants/default-multiaccount) constants/default-multiaccount)
;; The address from which we derive any chat ;; The address from which we derive any chat

42
src/status_im/ui/screens/offline_messaging_settings/styles.cljs
View File

@ -5,15 +5,10 @@
(def wrapper (def wrapper
{:flex 1}) {:flex 1})
(def mailserver-item-inner (styles/defn mailserver-item []
{:padding-horizontal 16})
(styles/defn mailserver-item [pinned?]
{:flex-direction :row {:flex-direction :row
:align-items :center :align-items :center
:opacity (if pinned? :justify-content :space-between
1
0.4)
:padding-horizontal 16 :padding-horizontal 16
:ios {:height 64} :ios {:height 64}
:android {:height 56}}) :android {:height 56}})
@ -31,21 +26,24 @@
:align-items :center :align-items :center
:justify-content :center}) :justify-content :center})
(defn mailserver-icon [connected?] (def switch-container
(hash-map :color {:height 52})
(if connected? colors/white-persist colors/gray)))
(def mailserver-pinned (def automatic-selection-container
{:padding-horizontal 16 {:border-top-width 1
:flex-direction :row :border-top-color colors/gray-lighter
:align-items :center :margin-top 16})
:padding-vertical 5})
(def mailserver-pinned-checkbox-container (def explanation-text
{:width 40 {:color colors/gray})
:height 40
:align-items :center
:justify-content :center})
(def mailserver-pinned-text-container (def use-history-explanation-text-container
{:padding-horizontal 15}) {:margin-right 16
:margin-left 16
:margin-top 8
:margin-bottom 16})
(def history-nodes-label
{:color colors/gray
:padding-horizontal 16
:margin-top 48})

102
src/status_im/ui/screens/offline_messaging_settings/views.cljs
View File

@ -2,60 +2,78 @@
(:require-macros [status-im.utils.views :as views]) (:require-macros [status-im.utils.views :as views])
(:require [re-frame.core :as re-frame] (:require [re-frame.core :as re-frame]
[status-im.i18n :as i18n] [status-im.i18n :as i18n]
[status-im.ui.components.checkbox.view :as checkbox.views]
[status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.ui.components.list.views :as list] [status-im.ui.components.list.views :as list]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.ui.components.radio :as radio]
[status-im.ui.components.colors :as colors]
[status-im.ui.screens.offline-messaging-settings.styles :as styles] [status-im.ui.screens.offline-messaging-settings.styles :as styles]
[status-im.ui.screens.profile.components.views :as profile.components]
[status-im.ui.components.topbar :as topbar])) [status-im.ui.components.topbar :as topbar]))
(defn- mailserver-icon [connected?]
[react/view (styles/mailserver-icon-container connected?)
[vector-icons/icon :main-icons/mailserver
(styles/mailserver-icon connected?)]])
(defn pinned-state [pinned?] (defn pinned-state [pinned?]
[react/touchable-highlight {:on-press (if pinned? [react/view {:style styles/automatic-selection-container}
#(re-frame/dispatch [:mailserver.ui/unpin-pressed]) [react/view {:style styles/switch-container}
#(re-frame/dispatch [:mailserver.ui/pin-pressed]))} [profile.components/settings-switch-item
[react/view {:style styles/mailserver-pinned} {:label-kw :t/mailserver-automatic
[checkbox.views/checkbox :value (not pinned?)
{:checked? (not pinned?) :action-fn #(if pinned?
:style styles/mailserver-pinned-checkbox-container (re-frame/dispatch [:mailserver.ui/unpin-pressed])
:on-value-change (if pinned? (re-frame/dispatch [:mailserver.ui/pin-pressed]))}]]
#(re-frame/dispatch [:mailserver.ui/unpin-pressed]) [react/view {:style {:padding-horizontal 16}}
#(re-frame/dispatch [:mailserver.ui/pin-pressed]))}] [react/text {:style styles/explanation-text}
[react/view {:style styles/mailserver-pinned-text-container} (i18n/label :t/mailserver-automatic-switch-explanation)]]])
[react/text (i18n/label :t/mailserver-automatic)]]]])
(defn render-row [current-mailserver-id pinned?] (defn render-row [current-mailserver-id pinned?]
(fn [{:keys [name id user-defined]}] (fn [{:keys [name id user-defined]}]
(let [connected? (= id current-mailserver-id)] (let [connected? (= id current-mailserver-id)
[react/touchable-highlight visible? (or pinned? ; show everything when auto selection is turned off
{:on-press (when pinned? #(if user-defined (and (not pinned?) ; auto selection turned on
(re-frame/dispatch [:mailserver.ui/user-defined-mailserver-selected id]) (= current-mailserver-id id) ; show only the selected server
(re-frame/dispatch [:mailserver.ui/default-mailserver-selected id]))) ))]
:accessibility-label :mailserver-item} (when visible?
[react/view (styles/mailserver-item pinned?) [react/touchable-highlight
[mailserver-icon connected?] {:on-press (when pinned? #(if user-defined
[react/view styles/mailserver-item-inner (re-frame/dispatch [:mailserver.ui/user-defined-mailserver-selected id])
[react/text {:style styles/mailserver-item-name-text} (re-frame/dispatch [:mailserver.ui/default-mailserver-selected id])))
name]]]]))) :accessibility-label :mailserver-item}
[react/view (styles/mailserver-item)
[react/text {:style styles/mailserver-item-name-text}
name]
(if pinned?
[radio/radio connected?]
[vector-icons/icon :check {:color colors/blue}])]]))))
(views/defview offline-messaging-settings [] (views/defview offline-messaging-settings []
(views/letsubs [current-mailserver-id [:mailserver/current-id] (views/letsubs [current-mailserver-id [:mailserver/current-id]
preferred-mailserver-id [:mailserver/preferred-id] preferred-mailserver-id [:mailserver/preferred-id]
mailservers [:mailserver/fleet-mailservers]] mailservers [:mailserver/fleet-mailservers]
[react/view {:flex 1} {:keys [use-mailservers?]} [:multiaccount]]
[react/view {:style styles/wrapper}
[topbar/topbar [topbar/topbar
{:title (i18n/label :t/offline-messaging-settings) {:title (i18n/label :t/offline-messaging-settings)
:right-accessories :right-accessories
[{:icon :main-icons/add [{:icon :main-icons/add-circle
:on-press #(re-frame/dispatch [:mailserver.ui/add-pressed])}]}] :on-press #(re-frame/dispatch [:mailserver.ui/add-pressed])}]}]
[react/view styles/wrapper
[pinned-state preferred-mailserver-id] [react/view {:style styles/switch-container}
[list/flat-list {:data (vals mailservers) [profile.components/settings-switch-item
:default-separator? false {:label-kw :t/offline-messaging-use-history-nodes
:key-fn :name :value use-mailservers?
:render-fn (render-row current-mailserver-id :action-fn #(re-frame/dispatch [:mailserver.ui/use-history-switch-pressed (not use-mailservers?)])}]]
preferred-mailserver-id)}]]])) [react/view {:style styles/use-history-explanation-text-container}
[react/text {:style styles/explanation-text}
(i18n/label :t/offline-messaging-use-history-explanation)]]
(when use-mailservers?
[:<>
[pinned-state preferred-mailserver-id]
[react/text {:style styles/history-nodes-label}
(i18n/label :t/history-nodes)]
[list/flat-list {:data (vals mailservers)
:default-separator? false
:key-fn :name
:render-fn (render-row current-mailserver-id
preferred-mailserver-id)}]])]))

5
src/status_im/ui/screens/sync_settings/views.cljs
View File

@ -8,7 +8,8 @@
[status-im.ui.components.topbar :as topbar])) [status-im.ui.components.topbar :as topbar]))
(views/defview sync-settings [] (views/defview sync-settings []
(views/letsubs [{:keys [syncing-on-mobile-network?]} [:multiaccount] (views/letsubs [{:keys [syncing-on-mobile-network?
use-mailservers?]} [:multiaccount]
mailserver-id [:mailserver/current-id]] mailserver-id [:mailserver/current-id]]
[react/view {:style {:flex 1 :background-color colors/white}} [react/view {:style {:flex 1 :background-color colors/white}}
[topbar/topbar {:title (i18n/label :t/sync-settings)}] [topbar/topbar {:title (i18n/label :t/sync-settings)}]
@ -28,7 +29,7 @@
:title (i18n/label :t/offline-messaging) :title (i18n/label :t/offline-messaging)
:on-press #(re-frame/dispatch [:navigate-to :offline-messaging-settings]) :on-press #(re-frame/dispatch [:navigate-to :offline-messaging-settings])
:accessory :text :accessory :text
:accessory-text mailserver-id :accessory-text (when use-mailservers? mailserver-id)
:chevron true}] :chevron true}]
;; TODO(Ferossgp): Devider componemt ;; TODO(Ferossgp): Devider componemt
[react/view {:height 1 [react/view {:height 1

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead", "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.62.8", "version": "v0.62.11",
"commit-sha1": "efbf093bc494e9c3ea00a6a3e8f286826294dff7", "commit-sha1": "4ecca1169d2e0a07b4e0cf5a7a3f4044216c678f",
"src-sha256": "0rbyzr360l2dv9gyinc7dwvd8hw6wwgs8lrs5kl3dl8bzxbrfsyj" "src-sha256": "189igps203m2yf3gcqjrghqnncf7vgl3p3bjcrk5dp2ym00jfr9f"
} }

6
translations/en.json
View File

@ -502,6 +502,7 @@
"hide-content-when-switching-apps": "Block screenshots", "hide-content-when-switching-apps": "Block screenshots",
"hide-content-when-switching-apps-ios": "Hide preview", "hide-content-when-switching-apps-ios": "Hide preview",
"history": "History", "history": "History",
"history-nodes": "History nodes",
"hold-card": "Hold card to the back\n of your phone", "hold-card": "Hold card to the back\n of your phone",
"home": "Home", "home": "Home",
"hooks": "Hooks", "hooks": "Hooks",
@ -673,6 +674,7 @@
"lost-connection": "Lost connection", "lost-connection": "Lost connection",
"mailserver-address": "Mailserver address", "mailserver-address": "Mailserver address",
"mailserver-automatic": "Automatic selection", "mailserver-automatic": "Automatic selection",
"mailserver-automatic-switch-explanation": "Choose the fastest history node available",
"mailserver-connection-error": "Could not connect to mailserver", "mailserver-connection-error": "Could not connect to mailserver",
"mailserver-details": "Mailserver details", "mailserver-details": "Mailserver details",
"mailserver-error-content": "The mailserver you selected couldn't be reached.", "mailserver-error-content": "The mailserver you selected couldn't be reached.",
@ -807,7 +809,9 @@
"off": "Off", "off": "Off",
"offline": "Offline", "offline": "Offline",
"offline-messaging": "Mailserver", "offline-messaging": "Mailserver",
"offline-messaging-settings": "Mailserver settings", "offline-messaging-settings": "History nodes",
"offline-messaging-use-history-nodes": "Use history nodes",
"offline-messaging-use-history-explanation": "Enable history nodes to fetch messages that were sent while the app was closed. When enabled, a history node gets your IP address. When disabled you will not receive messages when the app is closed and will not see them when you open the app later.",
"ok": "OK", "ok": "OK",
"ok-continue": "Okay, continue", "ok-continue": "Okay, continue",
"ok-got-it": "Okay, got it", "ok-got-it": "Okay, got it",