Tweak copy for user verification toast (#12605)

* Tweak copy for user verification toast Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
matrix-org · Jun 13, 2024 · 2547777 · 2547777
1 parent 8b4e3e6
commit 2547777
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/playwright/e2e/crypto/verification.spec.ts b/playwright/e2e/crypto/verification.spec.ts
@@ -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();

diff --git 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
@@ -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",