From 3ef67acb920a28eefa4f93b3b660531753652d0c Mon Sep 17 00:00:00 2001
From: Prateek Shourya <prateekshourya29@gmail.com>
Date: Fri, 24 May 2024 13:52:22 +0530
Subject: [PATCH 1/3] [WEB-1417] chore: fix size updating issue on create
 workspace form when multiple errors are shown. (#4575)

---
 web/components/onboarding/create-workspace.tsx     | 4 ++--
 web/components/workspace/create-workspace-form.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/components/onboarding/create-workspace.tsx b/web/components/onboarding/create-workspace.tsx
index 57da9fc5a..0dcf04387 100644
--- a/web/components/onboarding/create-workspace.tsx
+++ b/web/components/onboarding/create-workspace.tsx
@@ -224,9 +224,9 @@ export const CreateWorkspace: React.FC<Props> = (props) => {
             )}
           />
           <p className="text-sm text-onboarding-text-300">You can only edit the slug of the URL</p>
-          {slugError && <span className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</span>}
+          {slugError && <p className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</p>}
           {invalidSlug && (
-            <span className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</span>
+            <p className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</p>
           )}
         </div>
         <hr className="w-full border-onboarding-border-100" />
diff --git a/web/components/workspace/create-workspace-form.tsx b/web/components/workspace/create-workspace-form.tsx
index 9ccaa813d..d96bf093f 100644
--- a/web/components/workspace/create-workspace-form.tsx
+++ b/web/components/workspace/create-workspace-form.tsx
@@ -188,9 +188,9 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
               )}
             />
           </div>
-          {slugError && <span className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</span>}
+          {slugError && <p className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</p>}
           {invalidSlug && (
-            <span className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</span>
+            <p className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</p>
           )}
         </div>
         <div className="space-y-1 text-sm">

From f5d95ba3a155fe1af855d38b2a4bac85a111f6a0 Mon Sep 17 00:00:00 2001
From: Prateek Shourya <prateekshourya29@gmail.com>
Date: Fri, 24 May 2024 13:52:37 +0530
Subject: [PATCH 2/3] chore: minor improvement in admin service provider field.
 (#4577)

---
 admin/components/common/copy-field.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/components/common/copy-field.tsx b/admin/components/common/copy-field.tsx
index 47e1a3364..6322356b4 100644
--- a/admin/components/common/copy-field.tsx
+++ b/admin/components/common/copy-field.tsx
@@ -24,7 +24,7 @@ export const CopyField: React.FC<Props> = (props) => {
 
   return (
     <div className="flex flex-col gap-1">
-      <h4 className="text-sm text-custom-text-300">{label}</h4>
+      <h4 className="text-sm text-custom-text-200">{label}</h4>
       <Button
         variant="neutral-primary"
         className="flex items-center justify-between py-2"
@@ -40,7 +40,7 @@ export const CopyField: React.FC<Props> = (props) => {
         <p className="text-sm font-medium">{url}</p>
         <Copy size={18} color="#B9B9B9" />
       </Button>
-      <div className="text-xs text-custom-text-400">{description}</div>
+      <div className="text-xs text-custom-text-300">{description}</div>
     </div>
   );
 };

From 4bb4609833bc5f463644a3d35605ad92949f7e64 Mon Sep 17 00:00:00 2001
From: Prateek Shourya <prateekshourya29@gmail.com>
Date: Fri, 24 May 2024 13:56:20 +0530
Subject: [PATCH 3/3] [WEB-1413] chore: update label creation toast error
 message. (#4572)

---
 web/components/labels/create-label-modal.tsx         | 4 ++--
 web/components/labels/create-update-label-inline.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/components/labels/create-label-modal.tsx b/web/components/labels/create-label-modal.tsx
index 0de255c8c..18bed7a3a 100644
--- a/web/components/labels/create-label-modal.tsx
+++ b/web/components/labels/create-label-modal.tsx
@@ -73,9 +73,9 @@ export const CreateLabelModal: React.FC<Props> = observer((props) => {
       })
       .catch((error) => {
         setToast({
-          title: "Oops!",
+          title: "Error!",
           type: TOAST_TYPE.ERROR,
-          message: error?.error ?? "Error while adding the label",
+          message: error?.detail ?? "Something went wrong. Please try again later.",
         });
         reset(formData);
       });
diff --git a/web/components/labels/create-update-label-inline.tsx b/web/components/labels/create-update-label-inline.tsx
index 2aa8851c9..280ae55d9 100644
--- a/web/components/labels/create-update-label-inline.tsx
+++ b/web/components/labels/create-update-label-inline.tsx
@@ -63,9 +63,9 @@ export const CreateUpdateLabelInline = observer(
         })
         .catch((error) => {
           setToast({
-            title: "Oops!",
+            title: "Error!",
             type: TOAST_TYPE.ERROR,
-            message: error?.error ?? "Error while adding the label",
+            message: error?.detail ?? "Something went wrong. Please try again later.",
           });
           reset(formData);
         });