merge fixes

Signed-off-by: Sahil Kumar <[email protected]>

packages/stream_chat/lib/src/core/http/interceptor/logging_interceptor.dart

@@ -309,12 +309,12 @@ class LoggingInterceptor extends Interceptor {
     });
   }
 
-  bool _canFlattenMap(Map map) =>
+/*  bool _canFlattenMap(Map map) =>
       map.values.where((dynamic val) => val is Map || val is List).isEmpty &&
       map.toString().length < maxWidth;
 
   bool _canFlattenList(List list) =>
-      list.length < 10 && list.toString().length < maxWidth;
+      list.length < 10 && list.toString().length < maxWidth;*/
 
   void _printMapAsTable(
     void Function(Object) logPrint,

packages/stream_chat/lib/src/core/http/stream_http_client.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:math';
 
 import 'package:dio/dio.dart';
 import 'package:logging/logging.dart';

packages/stream_chat/lib/src/ws/websocket.dart

@@ -99,7 +99,7 @@ class WebSocket with TimerHelper {
       _connectionStatusController.add(status);
 
   /// The current connection status value
-  ConnectionStatus get connectionStatus => _connectionStatusController.value!;
+  ConnectionStatus get connectionStatus => _connectionStatusController.value;
 
   /// This notifies of connection status changes
   Stream<ConnectionStatus> get connectionStatusStream =>