From ac293f28c1e4fa006f2e048cd8d77e6908b1a6f8 Mon Sep 17 00:00:00 2001 From: Zhiyuan Zheng Date: Wed, 7 Jul 2021 17:19:13 +0200 Subject: [PATCH] Fix account moved crash When the account info was undefined, it may render fewer hooks --- src/screens/Tabs/Shared/Account/Information/Actions.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/screens/Tabs/Shared/Account/Information/Actions.tsx b/src/screens/Tabs/Shared/Account/Information/Actions.tsx index f8ebb9c2..bc3cb9f9 100644 --- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx +++ b/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 = ({ account, myInfo }) => { + if (!account) { + return null + } + const { t } = useTranslation('screenTabs') const navigation = useNavigation() @@ -65,7 +68,6 @@ const AccountInformationActions: React.FC = ({ account, myInfo }) => { getInstancePush, (prev, next) => prev?.global.value === next?.global.value ) - const instanceUri = useSelector(getInstanceUri) if (myInfo) { return (