Merge branch 'master' into feature/new-ui

lib/src/user_avatar.dart

@@ -24,6 +24,9 @@ class UserAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final hasImage = user.extraData?.containsKey('image') == true &&
+        user.extraData['image'] != null &&
+        user.extraData['image'] != '';
     return GestureDetector(
       onTap: onTap != null
           ? () {
@@ -49,7 +52,7 @@ class UserAvatar extends StatelessWidget {
               decoration: BoxDecoration(
                 color: StreamChatTheme.of(context).accentColor,
               ),
-              child: user.extraData?.containsKey('image') ?? false
+              child: hasImage
                   ? CachedNetworkImage(
                       imageUrl: user.extraData['image'],
                       errorWidget: (_, __, ___) {