From 462d10c043bd8032967e1848bca7f5354466403d Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Sat, 27 May 2023 17:00:39 +0000
Subject: [PATCH 1/4] Remove obsolete style rules -
 mx_SpaceRoomView_inviteTeammates_betaDisclaimer

---
 res/css/structures/_SpaceRoomView.pcss | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss
index 3487253ee7a..5f434a28022 100644
--- a/res/css/structures/_SpaceRoomView.pcss
+++ b/res/css/structures/_SpaceRoomView.pcss
@@ -271,23 +271,6 @@ $SpaceRoomViewInnerWidth: 428px;
     }
 
     .mx_SpaceRoomView_inviteTeammates {
-        /* XXX remove this when spaces leaves Beta */
-        .mx_SpaceRoomView_inviteTeammates_betaDisclaimer {
-            padding: 16px;
-            position: relative;
-            border-radius: 8px;
-            background-color: $header-panel-bg-color;
-            max-width: $SpaceRoomViewInnerWidth;
-            margin: 20px 0 30px;
-            box-sizing: border-box;
-
-            .mx_BetaCard_betaPill {
-                position: absolute;
-                left: 16px;
-                top: 16px;
-            }
-        }
-
         .mx_SpaceRoomView_inviteTeammates_buttons {
             color: $secondary-content;
             margin-top: 28px;

From 7a8d21f0d4285c9215b2f95d413d00dcb1ff33ab Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Mon, 29 May 2023 03:30:08 +0000
Subject: [PATCH 2/4] Remove the deprecated disclaimer

---
 src/components/structures/SpaceRoomView.tsx | 16 ----------------
 src/i18n/strings/en_EN.json                 |  1 -
 2 files changed, 17 deletions(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 1e582add9d6..0b64a592922 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -586,22 +586,6 @@ const SpaceSetupPrivateInvite: React.FC<{
                 {_t("Make sure the right people have access. You can invite more later.")}
             </div>
 
-            <div className="mx_SpaceRoomView_inviteTeammates_betaDisclaimer">
-                {_t(
-                    "<b>This is an experimental feature.</b> For now, " +
-                        "new users receiving an invite will have to open the invite on <link/> to actually join.",
-                    {},
-                    {
-                        b: (sub) => <b>{sub}</b>,
-                        link: () => (
-                            <ExternalLink href="https://app.element.io/" rel="noreferrer noopener" target="_blank">
-                                app.element.io
-                            </ExternalLink>
-                        ),
-                    },
-                )}
-            </div>
-
             {error && <div className="mx_SpaceRoomView_errorText">{error}</div>}
             <form onSubmit={onClick} id="mx_SpaceSetupPrivateInvite">
                 {fields}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ff653aa3c64..f4e329696e0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -3479,7 +3479,6 @@
     "Inviting…": "Inviting…",
     "Invite your teammates": "Invite your teammates",
     "Make sure the right people have access. You can invite more later.": "Make sure the right people have access. You can invite more later.",
-    "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.",
     "Invite by username": "Invite by username",
     "What are some things you want to discuss in %(spaceName)s?": "What are some things you want to discuss in %(spaceName)s?",
     "Let's create a room for each of them.": "Let's create a room for each of them.",

From c650eea56670d30529302e8cebe2f34dd05fbd3c Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Mon, 29 May 2023 04:33:59 +0000
Subject: [PATCH 3/4] Remove ExternalLink

---
 src/components/structures/SpaceRoomView.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 0b64a592922..4e163a820f5 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -77,7 +77,6 @@ import MainSplit from "./MainSplit";
 import RightPanel from "./RightPanel";
 import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
 import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
-import ExternalLink from "../views/elements/ExternalLink";
 
 interface IProps {
     space: Room;

From da60c965e71e99c7088f83d8e4a6f6bc43c6b054 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Mon, 29 May 2023 15:03:55 +0000
Subject: [PATCH 4/4] Add a Percy snapshot - 'Invite your teammates' dialog

---
 cypress/e2e/spaces/spaces.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cypress/e2e/spaces/spaces.spec.ts b/cypress/e2e/spaces/spaces.spec.ts
index 9b1fb241d0d..47228e2bcd1 100644
--- a/cypress/e2e/spaces/spaces.spec.ts
+++ b/cypress/e2e/spaces/spaces.spec.ts
@@ -140,6 +140,8 @@ describe("Spaces", () => {
         cy.findByPlaceholderText("Support").type("Projects");
         cy.findByRole("button", { name: "Continue" }).click();
 
+        cy.get(".mx_SpaceRoomView").percySnapshotElement("Space - 'Invite your teammates' dialog");
+
         cy.get(".mx_SpaceRoomView").within(() => {
             cy.get("h1").findByText("Invite your teammates");
             cy.findByRole("button", { name: "Skip for now" }).click();