Fix blank avatars, duplicate recent media, static message details

This commit is contained in:
Scott Nonnenberg 2021-09-29 13:18:27 -07:00 committed by GitHub
parent 5c1776e00e
commit 1e3de45af6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 23 deletions

View file

@ -119,9 +119,14 @@ export const AvatarPreview = ({
}, [avatarPreview]);
let imageStatus: ImageStatus;
let encodedPath: string | undefined;
if (avatarValue && !objectUrl) {
imageStatus = ImageStatus.Loading;
} else if (objectUrl || avatarPath) {
} else if (objectUrl) {
encodedPath = objectUrl;
imageStatus = ImageStatus.HasImage;
} else if (avatarPath) {
encodedPath = encodeURI(avatarPath);
imageStatus = ImageStatus.HasImage;
} else {
imageStatus = ImageStatus.Nothing;
@ -164,10 +169,10 @@ export const AvatarPreview = ({
className={`AvatarPreview__avatar AvatarPreview__avatar--${imageStatus}`}
{...clickProps}
style={
imageStatus === ImageStatus.HasImage
imageStatus === ImageStatus.HasImage && encodedPath
? {
...componentStyle,
backgroundImage: `url('${objectUrl || avatarPath}')`,
backgroundImage: `url('${encodedPath}')`,
}
: componentStyle
}