diff --git a/src/features/status/components/thread.tsx b/src/features/status/components/thread.tsx index 84d71d4469..b77b10e416 100644 --- a/src/features/status/components/thread.tsx +++ b/src/features/status/components/thread.tsx @@ -18,13 +18,12 @@ import { Stack } from 'soapbox/components/ui'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; import { HotKeys } from 'soapbox/features/ui/components/hotkeys'; import PendingStatus from 'soapbox/features/ui/components/pending-status'; -import { useAppDispatch, useAppSelector, useOwnAccount, useSettings } from 'soapbox/hooks'; +import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; import { RootState } from 'soapbox/store'; import { type Account, type Status } from 'soapbox/types/entities'; import { defaultMediaVisibility, textForScreenReader } from 'soapbox/utils/status'; import DetailedStatus from './detailed-status'; -import ThreadLoginCta from './thread-login-cta'; import ThreadStatus from './thread-status'; type DisplayMedia = 'default' | 'hide_all' | 'show_all'; @@ -97,7 +96,6 @@ const Thread = (props: IThread) => { const dispatch = useAppDispatch(); const history = useHistory(); const intl = useIntl(); - const { account: me } = useOwnAccount(); const settings = useSettings(); const displayMedia = settings.get('displayMedia') as DisplayMedia; @@ -459,8 +457,6 @@ const Thread = (props: IThread) => { {children} - - {!me && } ); }; diff --git a/src/features/status/index.tsx b/src/features/status/index.tsx index f2b882e0ab..c49d51b312 100644 --- a/src/features/status/index.tsx +++ b/src/features/status/index.tsx @@ -9,12 +9,13 @@ import { } from 'soapbox/actions/statuses'; import MissingIndicator from 'soapbox/components/missing-indicator'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; -import { Column } from 'soapbox/components/ui'; +import { Column, Stack } from 'soapbox/components/ui'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; +import { useAppDispatch, useAppSelector, useLoggedIn } from 'soapbox/hooks'; import { makeGetStatus } from 'soapbox/selectors'; import Thread from './components/thread'; +import ThreadLoginCta from './components/thread-login-cta'; const messages = defineMessages({ title: { id: 'status.title', defaultMessage: 'Post Details' }, @@ -47,6 +48,7 @@ interface IStatusDetails { const StatusDetails: React.FC = (props) => { const dispatch = useAppDispatch(); const intl = useIntl(); + const { isLoggedIn } = useLoggedIn(); const getStatus = useCallback(makeGetStatus(), []); const status = useAppSelector((state) => getStatus(state, { id: props.params.statusId })); @@ -113,15 +115,19 @@ const StatusDetails: React.FC = (props) => { }; return ( - - - - - + + + + + + + + {!isLoggedIn && } + ); };