Merge branch 'develop' into psf-662/live-share-banner

matrix-org · Mar 16, 2022 · 5fdfb11 · 5fdfb11
2 parents 3a6530d + 59584cd
commit 5fdfb11
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
@@ -131,6 +131,7 @@ import { ViewHomePagePayload } from '../../dispatcher/payloads/ViewHomePagePaylo
 import { AfterLeaveRoomPayload } from '../../dispatcher/payloads/AfterLeaveRoomPayload';
 import { DoAfterSyncPreparedPayload } from '../../dispatcher/payloads/DoAfterSyncPreparedPayload';
 import { ViewStartChatOrReusePayload } from '../../dispatcher/payloads/ViewStartChatOrReusePayload';
+import InfoDialog from '../views/dialogs/InfoDialog';
 
 // legacy export
 export { default as Views } from "../../Views";
@@ -1460,6 +1461,36 @@ 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()['showLabsSettings']) {
+                        Modal.createDialog(InfoDialog, {
+                            title: _t("Threads are no longer experimental! 🎉"),
+                            description: <>
+                                <p>
+                                    { _t("We’ve recently introduced key stability "
+                                    + "improvements for Threads, which also means "
+                                    + "phasing out support for experimental Threads.") }
+                                </p>
+                                <p>
+                                    { _t("All thread events created during the "
+                                    + "experimental period will now be rendered in "
+                                    + "the room timeline and displayed as replies. "
+                                    + "This is a one-off transition. Threads are now "
+                                    + "part of the Matrix specification.") }
+                                </p>
+                                <p>
+                                    { _t("Thank you for helping us testing Threads!") }
+                                </p>
+                            </>,
+                            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
@@ -3090,6 +3090,10 @@
     "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 are no longer experimental! 🎉": "Threads are no longer experimental! 🎉",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.",
+    "Thank you for helping us testing Threads!": "Thank you for helping us testing Threads!",
     "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",