Merge remote-tracking branch 'origin/develop' into feat/localization

# Conflicts:
#	packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
#	packages/stream_chat_flutter/lib/src/channel_name.dart
#	packages/stream_chat_flutter/lib/src/message_search_item.dart
#	packages/stream_chat_flutter/lib/src/message_widget.dart
This commit is contained in:
xsahil03x
2021-07-28 15:18:09 +05:30
67 changed files with 723 additions and 252 deletions
@@ -49,8 +49,8 @@ class ChannelName extends StatelessWidget {
if (extraData['name'] != null) {
title = extraData['name'];
} else {
final otherMembers =
members?.where((member) => member.userId != client.user!.id);
final otherMembers = members
?.where((member) => member.userId != client.currentUser!.id);
if (otherMembers?.length == 1) {
if (otherMembers!.first.user != null) {
title = otherMembers.first.user!.name;