From ae56eec40ffc7ddd2861929f2e8f56157f71ab30 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Wed, 23 May 2018 15:13:52 +0200 Subject: [PATCH] Disable group chats in dev mode. Closes #4396 --- .env | 4 ++-- .env.jenkins | 2 +- .env.nightly | 2 +- .env.prod | 2 +- src/status_im/ui/screens/add_new/views.cljs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 33e078d4f0..c97b0924bb 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=1 MAINNET_WARNING_ENABLED=0 OFFLINE_INBOX_ENABLED=1 -RPC_NETWORKS_ONLY 1 +RPC_NETWORKS_ONLY=1 LOG_LEVEL=debug LOG_LEVEL_STATUS_GO=info QUEUE_MESSAGE_ENABLED=1 @@ -16,6 +16,6 @@ TESTFAIRY_TOKEN=969f6c921cb435cea1d41d1ea3f5b247d6026d55 INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c DEBUG_WEBVIEW=1 INSTABUG_SURVEYS=1 -GROUP_CHATS_ENABLED=1 +GROUP_CHATS_ENABLED=0 FORCE_SENT_RECEIVED_TRACKING=0 USE_SYM_KEY=0 diff --git a/.env.jenkins b/.env.jenkins index 9d9c46f1f4..4d6990d624 100644 --- a/.env.jenkins +++ b/.env.jenkins @@ -16,6 +16,6 @@ DEFAULT_NETWORK=mainnet_rpc INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c DEBUG_WEBVIEW=1 INSTABUG_SURVEYS=1 -GROUP_CHATS_ENABLED=1 +GROUP_CHATS_ENABLED=0 FORCE_SENT_RECEIVED_TRACKING=1 USE_SYM_KEY=0 diff --git a/.env.nightly b/.env.nightly index 620f49dece..585705eb29 100644 --- a/.env.nightly +++ b/.env.nightly @@ -16,6 +16,6 @@ DEFAULT_NETWORK=mainnet_rpc INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c DEBUG_WEBVIEW=1 INSTABUG_SURVEYS=1 -GROUP_CHATS_ENABLED=1 +GROUP_CHATS_ENABLED=0 FORCE_SENT_RECEIVED_TRACKING=1 ADD_CUSTOM_MAILSERVERS_ENABLED=0 diff --git a/.env.prod b/.env.prod index 2d55287fd7..bb77a31de0 100644 --- a/.env.prod +++ b/.env.prod @@ -2,7 +2,7 @@ TESTFAIRY_ENABLED=0 STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=0 MAINNET_WARNING_ENABLED=1 -RPC_NETWORKS_ONLY 1 +RPC_NETWORKS_ONLY=1 OFFLINE_INBOX_ENABLED=0 LOG_LEVEL=info LOG_LEVEL_STATUS_GO=info diff --git a/src/status_im/ui/screens/add_new/views.cljs b/src/status_im/ui/screens/add_new/views.cljs index f070bc35a6..7cfbe94ba0 100644 --- a/src/status_im/ui/screens/add_new/views.cljs +++ b/src/status_im/ui/screens/add_new/views.cljs @@ -13,7 +13,7 @@ [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar])) -(defn- options-list [{:keys [address]}] +(defn- options-list [{:keys [address dev-mode?]}] [react/view action-button.styles/actions-list [action-button/action-button {:label (i18n/label :t/start-new-chat) @@ -23,7 +23,7 @@ :on-press #(re-frame/dispatch [:navigate-to :new-chat])}] [action-button/action-separator] ;; Hide behind flag (false by default), till everything is fixed in group chats - (when config/group-chats-enabled? + (when (or config/group-chats-enabled? dev-mode?) [action-button/action-button {:label (i18n/label :t/start-group-chat) :accessibility-label :start-group-chat-button