From b7d0b4d22dbda3675f5b8ca8bb902d83d5e172c3 Mon Sep 17 00:00:00 2001
From: mashal-m <mashal.malik@arbisoft.com>
Date: Mon, 10 Oct 2022 14:13:48 +0500
Subject: [PATCH 1/5] refactor: migrate off paragon modal deprecated component

---
 .../ViewEmailModal.jsx                        | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx b/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx
index 8d6a512a..fba3cfb6 100644
--- a/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx
+++ b/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { Button, Modal } from '@edx/paragon';
+import { ActionRow, Button, ModalDialog } from '@edx/paragon';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import messages from './messages';
 import { BulkEmailContext } from '../bulk-email-context';
@@ -12,10 +12,13 @@ function ViewEmailModal({
   const [, dispatch] = useContext(BulkEmailContext);
   return (
     <div>
-      <Modal
-        open={isOpen}
-        title=""
-        body={(
+      <ModalDialog
+        isOpen={isOpen}
+        onClose={() => setModalOpen(false)}
+        hasCloseButton
+      >
+        <ModalDialog.Body>
+
           <div>
             <div className="d-flex flex-row">
               <p>{intl.formatMessage(messages.modalMessageSubject)}</p>
@@ -40,24 +43,30 @@ function ViewEmailModal({
               <div dangerouslySetInnerHTML={{ __html: messageContent.email.html_message }} />
             </div>
           </div>
-        )}
-        onClose={() => setModalOpen(false)}
-        buttons={[
-          <Button
-            onClick={() => {
-              dispatch(
-                copyToEditor({
-                  emailBody: messageContent.email.html_message,
-                  emailSubject: messageContent.subject,
-                }),
-              );
-              setModalOpen(false);
-            }}
-          >
-            <FormattedMessage id="bulk.email.tool.copy.message.button" defaultMessage="Copy to editor" />
-          </Button>,
-        ]}
-      />
+        </ModalDialog.Body>
+        <ModalDialog.Footer>
+          <ActionRow>
+            <ModalDialog.CloseButton variant="link">
+              Close
+            </ModalDialog.CloseButton>
+            <Button
+              onClick={() => {
+                dispatch(
+                  copyToEditor({
+                    emailBody: messageContent.email.html_message,
+                    emailSubject: messageContent.subject,
+                  }),
+                );
+                setModalOpen(false);
+              }}
+              variant="primary"
+            >
+              <FormattedMessage id="bulk.email.tool.copy.message.button" defaultMessage="Copy to editor" />
+
+            </Button>
+          </ActionRow>
+        </ModalDialog.Footer>
+      </ModalDialog>
     </div>
   );
 }

From 868bcfadcd4c6fb1b0ecbaf8cd467444901037b7 Mon Sep 17 00:00:00 2001
From: mashal-m <mashal.malik@arbisoft.com>
Date: Mon, 10 Oct 2022 15:03:30 +0500
Subject: [PATCH 2/5] refactor: migrate off paragon modal deprecated component

---
 frontend-app-communications | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 frontend-app-communications

diff --git a/frontend-app-communications b/frontend-app-communications
new file mode 160000
index 00000000..0130b527
--- /dev/null
+++ b/frontend-app-communications
@@ -0,0 +1 @@
+Subproject commit 0130b5279f9899d4ca63337575e5ec5d3607ac27

From 30810e0521dbe725089f5fce3f85db4c44367672 Mon Sep 17 00:00:00 2001
From: mashal-m <mashal.malik@arbisoft.com>
Date: Mon, 5 Jun 2023 12:36:14 +0500
Subject: [PATCH 3/5] refactor: resource the close button string

---
 .../bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx b/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx
index fba3cfb6..dd3118e8 100644
--- a/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx
+++ b/src/components/bulk-email-tool/bulk-email-task-manager/ViewEmailModal.jsx
@@ -47,7 +47,7 @@ function ViewEmailModal({
         <ModalDialog.Footer>
           <ActionRow>
             <ModalDialog.CloseButton variant="link">
-              Close
+              <FormattedMessage id="bulk.email.tool.close.modalDialog.button" defaultMessage="Close" />
             </ModalDialog.CloseButton>
             <Button
               onClick={() => {

From c866dc9f0ac8a3e74d11bb60324951e45e7eae7d Mon Sep 17 00:00:00 2001
From: mashal-m <mashal.malik@arbisoft.com>
Date: Mon, 5 Jun 2023 12:38:10 +0500
Subject: [PATCH 4/5] refactor: remove extra file

---
 frontend-app-communications | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 frontend-app-communications

diff --git a/frontend-app-communications b/frontend-app-communications
deleted file mode 160000
index 0130b527..00000000
--- a/frontend-app-communications
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0130b5279f9899d4ca63337575e5ec5d3607ac27

From 9b69f5d5b9a7fbd92ae0df29ef0a42aed32ec56c Mon Sep 17 00:00:00 2001
From: mashal-m <mashal.malik@arbisoft.com>
Date: Mon, 5 Jun 2023 13:16:28 +0500
Subject: [PATCH 5/5] refactor: add message in messages  file

---
 .../bulk-email-tool/bulk-email-task-manager/messages.js       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/bulk-email-tool/bulk-email-task-manager/messages.js b/src/components/bulk-email-tool/bulk-email-task-manager/messages.js
index cedc47dd..5ed65955 100644
--- a/src/components/bulk-email-tool/bulk-email-task-manager/messages.js
+++ b/src/components/bulk-email-tool/bulk-email-task-manager/messages.js
@@ -34,6 +34,10 @@ const messages = defineMessages({
     id: 'bulk.email.content.history.table.modal.messageBody',
     defaultMessage: 'Message:',
   },
+  modalCloseButton: {
+    id: 'bulk.email.tool.close.modalDialog.button',
+    defaultMessage: 'Close',
+  },
   emailHistoryTableViewMessageInstructions: {
     id: 'bulk.email.content.history.table.viewMessageInstructions',
     defaultMessage: 'To read a sent email message, click the `View Message` button within the table.',