Merge pull request #152 from tooot-app/main

Release candidate v2.1.1

package.json

@@ -4,7 +4,7 @@
     "native": "210511",
     "major": 2,
     "minor": 1,
-    "patch": 0,
+    "patch": 1,
     "expo": "41.0.0"
   },
   "description": "tooot app for Mastodon",

src/components/Timeline/Default.tsx

@@ -49,7 +49,7 @@ const TimelineDefault: React.FC<Props> = ({
     StackNavigationProp<Nav.TabLocalStackParamList>
   >()
 
-  let actualStatus = item.reblog ? item.reblog : item
+  const actualStatus = item.reblog ? item.reblog : item
 
   const ownAccount = actualStatus.account.id === instanceAccount?.id
 

src/screens/Tabs/Shared/Account/Information/Actions.tsx

@@ -5,8 +5,7 @@ import { useNavigation } from '@react-navigation/native'
 import { useRelationshipQuery } from '@utils/queryHooks/relationship'
 import {
   getInstanceAccount,
-  getInstancePush,
-  getInstanceUri
+  getInstancePush
 } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import React from 'react'
@@ -41,6 +40,10 @@ const Conversation = ({ account }: { account: Mastodon.Account }) => {
 }
 
 const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
+  if (!account) {
+    return null
+  }
+
   const { t } = useTranslation('screenTabs')
   const navigation = useNavigation()
 
@@ -65,7 +68,6 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
     getInstancePush,
     (prev, next) => prev?.global.value === next?.global.value
   )
-  const instanceUri = useSelector(getInstanceUri)
 
   if (myInfo) {
     return (