From cdc5b49de6159f2c76b92819a09a0670d5d257a7 Mon Sep 17 00:00:00 2001
From: "Joen A." <1204802+jasmussen@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:03:02 +0200
Subject: [PATCH] Try: Update block warnings. (#64997)

Co-authored-by: jasmussen <joen@git.wordpress.org>
Co-authored-by: SantosGuillamot <santosguillamot@git.wordpress.org>
---
 .../components/block-list/block-invalid-warning.js    |  4 ++--
 .../block-editor/src/components/warning/content.scss  | 11 ++---------
 packages/block-library/src/missing/edit.js            |  4 ++--
 test/e2e/specs/editor/various/invalid-block.spec.js   |  2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/block-invalid-warning.js b/packages/block-editor/src/components/block-list/block-invalid-warning.js
index 42ec5f9deb84d0..fb235cbce9ca21 100644
--- a/packages/block-editor/src/components/block-list/block-invalid-warning.js
+++ b/packages/block-editor/src/components/block-list/block-invalid-warning.js
@@ -107,12 +107,12 @@ export default function BlockInvalidWarning( { clientId } ) {
 						onClick={ convert.toRecoveredBlock }
 						variant="primary"
 					>
-						{ __( 'Attempt Block Recovery' ) }
+						{ __( 'Attempt recovery' ) }
 					</Button>,
 				] }
 				secondaryActions={ secondaryActions }
 			>
-				{ __( 'This block contains unexpected or invalid content.' ) }
+				{ __( 'Block contains unexpected or invalid content.' ) }
 			</Warning>
 			{ compare && (
 				<Modal
diff --git a/packages/block-editor/src/components/warning/content.scss b/packages/block-editor/src/components/warning/content.scss
index f4eeb253c1c2fb..0c1185a0782e41 100644
--- a/packages/block-editor/src/components/warning/content.scss
+++ b/packages/block-editor/src/components/warning/content.scss
@@ -30,21 +30,14 @@
 		flex-wrap: wrap;
 		align-items: baseline;
 		width: 100%;
+		gap: $grid-unit-15;
 	}
 
 	.block-editor-warning__actions {
 		align-items: center;
 		display: flex;
-		margin-top: 1em;
+		gap: $grid-unit-10;
 	}
-
-	.block-editor-warning__action {
-		margin: 0 $grid-unit-10 0 0;
-	}
-}
-
-.block-editor-warning__secondary {
-	margin: auto 0 auto $grid-unit-10;
 }
 
 .components-popover.block-editor-warning__dropdown {
diff --git a/packages/block-library/src/missing/edit.js b/packages/block-library/src/missing/edit.js
index 9fb507794756f8..70b032cb9a2fe8 100644
--- a/packages/block-library/src/missing/edit.js
+++ b/packages/block-library/src/missing/edit.js
@@ -75,7 +75,7 @@ export default function MissingEdit( { attributes, clientId } ) {
 		messageHTML = sprintf(
 			/* translators: %s: block name */
 			__(
-				'Your site doesn’t include support for the "%s" block. You can leave this block intact, convert its content to a Custom HTML block, or remove it entirely.'
+				'Your site doesn’t include support for the "%s" block. You can leave it as-is, convert it to custom HTML, or remove it.'
 			),
 			originalName
 		);
@@ -84,7 +84,7 @@ export default function MissingEdit( { attributes, clientId } ) {
 		messageHTML = sprintf(
 			/* translators: %s: block name */
 			__(
-				'Your site doesn’t include support for the "%s" block. You can leave this block intact or remove it entirely.'
+				'Your site doesn’t include support for the "%s" block. You can leave it as-is or remove it.'
 			),
 			originalName
 		);
diff --git a/test/e2e/specs/editor/various/invalid-block.spec.js b/test/e2e/specs/editor/various/invalid-block.spec.js
index 07c04a5a55457e..3487c326d2851f 100644
--- a/test/e2e/specs/editor/various/invalid-block.spec.js
+++ b/test/e2e/specs/editor/various/invalid-block.spec.js
@@ -81,7 +81,7 @@ test.describe( 'Invalid blocks', () => {
 		await expect(
 			editor.canvas
 				.getByRole( 'document', { name: 'Block: Paragraph' } )
-				.getByRole( 'button', { name: 'Attempt Block Recovery' } )
+				.getByRole( 'button', { name: 'Attempt recovery' } )
 		).toBeVisible();
 
 		expect( hasAlert ).toBe( false );