Add support for multiple dismiss labels.

google · Dec 23, 2024 · 2775ad5 · 2775ad5
1 parent 1570bae
commit 2775ad5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/assets/js/googlesitekit/notifications/components/common/ActionsCTALinkDismiss.js b/assets/js/googlesitekit/notifications/components/common/ActionsCTALinkDismiss.js
@@ -34,6 +34,7 @@ export default function ActionsCTALinkDismiss( {
 	ctaLabel,
 	onCTAClick,
 	onDismiss = () => {},
+	dismissLabelInitial,
 	dismissLabel = __( 'OK, Got it!', 'google-site-kit' ),
 	dismissExpires = 0,
 	dismissOptions = {},
@@ -57,6 +58,7 @@ export default function ActionsCTALinkDismiss( {
 			<Dismiss
 				id={ id }
 				primary={ false }
+				dismissLabelInitial={ dismissLabelInitial }
 				dismissLabel={ dismissLabel }
 				dismissExpires={ dismissExpires }
 				disabled={ isNavigatingToCTALink }

diff --git a/assets/js/googlesitekit/notifications/components/common/Dismiss.js b/assets/js/googlesitekit/notifications/components/common/Dismiss.js
@@ -27,14 +27,15 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { useDispatch } from 'googlesitekit-data';
+import { useDispatch, useSelect } from 'googlesitekit-data';
 import useNotificationEvents from '../../hooks/useNotificationEvents';
 import { CORE_NOTIFICATIONS } from '../../datastore/constants';
 import { Button } from 'googlesitekit-components';
 
 export default function Dismiss( {
 	id,
 	primary = true,
+	dismissLabelInitial,
 	dismissLabel = __( 'OK, Got it!', 'google-site-kit' ),
 	dismissExpires = 0,
 	disabled,
@@ -49,6 +50,10 @@ export default function Dismiss( {
 
 	const { dismissNotification } = useDispatch( CORE_NOTIFICATIONS );
 
+	const isDismissalFinal = useSelect( ( select ) =>
+		select( CORE_NOTIFICATIONS ).isNotificationRetryFinal( id )
+	);
+
 	const handleDismiss = async ( event ) => {
 		await onDismiss?.( event );
 		trackEvents.dismiss(
@@ -67,7 +72,7 @@ export default function Dismiss( {
 			onClick={ handleDismiss }
 			disabled={ disabled }
 		>
-			{ dismissLabel }
+			{ isDismissalFinal ? dismissLabel : dismissLabelInitial }
 		</Button>
 	);
 }

diff --git a/...modules/reader-revenue-manager/components/dashboard/ReaderRevenueManagerSetupCTABanner.js b/...modules/reader-revenue-manager/components/dashboard/ReaderRevenueManagerSetupCTABanner.js
@@ -162,7 +162,14 @@ export default function ReaderRevenueManagerSetupCTABanner( {
 							'google-site-kit'
 						) }
 						onCTAClick={ onSetupActivate }
-						dismissLabel={ __( 'Maybe later', 'google-site-kit' ) }
+						dismissLabelInitial={ __(
+							'Maybe later',
+							'google-site-kit'
+						) }
+						dismissLabel={ __(
+							'Don’t show again',
+							'google-site-kit'
+						) }
 						onDismiss={ showTooltip }
 						dismissOptions={ {
 							skipHidingFromQueue: true,