From 9795083f41e6417c32d9c070ab0b2bf4aca67012 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Tue, 4 May 2021 17:12:22 -0400
Subject: fixed merge issues

---
 src/components/common/TaggUserRowCell.tsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/components/common')

diff --git a/src/components/common/TaggUserRowCell.tsx b/src/components/common/TaggUserRowCell.tsx
index 446f5e87..446dedc9 100644
--- a/src/components/common/TaggUserRowCell.tsx
+++ b/src/components/common/TaggUserRowCell.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
-import {Image, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
+import {StyleSheet, Text, TouchableOpacity, View} from 'react-native';
 import {ProfilePreviewType} from '../../types';
-import {defaultUserProfile, normalize} from '../../utils';
+import {normalize} from '../../utils';
+import Avatar from './Avatar';
 
 type TaggUserRowCellProps = {
   onPress: () => void;
@@ -10,11 +11,7 @@ type TaggUserRowCellProps = {
 const TaggUserRowCell: React.FC<TaggUserRowCellProps> = ({onPress, user}) => {
   return (
     <TouchableOpacity onPress={onPress} style={styles.container}>
-      <Image
-        defaultSource={defaultUserProfile()}
-        source={{uri: user.thumbnail_url}}
-        style={styles.image}
-      />
+      <Avatar style={styles.image} uri={user.thumbnail_url} />
       <View style={styles.textContent}>
         <Text style={styles.username}>{`@${user.username}`}</Text>
         <Text style={styles.name}>
-- 
cgit v1.2.3-70-g09d2