Remove release announcement on thread activity centre (#29892)

* Remove release announcement on thread activity centre

Signed-off-by: Michael Telatynski <[email protected]>

* Update tests

Signed-off-by: Michael Telatynski <[email protected]>

* Update tests

Signed-off-by: Michael Telatynski <[email protected]>

* Update tests

Signed-off-by: Michael Telatynski <[email protected]>

---------

Signed-off-by: Michael Telatynski <[email protected]>

Author: t3chguy

playwright/e2e/release-announcement/releaseAnnouncement.spec.ts

@@ -15,20 +15,34 @@ test.describe("Release announcement", () => {
                 feature_release_announcement: true,
             },
         },
-        labsFlags: ["threadsActivityCentre"],
+        room: async ({ app, user }, use) => {
+            const roomId = await app.client.createRoom({
+                name: "Test room",
+            });
+            await app.viewRoomById(roomId);
+            await use({ roomId });
+        },
     });
 
-    test("should display the release announcement process", { tag: "@screenshot" }, async ({ page, app, util }) => {
-        // The TAC release announcement should be displayed
-        await util.assertReleaseAnnouncementIsVisible("Threads Activity Centre");
-        // Hide the release announcement
-        await util.markReleaseAnnouncementAsRead("Threads Activity Centre");
-        await util.assertReleaseAnnouncementIsNotVisible("Threads Activity Centre");
+    test(
+        "should display the pinned messages release announcement",
+        { tag: "@screenshot" },
+        async ({ page, app, room, util }) => {
+            await app.toggleRoomInfoPanel();
 
-        await page.reload();
-        // Wait for EW to load
-        await expect(page.getByRole("navigation", { name: "Spaces" })).toBeVisible();
-        // Check that once the release announcement has been marked as viewed, it does not appear again
-        await util.assertReleaseAnnouncementIsNotVisible("Threads Activity Centre");
-    });
+            const name = "All new pinned messages";
+
+            // The release announcement should be displayed
+            await util.assertReleaseAnnouncementIsVisible(name);
+            // Hide the release announcement
+            await util.markReleaseAnnouncementAsRead(name);
+            await util.assertReleaseAnnouncementIsNotVisible(name);
+
+            await page.reload();
+            await app.toggleRoomInfoPanel();
+            await expect(page.getByRole("menuitem", { name: "Pinned messages" })).toBeVisible();
+            // Check that once the release announcement has been marked as viewed, it does not appear again
+            await util.assertReleaseAnnouncementIsNotVisible(name);
+        },
+    );
 });

playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts

@@ -19,7 +19,6 @@ test.describe("Threads Activity Centre", { tag: "@no-firefox" }, () => {
     test.use({
         displayName: "Alice",
         botCreateOpts: { displayName: "Other User" },
-        labsFlags: ["threadsActivityCentre"],
     });
 
     test(

playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-All-new-pinned-messages-linux.png

@@ -24,10 +24,7 @@ import { type NotificationLevel } from "../../../../stores/notifications/Notific
 import PosthogTrackers from "../../../../PosthogTrackers";
 import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../../accessibility/KeyboardShortcuts";
-import { ReleaseAnnouncement } from "../../../structures/ReleaseAnnouncement";
-import { useIsReleaseAnnouncementOpen } from "../../../../hooks/useIsReleaseAnnouncementOpen";
 import { useSettingValue } from "../../../../hooks/useSettings";
-import { ReleaseAnnouncementStore } from "../../../../stores/ReleaseAnnouncementStore";
 
 interface ThreadsActivityCentreProps {
     /**
@@ -43,7 +40,6 @@ interface ThreadsActivityCentreProps {
 export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCentreProps): JSX.Element {
     const [open, setOpen] = useState(false);
     const roomsAndNotifications = useUnreadThreadRooms(open);
-    const isReleaseAnnouncementOpen = useIsReleaseAnnouncementOpen("threadsActivityCentre");
     const settingTACOnlyNotifs = useSettingValue("Notifications.tac_only_notifications");
 
     const emptyCaption = settingTACOnlyNotifs
@@ -65,59 +61,39 @@ export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCen
                 }
             }}
         >
-            {isReleaseAnnouncementOpen ? (
-                <ReleaseAnnouncement
-                    feature="threadsActivityCentre"
-                    header={_t("threads_activity_centre|release_announcement_header")}
-                    description={_t("threads_activity_centre|release_announcement_description")}
-                    closeLabel={_t("action|ok")}
-                >
+            <Menu
+                align="start"
+                side="top"
+                open={open}
+                onOpenChange={(newOpen) => {
+                    // Track only when the Threads Activity Centre is opened
+                    if (newOpen) PosthogTrackers.trackInteraction("WebThreadsActivityCentreButton");
+
+                    setOpen(newOpen);
+                }}
+                title={_t("threads_activity_centre|header")}
+                trigger={
                     <ThreadsActivityCentreButton
-                        disableTooltip={true}
                         displayLabel={displayButtonLabel}
                         notificationLevel={roomsAndNotifications.greatestNotificationLevel}
-                        onClick={async () => {
-                            // Open the TAC after the release announcement closing
-                            setOpen(true);
-                            await ReleaseAnnouncementStore.instance.nextReleaseAnnouncement();
-                        }}
                     />
-                </ReleaseAnnouncement>
-            ) : (
-                <Menu
-                    align="start"
-                    side="top"
-                    open={open}
-                    onOpenChange={(newOpen) => {
-                        // Track only when the Threads Activity Centre is opened
-                        if (newOpen) PosthogTrackers.trackInteraction("WebThreadsActivityCentreButton");
-
-                        setOpen(newOpen);
-                    }}
-                    title={_t("threads_activity_centre|header")}
-                    trigger={
-                        <ThreadsActivityCentreButton
-                            displayLabel={displayButtonLabel}
-                            notificationLevel={roomsAndNotifications.greatestNotificationLevel}
+                }
+            >
+                {/* Make the content of the pop-up scrollable */}
+                <div className="mx_ThreadsActivityCentre_rows">
+                    {roomsAndNotifications.rooms.map(({ room, notificationLevel }) => (
+                        <ThreadsActivityCentreRow
+                            key={room.roomId}
+                            room={room}
+                            notificationLevel={notificationLevel}
+                            onClick={() => setOpen(false)}
                         />
-                    }
-                >
-                    {/* Make the content of the pop-up scrollable */}
-                    <div className="mx_ThreadsActivityCentre_rows">
-                        {roomsAndNotifications.rooms.map(({ room, notificationLevel }) => (
-                            <ThreadsActivityCentreRow
-                                key={room.roomId}
-                                room={room}
-                                notificationLevel={notificationLevel}
-                                onClick={() => setOpen(false)}
-                            />
-                        ))}
-                        {roomsAndNotifications.rooms.length === 0 && (
-                            <div className="mx_ThreadsActivityCentre_emptyCaption">{emptyCaption}</div>
-                        )}
-                    </div>
-                </Menu>
-            )}
+                    ))}
+                    {roomsAndNotifications.rooms.length === 0 && (
+                        <div className="mx_ThreadsActivityCentre_emptyCaption">{emptyCaption}</div>
+                    )}
+                </div>
+            </Menu>
         </div>
     );
 }

playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png

@@ -3292,9 +3292,7 @@
     "threads_activity_centre": {
         "header": "Threads activity",
         "no_rooms_with_threads_notifs": "You don't have rooms with thread notifications yet.",
-        "no_rooms_with_unread_threads": "You don't have rooms with unread threads yet.",
-        "release_announcement_description": "Threads notifications have moved, find them here from now on.",
-        "release_announcement_header": "Threads Activity Centre"
+        "no_rooms_with_unread_threads": "You don't have rooms with unread threads yet."
     },
     "time": {
         "about_day_ago": "about a day ago",

src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx

@@ -17,7 +17,7 @@ import { Features } from "../settings/Settings";
 /**
  * The features are shown in the array order.
  */
-const FEATURES = ["threadsActivityCentre", "pinningMessageList"] as const;
+const FEATURES = ["pinningMessageList"] as const;
 /**
  * All the features that can be shown in the release announcements.
  */

src/i18n/strings/en_EN.json

@@ -23,7 +23,7 @@ describe("ReleaseAnnouncement", () => {
     function renderReleaseAnnouncement() {
         return render(
             <ReleaseAnnouncement
-                feature="threadsActivityCentre"
+                feature="pinningMessageList"
                 header="header"
                 description="description"
                 closeLabel="close"

src/stores/ReleaseAnnouncementStore.ts

@@ -31,6 +31,8 @@ import { tagRoom } from "../../../../../src/utils/room/tagRoom";
 import { DefaultTagID } from "../../../../../src/stores/room-list/models";
 import { Action } from "../../../../../src/dispatcher/actions";
 import { ReportRoomDialog } from "../../../../../src/components/views/dialogs/ReportRoomDialog.tsx";
+import SettingsStore from "../../../../../src/settings/SettingsStore.ts";
+import { SettingLevel } from "../../../../../src/settings/SettingLevel.ts";
 
 jest.mock("../../../../../src/utils/room/tagRoom");
 
@@ -78,6 +80,8 @@ describe("<RoomSummaryCard />", () => {
         jest.clearAllMocks();
         DMRoomMap.makeShared(mockClient);
 
+        SettingsStore.setValue("releaseAnnouncementData", null, SettingLevel.DEVICE, { pinningMessageList: true });
+
         mockClient.getRoom.mockReturnValue(room);
         jest.spyOn(room, "isElementVideoRoom").mockRestore();
         jest.spyOn(room, "isCallRoom").mockRestore();

test/unit-tests/components/structures/ReleaseAnnouncement-test.tsx

@@ -8,7 +8,6 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
   >
     <div
       class="mx_UserMenu"
-      data-floating-ui-inert=""
     >
       <div
         aria-expanded="false"
@@ -43,7 +42,6 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
     <ul
       aria-label="Spaces"
       class="mx_AutoHideScrollbar mx_SpaceTreeLevel"
-      data-floating-ui-inert=""
       data-rbd-droppable-context-id="0"
       data-rbd-droppable-id="top-level-spaces"
       role="tree"
@@ -231,17 +229,18 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       class="mx_ThreadsActivityCentre_container"
     >
       <button
-        aria-controls="«r12»"
-        aria-describedby="«r12»"
-        aria-expanded="true"
-        aria-haspopup="dialog"
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
         aria-label="Threads"
-        aria-labelledby="«r14»"
+        aria-labelledby="«r12»"
         class="_icon-button_m2erp_8 mx_ThreadsActivityCentreButton"
-        data-floating-ui-inert=""
+        data-state="closed"
+        id="radix-«r10»"
         role="button"
         style="--cpd-icon-button-size: 32px;"
         tabindex="0"
+        type="button"
       >
         <div
           class="_indicator-icon_zr2a0_17"
@@ -261,37 +260,11 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
           </svg>
         </div>
       </button>
-      <span
-        aria-hidden="true"
-        data-floating-ui-inert=""
-        style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-        tabindex="-1"
-      />
-      <span
-        data-floating-ui-focus-guard=""
-        data-type="outside"
-        role="button"
-        style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-        tabindex="0"
-      />
-      <span
-        aria-owns="«r19»"
-        data-floating-ui-inert=""
-        style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-      />
-      <span
-        data-floating-ui-focus-guard=""
-        data-type="outside"
-        role="button"
-        style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
-        tabindex="0"
-      />
     </div>
     <div
       aria-expanded="false"
       aria-label="Quick settings"
       class="mx_AccessibleButton mx_QuickSettingsButton"
-      data-floating-ui-inert=""
       role="button"
       tabindex="0"
     />