From 0117d513eaacb9951c0125a1c27eede4956fd57e Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Tue, 13 Jul 2021 23:08:43 -0400
Subject: [PATCH] Consolidate disabling of history options

Signed-off-by: Robin Townsend <robin@robin.town>
---
 .../views/settings/tabs/room/SecurityRoomSettingsTab.tsx     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index 2863cabfb3..78d8fecf3b 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -350,17 +350,14 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         const options = [
             {
                 value: HistoryVisibility.Shared,
-                disabled: !canChangeHistory,
                 label: _t('Members only (since the point in time of selecting this option)'),
             },
             {
                 value: HistoryVisibility.Invited,
-                disabled: !canChangeHistory,
                 label: _t('Members only (since they were invited)'),
             },
             {
                 value: HistoryVisibility.Joined,
-                disabled: !canChangeHistory,
                 label: _t('Members only (since they joined)'),
             },
         ];
@@ -369,7 +366,6 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         if (!this.state.encrypted || history === HistoryVisibility.WorldReadable) {
             options.unshift({
                 value: HistoryVisibility.WorldReadable,
-                disabled: !canChangeHistory,
                 label: _t("Anyone"),
             });
         }
@@ -384,6 +380,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                     name="historyVis"
                     value={history}
                     onChange={this.onHistoryRadioToggle}
+                    disabled={!canChangeHistory}
                     definitions={options}
                 />
             </div>