diff --git a/src/components/PdsDialog.tsx b/src/components/PdsDialog.tsx index ee7e037ec..4f2fb0396 100644 --- a/src/components/PdsDialog.tsx +++ b/src/components/PdsDialog.tsx @@ -4,16 +4,18 @@ import { FontAwesomeIcon, type FontAwesomeIconStyle, } from '@fortawesome/react-native-fontawesome' -import {msg, Trans} from '@lingui/macro' +import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' +import {Trans} from '@lingui/react/macro' import {isBridgedPdsUrl, isBskyPdsUrl} from '#/state/queries/pds-label' const failedFaviconUrls = new Set() +import Svg, {G, Path, Rect} from 'react-native-svg' + import {atoms as a, useBreakpoints, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' -import Svg, {G, Path, Rect} from 'react-native-svg' import {InlineLinkText} from '#/components/Link' import {Text} from '#/components/Typography' @@ -75,37 +77,31 @@ export function PdsDialog({ size={36} /> - {/* - {displayName} - */} - - {isBsky && Bluesky-hosted PDS} - {isBridged && Fediverse bridge} - {!isBsky && !isBridged && Third-party PDS} + { + + {isBridged ? Fediverse : displayName} + + } + + {isBsky && Bluesky Social} - This badge represents the{' '} - - Personal Data Server - {' '} - this account is stored on:{' '} + This badge represents the Personal Data Server this account is + stored on:{' '} {displayName} - {'. '}A PDS is where your posts, follows, and other data live on - the AT Protocol network. + . A PDS is where posts, follows, and other data live on the AT + Protocol network. @@ -114,29 +110,40 @@ export function PdsDialog({ This account is bridged from the Fediverse via{' '} Bridgy Fed - . Their original account lives on a Fediverse platform such as - Mastodon. - - - )} - - {isBsky && ( - - - This account is hosted on one of Bluesky's first party PDS's. + .{' '} + {/* Their original account is avaiable at:{' '} + + {BridgedUrl} + */} )} - {!isBsky && !isBridged && ( + {!isBridged && ( - This account is self-hosted or uses a third-party PDS provider. + + Learn more + {' '} + about what a PDS is and how to{' '} + + self-host + {' '} + your own. )} diff --git a/src/state/persisted/schema.ts b/src/state/persisted/schema.ts index 7ba7f633c..d0e9e2d65 100644 --- a/src/state/persisted/schema.ts +++ b/src/state/persisted/schema.ts @@ -311,7 +311,7 @@ export const defaults: Schema = { highQualityImages: false, hideUnreplyablePosts: false, pdsLabel: { - enabled: false, + enabled: true, hideBskyPds: true, }, showExternalShareButtons: false,