From 9ac4fa92fd18c802906a401afb0862f6abf20d56 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:31:41 +0100
Subject: [PATCH 1/2] Update (bulk) unverified device toast copy

Fixes https://github.com/vector-im/riot-web/issues/13444
---
 .../views/toasts/BulkUnverifiedSessionsToast.js           | 2 +-
 src/components/views/toasts/UnverifiedSessionToast.js     | 8 ++------
 src/i18n/strings/en_EN.json                               | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
index b16dc87f21..e0be846a2b 100644
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -45,7 +45,7 @@ export default class BulkUnverifiedSessionsToast extends React.PureComponent {
     render() {
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Verify your other sessions")}
+                {_t("Unverified sessions currently have access to your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 3f2f29a493..a4454ca6d5 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -54,15 +54,11 @@ export default class UnverifiedSessionToast extends React.PureComponent {
 
         return (<div>
             <div className="mx_Toast_description">
-                <span className="mx_Toast_deviceName">
-                    {device.getDisplayName()}
-                </span> <span className="mx_Toast_deviceID">
-                    ({device.deviceId})
-                </span>
+                {_t("Verify the identity of the new login accessing your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
+                <FormButton label={_t("Verify")} onClick={this._onReviewClick} />
             </div>
         </div>);
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7484f7f635..6ab0c886d4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -559,7 +559,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Verify your other sessions": "Verify your other sessions",
+    "Unverified sessions currently have access to your account & messages": "Unverified sessions currently have access to your account & messages",
     "Later": "Later",
     "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
@@ -568,6 +568,7 @@
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
+    "Verify the identity of the new login accessing your account & messages": "Verify the identity of the new login accessing your account & messages",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From 283a15c0b30e40f965452ce5f4c60349d2391187 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:54:32 +0100
Subject: [PATCH 2/2] Lint

---
 src/components/views/toasts/UnverifiedSessionToast.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index a4454ca6d5..032d457c3a 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -49,9 +49,6 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     render() {
-        const cli = MatrixClientPeg.get();
-        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
-
         return (<div>
             <div className="mx_Toast_description">
                 {_t("Verify the identity of the new login accessing your account & messages")}