From 1507059241db3f5b8765581007a5d270db712734 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Fri, 19 Aug 2022 11:58:49 +0200
Subject: [PATCH] Fix some weird errors

---
 src/components/ContextMenu/status.ts          |  8 +++---
 .../Tabs/Me/Profile/Root/AvatarHeader.tsx     | 26 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/ContextMenu/status.ts b/src/components/ContextMenu/status.ts
index 20f94fb6..6974fe2e 100644
--- a/src/components/ContextMenu/status.ts
+++ b/src/components/ContextMenu/status.ts
@@ -54,13 +54,13 @@ const contextMenuStatus = ({
         message: t('common:message.error.message', {
           function: t(`status.${theFunction}.action`)
         }),
-        ...(err.status &&
+        ...(err?.status &&
           typeof err.status === 'number' &&
           err.data &&
           err.data.error &&
           typeof err.data.error === 'string' && {
-            description: err.data.error
-          })
+          description: err.data.error
+        })
       })
       queryClient.setQueryData(queryKey, oldData)
     }
@@ -70,7 +70,7 @@ const contextMenuStatus = ({
     getInstanceAccount,
     (prev, next) => prev.id === next.id
   )
-  const ownAccount = instanceAccount?.id === status?.account.id
+  const ownAccount = instanceAccount?.id === status?.account?.id
 
   if (ownAccount) {
     const accountMenuItems: ContextMenuAction[] = [
diff --git a/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx b/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
index 227f5d17..19b8caec 100644
--- a/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
+++ b/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
@@ -38,26 +38,26 @@ const ProfileAvatarHeader: React.FC<Props> = ({ type, messageRef }) => {
               ? { width: 400, height: 400 }
               : { width: 1500, height: 500 }
         })
-        if (!image[0].uri) {
+        if (image[0].uri) {
+          mutation.mutate({
+            theme,
+            messageRef,
+            message: {
+              text: `me.profile.root.${type}.title`,
+              succeed: true,
+              failed: true
+            },
+            type,
+            data: image[0].uri
+          })
+        } else {
           displayMessage({
             ref: messageRef,
             message: t('screenTabs:me.profile.mediaSelectionFailed'),
             theme: theme,
             type: 'error'
           })
-          return
         }
-        mutation.mutate({
-          theme,
-          messageRef,
-          message: {
-            text: `me.profile.root.${type}.title`,
-            succeed: true,
-            failed: true
-          },
-          type,
-          data: image[0].uri
-        })
       }}
     />
   )