fix for unread button on unsubscribed channels #1641 #1758
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chrisbobbe
requested changes
Jul 28, 2025
There was a problem hiding this comment.
As explained in the README (please follow links from there and read): https://github.com/zulip/zulip-flutter?tab=readme-ov-file#submitting-a-pull-request
- This needs a test
- Write the commit message according to the project style
lib/widgets/action_sheet.dart
Outdated
Comment on lines
609
to
610
| final showMarkAsUnreadButton = markAsUnreadSupported && isMessageRead && | ||
| (message is! StreamMessage || store.subscriptions[message.streamId] != null); |
There was a problem hiding this comment.
Suggested change
| final showMarkAsUnreadButton = markAsUnreadSupported && isMessageRead && | |
| (message is! StreamMessage || store.subscriptions[message.streamId] != null); | |
| final showMarkAsUnreadButton = markAsUnreadSupported && isMessageRead && | |
| (message is! StreamMessage || store.subscriptions[message.streamId] != null); |
chrisbobbe
reviewed
Jul 29, 2025
test/widgets/action_sheet_test.dart
Outdated
Comment on lines
1342
to
1344
| }); | ||
| testWidgets('not visible if message is in unsubscribed stream', (tester) async { |
There was a problem hiding this comment.
nit: add blank line separating tests
test/widgets/action_sheet_test.dart
Outdated
Comment on lines
1346
to
1371
| final stream = eg.stream(); | ||
| final readMessage = eg.streamMessage(stream: stream, flags: [MessageFlag.read]); | ||
| final narrow = TopicNarrow.ofMessage(readMessage); | ||
|
|
||
| // Manually set up the store, but without subscribing to the stream. | ||
| await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot()); | ||
| store = await testBinding.globalStore.perAccount(eg.selfAccount.id); | ||
| connection = store.connection as FakeApiConnection; | ||
| await store.addUser(eg.selfUser); | ||
| await store.addUser(eg.user(userId: readMessage.senderId)); | ||
| await store.addStream(stream); | ||
| // Do NOT add the subscription. | ||
|
|
||
| // Prepare the API response for the message list. | ||
| connection.prepare(json: eg.newestGetMessagesResult( | ||
| foundOldest: true, messages: [readMessage]).toJson()); | ||
|
|
||
| // Build the message list page. | ||
| await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id, | ||
| child: MessageListPage(initNarrow: narrow))); | ||
| await tester.pumpAndSettle(); | ||
|
|
||
| // Open the action sheet for the message. | ||
| await tester.longPress(find.byType(MessageContent), warnIfMissed: false); | ||
| await tester.pump(const Duration(milliseconds: 250)); // animation | ||
| check(find.byType(BottomSheet)).findsOne(); |
There was a problem hiding this comment.
Instead of reimplementing setupToMessageActionSheet with a difference, let's just call it, then afterward remove the subscription with store.handleEvent(SubscriptionRemoveEvent(.
Using a common helper function helps with code maintainability when there's a future change that needs to be made to many tests' setup at once.
earlier, the 'Mark as unread' button was displayed for any read message even if they were unsubscribed . This pr change adds a condition that should only show the button for direct messages or for stream messages where the subscription exists. The corresponding test is added to verify this new behavior which uses the `setupToMessageActionSheet` helper, dismissing the action sheet and also firing the `SubscriptionRemoveEvent`, and then re-opening the sheet to confirm that the button is now not present there
loveucifer
force-pushed
the
fix/omit-unread-button-unsubscribed
branch
from
82f41f5 to
f4fdacd
Compare
I tried to do this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #1641
Before & After