diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-26 15:33:37 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-26 15:33:37 -0400 |
| commit | 9be7248ba54eeb2ad4d19edd4c01ee736b58bfcd (patch) | |
| tree | 6f66b86bbe9adaffb7d866b22a89e0e3f78f26a3 /src/components/profile/Avatar.tsx | |
| parent | 883a6c51d4c3e442df5e6c0f3dc6fada2f370f8e (diff) | |
| parent | 99de9c8402f470ead242a81510dc2764ae7d9e66 (diff) | |
Merge branch 'master' into tma728-select-school-onboarding
# Conflicts:
# src/services/UserProfileService.ts
# src/types/types.ts
Diffstat (limited to 'src/components/profile/Avatar.tsx')
| -rw-r--r-- | src/components/profile/Avatar.tsx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/components/profile/Avatar.tsx b/src/components/profile/Avatar.tsx index ba4ec36c..5d677983 100644 --- a/src/components/profile/Avatar.tsx +++ b/src/components/profile/Avatar.tsx @@ -19,11 +19,8 @@ const Avatar: React.FC<AvatarProps> = ({style, screenType, userXId}) => { return ( <Image style={[styles.image, style]} - source={ - avatar - ? {uri: avatar} - : require('../../assets/images/avatar-placeholder.png') - } + defaultSource={require('../../assets/images/avatar-placeholder.png')} + source={{uri: avatar}} /> ); }; |