GetStream · xsahil03x · May 19, 2026 · May 19, 2026 · May 19, 2026 · May 19, 2026
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -19,7 +19,6 @@ linter:
     - control_flow_in_finally
     - empty_statements
     - hash_and_equals
-    - invariant_booleans
     - literal_only_boolean_expressions
     - no_adjacent_strings_in_list
     - no_duplicate_case_values
@@ -81,7 +80,6 @@ linter:
     - prefer_const_declarations
     - prefer_const_literals_to_create_immutables
     - prefer_contains
-    - prefer_equal_for_default_values
     - prefer_final_fields
     - prefer_final_in_for_each
     - prefer_final_locals

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
@@ -2942,16 +2942,10 @@ class ChannelClientState {
   void updateMessage(Message message) {
     // Determine if the message should be displayed in the channel view.
     if (message.parentId == null || message.showInChannel == true) {
-      // Locate the existing version (if any). One lookup feeds both the
-      // quoted-rewrite below and the `sortedUpsertAt` further down — no
-      // duplicate scan.
-
-      final oldIndex = () {
-        if (messages.isEmpty) return -1;
-        if (message.createdAt.isAfter(messages.last.createdAt)) return -1;
-        return messages.indexWhere((it) => it.id == message.id);
-      }();
-
+      // Scan from the tail: server echoes, edits, and reactions almost
+      // always target a recent message, so `lastIndexWhere` exits in a
+      // handful of comparisons instead of walking the full list.
+      final oldIndex = messages.lastIndexWhere((m) => m.id == message.id);
       final oldMessage = oldIndex == -1 ? null : messages[oldIndex];
 
       // Carry over local-only timestamps; no-op when there's no prior.

diff --git a/packages/stream_chat/test/src/client/channel_test.dart b/packages/stream_chat/test/src/client/channel_test.dart
@@ -4192,6 +4192,104 @@ void main() {
             ).called(1);
           },
         );
+
+        test(
+          'should not duplicate when server echoes back an optimistically '
+          'inserted message with a later createdAt',
+          () async {
+            // Local message used as the input to `channel.sendMessage`.
+            final localCreatedAt =
+                initialLastMessageAt.add(const Duration(seconds: 3));
+            final localMessage = Message(
+              id: 'test-message-id',
+              text: 'Hello world!',
+              user: client.state.currentUser,
+              createdAt: localCreatedAt,
+            );
+
+            // Mock the network send to return the message unchanged so the
+            // optimistic insert + sent-state update both land on the same
+            // `createdAt`. The bug fires later, on the WS echo.
+            final sendMessageResponse = SendMessageResponse()
+              ..message = localMessage.copyWith(state: MessageState.sent);
+            when(() => client.sendMessage(any(), channelId, channelType))
+                .thenAnswer((_) async => sendMessageResponse);
+
+            await channel.sendMessage(localMessage);
+
+            expect(channel.state!.messages, hasLength(1));
+
+            // Server then broadcasts the same message via a `message.new`
+            // event with a slightly later `createdAt` (server-assigned
+            // timestamp).
+            final serverMessage = localMessage.copyWith(
+              createdAt: localCreatedAt.add(const Duration(milliseconds: 50)),
+            );
+            client.addEvent(createNewMessageEvent(serverMessage));
+
+            // Wait for the event to get processed
+            await Future.delayed(Duration.zero);
+
+            // The state should contain exactly one message with that id,
+            // not a duplicate.
+            final matching =
+                channel.state!.messages.where((it) => it.id == localMessage.id);
+            expect(matching, hasLength(1));
+            expect(channel.state!.messages, hasLength(1));
+          },
+        );
+
+        test(
+          'should not duplicate when the locally-sent message is no longer '
+          'the latest (retry-after-offline scenario)',
+          () async {
+            // Mirrors the offline-retry flow: a local message is sent, then
+            // another message arrives via WS while the local one is still
+            // pending. When the retry finally succeeds the server response's
+            // `createdAt` is later than the intervening message, so the
+            // locally-sent copy is no longer `messages.last`.
+            final localCreatedAt =
+                initialLastMessageAt.add(const Duration(seconds: 1));
+            final localMessage = Message(
+              id: 'local-message-id',
+              text: 'Hello world!',
+              user: client.state.currentUser,
+              createdAt: localCreatedAt,
+            );
+
+            final sendMessageResponse = SendMessageResponse()
+              ..message = localMessage.copyWith(state: MessageState.sent);
+            when(() => client.sendMessage(any(), channelId, channelType))
+                .thenAnswer((_) async => sendMessageResponse);
+
+            await channel.sendMessage(localMessage);
+
+            // Another message arrives via WS with a later `createdAt`,
+            // pushing the locally-sent message off the tail.
+            final otherMessage = Message(
+              id: 'other-message-id',
+              user: User(id: 'other-user'),
+              createdAt: localCreatedAt.add(const Duration(seconds: 2)),
+            );
+            client.addEvent(createNewMessageEvent(otherMessage));
+            await Future.delayed(Duration.zero);
+
+            // Server then broadcasts the locally-sent message via
+            // `message.new` with a `createdAt` that is later than the
+            // intervening message — exactly the shape produced by a
+            // successful retry after another message arrived in between.
+            final serverEcho = localMessage.copyWith(
+              createdAt: otherMessage.createdAt.add(const Duration(seconds: 1)),
+            );
+            client.addEvent(createNewMessageEvent(serverEcho));
+            await Future.delayed(Duration.zero);
+
+            final localMatches =
+                channel.state!.messages.where((it) => it.id == localMessage.id);
+            expect(localMatches, hasLength(1));
+            expect(channel.state!.messages, hasLength(2));
+          },
+        );
       },
     );
 

diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input.dart
@@ -700,11 +700,9 @@ class StreamMessageInputState extends State<StreamMessageInput>
     final elevation = widget.elevation ?? _messageInputTheme.elevation;
     return Material(
       elevation: elevation ?? 8,
+      color: _messageInputTheme.inputBackgroundColor,
       child: DecoratedBox(
-        decoration: BoxDecoration(
-          color: _messageInputTheme.inputBackgroundColor,
-          boxShadow: [if (shadow != null) shadow],
-        ),
+        decoration: BoxDecoration(boxShadow: [if (shadow != null) shadow]),
         child: SimpleSafeArea(
           enabled: widget.enableSafeArea ?? _messageInputTheme.enableSafeArea,
           child: Center(heightFactor: 1, child: messageInput),

diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_attachment_list.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_attachment_list.dart
@@ -369,6 +369,7 @@ class MessageInputMediaAttachments extends StatelessWidget {
       child: ListView(
         scrollDirection: Axis.horizontal,
         padding: const EdgeInsets.symmetric(vertical: 2, horizontal: 8),
+        // ignore: deprecated_member_use
         cacheExtent: 104 * 10, // Cache 10 items ahead.
         children: attachments.map<Widget>(
           (attachment) {

diff --git a/packages/stream_chat_flutter/lib/src/misc/separated_reorderable_list_view.dart b/packages/stream_chat_flutter/lib/src/misc/separated_reorderable_list_view.dart
@@ -27,6 +27,7 @@ class SeparatedReorderableListView extends ReorderableListView {
     super.physics,
     super.shrinkWrap,
     super.anchor,
+    // ignore: deprecated_member_use
     super.cacheExtent,
     super.dragStartBehavior,
     super.keyboardDismissBehavior,
@@ -56,6 +57,7 @@ class SeparatedReorderableListView extends ReorderableListView {
 
             return separator;
           },
+          // ignore: deprecated_member_use
           onReorder: (int oldIndex, int newIndex) {
             // Adjust the indexes due to an issue in the ReorderableListView
             // which isn't going to be fixed in the near future.

diff --git a/packages/stream_chat_flutter/lib/src/poll/creator/poll_switch_list_tile.dart b/packages/stream_chat_flutter/lib/src/poll/creator/poll_switch_list_tile.dart
@@ -54,19 +54,14 @@ class PollSwitchListTile extends StatelessWidget {
     final listTile = SwitchListTile(
       value: value,
       onChanged: onChanged,
-      tileColor: fillColor,
       title: Text(title, style: theme.switchListTileTitleStyle),
       contentPadding: const EdgeInsets.only(left: 16, right: 8),
-      shape: RoundedRectangleBorder(
-        borderRadius: borderRadius ?? BorderRadius.zero,
-      ),
     );
 
-    return DecoratedBox(
-      decoration: BoxDecoration(
-        color: fillColor,
-        borderRadius: borderRadius,
-      ),
+    return Material(
+      color: fillColor,
+      borderRadius: borderRadius,
+      clipBehavior: Clip.antiAlias,
       child: Column(
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,

diff --git a/.../test/src/attachment/goldens/ci/stream_voice_recording_attachment_idle_dark.png b/.../test/src/attachment/goldens/ci/stream_voice_recording_attachment_idle_dark.png
diff --git a/...test/src/attachment/goldens/ci/stream_voice_recording_attachment_idle_light.png b/...test/src/attachment/goldens/ci/stream_voice_recording_attachment_idle_light.png
diff --git a/...st/src/attachment/goldens/ci/stream_voice_recording_attachment_playing_dark.png b/...st/src/attachment/goldens/ci/stream_voice_recording_attachment_playing_dark.png
diff --git a/...t/src/attachment/goldens/ci/stream_voice_recording_attachment_playing_light.png b/...t/src/attachment/goldens/ci/stream_voice_recording_attachment_playing_light.png
diff --git a/...t/src/attachment/goldens/ci/stream_voice_recording_attachment_playlist_dark.png b/...t/src/attachment/goldens/ci/stream_voice_recording_attachment_playlist_dark.png
diff --git a/.../src/attachment/goldens/ci/stream_voice_recording_attachment_playlist_light.png b/.../src/attachment/goldens/ci/stream_voice_recording_attachment_playlist_light.png
diff --git a/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_0.png b/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_0.png
diff --git a/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_1.png b/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_1.png
diff --git a/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_2.png b/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_2.png
diff --git a/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_3.png b/packages/stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_3.png
diff --git a/.../stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_issue_2369.png b/.../stream_chat_flutter/test/src/avatars/goldens/ci/gradient_avatar_issue_2369.png
diff --git a/packages/stream_chat_flutter/test/src/avatars/goldens/ci/group_avatar_0.png b/packages/stream_chat_flutter/test/src/avatars/goldens/ci/group_avatar_0.png
diff --git a/packages/stream_chat_flutter/test/src/avatars/goldens/ci/user_avatar_0.png b/packages/stream_chat_flutter/test/src/avatars/goldens/ci/user_avatar_0.png
diff --git a/packages/stream_chat_flutter/test/src/avatars/goldens/ci/user_avatar_1.png b/packages/stream_chat_flutter/test/src/avatars/goldens/ci/user_avatar_1.png
diff --git a/...eam_chat_flutter/test/src/bottom_sheets/goldens/ci/attachment_modal_sheet_0.png b/...eam_chat_flutter/test/src/bottom_sheets/goldens/ci/attachment_modal_sheet_0.png
diff --git a/.../stream_chat_flutter/test/src/bottom_sheets/goldens/ci/edit_message_sheet_0.png b/.../stream_chat_flutter/test/src/bottom_sheets/goldens/ci/edit_message_sheet_0.png
diff --git a/...s/stream_chat_flutter/test/src/bottom_sheets/goldens/ci/error_alert_sheet_0.png b/...s/stream_chat_flutter/test/src/bottom_sheets/goldens/ci/error_alert_sheet_0.png
diff --git a/...tream_chat_flutter/test/src/channel/goldens/ci/channel_header_bottom_widget.png b/...tream_chat_flutter/test/src/channel/goldens/ci/channel_header_bottom_widget.png
diff --git a/...am_chat_flutter/test/src/context_menu_items/goldens/ci/download_menu_item_0.png b/...am_chat_flutter/test/src/context_menu_items/goldens/ci/download_menu_item_0.png
diff --git a/...tter/test/src/context_menu_items/goldens/ci/stream_chat_context_menu_item_0.png b/...tter/test/src/context_menu_items/goldens/ci/stream_chat_context_menu_item_0.png
diff --git a/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/confirmation_dialog_0.png b/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/confirmation_dialog_0.png
diff --git a/...ges/stream_chat_flutter/test/src/dialogs/goldens/ci/delete_message_dialog_0.png b/...ges/stream_chat_flutter/test/src/dialogs/goldens/ci/delete_message_dialog_0.png
diff --git a/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/message_dialog_0.png b/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/message_dialog_0.png
diff --git a/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/message_dialog_1.png b/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/message_dialog_1.png
diff --git a/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/message_dialog_2.png b/packages/stream_chat_flutter/test/src/dialogs/goldens/ci/message_dialog_2.png
diff --git a/packages/stream_chat_flutter/test/src/gallery/goldens/ci/gallery_footer_0.png b/packages/stream_chat_flutter/test/src/gallery/goldens/ci/gallery_footer_0.png
diff --git a/packages/stream_chat_flutter/test/src/gallery/goldens/ci/gallery_header_0.png b/packages/stream_chat_flutter/test/src/gallery/goldens/ci/gallery_header_0.png
diff --git a/packages/stream_chat_flutter/test/src/icons/goldens/ci/stream_svg_icon_dark.png b/packages/stream_chat_flutter/test/src/icons/goldens/ci/stream_svg_icon_dark.png
diff --git a/packages/stream_chat_flutter/test/src/icons/goldens/ci/stream_svg_icon_light.png b/packages/stream_chat_flutter/test/src/icons/goldens/ci/stream_svg_icon_light.png
diff --git a/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_0.png b/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_0.png
diff --git a/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_1.png b/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_1.png
diff --git a/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_2.png b/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_2.png
diff --git a/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_3.png b/...ages/stream_chat_flutter/test/src/indicators/goldens/ci/sending_indicator_3.png
diff --git a/...eam_chat_flutter/test/src/indicators/goldens/ci/upload_progress_indicator_0.png b/...eam_chat_flutter/test/src/indicators/goldens/ci/upload_progress_indicator_0.png
diff --git a/...eam_chat_flutter/test/src/indicators/goldens/ci/upload_progress_indicator_1.png b/...eam_chat_flutter/test/src/indicators/goldens/ci/upload_progress_indicator_1.png
diff --git a/...eam_chat_flutter/test/src/indicators/goldens/ci/upload_progress_indicator_2.png b/...eam_chat_flutter/test/src/indicators/goldens/ci/upload_progress_indicator_2.png
diff --git a/...sage_input/audio_recorder/goldens/ci/stream_audio_recorder_button_idle_dark.png b/...sage_input/audio_recorder/goldens/ci/stream_audio_recorder_button_idle_dark.png
diff --git a/...age_input/audio_recorder/goldens/ci/stream_audio_recorder_button_idle_light.png b/...age_input/audio_recorder/goldens/ci/stream_audio_recorder_button_idle_light.png
diff --git a/.../audio_recorder/goldens/ci/stream_audio_recorder_button_recording_hold_dark.png b/.../audio_recorder/goldens/ci/stream_audio_recorder_button_recording_hold_dark.png
diff --git a/...audio_recorder/goldens/ci/stream_audio_recorder_button_recording_hold_light.png b/...audio_recorder/goldens/ci/stream_audio_recorder_button_recording_hold_light.png
diff --git a/...udio_recorder/goldens/ci/stream_audio_recorder_button_recording_locked_dark.png b/...udio_recorder/goldens/ci/stream_audio_recorder_button_recording_locked_dark.png
diff --git a/...dio_recorder/goldens/ci/stream_audio_recorder_button_recording_locked_light.png b/...dio_recorder/goldens/ci/stream_audio_recorder_button_recording_locked_light.png
diff --git a/...dio_recorder/goldens/ci/stream_audio_recorder_button_recording_stopped_dark.png b/...dio_recorder/goldens/ci/stream_audio_recorder_button_recording_stopped_dark.png
diff --git a/...io_recorder/goldens/ci/stream_audio_recorder_button_recording_stopped_light.png b/...io_recorder/goldens/ci/stream_audio_recorder_button_recording_stopped_light.png
diff --git a/...s/stream_chat_flutter/test/src/message_input/goldens/ci/attachment_button_0.png b/...s/stream_chat_flutter/test/src/message_input/goldens/ci/attachment_button_0.png
diff --git a/...es/stream_chat_flutter/test/src/message_input/goldens/ci/clear_input_item_0.png b/...es/stream_chat_flutter/test/src/message_input/goldens/ci/clear_input_item_0.png
diff --git a/...ages/stream_chat_flutter/test/src/message_input/goldens/ci/command_button_0.png b/...ages/stream_chat_flutter/test/src/message_input/goldens/ci/command_button_0.png
diff --git a/...es/stream_chat_flutter/test/src/message_input/goldens/ci/countdown_button_0.png b/...es/stream_chat_flutter/test/src/message_input/goldens/ci/countdown_button_0.png
diff --git a/packages/stream_chat_flutter/test/src/message_input/goldens/ci/dm_checkbox_0.png b/packages/stream_chat_flutter/test/src/message_input/goldens/ci/dm_checkbox_0.png
diff --git a/packages/stream_chat_flutter/test/src/message_input/goldens/ci/dm_checkbox_1.png b/packages/stream_chat_flutter/test/src/message_input/goldens/ci/dm_checkbox_1.png
diff --git a/packages/stream_chat_flutter/test/src/message_input/goldens/ci/dm_checkbox_2.png b/packages/stream_chat_flutter/test/src/message_input/goldens/ci/dm_checkbox_2.png
diff --git a/...ream_chat_flutter/test/src/message_widget/goldens/ci/deleted_message_custom.png b/...ream_chat_flutter/test/src/message_widget/goldens/ci/deleted_message_custom.png
diff --git a/...stream_chat_flutter/test/src/message_widget/goldens/ci/deleted_message_dark.png b/...stream_chat_flutter/test/src/message_widget/goldens/ci/deleted_message_dark.png
diff --git a/...tream_chat_flutter/test/src/message_widget/goldens/ci/deleted_message_light.png b/...tream_chat_flutter/test/src/message_widget/goldens/ci/deleted_message_light.png
diff --git a/packages/stream_chat_flutter/test/src/message_widget/goldens/ci/message_text.png b/packages/stream_chat_flutter/test/src/message_widget/goldens/ci/message_text.png
diff --git a/packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_2.png b/packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_2.png
diff --git a/packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_3_dark.png b/packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_3_dark.png
diff --git a/packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_3_light.png b/packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_3_light.png
diff --git a/...ages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_like_dark.png b/...ages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_like_dark.png
diff --git a/...ges/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_like_light.png b/...ges/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_like_light.png
diff --git a/...t_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_custom_dark.png b/...t_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_custom_dark.png
diff --git a/..._flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_custom_light.png b/..._flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_custom_light.png
diff --git a/...eam_chat_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_dark.png b/...eam_chat_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_dark.png
diff --git a/...at_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_empty_dark.png b/...at_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_empty_dark.png
diff --git a/...t_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_empty_light.png b/...t_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_empty_light.png
diff --git a/...flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_inverted_dark.png b/...flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_inverted_dark.png
diff --git a/...lutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_inverted_light.png b/...lutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_inverted_light.png
diff --git a/...lutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_less_data_dark.png b/...lutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_less_data_dark.png
diff --git a/...utter/test/src/misc/goldens/ci/stream_audio_waveform_slider_less_data_light.png b/...utter/test/src/misc/goldens/ci/stream_audio_waveform_slider_less_data_light.png
diff --git a/...am_chat_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_light.png b/...am_chat_flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_light.png
diff --git a/...flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_progress_dark.png b/...flutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_progress_dark.png
diff --git a/...lutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_progress_light.png b/...lutter/test/src/misc/goldens/ci/stream_audio_waveform_slider_progress_light.png
diff --git a/packages/stream_chat_flutter/test/src/misc/goldens/ci/stream_timestamp_dark.png b/packages/stream_chat_flutter/test/src/misc/goldens/ci/stream_timestamp_dark.png
diff --git a/packages/stream_chat_flutter/test/src/misc/goldens/ci/stream_timestamp_light.png b/packages/stream_chat_flutter/test/src/misc/goldens/ci/stream_timestamp_light.png
diff --git a/packages/stream_chat_flutter/test/src/misc/goldens/ci/system_message_dark.png b/packages/stream_chat_flutter/test/src/misc/goldens/ci/system_message_dark.png
diff --git a/packages/stream_chat_flutter/test/src/misc/goldens/ci/system_message_light.png b/packages/stream_chat_flutter/test/src/misc/goldens/ci/system_message_light.png
diff --git a/...hat_flutter/test/src/poll/creator/goldens/ci/poll_delete_option_dialog_dark.png b/...hat_flutter/test/src/poll/creator/goldens/ci/poll_delete_option_dialog_dark.png
diff --git a/...at_flutter/test/src/poll/creator/goldens/ci/poll_delete_option_dialog_light.png b/...at_flutter/test/src/poll/creator/goldens/ci/poll_delete_option_dialog_light.png
diff --git a/...ter/test/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_dark.png b/...ter/test/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_dark.png
diff --git a/...st/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_error_dark.png b/...st/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_error_dark.png
diff --git a/...t/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_error_light.png b/...t/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_error_light.png
diff --git a/...er/test/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_light.png b/...er/test/src/poll/creator/goldens/ci/poll_option_reorderable_list_view_light.png
diff --git a/...chat_flutter/test/src/poll/creator/goldens/ci/poll_question_text_field_dark.png b/...chat_flutter/test/src/poll/creator/goldens/ci/poll_question_text_field_dark.png
diff --git a/...lutter/test/src/poll/creator/goldens/ci/poll_question_text_field_error_dark.png b/...lutter/test/src/poll/creator/goldens/ci/poll_question_text_field_error_dark.png
diff --git a/...utter/test/src/poll/creator/goldens/ci/poll_question_text_field_error_light.png b/...utter/test/src/poll/creator/goldens/ci/poll_question_text_field_error_light.png
diff --git a/...hat_flutter/test/src/poll/creator/goldens/ci/poll_question_text_field_light.png b/...hat_flutter/test/src/poll/creator/goldens/ci/poll_question_text_field_light.png
diff --git a/...at_flutter/test/src/poll/creator/goldens/ci/stream_poll_creator_dialog_dark.png b/...at_flutter/test/src/poll/creator/goldens/ci/stream_poll_creator_dialog_dark.png
diff --git a/...t_flutter/test/src/poll/creator/goldens/ci/stream_poll_creator_dialog_light.png b/...t_flutter/test/src/poll/creator/goldens/ci/stream_poll_creator_dialog_light.png
diff --git a/...est/src/poll/creator/goldens/ci/stream_poll_creator_full_screen_dialog_dark.png b/...est/src/poll/creator/goldens/ci/stream_poll_creator_full_screen_dialog_dark.png
diff --git a/...st/src/poll/creator/goldens/ci/stream_poll_creator_full_screen_dialog_light.png b/...st/src/poll/creator/goldens/ci/stream_poll_creator_full_screen_dialog_light.png
diff --git a/...hat_flutter/test/src/poll/goldens/ci/poll_option_reorderable_list_view_dark.png b/...hat_flutter/test/src/poll/goldens/ci/poll_option_reorderable_list_view_dark.png
diff --git a/...at_flutter/test/src/poll/goldens/ci/poll_option_reorderable_list_view_error.png b/...at_flutter/test/src/poll/goldens/ci/poll_option_reorderable_list_view_error.png
diff --git a/...at_flutter/test/src/poll/goldens/ci/poll_option_reorderable_list_view_light.png b/...at_flutter/test/src/poll/goldens/ci/poll_option_reorderable_list_view_light.png
diff --git a/.../stream_chat_flutter/test/src/poll/goldens/ci/poll_question_text_field_dark.png b/.../stream_chat_flutter/test/src/poll/goldens/ci/poll_question_text_field_dark.png
diff --git a/...stream_chat_flutter/test/src/poll/goldens/ci/poll_question_text_field_error.png b/...stream_chat_flutter/test/src/poll/goldens/ci/poll_question_text_field_error.png
diff --git a/...stream_chat_flutter/test/src/poll/goldens/ci/poll_question_text_field_light.png b/...stream_chat_flutter/test/src/poll/goldens/ci/poll_question_text_field_light.png
diff --git a/...tream_chat_flutter/test/src/poll/goldens/ci/stream_poll_creator_dialog_dark.png b/...tream_chat_flutter/test/src/poll/goldens/ci/stream_poll_creator_dialog_dark.png
diff --git a/...ream_chat_flutter/test/src/poll/goldens/ci/stream_poll_creator_dialog_light.png b/...ream_chat_flutter/test/src/poll/goldens/ci/stream_poll_creator_dialog_light.png
diff --git a/...lutter/test/src/poll/goldens/ci/stream_poll_creator_full_screen_dialog_dark.png b/...lutter/test/src/poll/goldens/ci/stream_poll_creator_full_screen_dialog_dark.png
diff --git a/...utter/test/src/poll/goldens/ci/stream_poll_creator_full_screen_dialog_light.png b/...utter/test/src/poll/goldens/ci/stream_poll_creator_full_screen_dialog_light.png
diff --git a/...tream_chat_flutter/test/src/poll/goldens/ci/stream_poll_options_dialog_dark.png b/...tream_chat_flutter/test/src/poll/goldens/ci/stream_poll_options_dialog_dark.png
diff --git a/...ream_chat_flutter/test/src/poll/goldens/ci/stream_poll_options_dialog_light.png b/...ream_chat_flutter/test/src/poll/goldens/ci/stream_poll_options_dialog_light.png
diff --git a/...tream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_dark.png b/...tream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_dark.png
diff --git a/...ream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_light.png b/...ream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_light.png
diff --git a/...tter/test/src/poll/goldens/ci/stream_poll_results_dialog_with_show_all_dark.png b/...tter/test/src/poll/goldens/ci/stream_poll_results_dialog_with_show_all_dark.png
diff --git a/...ter/test/src/poll/goldens/ci/stream_poll_results_dialog_with_show_all_light.png b/...ter/test/src/poll/goldens/ci/stream_poll_results_dialog_with_show_all_light.png
diff --git a/...at_flutter/test/src/poll/interactor/goldens/ci/poll_add_comment_dialog_dark.png b/...at_flutter/test/src/poll/interactor/goldens/ci/poll_add_comment_dialog_dark.png
diff --git a/...t_flutter/test/src/poll/interactor/goldens/ci/poll_add_comment_dialog_light.png b/...t_flutter/test/src/poll/interactor/goldens/ci/poll_add_comment_dialog_light.png
diff --git a/.../poll/interactor/goldens/ci/poll_add_comment_dialog_with_initial_value_dark.png b/.../poll/interactor/goldens/ci/poll_add_comment_dialog_with_initial_value_dark.png
diff --git a/...poll/interactor/goldens/ci/poll_add_comment_dialog_with_initial_value_light.png b/...poll/interactor/goldens/ci/poll_add_comment_dialog_with_initial_value_light.png
diff --git a/..._chat_flutter/test/src/poll/interactor/goldens/ci/poll_end_vote_dialog_dark.png b/..._chat_flutter/test/src/poll/interactor/goldens/ci/poll_end_vote_dialog_dark.png
diff --git a/...chat_flutter/test/src/poll/interactor/goldens/ci/poll_end_vote_dialog_light.png b/...chat_flutter/test/src/poll/interactor/goldens/ci/poll_end_vote_dialog_light.png
diff --git a/...es/stream_chat_flutter/test/src/poll/interactor/goldens/ci/poll_header_dark.png b/...es/stream_chat_flutter/test/src/poll/interactor/goldens/ci/poll_header_dark.png
diff --git a/...s/stream_chat_flutter/test/src/poll/interactor/goldens/ci/poll_header_light.png b/...s/stream_chat_flutter/test/src/poll/interactor/goldens/ci/poll_header_light.png
diff --git a/..._flutter/test/src/poll/interactor/goldens/ci/poll_header_long_question_dark.png b/..._flutter/test/src/poll/interactor/goldens/ci/poll_header_long_question_dark.png
diff --git a/...flutter/test/src/poll/interactor/goldens/ci/poll_header_long_question_light.png b/...flutter/test/src/poll/interactor/goldens/ci/poll_header_long_question_light.png
diff --git a/...st/src/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_all_dark.png b/...st/src/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_all_dark.png
diff --git a/...t/src/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_all_light.png b/...t/src/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_all_light.png
diff --git a/...c/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_disabled_dark.png b/...c/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_disabled_dark.png
diff --git a/.../poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_disabled_light.png b/.../poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_disabled_light.png
diff --git a/...rc/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_limited_dark.png b/...rc/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_limited_dark.png
diff --git a/...c/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_limited_light.png b/...c/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_limited_light.png
diff --git a/...src/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_unique_dark.png b/...src/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_unique_dark.png
diff --git a/...rc/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_unique_light.png b/...rc/poll/interactor/goldens/ci/poll_header_subtitle_voting_mode_unique_light.png
diff --git a/...flutter/test/src/poll/interactor/goldens/ci/poll_suggest_option_dialog_dark.png b/...flutter/test/src/poll/interactor/goldens/ci/poll_suggest_option_dialog_dark.png
diff --git a/...lutter/test/src/poll/interactor/goldens/ci/poll_suggest_option_dialog_light.png b/...lutter/test/src/poll/interactor/goldens/ci/poll_suggest_option_dialog_light.png
diff --git a/...l/interactor/goldens/ci/poll_suggest_option_dialog_with_initial_option_dark.png b/...l/interactor/goldens/ci/poll_suggest_option_dialog_with_initial_option_dark.png
diff --git a/.../interactor/goldens/ci/poll_suggest_option_dialog_with_initial_option_light.png b/.../interactor/goldens/ci/poll_suggest_option_dialog_with_initial_option_light.png
diff --git a/...tter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_closed_dark.png b/...tter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_closed_dark.png
diff --git a/...ter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_closed_light.png b/...ter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_closed_light.png
diff --git a/...hat_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_dark.png b/...hat_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_dark.png
diff --git a/...at_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_light.png b/...at_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_light.png
diff --git a/...st/src/scroll_view/draft_scroll_view/goldens/ci/stream_draft_list_tile_dark.png b/...st/src/scroll_view/draft_scroll_view/goldens/ci/stream_draft_list_tile_dark.png
diff --git a/...t/src/scroll_view/draft_scroll_view/goldens/ci/stream_draft_list_tile_light.png b/...t/src/scroll_view/draft_scroll_view/goldens/ci/stream_draft_list_tile_light.png
diff --git a/.../src/scroll_view/thread_scroll_view/goldens/ci/stream_thread_list_tile_dark.png b/.../src/scroll_view/thread_scroll_view/goldens/ci/stream_thread_list_tile_dark.png
diff --git a/...src/scroll_view/thread_scroll_view/goldens/ci/stream_thread_list_tile_light.png b/...src/scroll_view/thread_scroll_view/goldens/ci/stream_thread_list_tile_light.png
diff --git a/...scroll_view/thread_scroll_view/goldens/ci/stream_unread_threads_banner_dark.png b/...scroll_view/thread_scroll_view/goldens/ci/stream_unread_threads_banner_dark.png
diff --git a/...croll_view/thread_scroll_view/goldens/ci/stream_unread_threads_banner_light.png b/...croll_view/thread_scroll_view/goldens/ci/stream_unread_threads_banner_light.png
diff --git a/packages/stream_chat_flutter_core/lib/src/paged_value_scroll_view.dart b/packages/stream_chat_flutter_core/lib/src/paged_value_scroll_view.dart
@@ -309,6 +309,7 @@ class _PagedValueListViewState<K, V> extends State<PagedValueListView<K, V>> {
               keyboardDismissBehavior: widget.keyboardDismissBehavior,
               restorationId: widget.restorationId,
               dragStartBehavior: widget.dragStartBehavior,
+              // ignore: deprecated_member_use
               cacheExtent: widget.cacheExtent,
               clipBehavior: widget.clipBehavior,
               itemCount: value.itemCount,
@@ -662,6 +663,7 @@ class _PagedValueGridViewState<K, V> extends State<PagedValueGridView<K, V>> {
               addAutomaticKeepAlives: widget.addAutomaticKeepAlives,
               addRepaintBoundaries: widget.addRepaintBoundaries,
               addSemanticIndexes: widget.addSemanticIndexes,
+              // ignore: deprecated_member_use
               cacheExtent: widget.cacheExtent,
               semanticChildCount: widget.semanticChildCount,
               dragStartBehavior: widget.dragStartBehavior,

diff --git a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
@@ -752,7 +752,7 @@ class StreamChannelState extends State<StreamChannel> {
     }
 
     // Find the index of the last read message
-    final lastReadIndex = messages.indexWhere(
+    final lastReadIndex = messages.lastIndexWhere(
       (message) => message.id == lastReadMessageId,
     );
 

diff --git a/sample_app/android/app/build.gradle b/sample_app/android/app/build.gradle
@@ -10,7 +10,10 @@ plugins {
 
 android {
     namespace "io.getstream.chat.android.flutter.sample"
-    compileSdkVersion flutter.compileSdkVersion
+    // Pin a floor of 36 so AAR metadata checks pass for transitive
+    // dependencies that require it until Flutter's bundled
+    // compileSdkVersion catches up.
+    compileSdkVersion Math.max(flutter.compileSdkVersion, 36)
     ndkVersion "27.0.12077973"
 
     compileOptions {

diff --git a/sample_app/android/app/src/profile/AndroidManifest.xml b/sample_app/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/sample_app/android/build.gradle b/sample_app/android/build.gradle
@@ -16,8 +16,11 @@ subprojects {
                 android.namespace = project.group
             }
 
-            // Align the compileSdkVersion with Flutter's compileSdkVersion
-            android.compileSdkVersion = flutter.compileSdkVersion
+            // Align the compileSdkVersion with Flutter's compileSdkVersion, but
+            // pin a floor of 36 so AAR metadata checks pass for transitive
+            // dependencies that require it until Flutter's bundled
+            // compileSdkVersion catches up.
+            android.compileSdkVersion = Math.max(flutter.compileSdkVersion, 36)
         }
     }
 

diff --git a/sample_app/android/gradle.properties b/sample_app/android/gradle.properties
@@ -3,3 +3,7 @@ org.gradle.caching=true
 org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false
diff --git a/sample_app/ios/Flutter/AppFrameworkInfo.plist b/sample_app/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>12.0</string>
 </dict>
 </plist>