From d83c2fd566e53d00350bac570c5a8177628d4b4c Mon Sep 17 00:00:00 2001
From: Mendel Konikov
Date: Thu, 17 May 2018 20:03:12 -0400
Subject: [PATCH 1/2] Only display paragraph if delete requested
---
.../client/components/DeleteMyAccount.js | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
index 179fa0193..6eae91043 100644
--- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
+++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
@@ -63,14 +63,13 @@ class DeleteMyAccount extends React.Component {
{t('delete_request.delete_my_account_description')}
-
- {scheduledDeletionDate &&
- t(
- 'delete_request.already_submitted_request_description',
- moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
- )}
-
{scheduledDeletionDate ? (
+
+ {t(
+ 'delete_request.already_submitted_request_description',
+ moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
+ )}
+
From ffa6b99d09aadc14e4c6109cdce3148cad5ff0ac Mon Sep 17 00:00:00 2001
From: Mendel Konikov
Date: Fri, 18 May 2018 12:32:24 -0400
Subject: [PATCH 2/2] Wrap els in div
---
.../client/components/DeleteMyAccount.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
index 6eae91043..c2055a16e 100644
--- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
+++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
@@ -64,15 +64,17 @@ class DeleteMyAccount extends React.Component {
{t('delete_request.delete_my_account_description')}
{scheduledDeletionDate ? (
-
- {t(
+
+
+ {t(
'delete_request.already_submitted_request_description',
moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
)}
-
-
+
+
+
) : (