Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add KeyIcon to key storage out of sync toast #29201

Merged
merged 2 commits into from
Feb 5, 2025
+18 −0
Merged

Add KeyIcon to key storage out of sync toast #29201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
717d1b9
feat(toast crypto): add KeyIcon to key storage out of sync toast
florianduros Feb 5, 2025
b4dcd30
test(toast crypto): update key storage out of sync snapshot
florianduros Feb 5, 2025
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
Binary file modified playwright/snapshots/crypto/toasts.spec.ts/key-storage-out-of-sync-toast-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/toasts/SetupEncryptionToast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/

import KeyIcon from "@vector-im/compound-design-tokens/assets/web/icons/key";
import { type ComponentType } from "react";

import type React from "react";
import Modal from "../Modal";
import { _t } from "../languageHandler";
import DeviceListener from "../DeviceListener";
Expand Down Expand Up @@ -61,6 +65,19 @@ const getSetupCaption = (kind: Kind): string => {
}
};

/**
* Get the icon to show on the primary button.
* @param kind
*/
const getPrimaryButtonIcon = (kind: Kind): ComponentType<React.SVGAttributes<SVGElement>> | undefined => {
switch (kind) {
case Kind.KEY_STORAGE_OUT_OF_SYNC:
return KeyIcon;
default:
return;
}
};

const getSecondaryButtonLabel = (kind: Kind): string => {
switch (kind) {
case Kind.SET_UP_RECOVERY:
Expand Down Expand Up @@ -162,6 +179,7 @@ export const showToast = (kind: Kind): void => {
props: {
description: getDescription(kind),
primaryLabel: getSetupCaption(kind),
PrimaryIcon: getPrimaryButtonIcon(kind),
onPrimaryClick,
secondaryLabel: getSecondaryButtonLabel(kind),
onSecondaryClick,
Expand Down
Loading