diff options
Diffstat (limited to 'src/view')
| -rw-r--r-- | src/view/com/util/AccountDropdownBtn.tsx | 6 | ||||
| -rw-r--r-- | src/view/screens/Settings.tsx | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/view/com/util/AccountDropdownBtn.tsx b/src/view/com/util/AccountDropdownBtn.tsx index 2042531e9..158ed9b6d 100644 --- a/src/view/com/util/AccountDropdownBtn.tsx +++ b/src/view/com/util/AccountDropdownBtn.tsx @@ -5,23 +5,23 @@ import { FontAwesomeIconStyle, } from '@fortawesome/react-native-fontawesome' import {s} from 'lib/styles' -import {useStores} from 'state/index' import {usePalette} from 'lib/hooks/usePalette' import {DropdownItem, NativeDropdown} from './forms/NativeDropdown' import * as Toast from '../../com/util/Toast' +import {useSessionApi} from '#/state/session' import {useLingui} from '@lingui/react' import {msg} from '@lingui/macro' export function AccountDropdownBtn({handle}: {handle: string}) { - const store = useStores() const pal = usePalette('default') + const {removeAccount} = useSessionApi() const {_} = useLingui() const items: DropdownItem[] = [ { label: 'Remove account', onPress: () => { - store.session.removeAccount(handle) + removeAccount({handle}) Toast.show('Account removed from quick access') }, icon: { diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx index 010de23db..062533c27 100644 --- a/src/view/screens/Settings.tsx +++ b/src/view/screens/Settings.tsx @@ -57,6 +57,7 @@ import { useRequireAltTextEnabled, useSetRequireAltTextEnabled, } from '#/state/preferences' +import {useSession, useSessionApi} from '#/state/session' // TEMPORARY (APP-700) // remove after backend testing finishes @@ -87,6 +88,8 @@ export const SettingsScreen = withAuthRequired( store.agent, ) const {openModal} = useModalControls() + const {logout} = useSessionApi() + const {accounts} = useSession() const primaryBg = useCustomPalette<ViewStyle>({ light: {backgroundColor: colors.blue0}, @@ -153,8 +156,9 @@ export const SettingsScreen = withAuthRequired( const onPressSignout = React.useCallback(() => { track('Settings:SignOutButtonClicked') + logout() store.session.logout() - }, [track, store]) + }, [track, store, logout]) const onPressDeleteAccount = React.useCallback(() => { openModal({name: 'delete-account'}) @@ -294,7 +298,7 @@ export const SettingsScreen = withAuthRequired( </View> </Link> )} - {store.session.switchableAccounts.map(account => ( + {accounts.map(account => ( <TouchableOpacity testID={`switchToAccountBtn-${account.handle}`} key={account.did} @@ -306,10 +310,11 @@ export const SettingsScreen = withAuthRequired( accessibilityLabel={`Switch to ${account.handle}`} accessibilityHint="Switches the account you are logged in to"> <View style={styles.avi}> - <UserAvatar size={40} avatar={account.aviUrl} /> + {/*<UserAvatar size={40} avatar={account.aviUrl} />*/} </View> <View style={[s.flex1]}> <Text type="md-bold" style={pal.text}> + {/* @ts-ignore */} {account.displayName || account.handle} </Text> <Text type="sm" style={pal.textLight}> |