fix

path-yu · Apr 22, 2023 · 9ac8158 · 9ac8158
1 parent b968b8b
commit 9ac8158
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/lib/common/firebase.dart b/lib/common/firebase.dart
@@ -280,17 +280,12 @@ Future<Map<String, dynamic>> handleChatData(
         : lastMessage['type'] == 'voice'
             ? '[voice]'
             : lastMessage['content'];
-    data['showAvatar'] = lastMessage['avatar'];
-    data['showUserName'] = lastMessage['userName'];
-  } else {
-    data['showAvatar'] =
-        data['isMyRequest'] ? data['targetUserPhotoURL'] : data['userPhotoURL'];
-    data['showUserName'] =
-        data['isMyRequest'] ? data['targetUserName'] : data['userName'];
   }
+  data['showAvatar'] =
+      data['isMyRequest'] ? data['userPhotoURL'] : data['targetUserPhotoURL'];
+  data['showUserName'] =
+      data['isMyRequest'] ? data['userName'] : data['targetUserName'];
   data['appbarTitle'] = data['targetUserName'];
-  data.remove('messages');
-  data.remove('targetMessages');
   return data;
 }