fix user avis being the wrong shape
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import React, {memo, useCallback, useMemo, useState} from 'react'
|
import {memo, useCallback, useMemo, useState} from 'react'
|
||||||
import {
|
import {
|
||||||
Image,
|
Image,
|
||||||
Pressable,
|
Pressable,
|
||||||
@@ -363,7 +363,7 @@ let EditableUserAvatar = ({
|
|||||||
}
|
}
|
||||||
}, [circular, size])
|
}, [circular, size])
|
||||||
|
|
||||||
const onOpenCamera = React.useCallback(async () => {
|
const onOpenCamera = useCallback(async () => {
|
||||||
if (!(await requestCameraAccessIfNeeded())) {
|
if (!(await requestCameraAccessIfNeeded())) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -377,7 +377,7 @@ let EditableUserAvatar = ({
|
|||||||
)
|
)
|
||||||
}, [onSelectNewAvatar, requestCameraAccessIfNeeded])
|
}, [onSelectNewAvatar, requestCameraAccessIfNeeded])
|
||||||
|
|
||||||
const onOpenLibrary = React.useCallback(async () => {
|
const onOpenLibrary = useCallback(async () => {
|
||||||
if (!(await requestPhotoAccessIfNeeded())) {
|
if (!(await requestPhotoAccessIfNeeded())) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -421,7 +421,7 @@ let EditableUserAvatar = ({
|
|||||||
circular,
|
circular,
|
||||||
])
|
])
|
||||||
|
|
||||||
const onRemoveAvatar = React.useCallback(() => {
|
const onRemoveAvatar = useCallback(() => {
|
||||||
onSelectNewAvatar(null)
|
onSelectNewAvatar(null)
|
||||||
}, [onSelectNewAvatar])
|
}, [onSelectNewAvatar])
|
||||||
|
|
||||||
@@ -528,7 +528,7 @@ let PreviewableUserAvatar = ({
|
|||||||
disableNavigation,
|
disableNavigation,
|
||||||
onBeforePress,
|
onBeforePress,
|
||||||
live,
|
live,
|
||||||
...rest
|
...props
|
||||||
}: PreviewableUserAvatarProps): React.ReactNode => {
|
}: PreviewableUserAvatarProps): React.ReactNode => {
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
@@ -557,10 +557,15 @@ let PreviewableUserAvatar = ({
|
|||||||
moderation={moderation}
|
moderation={moderation}
|
||||||
type={profile.associated?.labeler ? 'labeler' : 'user'}
|
type={profile.associated?.labeler ? 'labeler' : 'user'}
|
||||||
live={status.isActive || live}
|
live={status.isActive || live}
|
||||||
{...rest}
|
{...props}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const linkStyle =
|
||||||
|
props.type !== 'algo' && props.type !== 'list'
|
||||||
|
? a.rounded_full
|
||||||
|
: {borderRadius: props.size > 32 ? 8 : 3}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ProfileHoverCard did={profile.did} disable={disableHoverCard}>
|
<ProfileHoverCard did={profile.did} disable={disableHoverCard}>
|
||||||
{disableNavigation ? (
|
{disableNavigation ? (
|
||||||
@@ -596,7 +601,8 @@ let PreviewableUserAvatar = ({
|
|||||||
did: profile.did,
|
did: profile.did,
|
||||||
handle: profile.handle,
|
handle: profile.handle,
|
||||||
})}
|
})}
|
||||||
onPress={onPress}>
|
onPress={onPress}
|
||||||
|
style={linkStyle}>
|
||||||
{avatarEl}
|
{avatarEl}
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user