diff options
author | Samuel Newman <mozzius@protonmail.com> | 2024-10-17 18:48:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-17 18:48:38 +0300 |
commit | 74b0929e4d79690394c1217f63e458da5bf7317b (patch) | |
tree | 0f285273e4ede1a5d3a408abe5f60db40af53c80 /src/components/AccountList.tsx | |
parent | 9a91746fbbd4d8e028195813bb0d47497a9cb4bf (diff) | |
download | voidsky-74b0929e4d79690394c1217f63e458da5bf7317b.tar.zst |
Logged out improvments (#5771)
* fetch all accounts in one go * delete unused component * add safeareaview to logged out layout * add safe area insets to LoggedOut view * add safe area insets to the error boundary * sanitize displaynames/handles * use button for X * increase spacing
Diffstat (limited to 'src/components/AccountList.tsx')
-rw-r--r-- | src/components/AccountList.tsx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/components/AccountList.tsx b/src/components/AccountList.tsx index 68bb482af..fe0daed50 100644 --- a/src/components/AccountList.tsx +++ b/src/components/AccountList.tsx @@ -1,9 +1,12 @@ import React, {useCallback} from 'react' import {View} from 'react-native' +import {AppBskyActorDefs} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useProfileQuery} from '#/state/queries/profile' +import {sanitizeDisplayName} from '#/lib/strings/display-names' +import {sanitizeHandle} from '#/lib/strings/handles' +import {useProfilesQuery} from '#/state/queries/profile' import {type SessionAccount, useSession} from '#/state/session' import {UserAvatar} from '#/view/com/util/UserAvatar' import {atoms as a, useTheme} from '#/alf' @@ -26,6 +29,9 @@ export function AccountList({ const {currentAccount, accounts} = useSession() const t = useTheme() const {_} = useLingui() + const {data: profiles} = useProfilesQuery({ + handles: accounts.map(acc => acc.did), + }) const onPressAddAccount = useCallback(() => { onSelectOther() @@ -43,6 +49,7 @@ export function AccountList({ {accounts.map(account => ( <React.Fragment key={account.did}> <AccountItem + profile={profiles?.profiles.find(p => p.did === account.did)} account={account} onSelect={onSelectAccount} isCurrentAccount={account.did === currentAccount?.did} @@ -84,11 +91,13 @@ export function AccountList({ } function AccountItem({ + profile, account, onSelect, isCurrentAccount, isPendingAccount, }: { + profile?: AppBskyActorDefs.ProfileViewDetailed account: SessionAccount onSelect: (account: SessionAccount) => void isCurrentAccount: boolean @@ -96,9 +105,8 @@ function AccountItem({ }) { const t = useTheme() const {_} = useLingui() - const {data: profile} = useProfileQuery({did: account.did}) - const onPress = React.useCallback(() => { + const onPress = useCallback(() => { onSelect(account) }, [account, onSelect]) @@ -127,10 +135,12 @@ function AccountItem({ </View> <Text style={[a.align_baseline, a.flex_1, a.flex_row, a.py_sm]}> <Text emoji style={[a.font_bold]}> - {profile?.displayName || account.handle}{' '} - </Text> + {sanitizeDisplayName( + profile?.displayName || profile?.handle || account.handle, + )} + </Text>{' '} <Text emoji style={[t.atoms.text_contrast_medium]}> - {account.handle} + {sanitizeHandle(account.handle)} </Text> </Text> {isCurrentAccount ? ( |