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
2021-07-28 15:18:09 +05:30
parent ccd748a936 0313b997cc
commit 7720bf677d
67 changed files with 723 additions and 252 deletions
@@ -50,7 +50,7 @@ class MessageSearchItem extends StatelessWidget {
      title: Row(
        children: [
          Text(
-            user.id == StreamChat.of(context).user?.id
+            user.id == StreamChat.of(context).currentUser?.id
                ? context.translations.youText
                : user.name,
            style: chatThemeData.channelPreviewTheme.title,