From 88326d4b569240e19290c1caaec06d32c743e1e7 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Fri, 20 Oct 2017 18:39:41 +0200 Subject: [PATCH] remove NETWORK_SWITCHING flag --- .env | 1 - .env.jenkins | 1 - .env.prod | 1 - src/status_im/ui/screens/profile/views.cljs | 3 +-- src/status_im/utils/config.cljs | 4 +--- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.env b/.env index b7850248f0..f6eea46dd3 100644 --- a/.env +++ b/.env @@ -2,6 +2,5 @@ TESTFAIRY_ENABLED=0 NOTIFICATIONS_WIP_ENABLED=1 DEBUG_LOGS_ENABLED=1 STUB_STATUS_GO=0 -NETWORK_SWITCHING=1 ETHEREUM_DEV_CLUSTER=1 MAINNET_NETWORKS_ENABLED=1 diff --git a/.env.jenkins b/.env.jenkins index 987dc8abfd..be91f591e4 100644 --- a/.env.jenkins +++ b/.env.jenkins @@ -2,6 +2,5 @@ TESTFAIRY_ENABLED=1 NOTIFICATIONS_WIP_ENABLED=1 DEBUG_LOGS_ENABLED=1 STUB_STATUS_GO=0 -NETWORK_SWITCHING=1 ETHEREUM_DEV_CLUSTER=1 MAINNET_NETWORKS_ENABLED=1 diff --git a/.env.prod b/.env.prod index 0d88d6ddfd..e8af82def1 100644 --- a/.env.prod +++ b/.env.prod @@ -2,6 +2,5 @@ TESTFAIRY_ENABLED=0 NOTIFICATIONS_WIP_ENABLED=1 DEBUG_LOGS_ENABLED=0 STUB_STATUS_GO=0 -NETWORK_SWITCHING=0 ETHEREUM_DEV_CLUSTER=0 MAINNET_NETWORKS_ENABLED=0 diff --git a/src/status_im/ui/screens/profile/views.cljs b/src/status_im/ui/screens/profile/views.cljs index 0133c06273..7a5d2bd5c6 100644 --- a/src/status_im/ui/screens/profile/views.cljs +++ b/src/status_im/ui/screens/profile/views.cljs @@ -178,8 +178,7 @@ [{:value #(dispatch [:my-profile/change-phone-number]) :text (label :t/edit)}]] [info-item-separator] - (when config/network-switching-enabled? - [network-settings])]) + [network-settings]]) (defn profile-status [status & [edit?]] [react/view styles/profile-status-container diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs index ae82124e37..2e53aa62ae 100644 --- a/src/status_im/utils/config.cljs +++ b/src/status_im/utils/config.cljs @@ -13,13 +13,11 @@ ;; flags stay up to date and are removed once behavior introduced is stable. ;; ;; TESTFAIRY_ENABLED - indefinite +;; STUB_STATUS_GO - indefinite ;; NOTIFICATIONS_WIP_ENABLED - in 0.9.12 release, remove in develop if all goes well -;; STUB_STATUS_GO - TBD - roman knows -;; NETWORK_SWITCHING - TBD - roman knows (def testfairy-enabled? (enabled? (get-config :TESTFAIRY_ENABLED))) (def notifications-wip-enabled? (enabled? (get-config :NOTIFICATIONS_WIP_ENABLED 0))) (def stub-status-go? (enabled? (get-config :STUB_STATUS_GO 0))) -(def network-switching-enabled? (enabled? (get-config :NETWORK_SWITCHING 0))) (def mainnet-networks-enabled? (enabled? (get-config :MAINNET_NETWORKS_ENABLED 0)))