diff --git a/.env.e2e b/.env.e2e index 92b61b77fd..53d2e1a0bc 100644 --- a/.env.e2e +++ b/.env.e2e @@ -8,6 +8,7 @@ POW_TIME=1 DEFAULT_NETWORK=testnet_rpc DEBUG_WEBVIEW=1 GROUP_CHATS_ENABLED=1 +PAIRING_ENABLED=1 EXTENSIONS=1 PFS_ENCRYPTION_ENABLED=0 ERC20_CONTRACT_WARNINGS=1 diff --git a/.env.nightly.staging.fleet b/.env.nightly.staging.fleet index 4d26cbed8b..61f28668cb 100644 --- a/.env.nightly.staging.fleet +++ b/.env.nightly.staging.fleet @@ -7,7 +7,8 @@ POW_TARGET=0.002 POW_TIME=1 DEFAULT_NETWORK=mainnet_rpc DEBUG_WEBVIEW=1 -GROUP_CHATS_ENABLED=0 +PAIRING_ENABLED=1 +GROUP_CHATS_ENABLED=1 MAINNET_WARNING_ENABLED=1 EXTENSIONS=1 PFS_ENCRYPTION_ENABLED=0 diff --git a/.env.prod b/.env.prod index 62f6494e08..5755396c32 100644 --- a/.env.prod +++ b/.env.prod @@ -9,7 +9,8 @@ POW_TARGET=0.002 POW_TIME=1 DEFAULT_NETWORK=mainnet_rpc DEBUG_WEBVIEW=0 -GROUP_CHATS_ENABLED=0 +GROUP_CHATS_ENABLED=1 +PAIRING_ENABLED=1 MAINNET_WARNING_ENABLED=1 EXTENSIONS=1 PFS_ENCRYPTION_ENABLED=0 diff --git a/src/status_im/chat/db.cljs b/src/status_im/chat/db.cljs index 6a2a92bb4e..d6bb34d527 100644 --- a/src/status_im/chat/db.cljs +++ b/src/status_im/chat/db.cljs @@ -25,7 +25,7 @@ ;; not a group chat (or (not (and group-chat (not public?))) ;; if it's a group chat - (utils.config/group-chats-enabled? dev-mode?))) + utils.config/group-chats-enabled?)) (assoc acc chat-id (if-let [contact (get contacts chat-id)] (-> chat (assoc :name (:name contact)) diff --git a/src/status_im/group_chats/core.cljs b/src/status_im/group_chats/core.cljs index 0403a85a33..c25d5200c6 100644 --- a/src/status_im/group_chats/core.cljs +++ b/src/status_im/group_chats/core.cljs @@ -381,7 +381,7 @@ membership-updates] :as membership-update} sender-signature] (let [dev-mode? (get-in cofx [:db :account/account :dev-mode?])] - (when (and (config/group-chats-enabled? dev-mode?) + (when (and config/group-chats-enabled? (valid-chat-id? chat-id (extract-creator membership-update))) (let [previous-chat (get-in cofx [:db :chats chat-id]) all-updates (clojure.set/union (set (:membership-updates previous-chat)) diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs index 6b2c598d75..a85a88be95 100644 --- a/src/status_im/node/core.cljs +++ b/src/status_im/node/core.cljs @@ -110,7 +110,7 @@ ;; We don't check dev-mode? here as ;; otherwise we would have to restart the node ;; when the user enables it - (config/group-chats-enabled? true) + config/group-chats-enabled? (config/pairing-enabled? true))) (and diff --git a/src/status_im/ui/screens/add_new/views.cljs b/src/status_im/ui/screens/add_new/views.cljs index 4bdfb073b9..7d5727fe78 100644 --- a/src/status_im/ui/screens/add_new/views.cljs +++ b/src/status_im/ui/screens/add_new/views.cljs @@ -23,14 +23,14 @@ :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? dev-mode?) + (when config/group-chats-enabled? [action-button/action-button {:label (i18n/label :t/start-group-chat) :accessibility-label :start-group-chat-button :icon :icons/contacts :icon-opts {:color colors/blue} :on-press #(re-frame/dispatch [:contact.ui/start-group-chat-pressed])}]) - (when (config/group-chats-enabled? dev-mode?) + (when config/group-chats-enabled? [action-button/action-separator]) [action-button/action-button {:label (i18n/label :t/new-public-group-chat) diff --git a/src/status_im/ui/screens/desktop/main/add_new/views.cljs b/src/status_im/ui/screens/desktop/main/add_new/views.cljs index f2a3d0e7cd..be54e3f241 100644 --- a/src/status_im/ui/screens/desktop/main/add_new/views.cljs +++ b/src/status_im/ui/screens/desktop/main/add_new/views.cljs @@ -92,7 +92,7 @@ [react/image {:style styles/suggested-contact-image :source {:uri (:photo-path c)}}] [react/text {:style styles/new-contact-subtitle} (:name c)]]]))]] - (when (config/group-chats-enabled? true) group-chat-section) + (when config/group-chats-enabled? group-chat-section) ^{:key "publicchat"} [react/view {:style styles/new-contact-title} [react/text {:style styles/new-contact-title-text diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs index ba2c8dc42b..349db7347a 100644 --- a/src/status_im/utils/config.cljs +++ b/src/status_im/utils/config.cljs @@ -17,9 +17,7 @@ (def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1"))) (def rpc-networks-only? (enabled? (get-config :RPC_NETWORKS_ONLY "1"))) -(defn group-chats-enabled? [dev-mode?] - (and (enabled? (get-config :GROUP_CHATS_ENABLED "0")) - (or dev-mode? platform/desktop?))) +(def group-chats-enabled? (enabled? (get-config :GROUP_CHATS_ENABLED "0"))) (defn pairing-enabled? [dev-mode?] (and (enabled? (get-config :PAIRING_ENABLED "0")) (or dev-mode? platform/desktop?))) diff --git a/test/cljs/status_im/test/group_chats/core.cljs b/test/cljs/status_im/test/group_chats/core.cljs index bd9e6aacc2..b11e748c96 100644 --- a/test/cljs/status_im/test/group_chats/core.cljs +++ b/test/cljs/status_im/test/group_chats/core.cljs @@ -29,7 +29,7 @@ (is (= 3 (group-chats/get-last-clock-value {:db {:chats {chat-id {:last-clock-value 3}}}} chat-id)))) (deftest handle-group-membership-update-test - (with-redefs [config/group-chats-enabled? (constantly true)] + (with-redefs [config/group-chats-enabled? true] (testing "a brand new chat" (let [actual (-> (group-chats/handle-membership-update {:now 0 :db {}} initial-message admin) diff --git a/test/cljs/status_im/test/node/core.cljs b/test/cljs/status_im/test/node/core.cljs index b34770d7a3..ab48ae6e40 100644 --- a/test/cljs/status_im/test/node/core.cljs +++ b/test/cljs/status_im/test/node/core.cljs @@ -21,7 +21,7 @@ (is (= "id" (:InstallationID actual)))))) (testing "pfs & group chats disabled" (with-redefs [config/pfs-encryption-enabled? false - config/group-chats-enabled? (constantly false)] + config/group-chats-enabled? false] (testing "the user is not logged in" (let [actual (parse-node-config (node/start cofx nil))] (is (not (:PFSEnabled actual))))) @@ -37,7 +37,7 @@ (let [actual (parse-node-config (node/start cofx address))] (is (:PFSEnabled actual)))))) (testing "group chats is enabled" - (with-redefs [config/group-chats-enabled? (constantly true)] + (with-redefs [config/group-chats-enabled? true] (testing "the user is not logged in" (let [actual (parse-node-config (node/start cofx nil))] (is (not (:PFSEnabled actual)))))