update CustomAvatar usage

Author: mkilincaslan

src/components/Chat/index.tsx

@@ -242,9 +242,11 @@ const Chat = ({
         renderCustomView={(props: BubbleProps<ICustomMessage>) => (
           <CustomUsernameView {...props} activeRoom={activeRoom} />
         )}
-        renderAvatar={(props) => (
-          <CustomAvatar {...props} activeRoom={activeRoom} />
-        )}
+        renderAvatar={(props) =>
+          activeRoom?.groupAvatar && (
+            <CustomAvatar {...props} activeRoom={activeRoom} />
+          )
+        }
         renderAvatarOnTop={true}
         renderChatFooter={renderChatFooter}
         renderSystemMessage={CustomSystemMessage}

src/components/CustomAvatar/index.tsx

@@ -11,9 +11,7 @@ interface CustomAvatarProps extends AvatarProps<IMessage> {
 const CustomAvatar = (props: CustomAvatarProps) => {
   const theme = useTheme();
   // render user avatar just for community chat
-  if (props.activeRoom?.groupAvatar) {
-    return <Avatar {...props} imageStyle={styles(theme).avatarImageStle} />;
-  }
+  return <Avatar {...props} imageStyle={styles(theme).avatarImageStle} />;
 };
 
 export default CustomAvatar;