From 59f57e15fe88110935d9725c3cb935fda2a48e09 Mon Sep 17 00:00:00 2001
From: Timo <16718859+toger5@users.noreply.github.com>
Date: Tue, 11 Jan 2022 14:11:48 +0100
Subject: [PATCH] Ship maximised widgets and remove feature flag (#7509)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RightPanel.tsx               | 1 -
 src/components/structures/RoomView.tsx                 | 1 -
 src/components/views/elements/AppTile.tsx              | 2 +-
 src/components/views/right_panel/RoomHeaderButtons.tsx | 1 -
 src/components/views/right_panel/RoomSummaryCard.tsx   | 8 ++------
 src/i18n/strings/en_EN.json                            | 1 -
 src/settings/Settings.tsx                              | 7 -------
 7 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index 6effdc7dd4..be14c70f00 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -260,7 +260,6 @@ export default class RightPanel extends React.Component<IProps, IState> {
                 }
                 break;
             case RightPanelPhases.Timeline:
-                if (!SettingsStore.getValue("feature_maximised_widgets")) break;
                 card = <TimelineCard
                     classNames="mx_ThreadPanel mx_TimelineCard"
                     room={this.props.room}
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 315fe8c3a2..06e5d6ef87 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -2172,7 +2172,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 // keep the timeline in as the mainSplitBody
                 break;
             case MainSplitContentType.MaximisedWidget:
-                if (!SettingsStore.getValue("feature_maximised_widgets")) break;
                 mainSplitBody = <AppsDrawer
                     room={this.state.room}
                     userId={this.context.credentials.userId}
diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx
index 0d45d9145e..56543bbf18 100644
--- a/src/components/views/elements/AppTile.tsx
+++ b/src/components/views/elements/AppTile.tsx
@@ -542,7 +542,7 @@ export default class AppTile extends React.Component<IProps, IState> {
             );
         }
         let maxMinButton;
-        if (SettingsStore.getValue("feature_maximised_widgets") && !this.props.hideMaximiseButton) {
+        if (!this.props.hideMaximiseButton) {
             const widgetIsMaximised = WidgetLayoutStore.instance.
                 isInContainer(this.props.room, this.props.app, Container.Center);
             maxMinButton = <AccessibleButton
diff --git a/src/components/views/right_panel/RoomHeaderButtons.tsx b/src/components/views/right_panel/RoomHeaderButtons.tsx
index 2864caed18..783b9ae740 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.tsx
+++ b/src/components/views/right_panel/RoomHeaderButtons.tsx
@@ -97,7 +97,6 @@ const PinnedMessagesHeaderButton = ({ room, isHighlighted, onClick }: IHeaderBut
 };
 
 const TimelineCardHeaderButton = ({ room, isHighlighted, onClick }: IHeaderButtonProps) => {
-    if (!SettingsStore.getValue("feature_maximised_widgets")) return null;
     let unreadIndicator;
     const color = RoomNotificationStateStore.instance.getRoomState(room).color;
     switch (color) {
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index 5f0eca0551..3bdf7627b3 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -169,10 +169,7 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
         </AccessibleTooltipButton>
 
         { canModifyWidget && <ContextMenuTooltipButton
-            className={classNames({
-                "mx_RoomSummaryCard_app_options": true,
-                "mx_RoomSummaryCard_maximised_widget": SettingsStore.getValue("feature_maximised_widgets"),
-            })}
+            className="mx_RoomSummaryCard_app_options mx_RoomSummaryCard_maximised_widget"
             isExpanded={menuDisplayed}
             onClick={openMenu}
             title={_t("Options")}
@@ -186,13 +183,12 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
             disabled={cannotPin}
             yOffset={-24}
         />
-        { SettingsStore.getValue("feature_maximised_widgets") &&
         <AccessibleTooltipButton
             className={isMaximised ? "mx_RoomSummaryCard_app_minimise" : "mx_RoomSummaryCard_app_maximise"}
             onClick={toggleMaximised}
             title={maximiseTitle}
             yOffset={-24}
-        /> }
+        />
 
         { contextMenu }
     </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 57e11f3c91..308cf4736a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -865,7 +865,6 @@
     "Render LaTeX maths in messages": "Render LaTeX maths in messages",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
     "Message Pinning": "Message Pinning",
-    "Maximised widgets": "Maximised widgets",
     "Threaded messaging": "Threaded messaging",
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index f09eca8349..eb18eed35f 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -215,13 +215,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_maximised_widgets": {
-        isFeature: true,
-        labsGroup: LabGroup.Widgets,
-        displayName: _td("Maximised widgets"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_thread": {
         isFeature: true,
         labsGroup: LabGroup.Messaging,