Merge branch 'GetStream:develop' into fix-web-attachments

packages/stream_chat_flutter/lib/src/stream_chat.dart

@@ -110,7 +110,15 @@ class StreamChatState extends State<StreamChat> {
                 onBackgroundEventReceived: widget.onBackgroundEventReceived,
                 backgroundKeepAlive: widget.backgroundKeepAlive,
                 connectivityStream: widget.connectivityStream,
-                child: widget.child ?? const Offstage(),
+                child: Builder(
+                  builder: (context) {
+                    StreamChatClient.additionalHeaders = {
+                      'X-Stream-Client':
+                          '${StreamChatClient.defaultUserAgent}-ui',
+                    };
+                    return widget.child ?? const Offstage();
+                  },
+                ),
               ),
             );
           },

packages/stream_chat_flutter/test/scrollable_positioned_list/horizontal_scrollable_positioned_list_test.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';

packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_scrollable_positioned_list_test.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';

packages/stream_chat_flutter/test/scrollable_positioned_list/scrollable_positioned_list_test.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:math';
 import 'dart:ui';
 

packages/stream_chat_flutter/test/scrollable_positioned_list/separated_scrollable_positioned_list_test.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';

packages/stream_chat_flutter/test/scrollable_positioned_list/seperated_horizontal_scrollable_positioned_list_test.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';