diff --git a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
index da2ce6be63..377a1d899e 100644
--- a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
+++ b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
@@ -82,6 +82,7 @@ export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCen
closeLabel={_t("action|ok")}
>
diff --git a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
index fb9f324989..4feb167345 100644
--- a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
+++ b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
@@ -26,6 +26,10 @@ import { NotificationLevel } from "../../../../stores/notifications/Notification
import { notificationLevelToIndicator } from "../../../../utils/notifications";
interface ThreadsActivityCentreButtonProps extends ComponentProps {
+ /**
+ * Whether to disable the tooltip.
+ */
+ disableTooltip?: boolean;
/**
* Display the `Threads` label next to the icon.
*/
@@ -40,9 +44,12 @@ interface ThreadsActivityCentreButtonProps extends ComponentProps(
- function ThreadsActivityCentreButton({ displayLabel, notificationLevel, ...props }, ref): React.JSX.Element {
+ function ThreadsActivityCentreButton(
+ { displayLabel, notificationLevel, disableTooltip, ...props },
+ ref,
+ ): React.JSX.Element {
// Disable tooltip when the label is displayed
- const openTooltip = displayLabel ? false : undefined;
+ const openTooltip = disableTooltip || displayLabel ? false : undefined;
return (
diff --git a/test/components/views/spaces/ThreadsActivityCentre-test.tsx b/test/components/views/spaces/ThreadsActivityCentre-test.tsx
index 02d37b53af..b6ed5792bd 100644
--- a/test/components/views/spaces/ThreadsActivityCentre-test.tsx
+++ b/test/components/views/spaces/ThreadsActivityCentre-test.tsx
@@ -118,6 +118,17 @@ describe("ThreadsActivityCentre", () => {
expect(document.body).toMatchSnapshot();
});
+ it("should render not display the tooltip when the release announcement is displayed", async () => {
+ // Enable release announcement
+ await SettingsStore.setValue("feature_release_announcement", null, SettingLevel.DEVICE, true);
+
+ renderTAC();
+
+ // The tooltip should not be displayed
+ await userEvent.hover(getTACButton());
+ expect(screen.queryByRole("tooltip")).toBeNull();
+ });
+
it("should render the threads activity centre button and the display label", async () => {
renderTAC({ displayButtonLabel: true });
expect(getTACButton()).toBeInTheDocument();