diff --git a/src/components/dialogs/BirthDateSettings.tsx b/src/components/dialogs/BirthDateSettings.tsx index 9915d0a2d..c200a7c67 100644 --- a/src/components/dialogs/BirthDateSettings.tsx +++ b/src/components/dialogs/BirthDateSettings.tsx @@ -166,7 +166,7 @@ function BirthdayInner({ You must be at least 13 years old to use Bluesky. Read our{' '} Terms of Service {' '} diff --git a/src/components/dialogs/ServerInput.tsx b/src/components/dialogs/ServerInput.tsx index d7c02bb9f..fda1dfe4a 100644 --- a/src/components/dialogs/ServerInput.tsx +++ b/src/components/dialogs/ServerInput.tsx @@ -167,7 +167,7 @@ function DialogInner({ Bluesky is an open network where you can choose your own provider. If you're new here, we recommend sticking with the - default Bluesky Social option. + default syu.is option. diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index ed2a6cfb7..2f387b4a8 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -9,7 +9,6 @@ import {StackActions, useNavigation} from '@react-navigation/native' import {useActorStatus} from '#/lib/actor-status' -import {FEEDBACK_FORM_URL, HELP_DESK_URL} from '#/lib/constants' import {type PressableScale} from '#/lib/custom-animations/PressableScale' import {useNavigationTabState} from '#/lib/hooks/useNavigationTabState' @@ -33,22 +32,10 @@ import { Bell_Filled_Corner0_Rounded as BellFilled, Bell_Stroke2_Corner0_Rounded as Bell, } from '#/components/icons/Bell' -import {Bookmark, BookmarkFilled} from '#/components/icons/Bookmark' -import {BulletList_Stroke2_Corner0_Rounded as List} from '#/components/icons/BulletList' -import { - Hashtag_Filled_Corner0_Rounded as HashtagFilled, - Hashtag_Stroke2_Corner0_Rounded as Hashtag, -} from '#/components/icons/Hashtag' import { HomeOpen_Filled_Corner0_Rounded as HomeFilled, HomeOpen_Stoke2_Corner0_Rounded as Home, } from '#/components/icons/HomeOpen' import {MagnifyingGlass_Filled_Stroke2_Corner0_Rounded as MagnifyingGlassFilled} from '#/components/icons/MagnifyingGlass' import {MagnifyingGlass2_Stroke2_Corner0_Rounded as MagnifyingGlass} from '#/components/icons/MagnifyingGlass2' -import { - Message_Stroke2_Corner0_Rounded as Message, - Message_Stroke2_Corner0_Rounded_Filled as MessageFilled, -} from '#/components/icons/Message' import {SettingsGear2_Stroke2_Corner0_Rounded as Settings} from '#/components/icons/SettingsGear2' import { @@ -153,11 +140,7 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => { const { isAtHome, isAtSearch, - isAtFeeds, - isAtBookmarks, isAtNotifications, isAtMyProfile, - isAtMessages, } = useNavigationTabState() const {hasSession, currentAccount} = useSession() @@ -212,31 +195,6 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => { [onPressTab], ) - const onPressMessages = React.useCallback( - () => onPressTab('Messages'), - [onPressTab], - ) - const onPressNotifications = React.useCallback( () => onPressTab('Notifications'), [onPressTab], ) const onPressProfile = React.useCallback(() => { onPressTab('MyProfile') }, [onPressTab]) - const onPressMyFeeds = React.useCallback(() => { - navigation.navigate('Feeds') - setDrawerOpen(false) - }, [navigation, setDrawerOpen]) - - const onPressLists = React.useCallback(() => { - navigation.navigate('Lists') - setDrawerOpen(false) - }, [navigation, setDrawerOpen]) - - const onPressBookmarks = React.useCallback(() => { - navigation.navigate('Bookmarks') - setDrawerOpen(false) - }, [navigation, setDrawerOpen]) - const onPressSettings = React.useCallback(() => { navigation.navigate('Settings') setDrawerOpen(false) }, [navigation, setDrawerOpen]) - const onPressFeedback = React.useCallback(() => { - Linking.openURL( - FEEDBACK_FORM_URL({ - email: currentAccount?.email, - handle: currentAccount?.handle, - }), - ) - }, [currentAccount]) - - const onPressHelp = React.useCallback(() => { - Linking.openURL(HELP_DESK_URL) - }, []) - - // rendering - // = - return ( ): React.ReactNode => { <> - - - - ): React.ReactNode => { ) : ( <> - )} @@ -326,71 +274,12 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => { - - ) } -let DrawerFooter = ({ - onPressFeedback, - onPressHelp, -}: { - onPressFeedback: () => void - onPressHelp: () => void -}): React.ReactNode => { - const {_} = useLingui() - const insets = useSafeAreaInsets() - return ( - - - - - ) -} -DrawerFooter = React.memo(DrawerFooter) - interface MenuItemProps extends ComponentProps { icon: JSX.Element label: string @@ -448,32 +337,6 @@ let HomeMenuItem = ({ } HomeMenuItem = React.memo(HomeMenuItem) -let ChatMenuItem = ({ - isActive, - onPress, -}: { - isActive: boolean - onPress: () => void -}): React.ReactNode => { - const {_} = useLingui() - const t = useTheme() - return ( - - ) : ( - - ) - } - label={_(msg`Chat`)} - bold={isActive} - onPress={onPress} - /> - ) -} -ChatMenuItem = React.memo(ChatMenuItem) - let NotificationsMenuItem = ({ isActive, onPress, @@ -512,110 +375,6 @@ let NotificationsMenuItem = ({ } NotificationsMenuItem = React.memo(NotificationsMenuItem) -let FeedsMenuItem = ({ - isActive, - onPress, -}: { - isActive: boolean - onPress: () => void -}): React.ReactNode => { - const {_} = useLingui() - const t = useTheme() - return ( - - ) : ( - - ) - } - label={_(msg`Feeds`)} - bold={isActive} - onPress={onPress} - /> - ) -} -FeedsMenuItem = React.memo(FeedsMenuItem) - -let ListsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => { - const {_} = useLingui() - const t = useTheme() - - return ( - } - label={_(msg`Lists`)} - onPress={onPress} - /> - ) -} -ListsMenuItem = React.memo(ListsMenuItem) - -let BookmarksMenuItem = ({ - isActive, - onPress, -}: { - isActive: boolean - onPress: () => void -}): React.ReactNode => { - const {_} = useLingui() - const t = useTheme() - - return ( - - ) : ( - - ) - } - label={_(msg({message: 'Saved', context: 'link to bookmarks screen'}))} - onPress={onPress} - /> - ) -} -BookmarksMenuItem = React.memo(BookmarksMenuItem) - let ProfileMenuItem = ({ isActive, onPress, @@ -698,13 +457,13 @@ function ExtraLinks() { + to="https://syu.is/about/support/tos"> Terms of Service Privacy Policy diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index 1d097fc9a..e11a3a202 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -112,13 +112,13 @@ export function DesktopRightNav({routeName}: {routeName: string}) { )} {_(msg`Privacy`)} {' • '} {_(msg`Terms`)}