From a5e186b9786c387c999ecc70251ba01059add194 Mon Sep 17 00:00:00 2001
From: Germain <germains@element.io>
Date: Thu, 31 Aug 2023 21:21:32 +0100
Subject: [PATCH] Move notifications bell back in labs

---
 src/components/views/rooms/RoomHeader.tsx | 22 +++++++++++++---------
 src/i18n/strings/en_EN.json               |  3 ++-
 src/settings/Settings.tsx                 |  8 ++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/components/views/rooms/RoomHeader.tsx b/src/components/views/rooms/RoomHeader.tsx
index 05e649bddb..21f6e4e939 100644
--- a/src/components/views/rooms/RoomHeader.tsx
+++ b/src/components/views/rooms/RoomHeader.tsx
@@ -106,6 +106,8 @@ export default function RoomHeader({ room }: { room: Room }): JSX.Element {
     }, [room, directRoomsList]);
     const e2eStatus = useEncryptionStatus(client, room);
 
+    const notificationsEnabled = useFeatureEnabled("feature_notifications");
+
     return (
         <Flex
             as="header"
@@ -187,15 +189,17 @@ export default function RoomHeader({ room }: { room: Room }): JSX.Element {
                 >
                     <ThreadsIcon />
                 </IconButton>
-                <IconButton
-                    indicator={notificationColorToIndicator(globalNotificationState.color)}
-                    onClick={() => {
-                        showOrHidePanel(RightPanelPhases.NotificationPanel);
-                    }}
-                    title={_t("Notifications")}
-                >
-                    <NotificationsIcon />
-                </IconButton>
+                {notificationsEnabled && (
+                    <IconButton
+                        indicator={notificationColorToIndicator(globalNotificationState.color)}
+                        onClick={() => {
+                            showOrHidePanel(RightPanelPhases.NotificationPanel);
+                        }}
+                        title={_t("Notifications")}
+                    >
+                        <NotificationsIcon />
+                    </IconButton>
+                )}
             </Flex>
             {!isDirectMessage && (
                 <BodyText
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index df6f023a73..6015df0ec6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -868,7 +868,8 @@
         "hidebold": "Hide notification dot (only display counters badges)",
         "intentional_mentions": "Enable intentional mentions",
         "ask_to_join": "Enable ask to join",
-        "new_room_decoration_ui": "Under active development, new room header & details interface"
+        "new_room_decoration_ui": "Under active development, new room header & details interface",
+        "notifications": "Notifications panel"
     },
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Thank you for trying the beta, please go into as much detail as you can so we can improve it.",
     "Notification Settings": "Notification Settings",
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 55651f3e48..db3fc59eb0 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -552,6 +552,14 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         default: false,
         controller: new ReloadOnChangeController(),
     },
+    "feature_notifications": {
+        isFeature: true,
+        labsGroup: LabGroup.Messaging,
+        displayName: _td("labs|notifications"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+        controller: new ReloadOnChangeController(),
+    },
     "useCompactLayout": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("Use a more compact 'Modern' layout"),