GetStream · xsahil03x · May 7, 2026 · May 3, 2026 · May 3, 2026 · May 3, 2026
diff --git a/docs/docs_screenshots/pubspec.yaml b/docs/docs_screenshots/pubspec.yaml
@@ -22,7 +22,7 @@ dependencies:
   stream_core_flutter:
     git:
       url: https://github.com/GetStream/stream-core-flutter.git
-      ref: c012cfe01900fcc9cc87cafbcb2d46eada243343
+      ref: 639f99401891f171e9cc2264eea822ef3ede3f99
       path: packages/stream_core_flutter
 
 dev_dependencies:

diff --git a/docs/docs_screenshots/test/channel/channel_header_test.dart b/docs/docs_screenshots/test/channel/channel_header_test.dart
@@ -21,9 +21,7 @@ Widget _buildChannelHeaderScaffold({
       child: StreamChannel(
         showLoading: false,
         channel: channel,
-        child: Scaffold(
-          appBar: header ?? const StreamChannelHeader(showBackButton: false),
-        ),
+        child: Scaffold(appBar: header),
       ),
     ),
   );
@@ -35,7 +33,7 @@ void main() {
   goldenTest(
     'channel header default',
     fileName: 'channel_header',
-    constraints: const BoxConstraints.tightFor(width: 375, height: 56),
+    constraints: const BoxConstraints.tightFor(width: 375, height: 72),
     builder: () {
       final client = MockClient();
       final clientState = MockClientState();
@@ -50,14 +48,20 @@ void main() {
         channelName: 'General',
       );
 
-      return _buildChannelHeaderScaffold(client: client, channel: channel);
+      return _buildChannelHeaderScaffold(
+        client: client,
+        channel: channel,
+        header: const StreamChannelHeader(
+          automaticallyImplyLeading: false,
+        ),
+      );
     },
   );
 
   goldenTest(
     'channel header with custom title',
     fileName: 'channel_header_custom_title',
-    constraints: const BoxConstraints.tightFor(width: 375, height: 56),
+    constraints: const BoxConstraints.tightFor(width: 375, height: 72),
     builder: () {
       final client = MockClient();
       final clientState = MockClientState();
@@ -76,8 +80,8 @@ void main() {
         client: client,
         channel: channel,
         header: const StreamChannelHeader(
-          showBackButton: false,
           title: Text('My Custom Title'),
+          automaticallyImplyLeading: false,
         ),
       );
     },

diff --git a/docs/docs_screenshots/test/channel/channel_list_header_test.dart b/docs/docs_screenshots/test/channel/channel_list_header_test.dart
@@ -18,9 +18,7 @@ Widget _buildListHeaderScaffold({
       client: client,
       streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
-      child: Scaffold(
-        appBar: header ?? const StreamChannelListHeader(),
-      ),
+      child: Scaffold(appBar: header),
     ),
   );
 }
@@ -31,21 +29,24 @@ void main() {
   goldenTest(
     'channel list header default',
     fileName: 'channel_list_header',
-    constraints: const BoxConstraints.tightFor(width: 375, height: 56),
+    constraints: const BoxConstraints.tightFor(width: 375, height: 72),
     builder: () {
       final client = MockClient();
       final clientState = MockClientState();
       when(() => client.state).thenReturn(clientState);
       when(() => clientState.currentUser).thenReturn(OwnUser(id: 'user-id', name: 'Alice'));
 
-      return _buildListHeaderScaffold(client: client);
+      return _buildListHeaderScaffold(
+        client: client,
+        header: const StreamChannelListHeader(),
+      );
     },
   );
 
   goldenTest(
     'channel list header with custom subtitle',
     fileName: 'channel_list_header_custom_subtitle',
-    constraints: const BoxConstraints.tightFor(width: 375, height: 56),
+    constraints: const BoxConstraints.tightFor(width: 375, height: 72),
     builder: () {
       final client = MockClient();
       final clientState = MockClientState();

diff --git a/docs/docs_screenshots/test/channel/goldens/ci/channel_header.png b/docs/docs_screenshots/test/channel/goldens/ci/channel_header.png
diff --git a/docs/docs_screenshots/test/channel/goldens/ci/channel_header_custom_title.png b/docs/docs_screenshots/test/channel/goldens/ci/channel_header_custom_title.png
diff --git a/docs/docs_screenshots/test/channel/goldens/ci/channel_list_header.png b/docs/docs_screenshots/test/channel/goldens/ci/channel_list_header.png
diff --git a/...ocs_screenshots/test/channel/goldens/ci/channel_list_header_custom_subtitle.png b/...ocs_screenshots/test/channel/goldens/ci/channel_list_header_custom_subtitle.png
diff --git a/docs/docs_screenshots/test/channel/goldens/ci/channel_list_view.png b/docs/docs_screenshots/test/channel/goldens/ci/channel_list_view.png
diff --git a/docs/docs_screenshots/test/channel/goldens/ci/channel_preview.png b/docs/docs_screenshots/test/channel/goldens/ci/channel_preview.png
diff --git a/docs/docs_screenshots/test/channel/goldens/ci/slidable_channel_list.png b/docs/docs_screenshots/test/channel/goldens/ci/slidable_channel_list.png
diff --git a/docs/docs_screenshots/test/channel/goldens/ci/swipe_channel.png b/docs/docs_screenshots/test/channel/goldens/ci/swipe_channel.png
diff --git a/docs/docs_screenshots/test/channel/goldens/macos/channel_header.png b/docs/docs_screenshots/test/channel/goldens/macos/channel_header.png
diff --git a/docs/docs_screenshots/test/channel/goldens/macos/channel_header_custom_title.png b/docs/docs_screenshots/test/channel/goldens/macos/channel_header_custom_title.png
diff --git a/docs/docs_screenshots/test/channel/goldens/macos/channel_list_header.png b/docs/docs_screenshots/test/channel/goldens/macos/channel_list_header.png
diff --git a/..._screenshots/test/channel/goldens/macos/channel_list_header_custom_subtitle.png b/..._screenshots/test/channel/goldens/macos/channel_list_header_custom_subtitle.png
diff --git a/docs/docs_screenshots/test/channel/goldens/macos/channel_list_view.png b/docs/docs_screenshots/test/channel/goldens/macos/channel_list_view.png
diff --git a/docs/docs_screenshots/test/channel/goldens/macos/channel_preview.png b/docs/docs_screenshots/test/channel/goldens/macos/channel_preview.png
diff --git a/docs/docs_screenshots/test/channel/goldens/macos/slidable_channel_list.png b/docs/docs_screenshots/test/channel/goldens/macos/slidable_channel_list.png
diff --git a/docs/docs_screenshots/test/channel/goldens/macos/swipe_channel.png b/docs/docs_screenshots/test/channel/goldens/macos/swipe_channel.png
diff --git a/docs/docs_screenshots/test/draft_list/goldens/macos/channel_draft_message.png b/docs/docs_screenshots/test/draft_list/goldens/macos/channel_draft_message.png
diff --git a/docs/docs_screenshots/test/draft_list/goldens/macos/draft_list_view.png b/docs/docs_screenshots/test/draft_list/goldens/macos/draft_list_view.png
diff --git a/docs/docs_screenshots/test/draft_list/goldens/macos/thread_draft_message.png b/docs/docs_screenshots/test/draft_list/goldens/macos/thread_draft_message.png
diff --git a/docs/docs_screenshots/test/message_input/goldens/macos/message_input.png b/docs/docs_screenshots/test/message_input/goldens/macos/message_input.png
diff --git a/..._screenshots/test/message_input/goldens/macos/message_input_change_position.png b/..._screenshots/test/message_input/goldens/macos/message_input_change_position.png
diff --git a/...screenshots/test/message_input/goldens/macos/message_input_custom_send_icon.png b/...screenshots/test/message_input/goldens/macos/message_input_custom_send_icon.png
diff --git a/...s_screenshots/test/message_input/goldens/macos/message_input_quoted_message.png b/...s_screenshots/test/message_input/goldens/macos/message_input_quoted_message.png
diff --git a/...s_screenshots/test/message_input/goldens/macos/stream_message_input_default.png b/...s_screenshots/test/message_input/goldens/macos/stream_message_input_default.png
diff --git a/docs/docs_screenshots/test/message_list/goldens/macos/message_list_view.png b/docs/docs_screenshots/test/message_list/goldens/macos/message_list_view.png
diff --git a/docs/docs_screenshots/test/message_list/goldens/macos/message_list_view_pin.png b/docs/docs_screenshots/test/message_list/goldens/macos/message_list_view_pin.png
diff --git a/.../docs_screenshots/test/message_list/goldens/macos/message_list_view_threads.png b/.../docs_screenshots/test/message_list/goldens/macos/message_list_view_threads.png
diff --git a/docs/docs_screenshots/test/message_list/goldens/macos/message_reaction_theming.png b/docs/docs_screenshots/test/message_list/goldens/macos/message_reaction_theming.png
diff --git a/docs/docs_screenshots/test/message_list/goldens/macos/message_rounded_avatar.png b/docs/docs_screenshots/test/message_list/goldens/macos/message_rounded_avatar.png
diff --git a/docs/docs_screenshots/test/message_list/goldens/macos/message_styles.png b/docs/docs_screenshots/test/message_list/goldens/macos/message_styles.png
diff --git a/docs/docs_screenshots/test/message_list/goldens/macos/message_theming.png b/docs/docs_screenshots/test/message_list/goldens/macos/message_theming.png
diff --git a/docs/docs_screenshots/test/message_list/goldens/macos/message_widget_actions.png b/docs/docs_screenshots/test/message_list/goldens/macos/message_widget_actions.png
diff --git a/...docs_screenshots/test/message_search/goldens/macos/message_search_list_view.png b/...docs_screenshots/test/message_search/goldens/macos/message_search_list_view.png
diff --git a/docs/docs_screenshots/test/polls/goldens/macos/poll_creator.png b/docs/docs_screenshots/test/polls/goldens/macos/poll_creator.png
diff --git a/docs/docs_screenshots/test/polls/goldens/macos/poll_interactor.png b/docs/docs_screenshots/test/polls/goldens/macos/poll_interactor.png
diff --git a/docs/docs_screenshots/test/polls/goldens/macos/polls_composer.png b/docs/docs_screenshots/test/polls/goldens/macos/polls_composer.png
diff --git a/docs/docs_screenshots/test/src/mocks.dart b/docs/docs_screenshots/test/src/mocks.dart
@@ -133,6 +133,8 @@ void setupMockChannel({
   when(() => channel.isDistinct).thenReturn(false);
   when(() => channel.isMuted).thenReturn(false);
   when(() => channel.isMutedStream).thenAnswer((_) => Stream.value(false));
+  when(() => channel.isPinned).thenReturn(false);
+  when(() => channel.isPinnedStream).thenAnswer((_) => Stream.value(false));
   when(() => channel.extraDataStream).thenAnswer((_) => Stream.value({'name': channelName}));
   when(() => channel.extraData).thenReturn({'name': channelName});
   when(() => channel.name).thenReturn(channelName);

diff --git a/docs/docs_screenshots/test/thread_list/goldens/ci/thread_list_tile_custom.png b/docs/docs_screenshots/test/thread_list/goldens/ci/thread_list_tile_custom.png
diff --git a/docs/docs_screenshots/test/thread_list/goldens/ci/thread_list_unread_banner.png b/docs/docs_screenshots/test/thread_list/goldens/ci/thread_list_unread_banner.png
diff --git a/docs/docs_screenshots/test/thread_list/goldens/ci/thread_list_view.png b/docs/docs_screenshots/test/thread_list/goldens/ci/thread_list_view.png
diff --git a/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_tile_custom.png b/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_tile_custom.png
diff --git a/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_unread_banner.png b/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_unread_banner.png
diff --git a/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_view.png b/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_view.png
diff --git a/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_view_empty.png b/docs/docs_screenshots/test/thread_list/goldens/macos/thread_list_view_empty.png
diff --git a/docs/docs_screenshots/test/user_list/goldens/macos/user_list_view.png b/docs/docs_screenshots/test/user_list/goldens/macos/user_list_view.png
diff --git a/...s_screenshots/test/voice_recording/goldens/macos/voice_recording_attachment.png b/...s_screenshots/test/voice_recording/goldens/macos/voice_recording_attachment.png
diff --git a/...nshots/test/voice_recording/goldens/macos/voice_recording_attachment_custom.png b/...nshots/test/voice_recording/goldens/macos/voice_recording_attachment_custom.png
diff --git a/...shots/test/voice_recording/goldens/macos/voice_recording_attachment_playing.png b/...shots/test/voice_recording/goldens/macos/voice_recording_attachment_playing.png
diff --git a/...docs_screenshots/test/voice_recording/goldens/macos/voice_recording_enabled.png b/...docs_screenshots/test/voice_recording/goldens/macos/voice_recording_enabled.png
diff --git a/...ocs_screenshots/test/voice_recording/goldens/macos/voice_recording_finished.png b/...ocs_screenshots/test/voice_recording/goldens/macos/voice_recording_finished.png
diff --git a/...reenshots/test/voice_recording/goldens/macos/voice_recording_hold_recording.png b/...reenshots/test/voice_recording/goldens/macos/voice_recording_hold_recording.png
diff --git a/docs/docs_screenshots/test/voice_recording/goldens/macos/voice_recording_idle.png b/docs/docs_screenshots/test/voice_recording/goldens/macos/voice_recording_idle.png
diff --git a/...screenshots/test/voice_recording/goldens/macos/voice_recording_idle_tooltip.png b/...screenshots/test/voice_recording/goldens/macos/voice_recording_idle_tooltip.png
diff --git a/...enshots/test/voice_recording/goldens/macos/voice_recording_locked_recording.png b/...enshots/test/voice_recording/goldens/macos/voice_recording_locked_recording.png
diff --git a/...docs_screenshots/test/voice_recording/goldens/macos/voice_recording_stopped.png b/...docs_screenshots/test/voice_recording/goldens/macos/voice_recording_stopped.png
diff --git a/melos.yaml b/melos.yaml
@@ -19,6 +19,9 @@ categories:
 
 command:
   bootstrap:
+    # Run `pub get` sequentially to avoid races on the shared git-dep cache.
+    runPubGetInParallel: false
+
     # Dart and Flutter environment used in the project.
     environment:
       sdk: ^3.10.0
@@ -98,7 +101,7 @@ command:
       stream_core_flutter:
         git:
           url: https://github.com/GetStream/stream-core-flutter.git
-          ref: c012cfe01900fcc9cc87cafbcb2d46eada243343
+          ref: 639f99401891f171e9cc2264eea822ef3ede3f99
           path: packages/stream_core_flutter
       synchronized: ^3.1.0+1
       thumblr: ^0.0.4

diff --git a/migrations/redesign/headers_and_icons.md b/migrations/redesign/headers_and_icons.md
@@ -113,34 +113,178 @@ The following icons have been **removed with no equivalent** in the new set:
 
 ## Header Widgets
 
-`StreamChannelHeader`, `StreamChannelListHeader`, and `StreamThreadHeader` all received the same set of default-value changes.
+All four chat headers — `StreamChannelHeader`, `StreamChannelListHeader`,
+`StreamThreadHeader`, and `StreamGalleryHeader` — have been rebuilt on top
+of the new design system's `StreamAppBar`. They now share a single slot
+model (`leading` / `title` / `subtitle` / `trailing`) and a single theme
+type (`StreamAppBarThemeData`), replacing the legacy
+`AppBar`-style API.
+
+### What changed across all headers
+
+* **New layout primitive.** The headers render a [`StreamAppBar`] with a
+  fixed 72-px height (`kStreamHeaderHeight`) instead of Material's
+  `kToolbarHeight` (56 px). Pass the header directly to `Scaffold.appBar`
+  as before — it implements `PreferredSizeWidget`.
+* **Slot model.** All four headers now expose `leading`, `title`,
+  `subtitle`, and `trailing` as plain `Widget?` slots. Anything you used
+  to compose with `actions: [...]` should move into `trailing:` (single
+  widget) or be wrapped into a `Row` you build yourself.
+* **Auto-implied leading.** Headers that previously had `showBackButton`
+  / `onBackPressed` now use `automaticallyImplyLeading` (default `true`)
+  to insert a default back button. To override, pass `leading:` directly;
+  to suppress, pass `automaticallyImplyLeading: false`.
+* **Theme.** `StreamChannelHeaderThemeData`, `StreamChannelListHeaderThemeData`,
+  and `StreamGalleryHeaderThemeData` are deleted. The corresponding
+  accessors on `StreamChatThemeData` (`channelHeaderTheme`,
+  `channelListHeaderTheme`, `threadHeaderTheme`, `galleryHeaderTheme`)
+  now return [`StreamAppBarThemeData`].
+* **Per-instance overrides.** A new `style: StreamAppBarStyle?` parameter
+  lets callers override colours / padding / typography for one instance —
+  it merges over the ambient `StreamAppBarTheme`.
+* **Removed parameters.** `centerTitle`, `elevation`, `bottomOpacity`,
+  `bottom`, and `backgroundColor` are gone — the new bar always centres
+  the title, draws a hairline `borderSubtle` divider instead of an
+  elevation shadow, and reads its background from the theme / `style`.
+
+### `StreamChannelHeader`
+
+| Old parameter | New equivalent |
+|---------------|----------------|
+| `showBackButton: false` | `automaticallyImplyLeading: false` |
+| `onBackPressed: cb` | `leading: StreamBackButton(onPressed: cb)` |
+| `onTitleTap: cb` | `title: GestureDetector(onTap: cb, child: ...)` |
+| `onImageTap: cb` | `onChannelAvatarPressed: (channel) => cb()` (or replace `trailing:`) |
+| `showTypingIndicator: false` | `subtitle: Text(channel.name)` (or any custom widget) |
+| `actions: [a, b]` | `trailing: Row(children: [a, b])` |
+| `centerTitle`, `elevation`, `bottom`, `bottomOpacity`, `backgroundColor` | Use `style: StreamAppBarStyle(backgroundColor: ...)` for the background; the rest are gone |
 
-### Breaking Changes
+**Before:**
 
-| Parameter | Old default | New default | Notes |
-|-----------|-------------|-------------|-------|
-| `centerTitle` | `bool?` (`null` → platform-adaptive) | `bool` (`true`) | Was `null` by default, which let Flutter centre on iOS and left-align on Android. Now always `true` — explicitly pass `centerTitle: false` to restore left-aligned titles. |
-| `elevation` | `1` | `0` | Removes the drop shadow by default. Pass `elevation: 1` to restore the old appearance. |
-| `scrolledUnderElevation` | — | `0` (new param) | Controls the elevation when content is scrolled under the header. |
+```dart
+StreamChannelHeader(
+  showBackButton: true,
+  onBackPressed: () => GoRouter.of(context).pop(),
+  onImageTap: () => openChannelInfo(channel),
+  showTypingIndicator: true,
+  elevation: 1,
+)
+```
 
-### Migration
+**After:**
+
+```dart
+StreamChannelHeader(
+  leading: StreamBackButton(onPressed: () => GoRouter.of(context).pop()),
+  onChannelAvatarPressed: (channel) => openChannelInfo(channel),
+)
+```
+
+The default leading is now [`StreamBackButton`] with a channel-aware
+unread badge; the default trailing is the channel avatar wrapped in a
+48×48 tap target wired to `onChannelAvatarPressed`.
+
+### `StreamChannelListHeader`
+
+| Old parameter | New equivalent |
+|---------------|----------------|
+| `titleBuilder: (context, user) => ...` | `title: ...` (a `Widget`) |
+| `onUserAvatarTap: cb` | `onUserAvatarPressed: cb` (renamed) |
+| `onNewChatButtonTap: cb` | `trailing: StreamButton.icon(icon: Icon(context.streamIcons.plus), onPressed: cb)` |
+| `preNavigationCallback`, `leading`, `actions`, `centerTitle`, `elevation`, `backgroundColor` | Removed — see notes below |
+
+The leading slot is no longer caller-overridable: the SDK always renders
+the signed-in user's avatar. When `onUserAvatarPressed` is null the
+avatar mirrors Material `AppBar`'s auto-implied leading and opens the
+enclosing `Scaffold`'s drawer if one exists, so the previous
+`onUserAvatarTap: (_) => Scaffold.of(context).openDrawer()` callsites
+can drop the callback entirely.
+
+The trailing slot is empty by default — the SDK no longer ships a
+"new chat" button. Pass your own widget if you want one.
+
+**Before:**
 
 ```dart
-// Before: title was platform-adaptive, header had a shadow
-StreamChannelHeader()
-StreamChannelListHeader()
-StreamThreadHeader(parent: parentMessage)
-
-// After: title always centred, no shadow
-// If you relied on left-aligned titles on Android, pass centerTitle: false:
-StreamChannelHeader(centerTitle: false)
-StreamChannelListHeader(centerTitle: false)
-StreamThreadHeader(parent: parentMessage, centerTitle: false)
-
-// If you relied on the elevation shadow, restore it:
-StreamChannelHeader(elevation: 1)
+StreamChannelListHeader(
+  titleBuilder: (context, user) => Text(user?.name ?? 'Stream Chat'),
+  onUserAvatarTap: (_) => Scaffold.of(context).openDrawer(),
+  onNewChatButtonTap: () => GoRouter.of(context).pushNamed('new-chat'),
+  elevation: 1,
+)
 ```
 
+**After:**
+
+```dart
+StreamChannelListHeader(
+  title: Text('Chats', style: context.streamTextTheme.headingSm),
+  trailing: StreamButton.icon(
+    icon: Icon(context.streamIcons.plus),
+    onPressed: () => GoRouter.of(context).pushNamed('new-chat'),
+  ),
+)
+```
+
+### `StreamThreadHeader`
+
+| Old parameter | New equivalent |
+|---------------|----------------|
+| `showBackButton: false` | `automaticallyImplyLeading: false` |
+| `onBackPressed: cb` | `leading: StreamBackButton(onPressed: cb)` |
+| `onTitleTap: cb` | `title: GestureDetector(onTap: cb, child: ...)` |
+| `showTypingIndicator: false` | `subtitle: Text(...)` (or any custom widget) |
+| `actions: [a, b]` | `trailing: Row(children: [a, b])` |
+| `centerTitle`, `elevation`, `backgroundColor` | Use `style:`; the rest are gone |
+
+The default subtitle is a [`StreamTypingIndicator`] that falls back to
+the thread's reply count when nobody is typing.
+
+### `StreamGalleryHeader`
+
+| Old parameter | New equivalent |
+|---------------|----------------|
+| `showBackButton: false` | `automaticallyImplyLeading: false` |
+| `onBackPressed: cb` | `leading: StreamBackButton(onPressed: cb)` |
+| `onTitleTap: cb` | `title: GestureDetector(onTap: cb, child: ...)` |
+| `onImageTap: cb` | `trailing: GestureDetector(onTap: cb, child: ...)` |
+| `elevation`, `backgroundColor` | Use `style:`; the rest are gone |
+
+`onShowMessage`, `onReplyMessage`, and `attachmentActionsModalBuilder`
+are unchanged. The default trailing is still an icon button that opens
+the attachment actions modal.
+
+### Theming
+
+The theme accessors on `StreamChatThemeData` keep their names but their
+type changes to [`StreamAppBarThemeData`]:
+
+```dart
+// Before
+StreamChannelHeaderThemeData(
+  color: theme.colorTheme.barsBg,
+  titleStyle: theme.textTheme.headlineBold,
+)
+
+// After
+StreamAppBarThemeData(
+  style: StreamAppBarStyle(
+    backgroundColor: colorScheme.backgroundElevation1,
+    titleTextStyle: textTheme.headingSm,
+  ),
+)
+```
+
+Use `StreamAppBarTheme(data: ..., child: ...)` to override the theme for
+a subtree, or pass `style:` directly on a single header instance.
+
+### Header height
+
+`kStreamHeaderHeight` (72 px) is now the canonical header height —
+exposed from `package:stream_chat_flutter/stream_chat_flutter.dart`. If
+you read `kToolbarHeight` (56 px) to size custom chrome that sits next
+to a Stream header, switch to `kStreamHeaderHeight` to stay aligned.
+
 ---
 
 ## StreamChat.componentBuilders
@@ -225,7 +369,15 @@ StreamChat(
 ## Migration Checklist
 
 - [ ] Replace all `StreamSvgIcon(icon: StreamSvgIcons.*)` with `Icon(context.streamIcons.*)` using the mapping table above
-- [ ] If you relied on platform-adaptive `centerTitle` behaviour on `StreamChannelHeader` / `StreamChannelListHeader` / `StreamThreadHeader`, pass `centerTitle: false` explicitly for Android-style left-aligned titles
-- [ ] If you relied on the `elevation: 1` shadow on headers, pass `elevation: 1` explicitly
+- [ ] Replace `showBackButton: false` with `automaticallyImplyLeading: false` on every header that used it
+- [ ] Move `onBackPressed: cb` to `leading: StreamBackButton(onPressed: cb)`
+- [ ] Move `onTitleTap` / `onImageTap` callbacks into `GestureDetector` wrappers around the new `title:` / `trailing:` slots (or use `onChannelAvatarPressed` on `StreamChannelHeader`)
+- [ ] Rename `StreamChannelListHeader.onUserAvatarTap` to `onUserAvatarPressed`; drop manual `Scaffold.of(context).openDrawer()` callbacks if you only want the default drawer behaviour
+- [ ] Replace `StreamChannelListHeader.onNewChatButtonTap` with a `trailing: StreamButton.icon(...)` widget — the SDK no longer ships the default button
+- [ ] Replace `titleBuilder: (context, user) => ...` with `title: ...` (a `Widget`)
+- [ ] Replace `actions: [a, b]` with `trailing: Row(children: [a, b])` — only one trailing slot is exposed
+- [ ] Drop `centerTitle`, `elevation`, `bottomOpacity`, `bottom`, and `backgroundColor` from header callsites; use `style: StreamAppBarStyle(backgroundColor: ...)` if you need to override the background
+- [ ] Update theme overrides: `StreamChannelHeaderThemeData` / `StreamChannelListHeaderThemeData` / `StreamGalleryHeaderThemeData` are deleted — switch to `StreamAppBarThemeData`
+- [ ] If you sized custom chrome to `kToolbarHeight` next to a Stream header, switch to `kStreamHeaderHeight` (72 px)
 - [ ] Optionally move `StreamComponentFactory` wrapping into the `componentBuilders` parameter on `StreamChat`
 - [ ] Use the new `attachmentBuilders`, `reactionType`, and `reactionPosition` fields on `StreamChatConfigurationData` if you need custom attachment rendering or global reaction style control
diff --git a/migrations/redesign/localizations.md b/migrations/redesign/localizations.md
@@ -97,6 +97,10 @@ String get loadingReactionsError => 'Error loading reactions';
 @override
 String get tapToRemoveReactionLabel => 'Tap to remove';
 
+@override
+String reactionsCountText(int count) =>
+    count == 1 ? '1 Reaction' : '$count Reactions';
+
 // Confirmation dialogs
 @override
 String get confirmLabel => 'CONFIRM';

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
@@ -4,11 +4,17 @@
 
 - Added `StreamChatClient.recoverStateOnReconnect` (defaults to `true`); when `false`, the client no longer auto-re-queries active channels on connection recovery — useful for consumers driving their own refresh from the `connectionRecovered` event.
 - Added `Message.updateWith(Message? other)` — merges a server-side update onto the local message while preserving locally-known `poll`, `sharedLocation`, `ownReactions`, and nested `quotedMessage` enrichment when the server omits them.
+- Added `Channel.isOneToOne` — true when the channel is `isDistinct` and has exactly two members. For the looser count-only check, inline `channel.memberCount == 2`.
 
 ⚠️ Deprecated
 
 - Deprecated `Message.syncWith` in favor of `Message.updateWith`. Note the arguments are flipped: `local.updateWith(remote)` replaces `remote.syncWith(local)`.
 
+🔄 Changed
+
+- Tightened `Channel.isGroup` from `memberCount != 2` to `memberCount > 2 || !isDistinct`. Two-member non-distinct channels now correctly report as groups, and 1-member distinct channels no longer do. Migrate via `!channel.isOneToOne` or `channel.memberCount != 2`.
+- Tightened `Channel.isDistinct` to require the `!members-` prefix (with trailing dash), matching the backend's `DistinctChannelPrefix` constant. Real server-generated ids always include the dash; only malformed/test ids that previously matched the looser `!members` check are affected.
+
 🐞 Fixed
 
 - Fixed reactions, polls, and quoted-message enrichment briefly flickering after the app returned from the background. The reconnect path now refreshes channels and advances `lastSyncAt` to the current time instead of replaying every event since `lastSyncAt` through `handleEvent`. `client.sync()` remains available for consumers that need event-level replay.