Skip to content

fix for unread button on unsubscribed channels #1641 #1758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix for unread button on unsubscribed channels #1641 #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91246ee
fix for : Don't show "Mark as unread from here" button in unsubscrib…
loveucifer Jul 28, 2025
f4fdacd
actions: Omit 'Mark as unread' for messages in unsubscribed streams.
loveucifer Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/widgets/action_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,8 @@ void showMessageActionSheet({required BuildContext context, required Message mes

final isMessageRead = message.flags.contains(MessageFlag.read);
final markAsUnreadSupported = store.zulipFeatureLevel >= 155; // TODO(server-6)
final showMarkAsUnreadButton = markAsUnreadSupported && isMessageRead;
final showMarkAsUnreadButton = markAsUnreadSupported && isMessageRead &&
(message is! StreamMessage || store.subscriptions[message.streamId] != null);

final isSenderMuted = store.isUserMuted(message.senderId);

Expand Down
33 changes: 32 additions & 1 deletion test/widgets/action_sheet_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,6 +1341,38 @@ void main() {
check(find.byIcon(Icons.mark_chat_unread_outlined).evaluate()).single;
});

testWidgets('not visible if message is in unsubscribed stream', (tester) async {
// Setup with a read message, so the button is potentially visible.
final readMessage = eg.streamMessage(flags: [MessageFlag.read]);

// this will use the common helper function .
// This will subscribe to the stream and open the action sheet .
await setupToMessageActionSheet(tester,
message: readMessage, narrow: TopicNarrow.ofMessage(readMessage));

// Initially, the button should be visible because the helper subscribes to the stream.
check(find.byIcon(Icons.mark_chat_unread_outlined).evaluate()).single;

// Close the action sheet
await tester.tapAt(const Offset(0, 0)); // Tap outside to dismiss it
await tester.pumpAndSettle();

// Now, we will fire an event to unsubscribe from the stream.
await store.handleEvent(SubscriptionRemoveEvent(
id: 999, // dummy event ID
streamIds: [readMessage.streamId]));

// this will Process the state change
await tester.pump();

// Open the action sheet again after unsubscribing from the stream
await tester.longPress(find.byType(MessageContent), warnIfMissed: false);
await tester.pump(const Duration(milliseconds: 250));

// After the rebuild, the button should be gone.
check(find.byIcon(Icons.mark_chat_unread_outlined).evaluate()).isEmpty();
});

group('onPressed', () {
testWidgets('smoke test', (tester) async {
final message = eg.streamMessage(flags: [MessageFlag.read]);
Expand Down Expand Up @@ -1547,7 +1579,6 @@ void main() {
of: find.byWidget(snackbar.content),
matching: find.text(zulipLocalizations.successMessageTextCopied)));
});

testWidgets('request has an error', (tester) async {
final message = eg.streamMessage();
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
Expand Down