Merge branch 'master' into tma821-load-badges-faster-ft

# Conflicts:
#	src/utils/users.ts

1 files changed, 5 insertions, 16 deletions

diff --git a/src/components/taggs/TwitterTaggPost.tsx b/src/components/taggs/TwitterTaggPost.tsx
index 0a6f53d8..db07ba66 100644
--- a/src/components/taggs/TwitterTaggPost.tsx
+++ b/src/components/taggs/TwitterTaggPost.tsx
@@ -11,7 +11,7 @@ import {
 } from '../../constants';
 import {TwitterPostType} from '../../types';
 import {handleOpenSocialUrlOnBrowser, SCREEN_WIDTH} from '../../utils';
-import {DateLabel, PostCarousel} from '../common';
+import {Avatar, DateLabel, PostCarousel} from '../common';
 
 interface TwitterTaggPostProps {
   ownerHandle: string;
@@ -31,14 +31,7 @@ const TwitterTaggPost: React.FC<TwitterTaggPostProps> = ({
       )}
       {/* Post header (avatar and handle) */}
       <View style={styles.header}>
-        <Image
-          style={styles.avatar}
-          source={
-            post.profile_pic
-              ? {uri: post.profile_pic}
-              : require('../../assets/images/avatar-placeholder.png')
-          }
-        />
+        <Avatar style={styles.avatar} uri={post.profile_pic} />
         <Text
           style={styles.headerText}
           onPress={() => handleOpenSocialUrlOnBrowser(post.handle, 'Twitter')}>
@@ -84,13 +77,9 @@ const TwitterTaggPost: React.FC<TwitterTaggPostProps> = ({
                 <View style={styles.replyHeader}>
                   {post.in_reply_to.text !== 'This tweet is unavailable' && (
                     <>
-                      <Image
-                        style={styles.replyAvatar}
-                        source={
-                          post.in_reply_to.profile_pic
-                            ? {uri: post.in_reply_to.profile_pic}
-                            : require('../../assets/images/avatar-placeholder.png')
-                        }
+                      <Avatar
+                        style={styles.avatar}
+                        uri={post.in_reply_to.profile_pic}
                       />
                       <Text
                         style={styles.replyHandleText}