diff --git a/package.json b/package.json index 0144f8a70a..0ba5892d1f 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@matrix-org/spec": "^1.7.0", "@sentry/browser": "^10.0.0", "@types/png-chunks-extract": "^1.0.2", - "@vector-im/compound-design-tokens": "6.4.2", + "@vector-im/compound-design-tokens": "6.4.3", "@vector-im/compound-web": "^8.3.1", "@vector-im/matrix-wysiwyg": "2.40.0", "@zxcvbn-ts/core": "^3.0.4", diff --git a/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png b/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png index 9671f97e42..c2d1cc52a0 100644 Binary files a/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png and b/playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png differ diff --git a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png index c3eef375df..6149e4fe55 100644 Binary files a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png and b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png differ diff --git a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png index d1aa699c18..fb48a55879 100644 Binary files a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png and b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png differ diff --git a/playwright/snapshots/settings/room-settings/room-video-tab.spec.ts/room-video-settings-linux.png b/playwright/snapshots/settings/room-settings/room-video-tab.spec.ts/room-video-settings-linux.png index 664febf8da..37303257b7 100644 Binary files a/playwright/snapshots/settings/room-settings/room-video-tab.spec.ts/room-video-settings-linux.png and b/playwright/snapshots/settings/room-settings/room-video-tab.spec.ts/room-video-settings-linux.png differ diff --git a/res/img/element-icons/room/composer/sticker.svg b/res/img/element-icons/room/composer/sticker.svg deleted file mode 100644 index 3d8f445926..0000000000 --- a/res/img/element-icons/room/composer/sticker.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/components/views/dialogs/RoomSettingsDialog.tsx b/src/components/views/dialogs/RoomSettingsDialog.tsx index 9881d96cd7..5e9e660967 100644 --- a/src/components/views/dialogs/RoomSettingsDialog.tsx +++ b/src/components/views/dialogs/RoomSettingsDialog.tsx @@ -13,10 +13,11 @@ import { RoomEvent, type Room, RoomStateEvent, type MatrixEvent, EventType } fro import { AdminIcon, GroupIcon, - LockSolidIcon, + LockIcon, PollsIcon, - SettingsSolidIcon, - VoiceCallSolidIcon, + SettingsIcon, + VoiceCallIcon, + NotificationsIcon, } from "@vector-im/compound-design-tokens/assets/web/icons"; import TabbedView, { Tab } from "../../structures/TabbedView"; @@ -40,7 +41,6 @@ import { PollHistoryTab } from "../settings/tabs/room/PollHistoryTab"; import ErrorBoundary from "../elements/ErrorBoundary"; import { PeopleRoomSettingsTab } from "../settings/tabs/room/PeopleRoomSettingsTab"; import { Icon as AdvancedIcon } from "../../../../res/img/element-icons/room/settings/advanced.svg"; -import { Icon as NotificationsIcon } from "../../../../res/img/element-icons/notifications.svg"; import { Icon as BridgeIcon } from "../../../../res/img/feather-customised/bridge.svg"; export const enum RoomSettingsTab { @@ -140,7 +140,7 @@ class RoomSettingsDialog extends React.Component { new Tab( RoomSettingsTab.General, _td("common|general"), - , + , , "RoomSettingsGeneral", ), @@ -160,7 +160,7 @@ class RoomSettingsDialog extends React.Component { new Tab( RoomSettingsTab.Voip, _td("settings|voip|title"), - , + , , ), ); @@ -169,7 +169,7 @@ class RoomSettingsDialog extends React.Component { new Tab( RoomSettingsTab.Security, _td("room_settings|security|title"), - , + , this.props.onFinished(true)} />, "RoomSettingsSecurityPrivacy", ), diff --git a/src/components/views/location/LocationButton.tsx b/src/components/views/location/LocationButton.tsx index eb56207411..79385a35b8 100644 --- a/src/components/views/location/LocationButton.tsx +++ b/src/components/views/location/LocationButton.tsx @@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details. import React, { type ReactNode, type SyntheticEvent, useContext } from "react"; import classNames from "classnames"; import { type RoomMember, type IEventRelation } from "matrix-js-sdk/src/matrix"; -import { LocationPinSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; +import { LocationPinIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import { _t } from "../../../languageHandler"; import { CollapsibleButton } from "../rooms/CollapsibleButton"; @@ -56,7 +56,7 @@ const LocationButton: React.FC = ({ roomId, sender, menuPosition, relati return ( - + {contextMenu} diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx index 01ae3bc7a2..2221bf7592 100644 --- a/src/components/views/rooms/MessageComposerButtons.tsx +++ b/src/components/views/rooms/MessageComposerButtons.tsx @@ -17,9 +17,10 @@ import { import React, { type JSX, createContext, type ReactElement, type ReactNode, useContext, useRef } from "react"; import { AttachmentIcon, - MicOnSolidIcon, + MicOnIcon, OverflowHorizontalIcon, PollsIcon, + StickerIcon, TextFormattingIcon, } from "@vector-im/compound-design-tokens/assets/web/icons"; @@ -42,7 +43,6 @@ import { filterBoolean } from "../../../utils/arrays"; import { useSettingValue } from "../../../hooks/useSettings"; import AccessibleButton, { type ButtonEvent } from "../elements/AccessibleButton"; import { useScopedRoomContext } from "../../../contexts/ScopedRoomContext.tsx"; -import { Icon as StickersIcon } from "../../../../res/img/element-icons/room/composer/sticker.svg"; interface IProps { addEmoji: (emoji: string) => boolean; @@ -260,7 +260,7 @@ function showStickersButton(props: IProps): ReactElement | null { onClick={() => props.setStickerPickerOpen(!props.isStickerPickerOpen)} title={props.isStickerPickerOpen ? _t("composer|close_sticker_picker") : _t("common|sticker")} > - + ) : null; } @@ -274,7 +274,7 @@ function voiceRecordingButton(props: IProps, narrow: boolean): ReactElement | nu onClick={props.onRecordStartEndClick} title={_t("composer|voice_message_button")} > - + ); } diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap index 27ade6f794..c57922ed30 100644 --- a/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap +++ b/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap @@ -18,7 +18,10 @@ NodeList [ xmlns="http://www.w3.org/2000/svg" > + -
+ + +