Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 05:04:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tweak copy for user verification toast (#12605)

Browse Source 
* 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>
This commit is contained in:
Michael Telatynski 2024-06-13 17:04:33 +01:00 committed by GitHub
parent 8b4e3e6647
commit 2547777de7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playwright/e2e/crypto/verification.spec.ts
View File

@ -280,7 +280,7 @@ test.describe("User verification", () => {
// it should contain the details of the requesting user // it should contain the details of the requesting user
await expect(toast.getByText(`Bob (${bob.credentials.userId})`)).toBeVisible(); await expect(toast.getByText(`Bob (${bob.credentials.userId})`)).toBeVisible();
// Accept // Accept
await toast.getByRole("button", { name: "Verify Session" }).click(); await toast.getByRole("button", { name: "Verify User" }).click();
// request verification by emoji // request verification by emoji
await page.locator("#mx_RightPanel").getByRole("button", { name: "Verify by emoji" }).click(); await page.locator("#mx_RightPanel").getByRole("button", { name: "Verify by emoji" }).click();
@ -324,7 +324,7 @@ test.describe("User verification", () => {
// Accept verification via toast // Accept verification via toast
const toast = await toasts.getToast("Verification requested"); 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 // request verification by emoji
await page.locator("#mx_RightPanel").getByRole("button", { name: "Verify by emoji" }).click(); await page.locator("#mx_RightPanel").getByRole("button", { name: "Verify by emoji" }).click();

6
src/components/views/toasts/VerificationRequestToast.tsx
View File

@ -185,7 +185,11 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
<GenericToast <GenericToast
description={description} description={description}
detail={detail} 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} onAccept={this.accept}
rejectLabel={declineLabel} rejectLabel={declineLabel}
onReject={this.cancel} onReject={this.cancel}

1
src/i18n/strings/en_EN.json
View File

@ -997,6 +997,7 @@
"qr_reciprocate_same_shield_device": "Almost there! Is your other device showing the same shield?", "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?", "qr_reciprocate_same_shield_user": "Almost there! Is %(displayName)s showing the same shield?",
"request_toast_accept": "Verify Session", "request_toast_accept": "Verify Session",
"request_toast_accept_user": "Verify User",
"request_toast_decline_counter": "Ignore (%(counter)s)", "request_toast_decline_counter": "Ignore (%(counter)s)",
"request_toast_detail": "%(deviceId)s from %(ip)s", "request_toast_detail": "%(deviceId)s from %(ip)s",
"reset_proceed_prompt": "Proceed with reset", "reset_proceed_prompt": "Proceed with reset",