From 0306fa4124de75ca4712f0d9df1ca8bacccc177d Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 10 Nov 2020 17:58:24 +0100
Subject: [PATCH 1/4] upgrade dependencies

---
 pubspec.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 70e4ed1e..9394aa96 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,13 +16,13 @@ dependencies:
   jiffy: ^3.0.1
   flutter_portal: ^0.3.0
   cached_network_image: ^2.2.0+1
-  flutter_markdown: ^0.4.2
+  flutter_markdown: ^0.5.0
   url_launcher: ^5.4.11
-  video_player: ^0.10.11+1
-  chewie: ^0.9.10
-  file_picker: ^2.0.0
+  video_player: ^1.0.0
+  chewie: ^0.10.4
+  file_picker: ^2.0.12
   image_picker: ^0.6.7+2
-  flutter_keyboard_visibility: ^3.2.1
+  flutter_keyboard_visibility: ^3.3.0
   stream_chat: ^0.2.10
   mime: ^0.9.6+3
   visibility_detector: ^0.1.5

From f63d65a1bb23f2be67b4f8ab74430d4025dc5ed3 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 10 Nov 2020 17:58:45 +0100
Subject: [PATCH 2/4] check if user.extradata["image"] is null

---
 lib/src/message_text.dart | 6 +++++-
 lib/src/user_avatar.dart  | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/src/message_text.dart b/lib/src/message_text.dart
index 2ee6a6f8..a043c53a 100644
--- a/lib/src/message_text.dart
+++ b/lib/src/message_text.dart
@@ -24,7 +24,11 @@ class MessageText extends StatelessWidget {
     final text = _replaceMentions(message.text);
     return MarkdownBody(
       data: text,
-      onTapLink: (link) {
+      onTapLink: (
+        String link,
+        String href,
+        String title,
+      ) {
         if (link.startsWith('@')) {
           final mentionedUser = message.mentionedUsers.firstWhere(
             (u) => '@${u.name.replaceAll(' ', '')}' == link,
diff --git a/lib/src/user_avatar.dart b/lib/src/user_avatar.dart
index 8ea9a525..3e5a599f 100644
--- a/lib/src/user_avatar.dart
+++ b/lib/src/user_avatar.dart
@@ -38,7 +38,9 @@ class UserAvatar extends StatelessWidget {
           decoration: BoxDecoration(
             color: StreamChatTheme.of(context).accentColor,
           ),
-          child: user.extraData?.containsKey('image') ?? false
+          child: (user.extraData?.containsKey('image') == true &&
+                  user.extraData['image'] != null &&
+                  user.extraData['image'] != '')
               ? CachedNetworkImage(
                   imageUrl: user.extraData['image'],
                   errorWidget: (_, __, ___) {

From 4383e74d491ce0fa35868875ed9dfa73fab69fe7 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 10 Nov 2020 17:59:51 +0100
Subject: [PATCH 3/4] bump version

---
 CHANGELOG.md | 5 +++++
 pubspec.yaml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e924ddc7..03db8a6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.12
+
+- Upgrade dependencies
+- Check if user.extraData['image'] is not null before using it
+
 ## 0.2.11+1
 
 - Fix error with channel query while handling background notifications
diff --git a/pubspec.yaml b/pubspec.yaml
index 9394aa96..7733d25b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 0.2.11+1
+version: 0.2.12
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 

From d38bb92737d58d0b3d85820179b2830d7f2cb318 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 10 Nov 2020 18:07:33 +0100
Subject: [PATCH 4/4] extract condition

---
 lib/src/user_avatar.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/src/user_avatar.dart b/lib/src/user_avatar.dart
index 3e5a599f..9b833cfe 100644
--- a/lib/src/user_avatar.dart
+++ b/lib/src/user_avatar.dart
@@ -18,6 +18,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: () {
         if (onTap != null) {
@@ -38,9 +41,7 @@ class UserAvatar extends StatelessWidget {
           decoration: BoxDecoration(
             color: StreamChatTheme.of(context).accentColor,
           ),
-          child: (user.extraData?.containsKey('image') == true &&
-                  user.extraData['image'] != null &&
-                  user.extraData['image'] != '')
+          child: hasImage
               ? CachedNetworkImage(
                   imageUrl: user.extraData['image'],
                   errorWidget: (_, __, ___) {