diff --git a/packages/pl-fe/src/features/status/components/detailed-status.tsx b/packages/pl-fe/src/features/status/components/detailed-status.tsx index 728b5db95..fa4ab94c9 100644 --- a/packages/pl-fe/src/features/status/components/detailed-status.tsx +++ b/packages/pl-fe/src/features/status/components/detailed-status.tsx @@ -2,6 +2,7 @@ import React, { useRef } from 'react'; import { FormattedDate, FormattedMessage, useIntl } from 'react-intl'; import { Link } from 'react-router-dom'; +import { useGroup } from 'pl-fe/api/hooks'; import Account from 'pl-fe/components/account'; import StatusContent from 'pl-fe/components/status-content'; import StatusLanguagePicker from 'pl-fe/components/status-language-picker'; @@ -34,12 +35,14 @@ const DetailedStatus: React.FC = ({ const node = useRef(null); + const groupQuery = useGroup(status.group_id || undefined); + const handleOpenCompareHistoryModal = () => { onOpenCompareHistoryModal(status); }; const renderStatusInfo = () => { - if (status.group) { + if (groupQuery.group) { return (
= ({ defaultMessage='Posted in {group}' values={{ group: ( - + - + diff --git a/packages/pl-fe/src/features/status/index.tsx b/packages/pl-fe/src/features/status/index.tsx index 66db83e47..7acb44d1f 100644 --- a/packages/pl-fe/src/features/status/index.tsx +++ b/packages/pl-fe/src/features/status/index.tsx @@ -88,9 +88,9 @@ const StatusDetails: React.FC = (props) => { ); } - if (status.group && typeof status.group === 'object') { - if (status.group.id && !props.params.groupId) { - return ; + if (status.group_id) { + if (status.group_id && !props.params.groupId) { + return ; } } diff --git a/packages/pl-fe/src/features/ui/components/pending-status.tsx b/packages/pl-fe/src/features/ui/components/pending-status.tsx index c3cfc7862..6c303dd7f 100644 --- a/packages/pl-fe/src/features/ui/components/pending-status.tsx +++ b/packages/pl-fe/src/features/ui/components/pending-status.tsx @@ -36,7 +36,7 @@ const PendingStatusMedia: React.FC = ({ status }) => { media={status.media_attachments} /> ); - } else if (!status.quote && shouldHaveCard(status)) { + } else if (!status.quote_id && shouldHaveCard(status)) { return ; } else { return null; diff --git a/packages/pl-fe/src/pl-hooks/hooks/statuses/useStatus.ts b/packages/pl-fe/src/pl-hooks/hooks/statuses/useStatus.ts index 9b3bcfe25..de3cb1302 100644 --- a/packages/pl-fe/src/pl-hooks/hooks/statuses/useStatus.ts +++ b/packages/pl-fe/src/pl-hooks/hooks/statuses/useStatus.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { useIntl } from 'react-intl'; -import { useAccount, useGroup } from 'pl-fe/api/hooks'; +import { useAccount } from 'pl-fe/api/hooks'; import { useAppSelector, useClient } from 'pl-fe/hooks'; import { importEntities } from 'pl-fe/pl-hooks/importer'; import { queryClient } from 'pl-fe/queries/client'; @@ -109,12 +109,10 @@ const useStatus = (statusId?: string) => { const status = statusQuery.data; const { account } = useAccount(status?.account_id || undefined); - const { group } = useGroup(status?.group_id || undefined); // : (Status & { // account: Account; // accounts: Array; - // group: Group | null; // reblog: Status | null; // }) | null const data = useAppSelector((state) => { @@ -125,11 +123,9 @@ const useStatus = (statusId?: string) => { ...status, account: account!, accounts, - group, // quote, // reblog, // poll - }; });