Fix profile setup showing default avatar in web UI (mastodon#28453)

glitch-soc · Dec 21, 2023 · 01f0a6c · 01f0a6c
1 parent d29b1cc
commit 01f0a6c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/javascript/mastodon/features/onboarding/profile.jsx b/app/javascript/mastodon/features/onboarding/profile.jsx
@@ -26,6 +26,8 @@ const messages = defineMessages({
   uploadAvatar: { id: 'onboarding.profile.upload_avatar', defaultMessage: 'Upload profile picture' },
 });
 
+const nullIfMissing = path => path.endsWith('missing.png') ? null : path;
+
 export const Profile = () => {
   const account = useAppSelector(state => state.getIn(['accounts', me]));
   const [displayName, setDisplayName] = useState(account.get('display_name'));
@@ -61,8 +63,8 @@ export const Profile = () => {
     setHeader(e.target?.files?.[0]);
   }, [setHeader]);
 
-  const avatarPreview = useMemo(() => avatar ? URL.createObjectURL(avatar) : account.get('avatar'), [avatar, account]);
-  const headerPreview = useMemo(() => header ? URL.createObjectURL(header) : account.get('header'), [header, account]);
+  const avatarPreview = useMemo(() => avatar ? URL.createObjectURL(avatar) : nullIfMissing(account.get('avatar')), [avatar, account]);
+  const headerPreview = useMemo(() => header ? URL.createObjectURL(header) : nullIfMissing(account.get('header')), [header, account]);
 
   const handleSubmit = useCallback(() => {
     setIsSaving(true);