From f2c3c82d3a21d9436979061b20705ccb39b12598 Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Fri, 21 Jan 2022 16:33:43 -0800
Subject: [PATCH] Fix uploading avatars

---
 src/UserMenu.jsx             | 2 +-
 src/profile/ProfileModal.jsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/UserMenu.jsx b/src/UserMenu.jsx
index f85c5e5..3e9f735 100644
--- a/src/UserMenu.jsx
+++ b/src/UserMenu.jsx
@@ -64,7 +64,7 @@ export function UserMenu({
     <PopoverMenuTrigger placement="bottom right">
       <TooltipTrigger placement="bottom left">
         <Button variant="icon" className={styles.userButton}>
-          {isAuthenticated && !isPasswordlessUser ? (
+          {isAuthenticated && (!isPasswordlessUser || avatarUrl) ? (
             <Avatar
               size="sm"
               className={styles.avatar}
diff --git a/src/profile/ProfileModal.jsx b/src/profile/ProfileModal.jsx
index 3a4b5dc..979e67b 100644
--- a/src/profile/ProfileModal.jsx
+++ b/src/profile/ProfileModal.jsx
@@ -36,7 +36,7 @@ export function ProfileModal({
 
       saveProfile({
         displayName,
-        avatar,
+        avatar: avatar && avatar.size > 0 ? avatar : undefined,
       });
     },
     [saveProfile]
@@ -65,7 +65,7 @@ export function ProfileModal({
               onChange={onChangeDisplayName}
             />
           </FieldRow>
-          {isAuthenticated && !isPasswordlessUser && (
+          {isAuthenticated && (
             <FieldRow>
               <InputField
                 type="file"