diff --git a/apps/web/src/i18n/strings/en_EN.json b/apps/web/src/i18n/strings/en_EN.json index 905e4861b5..fe5e15e54e 100644 --- a/apps/web/src/i18n/strings/en_EN.json +++ b/apps/web/src/i18n/strings/en_EN.json @@ -1554,7 +1554,6 @@ "notification_settings_beta_caption": "Introducing a simpler way to change your notification settings. Customize your %(brand)s, just the way you like.", "notification_settings_beta_title": "Notification Settings", "notifications": "Enable the notifications panel in the room header", - "release_announcement": "Release announcement", "render_reaction_images": "Render custom images in reactions", "render_reaction_images_description": "Sometimes referred to as \"custom emojis\".", "report_to_moderators": "Report to moderators", diff --git a/apps/web/src/settings/Settings.tsx b/apps/web/src/settings/Settings.tsx index 32b3a02bd9..f808c85768 100644 --- a/apps/web/src/settings/Settings.tsx +++ b/apps/web/src/settings/Settings.tsx @@ -99,7 +99,6 @@ export enum LabGroup { export enum Features { NotificationSettings2 = "feature_notification_settings2", - ReleaseAnnouncement = "feature_release_announcement", } export const labGroupNames: Record = { @@ -206,7 +205,6 @@ export interface Settings { // [settingName: `feature_${string}`]: IFeature; "feature_video_rooms": IFeature; [Features.NotificationSettings2]: IFeature; - [Features.ReleaseAnnouncement]: IFeature; "feature_msc3531_hide_messages_pending_moderation": IFeature; "feature_report_to_moderators": IFeature; "feature_latex_maths": IFeature; @@ -1356,16 +1354,6 @@ export const SETTINGS: Settings = { // Contains room IDs shouldExportToRageshake: false, }, - /** - * Enable or disable the release announcement feature - */ - [Features.ReleaseAnnouncement]: { - isFeature: true, - labsGroup: LabGroup.Ui, - supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG, - default: true, - displayName: _td("labs|release_announcement"), - }, /** * Managed by the {@link ReleaseAnnouncementStore} * Store the release announcement data diff --git a/apps/web/src/stores/ReleaseAnnouncementStore.ts b/apps/web/src/stores/ReleaseAnnouncementStore.ts index f005fd4b30..7d37cf2853 100644 --- a/apps/web/src/stores/ReleaseAnnouncementStore.ts +++ b/apps/web/src/stores/ReleaseAnnouncementStore.ts @@ -12,7 +12,6 @@ import { cloneDeep } from "lodash"; import SettingsStore from "../settings/SettingsStore"; import { SettingLevel } from "../settings/SettingLevel"; -import { Features } from "../settings/Settings"; import ToastStore from "./ToastStore"; /** @@ -60,6 +59,12 @@ export class ReleaseAnnouncementStore extends TypedEventEmitter 0) return null; @@ -133,9 +143,8 @@ export class ReleaseAnnouncementStore extends TypedEventEmitter { - // Do nothing if the release announcement is disabled - const isReleaseAnnouncementEnabled = this.isReleaseAnnouncementEnabled(); - if (!isReleaseAnnouncementEnabled) return; + // Do nothing if the release announcement is disabled; + if (!this.enabled) return; const viewedReleaseAnnouncements = this.getViewedReleaseAnnouncements(); diff --git a/apps/web/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx b/apps/web/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx index 7a7a735c9a..44d40f91d8 100644 --- a/apps/web/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx +++ b/apps/web/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx @@ -26,7 +26,6 @@ describe("ReleaseAnnouncementStore", () => { beforeEach(() => { // Default settings settings = { - feature_release_announcement: true, releaseAnnouncementData: {}, }; const watchCallbacks: Array = []; @@ -58,13 +57,6 @@ describe("ReleaseAnnouncementStore", () => { releaseAnnouncementStore = new ReleaseAnnouncementStore(); }); - /** - * Disables the release announcement feature. - */ - function disableReleaseAnnouncement() { - settings["feature_release_announcement"] = false; - } - /** * Listens to the next release announcement change event. */ @@ -79,8 +71,7 @@ describe("ReleaseAnnouncementStore", () => { }); it("should return null when the release announcement is disabled", async () => { - disableReleaseAnnouncement(); - + releaseAnnouncementStore.disable(); expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBeNull(); // Wait for the next release announcement change event