From 3521f7d93d548cbe045e04b1a1a8ba0c7c6598e4 Mon Sep 17 00:00:00 2001
From: "Matthew Riley MacPherson (tofumatt)" <hi@tofumatt.com>
Date: Tue, 21 Jan 2025 22:45:35 +0000
Subject: [PATCH 1/3] Improve `dismissItem` behaviour in SiwG.

---
 assets/js/components/SettingsNotice/SettingsNotice.js    | 8 ++++++--
 .../js/googlesitekit/datastore/user/dismissed-items.js   | 3 ++-
 .../components/common/AnyoneCanRegisterDisabledNotice.js | 9 ++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/assets/js/components/SettingsNotice/SettingsNotice.js b/assets/js/components/SettingsNotice/SettingsNotice.js
index 3ac07020180..e75f7767fc8 100644
--- a/assets/js/components/SettingsNotice/SettingsNotice.js
+++ b/assets/js/components/SettingsNotice/SettingsNotice.js
@@ -92,8 +92,11 @@ const SettingsNotice = forwardRef( ( props, ref ) => {
 					<Button
 						tertiary
 						onClick={ () => {
-							dismissItem( dismiss );
-							dismissCallback();
+							if ( typeof dismiss === 'string' ) {
+								dismissItem( dismiss );
+							}
+
+							dismissCallback?.();
 						} }
 					>
 						{ dismissLabel }
@@ -119,6 +122,7 @@ SettingsNotice.propTypes = {
 	LearnMore: PropTypes.elementType,
 	CTA: PropTypes.elementType,
 	OuterCTA: PropTypes.elementType,
+	dismiss: PropTypes.oneOfType( [ PropTypes.string, PropTypes.bool ] ),
 	dismissLabel: PropTypes.string,
 	dismissCallback: PropTypes.func,
 };
diff --git a/assets/js/googlesitekit/datastore/user/dismissed-items.js b/assets/js/googlesitekit/datastore/user/dismissed-items.js
index 1ac2f774d47..f9ea2369bde 100644
--- a/assets/js/googlesitekit/datastore/user/dismissed-items.js
+++ b/assets/js/googlesitekit/datastore/user/dismissed-items.js
@@ -115,7 +115,8 @@ const baseActions = {
 	dismissItem: createValidatedAction(
 		( slug, options = {} ) => {
 			const { expiresInSeconds = 0 } = options;
-			invariant( slug, 'A tour slug is required to dismiss a tour.' );
+			invariant( slug, 'A slug is required to dismiss an item.' );
+			invariant( typeof slug === 'string', 'A slug must be a string.' );
 			invariant(
 				Number.isInteger( expiresInSeconds ),
 				'expiresInSeconds must be an integer.'
diff --git a/assets/js/modules/sign-in-with-google/components/common/AnyoneCanRegisterDisabledNotice.js b/assets/js/modules/sign-in-with-google/components/common/AnyoneCanRegisterDisabledNotice.js
index 525a7263be4..c5e9429745d 100644
--- a/assets/js/modules/sign-in-with-google/components/common/AnyoneCanRegisterDisabledNotice.js
+++ b/assets/js/modules/sign-in-with-google/components/common/AnyoneCanRegisterDisabledNotice.js
@@ -28,7 +28,7 @@ import { __, _x, sprintf } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { useSelect, useDispatch } from 'googlesitekit-data';
+import { useSelect } from 'googlesitekit-data';
 import {
 	CORE_USER,
 	PERMISSION_MANAGE_OPTIONS,
@@ -74,8 +74,6 @@ export default function AnyoneCanRegisterDisabledNotice( { className } ) {
 		)
 	);
 
-	const { dismissItem } = useDispatch( CORE_USER );
-
 	if ( isDismissed === true || anyoneCanRegister === true ) {
 		return null;
 	}
@@ -88,10 +86,7 @@ export default function AnyoneCanRegisterDisabledNotice( { className } ) {
 			) }
 			type={ TYPE_INFO }
 			Icon={ InfoIcon }
-			dismiss
-			dismissCallback={ () =>
-				dismissItem( ANYONE_CAN_REGISTER_DISABLED_NOTICE )
-			}
+			dismiss={ ANYONE_CAN_REGISTER_DISABLED_NOTICE }
 			dismissLabel={ __( 'Got it', 'google-site-kit' ) }
 			notice={ createInterpolateElement(
 				sprintf(

From 0cf986730784af76861c9fce540fe9a71ef5a17f Mon Sep 17 00:00:00 2001
From: "Matthew Riley MacPherson (tofumatt)" <hi@tofumatt.com>
Date: Tue, 28 Jan 2025 18:02:26 +0000
Subject: [PATCH 2/3] Add dismissed item test.

---
 .../datastore/user/dismissed-items.test.js             | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/assets/js/googlesitekit/datastore/user/dismissed-items.test.js b/assets/js/googlesitekit/datastore/user/dismissed-items.test.js
index aa92181f33b..fa61775d8b0 100644
--- a/assets/js/googlesitekit/datastore/user/dismissed-items.test.js
+++ b/assets/js/googlesitekit/datastore/user/dismissed-items.test.js
@@ -89,6 +89,16 @@ describe( 'core/user dismissed-items', () => {
 				).toMatchObject( response );
 				expect( console ).toHaveErrored();
 			} );
+
+			it( 'should dispatch an error if the slug is not a string', async () => {
+				try {
+					await registry.dispatch( CORE_USER ).dismissItem( true );
+				} catch ( error ) {
+					expect( error.message ).toMatch(
+						'A slug must be a string.'
+					);
+				}
+			} );
 		} );
 
 		describe( 'removeDismissItems', () => {

From 4f9637cf098276c0bf874cd400e19ab098059b4a Mon Sep 17 00:00:00 2001
From: "Matthew Riley MacPherson (tofumatt)" <hi@tofumatt.com>
Date: Wed, 29 Jan 2025 14:34:45 +0000
Subject: [PATCH 3/3] Change prop type to be only a string.

---
 assets/js/components/SettingsNotice/SettingsNotice.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/components/SettingsNotice/SettingsNotice.js b/assets/js/components/SettingsNotice/SettingsNotice.js
index e75f7767fc8..dabaaed4189 100644
--- a/assets/js/components/SettingsNotice/SettingsNotice.js
+++ b/assets/js/components/SettingsNotice/SettingsNotice.js
@@ -122,7 +122,7 @@ SettingsNotice.propTypes = {
 	LearnMore: PropTypes.elementType,
 	CTA: PropTypes.elementType,
 	OuterCTA: PropTypes.elementType,
-	dismiss: PropTypes.oneOfType( [ PropTypes.string, PropTypes.bool ] ),
+	dismiss: PropTypes.string,
 	dismissLabel: PropTypes.string,
 	dismissCallback: PropTypes.func,
 };