From 7fb0cd6c421862057c5ba7cae5599576c4d70c80 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 23 Jan 2019 15:56:58 -0700
Subject: [PATCH] Bring over the deactivate account button

---
 .../views/settings/tabs/GeneralSettingsTab.js      | 14 +++++++++++++-
 src/i18n/strings/en_EN.json                        | 11 +++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/tabs/GeneralSettingsTab.js b/src/components/views/settings/tabs/GeneralSettingsTab.js
index fef6abfb17..6b1c5b35de 100644
--- a/src/components/views/settings/tabs/GeneralSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralSettingsTab.js
@@ -29,6 +29,8 @@ import * as languageHandler from "../../../../languageHandler";
 import {SettingLevel} from "../../../../settings/SettingsStore";
 import SettingsStore from "../../../../settings/SettingsStore";
 import LanguageDropdown from "../../elements/LanguageDropdown";
+import AccessibleButton from "../../elements/AccessibleButton";
+import DeactivateAccountDialog from "../../dialogs/DeactivateAccountDialog";
 const PlatformPeg = require("../../../../PlatformPeg");
 const sdk = require('../../../../index');
 const Modal = require("../../../../Modal");
@@ -98,6 +100,10 @@ export default class GeneralSettingsTab extends React.Component {
         });
     };
 
+    _onDeactivateClicked = () => {
+        Modal.createTrackedDialog('Deactivate Account', '', DeactivateAccountDialog, {});
+    };
+
     _renderProfileSection() {
         // HACK/TODO: Using DragDropContext feels wrong, but we need it.
         return (
@@ -171,10 +177,16 @@ export default class GeneralSettingsTab extends React.Component {
     }
 
     _renderManagementSection() {
+        // TODO: Improve warning text for account deactivation
         return (
             <div className="mx_SettingsTab_section">
                 <span className="mx_SettingsTab_subheading">{_t("Account management")}</span>
-                <p>MANAGEMENT SECTION</p>
+                <span className="mx_SettingsTab_subsectionText">
+                    {_t("Deactivating your account is a permanent action - be careful!")}
+                </span>
+                <AccessibleButton onClick={this._onDeactivateClicked} kind="danger">
+                    {_t("Close Account")}
+                </AccessibleButton>
             </div>
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5b320a57c7..5d4c7ff4cf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -413,6 +413,7 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Unable to verify phone number.": "Unable to verify phone number.",
     "Verification code": "Verification code",
     "Phone Number": "Phone Number",
     "Profile picture": "Profile picture",
@@ -430,7 +431,13 @@
     "Phone numbers": "Phone numbers",
     "Language and region": "Language and region",
     "Theme": "Theme",
+    "Light theme": "Light theme",
+    "Dark theme": "Dark theme",
+    "2018 theme": "2018 theme",
+    "Status.im theme": "Status.im theme",
     "Account management": "Account management",
+    "Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
+    "Close Account": "Close Account",
     "General": "General",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
@@ -1254,10 +1261,6 @@
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
-    "Light theme": "Light theme",
-    "Dark theme": "Dark theme",
-    "2018 theme": "2018 theme",
-    "Status.im theme": "Status.im theme",
     "Can't load user settings": "Can't load user settings",
     "Server may be unavailable or overloaded": "Server may be unavailable or overloaded",
     "Remove Contact Information?": "Remove Contact Information?",