fix show avatar

App.js

@@ -1,6 +1,6 @@
 import { AppLoading, Asset, Linking } from 'expo'
 import React, { Component } from 'react'
-import { StyleSheet, View } from 'react-native'
+import { StyleSheet, View, Text } from 'react-native'
 import { Bubble, GiftedChat, SystemMessage } from './src/'
 
 import AccessoryBar from './example-expo/AccessoryBar'

src/Message.tsx

@@ -38,7 +38,7 @@ interface MessageProps<TMessage extends IMessage = IMessage> {
   currentMessage?: TMessage
   nextMessage?: TMessage
   previousMessage?: TMessage
-  user?: User
+  user: User
   inverted?: boolean
   containerStyle?: LeftRightStyle<ViewStyle>
   renderBubble?(props: Bubble['props']): React.ReactNode
@@ -59,7 +59,7 @@ export default class Message extends React.Component<MessageProps> {
     previousMessage: {},
     user: {},
     containerStyle: {},
-    showUserAvatar: true,
+    showUserAvatar: false,
     inverted: true,
   }
 
@@ -128,19 +128,33 @@ export default class Message extends React.Component<MessageProps> {
   }
 
   renderAvatar() {
-    const { user, currentMessage } = this.props
+    const { user, currentMessage, showUserAvatar } = this.props
+    console.warn({
+      cond:
+        user &&
+        user._id &&
+        currentMessage &&
+        user._id === currentMessage.user._id &&
+        !showUserAvatar,
+      showUserAvatar,
+      user,
+      currentMessage,
+    })
+
     if (
       user &&
+      user._id &&
       currentMessage &&
       user._id === currentMessage.user._id &&
-      !this.props.showUserAvatar
+      !showUserAvatar
     ) {
       return null
     }
 
     if (currentMessage && currentMessage.user.avatar === null) {
       return null
     }
+
     const { containerStyle, ...props } = this.props
     return <Avatar {...props} />
   }

src/MessageContainer.tsx

@@ -247,6 +247,7 @@ export default class MessageContainer extends React.PureComponent<
 
       const messageProps: Message['props'] = {
         ...restProps,
+        user,
         key: item._id,
         currentMessage: item,
         previousMessage,