diff --git a/src/screens/Tabs/Shared/Account/Information/Account.tsx b/src/screens/Tabs/Shared/Account/Information/Account.tsx index 38bb05a6..1f8c191f 100644 --- a/src/screens/Tabs/Shared/Account/Information/Account.tsx +++ b/src/screens/Tabs/Shared/Account/Information/Account.tsx @@ -1,6 +1,6 @@ import Icon from '@components/Icon' import CustomText from '@components/Text' -import { getAccountStorage, useAccountStorage } from '@utils/storage/actions' +import { useAccountStorage } from '@utils/storage/actions' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' import React, { useContext } from 'react' @@ -16,7 +16,7 @@ const AccountInformationAccount: React.FC = () => { const { colors } = useTheme() const [acct] = useAccountStorage.string('auth.account.acct') - const domain = getAccountStorage.string('auth.account.domain') + const [domain] = useAccountStorage.string('auth.account.domain') const localInstance = account?.acct?.includes('@') ? account?.acct?.includes(`@${domain}`) : true diff --git a/src/screens/Tabs/Shared/Account/Information/Avatar.tsx b/src/screens/Tabs/Shared/Account/Information/Avatar.tsx index 27cc281e..8865f8a1 100644 --- a/src/screens/Tabs/Shared/Account/Information/Avatar.tsx +++ b/src/screens/Tabs/Shared/Account/Information/Avatar.tsx @@ -3,7 +3,7 @@ import { useNavigation } from '@react-navigation/native' import { StackNavigationProp } from '@react-navigation/stack' import navigationRef from '@utils/navigation/navigationRef' import { TabLocalStackParamList } from '@utils/navigation/navigators' -import { useGlobalStorage } from '@utils/storage/actions' +import { useAccountStorage } from '@utils/storage/actions' import { StyleConstants } from '@utils/styles/constants' import React, { useContext } from 'react' import AccountContext from '../Context' @@ -13,7 +13,7 @@ const AccountInformationAvatar: React.FC = () => { const navigation = useNavigation>() - useGlobalStorage.string('account.active') + const [accountAvatarStatic] = useAccountStorage.string('auth.account.avatar_static') return ( { width: StyleConstants.Avatar.L, height: StyleConstants.Avatar.L }} - uri={{ original: account?.avatar, static: account?.avatar_static }} + uri={{ + original: account?.avatar || (pageMe ? accountAvatarStatic : undefined), + static: account?.avatar_static || (pageMe ? accountAvatarStatic : undefined) + }} onPress={() => { if (account) { if (pageMe) {