From ac62e83958330e4d3e02867090b20fbc1458dbf4 Mon Sep 17 00:00:00 2001
From: mariagrimaldi
Date: Tue, 8 Dec 2020 11:44:36 -0400
Subject: [PATCH 1/4] feat: remove edX branding on account deletion
---
.../student_account/components/StudentAccountDeletion.jsx | 8 +-------
.../components/StudentAccountDeletionModal.jsx | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/lms/static/js/student_account/components/StudentAccountDeletion.jsx b/lms/static/js/student_account/components/StudentAccountDeletion.jsx
index 1341faa9ee..e4fc4b3f4b 100644
--- a/lms/static/js/student_account/components/StudentAccountDeletion.jsx
+++ b/lms/static/js/student_account/components/StudentAccountDeletion.jsx
@@ -38,13 +38,7 @@ export class StudentAccountDeletion extends React.Component {
render() {
const { deletionModalOpen, socialAuthConnected, isActive } = this.state;
- const loseAccessText = StringUtils.interpolate(
- gettext('You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, follow the instructions for {htmlStart}printing or downloading a certificate{htmlEnd}.'),
- {
- htmlStart: '',
- htmlEnd: '',
- },
- );
+ const loseAccessText = gettext('You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.')
const showError = socialAuthConnected || !isActive;
diff --git a/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx b/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx
index e2a83c61ff..8d9f86f21f 100644
--- a/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx
+++ b/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx
@@ -94,13 +94,7 @@ class StudentAccountDeletionConfirmationModal extends React.Component {
validationMessage,
} = this.state;
const { onClose } = this.props;
- const loseAccessText = StringUtils.interpolate(
- gettext('You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, follow the instructions for {htmlStart}printing or downloading a certificate{htmlEnd}.'),
- {
- htmlStart: '',
- htmlEnd: '',
- },
- );
+ const loseAccessText = gettext('You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.')
const noteDeletion = StringUtils.interpolate(
gettext('You have selected “Delete my account.” Deletion of your account and personal data is permanent and cannot be undone. {platformName} will not be able to recover your account or the data that is deleted.'),
From 99147d25e7b5986fe2c065a9f04771929a3b6795 Mon Sep 17 00:00:00 2001
From: Maria Grimaldi
Date: Tue, 23 Jan 2024 16:11:49 -0400
Subject: [PATCH 2/4] refactor: address PR reviews
---
.../student_account/components/StudentAccountDeletion.jsx | 8 +++-----
.../components/StudentAccountDeletionModal.jsx | 4 +++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lms/static/js/student_account/components/StudentAccountDeletion.jsx b/lms/static/js/student_account/components/StudentAccountDeletion.jsx
index e4fc4b3f4b..93544c1166 100644
--- a/lms/static/js/student_account/components/StudentAccountDeletion.jsx
+++ b/lms/static/js/student_account/components/StudentAccountDeletion.jsx
@@ -107,11 +107,9 @@ export class StudentAccountDeletion extends React.Component {
{bodyDeletion}
{bodyDeletion2}
-
+
+ {loseAccessText}
+
{bodyDeletion2}
{/* eslint-disable-next-line react/no-danger */}
-
+
+ {loseAccessText}
+
)}
From acd2a917409fde08058ea0891a5bf591a8c79f57 Mon Sep 17 00:00:00 2001
From: Maria Grimaldi
Date: Wed, 21 Feb 2024 13:31:57 -0400
Subject: [PATCH 3/4] refactor: address PR reviews
---
.../js/student_account/components/StudentAccountDeletion.jsx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lms/static/js/student_account/components/StudentAccountDeletion.jsx b/lms/static/js/student_account/components/StudentAccountDeletion.jsx
index 93544c1166..e108f09240 100644
--- a/lms/static/js/student_account/components/StudentAccountDeletion.jsx
+++ b/lms/static/js/student_account/components/StudentAccountDeletion.jsx
@@ -107,9 +107,7 @@ export class StudentAccountDeletion extends React.Component {
{bodyDeletion}
{bodyDeletion2}
-
- {loseAccessText}
-
+ {loseAccessText}
Date: Wed, 21 Feb 2024 15:02:29 -0400
Subject: [PATCH 4/4] refactor: address PR reviews
---
.../components/StudentAccountDeletionModal.jsx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx b/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx
index b8d7f71202..dceffc9ff4 100644
--- a/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx
+++ b/lms/static/js/student_account/components/StudentAccountDeletionModal.jsx
@@ -162,9 +162,7 @@ class StudentAccountDeletionConfirmationModal extends React.Component {
{bodyDeletion2}
{/* eslint-disable-next-line react/no-danger */}
-
- {loseAccessText}
-
+ {loseAccessText}
)}