From 3ff6a1922948468019b4b943329dff9a317909fe Mon Sep 17 00:00:00 2001
From: vishtree <vishal@getstream.io>
Date: Sun, 19 Apr 2020 22:23:48 +0200
Subject: [PATCH] Code cleanup for finding other member of direct conversation

---
 lib/src/channel_image.dart | 8 +++++---
 lib/src/channel_name.dart  | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/src/channel_image.dart b/lib/src/channel_image.dart
index 0cc4c16b..45363064 100644
--- a/lib/src/channel_image.dart
+++ b/lib/src/channel_image.dart
@@ -64,11 +64,13 @@ class ChannelImage extends StatelessWidget {
         initialData: channel.extraData,
         builder: (context, snapshot) {
           var image = '';
-          if (snapshot.data?.containsKey('image') ?? false) {
+          if (snapshot.data?.containsKey('image') == true) {
             image = snapshot.data['image'];
           } else if (channel.state.members.length == 2) {
-            final otherMemberIndex = channel.state.members[0].user.id == client.user.id ? 1 : 0;
-            image = channel.state.members[otherMemberIndex].user.image;
+            final otherMember = channel.state.members.firstWhere(
+              (member) => member.user.id != client.user.id
+            );
+            image = otherMember.user.image;
           }
 
           return ClipRRect(
diff --git a/lib/src/channel_name.dart b/lib/src/channel_name.dart
index 137fdc6b..ce563804 100644
--- a/lib/src/channel_name.dart
+++ b/lib/src/channel_name.dart
@@ -30,8 +30,10 @@ class ChannelName extends StatelessWidget {
       builder: (context, snapshot) {
         var title;
         if (snapshot.data['name'] == null && channel.state.members.length == 2) {
-          final otherMemberIndex = channel.state.members[0].user.id == client.user.id ? 1 : 0;
-          title = channel.state.members[otherMemberIndex].user.name;
+          final otherMember = channel.state.members.firstWhere(
+            (member) => member.user.id != client.user.id
+          );
+          title = otherMember.user.name;
         } else {
           title = snapshot.data['name'] ?? channel.id;
         }