Merge branch 'master' into tma853-tag-selection-screen

1 files changed, 9 insertions, 3 deletions

diff --git a/src/components/common/Avatar.tsx b/src/components/common/Avatar.tsx
index 4d9aec41..29197d6e 100644
--- a/src/components/common/Avatar.tsx
+++ b/src/components/common/Avatar.tsx
@@ -4,8 +4,8 @@ import {Image, ImageStyle, StyleProp, ImageBackground} from 'react-native';
 type AvatarProps = {
   style: StyleProp<ImageStyle>;
   uri: string | undefined;
-  loading: boolean;
-  loadingStyle: StyleProp<ImageStyle> | undefined;
+  loading?: boolean;
+  loadingStyle?: StyleProp<ImageStyle> | undefined;
 };
 const Avatar: FC<AvatarProps> = ({
   style,
@@ -13,7 +13,7 @@ const Avatar: FC<AvatarProps> = ({
   loading = false,
   loadingStyle,
 }) => {
-  return (
+  return loading ? (
     <ImageBackground
       style={style}
       imageStyle={style}
@@ -26,6 +26,12 @@ const Avatar: FC<AvatarProps> = ({
         />
       )}
     </ImageBackground>
+  ) : (
+    <Image
+      defaultSource={require('../../assets/images/avatar-placeholder.png')}
+      source={{uri, cache: 'reload'}}
+      style={style}
+    />
   );
 };