From 875ff934b60a5ae41e8badb4846c0778af906d9d Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 12 Jul 2023 17:21:28 +0530
Subject: [PATCH 01/12] chore(repo): updated minimum supported SDK version to
 Flutter 3.10/Dart 3.0

Signed-off-by: xsahil03x <xdsahil@gmail.com>
Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 packages/stream_chat/example/pubspec.yaml     |  4 ++--
 .../stream_chat/lib/src/ws/timer_helper.dart  |  2 +-
 packages/stream_chat/pubspec.yaml             | 18 ++++++++---------
 .../stream_chat_flutter/example/pubspec.yaml  |  4 ++--
 packages/stream_chat_flutter/pubspec.yaml     | 20 +++++++++----------
 .../example/pubspec.yaml                      |  4 ++--
 .../stream_chat_flutter_core/pubspec.yaml     | 14 ++++++-------
 .../example/pubspec.yaml                      |  4 ++--
 .../stream_chat_localizations/pubspec.yaml    |  4 ++--
 .../example/pubspec.yaml                      |  4 ++--
 packages/stream_chat_persistence/pubspec.yaml | 14 ++++++-------
 11 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/stream_chat/example/pubspec.yaml b/packages/stream_chat/example/pubspec.yaml
index 16362f020..d16c8647d 100644
--- a/packages/stream_chat/example/pubspec.yaml
+++ b/packages/stream_chat/example/pubspec.yaml
@@ -5,8 +5,8 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   cupertino_icons: ^1.0.5
diff --git a/packages/stream_chat/lib/src/ws/timer_helper.dart b/packages/stream_chat/lib/src/ws/timer_helper.dart
index 0974ee80c..1478327cc 100644
--- a/packages/stream_chat/lib/src/ws/timer_helper.dart
+++ b/packages/stream_chat/lib/src/ws/timer_helper.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'package:uuid/uuid.dart';
 
 ///
-class TimerHelper {
+mixin class TimerHelper {
   final _uuid = const Uuid();
   late final _timers = <String, Timer>{};
 
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index e34a6cf3b..dabb769cf 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -6,19 +6,19 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  async: ^2.10.0
-  collection: ^1.17.0
+  async: ^2.11.0
+  collection: ^1.17.1
   dio: ^5.2.1+1
   equatable: ^2.0.5
-  freezed_annotation: ^2.2.0
+  freezed_annotation: ^2.4.1
   http_parser: ^4.0.2
   jose: ^0.3.3
   json_annotation: ^4.8.1
   logging: ^1.2.0
-  meta: ^1.8.0
+  meta: ^1.9.1
   mime: ^1.0.4
   rate_limiter: ^1.0.0
   rxdart: ^0.27.7
@@ -27,8 +27,8 @@ dependencies:
   web_socket_channel: ^2.4.0
 
 dev_dependencies:
-  build_runner: ^2.3.3
-  freezed: ^2.4.0
-  json_serializable: ^6.6.2
+  build_runner: ^2.4.6
+  freezed: ^2.4.1
+  json_serializable: ^6.7.1
   mocktail: ^1.0.0
-  test: ^1.24.3
+  test: ^1.24.4
diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index 075e8132f..9ec9351c2 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -4,8 +4,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   collection: ^1.15.0
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index e49a487fb..b7976a971 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -6,32 +6,32 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.19.0 <4.0.0"
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   cached_network_image: ^3.2.3
   chewie: ^1.7.0
-  collection: ^1.17.0
+  collection: ^1.17.1
   contextmenu: ^3.0.0
   dart_vlc: ^0.4.0
   desktop_drop: ^0.4.1
   diacritic: ^0.1.4
   dio: ^5.2.1+1
   ezanimation: ^0.6.0
-  file_picker: ^5.3.1
+  file_picker: ^5.3.2
   file_selector: ^1.0.0
   flutter:
     sdk: flutter
-  flutter_markdown: ^0.6.15
+  flutter_markdown: ^0.6.17
   flutter_portal: ^1.1.4
-  flutter_svg: ^2.0.5
+  flutter_svg: ^2.0.7
   http_parser: ^4.0.2
   image_gallery_saver: ^2.0.3
-  image_picker: ^1.0.0
+  image_picker: ^1.0.1
   jiffy: ^5.0.0
-  lottie: ^2.3.2
-  meta: ^1.8.0
+  lottie: ^2.4.0
+  meta: ^1.9.1
   path_provider: ^2.0.15
   photo_manager: ^2.6.0
   photo_view: ^0.14.0
@@ -41,7 +41,7 @@ dependencies:
   stream_chat_flutter_core: ^6.7.0
   synchronized: ^3.1.0
   thumblr: ^0.0.4
-  url_launcher: ^6.1.11
+  url_launcher: ^6.1.12
   video_player: ^2.7.0
   video_player_macos: ^2.0.1
   video_thumbnail: ^0.5.3
diff --git a/packages/stream_chat_flutter_core/example/pubspec.yaml b/packages/stream_chat_flutter_core/example/pubspec.yaml
index c92a4fc6f..4a45b71eb 100644
--- a/packages/stream_chat_flutter_core/example/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/example/pubspec.yaml
@@ -4,8 +4,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   cupertino_icons: ^1.0.3
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index 4f9e09842..664544200 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -6,24 +6,24 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.19.0 <4.0.0"
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
-  collection: ^1.17.0
+  collection: ^1.17.1
   connectivity_plus: ^4.0.1
   flutter:
     sdk: flutter
-  freezed_annotation: ^2.2.0
-  meta: ^1.8.0
+  freezed_annotation: ^2.4.1
+  meta: ^1.9.1
   rxdart: ^0.27.7
   stream_chat: ^6.7.0
 
 dev_dependencies:
-  build_runner: ^2.3.3
+  build_runner: ^2.4.6
   fake_async: ^1.3.1
   flutter_test:
     sdk: flutter
-  freezed: ^2.4.0
+  freezed: ^2.4.1
   mocktail: ^1.0.0
 
diff --git a/packages/stream_chat_localizations/example/pubspec.yaml b/packages/stream_chat_localizations/example/pubspec.yaml
index c23b28b1d..f3e11a290 100644
--- a/packages/stream_chat_localizations/example/pubspec.yaml
+++ b/packages/stream_chat_localizations/example/pubspec.yaml
@@ -5,8 +5,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   cupertino_icons: ^1.0.3
diff --git a/packages/stream_chat_localizations/pubspec.yaml b/packages/stream_chat_localizations/pubspec.yaml
index a5c3abdcb..b1dbf0367 100644
--- a/packages/stream_chat_localizations/pubspec.yaml
+++ b/packages/stream_chat_localizations/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.19.0 <4.0.0"
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   flutter:
diff --git a/packages/stream_chat_persistence/example/pubspec.yaml b/packages/stream_chat_persistence/example/pubspec.yaml
index f67961aa5..c384f1c8e 100644
--- a/packages/stream_chat_persistence/example/pubspec.yaml
+++ b/packages/stream_chat_persistence/example/pubspec.yaml
@@ -4,8 +4,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   cupertino_icons: ^1.0.3
diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
index 123303ba9..70fb2041a 100644
--- a/packages/stream_chat_persistence/pubspec.yaml
+++ b/packages/stream_chat_persistence/pubspec.yaml
@@ -6,23 +6,23 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.19.0 <4.0.0"
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
-  drift: ^2.8.0
+  drift: ^2.9.0
   flutter:
     sdk: flutter
   logging: ^1.2.0
-  meta: ^1.8.0
-  path: ^1.8.2
+  meta: ^1.9.1
+  path: ^1.8.3
   path_provider: ^2.0.15
   sqlite3_flutter_libs: ^0.5.15
   stream_chat: ^6.7.0
 
 dev_dependencies:
-  build_runner: ^2.3.3
-  drift_dev: ^2.8.3
+  build_runner: ^2.4.6
+  drift_dev: ^2.9.0
   flutter_test:
     sdk: flutter
   mocktail: ^1.0.0

From 7adc99fecb982cd8ba1fa37ab97db76cdd966f08 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Mon, 19 Jun 2023 15:53:34 +0530
Subject: [PATCH 02/12] feat(ui): add support for
 `StreamMessageInput.contentInsertionConfiguration`.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
(cherry picked from commit bdc85b48730475ff3f9f5b5c36405ea373705812)
---
 .../lib/src/message_input/stream_message_input.dart       | 6 ++++++
 .../lib/src/message_input/stream_message_text_field.dart  | 8 ++++++++
 2 files changed, 14 insertions(+)

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
index f33bbf6ac..227a5192c 100644
--- 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
@@ -147,6 +147,7 @@ class StreamMessageInput extends StatefulWidget {
         _defaultClearQuotedMessageKeyPredicate,
     this.ogPreviewFilter = _defaultOgPreviewFilter,
     this.hintGetter = _defaultHintGetter,
+    this.contentInsertionConfiguration,
   });
 
   /// The predicate used to send a message on desktop/web
@@ -340,6 +341,9 @@ class StreamMessageInput extends StatefulWidget {
   /// Returns the hint text for the message input.
   final HintGetter hintGetter;
 
+  /// {@macro flutter.widgets.editableText.contentInsertionConfiguration}
+  final ContentInsertionConfiguration? contentInsertionConfiguration;
+
   static String? _defaultHintGetter(
     BuildContext context,
     HintType type,
@@ -905,6 +909,8 @@ class StreamMessageInputState extends State<StreamMessageInput>
                         decoration: _getInputDecoration(context),
                         textCapitalization: widget.textCapitalization,
                         autocorrect: widget.autoCorrect,
+                        contentInsertionConfiguration:
+                            widget.contentInsertionConfiguration,
                       ),
                     ),
                   ),
diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart
index a04ab829d..292c9141f 100644
--- a/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart
@@ -120,6 +120,7 @@ class StreamMessageTextField extends StatefulWidget {
     this.restorationId,
     this.scribbleEnabled = true,
     this.enableIMEPersonalizedLearning = true,
+    this.contentInsertionConfiguration,
   })  : assert(obscuringCharacter.length == 1, ''),
         smartDashesType = smartDashesType ??
             (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
@@ -526,6 +527,9 @@ class StreamMessageTextField extends StatefulWidget {
   /// {@macro flutter.services.TextInputConfiguration.enableIMEPersonalizedLearning}
   final bool enableIMEPersonalizedLearning;
 
+  /// {@macro flutter.widgets.editableText.contentInsertionConfiguration}
+  final ContentInsertionConfiguration? contentInsertionConfiguration;
+
   @override
   _StreamMessageTextFieldState createState() => _StreamMessageTextFieldState();
 
@@ -622,6 +626,9 @@ class StreamMessageTextField extends StatefulWidget {
     properties.add(DiagnosticsProperty<bool>(
         'enableIMEPersonalizedLearning', enableIMEPersonalizedLearning,
         defaultValue: true));
+    properties.add(DiagnosticsProperty<ContentInsertionConfiguration>(
+        'contentInsertionConfiguration', contentInsertionConfiguration,
+        defaultValue: null));
   }
 }
 
@@ -727,6 +734,7 @@ class _StreamMessageTextFieldState extends State<StreamMessageTextField>
         restorationId: widget.restorationId,
         scribbleEnabled: widget.scribbleEnabled,
         enableIMEPersonalizedLearning: widget.enableIMEPersonalizedLearning,
+        contentInsertionConfiguration: widget.contentInsertionConfiguration,
       );
 
   @override

From 4f6fbe994dc92baf5eac03ffd847d98018ebd22e Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 22 Jun 2023 13:37:58 +0530
Subject: [PATCH 03/12] chore(ui): bump jiffy to v6.2.1

Signed-off-by: xsahil03x <xdsahil@gmail.com>

(cherry picked from commit 79faac57e5761296f0bf93719a57985758db9629)
Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .../lib/src/channel/channel_info.dart         |  3 ++-
 .../lib/src/channel/channel_preview.dart      |  6 ++---
 .../lib/src/localization/translations.dart    |  8 ++++---
 .../message_list_view/message_list_view.dart  | 22 +++++++++++++------
 .../lib/src/message_widget/bottom_row.dart    |  2 +-
 .../lib/src/misc/date_divider.dart            | 12 +++++-----
 .../stream_channel_list_tile.dart             |  6 ++---
 .../stream_message_search_list_tile.dart      |  4 ++--
 .../stream_user_list_tile.dart                |  3 ++-
 .../lib/src/stream_chat.dart                  |  4 ++--
 .../lib/src/user/user_item.dart               |  3 ++-
 packages/stream_chat_flutter/pubspec.yaml     |  2 +-
 12 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
index 5c32d2789..abab5ad93 100644
--- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
+++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
@@ -106,9 +106,10 @@ class _ConnectedTitleState extends StatelessWidget {
             style: textStyle,
           );
         } else {
+          final lastActive = otherMember.user?.lastActive ?? DateTime.now();
           alternativeWidget = Text(
             '${context.translations.userLastOnlineText} '
-            '${Jiffy(otherMember.user?.lastActive).fromNow()}',
+            '${Jiffy.parseFromDateTime(lastActive).fromNow()}',
             style: textStyle,
           );
         }
diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart
index ae6247ea2..f64b9dc95 100644
--- a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart
+++ b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart
@@ -349,16 +349,16 @@ class _Date extends StatelessWidget {
 
         if (lastMessageAt.millisecondsSinceEpoch >=
             startOfDay.millisecondsSinceEpoch) {
-          stringDate = Jiffy(lastMessageAt.toLocal()).jm;
+          stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm;
         } else if (lastMessageAt.millisecondsSinceEpoch >=
             startOfDay
                 .subtract(const Duration(days: 1))
                 .millisecondsSinceEpoch) {
           stringDate = context.translations.yesterdayLabel;
         } else if (startOfDay.difference(lastMessageAt).inDays < 7) {
-          stringDate = Jiffy(lastMessageAt.toLocal()).EEEE;
+          stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE;
         } else {
-          stringDate = Jiffy(lastMessageAt.toLocal()).yMd;
+          stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd;
         }
 
         return Text(
diff --git a/packages/stream_chat_flutter/lib/src/localization/translations.dart b/packages/stream_chat_flutter/lib/src/localization/translations.dart
index 61c3441a2..9863fbbcf 100644
--- a/packages/stream_chat_flutter/lib/src/localization/translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/translations.dart
@@ -611,13 +611,15 @@ class DefaultTranslations implements Translations {
     } else if (date == yesterday) {
       return 'yesterday';
     } else {
-      return 'on ${Jiffy(date).MMMd}';
+      return 'on ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Sent ${_getDay(date)} at ${atTime.format(pattern: 'HH:mm')}';
+  }
 
   @override
   String get todayLabel => 'Today';
diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
index 5a5075f88..f9de17876 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
@@ -669,14 +669,20 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
                     final isPartOfThread = message.replyCount! > 0 ||
                         message.showInChannel == true;
 
-                    final createdAt = message.createdAt.toLocal();
-                    final nextCreatedAt = nextMessage.createdAt.toLocal();
-                    if (!Jiffy(createdAt).isSame(nextCreatedAt, Units.DAY)) {
+                    final createdAt = Jiffy.parseFromDateTime(
+                      message.createdAt.toLocal(),
+                    );
+
+                    final nextCreatedAt = Jiffy.parseFromDateTime(
+                      nextMessage.createdAt.toLocal(),
+                    );
+
+                    if (!createdAt.isSame(nextCreatedAt, unit: Unit.day)) {
                       separator = _buildDateDivider(nextMessage);
                     } else {
-                      final hasTimeDiff = !Jiffy(createdAt).isSame(
+                      final hasTimeDiff = !createdAt.isSame(
                         nextCreatedAt,
-                        Units.MINUTE,
+                        unit: Unit.minute,
                       );
 
                       final isNextUserSame =
@@ -1071,10 +1077,12 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
 
     var hasTimeDiff = false;
     if (nextMessage != null) {
-      hasTimeDiff = !Jiffy(message.createdAt.toLocal()).isSame(
+      final createdAt = Jiffy.parseFromDateTime(message.createdAt.toLocal());
+      final nextCreatedAt = Jiffy.parseFromDateTime(
         nextMessage.createdAt.toLocal(),
-        Units.MINUTE,
       );
+
+      hasTimeDiff = !createdAt.isSame(nextCreatedAt, unit: Unit.minute);
     }
 
     final hasFileAttachment =
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
index 5ca2462a5..7092dadf5 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
@@ -191,7 +191,7 @@ class BottomRow extends StatelessWidget {
             ),
       if (showTimeStamp)
         Text(
-          Jiffy(message.createdAt.toLocal()).jm,
+          Jiffy.parseFromDateTime(message.createdAt.toLocal()).jm,
           style: messageTheme.createdAtStyle,
         ),
       if (showSendingIndicator)
diff --git a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
index 24af4f3f2..24c0c9a73 100644
--- a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
+++ b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
@@ -20,17 +20,17 @@ class StreamDateDivider extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final createdAt = Jiffy(dateTime);
-    final now = Jiffy(DateTime.now());
+    final createdAt = Jiffy.parseFromDateTime(dateTime);
+    final now = Jiffy.parseFromDateTime(DateTime.now());
 
     var dayInfo = createdAt.MMMd;
-    if (createdAt.isSame(now, Units.DAY)) {
+    if (createdAt.isSame(now, unit: Unit.day)) {
       dayInfo = context.translations.todayLabel;
-    } else if (createdAt.isSame(now.subtract(days: 1), Units.DAY)) {
+    } else if (createdAt.isSame(now.subtract(days: 1), unit: Unit.day)) {
       dayInfo = context.translations.yesterdayLabel;
-    } else if (createdAt.isAfter(now.subtract(days: 7), Units.DAY)) {
+    } else if (createdAt.isAfter(now.subtract(days: 7), unit: Unit.day)) {
       dayInfo = createdAt.EEEE;
-    } else if (createdAt.isAfter(now.subtract(years: 1), Units.DAY)) {
+    } else if (createdAt.isAfter(now.subtract(years: 1), unit: Unit.day)) {
       dayInfo = createdAt.MMMd;
     }
 
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart
index 39951d53a..b1b165ba2 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart
@@ -287,16 +287,16 @@ class ChannelLastMessageDate extends StatelessWidget {
 
           if (lastMessageAt.millisecondsSinceEpoch >=
               startOfDay.millisecondsSinceEpoch) {
-            stringDate = Jiffy(lastMessageAt.toLocal()).jm;
+            stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm;
           } else if (lastMessageAt.millisecondsSinceEpoch >=
               startOfDay
                   .subtract(const Duration(days: 1))
                   .millisecondsSinceEpoch) {
             stringDate = context.translations.yesterdayLabel;
           } else if (startOfDay.difference(lastMessageAt).inDays < 7) {
-            stringDate = Jiffy(lastMessageAt.toLocal()).EEEE;
+            stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE;
           } else {
-            stringDate = Jiffy(lastMessageAt.toLocal()).yMd;
+            stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd;
           }
 
           return Text(
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
index 5aab3b2d4..3eb03aec1 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
@@ -227,9 +227,9 @@ class MessageSearchTileMessageDate extends StatelessWidget {
     if (now.year != createdAt.year ||
         now.month != createdAt.month ||
         now.day != createdAt.day) {
-      stringDate = Jiffy(createdAt.toLocal()).yMd;
+      stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).yMd;
     } else {
-      stringDate = Jiffy(createdAt.toLocal()).jm;
+      stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).jm;
     }
 
     return Text(
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
index 5ee49dccb..1b0251f6a 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
@@ -176,11 +176,12 @@ class UserLastActive extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final chatTheme = StreamChatTheme.of(context);
+    final lastActive = user.lastActive ?? DateTime.now();
     return Text(
       user.online
           ? context.translations.userOnlineText
           : '${context.translations.userLastOnlineText} '
-              '${Jiffy(user.lastActive).fromNow()}',
+              '${Jiffy.parseFromDateTime(lastActive).fromNow()}',
       style: chatTheme.textTheme.footnote.copyWith(
         color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5),
       ),
diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart
index 73a0d0a0a..6b0d0e609 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart
@@ -165,9 +165,9 @@ class StreamChatState extends State<StreamChat> {
   @override
   void didChangeDependencies() {
     final currentLocale = Localizations.localeOf(context).toString();
-    final availableLocales = Jiffy.getAllAvailableLocales();
+    final availableLocales = Jiffy.getSupportedLocales();
     if (availableLocales.contains(currentLocale)) {
-      Jiffy.locale(currentLocale);
+      Jiffy.setLocale(currentLocale);
     }
     super.didChangeDependencies();
   }
diff --git a/packages/stream_chat_flutter/lib/src/user/user_item.dart b/packages/stream_chat_flutter/lib/src/user/user_item.dart
index 019322d9b..0c13d95ec 100644
--- a/packages/stream_chat_flutter/lib/src/user/user_item.dart
+++ b/packages/stream_chat_flutter/lib/src/user/user_item.dart
@@ -74,11 +74,12 @@ class StreamUserItem extends StatelessWidget {
 
   Widget _buildLastActive(BuildContext context) {
     final chatTheme = StreamChatTheme.of(context);
+    final lastActive = user.lastActive ?? DateTime.now();
     return Text(
       user.online
           ? context.translations.userOnlineText
           : '${context.translations.userLastOnlineText} '
-              '${Jiffy(user.lastActive).fromNow()}',
+              '${Jiffy.parseFromDateTime(lastActive).fromNow()}',
       style: chatTheme.textTheme.footnote.copyWith(
         color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5),
       ),
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index b7976a971..eec72981a 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -29,7 +29,7 @@ dependencies:
   http_parser: ^4.0.2
   image_gallery_saver: ^2.0.3
   image_picker: ^1.0.1
-  jiffy: ^5.0.0
+  jiffy: ^6.2.1
   lottie: ^2.4.0
   meta: ^1.9.1
   path_provider: ^2.0.15

From 015628bd7bad70ed6687a4b42f1cb4f2d23634bb Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 22 Jun 2023 14:12:29 +0530
Subject: [PATCH 04/12] chore(localization): bump stream_chat_flutter

Signed-off-by: xsahil03x <xdsahil@gmail.com>
(cherry picked from commit 677b71e728b095e6f2088aa1a694846c26bcdb7e)
---
 .../example/lib/add_new_lang.dart                         | 8 +++++---
 .../lib/src/stream_chat_localizations_ca.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_de.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_en.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_es.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_fr.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_hi.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_it.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_ja.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_ko.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_no.dart             | 8 +++++---
 .../lib/src/stream_chat_localizations_pt.dart             | 8 +++++---
 12 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/packages/stream_chat_localizations/example/lib/add_new_lang.dart b/packages/stream_chat_localizations/example/lib/add_new_lang.dart
index bab8101b8..e1d1335ac 100644
--- a/packages/stream_chat_localizations/example/lib/add_new_lang.dart
+++ b/packages/stream_chat_localizations/example/lib/add_new_lang.dart
@@ -270,13 +270,15 @@ class NnStreamChatLocalizations extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'yesterday';
     } else {
-      return 'on ${Jiffy(date).MMMd}';
+      return 'on ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Sent ${_getDay(date)} at ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'Today';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
index 3c471e051..ed2d3d7ed 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
@@ -249,13 +249,15 @@ class StreamChatLocalizationsCa extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'ahir';
     } else {
-      return 'el ${Jiffy(date).MMMd}';
+      return 'el ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      '''Enviat el ${_getDay(date)} a les ${Jiffy(time.toLocal()).format('HH:mm')}''';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Enviat el ${_getDay(date)} a les ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'Avui';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
index df2a7766b..fe95f0f7f 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
@@ -239,13 +239,15 @@ class StreamChatLocalizationsDe extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'Gestern';
     } else {
-      return 'am ${Jiffy(date).MMMd}';
+      return 'am ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      'Gesendet ${_getDay(date)} am ${Jiffy(time.toLocal()).format('HH:mm')}';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Gesendet ${_getDay(date)} am ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'Heute';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
index c55bbf49d..a744ff2ae 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
@@ -246,13 +246,15 @@ class StreamChatLocalizationsEn extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'yesterday';
     } else {
-      return 'on ${Jiffy(date).MMMd}';
+      return 'on ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Sent ${_getDay(date)} at ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'Today';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
index 107e26166..2d75b1028 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
@@ -250,13 +250,15 @@ class StreamChatLocalizationsEs extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'ayer';
     } else {
-      return 'el ${Jiffy(date).MMMd}';
+      return 'el ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      '''Enviado el ${_getDay(date)} a las ${Jiffy(time.toLocal()).format('HH:mm')}''';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Enviado el ${_getDay(date)} a las ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'Hoy';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
index 8b501184e..6a474b8a6 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
@@ -249,13 +249,15 @@ class StreamChatLocalizationsFr extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'hier';
     } else {
-      return 'le ${Jiffy(date).MMMd}';
+      return 'le ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      'Envoyé ${_getDay(date)} à ${Jiffy(time.toLocal()).format('HH:mm')}';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Envoyé ${_getDay(date)} à ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => "Aujourd'hui";
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
index 4f27717a7..4e056ab22 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
@@ -243,13 +243,15 @@ class StreamChatLocalizationsHi extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'कल';
     } else {
-      return '${Jiffy(date).MMMd} को';
+      return '${Jiffy.parseFromDateTime(date).MMMd} को';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      '${_getDay(date)} ${Jiffy(time.toLocal()).format('HH:mm')} बजे भेजा गया';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return '${_getDay(date)} ${atTime.jm} बजे भेजा गया';
+  }
 
   @override
   String get todayLabel => 'आज';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
index b407629d1..51a808972 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
@@ -252,13 +252,15 @@ Il file è troppo grande per essere caricato. Il limite è di $limitInMB MB.''';
     } else if (date == yesterday) {
       return 'ieri';
     } else {
-      return 'il ${Jiffy(date).MMMd}';
+      return 'il ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      "Inviato ${_getDay(date)} alle ${Jiffy(time.toLocal()).format('HH:mm')}";
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Inviato ${_getDay(date)} alle ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'Oggi';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
index 26a5e8b3e..17285f6aa 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
@@ -236,13 +236,15 @@ class StreamChatLocalizationsJa extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return '昨日';
     } else {
-      return '${Jiffy(date).MMMd}に';
+      return '${Jiffy.parseFromDateTime(date).MMMd}に';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      '${_getDay(date)}の${Jiffy(time.toLocal()).format('HH:mm')}に送信しました ';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return '${_getDay(date)}の${atTime.jm}に送信しました ';
+  }
 
   @override
   String get todayLabel => '今日';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
index 7b907584e..acf1f79f9 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
@@ -235,13 +235,15 @@ class StreamChatLocalizationsKo extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return '어제';
     } else {
-      return '${Jiffy(date).MMMd}에';
+      return '${Jiffy.parseFromDateTime(date).MMMd}에';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      '${_getDay(date)} ${Jiffy(time.toLocal()).format('HH:mm')}에 보냈습니다';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return '${_getDay(date)} ${atTime.jm}에 보냈습니다';
+  }
 
   @override
   String get todayLabel => '오늘';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index 88350979e..8a6c4db31 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -242,13 +242,15 @@ class StreamChatLocalizationsNo extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'i går';
     } else {
-      return 'på ${Jiffy(date).MMMd}';
+      return 'på ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      'Sent ${_getDay(date)} kl. ${Jiffy(time.toLocal()).format('HH:mm')}';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Sent ${_getDay(date)} kl. ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'I dag';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
index 874eb1189..f359808b2 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
@@ -244,13 +244,15 @@ class StreamChatLocalizationsPt extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'Ontem';
     } else {
-      return 'o ${Jiffy(date).MMMd}';
+      return 'o ${Jiffy.parseFromDateTime(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) =>
-      '''Enviado ${_getDay(date)} às ${Jiffy(time.toLocal()).format('HH:mm')}''';
+  String sentAtText({required DateTime date, required DateTime time}) {
+    final atTime = Jiffy.parseFromDateTime(time.toLocal());
+    return 'Enviado ${_getDay(date)} às ${atTime.jm}';
+  }
 
   @override
   String get todayLabel => 'Hoje';

From 5e8c8602a9ec4409a2fd0f64a4522be39ae092bf Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 22 Jun 2023 14:18:41 +0530
Subject: [PATCH 05/12] chore: minor change.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
(cherry picked from commit d1ce69d539f10207d6e14c62c6b56df096e0ad19)
---
 .../stream_chat_flutter/lib/src/localization/translations.dart  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stream_chat_flutter/lib/src/localization/translations.dart b/packages/stream_chat_flutter/lib/src/localization/translations.dart
index 9863fbbcf..e6bb87d97 100644
--- a/packages/stream_chat_flutter/lib/src/localization/translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/translations.dart
@@ -618,7 +618,7 @@ class DefaultTranslations implements Translations {
   @override
   String sentAtText({required DateTime date, required DateTime time}) {
     final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Sent ${_getDay(date)} at ${atTime.format(pattern: 'HH:mm')}';
+    return 'Sent ${_getDay(date)} at ${atTime.jm}';
   }
 
   @override

From b34f725ff19eabe4aa195c026b199ddcf16051ae Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 13 Jul 2023 14:10:28 +0530
Subject: [PATCH 06/12] chore: migrate loadBuffer to loadImage.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .../photo_gallery/stream_photo_gallery_tile.dart          | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart
index 2f03613c8..b93686d0b 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart
@@ -202,10 +202,9 @@ class MediaThumbnailProvider extends ImageProvider<MediaThumbnailProvider> {
   }
 
   @override
-  @Deprecated('Will get replaced by loadImage in the next major version.')
-  ImageStreamCompleter loadBuffer(
+  ImageStreamCompleter loadImage(
     MediaThumbnailProvider key,
-    DecoderBufferCallback decode,
+    ImageDecoderCallback decode,
   ) {
     return MultiFrameImageStreamCompleter(
       codec: _loadAsync(key, decode),
@@ -220,10 +219,9 @@ class MediaThumbnailProvider extends ImageProvider<MediaThumbnailProvider> {
     );
   }
 
-  @Deprecated('Will get replaced by loadImage in the next major version.')
   Future<ui.Codec> _loadAsync(
     MediaThumbnailProvider key,
-    DecoderBufferCallback decode,
+    ImageDecoderCallback decode,
   ) async {
     assert(key == this, '$key is not $this');
     final bytes = await media.thumbnailDataWithSize(

From d684e74b8c9649abe21ae5bb44730dcaf76c605b Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 17 Aug 2023 13:54:38 +0530
Subject: [PATCH 07/12] chore(ui): fix lint.

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 .../lib/src/message_widget/bottom_row.dart             | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
index 7092dadf5..83a40a4d5 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
@@ -162,8 +162,7 @@ class BottomRow extends StatelessWidget {
       msg = context.translations.threadReplyCountText(replyCount);
     }
 
-    // ignore: prefer_function_declarations_over_variables
-    final _onThreadTap = () async {
+    Future<void> _onThreadTap() async {
       try {
         var message = this.message;
         if (showInChannel) {
@@ -172,12 +171,9 @@ class BottomRow extends StatelessWidget {
         }
         return onThreadTap!(message);
       } catch (e, stk) {
-        print(e);
-        print(stk);
-        // ignore: avoid_returning_null_for_void
-        return null;
+        debugPrint('Error while fetching message: $e, $stk');
       }
-    };
+    }
 
     const usernameKey = Key('username');
 

From 7c495ad52070c52332b8ec074d64832d183b8e20 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 17 Aug 2023 14:04:55 +0530
Subject: [PATCH 08/12] chore(llc, core, persistence, ui, localization): bump
 dependencies, update CHANGELOG.md

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 packages/stream_chat/CHANGELOG.md             |   4 +
 packages/stream_chat/pubspec.yaml             |   8 +-
 packages/stream_chat_flutter/CHANGELOG.md     | 201 ++++++++++++------
 packages/stream_chat_flutter/pubspec.yaml     |  18 +-
 .../stream_chat_flutter_core/CHANGELOG.md     |   5 +
 .../stream_chat_flutter_core/pubspec.yaml     |   2 +-
 .../stream_chat_localizations/CHANGELOG.md    |   5 +
 packages/stream_chat_persistence/CHANGELOG.md |   5 +
 packages/stream_chat_persistence/pubspec.yaml |   6 +-
 pubspec.yaml                                  |   2 +-
 10 files changed, 178 insertions(+), 78 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 01105cdcb..0327bbc65 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -9,6 +9,10 @@
 - Added support for `channel.countUnreadMentions()` to get the count of unread messages mentioning the current user on a
   channel. [#1692](https://github.com/GetStream/stream-chat-flutter/issues/1692)
 
+🔄 Changed
+
+- Updated minimum supported `SDK` version to Dart 3.0
+
 ## 6.7.0
 
 ✅ Added
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index dabb769cf..109483fa8 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -11,11 +11,11 @@ environment:
 dependencies:
   async: ^2.11.0
   collection: ^1.17.1
-  dio: ^5.2.1+1
+  dio: ^5.3.2
   equatable: ^2.0.5
   freezed_annotation: ^2.4.1
   http_parser: ^4.0.2
-  jose: ^0.3.3
+  jose: ^0.3.4
   json_annotation: ^4.8.1
   logging: ^1.2.0
   meta: ^1.9.1
@@ -28,7 +28,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.4.6
-  freezed: ^2.4.1
+  freezed: ^2.4.2
   json_serializable: ^6.7.1
   mocktail: ^1.0.0
-  test: ^1.24.4
+  test: ^1.24.6
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 5d7b5e2e1..4c2c0eb67 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -11,6 +11,27 @@
 
 - Added support for listening error events in AttachmentPickerBottomSheet.
 - Added support for overriding the `MessageWidget.onReactionTap` callback.
+- Added support for `StreamMessageInput.contentInsertionConfiguration` to specify the content insertion configuration.
+  [#1613](https://github.com/GetStream/stream-chat-flutter/issues/1613)
+
+  ```dart
+  StreamMessageInput(
+    ...,
+    contentInsertionConfiguration: ContentInsertionConfiguration(
+      onContentInserted: (content) {
+        // Do something with the content.
+        controller.addAttachment(...);
+      },
+    ),
+  )
+  ```
+
+🔄 Changed
+
+- Updated minimum supported `SDK` version to Flutter 3.10/Dart 3.0
+- Updated `stream_chat_flutter_core` dependency
+  to [`6.7.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
+- Updated jiffy dependency to ^6.2.1.
 
 ## 6.8.1
 
@@ -42,43 +63,57 @@
 
 🐞 Fixed
 
-- [[#1620]](https://github.com/GetStream/stream-chat-flutter/issues/1620) Fixed messages Are Not Hard Deleting even
+- [[#1620]](https://github.com/GetStream/stream-chat-flutter/issues/1620) Fixed messages Are Not
+  Hard Deleting even
   after overriding the `onConfirmDeleteTap` callback.
-- [[#1621]](https://github.com/GetStream/stream-chat-flutter/issues/1621) Fixed `createdAtStyle` null check error
+- [[#1621]](https://github.com/GetStream/stream-chat-flutter/issues/1621) Fixed `createdAtStyle`
+  null check error
   in `SendingIndicatorBuilder`.
-- [[#1069]](https://github.com/GetStream/stream-chat-flutter/issues/1069) Fixed message swipe to reply using same
-  direction for both current user and other users. It now uses `SwipeDirection.startToEnd` for current user
+- [[#1069]](https://github.com/GetStream/stream-chat-flutter/issues/1069) Fixed message swipe to
+  reply using same
+  direction for both current user and other users. It now uses `SwipeDirection.startToEnd` for
+  current user
   and `SwipeDirection.endToStart` for other users.
 - [[#1590]](https://github.com/GetStream/stream-chat-flutter/issues/1590)
-  Fixed `StreamMessageWidget.showReactionPickerIndicator` not toggling the reaction picker indicator visibility.
-- [[#1639]](https://github.com/GetStream/stream-chat-flutter/issues/1639) Fixed attachments not showing in gallery view
+  Fixed `StreamMessageWidget.showReactionPickerIndicator` not toggling the reaction picker indicator
+  visibility.
+- [[#1639]](https://github.com/GetStream/stream-chat-flutter/issues/1639) Fixed attachments not
+  showing in gallery view
   even after saving them to the device.
   > **Note**
-  > This fix depends on the [image_gallery_saver](https://pub.dev/packages/image_gallery_saver) plugin. Make sure to add
+  > This fix depends on the [image_gallery_saver](https://pub.dev/packages/image_gallery_saver)
+  plugin. Make sure to add
   necessary permissions in your App as per the plugin documentation.
-- [[#1642]](https://github.com/GetStream/stream-chat-flutter/issues/1642) Fixed `StreamMessageWidget.widthFactor` not
+- [[#1642]](https://github.com/GetStream/stream-chat-flutter/issues/1642)
+  Fixed `StreamMessageWidget.widthFactor` not
   working on web and desktop platforms.
 
 ✅ Added
 
-- Added support for customizing attachments in `StreamMessageInput`. Use various properties mentioned
+- Added support for customizing attachments in `StreamMessageInput`. Use various properties
+  mentioned
   below. [#1511](https://github.com/GetStream/stream-chat-flutter/issues/1511)
     * `StreamMessageInput.attachmentListBuilder` to customize the attachment list.
     * `StreamMessageInput.fileAttachmentListBuilder` to customize the file attachment list.
-    * `StreamMessageInput.mediaAttachmentListBuilder` to customize the media attachment list. Includes images, videos
+    * `StreamMessageInput.mediaAttachmentListBuilder` to customize the media attachment list.
+      Includes images, videos
       and gifs.
-    * `StreamMessageInput.fileAttachmentBuilder` to customize the file attachment item shown in `FileAttachmentList`.
+    * `StreamMessageInput.fileAttachmentBuilder` to customize the file attachment item shown
+      in `FileAttachmentList`.
     * `StreamMessageInput.mediaAttachmentBuilder` to customize the media attachment item shown in
       `MediaAttachmentList`.
 
 
-- Added `StreamMessageInput.quotedMessageAttachmentThumbnailBuilders` to customize the thumbnail builders for quoted
+- Added `StreamMessageInput.quotedMessageAttachmentThumbnailBuilders` to customize the thumbnail
+  builders for quoted
   message attachments.
 
 🔄 Changed
 
-- Deprecated `StreamMessageInput.attachmentThumbnailBuilders` in favor of `StreamMessageInput.mediaAttachmentBuilder`.
-- Deprecated `StreamMessageListView.onMessageSwiped`. Try wrapping the `MessageWidget` with a `Swipeable`, `Dismissible`
+- Deprecated `StreamMessageInput.attachmentThumbnailBuilders` in favor
+  of `StreamMessageInput.mediaAttachmentBuilder`.
+- Deprecated `StreamMessageListView.onMessageSwiped`. Try wrapping the `MessageWidget` with
+  a `Swipeable`, `Dismissible`
   or a custom widget to achieve the swipe to reply behaviour.
 
   ```dart
@@ -126,7 +161,8 @@
     },
   )
   ```
-- Deprecated `StreamMessageWidget.showReactionPickerIndicator` in favor of `StreamMessageWidget.showReactionPicker`.
+- Deprecated `StreamMessageWidget.showReactionPickerIndicator` in favor
+  of `StreamMessageWidget.showReactionPicker`.
 
   ```diff
   StreamMessageWidget(
@@ -143,16 +179,20 @@
 
 🐞 Fixed
 
-- [[#1600]](https://github.com/GetStream/stream-chat-flutter/issues/1600) Fixed type `ImageDecoderCallback` not found
+- [[#1600]](https://github.com/GetStream/stream-chat-flutter/issues/1600) Fixed
+  type `ImageDecoderCallback` not found
   error on pre-Flutter 3.10.0 versions.
-- [[#1605]](https://github.com/GetStream/stream-chat-flutter/issues/1605) Fixed Null exception is thrown on message list
+- [[#1605]](https://github.com/GetStream/stream-chat-flutter/issues/1605) Fixed Null exception is
+  thrown on message list
   for unread messages when `ScrollToBottomButton` is pressed.
-- [[#1615]](https://github.com/GetStream/stream-chat-flutter/issues/1615) Fixed `StreamAttachmentPickerBottomSheet` not
+- [[#1615]](https://github.com/GetStream/stream-chat-flutter/issues/1615)
+  Fixed `StreamAttachmentPickerBottomSheet` not
   able to find the `StreamChatTheme` when used in nested MaterialApp.
 
 ✅ Added
 
-- Added support for `StreamMessageInput.allowedAttachmentPickerTypes` to specify the allowed attachment picker types.
+- Added support for `StreamMessageInput.allowedAttachmentPickerTypes` to specify the allowed
+  attachment picker types.
   [#1601](https://github.com/GetStream/stream-chat-flutter/issues/1376)
 
   ```dart
@@ -165,7 +205,8 @@
   )
   ```
 
-- Added support for `StreamMessageWidget.onConfirmDeleteTap` to override the default action on delete confirmation.
+- Added support for `StreamMessageWidget.onConfirmDeleteTap` to override the default action on
+  delete confirmation.
   [#1604](https://github.com/GetStream/stream-chat-flutter/issues/1604)
 
   ```dart
@@ -178,8 +219,10 @@
   )
   ```
 
-- Added support for `StreamMessageWidget.quotedMessageBuilder` and `StreamMessageInput.quotedMessageBuilder` to override
-  the default quoted message widget. [#1547](https://github.com/GetStream/stream-chat-flutter/issues/1547)
+- Added support for `StreamMessageWidget.quotedMessageBuilder`
+  and `StreamMessageInput.quotedMessageBuilder` to override
+  the default quoted message
+  widget. [#1547](https://github.com/GetStream/stream-chat-flutter/issues/1547)
 
   ```dart
   StreamMessageWidget(
@@ -193,7 +236,8 @@
   )
   ```
 
-- Added support for `StreamChannelAvatar.ownSpaceAvatarBuilder`, `StreamChannelAvatar.oneToOneAvatarBuilder` and
+- Added support
+  for `StreamChannelAvatar.ownSpaceAvatarBuilder`, `StreamChannelAvatar.oneToOneAvatarBuilder` and
   `StreamChannelAvatar.groupAvatarBuilder` to override the default avatar
   widget.[#1614](https://github.com/GetStream/stream-chat-flutter/issues/1614)
 
@@ -225,10 +269,13 @@
 
 🐞 Fixed
 
-- [[#1592]](https://github.com/GetStream/stream-chat-flutter/issues/1592) Fixed broken attachment download on web.
-- [[#1591]](https://github.com/GetStream/stream-chat-flutter/issues/1591) Fixed `StreamChannelInfoBottomSheet` not
+- [[#1592]](https://github.com/GetStream/stream-chat-flutter/issues/1592) Fixed broken attachment
+  download on web.
+- [[#1591]](https://github.com/GetStream/stream-chat-flutter/issues/1591)
+  Fixed `StreamChannelInfoBottomSheet` not
   rendering member list properly.
-- [[#1427]](https://github.com/GetStream/stream-chat-flutter/issues/1427) Fixed unable to load asset error for
+- [[#1427]](https://github.com/GetStream/stream-chat-flutter/issues/1427) Fixed unable to load asset
+  error for
   `packages/stream_chat_flutter/lib/svgs/video_call_icon.svg`.
 
 🔄 Changed
@@ -241,30 +288,40 @@
 
 - [[#1546]](https://github.com/GetStream/stream-chat-flutter/issues/1546)
   Fixed `StreamMessageInputTheme.linkHighlightColor` returning null for default theme.
-- [[#1548]](https://github.com/GetStream/stream-chat-flutter/issues/1548) Fixed `StreamMessageInput` urlRegex only
+- [[#1548]](https://github.com/GetStream/stream-chat-flutter/issues/1548) Fixed `StreamMessageInput`
+  urlRegex only
   matching the lowercase `http(s)|ftp`.
-- [[#1542]](https://github.com/GetStream/stream-chat-flutter/issues/1542) Handle error thrown in `StreamMessageInput`
+- [[#1542]](https://github.com/GetStream/stream-chat-flutter/issues/1542) Handle error thrown
+  in `StreamMessageInput`
   when unable to fetch a link preview.
-- [[#1540]](https://github.com/GetStream/stream-chat-flutter/issues/1540) Use `CircularProgressIndicator.adaptive`
+- [[#1540]](https://github.com/GetStream/stream-chat-flutter/issues/1540)
+  Use `CircularProgressIndicator.adaptive`
   instead of material indicator.
-- [[#1490]](https://github.com/GetStream/stream-chat-flutter/issues/1490) Fixed `editMessageInputBuilder` property not
+- [[#1490]](https://github.com/GetStream/stream-chat-flutter/issues/1490)
+  Fixed `editMessageInputBuilder` property not
   used in `MessageActionsModal.editMessage` option.
-- [[#1544]](https://github.com/GetStream/stream-chat-flutter/issues/1544) Fixed error thrown when unable to fetch
+- [[#1544]](https://github.com/GetStream/stream-chat-flutter/issues/1544) Fixed error thrown when
+  unable to fetch
   image/data in Message link preview.
-- [[#1482]](https://github.com/GetStream/stream-chat-flutter/issues/1482) Fixed `StreaChannelListTile` not showing
+- [[#1482]](https://github.com/GetStream/stream-chat-flutter/issues/1482)
+  Fixed `StreaChannelListTile` not showing
   unread indicator when `currentUser` is not present in the initial member list.
 - [[#1487]](https://github.com/GetStream/stream-chat-flutter/issues/1487) Use localized title
   for `WebOrDesktopAttachmentPickerOption` in `StreamMessageInput`.
-- [[#1250]](https://github.com/GetStream/stream-chat-flutter/issues/1250) Fixed bottomRow widgetSpans getting resized
+- [[#1250]](https://github.com/GetStream/stream-chat-flutter/issues/1250) Fixed bottomRow
+  widgetSpans getting resized
   twice when `textScaling` is enabled.
-- [[#1498]](https://github.com/GetStream/stream-chat-flutter/issues/1498) Fixed `MessageInput` autocomplete not working
+- [[#1498]](https://github.com/GetStream/stream-chat-flutter/issues/1498) Fixed `MessageInput`
+  autocomplete not working
   on non-mobile platforms.
-- [[#1576]](https://github.com/GetStream/stream-chat-flutter/issues/1576) Temporary fix for `StreamMessageListView`
+- [[#1576]](https://github.com/GetStream/stream-chat-flutter/issues/1576) Temporary fix
+  for `StreamMessageListView`
   getting broken when loaded at a particular message and a new message is added.
 
 ✅ Added
 
-- Added support for `StreamMessageThemeData.urlAttachmentTextMaxLine` to specify the `.maxLines` for the url attachment
+- Added support for `StreamMessageThemeData.urlAttachmentTextMaxLine` to specify the `.maxLines` for
+  the url attachment
   text. [#1543](https://github.com/GetStream/stream-chat-flutter/issues/1543)
 
 🔄 Changed
@@ -279,24 +336,33 @@
 
 🐞 Fixed
 
-- [[#1502]](https://github.com/GetStream/stream-chat-flutter/issues/1502) Fixed `isOnlyEmoji` method Detects Single
+- [[#1502]](https://github.com/GetStream/stream-chat-flutter/issues/1502) Fixed `isOnlyEmoji` method
+  Detects Single
   Hangul
   Consonants as Emoji.
-- [[#1505]](https://github.com/GetStream/stream-chat-flutter/issues/1505) Fixed Message bubble disappears for Hangul
+- [[#1505]](https://github.com/GetStream/stream-chat-flutter/issues/1505) Fixed Message bubble
+  disappears for Hangul
   Consonants.
-- [[#1476]](https://github.com/GetStream/stream-chat-flutter/issues/1476) Fixed `UserAvatarTransform.userAvatarBuilder`
+- [[#1476]](https://github.com/GetStream/stream-chat-flutter/issues/1476)
+  Fixed `UserAvatarTransform.userAvatarBuilder`
   works only for otherUser.
-- [[#1490]](https://github.com/GetStream/stream-chat-flutter/issues/1490) Fixed `editMessageInputBuilder` property not
+- [[#1490]](https://github.com/GetStream/stream-chat-flutter/issues/1490)
+  Fixed `editMessageInputBuilder` property not
   used in message edit widget.
-- [[#1523]](https://github.com/GetStream/stream-chat-flutter/issues/1523) Fixed `StreamMessageThemeData` not being
+- [[#1523]](https://github.com/GetStream/stream-chat-flutter/issues/1523)
+  Fixed `StreamMessageThemeData` not being
   applied correctly.
-- [[#1525]](https://github.com/GetStream/stream-chat-flutter/issues/1525) Fixed `StreamQuotedMessageWidget` message for
+- [[#1525]](https://github.com/GetStream/stream-chat-flutter/issues/1525)
+  Fixed `StreamQuotedMessageWidget` message for
   deleted messages not being shown correctly.
-- [[#1529]](https://github.com/GetStream/stream-chat-flutter/issues/1529) Fixed `ClipboardData` requires non-nullable
+- [[#1529]](https://github.com/GetStream/stream-chat-flutter/issues/1529) Fixed `ClipboardData`
+  requires non-nullable
   string as text on Flutter 3.10.
-- [[#1533]](https://github.com/GetStream/stream-chat-flutter/issues/1533) Fixed `StreamMessageListView` messages grouped
+- [[#1533]](https://github.com/GetStream/stream-chat-flutter/issues/1533)
+  Fixed `StreamMessageListView` messages grouped
   incorrectly w.r.t. timestamp.
-- [[#1532]](https://github.com/GetStream/stream-chat-flutter/issues/1532) Fixed `StreamMessageWidget` actions dialog
+- [[#1532]](https://github.com/GetStream/stream-chat-flutter/issues/1532)
+  Fixed `StreamMessageWidget` actions dialog
   backdrop filter is cut off by safe area.
 
 ✅ Added
@@ -344,7 +410,8 @@
 🔄 Changed
 
 - Updated `dart` sdk environment range to support `3.0.0`.
-- Deprecated `MessageTheme.linkBackgroundColor` in favor of `MessageTheme.urlAttachmentBackgroundColor`.
+- Deprecated `MessageTheme.linkBackgroundColor` in favor
+  of `MessageTheme.urlAttachmentBackgroundColor`.
 - Updated `stream_chat_flutter_core` dependency
   to [`6.1.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
 
@@ -352,18 +419,23 @@
 
 🐞 Fixed
 
-- [[#1456]](https://github.com/GetStream/stream-chat-flutter/issues/1456) Fixed logic for showing that a message was
+- [[#1456]](https://github.com/GetStream/stream-chat-flutter/issues/1456) Fixed logic for showing
+  that a message was
   read using sending indicator.
-- [[#1462]](https://github.com/GetStream/stream-chat-flutter/issues/1462) Fixed support for iPad in the share button for
+- [[#1462]](https://github.com/GetStream/stream-chat-flutter/issues/1462) Fixed support for iPad in
+  the share button for
   images.
-- [[#1475]](https://github.com/GetStream/stream-chat-flutter/issues/1475) Fixed typo to fix compilation.
+- [[#1475]](https://github.com/GetStream/stream-chat-flutter/issues/1475) Fixed typo to fix
+  compilation.
 
 ✅ Added
 
-- Now it is possible to customize the max lines of the title of a url attachment. Before it was always 1 line.
+- Now it is possible to customize the max lines of the title of a url attachment. Before it was
+  always 1 line.
 - Added `attachmentActionsModalBuilder` parameter to `StreamMessageWidget` that allows to
   customize `AttachmentActionsModal`.
-- Added `StreamMessageInput.sendMessageKeyPredicate` and `StreamMessageInput.clearQuotedMessageKeyPredicate` to
+- Added `StreamMessageInput.sendMessageKeyPredicate`
+  and `StreamMessageInput.clearQuotedMessageKeyPredicate` to
   customize the keys used to send and clear the quoted message.
 
 🔄 Changed
@@ -372,7 +444,8 @@
 
 🚀 Improved
 
-- Improved draw of reaction options. [#1455](https://github.com/GetStream/stream-chat-flutter/pull/1455)
+- Improved draw of reaction
+  options. [#1455](https://github.com/GetStream/stream-chat-flutter/pull/1455)
 
 ## 5.3.0
 
@@ -382,7 +455,8 @@
 
 🐞 Fixed
 
-- [[#1424]](https://github.com/GetStream/stream-chat-flutter/issues/1424) Fixed a render issue when showing messages
+- [[#1424]](https://github.com/GetStream/stream-chat-flutter/issues/1424) Fixed a render issue when
+  showing messages
   starting with 4 whitespaces.
 - Fixed a bug where the `AttachmentPickerBottomSheet` was not able to identify the mobile browser.
 - Fixed uploading files on Windows - fixed temp file path.
@@ -395,7 +469,8 @@
 
 ✅ Added
 
-- Added a new `bottomRowBuilderWithDefaultWidget` parameter to `StreamMessageWidget` which contains a third parameter (
+- Added a new `bottomRowBuilderWithDefaultWidget` parameter to `StreamMessageWidget` which contains
+  a third parameter (
   default `BottomRow` widget with `copyWith` method available) to allow easier customization.
 
 🔄 Changed
@@ -405,18 +480,23 @@
 - Updated `connectivity_plus` dependency to `^3.0.2`
 - Updated `dart_vlc` dependency to `^0.4.0`
 - Updated `file_picker` dependency to `^5.2.4`
-- Deprecated `StreamMessageWidget.bottomRowBuilder` in favor of `StreamMessageWidget.bottomRowBuilderWithDefaultWidget`.
+- Deprecated `StreamMessageWidget.bottomRowBuilder` in favor
+  of `StreamMessageWidget.bottomRowBuilderWithDefaultWidget`.
 - Deprecated `StreamMessageWidget.deletedBottomRowBuilder` in favor
   of `StreamMessageWidget.bottomRowBuilderWithDefaultWidget`.
-- Deprecated `StreamMessageWidget.usernameBuilder` in favor of `StreamMessageWidget.bottomRowBuilderWithDefaultWidget`.
+- Deprecated `StreamMessageWidget.usernameBuilder` in favor
+  of `StreamMessageWidget.bottomRowBuilderWithDefaultWidget`.
 
 🐞 Fixed
 
-- [[#1379]](https://github.com/GetStream/stream-chat-flutter/issues/1379) Fixed "Issues with photo attachments on web",
+- [[#1379]](https://github.com/GetStream/stream-chat-flutter/issues/1379) Fixed "Issues with photo
+  attachments on web",
   where the cached image attachment would not render while uploading.
-- Fix render overflow issue with `MessageSearchListTileTitle`. It now uses `Text.rich` instead of `Row`. Better default
+- Fix render overflow issue with `MessageSearchListTileTitle`. It now uses `Text.rich` instead
+  of `Row`. Better default
   behaviour and allows `TextOverflow`.
-- [[1346]](https://github.com/GetStream/stream-chat-flutter/issues/1346) Fixed a render issue while uploading video on
+- [[1346]](https://github.com/GetStream/stream-chat-flutter/issues/1346) Fixed a render issue while
+  uploading video on
   web.
 - [[#1347]](https://github.com/GetStream/stream-chat-flutter/issues/1347) `onReply` not working
   in `AttachmentActionsModal` which is used by `StreamImageAttachment` and `StreamImageGroup`.
@@ -459,7 +539,8 @@
     * `textInputAction`
     * `keyboardType`
     * `textCapitalization`
-- Added `showStreamAttachmentPickerModalBottomSheet` to show the attachment picker modal bottom sheet.
+- Added `showStreamAttachmentPickerModalBottomSheet` to show the attachment picker modal bottom
+  sheet.
 
 🔄 Changed
 
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index eec72981a..9e6af3889 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -17,26 +17,26 @@ dependencies:
   dart_vlc: ^0.4.0
   desktop_drop: ^0.4.1
   diacritic: ^0.1.4
-  dio: ^5.2.1+1
+  dio: ^5.3.2
   ezanimation: ^0.6.0
-  file_picker: ^5.3.2
+  file_picker: ^5.3.3
   file_selector: ^1.0.0
   flutter:
     sdk: flutter
-  flutter_markdown: ^0.6.17
+  flutter_markdown: ^0.6.17+1
   flutter_portal: ^1.1.4
   flutter_svg: ^2.0.7
   http_parser: ^4.0.2
   image_gallery_saver: ^2.0.3
-  image_picker: ^1.0.1
+  image_picker: ^1.0.2
   jiffy: ^6.2.1
-  lottie: ^2.4.0
+  lottie: ^2.6.0
   meta: ^1.9.1
-  path_provider: ^2.0.15
-  photo_manager: ^2.6.0
+  path_provider: ^2.1.0
+  photo_manager: ^2.7.1
   photo_view: ^0.14.0
   rxdart: ^0.27.7
-  share_plus: ^7.0.2
+  share_plus: ^7.1.0
   shimmer: ^3.0.0
   stream_chat_flutter_core: ^6.7.0
   synchronized: ^3.1.0
@@ -74,4 +74,4 @@ dev_dependencies:
     sdk: flutter
   golden_toolkit: ^0.15.0
   mocktail: ^1.0.0
-  path: ^1.8.2
\ No newline at end of file
+  path: ^1.8.3
\ No newline at end of file
diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index 475bd5beb..e1d52de7b 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Upcoming
+
+- Updated minimum supported `SDK` version to Flutter 3.10/Dart 3.0
+- Updated `stream_chat` dependency to [`Upcoming`](https://pub.dev/packages/stream_chat/changelog).
+
 ## 6.7.0
 
 - Updated `stream_chat` dependency to [`6.7.0`](https://pub.dev/packages/stream_chat/changelog).
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index 664544200..f52027b0e 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -11,7 +11,7 @@ environment:
 
 dependencies:
   collection: ^1.17.1
-  connectivity_plus: ^4.0.1
+  connectivity_plus: ^4.0.2
   flutter:
     sdk: flutter
   freezed_annotation: ^2.4.1
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index c397739aa..a7f044119 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Upcoming
+
+* Updated minimum supported `SDK` version to Flutter 3.10/Dart 3.0
+* Updated `stream_chat_flutter` dependency to [`Upcoming`](https://pub.dev/packages/stream_chat_flutter/changelog).
+
 ## 5.8.0
 
 * Updated `stream_chat_flutter` dependency to [`6.8.0`](https://pub.dev/packages/stream_chat_flutter/changelog).
diff --git a/packages/stream_chat_persistence/CHANGELOG.md b/packages/stream_chat_persistence/CHANGELOG.md
index 8c58dffdb..3b29b9de1 100644
--- a/packages/stream_chat_persistence/CHANGELOG.md
+++ b/packages/stream_chat_persistence/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Upcoming
+
+- Updated minimum supported `SDK` version to Flutter 3.10/Dart 3.0
+- Updated `stream_chat` dependency to [`Upcoming`](https://pub.dev/packages/stream_chat/changelog).
+
 ## 6.7.0
 
 - [[#1683]](https://github.com/GetStream/stream-chat-flutter/issues/1683) Fixed SqliteException no such
diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
index 70fb2041a..b7e66a8a8 100644
--- a/packages/stream_chat_persistence/pubspec.yaml
+++ b/packages/stream_chat_persistence/pubspec.yaml
@@ -10,19 +10,19 @@ environment:
   flutter: ">=3.10.0"
 
 dependencies:
-  drift: ^2.9.0
+  drift: ^2.11.0
   flutter:
     sdk: flutter
   logging: ^1.2.0
   meta: ^1.9.1
   path: ^1.8.3
-  path_provider: ^2.0.15
+  path_provider: ^2.1.0
   sqlite3_flutter_libs: ^0.5.15
   stream_chat: ^6.7.0
 
 dev_dependencies:
   build_runner: ^2.4.6
-  drift_dev: ^2.9.0
+  drift_dev: ^2.11.0
   flutter_test:
     sdk: flutter
   mocktail: ^1.0.0
diff --git a/pubspec.yaml b/pubspec.yaml
index cf418d76f..0d7014e9a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter_workspace
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
+  sdk: '>=3.10.0 <4.0.0'
 
 dev_dependencies:
   melos: ^3.1.0

From 046b696a254eaa5dbc5f33162163283bd6da4089 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 17 Aug 2023 14:08:34 +0530
Subject: [PATCH 09/12] fix(ui): fix for flutter 3.13

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/lib/src/avatars/group_avatar.dart | 3 ++-
 packages/stream_chat_flutter/lib/src/avatars/user_avatar.dart  | 3 ++-
 .../lib/src/channel/stream_channel_avatar.dart                 | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/avatars/group_avatar.dart b/packages/stream_chat_flutter/lib/src/avatars/group_avatar.dart
index be70bdbff..146a66431 100644
--- a/packages/stream_chat_flutter/lib/src/avatars/group_avatar.dart
+++ b/packages/stream_chat_flutter/lib/src/avatars/group_avatar.dart
@@ -66,7 +66,8 @@ class StreamGroupAvatar extends StatelessWidget {
     Widget avatar = GestureDetector(
       onTap: onTap,
       child: ClipRRect(
-        borderRadius: borderRadius ?? previewTheme?.borderRadius,
+        borderRadius:
+            borderRadius ?? previewTheme?.borderRadius ?? BorderRadius.zero,
         child: Container(
           constraints: constraints ?? previewTheme?.constraints,
           decoration: BoxDecoration(color: colorTheme.accentPrimary),
diff --git a/packages/stream_chat_flutter/lib/src/avatars/user_avatar.dart b/packages/stream_chat_flutter/lib/src/avatars/user_avatar.dart
index 72ec020bb..aae50f481 100644
--- a/packages/stream_chat_flutter/lib/src/avatars/user_avatar.dart
+++ b/packages/stream_chat_flutter/lib/src/avatars/user_avatar.dart
@@ -86,7 +86,8 @@ class StreamUserAvatar extends StatelessWidget {
 
     final backupGradientAvatar = ClipRRect(
       borderRadius: borderRadius ??
-          streamChatTheme.ownMessageTheme.avatarTheme?.borderRadius,
+          streamChatTheme.ownMessageTheme.avatarTheme?.borderRadius ??
+          BorderRadius.zero,
       child: streamChatConfig.defaultUserImage(context, user),
     );
 
diff --git a/packages/stream_chat_flutter/lib/src/channel/stream_channel_avatar.dart b/packages/stream_chat_flutter/lib/src/channel/stream_channel_avatar.dart
index 9090c33a0..8f148a370 100644
--- a/packages/stream_chat_flutter/lib/src/channel/stream_channel_avatar.dart
+++ b/packages/stream_chat_flutter/lib/src/channel/stream_channel_avatar.dart
@@ -111,7 +111,8 @@ class StreamChannelAvatar extends StatelessWidget {
       initialData: channel.image,
       builder: (context, channelImage) {
         Widget child = ClipRRect(
-          borderRadius: borderRadius ?? previewTheme?.borderRadius,
+          borderRadius:
+              borderRadius ?? previewTheme?.borderRadius ?? BorderRadius.zero,
           child: Container(
             constraints: constraints ?? previewTheme?.constraints,
             decoration: BoxDecoration(color: colorTheme.accentPrimary),

From d94f96b7a1876a5c1aade9478b08e826192ca9bd Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 17 Aug 2023 14:08:44 +0530
Subject: [PATCH 10/12] chore: fix lints.

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 packages/stream_chat/lib/src/client/client.dart       | 2 +-
 packages/stream_chat/test/src/client/client_test.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
index 9fc995312..4e4fc5e45 100644
--- a/packages/stream_chat/lib/src/client/client.dart
+++ b/packages/stream_chat/lib/src/client/client.dart
@@ -1696,7 +1696,7 @@ class ClientState {
   void updateUsers(List<User?> userList) {
     final newUsers = {
       ...users,
-      for (var user in userList)
+      for (final user in userList)
         if (user != null) user.id: user,
     };
     _usersController.add(newUsers);
diff --git a/packages/stream_chat/test/src/client/client_test.dart b/packages/stream_chat/test/src/client/client_test.dart
index df167b235..87053d9bf 100644
--- a/packages/stream_chat/test/src/client/client_test.dart
+++ b/packages/stream_chat/test/src/client/client_test.dart
@@ -975,7 +975,7 @@ void main() {
         // skipping initial seed event -> {} users
         client.state.usersStream.skip(1),
         emitsInOrder([
-          {for (var user in users) user.id: user},
+          {for (final user in users) user.id: user},
         ]),
       );
 

From 8e3e150a521ffa20ac58bbf68fdea2e40bae8176 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 17 Aug 2023 14:13:00 +0530
Subject: [PATCH 11/12] chore(ci): update workflows.

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 .github/workflows/legacy_version_analyze.yml  | 2 +-
 .github/workflows/stream_flutter_workflow.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml
index 89c195dfe..4b462c524 100644
--- a/.github/workflows/legacy_version_analyze.yml
+++ b/.github/workflows/legacy_version_analyze.yml
@@ -3,7 +3,7 @@ name: legacy_version_analyze
 env:
   # Note: The versions below should be manually updated after a new stable
   # version comes out.
-  flutter_version: "3.7.12"
+  flutter_version: "3.10.6"
 
 on:
   push:
diff --git a/.github/workflows/stream_flutter_workflow.yml b/.github/workflows/stream_flutter_workflow.yml
index 99312316c..5f7c04889 100644
--- a/.github/workflows/stream_flutter_workflow.yml
+++ b/.github/workflows/stream_flutter_workflow.yml
@@ -2,7 +2,7 @@ name: stream_flutter_workflow
 
 env:
   ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-  flutter_version: "3.10.4"
+  flutter_channel: "stable"
 
 on:
   pull_request:
@@ -37,7 +37,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           cache: true
-          flutter-version: ${{ env.flutter_version }}
+          channel: ${{ env.flutter_channel }}
       - name: "Install Tools"
         run: |
           flutter pub global activate melos

From 20fe69c79a4f378831bd5039d93e84c1c3c4d28f Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 17 Aug 2023 14:17:10 +0530
Subject: [PATCH 12/12] chore: repo dart min version.

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 0d7014e9a..8c61d28a6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter_workspace
 
 environment:
-  sdk: '>=3.10.0 <4.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dev_dependencies:
   melos: ^3.1.0