From ea787e5ad4fc39e00a566b21bd720f5af05bf0ef Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 11 May 2024 15:43:25 -0500 Subject: [PATCH] PublicTimeline: hide fediverse explanation on Nostr --- src/features/public-timeline/index.tsx | 65 ++++++++++++++------------ 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/src/features/public-timeline/index.tsx b/src/features/public-timeline/index.tsx index 736366ec2..a73ac7289 100644 --- a/src/features/public-timeline/index.tsx +++ b/src/features/public-timeline/index.tsx @@ -7,7 +7,7 @@ import { expandPublicTimeline } from 'soapbox/actions/timelines'; import { usePublicStream } from 'soapbox/api/hooks'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; import { Accordion, Column } from 'soapbox/components/ui'; -import { useAppSelector, useAppDispatch, useInstance, useSettings, useTheme } from 'soapbox/hooks'; +import { useAppSelector, useAppDispatch, useInstance, useSettings, useTheme, useFeatures } from 'soapbox/hooks'; import PinnedHostsPicker from '../remote-timeline/components/pinned-hosts-picker'; import Timeline from '../ui/components/timeline'; @@ -17,9 +17,10 @@ const messages = defineMessages({ dismiss: { id: 'fediverse_tab.explanation_box.dismiss', defaultMessage: 'Don\'t show again' }, }); -const CommunityTimeline = () => { +const PublicTimeline = () => { const intl = useIntl(); const dispatch = useAppDispatch(); + const features = useFeatures(); const theme = useTheme(); const instance = useInstance(); @@ -30,7 +31,7 @@ const CommunityTimeline = () => { const timelineId = 'public'; const explanationBoxExpanded = settings.explanationBox; - const showExplanationBox = settings.showExplanationBox; + const showExplanationBox = settings.showExplanationBox && !features.nostr; const dismissExplanationBox = () => { dispatch(changeSetting(['showExplanationBox'], false)); @@ -58,33 +59,35 @@ const CommunityTimeline = () => { - {showExplanationBox &&
- } - action={dismissExplanationBox} - actionIcon={require('@tabler/icons/outline/x.svg')} - actionLabel={intl.formatMessage(messages.dismiss)} - expanded={explanationBoxExpanded} - onToggle={toggleExplanationBox} - > - - - - ), - }} - /> - -
} + {showExplanationBox && ( +
+ } + action={dismissExplanationBox} + actionIcon={require('@tabler/icons/outline/x.svg')} + actionLabel={intl.formatMessage(messages.dismiss)} + expanded={explanationBoxExpanded} + onToggle={toggleExplanationBox} + > + + + + ), + }} + /> + +
+ )} { ); }; -export default CommunityTimeline; +export default PublicTimeline;