Skip to content

Commit

Permalink
Revert "Revert "ID-3415 [FIX] Chat was replaced with conversation if …
Browse files Browse the repository at this point in the history
…the user…" (#142)

This reverts commit 730978a.
  • Loading branch information
armine-fliplet authored Jul 11, 2024
1 parent 730978a commit 3584513
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 62 deletions.
6 changes: 3 additions & 3 deletions js/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2354,9 +2354,9 @@ Fliplet().then(function() {
var isFriendAvatar = friend ? friend.data[avatarColumnName] : '';

conversation.isChannel = conversation.definition.group && conversation.definition.group.public;
conversation.name = participants.length >= 2 || conversation.isChannel ? conversation.name || 'Group' : conversationName;
conversation.avatar = participants.length >= 2 ? '' : isFriendAvatar;
conversation.isGroup = !conversation.isChannel && participants.length >= 2;
conversation.isGroup = !conversation.isChannel && (participants.length > 2 || (conversation.definition.removedParticipants && conversation.definition.removedParticipants.length > 0));
conversation.name = conversation.isGroup ? conversation.name || 'Group' : conversationName;
conversation.avatar = participants.length > 2 ? '' : isFriendAvatar;
conversation.usersInConversation = conversationName;
conversation.nParticipants = participants.length;
conversation.absoluteTime = TD(conversation.updatedAt, { format: 'fromNow' });
Expand Down
Loading

0 comments on commit 3584513

Please sign in to comment.