From d235d74e0e1c8224351f9e5ac3f528d38b4e7c34 Mon Sep 17 00:00:00 2001
From: Evan Mullins <evanrm@gmail.com>
Date: Thu, 29 Aug 2024 15:01:10 -0400
Subject: [PATCH] use the NewfoldRuntime.comingSoon api and add some inline
 styles

---
 src/components/Icons/index.js   |  1 -
 src/components/Icons/launch.jsx | 12 ---------
 src/components/Modal.jsx        | 45 +++++++++++++++++++++++----------
 src/utils/api/comingSoon.js     | 16 ------------
 src/utils/api/resolve.js        | 14 ----------
 5 files changed, 31 insertions(+), 57 deletions(-)
 delete mode 100644 src/components/Icons/index.js
 delete mode 100644 src/components/Icons/launch.jsx
 delete mode 100644 src/utils/api/comingSoon.js
 delete mode 100644 src/utils/api/resolve.js

diff --git a/src/components/Icons/index.js b/src/components/Icons/index.js
deleted file mode 100644
index 4228a6a..0000000
--- a/src/components/Icons/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as launch } from './launch';
diff --git a/src/components/Icons/launch.jsx b/src/components/Icons/launch.jsx
deleted file mode 100644
index 29b08e7..0000000
--- a/src/components/Icons/launch.jsx
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/primitives';
-
-const launch = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 22">
-		<Path d="M11.8667 10.975C12.0402 11.7092 12.0453 12.4732 11.8816 13.2097C11.718 13.9462 11.3898 14.6361 10.9216 15.2277C10.4534 15.8193 9.85744 16.2973 9.17829 16.6259C8.49915 16.9545 7.75445 17.1251 7 17.125V13.125M11.8667 10.975C13.4582 9.81565 14.753 8.29625 15.6451 6.5409C16.5373 4.78556 17.0016 2.84406 17 0.875003C15.0311 0.873581 13.0898 1.33791 11.3346 2.23006C9.57937 3.12221 8.0601 4.41688 6.90083 6.00834M11.8667 10.975C10.4183 12.0344 8.7586 12.7678 7 13.125M7 13.125C6.91417 13.1425 6.8275 13.1592 6.74083 13.175C5.98482 12.5755 5.30032 11.891 4.70083 11.135C4.71658 11.0482 4.73241 10.9615 4.75 10.875M6.90083 6.00834C6.16655 5.83467 5.40248 5.82944 4.66589 5.99304C3.9293 6.15664 3.23928 6.48483 2.64756 6.95301C2.05584 7.4212 1.57775 8.01723 1.24912 8.69645C0.9205 9.37567 0.749863 10.1205 0.75 10.875H4.75M6.90083 6.00834C5.84157 7.45652 5.10729 9.11671 4.75 10.875M2.88417 12.8667C2.33598 13.2743 1.90977 13.8242 1.65169 14.4567C1.3936 15.0892 1.31348 15.7802 1.42 16.455C2.09486 16.5614 2.78597 16.4812 3.41848 16.2229C4.05099 15.9647 4.6008 15.5383 5.00833 14.99M12.625 6.5C12.625 6.83152 12.4933 7.14947 12.2589 7.38389C12.0245 7.61831 11.7065 7.75 11.375 7.75C11.0435 7.75 10.7255 7.61831 10.4911 7.38389C10.2567 7.14947 10.125 6.83152 10.125 6.5C10.125 6.16848 10.2567 5.85054 10.4911 5.61612C10.7255 5.3817 11.0435 5.25 11.375 5.25C11.7065 5.25 12.0245 5.3817 12.2589 5.61612C12.4933 5.85054 12.625 6.16848 12.625 6.5Z" stroke="white" stroke-width="1.15" stroke-linecap="round" stroke-linejoin="round" />
-	</SVG>
-);
-
-export default launch;
diff --git a/src/components/Modal.jsx b/src/components/Modal.jsx
index 7b9415f..fa0d329 100644
--- a/src/components/Modal.jsx
+++ b/src/components/Modal.jsx
@@ -13,23 +13,20 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { store as nfdComingSoonStore } from '../store';
-import { setComingSoon } from '../utils/api/comingSoon';
 
 const Modal = () => {
 	const { setIsModalOpen } = useDispatch(nfdComingSoonStore);
-	const [isComingSoonActive, setIsComingSoonActive] = useState(true);
 
 	const { isModalOpen } = useSelect((select) => ({
 		isModalOpen: select(nfdComingSoonStore).isModalOpen(),
 	}));
 
 	const handlePublishAndLaunch = () => {
-		setComingSoon(false);
-		setIsComingSoonActive(false);
+		window.NewfoldRuntime.comingSoon.disable();
 		setIsModalOpen(false);
 	};
 
-	if (!isModalOpen || !isComingSoonActive) {
+	if (!isModalOpen || !window.NewfoldRuntime.comingSoon.isEnabled) {
 		return null;
 	}
 
@@ -49,16 +46,36 @@ const Modal = () => {
 			<div>
 				<p>{heading}</p>
 				<br />
-				<Button variant="primary" onClick={handlePublishAndLaunch}>
-					{launchButtonText}
-				</Button>
-				&nbsp;
-				<Button
-					variant="secondary"
-					onClick={() => setIsModalOpen(false)}
+				<div
+					style={ {
+						alignContent: 'space-between',
+						display: 'flex',
+						flexWrap: 'wrap',
+						gap: '16px',
+						boxSizing: 'inherit',
+					} }
 				>
-					{withoutLaunchButtonText}
-				</Button>
+					<Button
+						variant="primary"
+						onClick={handlePublishAndLaunch}
+						style={{
+							flex: 1,
+							justifyContent: 'center',
+						}}
+					>
+						{launchButtonText}
+					</Button>
+					<Button
+						variant="link"
+						onClick={() => setIsModalOpen(false)}
+						style={{
+							flex: 1,
+							justifyContent: 'center',
+						}}
+					>
+						{withoutLaunchButtonText}
+					</Button>
+				</div>
 			</div>
 		</WP2Modal>
 	);
diff --git a/src/utils/api/comingSoon.js b/src/utils/api/comingSoon.js
deleted file mode 100644
index 8dfb287..0000000
--- a/src/utils/api/comingSoon.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { wpSettingsRestRoute } from '../../constants';
-import { resolve } from './resolve';
-
-import apiFetch from '@wordpress/api-fetch';
-
-export async function setComingSoon( comingSoon ) {
-	return await resolve(
-		apiFetch( {
-			url: wpSettingsRestRoute,
-			method: 'POST',
-			data: {
-				comingSoon,
-			},
-		} ).then()
-	);
-}
diff --git a/src/utils/api/resolve.js b/src/utils/api/resolve.js
deleted file mode 100644
index cc363cd..0000000
--- a/src/utils/api/resolve.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export async function resolve(promise) {
-    const resolved = {
-        body: null,
-        error: null
-    };
-
-    try {
-        resolved.body = await promise;
-    } catch (e) {
-        resolved.error = e;
-    }
-
-    return resolved;
-}