diff --git a/res/img/element-icons/brands/apple.svg b/res/img/element-icons/brands/apple.svg deleted file mode 100644 index 308c3c5d5a..0000000000 --- a/res/img/element-icons/brands/apple.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/brands/linux.svg b/res/img/element-icons/brands/linux.svg deleted file mode 100644 index 6df5e6f959..0000000000 --- a/res/img/element-icons/brands/linux.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/res/img/element-icons/brands/microsoft.svg b/res/img/element-icons/brands/microsoft.svg deleted file mode 100644 index 221dcba716..0000000000 --- a/res/img/element-icons/brands/microsoft.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx index fe7b00468a..80a3d8dba1 100644 --- a/src/async-components/structures/ErrorView.tsx +++ b/src/async-components/structures/ErrorView.tsx @@ -9,12 +9,10 @@ import React, { type JSX, type ReactNode } from "react"; import { Text, Heading, Button, Separator } from "@vector-im/compound-web"; import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out"; import { Flex } from "@element-hq/web-shared-components"; +import { LinuxIcon, MacIcon, WindowsIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import SdkConfig from "../../SdkConfig"; import { _t } from "../../languageHandler"; -import { Icon as AppleIcon } from "../../../res/img/element-icons/brands/apple.svg"; -import { Icon as MicrosoftIcon } from "../../../res/img/element-icons/brands/microsoft.svg"; -import { Icon as LinuxIcon } from "../../../res/img/element-icons/brands/linux.svg"; // directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk // PostCSS variables will be accessible. @@ -86,17 +84,17 @@ const DesktopAppLinks: React.FC<{ return ( {macOsUrl && ( - )} {win64Url && ( - )} {win64ArmUrl && ( - )} diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx index 3945a66510..52fdef752c 100644 --- a/src/components/views/elements/SSOButtons.tsx +++ b/src/components/views/elements/SSOButtons.tsx @@ -35,7 +35,7 @@ const getIcon = (brand: IdentityProviderBrand | string): string | null => { switch (brand) { /* eslint-disable @typescript-eslint/no-require-imports */ case IdentityProviderBrand.Apple: - return require(`../../../../res/img/element-icons/brands/apple.svg`).default; + return require("@vector-im/compound-design-tokens/icons/mac.svg").default; case IdentityProviderBrand.Facebook: return require(`../../../../res/img/element-icons/brands/facebook.svg`).default; case IdentityProviderBrand.Github: diff --git a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap index 185a8c83e7..d22d61a0bd 100644 --- a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap +++ b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap @@ -150,11 +150,20 @@ exports[` should match snapshot 1`] = ` role="link" tabindex="0" > -