From 7561125a057eef0d7da50ffdb67113fecaf08b0b Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Fri, 30 Jul 2021 14:57:26 +0530
Subject: [PATCH] fix(ui): add null-check in currentUserMember

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/lib/src/message_list_view.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index 5ae6f9ea..17ad24c6 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -965,7 +965,7 @@ class _MessageListViewState extends State<MessageListView> {
     final currentUser = StreamChat.of(context).currentUser;
     final members = StreamChannel.of(context).channel.state?.members ?? [];
     final currentUserMember =
-        members.firstWhere((e) => e.user!.id == currentUser!.id);
+        members.firstWhereOrNull((e) => e.user!.id == currentUser!.id);
 
     Widget messageWidget = MessageWidget(
       key: ValueKey<String>('MESSAGE-${message.id}'),
@@ -1072,7 +1072,8 @@ class _MessageListViewState extends State<MessageListView> {
         }
         FocusScope.of(context).unfocus();
       },
-      showPinButton: widget.pinPermissions.contains(currentUserMember.role),
+      showPinButton: currentUserMember != null &&
+          widget.pinPermissions.contains(currentUserMember.role),
     );
 
     if (widget.messageBuilder != null) {