From 01f0add64cd8a0adcf27739f4e02529513288ac2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 12 Jun 2024 10:40:05 +0100
Subject: [PATCH 1/3] Tweak copy for user verification toast

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/toasts/VerificationRequestToast.tsx | 6 +++++-
 src/i18n/strings/en_EN.json                              | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 0ad86af4b86..283473bf516 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -185,7 +185,11 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
             <GenericToast
                 description={description}
                 detail={detail}
-                acceptLabel={_t("encryption|verification|request_toast_accept")}
+                acceptLabel={
+                    request.isSelfVerification || !request.roomId
+                        ? _t("encryption|verification|request_toast_accept")
+                        : _t("encryption|verification|request_toast_accept_user")
+                }
                 onAccept={this.accept}
                 rejectLabel={declineLabel}
                 onReject={this.cancel}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d2a54b93f13..1a0b8b63ae7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -997,6 +997,7 @@
             "qr_reciprocate_same_shield_device": "Almost there! Is your other device showing the same shield?",
             "qr_reciprocate_same_shield_user": "Almost there! Is %(displayName)s showing the same shield?",
             "request_toast_accept": "Verify Session",
+            "request_toast_accept_user": "Verify User",
             "request_toast_decline_counter": "Ignore (%(counter)s)",
             "request_toast_detail": "%(deviceId)s from %(ip)s",
             "reset_proceed_prompt": "Proceed with reset",

From 05637b0f178e5f16df0e46174b6638af72e18618 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 12 Jun 2024 11:42:11 +0100
Subject: [PATCH 2/3] Update tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 playwright/e2e/crypto/verification.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playwright/e2e/crypto/verification.spec.ts b/playwright/e2e/crypto/verification.spec.ts
index e471b6b2f52..7eda04dd4ad 100644
--- a/playwright/e2e/crypto/verification.spec.ts
+++ b/playwright/e2e/crypto/verification.spec.ts
@@ -212,7 +212,7 @@ test.describe("Device verification", () => {
         // it should contain the device ID of the requesting device
         await expect(toast.getByText(`${aliceBotClient.credentials.deviceId} from `)).toBeVisible();
         // Accept
-        await toast.getByRole("button", { name: "Verify Session" }).click();
+        await toast.getByRole("button", { name: "Verify User" }).click();
 
         /* Click 'Start' to start SAS verification */
         await page.getByRole("button", { name: "Start" }).click();
@@ -280,7 +280,7 @@ test.describe("User verification", () => {
         // it should contain the details of the requesting user
         await expect(toast.getByText(`Bob (${bob.credentials.userId})`)).toBeVisible();
         // Accept
-        await toast.getByRole("button", { name: "Verify Session" }).click();
+        await toast.getByRole("button", { name: "Verify User" }).click();
 
         // request verification by emoji
         await page.locator("#mx_RightPanel").getByRole("button", { name: "Verify by emoji" }).click();
@@ -324,7 +324,7 @@ test.describe("User verification", () => {
 
         // Accept verification via toast
         const toast = await toasts.getToast("Verification requested");
-        await toast.getByRole("button", { name: "Verify Session" }).click();
+        await toast.getByRole("button", { name: "Verify User" }).click();
 
         // request verification by emoji
         await page.locator("#mx_RightPanel").getByRole("button", { name: "Verify by emoji" }).click();

From e3a7908d76a18fc3fc1a8356cee25c2660baddc8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 12 Jun 2024 13:30:36 +0100
Subject: [PATCH 3/3] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 playwright/e2e/crypto/verification.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright/e2e/crypto/verification.spec.ts b/playwright/e2e/crypto/verification.spec.ts
index 7eda04dd4ad..af30a78b016 100644
--- a/playwright/e2e/crypto/verification.spec.ts
+++ b/playwright/e2e/crypto/verification.spec.ts
@@ -212,7 +212,7 @@ test.describe("Device verification", () => {
         // it should contain the device ID of the requesting device
         await expect(toast.getByText(`${aliceBotClient.credentials.deviceId} from `)).toBeVisible();
         // Accept
-        await toast.getByRole("button", { name: "Verify User" }).click();
+        await toast.getByRole("button", { name: "Verify Session" }).click();
 
         /* Click 'Start' to start SAS verification */
         await page.getByRole("button", { name: "Start" }).click();