diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png index a84f3ac260..6bc9d4696e 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png index 8c056bc754..fd60bb3d53 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png index 06314b5213..1cff3fea46 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png index 313f6a1d14..43cae04270 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png index a1106b4dc3..f9417d52da 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png index 38b0bf2fff..d5a2d8a4c0 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png index 78bca99706..fb8aabd6bf 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png differ diff --git a/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss index 595f47f9c8..9af934c308 100644 --- a/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss +++ b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss @@ -21,10 +21,6 @@ } } - button { - color: var(--cpd-color-icon-secondary); - } - .mx_SpaceMenu_button { svg { transition: transform 0.1s linear; diff --git a/src/components/views/rooms/NotificationDecoration.tsx b/src/components/views/rooms/NotificationDecoration.tsx index 4a2f62cb5a..3266445782 100644 --- a/src/components/views/rooms/NotificationDecoration.tsx +++ b/src/components/views/rooms/NotificationDecoration.tsx @@ -7,7 +7,7 @@ import React, { type HTMLProps, type JSX } from "react"; import MentionIcon from "@vector-im/compound-design-tokens/assets/web/icons/mention"; -import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error"; +import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-solid"; import NotificationOffIcon from "@vector-im/compound-design-tokens/assets/web/icons/notifications-off-solid"; import { UnreadCounter, Unread } from "@vector-im/compound-web"; diff --git a/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx index e07b886f54..ba4fdc5ca4 100644 --- a/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx +++ b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx @@ -47,7 +47,7 @@ export function RoomListHeaderView(): JSX.Element { ) : ( vm.createChatRoom(e.nativeEvent)}> - + )} @@ -76,7 +76,7 @@ function SpaceMenu({ vm }: SpaceMenuProps): JSX.Element { align="start" trigger={ - + } > @@ -135,7 +135,7 @@ function ComposeMenu({ vm }: ComposeMenuProps): JSX.Element { align="start" trigger={ - + } > diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 90d06d04c9..56005720fd 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2126,7 +2126,7 @@ "favourite": "Favourites", "people": "People", "rooms": "Rooms", - "unread": "Unread" + "unread": "Unreads" }, "home_menu_label": "Home options", "join_public_room_label": "Join public room", diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx index 6ee1f5e3e4..bf92272e08 100644 --- a/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx +++ b/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx @@ -73,7 +73,7 @@ describe("RoomListViewModel", () => { // should have 4 filters expect(vm.current.primaryFilters).toHaveLength(4); // check the order - for (const [i, name] of ["Unread", "Favourites", "People", "Rooms"].entries()) { + for (const [i, name] of ["Unreads", "Favourites", "People", "Rooms"].entries()) { expect(vm.current.primaryFilters[i].name).toEqual(name); expect(vm.current.primaryFilters[i].active).toEqual(false); } @@ -218,9 +218,13 @@ describe("RoomListViewModel", () => { [ "Mentions only", { secondary: SecondaryFilters.MentionsOnly, filterKey: FilterKey.MentionsFilter }, - "Unread", + "Unreads", + ], + [ + "Invites only", + { secondary: SecondaryFilters.InvitesOnly, filterKey: FilterKey.InvitesFilter }, + "Unreads", ], - ["Invites only", { secondary: SecondaryFilters.InvitesOnly, filterKey: FilterKey.InvitesFilter }, "Unread"], [ "Invites only", { secondary: SecondaryFilters.InvitesOnly, filterKey: FilterKey.InvitesFilter }, diff --git a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap index 731a333f75..5dd6c23699 100644 --- a/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap +++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap @@ -35,6 +35,7 @@ exports[` compose menu should display the compose menu 1`] style="--cpd-icon-button-size: 100%;" > compose menu should display the compose menu 1`] style="--cpd-icon-button-size: 100%;" > compose menu should not display the compose menu style="--cpd-icon-button-size: 100%;" > compose menu should not display the compose menu style="--cpd-icon-button-size: 100%;" > space menu should display the space menu 1`] = ` style="--cpd-icon-button-size: 100%;" > space menu should display the space menu 1`] = ` style="--cpd-icon-button-size: 100%;" > space menu should not display the space menu 1`] style="--cpd-icon-button-size: 100%;" > should not render the RoomListSearch component when U style="--cpd-icon-button-size: 100%;" > should not render the RoomListSearch component when U role="button" tabindex="0" > - Unread + Unreads
  • should render the RoomListSearch component when UICom style="--cpd-icon-button-size: 100%;" > should render the RoomListSearch component when UICom role="button" tabindex="0" > - Unread + Unreads
  • should render the unset message decoration 1 xmlns="http://www.w3.org/2000/svg" >