Skip to content

Commit bde473f

Browse files
committed
Update the compound design tokens, replace the error icon with error-solid
1 parent 4a0db97 commit bde473f

File tree

15 files changed

+315
-569
lines changed

15 files changed

+315
-569
lines changed

frontend/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@radix-ui/react-dialog": "^1.1.6",
2525
"@tanstack/react-query": "^5.66.9",
2626
"@tanstack/react-router": "^1.109.2",
27-
"@vector-im/compound-design-tokens": "3.0.1",
27+
"@vector-im/compound-design-tokens": "4.0.0",
2828
"@vector-im/compound-web": "^7.6.3",
2929
"@zxcvbn-ts/core": "^3.0.4",
3030
"@zxcvbn-ts/language-common": "^3.0.4",

frontend/src/components/GenericError.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// SPDX-License-Identifier: AGPL-3.0-only
55
// Please see LICENSE in the repository root for full details.
66

7-
import IconError from "@vector-im/compound-design-tokens/assets/web/icons/error";
7+
import IconErrorSolid from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
88
import { Button } from "@vector-im/compound-web";
99
import { useState } from "react";
1010
import { Translation } from "react-i18next";
@@ -22,7 +22,7 @@ const GenericError: React.FC<{ error: unknown; dontSuspend?: boolean }> = ({
2222
<div className="flex flex-col gap-6">
2323
<PageHeading
2424
invalid
25-
Icon={IconError}
25+
Icon={IconErrorSolid}
2626
title={t("frontend.error.title", {
2727
defaultValue: "Something went wrong",
2828
})}

frontend/src/components/SessionDetail/SessionInfo.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import IconChat from "@vector-im/compound-design-tokens/assets/web/icons/chat";
77
import IconComputer from "@vector-im/compound-design-tokens/assets/web/icons/computer";
8-
import IconError from "@vector-im/compound-design-tokens/assets/web/icons/error";
8+
import IconErrorSolid from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
99
import IconInfo from "@vector-im/compound-design-tokens/assets/web/icons/info";
1010
import IconSend from "@vector-im/compound-design-tokens/assets/web/icons/send";
1111
import IconUserProfile from "@vector-im/compound-design-tokens/assets/web/icons/user-profile";
@@ -68,7 +68,7 @@ export const ScopeSendMessages: React.FC = () => {
6868
const ScopeSynapseAdmin: React.FC = () => {
6969
const { t } = useTranslation();
7070
return (
71-
<VisualListItem Icon={IconError}>
71+
<VisualListItem Icon={IconErrorSolid}>
7272
{t("mas.scope.synapse_admin")}
7373
</VisualListItem>
7474
);
@@ -77,7 +77,9 @@ const ScopeSynapseAdmin: React.FC = () => {
7777
const ScopeMasAdmin: React.FC = () => {
7878
const { t } = useTranslation();
7979
return (
80-
<VisualListItem Icon={IconError}>{t("mas.scope.mas_admin")}</VisualListItem>
80+
<VisualListItem Icon={IconErrorSolid}>
81+
{t("mas.scope.mas_admin")}
82+
</VisualListItem>
8183
);
8284
};
8385

frontend/src/routes/emails.$id.in-use.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { useSuspenseQuery } from "@tanstack/react-query";
77
import { createFileRoute, notFound, redirect } from "@tanstack/react-router";
88
import IconArrowLeft from "@vector-im/compound-design-tokens/assets/web/icons/arrow-left";
9-
import IconError from "@vector-im/compound-design-tokens/assets/web/icons/error";
9+
import IconErrorSolid from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
1010
import { useTranslation } from "react-i18next";
1111
import { ButtonLink } from "../components/ButtonLink";
1212
import Layout from "../components/Layout";
@@ -41,7 +41,7 @@ function EmailInUse(): React.ReactElement {
4141
return (
4242
<Layout>
4343
<PageHeading
44-
Icon={IconError}
44+
Icon={IconErrorSolid}
4545
invalid
4646
title={t("frontend.email_in_use.heading", {
4747
email: userEmailAuthentication.email,

frontend/src/routes/password.recovery.index.lazy.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
useNavigate,
1212
useSearch,
1313
} from "@tanstack/react-router";
14-
import IconError from "@vector-im/compound-design-tokens/assets/web/icons/error";
14+
import IconErrorSolid from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
1515
import IconLockSolid from "@vector-im/compound-design-tokens/assets/web/icons/lock-solid";
1616
import { Alert, Button, Form } from "@vector-im/compound-web";
1717
import type { FormEvent } from "react";
@@ -63,7 +63,7 @@ const EmailConsumed: React.FC = () => {
6363
return (
6464
<Layout>
6565
<PageHeading
66-
Icon={IconError}
66+
Icon={IconErrorSolid}
6767
title={t("frontend.password_reset.consumed.title")}
6868
subtitle={t("frontend.password_reset.consumed.subtitle")}
6969
invalid
@@ -117,7 +117,7 @@ const EmailExpired: React.FC<{
117117
return (
118118
<Layout>
119119
<PageHeading
120-
Icon={IconError}
120+
Icon={IconErrorSolid}
121121
title={t("frontend.password_reset.expired.title")}
122122
subtitle={t("frontend.password_reset.expired.subtitle", {
123123
email: userRecoveryTicket.email,

frontend/src/routes/reset-cross-signing.index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from "@tanstack/react-query";
1212
import { createFileRoute, notFound } from "@tanstack/react-router";
1313
import IconCheck from "@vector-im/compound-design-tokens/assets/web/icons/check";
14-
import IconError from "@vector-im/compound-design-tokens/assets/web/icons/error";
14+
import IconErrorSolid from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
1515
import IconInfo from "@vector-im/compound-design-tokens/assets/web/icons/info";
1616
import {
1717
Button,
@@ -114,7 +114,7 @@ function ResetCrossSigning(): React.ReactNode {
114114
return (
115115
<>
116116
<PageHeading
117-
Icon={IconError}
117+
Icon={IconErrorSolid}
118118
title={t("frontend.reset_cross_signing.heading")}
119119
invalid
120120
/>

frontend/src/routes/reset-cross-signing.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Outlet,
99
createFileRoute,
1010
} from "@tanstack/react-router";
11-
import IconError from "@vector-im/compound-design-tokens/assets/web/icons/error";
11+
import IconErrorSolid from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
1212
import { Button, Text } from "@vector-im/compound-web";
1313
import * as v from "valibot";
1414

@@ -37,7 +37,7 @@ function ResetCrossSigningError({
3737
return (
3838
<Layout>
3939
<PageHeading
40-
Icon={IconError}
40+
Icon={IconErrorSolid}
4141
title={t("frontend.reset_cross_signing.failure.heading")}
4242
invalid
4343
/>

0 commit comments

Comments
 (0)