fix: make code improvements

Automattic · Aug 27, 2024 · 38b6d13 · 38b6d13
1 parent 6461db9
commit 38b6d13
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/src/modal-checkout/modal.js b/src/modal-checkout/modal.js
@@ -57,18 +57,9 @@ domReady( () => {
 		const hasNewsletterPopup = document?.querySelector( '.newspack-newsletters-signup-modal' );
 
 		// We want to block closing the modal if redirecting elsewhere:
-		let shouldCloseModal = true;
-
-		if (
-			afterSuccessUrlInput &&
-			afterSuccessBehaviorInput &&
-			container?.checkoutComplete &&
-			! hasNewsletterPopup
-		) {
-			shouldCloseModal = false;
-		}
+		const shouldCloseModal = ! afterSuccessUrlInput || ! afterSuccessBehaviorInput || ! container?.checkoutComplete;
 
-		if ( shouldCloseModal ) {
+		if ( shouldCloseModal || hasNewsletterPopup ) {
 			spinner.style.display = 'flex';
 			if ( iframe && modalContent.contains( iframe ) ) {
 				// Reset iframe and modal content heights.
@@ -112,7 +103,7 @@ domReady( () => {
 			if ( window?.newspackReaderActivation?.openNewslettersSignupModal ) {
 				window.newspackReaderActivation.openNewslettersSignupModal( {
 					callback: handleCheckoutComplete,
-					skipClose: ( afterSuccessUrlInput && afterSuccessBehaviorInput ) ? true : false,
+					closeOnSuccess: shouldCloseModal,
 				} );
 			} else {
 				handleCheckoutComplete();