Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Tweak copy for user verification toast #12605

Merged
merged 3 commits into from
Jun 13, 2024
Merged

Tweak copy for user verification toast #12605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01f0add
Tweak copy for user verification toast
t3chguy Jun 12, 2024
05637b0
Update tests
t3chguy Jun 12, 2024
e3a7908
Iterate
t3chguy Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions playwright/e2e/crypto/verification.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
6 changes: 5 additions & 1 deletion src/components/views/toasts/VerificationRequestToast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading