From 6e9ddc9ddef5dc752ec58ab1cc84a9fe413ee0d8 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Thu, 6 Jun 2024 10:58:30 -0400
Subject: [PATCH 01/18] Fix URLs for social icons

---
 blocks/footer/render.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/blocks/footer/render.php b/blocks/footer/render.php
index aa14f89b..80a5080d 100644
--- a/blocks/footer/render.php
+++ b/blocks/footer/render.php
@@ -29,28 +29,48 @@
 			<?php if ( ! empty( $nb_facebook_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
 					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_facebook_url ); ?>">
-						<img src="/wp-content/plugins/wp-newsletter-builder/images/facebook.png" alt="Facebook" height="26" width="26" />
+						<img
+							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/facebook.png' ); ?>"
+							alt="Facebook"
+							height="26"
+							width="26"
+						/>
 					</a>
 				</span>
 			<?php endif; ?>
 			<?php if ( ! empty( $nb_twitter_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
 					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_twitter_url ); ?>">
-						<img src="/wp-content/plugins/wp-newsletter-builder/images/twitter.png" alt="Twitter" height="26" width="26" />
+						<img
+							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/twitter.png' ); ?>"
+							alt="Twitter"
+							height="26"
+							width="26"
+						/>
 					</a>
 				</span>
 			<?php endif; ?>
 			<?php if ( ! empty( $nb_instagram_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
 					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_instagram_url ); ?>">
-						<img src="/wp-content/plugins/wp-newsletter-builder/images/instagram.png" alt="Instagram" height="26" width="26" />
+						<img
+							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/instagram.png' ); ?>"
+							alt="Instagram"
+							height="26"
+							width="26"
+						/>
 					</a>
 				</span>
 			<?php endif; ?>
 			<?php if ( ! empty( $nb_youtube_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
 					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_youtube_url ); ?>">
-						<img src="/wp-content/plugins/wp-newsletter-builder/images/youtube.png" alt="YouTube" height="26" width="26" />
+						<img
+							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/youtube.png' ); ?>"
+							alt="YouTube"
+							height="26"
+							width="26"
+						/>
 					</a>
 				</span>
 			<?php endif; ?>

From 26390d9d56bd88a4fc33f067e620ae86d44c0daf Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Mon, 10 Jun 2024 16:05:50 -0400
Subject: [PATCH 02/18] Use native colors for social icons

---
 blocks/footer/edit.tsx   | 10 +++++-----
 blocks/footer/render.php |  8 ++++----
 blocks/footer/style.scss | 22 ++++++++++++++++++++--
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/blocks/footer/edit.tsx b/blocks/footer/edit.tsx
index 65a6af0b..ef234951 100644
--- a/blocks/footer/edit.tsx
+++ b/blocks/footer/edit.tsx
@@ -95,7 +95,7 @@ export default function Edit({
                   {facebookUrl
                     ? (
                       <span className="wp-block-wp-newsletter-builder-footer__social-links__item">
-                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link" href={facebookUrl}>
+                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link facebook-icon" href={facebookUrl}>
                           <img src="/wp-content/plugins/wp-newsletter-builder/images/facebook.png" alt="Facebook" height="26" width="26" />
                         </a>
                       </span>
@@ -103,15 +103,15 @@ export default function Edit({
                   {twitterUrl
                     ? (
                       <span className="wp-block-wp-newsletter-builder-footer__social-links__item">
-                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link" href={twitterUrl}>
-                          <img src="/wp-content/plugins/wp-newsletter-builder/images/twitter.png" alt="Twitter" height="26" width="26" />
+                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link twitter-icon" href={twitterUrl}>
+                          <img src="/wp-content/plugins/wp-newsletter-builder/images/twitter.png" alt="X" height="26" width="26" />
                         </a>
                       </span>
                     ) : null}
                   {instagramUrl
                     ? (
                       <span className="wp-block-wp-newsletter-builder-footer__social-links__item">
-                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link" href={instagramUrl}>
+                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link instagram-icon" href={instagramUrl}>
                           <img src="/wp-content/plugins/wp-newsletter-builder/images/instagram.png" alt="Instagram" height="26" width="26" />
                         </a>
                       </span>
@@ -119,7 +119,7 @@ export default function Edit({
                   {youtubeUrl
                     ? (
                       <span className="wp-block-wp-newsletter-builder-footer__social-links__item">
-                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link" href={youtubeUrl}>
+                        <a className="wp-block-wp-newsletter-builder-footer__social-links__link youtube-icon" href={youtubeUrl}>
                           <img src="/wp-content/plugins/wp-newsletter-builder/images/youtube.png" alt="YouTube" height="26" width="26" />
                         </a>
                       </span>
diff --git a/blocks/footer/render.php b/blocks/footer/render.php
index 80a5080d..03548984 100644
--- a/blocks/footer/render.php
+++ b/blocks/footer/render.php
@@ -28,7 +28,7 @@
 		<div class="wp-block-wp-newsletter-builder-footer__social-links">
 			<?php if ( ! empty( $nb_facebook_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
-					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_facebook_url ); ?>">
+					<a class="wp-block-wp-newsletter-builder-footer__social-links__link facebook-icon" href="<?php echo esc_url( $nb_facebook_url ); ?>">
 						<img
 							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/facebook.png' ); ?>"
 							alt="Facebook"
@@ -40,7 +40,7 @@
 			<?php endif; ?>
 			<?php if ( ! empty( $nb_twitter_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
-					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_twitter_url ); ?>">
+					<a class="wp-block-wp-newsletter-builder-footer__social-links__link twitter-icon" href="<?php echo esc_url( $nb_twitter_url ); ?>">
 						<img
 							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/twitter.png' ); ?>"
 							alt="Twitter"
@@ -52,7 +52,7 @@
 			<?php endif; ?>
 			<?php if ( ! empty( $nb_instagram_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
-					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_instagram_url ); ?>">
+					<a class="wp-block-wp-newsletter-builder-footer__social-links__link instagram-icon" href="<?php echo esc_url( $nb_instagram_url ); ?>">
 						<img
 							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/instagram.png' ); ?>"
 							alt="Instagram"
@@ -64,7 +64,7 @@
 			<?php endif; ?>
 			<?php if ( ! empty( $nb_youtube_url ) ) : ?>
 				<span class="wp-block-wp-newsletter-builder-footer__social-links__item">
-					<a class="wp-block-wp-newsletter-builder-footer__social-links__link" href="<?php echo esc_url( $nb_youtube_url ); ?>">
+					<a class="wp-block-wp-newsletter-builder-footer__social-links__link youtube-icon" href="<?php echo esc_url( $nb_youtube_url ); ?>">
 						<img
 							src="<?php echo esc_url( home_url() . '/wp-content/plugins/wp-newsletter-builder/images/youtube.png' ); ?>"
 							alt="YouTube"
diff --git a/blocks/footer/style.scss b/blocks/footer/style.scss
index 67bea081..193bc6f9 100644
--- a/blocks/footer/style.scss
+++ b/blocks/footer/style.scss
@@ -27,9 +27,7 @@
   }
 
   &__link {
-    background-color: #D62827;
     border-radius: 50%;
-    color: #D62827;
     display: inline-block;
     height: 26px;
     max-height: 26px;
@@ -37,6 +35,26 @@
     transition: opacity 0.1s ease-in;
     width: 26px;
   }
+
+  .facebook-icon {
+    background-color: #1877F2;
+    color: #1877F2;
+  }
+
+  .twitter-icon {
+    background-color: #3CA1F2;
+    color: #3CA1F2;
+  }
+
+  .instagram-icon {
+    background-color: #E1306C;
+    color: #E1306C;
+  }
+
+  .youtube-icon {
+    background-color: #FF0000;
+    color: #FF0000;
+  }
 }
 
 .wp-block-wp-newsletter-builder-footer__logo {

From 1e43bb3711d22af6ce03258d6b31e90af9a95045 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 09:43:44 -0400
Subject: [PATCH 03/18] Optimize email list option creation

---
 .../newsletter-from-post/email-settings.tsx   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index f02dd490..9d91f4b9 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -9,7 +9,7 @@ import {
   CheckboxControl,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { useEffect, useState } from '@wordpress/element';
+import { useMemo, useEffect, useState } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import apiFetch from '@wordpress/api-fetch';
 import { usePostMeta } from '@alleyinteractive/block-editor-tools';
@@ -44,6 +44,8 @@ interface Window {
 
 function EmailSettings() {
   const [meta, setMeta] = usePostMeta();
+  const [lists, setLists] = useState<ListResult[]>([]); // eslint-disable-line
+
   const {
     nb_breaking_email_type: type = '',
     nb_breaking_template: template = '',
@@ -79,7 +81,15 @@ function EmailSettings() {
     };
   }, []);
 
-  const [lists, setLists] = useState<ListResult[]>([]); // eslint-disable-line
+  const options = useMemo(() => {
+    if (lists.length > 0) {
+      return [];
+    }
+
+    return lists
+      .map((item: ListResult) => ({ label: item.Name, value: item.ListID }));
+  }, [lists]);
+
   const manualSubject = subject !== '';
   const manualPreview = preview !== '';
 
@@ -96,12 +106,6 @@ function EmailSettings() {
     setMeta({ nb_breaking_list: listIds });
   });
 
-  const listsToOptions = (rawLists: ListResult[]) => {
-    const output = rawLists.map((item: ListResult) => ({ label: item.Name, value: item.ListID }));
-    return output;
-  };
-
-  const options = lists.length > 0 ? listsToOptions(lists) : [];
   const selected = options.filter((item: Option) => listArray.includes(item.value));
 
   useEffect(() => { // eslint-disable-line

From b758f655b7d2fa72d6a955e6a3ced8e223c23d67 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 09:49:10 -0400
Subject: [PATCH 04/18] Return an empty array if lists length is 0

---
 plugins/newsletter-from-post/email-settings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 9d91f4b9..36cd00cd 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -82,7 +82,7 @@ function EmailSettings() {
   }, []);
 
   const options = useMemo(() => {
-    if (lists.length > 0) {
+    if (lists.length === 0) {
       return [];
     }
 

From e388598a8f4fca416719a58b088dc235e36b615e Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 09:49:57 -0400
Subject: [PATCH 05/18] Memoize selected email list

---
 plugins/newsletter-from-post/email-settings.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 36cd00cd..ca0db7d7 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -89,6 +89,8 @@ function EmailSettings() {
     return lists
       .map((item: ListResult) => ({ label: item.Name, value: item.ListID }));
   }, [lists]);
+  const selected = useMemo(() => options
+    .filter((item: Option) => list.includes(item.value)), [list, options]);
 
   const manualSubject = subject !== '';
   const manualPreview = preview !== '';
@@ -106,8 +108,6 @@ function EmailSettings() {
     setMeta({ nb_breaking_list: listIds });
   });
 
-  const selected = options.filter((item: Option) => listArray.includes(item.value));
-
   useEffect(() => { // eslint-disable-line
     if (lists.length > 0) {
       return;

From 2c0e4cb5f078c19669ed40bcbd727078706af4c1 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 09:52:56 -0400
Subject: [PATCH 06/18] Rename variables

---
 plugins/newsletter-from-post/email-settings.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index ca0db7d7..62c1a7a8 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -81,7 +81,7 @@ function EmailSettings() {
     };
   }, []);
 
-  const options = useMemo(() => {
+  const emailListOptions = useMemo(() => {
     if (lists.length === 0) {
       return [];
     }
@@ -89,8 +89,8 @@ function EmailSettings() {
     return lists
       .map((item: ListResult) => ({ label: item.Name, value: item.ListID }));
   }, [lists]);
-  const selected = useMemo(() => options
-    .filter((item: Option) => list.includes(item.value)), [list, options]);
+  const selectedEmailList = useMemo(() => emailListOptions
+    .filter((item: Option) => list.includes(item.value)), [list, emailListOptions]);
 
   const manualSubject = subject !== '';
   const manualPreview = preview !== '';
@@ -185,8 +185,8 @@ function EmailSettings() {
             {__('Email List', 'wp-newsletter-builder')}
             <MultiSelect
               labelledBy={__('List', 'wp-newsletter-builder')}
-              value={selected}
-              options={options}
+              value={selectedEmailList}
+              options={emailListOptions}
               onChange={setSelectedLists}
               hasSelectAll={false}
               overrideStrings={{

From b42c42bfd643e324306560c11b1756ed0bbca993 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 10:33:17 -0400
Subject: [PATCH 07/18] Extract a hook for managing newsletter meta

---
 .../newsletter-from-post/email-settings.tsx   | 70 ++++++++-----------
 .../useNewsletterMeta.tsx                     | 36 ++++++++++
 2 files changed, 66 insertions(+), 40 deletions(-)
 create mode 100644 plugins/newsletter-from-post/useNewsletterMeta.tsx

diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 62c1a7a8..e061607a 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -12,11 +12,11 @@ import { __ } from '@wordpress/i18n';
 import { useMemo, useEffect, useState } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import apiFetch from '@wordpress/api-fetch';
-import { usePostMeta } from '@alleyinteractive/block-editor-tools';
 import { MultiSelect } from 'react-multi-select-component';
 import { parse, serialize } from '@wordpress/blocks';
-
+import useNewsletterMeta from '@/plugins/newsletter-from-post/useNewsletterMeta';
 import NewsletterSpinner from '@/components/newsletterSpinner';
+
 import EmailTypeSelector from '../../components/emailTypeSelector';
 import SentNewsletter from './sent-newsletter';
 
@@ -43,22 +43,9 @@ interface Window {
 }
 
 function EmailSettings() {
-  const [meta, setMeta] = usePostMeta();
+  const { meta, setMeta } = useNewsletterMeta();
   const [lists, setLists] = useState<ListResult[]>([]); // eslint-disable-line
 
-  const {
-    nb_breaking_email_type: type = '',
-    nb_breaking_template: template = '',
-    nb_breaking_from_name: fromName = '',
-    nb_breaking_subject: subject = '',
-    nb_breaking_preview: preview = '',
-    nb_breaking_list: list = [],
-    nb_breaking_header_img: image = 0, // eslint-disable-line
-    nb_breaking_should_send: send = false,
-    nb_breaking_content: content = '', // eslint-disable-line
-    nb_newsletter_sent_breaking_post_id: sentBreakingPostId = [],
-  } = meta;
-
   const {
     postId,
     postStatus,
@@ -90,12 +77,12 @@ function EmailSettings() {
       .map((item: ListResult) => ({ label: item.Name, value: item.ListID }));
   }, [lists]);
   const selectedEmailList = useMemo(() => emailListOptions
-    .filter((item: Option) => list.includes(item.value)), [list, emailListOptions]);
+    .filter((item: Option) => meta.list.includes(item.value)), [meta.list, emailListOptions]);
 
-  const manualSubject = subject !== '';
-  const manualPreview = preview !== '';
+  const manualSubject = meta.subject !== '';
+  const manualPreview = meta.preview !== '';
 
-  const listArray = Array.isArray(list) ? list : [list];
+  const listArray = Array.isArray(meta.list) ? meta.list : [meta.list];
 
   const {
     newsletterBuilder: {
@@ -125,12 +112,15 @@ function EmailSettings() {
     setMeta({ nb_breaking_content: serialize(blocks) });
   };
 
-  const disabled = type === ''
-    || template === ''
-    || fromName === ''
-    || (subject === '' && postTitle === '')
-    || (preview === '' && postExcerpt === '')
-    || list.length === 0;
+  const disabled = meta.type === ''
+    || meta.template === ''
+    || meta.fromName === ''
+    || (meta.subject === '' && postTitle === '')
+    || (meta.preview === '' && postExcerpt === '')
+    || meta.list.length === 0;
+
+  console.log('rendering', emailListOptions);
+
   return (
     <PluginSidebar
       icon="email-alt2"
@@ -145,22 +135,22 @@ function EmailSettings() {
           contentHandler={contentHandler}
           typeHandler={(newType) => { setMeta({ nb_breaking_email_type: newType }); }}
           imageHandler={(newImage) => { setMeta({ nb_breaking_header_img: newImage }); }}
-          typeValue={type}
+          typeValue={meta.type}
           templateHandler={(newTemplate) => { setMeta({ nb_breaking_template: newTemplate }); }}
           fromNameHandler={(newFromName) => { setMeta({ nb_breaking_from_name: newFromName }); }}
-          templateValue={template}
-          fromNameValue={fromName}
+          templateValue={meta.template}
+          fromNameValue={meta.fromName}
         />
         <TextareaControl
           label={manualSubject ? __('Subject', 'wp-newsletter-builder') : __('Subject (linked)', 'wp-newsletter-builder')}
           placeholder={__('Enter subject', 'wp-newsletter-builder')}
-          value={subject !== '' ? subject : postTitle}
+          value={meta.subject !== '' ? meta.subject : postTitle}
           onChange={(value) => { setMeta({ nb_breaking_subject: value }); }}
         />
         <TextareaControl
           label={manualPreview ? __('Preview Text', 'wp-newsletter-builder') : __('Preview Text (linked)', 'wp-newsletter-builder')}
           placeholder={__('Enter preview text', 'wp-newsletter-builder')}
-          value={preview !== '' ? preview : postExcerpt}
+          value={meta.preview !== '' ? meta.preview : postExcerpt}
           onChange={(value) => { setMeta({ nb_breaking_preview: value }); }}
         />
         {Object.keys(breakingLists).map((key: string) => {
@@ -200,36 +190,36 @@ function EmailSettings() {
         <div style={{ marginTop: '1rem' }}>
           <CheckboxControl
             label={postStatus === 'draft' || postStatus === 'auto-draft' ? __('Send Newsletter on Publish', 'wp-newsletter-builder') : __('Send Newsletter on Update', 'wp-newsletter-builder')}
-            checked={send && !disabled}
+            checked={meta.send && !disabled}
             onChange={(value) => { setMeta({ nb_breaking_should_send: value }); }}
             disabled={disabled}
           />
-          {!type ? (
+          {!meta.type ? (
             <p style={{ color: 'red' }}>{__('Header Type is Required', 'wp-newsletter-builder')}</p>
           ) : null}
-          {!template ? (
+          {!meta.template ? (
             <p style={{ color: 'red' }}>{__('Template is Required', 'wp-newsletter-builder')}</p>
           ) : null}
-          {!fromName ? (
+          {!meta.fromName ? (
             <p style={{ color: 'red' }}>{__('From Name is Required', 'wp-newsletter-builder')}</p>
           ) : null}
-          {!subject && !postTitle ? (
+          {!meta.subject && !postTitle ? (
             <p style={{ color: 'red' }}>{__('Subject is Required', 'wp-newsletter-builder')}</p>
           ) : null}
-          {!preview && !postExcerpt ? (
+          {!meta.preview && !postExcerpt ? (
             <p style={{ color: 'red' }}>{__('Preview Text is Required', 'wp-newsletter-builder')}</p>
           ) : null}
-          {list.length === 0 ? (
+          {meta.list.length === 0 ? (
             <p style={{ color: 'red' }}>{__('Email List is Required', 'wp-newsletter-builder')}</p>
           ) : null}
         </div>
       </PanelBody>
-      {sentBreakingPostId ? (
+      {meta.sentBreakingPostId ? (
         <PanelBody
           initialOpen={false}
           title={__('Sent Newsletters', 'wp-newsletter-builder')}
         >
-          {sentBreakingPostId.map((id: number) => (
+          {meta.sentBreakingPostId.map((id: number) => (
             <SentNewsletter postId={id} key={id} />
           ))}
         </PanelBody>
diff --git a/plugins/newsletter-from-post/useNewsletterMeta.tsx b/plugins/newsletter-from-post/useNewsletterMeta.tsx
new file mode 100644
index 00000000..1ca20be9
--- /dev/null
+++ b/plugins/newsletter-from-post/useNewsletterMeta.tsx
@@ -0,0 +1,36 @@
+import { usePostMeta } from '@alleyinteractive/block-editor-tools';
+
+function useNewsletterMeta() {
+  const [meta, setMeta] = usePostMeta();
+
+  const {
+    nb_breaking_email_type: type = '',
+    nb_breaking_template: template = '',
+    nb_breaking_from_name: fromName = '',
+    nb_breaking_subject: subject = '',
+    nb_breaking_preview: preview = '',
+    nb_breaking_list: list = [],
+    nb_breaking_header_img: image = 0, // eslint-disable-line
+    nb_breaking_should_send: send = false,
+    nb_breaking_content: content = '', // eslint-disable-line
+    nb_newsletter_sent_breaking_post_id: sentBreakingPostId = [],
+  } = meta;
+
+  return {
+    meta: {
+      type,
+      template,
+      fromName,
+      subject,
+      preview,
+      list,
+      image,
+      send,
+      content,
+      sentBreakingPostId,
+    },
+    setMeta,
+  };
+}
+
+export default useNewsletterMeta;

From 663cf01e045b8e5c801b1a05509ca438bb381013 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 10:36:11 -0400
Subject: [PATCH 08/18] Move the hook into the hooks folder

---
 .../useNewsletterMeta.tsx => hooks/useNewsletterMeta/index.ts   | 0
 plugins/newsletter-from-post/email-settings.tsx                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename plugins/newsletter-from-post/useNewsletterMeta.tsx => hooks/useNewsletterMeta/index.ts (100%)

diff --git a/plugins/newsletter-from-post/useNewsletterMeta.tsx b/hooks/useNewsletterMeta/index.ts
similarity index 100%
rename from plugins/newsletter-from-post/useNewsletterMeta.tsx
rename to hooks/useNewsletterMeta/index.ts
diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index e061607a..6d748770 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -14,8 +14,8 @@ import { useSelect } from '@wordpress/data';
 import apiFetch from '@wordpress/api-fetch';
 import { MultiSelect } from 'react-multi-select-component';
 import { parse, serialize } from '@wordpress/blocks';
-import useNewsletterMeta from '@/plugins/newsletter-from-post/useNewsletterMeta';
 import NewsletterSpinner from '@/components/newsletterSpinner';
+import useNewsletterMeta from '@/hooks/useNewsletterMeta';
 
 import EmailTypeSelector from '../../components/emailTypeSelector';
 import SentNewsletter from './sent-newsletter';

From e477596c304c4bc205adaea4db05134489a2b0fd Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 10:58:49 -0400
Subject: [PATCH 09/18] Move email list functionality out into a custom hook

---
 hooks/useEmailLists/index.ts                  | 45 +++++++++++++++++++
 .../newsletter-from-post/email-settings.tsx   | 39 ++--------------
 2 files changed, 48 insertions(+), 36 deletions(-)
 create mode 100644 hooks/useEmailLists/index.ts

diff --git a/hooks/useEmailLists/index.ts b/hooks/useEmailLists/index.ts
new file mode 100644
index 00000000..394f8abc
--- /dev/null
+++ b/hooks/useEmailLists/index.ts
@@ -0,0 +1,45 @@
+import { useEffect, useMemo, useState } from '@wordpress/element';
+import apiFetch from '@wordpress/api-fetch';
+import useNewsletterMeta from '@/hooks/useNewsletterMeta';
+
+interface ListResult {
+  ListID: string;
+  Name: string;
+}
+
+export interface Option {
+  value: string;
+  label: string;
+}
+
+function useEmailLists() {
+  const { meta} = useNewsletterMeta();
+  const [lists, setLists] = useState<ListResult[]>([]); // eslint-disable-line
+
+  const emailListOptions = useMemo(() => {
+    if (lists.length === 0) {
+      return [];
+    }
+
+    return lists
+      .map((item: ListResult) => ({ label: item.Name, value: item.ListID }));
+  }, [lists]);
+  const selectedEmailList = useMemo(() => emailListOptions
+    .filter((item: Option) => meta.list.includes(item.value)), [meta.list, emailListOptions]);
+
+  useEffect(() => { // eslint-disable-line
+    if (lists.length > 0) {
+      return;
+    }
+    apiFetch({ path: '/wp-newsletter-builder/v1/lists' }).then((response) => {
+      setLists(response as any as ListResult[]);
+    });
+  }, [lists]);
+
+  return {
+    emailListOptions,
+    selectedEmailList,
+  };
+}
+
+export default useEmailLists;
diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 6d748770..f5df2f9b 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -9,27 +9,16 @@ import {
   CheckboxControl,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { useMemo, useEffect, useState } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
-import apiFetch from '@wordpress/api-fetch';
 import { MultiSelect } from 'react-multi-select-component';
 import { parse, serialize } from '@wordpress/blocks';
 import NewsletterSpinner from '@/components/newsletterSpinner';
 import useNewsletterMeta from '@/hooks/useNewsletterMeta';
+import useEmailLists, { Option } from '@/hooks/useEmailLists';
 
 import EmailTypeSelector from '../../components/emailTypeSelector';
 import SentNewsletter from './sent-newsletter';
 
-interface ListResult {
-  ListID: string;
-  Name: string;
-}
-
-interface Option {
-  value: string;
-  label: string;
-}
-
 interface CoreEditor {
   getEditedPostAttribute: (attribute: string) => string;
 }
@@ -44,7 +33,7 @@ interface Window {
 
 function EmailSettings() {
   const { meta, setMeta } = useNewsletterMeta();
-  const [lists, setLists] = useState<ListResult[]>([]); // eslint-disable-line
+  const { emailListOptions, selectedEmailList } = useEmailLists();
 
   const {
     postId,
@@ -68,17 +57,6 @@ function EmailSettings() {
     };
   }, []);
 
-  const emailListOptions = useMemo(() => {
-    if (lists.length === 0) {
-      return [];
-    }
-
-    return lists
-      .map((item: ListResult) => ({ label: item.Name, value: item.ListID }));
-  }, [lists]);
-  const selectedEmailList = useMemo(() => emailListOptions
-    .filter((item: Option) => meta.list.includes(item.value)), [meta.list, emailListOptions]);
-
   const manualSubject = meta.subject !== '';
   const manualPreview = meta.preview !== '';
 
@@ -95,15 +73,6 @@ function EmailSettings() {
     setMeta({ nb_breaking_list: listIds });
   });
 
-  useEffect(() => { // eslint-disable-line
-    if (lists.length > 0) {
-      return;
-    }
-    apiFetch({ path: '/wp-newsletter-builder/v1/lists' }).then((response) => {
-      setLists(response as any as ListResult[]);
-    });
-  }, [lists]);
-
   const contentHandler = (html: string) => {
     const blocks = parse(html);
     const postIndex = blocks.findIndex((block) => block.name === 'wp-newsletter-builder/post');
@@ -119,8 +88,6 @@ function EmailSettings() {
     || (meta.preview === '' && postExcerpt === '')
     || meta.list.length === 0;
 
-  console.log('rendering', emailListOptions);
-
   return (
     <PluginSidebar
       icon="email-alt2"
@@ -168,7 +135,7 @@ function EmailSettings() {
             />
           );
         })}
-        {lists.length > 0 ? (
+        {emailListOptions.length > 0 ? (
           <label
             htmlFor="wp-newsletter-builder-list"
           >

From 0cf114fab48ad48c94952cdb96008c2784cb1c41 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 15:44:36 -0400
Subject: [PATCH 10/18] Account for both objects and arrays

---
 src/class-breaking-recipients.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/class-breaking-recipients.php b/src/class-breaking-recipients.php
index f4c76516..fa1156fd 100644
--- a/src/class-breaking-recipients.php
+++ b/src/class-breaking-recipients.php
@@ -103,7 +103,11 @@ private function get_options(): array {
 			return $options;
 		}
 		foreach ( $lists as $list ) {
-			$options[ $list->ListID ] = $list->Name; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			if ( is_object( $list ) ) {
+				$options[ $list->ListID ] = $list->Name; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			} else {
+				$options[ $list['ListID'] ] = $list['Name']; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			}
 		}
 		return $options;
 	}

From 13cee9629e00841fbb65e00f66dc439e3e696e05 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 15:45:07 -0400
Subject: [PATCH 11/18] Recreate the block so that it retains the new postId
 attribute

---
 plugins/newsletter-from-post/email-settings.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index f5df2f9b..2972d213 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -3,15 +3,11 @@
  */
 
 import { PluginSidebar } from '@wordpress/edit-post';
-import {
-  PanelBody,
-  TextareaControl,
-  CheckboxControl,
-} from '@wordpress/components';
+import { CheckboxControl, PanelBody, TextareaControl, } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { MultiSelect } from 'react-multi-select-component';
-import { parse, serialize } from '@wordpress/blocks';
+import { createBlock, parse, serialize } from '@wordpress/blocks';
 import NewsletterSpinner from '@/components/newsletterSpinner';
 import useNewsletterMeta from '@/hooks/useNewsletterMeta';
 import useEmailLists, { Option } from '@/hooks/useEmailLists';
@@ -76,7 +72,11 @@ function EmailSettings() {
   const contentHandler = (html: string) => {
     const blocks = parse(html);
     const postIndex = blocks.findIndex((block) => block.name === 'wp-newsletter-builder/post');
-    blocks[postIndex].attributes.postId = postId;
+
+    blocks[postIndex] = createBlock('wp-newsletter-builder/post', {
+      ...blocks[postIndex].attributes,
+      postId,
+    }, blocks[postIndex].innerBlocks);
 
     setMeta({ nb_breaking_content: serialize(blocks) });
   };

From 6db262bd5a7e468236141882d3621d76bc93333e Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 15:52:11 -0400
Subject: [PATCH 12/18] Move sent-newsletter.tsx into a components folder

---
 .../newsletter-from-post/{ => components}/sent-newsletter.tsx   | 0
 plugins/newsletter-from-post/email-settings.tsx                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename plugins/newsletter-from-post/{ => components}/sent-newsletter.tsx (100%)

diff --git a/plugins/newsletter-from-post/sent-newsletter.tsx b/plugins/newsletter-from-post/components/sent-newsletter.tsx
similarity index 100%
rename from plugins/newsletter-from-post/sent-newsletter.tsx
rename to plugins/newsletter-from-post/components/sent-newsletter.tsx
diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 2972d213..3753b8bf 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -13,7 +13,7 @@ import useNewsletterMeta from '@/hooks/useNewsletterMeta';
 import useEmailLists, { Option } from '@/hooks/useEmailLists';
 
 import EmailTypeSelector from '../../components/emailTypeSelector';
-import SentNewsletter from './sent-newsletter';
+import SentNewsletter from './components/sent-newsletter';
 
 interface CoreEditor {
   getEditedPostAttribute: (attribute: string) => string;

From aff7caabae029cd5c0ca586058baa61a5a886e4e Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Tue, 11 Jun 2024 16:14:19 -0400
Subject: [PATCH 13/18] Extract required fields out into its own component

---
 hooks/useNewsletterMeta/index.ts              | 13 +++++++
 .../components/required-fields.tsx            | 35 +++++++++++++++++++
 .../newsletter-from-post/email-settings.tsx   | 20 ++---------
 3 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 plugins/newsletter-from-post/components/required-fields.tsx

diff --git a/hooks/useNewsletterMeta/index.ts b/hooks/useNewsletterMeta/index.ts
index 1ca20be9..0ee27ed2 100644
--- a/hooks/useNewsletterMeta/index.ts
+++ b/hooks/useNewsletterMeta/index.ts
@@ -1,5 +1,18 @@
 import { usePostMeta } from '@alleyinteractive/block-editor-tools';
 
+export interface NewsletterMeta {
+  type: string;
+  template: string;
+  fromName: string;
+  subject: string;
+  preview: string;
+  list: string[];
+  image: number;
+  send: boolean;
+  content: string;
+  sentBreakingPostId: number[];
+}
+
 function useNewsletterMeta() {
   const [meta, setMeta] = usePostMeta();
 
diff --git a/plugins/newsletter-from-post/components/required-fields.tsx b/plugins/newsletter-from-post/components/required-fields.tsx
new file mode 100644
index 00000000..fe49e846
--- /dev/null
+++ b/plugins/newsletter-from-post/components/required-fields.tsx
@@ -0,0 +1,35 @@
+import { __ } from '@wordpress/i18n';
+import { NewsletterMeta } from '@/hooks/useNewsletterMeta';
+
+interface RequiredFieldsProps {
+  meta: Pick<NewsletterMeta, 'type' | 'template' | 'fromName' | 'subject' | 'preview' | 'list'>
+  postTitle: string;
+  postExcerpt: string;
+}
+
+function RequiredFields({ meta, postTitle, postExcerpt }: RequiredFieldsProps) {
+  return (
+    <>
+      {!meta.type ? (
+        <p style={{ color: 'red' }}>{__('Header Type is Required', 'wp-newsletter-builder')}</p>
+      ) : null}
+      {!meta.template ? (
+        <p style={{ color: 'red' }}>{__('Template is Required', 'wp-newsletter-builder')}</p>
+      ) : null}
+      {!meta.fromName ? (
+        <p style={{ color: 'red' }}>{__('From Name is Required', 'wp-newsletter-builder')}</p>
+      ) : null}
+      {!meta.subject && !postTitle ? (
+        <p style={{ color: 'red' }}>{__('Subject is Required', 'wp-newsletter-builder')}</p>
+      ) : null}
+      {!meta.preview && !postExcerpt ? (
+        <p style={{ color: 'red' }}>{__('Preview Text is Required', 'wp-newsletter-builder')}</p>
+      ) : null}
+      {meta.list.length === 0 ? (
+        <p style={{ color: 'red' }}>{__('Email List is Required', 'wp-newsletter-builder')}</p>
+      ) : null}
+    </>
+  );
+}
+
+export default RequiredFields;
diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 3753b8bf..8845b14f 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -11,6 +11,7 @@ import { createBlock, parse, serialize } from '@wordpress/blocks';
 import NewsletterSpinner from '@/components/newsletterSpinner';
 import useNewsletterMeta from '@/hooks/useNewsletterMeta';
 import useEmailLists, { Option } from '@/hooks/useEmailLists';
+import RequiredFields from '@/plugins/newsletter-from-post/components/required-fields';
 
 import EmailTypeSelector from '../../components/emailTypeSelector';
 import SentNewsletter from './components/sent-newsletter';
@@ -161,24 +162,7 @@ function EmailSettings() {
             onChange={(value) => { setMeta({ nb_breaking_should_send: value }); }}
             disabled={disabled}
           />
-          {!meta.type ? (
-            <p style={{ color: 'red' }}>{__('Header Type is Required', 'wp-newsletter-builder')}</p>
-          ) : null}
-          {!meta.template ? (
-            <p style={{ color: 'red' }}>{__('Template is Required', 'wp-newsletter-builder')}</p>
-          ) : null}
-          {!meta.fromName ? (
-            <p style={{ color: 'red' }}>{__('From Name is Required', 'wp-newsletter-builder')}</p>
-          ) : null}
-          {!meta.subject && !postTitle ? (
-            <p style={{ color: 'red' }}>{__('Subject is Required', 'wp-newsletter-builder')}</p>
-          ) : null}
-          {!meta.preview && !postExcerpt ? (
-            <p style={{ color: 'red' }}>{__('Preview Text is Required', 'wp-newsletter-builder')}</p>
-          ) : null}
-          {meta.list.length === 0 ? (
-            <p style={{ color: 'red' }}>{__('Email List is Required', 'wp-newsletter-builder')}</p>
-          ) : null}
+          <RequiredFields meta={meta} postTitle={postTitle} postExcerpt={postExcerpt} />
         </div>
       </PanelBody>
       {meta.sentBreakingPostId ? (

From 42cefbf62a2ad07005ac7cff010f1570b64c2863 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Wed, 12 Jun 2024 08:56:19 -0400
Subject: [PATCH 14/18] Chores: ESLint

---
 hooks/useEmailLists/index.ts                    | 2 +-
 plugins/newsletter-from-post/email-settings.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hooks/useEmailLists/index.ts b/hooks/useEmailLists/index.ts
index 394f8abc..7aae8d86 100644
--- a/hooks/useEmailLists/index.ts
+++ b/hooks/useEmailLists/index.ts
@@ -13,7 +13,7 @@ export interface Option {
 }
 
 function useEmailLists() {
-  const { meta} = useNewsletterMeta();
+  const { meta } = useNewsletterMeta();
   const [lists, setLists] = useState<ListResult[]>([]); // eslint-disable-line
 
   const emailListOptions = useMemo(() => {
diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 8845b14f..6038d58b 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -3,7 +3,7 @@
  */
 
 import { PluginSidebar } from '@wordpress/edit-post';
-import { CheckboxControl, PanelBody, TextareaControl, } from '@wordpress/components';
+import { CheckboxControl, PanelBody, TextareaControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { MultiSelect } from 'react-multi-select-component';

From 7883d291f08f74a38db61f228b8a39e322fa95f3 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Wed, 12 Jun 2024 09:53:40 -0400
Subject: [PATCH 15/18] Remove ESLint ignores and rename disabled variable

---
 hooks/useEmailLists/index.ts                    |  2 +-
 hooks/useNewsletterMeta/index.ts                |  4 ++--
 plugins/newsletter-from-post/email-settings.tsx | 14 ++++++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/hooks/useEmailLists/index.ts b/hooks/useEmailLists/index.ts
index 7aae8d86..32f37e9a 100644
--- a/hooks/useEmailLists/index.ts
+++ b/hooks/useEmailLists/index.ts
@@ -14,7 +14,7 @@ export interface Option {
 
 function useEmailLists() {
   const { meta } = useNewsletterMeta();
-  const [lists, setLists] = useState<ListResult[]>([]); // eslint-disable-line
+  const [lists, setLists] = useState<ListResult[]>([]);
 
   const emailListOptions = useMemo(() => {
     if (lists.length === 0) {
diff --git a/hooks/useNewsletterMeta/index.ts b/hooks/useNewsletterMeta/index.ts
index 0ee27ed2..9230f621 100644
--- a/hooks/useNewsletterMeta/index.ts
+++ b/hooks/useNewsletterMeta/index.ts
@@ -23,9 +23,9 @@ function useNewsletterMeta() {
     nb_breaking_subject: subject = '',
     nb_breaking_preview: preview = '',
     nb_breaking_list: list = [],
-    nb_breaking_header_img: image = 0, // eslint-disable-line
+    nb_breaking_header_img: image = 0,
     nb_breaking_should_send: send = false,
-    nb_breaking_content: content = '', // eslint-disable-line
+    nb_breaking_content: content = '',
     nb_newsletter_sent_breaking_post_id: sentBreakingPostId = [],
   } = meta;
 
diff --git a/plugins/newsletter-from-post/email-settings.tsx b/plugins/newsletter-from-post/email-settings.tsx
index 6038d58b..2c1c4ae1 100644
--- a/plugins/newsletter-from-post/email-settings.tsx
+++ b/plugins/newsletter-from-post/email-settings.tsx
@@ -31,6 +31,9 @@ interface Window {
 function EmailSettings() {
   const { meta, setMeta } = useNewsletterMeta();
   const { emailListOptions, selectedEmailList } = useEmailLists();
+  const manualSubject = meta.subject !== '';
+  const manualPreview = meta.preview !== '';
+  const listArray = Array.isArray(meta.list) ? meta.list : [meta.list];
 
   const {
     postId,
@@ -54,11 +57,6 @@ function EmailSettings() {
     };
   }, []);
 
-  const manualSubject = meta.subject !== '';
-  const manualPreview = meta.preview !== '';
-
-  const listArray = Array.isArray(meta.list) ? meta.list : [meta.list];
-
   const {
     newsletterBuilder: {
       breakingLists = {},
@@ -82,7 +80,7 @@ function EmailSettings() {
     setMeta({ nb_breaking_content: serialize(blocks) });
   };
 
-  const disabled = meta.type === ''
+  const areRequiredFieldsSet = meta.type === ''
     || meta.template === ''
     || meta.fromName === ''
     || (meta.subject === '' && postTitle === '')
@@ -158,9 +156,9 @@ function EmailSettings() {
         <div style={{ marginTop: '1rem' }}>
           <CheckboxControl
             label={postStatus === 'draft' || postStatus === 'auto-draft' ? __('Send Newsletter on Publish', 'wp-newsletter-builder') : __('Send Newsletter on Update', 'wp-newsletter-builder')}
-            checked={meta.send && !disabled}
+            checked={meta.send && !areRequiredFieldsSet}
             onChange={(value) => { setMeta({ nb_breaking_should_send: value }); }}
-            disabled={disabled}
+            disabled={areRequiredFieldsSet}
           />
           <RequiredFields meta={meta} postTitle={postTitle} postExcerpt={postExcerpt} />
         </div>

From 05a70fbf56c36992870effce8b42d0385489f90a Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Wed, 12 Jun 2024 11:57:24 -0400
Subject: [PATCH 16/18] Configure PHPUnit

---
 phpunit.xml            | 12 +++++++-----
 tests/test-example.php | 11 +++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 tests/test-example.php

diff --git a/phpunit.xml b/phpunit.xml
index c8d576ca..03dba968 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,8 +2,10 @@
 	bootstrap="tests/bootstrap.php"
 	backupGlobals="false"
 	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
-/>
+	printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer">
+  <testsuites>
+    <testsuite name="wp-newsletter-builder">
+      <directory prefix="test-" suffix=".php">./tests/</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/tests/test-example.php b/tests/test-example.php
new file mode 100644
index 00000000..c1a02e95
--- /dev/null
+++ b/tests/test-example.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace WP_Newsletter_Builder;
+
+use WP_Newsletter_Builder\Tests\Test_Case;
+
+class Test_Example extends Test_Case {
+	public function test_example() {
+		$this->assertTrue( true );
+	}
+}

From f96ad9ae762743c350adfa08bcc342acabe14076 Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Wed, 12 Jun 2024 12:02:13 -0400
Subject: [PATCH 17/18] Exclude tests director from PHPCS

---
 .phpcs.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.phpcs.xml b/.phpcs.xml
index b0425ef2..50c58dfc 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -28,6 +28,7 @@
   <!-- Exclude a few directories and autogenerated files. -->
   <exclude-pattern>build/</exclude-pattern>
   <exclude-pattern>vendor/</exclude-pattern>
+  <exclude-pattern>tests/</exclude-pattern>
 
   <!-- The version set here matches the minimum version tested in buddy.yml. -->
   <config name="minimum_supported_wp_version" value="5.9" />

From d613b3c3962e7d411e4a07e73401fdb5726138ef Mon Sep 17 00:00:00 2001
From: efuller <eric@alley.co>
Date: Wed, 12 Jun 2024 12:06:26 -0400
Subject: [PATCH 18/18] Version bump

---
 plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.php b/plugin.php
index 0fe5667b..22a9f496 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
  * Plugin Name: Newsletter Builder
  * Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Description: Interface to manage email newsletters
- * Version: 0.3.18
+ * Version: 0.3.19
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2