From 8080c2cc04864f04eb43aeb9d25e9773c6057ce0 Mon Sep 17 00:00:00 2001
From: Germain <germains@element.io>
Date: Fri, 6 May 2022 09:32:33 +0100
Subject: [PATCH] Remove experimental threads disclaimer (#8445)

---
 src/components/structures/MatrixChat.tsx      | 31 -------------------
 src/i18n/strings/en_EN.json                   |  4 ---
 test/end-to-end-tests/src/usecases/threads.ts |  1 -
 3 files changed, 36 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 328af85314..b7e89b08a4 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -129,7 +129,6 @@ import { DoAfterSyncPreparedPayload } from '../../dispatcher/payloads/DoAfterSyn
 import { ViewStartChatOrReusePayload } from '../../dispatcher/payloads/ViewStartChatOrReusePayload';
 import { IConfigOptions } from "../../IConfigOptions";
 import { SnakedObject } from "../../utils/SnakedObject";
-import InfoDialog from '../views/dialogs/InfoDialog';
 import { leaveRoomBehaviour } from "../../utils/leave-behaviour";
 import VideoChannelStore from "../../stores/VideoChannelStore";
 
@@ -1412,36 +1411,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 showNotificationsToast(false);
             }
 
-            if (!localStorage.getItem("mx_seen_feature_thread_experimental")) {
-                setTimeout(() => {
-                    if (SettingsStore.getValue("feature_thread") && SdkConfig.get("show_labs_settings")) {
-                        Modal.createDialog(InfoDialog, {
-                            title: _t("Threads Approaching Beta 🎉"),
-                            description: <>
-                                <p>
-                                    { _t("We're getting closer to releasing a public Beta for Threads.") }
-                                </p>
-                                <p>
-                                    { _t("As we prepare for it, we need to make some changes: threads created "
-                                       + "before this point will be <strong>displayed as regular replies</strong>.",
-                                    {}, {
-                                        "strong": sub => <strong>{ sub }</strong>,
-                                    }) }
-                                </p>
-                                <p>
-                                    { _t("This will be a one-off transition, as threads are now part "
-                                       + "of the Matrix specification.") }
-                                </p>
-                            </>,
-                            button: _t("Got it"),
-                            onFinished: () => {
-                                localStorage.setItem("mx_seen_feature_thread_experimental", "true");
-                            },
-                        });
-                    }
-                }, 1 * 60 * 1000); // show after 1 minute to not overload user on launch
-            }
-
             if (!localStorage.getItem("mx_seen_feature_spotlight_toast")) {
                 setTimeout(() => {
                     // Skip the toast if the beta is already enabled or the user has changed the setting from default
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a37af4d26c..14669a84aa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -3050,10 +3050,6 @@
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
     "Unable to copy room link": "Unable to copy room link",
     "Unable to copy a link to the room to the clipboard.": "Unable to copy a link to the room to the clipboard.",
-    "Threads Approaching Beta 🎉": "Threads Approaching Beta 🎉",
-    "We're getting closer to releasing a public Beta for Threads.": "We're getting closer to releasing a public Beta for Threads.",
-    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.",
-    "This will be a one-off transition, as threads are now part of the Matrix specification.": "This will be a one-off transition, as threads are now part of the Matrix specification.",
     "New search beta available": "New search beta available",
     "We're testing a new search to make finding what you want quicker.\n": "We're testing a new search to make finding what you want quicker.\n",
     "Signed Out": "Signed Out",
diff --git a/test/end-to-end-tests/src/usecases/threads.ts b/test/end-to-end-tests/src/usecases/threads.ts
index 24ccd7064a..d263f147df 100644
--- a/test/end-to-end-tests/src/usecases/threads.ts
+++ b/test/end-to-end-tests/src/usecases/threads.ts
@@ -21,7 +21,6 @@ import { ElementSession } from "../session";
 export async function enableThreads(session: ElementSession): Promise<void> {
     session.log.step(`enables threads`);
     await session.page.evaluate(() => {
-        window.localStorage.setItem("mx_seen_feature_thread_experimental", "1"); // inhibit dialog
         window["mxSettingsStore"].setValue("feature_thread", null, "device", true);
     });
     session.log.done();