From d093bb1f0086ec62d761106fbab185ffd6dc057d Mon Sep 17 00:00:00 2001
From: Sean Zubrickas <zubricks@gmail.com>
Date: Mon, 28 Jul 2025 05:59:25 -0700
Subject: [PATCH] fix: refactors toast error rendering (#13252)

Fixes #13191

- Render a single html element for single error messages
- Preserve ul structure for multiple errors
- Updates tests to check for both cases
---
 .../ui/src/elements/Toasts/fieldErrors.tsx    | 14 ++++++---
 test/helpers/assertToastErrors.ts             | 31 +++++++++++--------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/packages/ui/src/elements/Toasts/fieldErrors.tsx b/packages/ui/src/elements/Toasts/fieldErrors.tsx
index b0d110d7b..97d984ef9 100644
--- a/packages/ui/src/elements/Toasts/fieldErrors.tsx
+++ b/packages/ui/src/elements/Toasts/fieldErrors.tsx
@@ -63,11 +63,15 @@ export function FieldErrorsToast({ errorMessage }) {
     <div>
       {message}
       {Array.isArray(errors) && errors.length > 0 ? (
-        <ul data-testid="field-errors">
-          {errors.map((error, index) => {
-            return <li key={index}>{error}</li>
-          })}
-        </ul>
+        errors.length === 1 ? (
+          <span data-testid="field-error">{errors[0]}</span>
+        ) : (
+          <ul data-testid="field-errors">
+            {errors.map((error, index) => {
+              return <li key={index}>{error}</li>
+            })}
+          </ul>
+        )
       ) : null}
     </div>
   )
diff --git a/test/helpers/assertToastErrors.ts b/test/helpers/assertToastErrors.ts
index 3d1667184..4067ec73d 100644
--- a/test/helpers/assertToastErrors.ts
+++ b/test/helpers/assertToastErrors.ts
@@ -11,19 +11,24 @@ export async function assertToastErrors({
   errors: string[]
   page: Page
 }): Promise<void> {
-  const message =
-    errors.length === 1
-      ? 'The following field is invalid:'
-      : `The following fields are invalid (${errors.length}):`
-  await expect(
-    page.locator('.payload-toast-container li').filter({ hasText: message }),
-  ).toBeVisible()
-  for (let i = 0; i < errors.length; i++) {
-    const error = errors[i]
-    if (error) {
-      await expect(
-        page.locator('.payload-toast-container [data-testid="field-errors"] li').nth(i),
-      ).toHaveText(error)
+  const isSingleError = errors.length === 1
+  const message = isSingleError
+    ? 'The following field is invalid:'
+    : `The following fields are invalid (${errors.length}):`
+
+  // Check the intro message text
+  await expect(page.locator('.payload-toast-container')).toContainText(message)
+
+  // Check single error
+  if (isSingleError) {
+    await expect(page.locator('.payload-toast-container [data-testid="field-error"]')).toHaveText(
+      errors[0]!,
+    )
+  } else {
+    // Check multiple errors
+    const errorItems = page.locator('.payload-toast-container [data-testid="field-errors"] li')
+    for (let i = 0; i < errors.length; i++) {
+      await expect(errorItems.nth(i)).toHaveText(errors[i]!)
     }
   }