diff --git a/packages/pl-fe/src/components/status-reply-mentions.tsx b/packages/pl-fe/src/components/status-reply-mentions.tsx index 895793943..b3c344ec7 100644 --- a/packages/pl-fe/src/components/status-reply-mentions.tsx +++ b/packages/pl-fe/src/components/status-reply-mentions.tsx @@ -90,7 +90,7 @@ const StatusReplyMentions: React.FC = ({ status, hoverable } return ( -
+
= ({ status, hoverable if (hoverable) { return ( - + {children} diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx index 727096bb9..3564708b7 100644 --- a/packages/pl-fe/src/components/status.tsx +++ b/packages/pl-fe/src/components/status.tsx @@ -7,7 +7,6 @@ import { mentionCompose, replyCompose } from 'pl-fe/actions/compose'; import { unfilterStatus } from 'pl-fe/actions/statuses'; import Card from 'pl-fe/components/ui/card'; 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 AccountContainer from 'pl-fe/containers/account-container'; import Emojify from 'pl-fe/features/emoji/emojify'; @@ -414,17 +413,15 @@ const Status: React.FC = (props) => {
- - {actualStatus.event ? : ( - - )} - + {actualStatus.event ? : ( + + )} diff --git a/packages/pl-fe/src/features/status/components/thread-login-cta.tsx b/packages/pl-fe/src/features/status/components/thread-login-cta.tsx deleted file mode 100644 index 1c3167dd6..000000000 --- a/packages/pl-fe/src/features/status/components/thread-login-cta.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import { FormattedMessage } from 'react-intl'; - -import Button from 'pl-fe/components/ui/button'; -import Card, { CardTitle } from 'pl-fe/components/ui/card'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; - -/** Prompts logged-out users to log in when viewing a thread. */ -const ThreadLoginCta: React.FC = () => { - const instance = useInstance(); - const { displayCta } = usePlFeConfig(); - - if (!displayCta) return null; - - return ( - - - } /> - - - - - - - - - - - ); -}; - -export { ThreadLoginCta as default }; diff --git a/packages/pl-fe/src/locales/en.json b/packages/pl-fe/src/locales/en.json index 6cf80c294..c8bf49cde 100644 --- a/packages/pl-fe/src/locales/en.json +++ b/packages/pl-fe/src/locales/en.json @@ -1307,7 +1307,6 @@ "plfe_config.crypto_address.meta_fields.note_placeholder": "Note (optional)", "plfe_config.crypto_address.meta_fields.ticker_placeholder": "Ticker", "plfe_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Number of items to display in the crypto homepage widget", - "plfe_config.cta_label": "Display call to action panels if not authenticated", "plfe_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.", "plfe_config.fields.crypto_addresses_label": "Cryptocurrency addresses", "plfe_config.fields.edit_theme_label": "Edit theme", @@ -1775,9 +1774,7 @@ "theme_toggle.light": "Light", "theme_toggle.system": "System", "thread_login.login": "Log in", - "thread_login.message": "Join {siteTitle} to get the full story and details.", "thread_login.signup": "Sign up", - "thread_login.title": "Continue the conversation", "time_remaining.days": "{number, plural, one {# day} other {# days}} left", "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left", "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left", diff --git a/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts b/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts index a4fef5286..c1f258e4f 100644 --- a/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts +++ b/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts @@ -72,7 +72,6 @@ const plFeConfigSchema = coerceObject({ authenticatedProfile: v.fallback(v.boolean(), false), linkFooterMessage: v.fallback(v.string(), ''), links: v.fallback(v.record(v.string(), v.string()), {}), - displayCta: v.fallback(v.boolean(), false), tileServer: v.fallback(v.string(), ''), tileServerAttribution: v.fallback(v.string(), ''), redirectRootNoLogin: v.fallback(v.pipe(v.string(), v.transform((url: string) => { diff --git a/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx b/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx index e9386562f..fdb25ede7 100644 --- a/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx +++ b/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx @@ -42,7 +42,6 @@ const messages = defineMessages({ greentextLabel: { id: 'plfe_config.greentext_label', defaultMessage: 'Enable greentext support' }, authenticatedProfileLabel: { id: 'plfe_config.authenticated_profile_label', defaultMessage: 'Profiles require authentication' }, authenticatedProfileHint: { id: 'plfe_config.authenticated_profile_hint', defaultMessage: 'Users must be logged-in to view replies and media on user profiles.' }, - displayCtaLabel: { id: 'plfe_config.cta_label', defaultMessage: 'Display call to action panels if not authenticated' }, mediaPreviewLabel: { id: 'plfe_config.media_preview_label', defaultMessage: 'Prefer preview media for thumbnails' }, mediaPreviewHint: { id: 'plfe_config.media_preview_hint', defaultMessage: 'Some backends provide an optimized version of media for display in timelines. However, these preview images may be too small without additional configuration.' }, tileServerLabel: { id: 'plfe_config.tile_server_label', defaultMessage: 'Map tile server' }, @@ -268,13 +267,6 @@ const PlFeConfigEditor: React.FC = () => { /> - - e.target.checked)} - /> - - = (props) => { const dispatch = useAppDispatch(); const intl = useIntl(); - const { isLoggedIn } = useLoggedIn(); const getStatus = useCallback(makeGetStatus(), []); const status = useAppSelector((state) => getStatus(state, { id: props.params.statusId })); @@ -149,8 +146,6 @@ const StatusPage: React.FC = (props) => { setExpandAllStatuses(() => fn)} /> - - {!isLoggedIn && } ); };