Merged in release/2022-11-04 (pull request #612)

Add title to email overlay to prevent close button overlap.

bodyshop_translations.babel

@@ -14191,6 +14191,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>emailpreview</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>generatingemail</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/email-overlay/email-overlay.container.jsx

@@ -178,6 +178,7 @@ export function EmailOverlayContainer({
       maskClosable={false}
       width={"80%"}
       onOk={() => form.submit()}
+      title={t("emails.labels.emailpreview")}
       onCancel={() => {
         toggleEmailOverlayVisible();
       }}
@@ -198,7 +199,7 @@ export function EmailOverlayContainer({
       <div>
         <div
           style={{
-            marginTop: "1rem",
+            //   marginTop: "3rem",
             display: "flex",
             justifyContent: "flex-end",
           }}

client/src/translations/en_us/common.json

@@ -881,6 +881,7 @@
 			"labels": {
 				"attachments": "Attachments",
 				"documents": "Documents",
+				"emailpreview": "Email Preview",
 				"generatingemail": "Generating email...",
 				"pdfcopywillbeattached": "A PDF copy of this email will be attached when it is sent.",
 				"preview": "Email Preview"

client/src/translations/es/common.json

@@ -881,6 +881,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""

client/src/translations/fr/common.json

@@ -881,6 +881,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""