feat(ui): sync default message actions with design system (#2701)

Author: xsahil03x

.github/workflows/update_goldens.yml

@@ -7,21 +7,21 @@ on:
         description: "Which goldens to update"
         required: true
         type: choice
-        default: sdk
+        default: both
         options:
+          - both
           - sdk
           - docs
-          - both
 
 jobs:
   update_sdk_goldens:
     if: inputs.target == 'sdk' || inputs.target == 'both'
     runs-on: ubuntu-latest
+    outputs:
+      changed: ${{ steps.detect.outputs.changed }}
     steps:
       - name: 📚 Checkout branch
         uses: actions/checkout@v6
-        with:
-          ssh-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
 
       - name: 🐦 Install Flutter
         uses: subosito/flutter-action@v2
@@ -40,22 +40,37 @@ jobs:
         continue-on-error: true
         run: melos run update:goldens:sdk
 
-      - name: 📤 Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v7
+      - name: 🔍 Detect changed goldens
+        id: detect
+        run: |
+          if [[ -z "$(git status --porcelain -- 'packages/**/test/**/goldens/**/*.png')" ]]; then
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: 📦 Bundle SDK goldens
+        if: steps.detect.outputs.changed == 'true'
+        run: |
+          find packages -path '*/test/*/goldens/*' -name '*.png' -print0 \
+            | tar --null -czf sdk-goldens.tgz -T -
+
+      - name: 📤 Upload SDK goldens artifact
+        if: steps.detect.outputs.changed == 'true'
+        uses: actions/upload-artifact@v4
         with:
-          commit_message: "chore: Update SDK Goldens"
-          file_pattern: "packages/**/test/**/goldens/**/*.png"
-          commit_user_name: "Stream SDK Bot"
-          commit_user_email: "60655709+Stream-SDK-Bot@users.noreply.github.com"
+          name: sdk-goldens
+          path: sdk-goldens.tgz
+          retention-days: 1
 
   update_docs_goldens:
     if: inputs.target == 'docs' || inputs.target == 'both'
     runs-on: macos-latest
+    outputs:
+      changed: ${{ steps.detect.outputs.changed }}
     steps:
       - name: 📚 Checkout branch
         uses: actions/checkout@v6
-        with:
-          ssh-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
 
       - name: 🐦 Install Flutter
         uses: subosito/flutter-action@v2
@@ -74,10 +89,67 @@ jobs:
         continue-on-error: true
         run: melos run update:goldens:docs
 
+      - name: 🔍 Detect changed goldens
+        id: detect
+        run: |
+          if [[ -z "$(git status --porcelain -- 'docs/**/test/**/goldens/**/*.png')" ]]; then
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: 📦 Bundle docs goldens
+        if: steps.detect.outputs.changed == 'true'
+        run: |
+          find docs -path '*/test/*/goldens/*' -name '*.png' -print0 \
+            | tar --null -czf docs-goldens.tgz -T -
+
+      - name: 📤 Upload docs goldens artifact
+        if: steps.detect.outputs.changed == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs-goldens
+          path: docs-goldens.tgz
+          retention-days: 1
+
+  commit_goldens:
+    needs: [update_sdk_goldens, update_docs_goldens]
+    # `always()` lets this run even when one regen job was skipped (e.g. target=sdk).
+    # We commit only when at least one regen produced actual changes — no diff means
+    # no artifact uploaded, so a workflow run with no golden changes ends as a no-op.
+    if: |
+      always() &&
+      (needs.update_sdk_goldens.outputs.changed == 'true' ||
+       needs.update_docs_goldens.outputs.changed == 'true')
+    runs-on: ubuntu-latest
+    steps:
+      - name: 📚 Checkout branch
+        uses: actions/checkout@v6
+        with:
+          ssh-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
+
+      - name: 📥 Download SDK goldens
+        if: needs.update_sdk_goldens.outputs.changed == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: sdk-goldens
+
+      - name: 📥 Download docs goldens
+        if: needs.update_docs_goldens.outputs.changed == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: docs-goldens
+
+      - name: 📦 Extract goldens
+        run: |
+          for tgz in sdk-goldens.tgz docs-goldens.tgz; do
+            [[ -f "$tgz" ]] && tar -xzf "$tgz" && rm "$tgz"
+          done
+
       - name: 📤 Commit Changes
         uses: stefanzweifel/git-auto-commit-action@v7
         with:
-          commit_message: "chore: Update Docs Snapshots"
-          file_pattern: "docs/**/test/**/goldens/macos/*.png"
+          commit_message: "chore: Update Goldens"
+          file_pattern: "**/test/**/goldens/**/*.png"
           commit_user_name: "Stream SDK Bot"
           commit_user_email: "60655709+Stream-SDK-Bot@users.noreply.github.com"

docs/docs_screenshots/test/message_list/goldens/macos/message_widget_actions.png

@@ -132,6 +132,7 @@ void setupMockChannel({
   when(() => channel.lastMessageAtStream).thenAnswer((_) => Stream.value(DateTime.parse('2020-06-22 12:00:00')));
   when(() => channel.state).thenReturn(channelState);
   when(() => channel.client).thenReturn(client);
+  when(() => channel.config).thenReturn(ChannelConfig(mutes: true));
   when(channel.getRemainingCooldown).thenReturn(0);
   when(() => channel.isDistinct).thenReturn(false);
   when(() => channel.isMuted).thenReturn(false);

docs/docs_screenshots/test/src/mocks.dart

@@ -4,8 +4,16 @@
 
 - `StreamMessageComposer` no longer clobbers pre-populated composer state (text, quoted message, attachments) when the channel's draft stream emits its initial `null` (no draft on server). The reset now fires only on an actual non-null → null transition, distinguishing "no draft yet" from "draft was removed".
 
+✅ Added
+
+- Added `BlockUser` / `UnblockUser` default message actions, dispatching to `StreamChatClient.blockUser` / `unblockUser`.
+
 🔄 Internal / Non-breaking
 
+- Reordered the default message actions to match the design system.
+- Renamed default English `threadReplyLabel` (`'Thread'` → `'Thread Reply'`) and `markAsUnreadLabel` (`'Mark as Unread'` → `'Mark Unread'`).
+- `StreamThreadHeader` default title now sources from the new `threadLabel` translation key instead of `threadReplyLabel`, restoring the short `'Thread'` header.
+
 - `ReactionIconResolver.supportedReactions` is now wired to the full emoji picker sheet opened by the "+" button in `StreamMessageReactionPicker` and the add-emoji chip in `ReactionDetailSheet`. Override `supportedReactions` on a custom resolver to control which reactions appear in the full picker grid.
 
 - Composer UI primitives (`StreamMessageComposerInputField`, `VoiceRecordingCallback`, and the outer/inner layout containers) are now owned by `stream_chat_flutter` and exported from this package. They were previously supplied by `stream_core_flutter`. The public API of `StreamMessageComposer` / `StreamChatMessageInput` and its sub-components is unchanged.

packages/stream_chat_flutter/CHANGELOG.md

@@ -34,6 +34,9 @@ abstract class Translations {
   /// The label for "thread reply"
   String get threadReplyLabel;
 
+  /// The label for the thread view header ("Thread").
+  String get threadLabel;
+
   /// The text for showing if the message is only visible to you
   String get onlyVisibleToYouText;
 
@@ -398,6 +401,9 @@ abstract class Translations {
   /// The text for "Mute User"/"Unmute User" based on the value of [isMuted].
   String toggleMuteUnmuteUserText({required bool isMuted});
 
+  /// The text for "Block User"/"Unblock User" based on the value of [isBlocked].
+  String toggleBlockUnblockUserText({required bool isBlocked});
+
   /// The text for "Are you sure you want to mute this group?"/"Are you sure you want to unmute this group?"
   /// based on the value of [isMuted].
   String toggleMuteUnmuteGroupQuestion({required bool isMuted});
@@ -754,7 +760,10 @@ class DefaultTranslations implements Translations {
   }
 
   @override
-  String get threadReplyLabel => 'Thread';
+  String get threadReplyLabel => 'Thread Reply';
+
+  @override
+  String get threadLabel => 'Thread';
 
   @override
   String get onlyVisibleToYouText => 'Only visible to you';
@@ -930,7 +939,7 @@ class DefaultTranslations implements Translations {
   }
 
   @override
-  String get markAsUnreadLabel => 'Mark as Unread';
+  String get markAsUnreadLabel => 'Mark Unread';
 
   @override
   String unreadCountIndicatorLabel({required int unreadCount}) {
@@ -1135,6 +1144,12 @@ Attachment limit exceeded: it's not possible to add more than $limit attachments
     }
   }
 
+  @override
+  String toggleBlockUnblockUserText({required bool isBlocked}) {
+    if (isBlocked) return 'Unblock User';
+    return 'Block User';
+  }
+
   @override
   String toggleMuteUnmuteGroupQuestion({required bool isMuted}) {
     if (isMuted) {

packages/stream_chat_flutter/lib/src/localization/translations.dart

@@ -107,6 +107,30 @@ final class UnmuteUser extends MessageAction {
   final User user;
 }
 
+/// Action to block a user, preventing direct messages from them
+final class BlockUser extends MessageAction {
+  /// Create a new block user action
+  const BlockUser({
+    required super.message,
+    required this.user,
+  });
+
+  /// The user to be blocked.
+  final User user;
+}
+
+/// Action to unblock a previously blocked user
+final class UnblockUser extends MessageAction {
+  /// Create a new unblock user action
+  const UnblockUser({
+    required super.message,
+    required this.user,
+  });
+
+  /// The user to be unblocked.
+  final User user;
+}
+
 /// Action to pin a message to make it prominently visible in the channel
 final class PinMessage extends MessageAction {
   /// Create a new pin message action

packages/stream_chat_flutter/lib/src/message_action/message_action.dart

@@ -153,6 +153,37 @@ class StreamMessageActionsBuilder {
       );
     }
 
+    // Pinning a private message is not allowed, simply because pinning a
+    // message is meant to bring attention to that message, that is not possible
+    // with a message that is only visible to a subset of users.
+    if (canPinMessage && !isPrivateMessage) {
+      final isPinned = message.pinned;
+      final label = context.translations.togglePinUnpinText;
+
+      final action = switch (isPinned) {
+        true => UnpinMessage(message: message),
+        false => PinMessage(message: message),
+      };
+
+      messageActions.add(
+        StreamContextMenuAction(
+          value: action,
+          label: Text(label.call(pinned: isPinned)),
+          leading: Icon(icons.pin),
+        ),
+      );
+    }
+
+    if (message.text case final text? when text.isNotEmpty) {
+      messageActions.add(
+        StreamContextMenuAction(
+          value: CopyMessage(message: message),
+          label: Text(context.translations.copyMessageLabel),
+          leading: Icon(icons.copy),
+        ),
+      );
+    }
+
     // Mark unread action is only available for other users' messages.
     if (canReceiveReadEvents && !isSentByCurrentUser) {
       StreamContextMenuAction<MessageAction> markUnreadAction() {
@@ -175,16 +206,6 @@ class StreamMessageActionsBuilder {
       }
     }
 
-    if (message.text case final text? when text.isNotEmpty) {
-      messageActions.add(
-        StreamContextMenuAction(
-          value: CopyMessage(message: message),
-          label: Text(context.translations.copyMessageLabel),
-          leading: Icon(icons.copy),
-        ),
-      );
-    }
-
     if (!containsPoll && !containsGiphy) {
       if (canUpdateAnyMessage || (canUpdateOwnMessage && isSentByCurrentUser)) {
         messageActions.add(
@@ -197,39 +218,6 @@ class StreamMessageActionsBuilder {
       }
     }
 
-    // Pinning a private message is not allowed, simply because pinning a
-    // message is meant to bring attention to that message, that is not possible
-    // with a message that is only visible to a subset of users.
-    if (canPinMessage && !isPrivateMessage) {
-      final isPinned = message.pinned;
-      final label = context.translations.togglePinUnpinText;
-
-      final action = switch (isPinned) {
-        true => UnpinMessage(message: message),
-        false => PinMessage(message: message),
-      };
-
-      messageActions.add(
-        StreamContextMenuAction(
-          value: action,
-          label: Text(label.call(pinned: isPinned)),
-          leading: Icon(icons.pin),
-        ),
-      );
-    }
-
-    if (canDeleteAnyMessage || (canDeleteOwnMessage && isSentByCurrentUser)) {
-      final label = context.translations.toggleDeleteRetryDeleteMessageText;
-
-      messageActions.add(
-        StreamContextMenuAction.destructive(
-          value: DeleteMessage(message: message),
-          leading: Icon(icons.delete),
-          label: Text(label.call(isDeleteFailed: false)),
-        ),
-      );
-    }
-
     if (!isSentByCurrentUser) {
       messageActions.add(
         StreamContextMenuAction(
@@ -259,6 +247,36 @@ class StreamMessageActionsBuilder {
       );
     }
 
+    if (message.user case final messageUser? when !isSentByCurrentUser) {
+      final isBlocked = currentUser?.blockedUserIds.contains(messageUser.id) ?? false;
+      final label = context.translations.toggleBlockUnblockUserText;
+
+      final action = switch (isBlocked) {
+        true => UnblockUser(message: message, user: messageUser),
+        false => BlockUser(message: message, user: messageUser),
+      };
+
+      messageActions.add(
+        StreamContextMenuAction.destructive(
+          value: action,
+          label: Text(label.call(isBlocked: isBlocked)),
+          leading: Icon(isBlocked ? icons.userCheck : icons.noSign),
+        ),
+      );
+    }
+
+    if (canDeleteAnyMessage || (canDeleteOwnMessage && isSentByCurrentUser)) {
+      final label = context.translations.toggleDeleteRetryDeleteMessageText;
+
+      messageActions.add(
+        StreamContextMenuAction.destructive(
+          value: DeleteMessage(message: message),
+          leading: Icon(icons.delete),
+          label: Text(label.call(isDeleteFailed: false)),
+        ),
+      );
+    }
+
     return messageActions;
   }
 }

packages/stream_chat_flutter/lib/src/message_action/message_actions_builder.dart

@@ -838,6 +838,8 @@ class DefaultStreamMessageItem extends StatelessWidget {
     MarkUnread() => channel.markUnread(action.message.id),
     MuteUser() => channel.client.muteUser(action.user.id),
     UnmuteUser() => channel.client.unmuteUser(action.user.id),
+    BlockUser() => channel.client.blockUser(action.user.id),
+    UnblockUser() => channel.client.unblockUser(action.user.id),
     PinMessage() => channel.pinMessage(action.message),
     UnpinMessage() => channel.unpinMessage(action.message),
     ResendMessage() => channel.retryMessage(action.message),