Remove release announcements for new sounds & room list (#31544)
* Remove release announcements for new sounds & room list Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
committed by
GitHub
GitHub
parent
71c5b71f5c
commit
c37fef459d
@@ -23,7 +23,6 @@ import {
|
||||
useRoomListHeaderViewModel,
|
||||
} from "../../../viewmodels/roomlist/RoomListHeaderViewModel";
|
||||
import { RoomListOptionsMenu } from "./RoomListOptionsMenu";
|
||||
import { ReleaseAnnouncement } from "../../../structures/ReleaseAnnouncement";
|
||||
|
||||
/**
|
||||
* The header view for the room list
|
||||
@@ -46,38 +45,23 @@ export function RoomListHeaderView(): JSX.Element {
|
||||
{vm.displaySpaceMenu && <SpaceMenu vm={vm} />}
|
||||
</Flex>
|
||||
<Flex align="center" gap="var(--cpd-space-2x)">
|
||||
<ReleaseAnnouncement
|
||||
feature="newRoomList_sort"
|
||||
header={_t("room_list|release_announcement|sort|title")}
|
||||
description={_t("room_list|release_announcement|sort|description")}
|
||||
closeLabel={_t("room_list|release_announcement|next")}
|
||||
placement="bottom"
|
||||
>
|
||||
<div className="mx_RoomListHeaderView_ReleaseAnnouncementAnchor">
|
||||
<RoomListOptionsMenu vm={vm} />
|
||||
</div>
|
||||
</ReleaseAnnouncement>
|
||||
<div className="mx_RoomListHeaderView_ReleaseAnnouncementAnchor">
|
||||
<RoomListOptionsMenu vm={vm} />
|
||||
</div>
|
||||
|
||||
{/* If we don't display the compose menu, it means that the user can only send DM */}
|
||||
<ReleaseAnnouncement
|
||||
feature="newRoomList_intro"
|
||||
header={_t("room_list|release_announcement|intro|title")}
|
||||
description={_t("room_list|release_announcement|intro|description")}
|
||||
closeLabel={_t("room_list|release_announcement|next")}
|
||||
>
|
||||
<div className="mx_RoomListHeaderView_ReleaseAnnouncementAnchor">
|
||||
{vm.displayComposeMenu ? (
|
||||
<ComposeMenu vm={vm} />
|
||||
) : (
|
||||
<IconButton
|
||||
onClick={(e) => vm.createChatRoom(e.nativeEvent)}
|
||||
tooltip={_t("action|new_conversation")}
|
||||
>
|
||||
<ComposeIcon color="var(--cpd-color-icon-secondary)" aria-hidden />
|
||||
</IconButton>
|
||||
)}
|
||||
</div>
|
||||
</ReleaseAnnouncement>
|
||||
<div className="mx_RoomListHeaderView_ReleaseAnnouncementAnchor">
|
||||
{vm.displayComposeMenu ? (
|
||||
<ComposeMenu vm={vm} />
|
||||
) : (
|
||||
<IconButton
|
||||
onClick={(e) => vm.createChatRoom(e.nativeEvent)}
|
||||
tooltip={_t("action|new_conversation")}
|
||||
>
|
||||
<ComposeIcon color="var(--cpd-color-icon-secondary)" aria-hidden />
|
||||
</IconButton>
|
||||
)}
|
||||
</div>
|
||||
</Flex>
|
||||
</Flex>
|
||||
);
|
||||
|
||||
@@ -11,8 +11,6 @@ import { useRoomListViewModel } from "../../../viewmodels/roomlist/RoomListViewM
|
||||
import { RoomList } from "./RoomList";
|
||||
import { EmptyRoomList } from "./EmptyRoomList";
|
||||
import { RoomListPrimaryFilters } from "./RoomListPrimaryFilters";
|
||||
import { _t } from "../../../../languageHandler";
|
||||
import { ReleaseAnnouncement } from "../../../structures/ReleaseAnnouncement";
|
||||
|
||||
/**
|
||||
* Host the room list and the (future) room filters
|
||||
@@ -30,17 +28,9 @@ export function RoomListView(): JSX.Element {
|
||||
}
|
||||
return (
|
||||
<>
|
||||
<ReleaseAnnouncement
|
||||
feature="newRoomList_filter"
|
||||
header={_t("room_list|release_announcement|filter|title")}
|
||||
description={_t("room_list|release_announcement|filter|description")}
|
||||
closeLabel={_t("room_list|release_announcement|next")}
|
||||
placement="right"
|
||||
>
|
||||
<div>
|
||||
<RoomListPrimaryFilters vm={vm} />
|
||||
</div>
|
||||
</ReleaseAnnouncement>
|
||||
<div>
|
||||
<RoomListPrimaryFilters vm={vm} />
|
||||
</div>
|
||||
{listBody}
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -31,7 +31,6 @@ import QuickThemeSwitcher from "./QuickThemeSwitcher";
|
||||
import Modal from "../../../Modal";
|
||||
import DevtoolsDialog from "../dialogs/DevtoolsDialog";
|
||||
import { SdkContextClass } from "../../../contexts/SDKContext";
|
||||
import { ReleaseAnnouncement } from "../../structures/ReleaseAnnouncement";
|
||||
|
||||
const QuickSettingsButton: React.FC<{
|
||||
isPanelCollapsed: boolean;
|
||||
@@ -169,16 +168,7 @@ const QuickSettingsButton: React.FC<{
|
||||
|
||||
return (
|
||||
<>
|
||||
<ReleaseAnnouncement
|
||||
feature="newRoomList_settings"
|
||||
header={_t("room_list|release_announcement|settings|title")}
|
||||
description={_t("room_list|release_announcement|settings|description")}
|
||||
closeLabel={_t("room_list|release_announcement|done")}
|
||||
placement="right"
|
||||
>
|
||||
{button}
|
||||
</ReleaseAnnouncement>
|
||||
|
||||
{button}
|
||||
{contextMenu}
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -79,7 +79,6 @@ import { Landmark, LandmarkNavigation } from "../../../accessibility/LandmarkNav
|
||||
import { KeyboardShortcut } from "../settings/KeyboardShortcut";
|
||||
import { ModuleApi } from "../../../modules/Api.ts";
|
||||
import { useModuleSpacePanelItems } from "../../../modules/ExtrasApi.ts";
|
||||
import { ReleaseAnnouncement } from "../../structures/ReleaseAnnouncement";
|
||||
|
||||
const useSpaces = (): [Room[], MetaSpace[], Room[], SpaceKey] => {
|
||||
const invites = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_INVITED_SPACES, () => {
|
||||
@@ -415,74 +414,65 @@ const SpacePanel: React.FC = () => {
|
||||
onDragEndHandler();
|
||||
}}
|
||||
>
|
||||
<ReleaseAnnouncement
|
||||
feature="newNotificationSounds"
|
||||
header={_t("settings|notifications|sounds_release_announcement|title")}
|
||||
description={_t("settings|notifications|sounds_release_announcement|description")}
|
||||
closeLabel={_t("action|ok")}
|
||||
displayArrow={false}
|
||||
placement="right-start"
|
||||
<nav
|
||||
className={classNames("mx_SpacePanel", {
|
||||
collapsed: isPanelCollapsed,
|
||||
newUi: newRoomListEnabled,
|
||||
})}
|
||||
onKeyDown={(ev) => {
|
||||
const navAction = getKeyBindingsManager().getNavigationAction(ev);
|
||||
if (
|
||||
navAction === KeyBindingAction.NextLandmark ||
|
||||
navAction === KeyBindingAction.PreviousLandmark
|
||||
) {
|
||||
LandmarkNavigation.findAndFocusNextLandmark(
|
||||
Landmark.ACTIVE_SPACE_BUTTON,
|
||||
navAction === KeyBindingAction.PreviousLandmark,
|
||||
);
|
||||
ev.stopPropagation();
|
||||
ev.preventDefault();
|
||||
return;
|
||||
}
|
||||
onKeyDownHandler(ev);
|
||||
}}
|
||||
ref={ref}
|
||||
aria-label={_t("common|spaces")}
|
||||
>
|
||||
<nav
|
||||
className={classNames("mx_SpacePanel", {
|
||||
collapsed: isPanelCollapsed,
|
||||
newUi: newRoomListEnabled,
|
||||
})}
|
||||
onKeyDown={(ev) => {
|
||||
const navAction = getKeyBindingsManager().getNavigationAction(ev);
|
||||
if (
|
||||
navAction === KeyBindingAction.NextLandmark ||
|
||||
navAction === KeyBindingAction.PreviousLandmark
|
||||
) {
|
||||
LandmarkNavigation.findAndFocusNextLandmark(
|
||||
Landmark.ACTIVE_SPACE_BUTTON,
|
||||
navAction === KeyBindingAction.PreviousLandmark,
|
||||
);
|
||||
ev.stopPropagation();
|
||||
ev.preventDefault();
|
||||
return;
|
||||
<UserMenu isPanelCollapsed={isPanelCollapsed}>
|
||||
<AccessibleButton
|
||||
className={classNames("mx_SpacePanel_toggleCollapse", {
|
||||
expanded: !isPanelCollapsed,
|
||||
})}
|
||||
onClick={() => setPanelCollapsed(!isPanelCollapsed)}
|
||||
title={isPanelCollapsed ? _t("action|expand") : _t("action|collapse")}
|
||||
caption={
|
||||
<KeyboardShortcut
|
||||
value={{ ctrlOrCmdKey: true, shiftKey: true, key: "d" }}
|
||||
className="mx_SpacePanel_Tooltip_KeyboardShortcut"
|
||||
/>
|
||||
}
|
||||
onKeyDownHandler(ev);
|
||||
}}
|
||||
ref={ref}
|
||||
aria-label={_t("common|spaces")}
|
||||
>
|
||||
<UserMenu isPanelCollapsed={isPanelCollapsed}>
|
||||
<AccessibleButton
|
||||
className={classNames("mx_SpacePanel_toggleCollapse", {
|
||||
expanded: !isPanelCollapsed,
|
||||
})}
|
||||
onClick={() => setPanelCollapsed(!isPanelCollapsed)}
|
||||
title={isPanelCollapsed ? _t("action|expand") : _t("action|collapse")}
|
||||
caption={
|
||||
<KeyboardShortcut
|
||||
value={{ ctrlOrCmdKey: true, shiftKey: true, key: "d" }}
|
||||
className="mx_SpacePanel_Tooltip_KeyboardShortcut"
|
||||
/>
|
||||
}
|
||||
>
|
||||
<ChevronRightIcon />
|
||||
</AccessibleButton>
|
||||
</UserMenu>
|
||||
<Droppable droppableId="top-level-spaces">
|
||||
{(provided, snapshot) => (
|
||||
<InnerSpacePanel
|
||||
{...provided.droppableProps}
|
||||
isPanelCollapsed={isPanelCollapsed}
|
||||
setPanelCollapsed={setPanelCollapsed}
|
||||
isDraggingOver={snapshot.isDraggingOver}
|
||||
innerRef={provided.innerRef}
|
||||
>
|
||||
<ChevronRightIcon />
|
||||
</AccessibleButton>
|
||||
</UserMenu>
|
||||
<Droppable droppableId="top-level-spaces">
|
||||
{(provided, snapshot) => (
|
||||
<InnerSpacePanel
|
||||
{...provided.droppableProps}
|
||||
isPanelCollapsed={isPanelCollapsed}
|
||||
setPanelCollapsed={setPanelCollapsed}
|
||||
isDraggingOver={snapshot.isDraggingOver}
|
||||
innerRef={provided.innerRef}
|
||||
>
|
||||
{provided.placeholder}
|
||||
</InnerSpacePanel>
|
||||
)}
|
||||
</Droppable>
|
||||
{provided.placeholder}
|
||||
</InnerSpacePanel>
|
||||
)}
|
||||
</Droppable>
|
||||
|
||||
<ThreadsActivityCentre displayButtonLabel={!isPanelCollapsed} />
|
||||
<ThreadsActivityCentre displayButtonLabel={!isPanelCollapsed} />
|
||||
|
||||
<QuickSettingsButton isPanelCollapsed={isPanelCollapsed} />
|
||||
</nav>
|
||||
</ReleaseAnnouncement>
|
||||
<QuickSettingsButton isPanelCollapsed={isPanelCollapsed} />
|
||||
</nav>
|
||||
</DragDropContext>
|
||||
)}
|
||||
</RovingTabIndexProvider>
|
||||
|
||||
@@ -2219,26 +2219,6 @@
|
||||
"one": "Currently removing messages in %(count)s room",
|
||||
"other": "Currently removing messages in %(count)s rooms"
|
||||
},
|
||||
"release_announcement": {
|
||||
"done": "Done",
|
||||
"filter": {
|
||||
"description": "Filter your chats with a single click. Expand to view more filters.",
|
||||
"title": "New quick filters"
|
||||
},
|
||||
"intro": {
|
||||
"description": "The chats list has been updated to be more clear and simple to use.",
|
||||
"title": "Chats has a new look!"
|
||||
},
|
||||
"next": "Next",
|
||||
"settings": {
|
||||
"description": "To show or hide message previews, go to All settings > Preferences > Room list",
|
||||
"title": "Some settings have moved"
|
||||
},
|
||||
"sort": {
|
||||
"description": "Change the ordering of your chats from most recent to A-Z",
|
||||
"title": "Sort your chats"
|
||||
}
|
||||
},
|
||||
"room": {
|
||||
"more_options": "More Options",
|
||||
"open_room": "Open room %(roomName)s"
|
||||
@@ -2908,10 +2888,6 @@
|
||||
"rule_suppress_notices": "Messages sent by bot",
|
||||
"rule_tombstone": "When rooms are upgraded",
|
||||
"show_message_desktop_notification": "Show message in desktop notification",
|
||||
"sounds_release_announcement": {
|
||||
"description": "Your notification ping and call ringer have been updated—clearer, quicker, and less disruptive",
|
||||
"title": "We’ve refreshed your sounds"
|
||||
},
|
||||
"voip": "Audio and Video calls"
|
||||
},
|
||||
"preferences": {
|
||||
|
||||
@@ -17,14 +17,10 @@ import ToastStore from "./ToastStore";
|
||||
|
||||
/**
|
||||
* The features are shown in the array order.
|
||||
* We include a `_test_dummy` value to enable tests to function even where there are no running release announcements.
|
||||
* This value must be at the end of the list.
|
||||
*/
|
||||
const FEATURES = [
|
||||
"newNotificationSounds",
|
||||
"newRoomList_intro",
|
||||
"newRoomList_sort",
|
||||
"newRoomList_filter",
|
||||
"newRoomList_settings",
|
||||
] as const;
|
||||
const FEATURES = ["_test_dummy1", "_test_dummy2"] as const;
|
||||
/**
|
||||
* All the features that can be shown in the release announcements.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user