From 0eb85684cf3afdf945ad164839d448eda7b5dc8e Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Wed, 28 Jul 2021 11:39:26 +0200
Subject: [PATCH] fix message text with null language

---
 packages/stream_chat_flutter/lib/src/message_text.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_text.dart b/packages/stream_chat_flutter/lib/src/message_text.dart
index a1e3a4f8..721e4670 100644
--- a/packages/stream_chat_flutter/lib/src/message_text.dart
+++ b/packages/stream_chat_flutter/lib/src/message_text.dart
@@ -31,9 +31,9 @@ class MessageText extends StatelessWidget {
   Widget build(BuildContext context) {
     final streamChat = StreamChat.of(context);
     assert(streamChat.currentUser != null, '');
-    return BetterStreamBuilder(
-      stream: streamChat.currentUserStream.map((it) => it!.language),
-      initialData: streamChat.currentUser!.language,
+    return BetterStreamBuilder<String>(
+      stream: streamChat.currentUserStream.map((it) => it!.language ?? 'en'),
+      initialData: streamChat.currentUser!.language ?? 'en',
       builder: (context, language) {
         final translatedText =
             message.i18n?['${language}_text'] ?? message.text;