From b035a2130989d22134cdbcbdd33a657cb825fc55 Mon Sep 17 00:00:00 2001
From: Jan Keromnes <janx@linux.com>
Date: Thu, 6 Oct 2022 09:07:40 +0000
Subject: [PATCH] [dashboard] Don't double-encapsulate Alert contents in
 <span/> or <p/>

---
 components/dashboard/src/AppNotifications.tsx          |  2 +-
 components/dashboard/src/admin/BlockedRepositories.tsx |  8 +++-----
 components/dashboard/src/admin/WorkspacesSearch.tsx    |  2 +-
 components/dashboard/src/components/ErrorMessage.tsx   |  2 +-
 components/dashboard/src/projects/Projects.tsx         | 10 ++++------
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/components/dashboard/src/AppNotifications.tsx b/components/dashboard/src/AppNotifications.tsx
index c6961a1352de62..662cf934806479 100644
--- a/components/dashboard/src/AppNotifications.tsx
+++ b/components/dashboard/src/AppNotifications.tsx
@@ -74,7 +74,7 @@ export function AppNotifications() {
                 showIcon={true}
                 className="flex rounded mb-2 w-full"
             >
-                <span>{topNotification}</span>
+                {topNotification}
                 {getManageBilling()}
             </Alert>
         </div>
diff --git a/components/dashboard/src/admin/BlockedRepositories.tsx b/components/dashboard/src/admin/BlockedRepositories.tsx
index 35d3908460f771..5c7406b80665fd 100644
--- a/components/dashboard/src/admin/BlockedRepositories.tsx
+++ b/components/dashboard/src/admin/BlockedRepositories.tsx
@@ -149,9 +149,7 @@ export function BlockedRepositoriesList(props: Props) {
             </div>
 
             <Alert type={"info"} closable={false} showIcon={true} className="flex rounded p-2 mb-2 w-full">
-                <span>
-                    Search entries by their repository URL <abbr title="regular expression">RegEx</abbr>.
-                </span>
+                Search entries by their repository URL <abbr title="regular expression">RegEx</abbr>.
             </Alert>
             <div className="flex flex-col space-y-2">
                 <div className="px-6 py-3 flex justify-between text-sm text-gray-400 border-t border-b border-gray-200 dark:border-gray-800 mb-2">
@@ -242,10 +240,10 @@ function AddBlockedRepositoryModal(p: AddBlockedRepositoryModalProps) {
             ]}
         >
             <Alert type={"warning"} closable={false} showIcon={true} className="flex rounded p-2 w-2/3 mb-2 w-full">
-                <span>Entries in this table have an immediate effect on all users. Please use it carefully.</span>
+                Entries in this table have an immediate effect on all users. Please use it carefully.
             </Alert>
             <Alert type={"message"} closable={false} showIcon={true} className="flex rounded p-2 w-2/3 mb-2 w-full">
-                <span>Repositories are blocked by matching their URL against this regular expression.</span>
+                Repositories are blocked by matching their URL against this regular expression.
             </Alert>
             <Details br={br} update={update} error={error} />
         </Modal>
diff --git a/components/dashboard/src/admin/WorkspacesSearch.tsx b/components/dashboard/src/admin/WorkspacesSearch.tsx
index a8790154d9e6b3..85441ae462bbf9 100644
--- a/components/dashboard/src/admin/WorkspacesSearch.tsx
+++ b/components/dashboard/src/admin/WorkspacesSearch.tsx
@@ -147,7 +147,7 @@ export function WorkspaceSearch(props: Props) {
                 </div>
             </div>
             <Alert type={"info"} closable={false} showIcon={true} className="flex rounded p-2 mb-2 w-full">
-                <span>Search workspaces using workspace ID.</span>
+                Search workspaces using workspace ID.
             </Alert>
             <div className="flex flex-col space-y-2">
                 <div className="px-6 py-3 flex justify-between text-sm text-gray-400 border-t border-b border-gray-200 dark:border-gray-800 mb-2">
diff --git a/components/dashboard/src/components/ErrorMessage.tsx b/components/dashboard/src/components/ErrorMessage.tsx
index e32bce0c81c341..8812c01a07a220 100644
--- a/components/dashboard/src/components/ErrorMessage.tsx
+++ b/components/dashboard/src/components/ErrorMessage.tsx
@@ -13,7 +13,7 @@ function ErrorMessage(props: { imgSrc: string; imgAlt?: string; message: string
         <>
             <div className="mt-16 w-96">
                 <Alert closable={false} showIcon={true} type="error">
-                    <span>{props.message}</span>
+                    {props.message}
                 </Alert>
             </div>
             {isGitpodIo() && (
diff --git a/components/dashboard/src/projects/Projects.tsx b/components/dashboard/src/projects/Projects.tsx
index e900d3f369e80f..97fc97f003cb0a 100644
--- a/components/dashboard/src/projects/Projects.tsx
+++ b/components/dashboard/src/projects/Projects.tsx
@@ -133,12 +133,10 @@ export default function () {
             {!team && (
                 <div className="app-container pt-2">
                     <Alert type={"message"} closable={false} showIcon={true} className="flex rounded mb-2 w-full">
-                        <p>
-                            We'll remove projects under personal accounts in Q1'2023.{" "}
-                            <Link to="/new" className="gp-link">
-                                Create a team.
-                            </Link>
-                        </p>
+                        We'll remove projects under personal accounts in Q1'2023.{" "}
+                        <Link to="/new" className="gp-link">
+                            Create a team.
+                        </Link>
                     </Alert>
                 </div>
             )}