From 40e1c70fcae95266d863a0b39007ca0946e29a63 Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 3 Apr 2024 15:31:54 +0200 Subject: [PATCH] don't try to mark entries that are not markable (#1303) --- commafeed-client/src/app/entries/thunks.ts | 2 +- .../components/content/FeedEntryContextMenu.tsx | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/commafeed-client/src/app/entries/thunks.ts b/commafeed-client/src/app/entries/thunks.ts index 99e97753..82f25af2 100644 --- a/commafeed-client/src/app/entries/thunks.ts +++ b/commafeed-client/src/app/entries/thunks.ts @@ -64,7 +64,7 @@ export const markEntry = createAppAsyncThunk( }) }, { - condition: arg => arg.entry.read !== arg.read, + condition: arg => arg.entry.markable && arg.entry.read !== arg.read, } ) export const markMultipleEntries = createAppAsyncThunk( diff --git a/commafeed-client/src/components/content/FeedEntryContextMenu.tsx b/commafeed-client/src/components/content/FeedEntryContextMenu.tsx index c698a251..7814a56f 100644 --- a/commafeed-client/src/components/content/FeedEntryContextMenu.tsx +++ b/commafeed-client/src/components/content/FeedEntryContextMenu.tsx @@ -67,12 +67,14 @@ export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) { {props.entry.starred ? Unstar : Star} - await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}> - - {props.entry.read ? : } - {props.entry.read ? Keep unread : Mark as read} - - + {props.entry.markable && ( + await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}> + + {props.entry.read ? : } + {props.entry.read ? Keep unread : Mark as read} + + + )} await dispatch(markEntriesUpToEntry(props.entry))}>