From 79beb226a5dc44de2ed01ddb6497e8476adba7d4 Mon Sep 17 00:00:00 2001
From: Nate Weller <hello@nateweller.com>
Date: Fri, 27 Sep 2024 10:49:44 -0600
Subject: [PATCH 1/2] Security Settings: remove deprecation notice for the web
 application firewall.

---
 .../plugins/jetpack/_inc/client/security/waf.jsx   | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/projects/plugins/jetpack/_inc/client/security/waf.jsx b/projects/plugins/jetpack/_inc/client/security/waf.jsx
index c9437c5aa202d..4e240c20d60b6 100644
--- a/projects/plugins/jetpack/_inc/client/security/waf.jsx
+++ b/projects/plugins/jetpack/_inc/client/security/waf.jsx
@@ -8,8 +8,6 @@ import { FormFieldset } from 'components/forms';
 import { createNotice, removeNotice } from 'components/global-notices/state/notices/actions';
 import JetpackBanner from 'components/jetpack-banner';
 import { withModuleSettingsFormHelpers } from 'components/module-settings/with-module-settings-form-helpers';
-import SimpleNotice from 'components/notice';
-import NoticeAction from 'components/notice/notice-action';
 import SettingsCard from 'components/settings-card';
 import SettingsGroup from 'components/settings-group';
 import {
@@ -501,18 +499,6 @@ export const Waf = class extends Component {
 				hideButton={ true }
 			>
 				{ isWafActive && <QueryWafSettings /> }
-				<SimpleNotice
-					showDismiss={ false }
-					status="is-info"
-					text={ __(
-						'The settings for the Firewall will be moved to Jetpack Protect in Jetpack version 13.10.',
-						'jetpack'
-					) }
-				>
-					<NoticeAction href={ this.props.getProtectUrl }>
-						{ __( 'Get Jetpack Protect', 'jetpack' ) }
-					</NoticeAction>
-				</SimpleNotice>
 				<SettingsGroup
 					disableInOfflineMode
 					module={ this.props.getModule( 'waf' ) }

From 0579e25749658c9d08478f9fad876998e50b35be Mon Sep 17 00:00:00 2001
From: Nate Weller <hello@nateweller.com>
Date: Fri, 27 Sep 2024 10:53:23 -0600
Subject: [PATCH 2/2] changelog

---
 .../jetpack/changelog/remove-jetpack-waf-deprecation-notice   | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/remove-jetpack-waf-deprecation-notice

diff --git a/projects/plugins/jetpack/changelog/remove-jetpack-waf-deprecation-notice b/projects/plugins/jetpack/changelog/remove-jetpack-waf-deprecation-notice
new file mode 100644
index 0000000000000..f2282b6e58add
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/remove-jetpack-waf-deprecation-notice
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Removed deprecation notice as the firewall feature will not be removed in the next release.