From ea01bc7bafcd986b47663c5e75bf4c223a0a2e06 Mon Sep 17 00:00:00 2001
From: ankur12-1610 <anknerd.12@gmail.com>
Date: Sat, 23 Jul 2022 09:58:42 +0530
Subject: [PATCH] Added conditional rendering for the JoinRule DropDown based
 on labs feature

Signed-off-by: ankur12-1610 <anknerd.12@gmail.com>
---
 src/components/views/dialogs/CreateRoomDialog.tsx  | 9 +++++++--
 src/components/views/elements/JoinRuleDropdown.tsx | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
index 4650a806bf92..003fb992970a 100644
--- a/src/components/views/dialogs/CreateRoomDialog.tsx
+++ b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -20,6 +20,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomType } from "matrix-js-sdk/src/@types/event";
 import { JoinRule, Preset, Visibility } from "matrix-js-sdk/src/@types/partials";
 
+import SettingsStore from '../../../settings/SettingsStore';
 import SdkConfig from '../../../SdkConfig';
 import withValidation, { IFieldState } from '../elements/Validation';
 import { _t } from '../../../languageHandler';
@@ -59,6 +60,7 @@ interface IState {
 
 export default class CreateRoomDialog extends React.Component<IProps, IState> {
     private readonly supportsRestricted: boolean;
+    private readonly knockingEnabled: boolean;
     private nameField = createRef<Field>();
     private aliasField = createRef<RoomAliasField>();
 
@@ -66,12 +68,15 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         super(props);
 
         this.supportsRestricted = !!this.props.parentSpace;
+        this.knockingEnabled = SettingsStore.getValue("feature_knocking");
 
         let joinRule = JoinRule.Invite;
         if (this.props.defaultPublic) {
             joinRule = JoinRule.Public;
         } else if (this.supportsRestricted) {
             joinRule = JoinRule.Restricted;
+        } else if (this.knockingEnabled) {
+            joinRule = JoinRule.Knock;
         }
 
         this.state = {
@@ -269,7 +274,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                 &nbsp;
                 { _t("You can change this at any time from room settings.") }
             </p>;
-        } else if (this.state.joinRule === JoinRule.Knock) {
+        } else if (this.state.joinRule === JoinRule.Knock && this.knockingEnabled) {
             publicPrivateLabel = <p>
                 { _t("Anyone can knock on this room to join.") }
                 &nbsp;
@@ -353,7 +358,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                         <JoinRuleDropdown
                             label={_t("Room visibility")}
                             labelInvite={_t("Private room (invite only)")}
-                            labelKnock = {_t("Anyone can knock to join")}
+                            labelKnock={this.knockingEnabled ? _t("Anyone can knock to join") : undefined}
                             labelPublic={_t("Public room")}
                             labelRestricted={this.supportsRestricted ? _t("Visible to space members") : undefined}
                             value={this.state.joinRule}
diff --git a/src/components/views/elements/JoinRuleDropdown.tsx b/src/components/views/elements/JoinRuleDropdown.tsx
index aaaac314872e..dcb81e8fe1f5 100644
--- a/src/components/views/elements/JoinRuleDropdown.tsx
+++ b/src/components/views/elements/JoinRuleDropdown.tsx
@@ -44,9 +44,6 @@ const JoinRuleDropdown = ({
         <div key={JoinRule.Invite} className="mx_JoinRuleDropdown_invite">
             { labelInvite }
         </div>,
-        <div key={JoinRule.Knock} className="mx_JoinRuleDropdown_knock">
-            { labelKnock }
-        </div>,
         <div key={JoinRule.Public} className="mx_JoinRuleDropdown_public">
             { labelPublic }
         </div>,
@@ -56,6 +53,10 @@ const JoinRuleDropdown = ({
         options.unshift(<div key={JoinRule.Restricted} className="mx_JoinRuleDropdown_restricted">
             { labelRestricted }
         </div>);
+    } else if (labelKnock) {
+        options.unshift(<div key={JoinRule.Knock} className="mx_JoinRuleDropdown_knock">
+            { labelKnock }
+        </div>);
     }
 
     return <Dropdown