More elegant by cleaning up the URL param

Automattic · Oct 15, 2024 · 278436e · 278436e
1 parent 004c371
commit 278436e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/subscribe-modal.js b/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/subscribe-modal.js
@@ -3,6 +3,7 @@ const { domReady } = wp;
 domReady( () => {
 	const modal = document.querySelector( '.jetpack-subscribe-modal' );
 	const modalDismissedCookie = 'jetpack_post_subscribe_modal_dismissed';
+	const skipUrlParam = 'jetpack_skip_subscription_popup';
 
 	function hasEnoughTimePassed() {
 		const lastDismissed = localStorage.getItem( modalDismissedCookie );
@@ -12,9 +13,10 @@ domReady( () => {
 	// Subscriber ended up here e.g. from emails:
 	// we won't show the modal to them in future since they most likely are already a subscriber.
 	function skipModal() {
-		const urlParams = new URLSearchParams( window.location.search );
-		const skip = urlParams.get( 'jetpack_skip_subscription_popup' );
-		if ( skip ) {
+		const url = new URL( window.location.href );
+		if ( url.searchParams.has( skipUrlParam ) ) {
+			url.searchParams.delete( skipUrlParam );
+			window.history.pushState( {}, '', url );
 			storeCloseTimestamp();
 			return true;
 		}

diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.js b/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.js
@@ -3,15 +3,17 @@ const { domReady } = wp;
 domReady( function () {
 	const overlay = document.querySelector( '.jetpack-subscribe-overlay' );
 	const overlayDismissedCookie = 'jetpack_post_subscribe_overlay_dismissed';
+	const skipUrlParam = 'jetpack_skip_subscription_popup';
 	const hasOverlayDismissedCookie =
 		document.cookie && document.cookie.indexOf( overlayDismissedCookie ) > -1;
 
 	// Subscriber ended up here e.g. from emails:
 	// we won't show the overlay to them in future since they most likely are already a subscriber.
 	function skipOverlay() {
-		const urlParams = new URLSearchParams( window.location.search );
-		const skip = urlParams.get( 'jetpack_skip_subscription_popup' );
-		if ( skip ) {
+		const url = new URL( window.location.href );
+		if ( url.searchParams.has( skipUrlParam ) ) {
+			url.searchParams.delete( skipUrlParam );
+			window.history.pushState( {}, '', url );
 			setOverlayDismissedCookie();
 			return true;
 		}