diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx index 7b23547c60..9db4573251 100644 --- a/src/view/com/util/UserAvatar.tsx +++ b/src/view/com/util/UserAvatar.tsx @@ -1,5 +1,5 @@ import React, {useMemo} from 'react' -import {StyleSheet, View} from 'react-native' +import {Image, StyleSheet, View} from 'react-native' import Svg, {Circle, Rect, Path} from 'react-native-svg' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {HighPriorityImage} from 'view/com/util/images/Image' @@ -27,6 +27,7 @@ interface BaseUserAvatarProps { interface UserAvatarProps extends BaseUserAvatarProps { moderation?: ModerationUI + usePlainRNImage?: boolean } interface EditableUserAvatarProps extends BaseUserAvatarProps { @@ -110,6 +111,7 @@ export function UserAvatar({ size, avatar, moderation, + usePlainRNImage = false, }: UserAvatarProps) { const pal = usePalette('default') @@ -146,13 +148,24 @@ export function UserAvatar({ return avatar && !((moderation?.blur && isAndroid) /* android crashes with blur */) ? ( - + {usePlainRNImage ? ( + + ) : ( + + )} {alert} ) : ( diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index 95b79faa13..c2d307f598 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -158,7 +158,12 @@ export const DrawerContent = observer(function DrawerContentImpl() { accessibilityLabel="Profile" accessibilityHint="Navigates to your profile" onPress={onPressProfile}> - + - + ) : ( - + )}