diff --git a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx index ee930ffdb..e11e97e23 100644 --- a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx @@ -12,8 +12,8 @@ import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import Emojify from 'pl-fe/features/emoji/emojify'; +import { useAcct } from 'pl-fe/hooks/use-acct'; import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; import { accountScrobbleQueryOptions } from 'pl-fe/queries/accounts/account-scrobble'; import { capitalize } from 'pl-fe/utils/strings'; @@ -40,7 +40,7 @@ interface IProfileInfoPanel { /** User profile metadata, such as location, birthday, etc. */ const ProfileInfoPanel: React.FC = ({ account, username }) => { const intl = useIntl(); - const { displayFqn } = usePlFeConfig(); + const acct = useAcct(account); const me = useAppSelector(state => state.me); const ownAccount = account?.id === me; @@ -152,7 +152,7 @@ const ProfileInfoPanel: React.FC = ({ account, username }) => - @{displayFqn ? account.fqn : account.acct} + @{acct} {account.locked && ( diff --git a/packages/pl-fe/src/hooks/use-acct.ts b/packages/pl-fe/src/hooks/use-acct.ts index 7f05392df..521d81cf0 100644 --- a/packages/pl-fe/src/hooks/use-acct.ts +++ b/packages/pl-fe/src/hooks/use-acct.ts @@ -11,7 +11,6 @@ import type { Account } from 'pl-api'; const useAcct = (account?: Pick): string | undefined => { const fqn = useAppSelector((state) => displayFqn(state)); const instance = useInstance(); - const localUrl = useOwnAccount().account?.url; return useMemo(() => { diff --git a/packages/pl-fe/src/utils/accounts.ts b/packages/pl-fe/src/utils/accounts.ts index 7c0c72018..83e1a076d 100644 --- a/packages/pl-fe/src/utils/accounts.ts +++ b/packages/pl-fe/src/utils/accounts.ts @@ -22,12 +22,7 @@ const getBaseURL = (account: Pick): string => { } }; -const getAcct = (account: Pick, displayFqn: boolean): string => ( - displayFqn === true ? account.fqn : account.acct -); - export { getDomain, getBaseURL, - getAcct, };