Merge branch 'develop' into germain-gg/notifications-labs

2023-09-06 19:13:10 +05:30 · 2023-09-06 19:13:10 +05:30 · 9ceac6eae1
commit 9ceac6eae1
parent 44d4de14c9 85be845f16
148 changed files with 14554 additions and 11595 deletions
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@ -343,14 +343,16 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose, on
                    {_t("common|people")}
                    <span className="mx_BaseCard_Button_sublabel">{memberCount}</span>
                </Button>
-                <Button
-                    className="mx_RoomSummaryCard_icon_search"
-                    onClick={() => {
-                        onSearchClick?.();
-                    }}
-                >
-                    {_t("Search")}
-                </Button>
+                {SettingsStore.getValue("feature_new_room_decoration_ui") && (
+                    <Button
+                        className="mx_RoomSummaryCard_icon_search"
+                        onClick={() => {
+                            onSearchClick?.();
+                        }}
+                    >
+                        {_t("Search")}
+                    </Button>
+                )}
                {!isVideoRoom && (
                    <Button className="mx_RoomSummaryCard_icon_files" onClick={onRoomFilesClick}>
                        {_t("Files")}