Merge branch 'master' into develop

packages/stream_chat/lib/src/client.dart

@@ -546,10 +546,10 @@ class StreamChatClient {
 
     var event = await _chatPersistenceClient?.getConnectionInfo();
 
-    await _ws.connect().then((e) async {
-      await _chatPersistenceClient?.updateConnectionInfo(e);
+    await _ws.connect().then((e) {
+      _chatPersistenceClient?.updateConnectionInfo(e);
       event = e;
-      await resync();
+      resync();
     }).catchError((err, stacktrace) {
       logger.severe('error connecting ws', err, stacktrace);
       if (err is Map) {
@@ -633,7 +633,7 @@ class StreamChatClient {
       );
       if (channels.isNotEmpty) yield channels;
 
-      if (wsConnectionStatus == ConnectionStatus.connected) {
+      try {
         final newQueryChannelsFuture = queryChannelsOnline(
           filter: filter,
           sort: sort,
@@ -648,6 +648,8 @@ class StreamChatClient {
         _queryChannelsStreams[hash] = newQueryChannelsFuture;
 
         yield await newQueryChannelsFuture;
+      } catch (_) {
+        if (channels.isEmpty) rethrow;
       }
     }
   }