From 1b1e304cfc05cee07a054e9dae9be05bb0fc405d Mon Sep 17 00:00:00 2001
From: Thomas Tracy <contact@tjtracy.com>
Date: Tue, 8 Feb 2022 15:05:53 -0500
Subject: [PATCH] fix: [MICROBA-1703] Add missing form instructions (#18)

Add/move instructions for submitting the email form.
Also fixes a sneaky bug when selecting cohorts.
---
 .../bulk-email-form/BulkEmailForm.jsx         | 31 ++++++++++++++-----
 .../bulk-email-form/BulkEmailRecipient.jsx    |  1 -
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx b/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
index c2af641..d49ce22 100644
--- a/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
+++ b/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
@@ -101,18 +101,11 @@ export default function BulkEmailForm(props) {
                 }}
               />
             </p>
-            <ul>
+            <ul className="list-unstyled">
               {selectedRecipients.map((group) => (
                 <li key={group}>{group}</li>
               ))}
             </ul>
-            <p>
-              <FormattedMessage
-                id="bulk.email.task.alert.warning"
-                defaultMessage="CAUTION! When you select Send Email, your email message is added to the queue for sending, and cannot be cancelled."
-                description="Warns the user in an alert that the email may not be immediately sent out to users."
-              />
-            </p>
           </>
         )}
         close={(event) => {
@@ -167,6 +160,28 @@ export default function BulkEmailForm(props) {
             </Form.Control.Feedback>
           )}
         </Form.Group>
+        <div>
+          <p>
+            <FormattedMessage
+              id="bulk.email.instructions.proofreading"
+              defaultMessage="We recommend sending learners no more than one email message per week. Before you send your email, review
+              the text carefully and send it to yourself first, so that you can preview the formatting and make sure
+              embedded images and links work correctly."
+              description="A set of instructions to give users a heads up about the formatting of the email they are about to send"
+            />
+          </p>
+          <p>
+            <strong>
+              <FormattedMessage id="bulk.email.instructions.caution" defaultMessage="Caution!" />
+            </strong>
+            <FormattedMessage
+              id="bulk.email.instructions.caution.message"
+              defaultMessage=" When you select Send Email, your email message is added to the queue for sending,
+              and cannot be cancelled."
+              description="A warning about how emails are sent out to users"
+            />
+          </p>
+        </div>
         <Form.Group className="d-flex flex-row">
           <StatefulButton
             variant="primary"
diff --git a/src/components/bulk-email-tool/bulk-email-form/BulkEmailRecipient.jsx b/src/components/bulk-email-tool/bulk-email-form/BulkEmailRecipient.jsx
index 5a486ac..9c184e2 100644
--- a/src/components/bulk-email-tool/bulk-email-form/BulkEmailRecipient.jsx
+++ b/src/components/bulk-email-tool/bulk-email-form/BulkEmailRecipient.jsx
@@ -82,7 +82,6 @@ export default function BulkEmailRecipient(props) {
               <Form.Checkbox
                 key={cohort}
                 value={`cohort:${cohort}`}
-                disabled={selectedGroups.find((group) => group === (DEFAULT_GROUPS.AUDIT || DEFAULT_GROUPS.VERIFIED))}
               >
                 <FormattedMessage
                   id="bulk.email.form.cohort.label"