diff options
Diffstat (limited to 'src/view/shell')
| -rw-r--r-- | src/view/shell/Drawer.tsx | 55 | ||||
| -rw-r--r-- | src/view/shell/desktop/RightNav.tsx | 87 |
2 files changed, 3 insertions, 139 deletions
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index 62a6b9040..2a37d1fe9 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -44,12 +44,10 @@ import {formatCountShortOnly} from 'view/com/util/numeric/format' import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useSetDrawerOpen} from '#/state/shell' -import {useModalControls} from '#/state/modals' import {useSession, SessionAccount} from '#/state/session' import {useProfileQuery} from '#/state/queries/profile' import {useUnreadNotifications} from '#/state/queries/notifications/unread' import {emitSoftReset} from '#/state/events' -import {useInviteCodesQuery} from '#/state/queries/invites' import {NavSignupCard} from '#/view/shell/NavSignupCard' import {TextLink} from '../com/util/Link' @@ -228,8 +226,7 @@ let DrawerContent = ({}: {}): React.ReactNode => { {hasSession ? ( <> - <InviteCodes /> - <View style={{height: 10}} /> + <View style={{height: 16}} /> <SearchMenuItem isActive={isAtSearch} onPress={onPressSearch} /> <HomeMenuItem isActive={isAtHome} onPress={onPressHome} /> <NotificationsMenuItem @@ -621,56 +618,6 @@ function MenuItem({ ) } -let InviteCodes = ({}: {}): React.ReactNode => { - const {track} = useAnalytics() - const setDrawerOpen = useSetDrawerOpen() - const pal = usePalette('default') - const {data: invites} = useInviteCodesQuery() - const invitesAvailable = invites?.available?.length ?? 0 - const {openModal} = useModalControls() - const {_} = useLingui() - - const onPress = React.useCallback(() => { - track('Menu:ItemClicked', {url: '#invite-codes'}) - setDrawerOpen(false) - openModal({name: 'invite-codes'}) - }, [openModal, track, setDrawerOpen]) - - return ( - <TouchableOpacity - testID="menuItemInviteCodes" - style={styles.inviteCodes} - onPress={onPress} - accessibilityRole="button" - accessibilityLabel={_(msg`Invite codes: ${invitesAvailable} available`)} - accessibilityHint={_(msg`Opens list of invite codes`)} - disabled={invites?.disabled}> - <FontAwesomeIcon - icon="ticket" - style={[ - styles.inviteCodesIcon, - invitesAvailable > 0 ? pal.link : pal.textLight, - ]} - size={18} - /> - <Text - type="lg-medium" - style={invitesAvailable > 0 ? pal.link : pal.textLight}> - {invites?.disabled ? ( - <Trans> - Your invite codes are hidden when logged in using an App Password - </Trans> - ) : invitesAvailable === 1 ? ( - <Trans>{invitesAvailable} invite code available</Trans> - ) : ( - <Trans>{invitesAvailable} invite codes available</Trans> - )} - </Text> - </TouchableOpacity> - ) -} -InviteCodes = React.memo(InviteCodes) - const styles = StyleSheet.create({ view: { flex: 1, diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index d955832aa..264fef194 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -1,6 +1,5 @@ import React from 'react' -import {StyleSheet, TouchableOpacity, View} from 'react-native' -import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' +import {StyleSheet, View} from 'react-native' import {usePalette} from 'lib/hooks/usePalette' import {DesktopSearch} from './Search' import {DesktopFeeds} from './Feeds' @@ -9,12 +8,9 @@ import {TextLink} from 'view/com/util/Link' import {FEEDBACK_FORM_URL, HELP_DESK_URL} from 'lib/constants' import {s} from 'lib/styles' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' -import {formatCount} from 'view/com/util/numeric/format' -import {useModalControls} from '#/state/modals' import {useLingui} from '@lingui/react' -import {Plural, Trans, msg, plural} from '@lingui/macro' +import {Trans, msg} from '@lingui/macro' import {useSession} from '#/state/session' -import {useInviteCodesQuery} from '#/state/queries/invites' export function DesktopRightNav({routeName}: {routeName: string}) { const pal = usePalette('default') @@ -103,78 +99,11 @@ export function DesktopRightNav({routeName}: {routeName: string}) { /> </View> </View> - - {hasSession && <InviteCodes />} </View> </View> ) } -function InviteCodes() { - const pal = usePalette('default') - const {openModal} = useModalControls() - const {data: invites} = useInviteCodesQuery() - const invitesAvailable = invites?.available?.length ?? 0 - const {_} = useLingui() - - const onPress = React.useCallback(() => { - openModal({name: 'invite-codes'}) - }, [openModal]) - - if (!invites) { - return null - } - - if (invites?.disabled) { - return ( - <View style={[styles.inviteCodes, pal.border]}> - <FontAwesomeIcon - icon="ticket" - style={[styles.inviteCodesIcon, pal.textLight]} - size={16} - /> - <Text type="md-medium" style={pal.textLight}> - <Trans> - Your invite codes are hidden when logged in using an App Password - </Trans> - </Text> - </View> - ) - } - - return ( - <TouchableOpacity - style={[styles.inviteCodes, pal.border]} - onPress={onPress} - accessibilityRole="button" - accessibilityLabel={_( - plural(invitesAvailable, { - one: 'Invite codes: # available', - other: 'Invite codes: # available', - }), - )} - accessibilityHint={_(msg`Opens list of invite codes`)}> - <FontAwesomeIcon - icon="ticket" - style={[ - styles.inviteCodesIcon, - invitesAvailable > 0 ? pal.link : pal.textLight, - ]} - size={16} - /> - <Text - type="md-medium" - style={invitesAvailable > 0 ? pal.link : pal.textLight}> - <Plural - value={formatCount(invitesAvailable)} - one="# invite code available" - other="# invite codes available" - /> - </Text> - </TouchableOpacity> - ) -} - const styles = StyleSheet.create({ rightNav: { // @ts-ignore web only @@ -193,18 +122,6 @@ const styles = StyleSheet.create({ messageLine: { marginBottom: 10, }, - - inviteCodes: { - borderTopWidth: 1, - paddingHorizontal: 12, - paddingVertical: 12, - flexDirection: 'row', - }, - inviteCodesIcon: { - marginTop: 2, - marginRight: 6, - flexShrink: 0, - }, desktopFeedsContainer: { borderTopWidth: 1, borderBottomWidth: 1, |