diff --git a/CHANGELOG.md b/CHANGELOG.md index 701baad5d3..aabfd08883 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - replace BlueprintJS Button, Icon, Radio, RadioGroup, Collapse, Dialog with our implementation #4006, #4226 - Update `@deltachat/stdio-rpc-server` and `deltachat/jsonrpc-client` to `1.147.1` - Update proxy configuration - a full url can be entered now +- show "Mark All As Read" in account menu unconditionally #4234 ### Fixed - fix that you can not click header button in dialog when they are on top of the navbar #4093 @@ -57,6 +58,7 @@ - some reactions dialog items not being clickable on secondary accounts (profiles) #4228 - target-electron: make sure log of stdio server is also logged to file - improve accessibility a little #4133 +- fix "Mark All As Read" in account menu mark also archived chats as read - use authname instead of displayname for vcard filename #4233 diff --git a/packages/frontend/src/components/AccountListSidebar/AccountItem.tsx b/packages/frontend/src/components/AccountListSidebar/AccountItem.tsx index be93e2c828..8fc67d78df 100644 --- a/packages/frontend/src/components/AccountListSidebar/AccountItem.tsx +++ b/packages/frontend/src/components/AccountListSidebar/AccountItem.tsx @@ -18,7 +18,7 @@ import Icon from '../Icon' import styles from './styles.module.scss' -import type { T } from '@deltachat/jsonrpc-client' +import { C, type T } from '@deltachat/jsonrpc-client' import { openMapWebxdc } from '../../system-integration/webxdc' type Props = { @@ -73,13 +73,6 @@ export default function AccountItem({ const bgSyncDisabled = syncAllAccounts === false && !isSelected const { onContextMenu, isContextMenuActive } = useContextMenuWithActiveState([ - !bgSyncDisabled && - unreadCount > 0 && { - label: tx('mark_all_as_read'), - action: () => { - markAccountAsRead(account.id) - }, - }, muted ? { label: tx('menu_unmute'), @@ -113,6 +106,12 @@ export default function AccountItem({ openMapWebxdc(account.id) }, }, + { + label: tx('mark_all_as_read'), + action: () => { + markAccountAsRead(account.id) + }, + }, { label: tx('menu_settings'), action: async () => { @@ -251,6 +250,8 @@ async function markAccountAsRead(accountId: number) { } } } + // Add archived chats to also mark them as read + uniqueChatIds.add(C.DC_CHAT_ID_ARCHIVED_LINK) for (const chatId of uniqueChatIds) { await EffectfulBackendActions.marknoticedChat(accountId, chatId)