Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit e6cddcb

Browse files
authored
Remove obsolete style rules - mx_SpaceRoomView_inviteTeammates_betaDisclaimer (#11004)
* Remove obsolete style rules - mx_SpaceRoomView_inviteTeammates_betaDisclaimer * Remove the deprecated disclaimer * Remove ExternalLink * Add a Percy snapshot - 'Invite your teammates' dialog
1 parent b35fb4f commit e6cddcb

File tree

4 files changed

+2
-35
lines changed

4 files changed

+2
-35
lines changed

cypress/e2e/spaces/spaces.spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ describe("Spaces", () => {
140140
cy.findByPlaceholderText("Support").type("Projects");
141141
cy.findByRole("button", { name: "Continue" }).click();
142142

143+
cy.get(".mx_SpaceRoomView").percySnapshotElement("Space - 'Invite your teammates' dialog");
144+
143145
cy.get(".mx_SpaceRoomView").within(() => {
144146
cy.get("h1").findByText("Invite your teammates");
145147
cy.findByRole("button", { name: "Skip for now" }).click();

res/css/structures/_SpaceRoomView.pcss

-17
Original file line numberDiff line numberDiff line change
@@ -271,23 +271,6 @@ $SpaceRoomViewInnerWidth: 428px;
271271
}
272272

273273
.mx_SpaceRoomView_inviteTeammates {
274-
/* XXX remove this when spaces leaves Beta */
275-
.mx_SpaceRoomView_inviteTeammates_betaDisclaimer {
276-
padding: 16px;
277-
position: relative;
278-
border-radius: 8px;
279-
background-color: $header-panel-bg-color;
280-
max-width: $SpaceRoomViewInnerWidth;
281-
margin: 20px 0 30px;
282-
box-sizing: border-box;
283-
284-
.mx_BetaCard_betaPill {
285-
position: absolute;
286-
left: 16px;
287-
top: 16px;
288-
}
289-
}
290-
291274
.mx_SpaceRoomView_inviteTeammates_buttons {
292275
color: $secondary-content;
293276
margin-top: 28px;

src/components/structures/SpaceRoomView.tsx

-17
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ import MainSplit from "./MainSplit";
7777
import RightPanel from "./RightPanel";
7878
import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
7979
import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
80-
import ExternalLink from "../views/elements/ExternalLink";
8180

8281
interface IProps {
8382
space: Room;
@@ -586,22 +585,6 @@ const SpaceSetupPrivateInvite: React.FC<{
586585
{_t("Make sure the right people have access. You can invite more later.")}
587586
</div>
588587

589-
<div className="mx_SpaceRoomView_inviteTeammates_betaDisclaimer">
590-
{_t(
591-
"<b>This is an experimental feature.</b> For now, " +
592-
"new users receiving an invite will have to open the invite on <link/> to actually join.",
593-
{},
594-
{
595-
b: (sub) => <b>{sub}</b>,
596-
link: () => (
597-
<ExternalLink href="https://app.element.io/" rel="noreferrer noopener" target="_blank">
598-
app.element.io
599-
</ExternalLink>
600-
),
601-
},
602-
)}
603-
</div>
604-
605588
{error && <div className="mx_SpaceRoomView_errorText">{error}</div>}
606589
<form onSubmit={onClick} id="mx_SpaceSetupPrivateInvite">
607590
{fields}

src/i18n/strings/en_EN.json

-1
Original file line numberDiff line numberDiff line change
@@ -3479,7 +3479,6 @@
34793479
"Inviting…": "Inviting…",
34803480
"Invite your teammates": "Invite your teammates",
34813481
"Make sure the right people have access. You can invite more later.": "Make sure the right people have access. You can invite more later.",
3482-
"<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.",
34833482
"Invite by username": "Invite by username",
34843483
"What are some things you want to discuss in %(spaceName)s?": "What are some things you want to discuss in %(spaceName)s?",
34853484
"Let's create a room for each of them.": "Let's create a room for each of them.",

0 commit comments

Comments
 (0)