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

Disable pairing pop-up in e2e 

Signed-off-by: Anton Danchenko <ant.danchenko@gmail.com>
This commit is contained in:
Andrea Maria Piana 2019-01-30 14:12:37 +01:00 committed by Anton Danchenko
parent d093b5f6be
commit 093f7de1aa
No known key found for this signature in database
GPG Key ID: C2D4819B698627E4
8 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -11,7 +11,6 @@ HARDWALLET_ENABLED=0
LOG_LEVEL_STATUS_GO=info LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug LOG_LEVEL=debug
MAILSERVER_CONFIRMATIONS_ENABLED=0 MAILSERVER_CONFIRMATIONS_ENABLED=0
PAIRING_ENABLED=1
PFS_ENCRYPTION_ENABLED=1 PFS_ENCRYPTION_ENABLED=1
POW_TARGET=0.002 POW_TARGET=0.002
POW_TIME=1 POW_TIME=1

2
.env.e2e
View File

@ -8,7 +8,7 @@ GROUP_CHATS_ENABLED=1
LOG_LEVEL_STATUS_GO=info LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug LOG_LEVEL=debug
MAILSERVER_CONFIRMATIONS_ENABLED=0 MAILSERVER_CONFIRMATIONS_ENABLED=0
PAIRING_ENABLED=1 PAIRING_POPUP_DISABLED=1
PFS_ENCRYPTION_ENABLED=1 PFS_ENCRYPTION_ENABLED=1
POW_TARGET=0.002 POW_TARGET=0.002
POW_TIME=1 POW_TIME=1

1
.env.jenkins
View File

@ -11,7 +11,6 @@ LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug LOG_LEVEL=debug
MAILSERVER_CONFIRMATIONS_ENABLED=0 MAILSERVER_CONFIRMATIONS_ENABLED=0
MAINNET_WARNING_ENABLED=1 MAINNET_WARNING_ENABLED=1
PAIRING_ENABLED=1
PFS_ENCRYPTION_ENABLED=1 PFS_ENCRYPTION_ENABLED=1
POW_TARGET=0.002 POW_TARGET=0.002
POW_TIME=1 POW_TIME=1

1
.env.nightly
View File

@ -9,7 +9,6 @@ LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug LOG_LEVEL=debug
MAILSERVER_CONFIRMATIONS_ENABLED=0 MAILSERVER_CONFIRMATIONS_ENABLED=0
MAINNET_WARNING_ENABLED=1 MAINNET_WARNING_ENABLED=1
PAIRING_ENABLED=1
PFS_ENCRYPTION_ENABLED=1 PFS_ENCRYPTION_ENABLED=1
POW_TARGET=0.002 POW_TARGET=0.002
POW_TIME=1 POW_TIME=1

1
.env.nightly.staging.fleet
View File

@ -9,7 +9,6 @@ LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug LOG_LEVEL=debug
MAILSERVER_CONFIRMATIONS_ENABLED=0 MAILSERVER_CONFIRMATIONS_ENABLED=0
MAINNET_WARNING_ENABLED=1 MAINNET_WARNING_ENABLED=1
PAIRING_ENABLED=1
PFS_ENCRYPTION_ENABLED=1 PFS_ENCRYPTION_ENABLED=1
POW_TARGET=0.002 POW_TARGET=0.002
POW_TIME=1 POW_TIME=1

1
.env.prod
View File

@ -8,7 +8,6 @@ GROUP_CHATS_ENABLED=1
LOG_LEVEL_STATUS_GO= LOG_LEVEL_STATUS_GO=
LOG_LEVEL=info LOG_LEVEL=info
MAINNET_WARNING_ENABLED=1 MAINNET_WARNING_ENABLED=1
PAIRING_ENABLED=1
PFS_ENCRYPTION_ENABLED=1 PFS_ENCRYPTION_ENABLED=1
POW_TARGET=0.002 POW_TARGET=0.002
POW_TIME=1 POW_TIME=1

15
src/status_im/pairing/core.cljs
View File

@ -69,13 +69,14 @@
(navigation/navigate-to-cofx :installations nil))) (navigation/navigate-to-cofx :installations nil)))
(fx/defn prompt-user-on-new-installation [{:keys [db]}] (fx/defn prompt-user-on-new-installation [{:keys [db]}]
{:db (assoc-in db [:pairing/prompt-user-pop-up] true) (when-not config/pairing-popup-disabled?
:ui/show-confirmation {:title (i18n/label :t/pairing-new-installation-detected-title) {:db (assoc-in db [:pairing/prompt-user-pop-up] true)
:content (i18n/label :t/pairing-new-installation-detected-content) :ui/show-confirmation {:title (i18n/label :t/pairing-new-installation-detected-title)
:confirm-button-text (i18n/label :t/pairing-go-to-installation) :content (i18n/label :t/pairing-new-installation-detected-content)
:cancel-button-text (i18n/label :t/cancel) :confirm-button-text (i18n/label :t/pairing-go-to-installation)
:on-cancel #(re-frame/dispatch [:pairing.ui/prompt-dismissed]) :cancel-button-text (i18n/label :t/cancel)
:on-accept #(re-frame/dispatch [:pairing.ui/prompt-accepted])}}) :on-cancel #(re-frame/dispatch [:pairing.ui/prompt-dismissed])
:on-accept #(re-frame/dispatch [:pairing.ui/prompt-accepted])}}))
(fx/defn upsert-installation [{:keys [db]} {:keys [installation-id] :as new-installation}] (fx/defn upsert-installation [{:keys [db]} {:keys [installation-id] :as new-installation}]
(let [old-installation (get-in db [:pairing/installations installation-id]) (let [old-installation (get-in db [:pairing/installations installation-id])

1
src/status_im/utils/config.cljs
View File

@ -22,6 +22,7 @@
(def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED))) (def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED)))
(def mainnet-warning-enabled? (enabled? (get-config :MAINNET_WARNING_ENABLED 0))) (def mainnet-warning-enabled? (enabled? (get-config :MAINNET_WARNING_ENABLED 0)))
(def pfs-encryption-enabled? (enabled? (get-config :PFS_ENCRYPTION_ENABLED "0"))) (def pfs-encryption-enabled? (enabled? (get-config :PFS_ENCRYPTION_ENABLED "0")))
(def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0")))
(def cached-webviews-enabled? (enabled? (get-config :CACHED_WEBVIEWS_ENABLED 0))) (def cached-webviews-enabled? (enabled? (get-config :CACHED_WEBVIEWS_ENABLED 0)))
(def rn-bridge-threshold-warnings-enabled? (enabled? (get-config :RN_BRIDGE_THRESHOLD_WARNINGS 0))) (def rn-bridge-threshold-warnings-enabled? (enabled? (get-config :RN_BRIDGE_THRESHOLD_WARNINGS 0)))
(def extensions-enabled? (enabled? (get-config :EXTENSIONS 0))) (def extensions-enabled? (enabled? (get-config :EXTENSIONS 0)))