Improve text of account deactivation dialog (#8371)

* Improve text of account deactivation dialog
* Reduce spacing of deactivate account dialog

Author: justjanne

res/css/views/dialogs/_DeactivateAccountDialog.scss

@@ -18,10 +18,6 @@ limitations under the License.
     margin-bottom: 30px;
 }
 
-.mx_DeactivateAccountDialog .mx_DeactivateAccountDialog_input_section {
-    margin-top: 60px;
-}
-
 .mx_DeactivateAccountDialog .mx_DeactivateAccountDialog_input_section .mx_Field {
     width: 300px;
 }

src/components/views/dialogs/DeactivateAccountDialog.tsx

@@ -86,7 +86,7 @@ export default class DeactivateAccountDialog extends React.Component<IProps, ISt
             [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
             [PasswordAuthEntry.LOGIN_TYPE]: {
                 [DEFAULT_PHASE]: {
-                    body: _t("To continue, please enter your password:"),
+                    body: _t("To continue, please enter your account password:"),
                 },
             },
         };
@@ -206,52 +206,28 @@ export default class DeactivateAccountDialog extends React.Component<IProps, ISt
                 screenName="DeactivateAccount"
             >
                 <div className="mx_Dialog_content">
-                    <p>{ _t(
-                        "This will make your account permanently unusable. " +
-                        "You will not be able to log in, and no one will be able to re-register the same " +
-                        "user ID. " +
-                        "This will cause your account to leave all rooms it is participating in, and it " +
-                        "will remove your account details from your identity server. " +
-                        "<b>This action is irreversible.</b>",
-                        {},
-                        { b: (sub) => <b> { sub } </b> },
-                    ) }</p>
-
-                    <p>{ _t(
-                        "Deactivating your account <b>does not by default cause us to forget messages you " +
-                        "have sent.</b> " +
-                        "If you would like us to forget your messages, please tick the box below.",
-                        {},
-                        { b: (sub) => <b> { sub } </b> },
-                    ) }</p>
-
-                    <p>{ _t(
-                        "Message visibility in Matrix is similar to email. " +
-                        "Our forgetting your messages means that messages you have sent will not be shared " +
-                        "with any new or unregistered users, but registered users who already have access " +
-                        "to these messages will still have access to their copy.",
-                    ) }</p>
+                    <p>{ _t("Confirm that you would like to deactivate your account. If you proceed:") }</p>
+                    <ul>
+                        <li>{ _t("You will not be able to reactivate your account") }</li>
+                        <li>{ _t("You will no longer be able to log in") }</li>
+                        <li>{ _t("No one will be able to reuse your username (MXID), including you: this username will remain unavailable") }</li>
+                        <li>{ _t("You will leave all rooms and DMs that you are in") }</li>
+                        <li>{ _t("You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number") }</li>
+                    </ul>
+                    <p>{ _t("Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?") }</p>
 
                     <div className="mx_DeactivateAccountDialog_input_section">
                         <p>
                             <StyledCheckbox
                                 checked={this.state.shouldErase}
                                 onChange={this.onEraseFieldChange}
                             >
-                                { _t(
-                                    "Please forget all messages I have sent when my account is deactivated " +
-                                    "(<b>Warning:</b> this will cause future users to see an incomplete view " +
-                                    "of conversations)",
-                                    {},
-                                    { b: (sub) => <b>{ sub }</b> },
-                                ) }
+                                { _t("Hide my messages from new joiners") }
                             </StyledCheckbox>
                         </p>
-
                         { error }
                         { auth }
                     </div>
-
                 </div>
             </BaseDialog>
         );

src/i18n/strings/en_EN.json

@@ -2479,14 +2479,18 @@
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.",
     "Confirm account deactivation": "Confirm account deactivation",
-    "To continue, please enter your password:": "To continue, please enter your password:",
+    "To continue, please enter your account password:": "To continue, please enter your account password:",
     "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.",
     "Server did not require any authentication": "Server did not require any authentication",
     "Server did not return valid authentication information.": "Server did not return valid authentication information.",
-    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.",
-    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)",
+    "Confirm that you would like to deactivate your account. If you proceed:": "Confirm that you would like to deactivate your account. If you proceed:",
+    "You will not be able to reactivate your account": "You will not be able to reactivate your account",
+    "You will no longer be able to log in": "You will no longer be able to log in",
+    "No one will be able to reuse your username (MXID), including you: this username will remain unavailable": "No one will be able to reuse your username (MXID), including you: this username will remain unavailable",
+    "You will leave all rooms and DMs that you are in": "You will leave all rooms and DMs that you are in",
+    "You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number": "You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number",
+    "Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?": "Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?",
+    "Hide my messages from new joiners": "Hide my messages from new joiners",
     "Room": "Room",
     "Send custom timeline event": "Send custom timeline event",
     "Explore room state": "Explore room state",