From a2b75a73f36b0440d37ef76223e3baf722ed78e8 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta.wolny@automattic.com>
Date: Fri, 20 Dec 2024 14:47:41 +0100
Subject: [PATCH] Add support for the stable border feature name

[MAILPOET-6359]
---
 .../sidebar/block-compatibility-warnings.tsx  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/js/email-editor/src/components/sidebar/block-compatibility-warnings.tsx b/packages/js/email-editor/src/components/sidebar/block-compatibility-warnings.tsx
index 9ce837cd1d..933049c74c 100644
--- a/packages/js/email-editor/src/components/sidebar/block-compatibility-warnings.tsx
+++ b/packages/js/email-editor/src/components/sidebar/block-compatibility-warnings.tsx
@@ -20,12 +20,20 @@ export function BlockCompatibilityWarnings(): JSX.Element {
 	);
 
 	// Check if the selected block has enabled border configuration
-	const hasBorderSupport = hasBlockSupport(
-		selectedBlock?.name,
-		// @ts-expect-error Border is not yet supported in the types
-		'__experimentalBorder',
-		false
-	);
+	const hasBorderSupport =
+		hasBlockSupport(
+			selectedBlock?.name,
+			// @ts-expect-error Border is not yet supported in the types
+			'border',
+			false
+		) ||
+		// We can remove the check for __experimentalBorder after we support WordPress 6.8+.
+		hasBlockSupport(
+			selectedBlock?.name,
+			// @ts-expect-error Border is not yet supported in the types
+			'__experimentalBorder',
+			false
+		);
 
 	return (
 		<>