From 3862633e79b1eba243316a5578be2bb51097b4ca Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Mon, 2 Dec 2019 10:50:20 -0330
Subject: [PATCH 1/3] Improve disconnectAccountModalDescription and
 disconnectAllModalDescription messages

---
 app/_locales/en/messages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 02a2fac43fec..80e92f5b60a3 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -421,10 +421,10 @@
     "message": "Disconnect All"
   },
   "disconnectAllModalDescription": {
-    "message": "Are you sure? You will no longer be able to interact with any of these sites."
+    "message": "Are you sure? You will be disconnected from all sites on all accounts."
   },
   "disconnectAccountModalDescription": {
-    "message": "Are you sure? You will no longer be able to interact with this site."
+    "message": "Are you sure? You're account will be disconnected from this site."
   },
   "disconnectAccountQuestion": {
     "message": "Disconnect account?"

From ace1af99ab5152a231887f8b28099039b1c37261 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 2 Dec 2019 11:44:35 -0330
Subject: [PATCH 2/3] Update disconnectAccountModalDescription
 app/_locales/en/messages.json

Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
---
 app/_locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 80e92f5b60a3..1a7935067711 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -424,7 +424,7 @@
     "message": "Are you sure? You will be disconnected from all sites on all accounts."
   },
   "disconnectAccountModalDescription": {
-    "message": "Are you sure? You're account will be disconnected from this site."
+    "message": "Are you sure? Your account will be disconnected from this site."
   },
   "disconnectAccountQuestion": {
     "message": "Disconnect account?"

From 319c37fc05b7fb31ae8f1ec60be92a39083aaeb5 Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Mon, 2 Dec 2019 13:15:25 -0330
Subject: [PATCH 3/3] Improve disconnectAccount modal message clarity

---
 app/_locales/en/messages.json                                | 2 +-
 .../disconnect-account/disconnect-account.component.js       | 5 +++--
 .../disconnect-account/disconnect-account.container.js       | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 1a7935067711..515b6096ddfb 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -424,7 +424,7 @@
     "message": "Are you sure? You will be disconnected from all sites on all accounts."
   },
   "disconnectAccountModalDescription": {
-    "message": "Are you sure? Your account will be disconnected from this site."
+    "message": "Are you sure? Your account (\"$1\") will be disconnected from this site."
   },
   "disconnectAccountQuestion": {
     "message": "Disconnect account?"
diff --git a/ui/app/components/app/modals/disconnect-account/disconnect-account.component.js b/ui/app/components/app/modals/disconnect-account/disconnect-account.component.js
index 0d88a03a0598..4fe5c7227eff 100644
--- a/ui/app/components/app/modals/disconnect-account/disconnect-account.component.js
+++ b/ui/app/components/app/modals/disconnect-account/disconnect-account.component.js
@@ -8,6 +8,7 @@ export default class DisconnectAccount extends PureComponent {
   static propTypes = {
     hideModal: PropTypes.func.isRequired,
     disconnectAccount: PropTypes.func.isRequired,
+    accountLabel: PropTypes.string.isRequired,
   }
 
   static contextTypes = {
@@ -16,7 +17,7 @@ export default class DisconnectAccount extends PureComponent {
 
   render () {
     const { t } = this.context
-    const { hideModal, disconnectAccount } = this.props
+    const { hideModal, disconnectAccount, accountLabel } = this.props
 
     return (
       <Modal
@@ -26,7 +27,7 @@ export default class DisconnectAccount extends PureComponent {
       >
         <div className="disconnect-account-modal">
           <div className="disconnect-account-modal__description">
-            { t('disconnectAccountModalDescription') }
+            { t('disconnectAccountModalDescription', [ accountLabel ]) }
           </div>
           <Button
             type="primary"
diff --git a/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js b/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js
index 2eb1bb92a11c..b0511bb47261 100644
--- a/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js
+++ b/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js
@@ -2,11 +2,13 @@ import { connect } from 'react-redux'
 import { compose } from 'recompose'
 import withModalProps from '../../../../helpers/higher-order-components/with-modal-props'
 import DisconnectAccount from './disconnect-account.component'
+import { getCurrentAccountWithSendEtherInfo } from '../../../../selectors/selectors'
 import { removePermissionsFor } from '../../../../store/actions'
 
 const mapStateToProps = state => {
   return {
     ...state.appState.modal.modalState.props || {},
+    accountLabel: getCurrentAccountWithSendEtherInfo(state).name,
   }
 }