Remove Moderation from sidebar (#3692) · jeanmachine.dev/witchsky.app@05212ca

+43 -43

src/view/screens/Settings/index.tsx

··· 494 494 </Text> 495 495 </TouchableOpacity> 496 496 <TouchableOpacity 497 + testID="languageSettingsBtn" 498 + style={[ 499 + styles.linkCard, 500 + pal.view, 501 + isSwitchingAccounts && styles.dimmed, 502 + ]} 503 + onPress={isSwitchingAccounts ? undefined : onPressLanguageSettings} 504 + accessibilityRole="button" 505 + accessibilityLabel={_(msg`Language settings`)} 506 + accessibilityHint={_(msg`Opens configurable language settings`)}> 507 + <View style={[styles.iconContainer, pal.btn]}> 508 + <FontAwesomeIcon 509 + icon="language" 510 + style={pal.text as FontAwesomeIconStyle} 511 + /> 512 + </View> 513 + <Text type="lg" style={pal.text}> 514 + <Trans>Languages</Trans> 515 + </Text> 516 + </TouchableOpacity> 517 + <TouchableOpacity 518 + testID="moderationBtn" 519 + style={[ 520 + styles.linkCard, 521 + pal.view, 522 + isSwitchingAccounts && styles.dimmed, 523 + ]} 524 + onPress={ 525 + isSwitchingAccounts 526 + ? undefined 527 + : () => navigation.navigate('Moderation') 528 + } 529 + accessibilityRole="button" 530 + accessibilityLabel={_(msg`Moderation settings`)} 531 + accessibilityHint={_(msg`Opens moderation settings`)}> 532 + <View style={[styles.iconContainer, pal.btn]}> 533 + <HandIcon style={pal.text} size={18} strokeWidth={6} /> 534 + </View> 535 + <Text type="lg" style={pal.text}> 536 + <Trans>Moderation</Trans> 537 + </Text> 538 + </TouchableOpacity> 539 + <TouchableOpacity 497 540 testID="preferencesHomeFeedButton" 498 541 style={[ 499 542 styles.linkCard, ··· 552 595 </View> 553 596 <Text type="lg" style={pal.text}> 554 597 <Trans>My Saved Feeds</Trans> 555 - </Text> 556 - </TouchableOpacity> 557 - <TouchableOpacity 558 - testID="languageSettingsBtn" 559 - style={[ 560 - styles.linkCard, 561 - pal.view, 562 - isSwitchingAccounts && styles.dimmed, 563 - ]} 564 - onPress={isSwitchingAccounts ? undefined : onPressLanguageSettings} 565 - accessibilityRole="button" 566 - accessibilityLabel={_(msg`Language settings`)} 567 - accessibilityHint={_(msg`Opens configurable language settings`)}> 568 - <View style={[styles.iconContainer, pal.btn]}> 569 - <FontAwesomeIcon 570 - icon="language" 571 - style={pal.text as FontAwesomeIconStyle} 572 - /> 573 - </View> 574 - <Text type="lg" style={pal.text}> 575 - <Trans>Languages</Trans> 576 - </Text> 577 - </TouchableOpacity> 578 - <TouchableOpacity 579 - testID="moderationBtn" 580 - style={[ 581 - styles.linkCard, 582 - pal.view, 583 - isSwitchingAccounts && styles.dimmed, 584 - ]} 585 - onPress={ 586 - isSwitchingAccounts 587 - ? undefined 588 - : () => navigation.navigate('Moderation') 589 - } 590 - accessibilityRole="button" 591 - accessibilityLabel={_(msg`Moderation settings`)} 592 - accessibilityHint={_(msg`Opens moderation settings`)}> 593 - <View style={[styles.iconContainer, pal.btn]}> 594 - <HandIcon style={pal.text} size={18} strokeWidth={6} /> 595 - </View> 596 - <Text type="lg" style={pal.text}> 597 - <Trans>Moderation</Trans> 598 598 </Text> 599 599 </TouchableOpacity> 600 600

-27

src/view/shell/Drawer.tsx

··· 30 30 BellIcon, 31 31 BellIconSolid, 32 32 CogIcon, 33 - HandIcon, 34 33 HashtagIcon, 35 34 HomeIcon, 36 35 HomeIconSolid, ··· 177 176 setDrawerOpen(false) 178 177 }, [navigation, track, setDrawerOpen]) 179 178 180 - const onPressModeration = React.useCallback(() => { 181 - track('Menu:ItemClicked', {url: 'Moderation'}) 182 - navigation.navigate('Moderation') 183 - setDrawerOpen(false) 184 - }, [navigation, track, setDrawerOpen]) 185 - 186 179 const onPressSettings = React.useCallback(() => { 187 180 track('Menu:ItemClicked', {url: 'Settings'}) 188 181 navigation.navigate('Settings') ··· 240 233 /> 241 234 <FeedsMenuItem isActive={isAtFeeds} onPress={onPressMyFeeds} /> 242 235 <ListsMenuItem onPress={onPressLists} /> 243 - <ModerationMenuItem onPress={onPressModeration} /> 244 236 <ProfileMenuItem 245 237 isActive={isAtMyProfile} 246 238 onPress={onPressProfile} ··· 506 498 ) 507 499 } 508 500 ListsMenuItem = React.memo(ListsMenuItem) 509 - 510 - let ModerationMenuItem = ({ 511 - onPress, 512 - }: { 513 - onPress: () => void 514 - }): React.ReactNode => { 515 - const {_} = useLingui() 516 - const pal = usePalette('default') 517 - return ( 518 - <MenuItem 519 - icon={<HandIcon strokeWidth={5} style={pal.text} size={24} />} 520 - label={_(msg`Moderation`)} 521 - accessibilityLabel={_(msg`Moderation`)} 522 - accessibilityHint="" 523 - onPress={onPress} 524 - /> 525 - ) 526 - } 527 - ModerationMenuItem = React.memo(ModerationMenuItem) 528 501 529 502 let ProfileMenuItem = ({ 530 503 isActive,

+30 -48

src/view/shell/desktop/LeftNav.tsx

··· 1 1 import React from 'react' 2 2 import {StyleSheet, TouchableOpacity, View} from 'react-native' 3 - import {PressableWithHover} from 'view/com/util/PressableWithHover' 3 + import { 4 + FontAwesomeIcon, 5 + FontAwesomeIconStyle, 6 + } from '@fortawesome/react-native-fontawesome' 7 + import {msg, Trans} from '@lingui/macro' 8 + import {useLingui} from '@lingui/react' 4 9 import { 5 10 useLinkProps, 6 11 useNavigation, 7 12 useNavigationState, 8 13 } from '@react-navigation/native' 9 - import { 10 - FontAwesomeIcon, 11 - FontAwesomeIconStyle, 12 - } from '@fortawesome/react-native-fontawesome' 13 - import {Text} from 'view/com/util/text/Text' 14 - import {UserAvatar} from 'view/com/util/UserAvatar' 15 - import {Link} from 'view/com/util/Link' 16 - import {LoadingPlaceholder} from 'view/com/util/LoadingPlaceholder' 14 + 15 + import {isInvalidHandle} from '#/lib/strings/handles' 16 + import {emitSoftReset} from '#/state/events' 17 + import {useFetchHandle} from '#/state/queries/handle' 18 + import {useUnreadNotifications} from '#/state/queries/notifications/unread' 19 + import {useProfileQuery} from '#/state/queries/profile' 20 + import {useSession} from '#/state/session' 21 + import {useComposerControls} from '#/state/shell/composer' 17 22 import {usePalette} from 'lib/hooks/usePalette' 18 23 import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' 19 - import {s, colors} from 'lib/styles' 20 24 import { 21 - HomeIcon, 22 - HomeIconSolid, 23 - MagnifyingGlassIcon2, 24 - MagnifyingGlassIcon2Solid, 25 25 BellIcon, 26 26 BellIconSolid, 27 - UserIcon, 28 - UserIconSolid, 29 27 CogIcon, 30 28 CogIconSolid, 31 29 ComposeIcon2, 32 - ListIcon, 33 30 HashtagIcon, 34 - HandIcon, 31 + HomeIcon, 32 + HomeIconSolid, 33 + ListIcon, 34 + MagnifyingGlassIcon2, 35 + MagnifyingGlassIcon2Solid, 36 + UserIcon, 37 + UserIconSolid, 35 38 } from 'lib/icons' 36 - import {getCurrentRoute, isTab, isStateAtTabRoot} from 'lib/routes/helpers' 37 - import {NavigationProp, CommonNavigatorParams} from 'lib/routes/types' 38 - import {router} from '../../../routes' 39 + import {getCurrentRoute, isStateAtTabRoot, isTab} from 'lib/routes/helpers' 39 40 import {makeProfileLink} from 'lib/routes/links' 40 - import {useLingui} from '@lingui/react' 41 - import {Trans, msg} from '@lingui/macro' 42 - import {useProfileQuery} from '#/state/queries/profile' 43 - import {useSession} from '#/state/session' 44 - import {useUnreadNotifications} from '#/state/queries/notifications/unread' 45 - import {useComposerControls} from '#/state/shell/composer' 46 - import {useFetchHandle} from '#/state/queries/handle' 47 - import {emitSoftReset} from '#/state/events' 41 + import {CommonNavigatorParams, NavigationProp} from 'lib/routes/types' 42 + import {colors, s} from 'lib/styles' 48 43 import {NavSignupCard} from '#/view/shell/NavSignupCard' 49 - import {isInvalidHandle} from '#/lib/strings/handles' 44 + import {Link} from 'view/com/util/Link' 45 + import {LoadingPlaceholder} from 'view/com/util/LoadingPlaceholder' 46 + import {PressableWithHover} from 'view/com/util/PressableWithHover' 47 + import {Text} from 'view/com/util/text/Text' 48 + import {UserAvatar} from 'view/com/util/UserAvatar' 49 + import {router} from '../../../routes' 50 50 51 51 function ProfileCard() { 52 52 const {currentAccount} = useSession() ··· 381 381 /> 382 382 } 383 383 label={_(msg`Lists`)} 384 - /> 385 - <NavItem 386 - href="/moderation" 387 - icon={ 388 - <HandIcon 389 - style={pal.text} 390 - size={isDesktop ? 24 : 27} 391 - strokeWidth={5.5} 392 - /> 393 - } 394 - iconFilled={ 395 - <FontAwesomeIcon 396 - icon="hand" 397 - style={pal.text as FontAwesomeIconStyle} 398 - size={isDesktop ? 23 : 26} 399 - /> 400 - } 401 - label={_(msg`Moderation`)} 402 384 /> 403 385 <NavItem 404 386 href={currentAccount ? makeProfileLink(currentAccount) : '/'}

Configure Feed

Configure Feed