about summary refs log tree commit diff
path: root/src/view
diff options
context:
space:
mode:
Diffstat (limited to 'src/view')
-rw-r--r--src/view/screens/Settings/index.tsx76
-rw-r--r--src/view/shell/Drawer.tsx27
-rw-r--r--src/view/shell/desktop/LeftNav.tsx78
3 files changed, 68 insertions, 113 deletions
diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx
index 1211aa5c5..6b5390c29 100644
--- a/src/view/screens/Settings/index.tsx
+++ b/src/view/screens/Settings/index.tsx
@@ -494,107 +494,107 @@ export function SettingsScreen({}: Props) {
           </Text>
         </TouchableOpacity>
         <TouchableOpacity
-          testID="preferencesHomeFeedButton"
+          testID="languageSettingsBtn"
           style={[
             styles.linkCard,
             pal.view,
             isSwitchingAccounts && styles.dimmed,
           ]}
-          onPress={openFollowingFeedPreferences}
+          onPress={isSwitchingAccounts ? undefined : onPressLanguageSettings}
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Following feed preferences`)}
-          accessibilityHint={_(msg`Opens the Following feed preferences`)}>
+          accessibilityLabel={_(msg`Language settings`)}
+          accessibilityHint={_(msg`Opens configurable language settings`)}>
           <View style={[styles.iconContainer, pal.btn]}>
             <FontAwesomeIcon
-              icon="sliders"
+              icon="language"
               style={pal.text as FontAwesomeIconStyle}
             />
           </View>
           <Text type="lg" style={pal.text}>
-            <Trans>Following Feed Preferences</Trans>
+            <Trans>Languages</Trans>
           </Text>
         </TouchableOpacity>
         <TouchableOpacity
-          testID="preferencesThreadsButton"
+          testID="moderationBtn"
           style={[
             styles.linkCard,
             pal.view,
             isSwitchingAccounts && styles.dimmed,
           ]}
-          onPress={openThreadsPreferences}
+          onPress={
+            isSwitchingAccounts
+              ? undefined
+              : () => navigation.navigate('Moderation')
+          }
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Thread preferences`)}
-          accessibilityHint={_(msg`Opens the threads preferences`)}>
+          accessibilityLabel={_(msg`Moderation settings`)}
+          accessibilityHint={_(msg`Opens moderation settings`)}>
           <View style={[styles.iconContainer, pal.btn]}>
-            <FontAwesomeIcon
-              icon={['far', 'comments']}
-              style={pal.text as FontAwesomeIconStyle}
-              size={18}
-            />
+            <HandIcon style={pal.text} size={18} strokeWidth={6} />
           </View>
           <Text type="lg" style={pal.text}>
-            <Trans>Thread Preferences</Trans>
+            <Trans>Moderation</Trans>
           </Text>
         </TouchableOpacity>
         <TouchableOpacity
-          testID="savedFeedsBtn"
+          testID="preferencesHomeFeedButton"
           style={[
             styles.linkCard,
             pal.view,
             isSwitchingAccounts && styles.dimmed,
           ]}
-          onPress={onPressSavedFeeds}
+          onPress={openFollowingFeedPreferences}
           accessibilityRole="button"
-          accessibilityLabel={_(msg`My saved feeds`)}
-          accessibilityHint={_(msg`Opens screen with all saved feeds`)}>
+          accessibilityLabel={_(msg`Following feed preferences`)}
+          accessibilityHint={_(msg`Opens the Following feed preferences`)}>
           <View style={[styles.iconContainer, pal.btn]}>
-            <HashtagIcon style={pal.text} size={18} strokeWidth={3} />
+            <FontAwesomeIcon
+              icon="sliders"
+              style={pal.text as FontAwesomeIconStyle}
+            />
           </View>
           <Text type="lg" style={pal.text}>
-            <Trans>My Saved Feeds</Trans>
+            <Trans>Following Feed Preferences</Trans>
           </Text>
         </TouchableOpacity>
         <TouchableOpacity
-          testID="languageSettingsBtn"
+          testID="preferencesThreadsButton"
           style={[
             styles.linkCard,
             pal.view,
             isSwitchingAccounts && styles.dimmed,
           ]}
-          onPress={isSwitchingAccounts ? undefined : onPressLanguageSettings}
+          onPress={openThreadsPreferences}
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Language settings`)}
-          accessibilityHint={_(msg`Opens configurable language settings`)}>
+          accessibilityLabel={_(msg`Thread preferences`)}
+          accessibilityHint={_(msg`Opens the threads preferences`)}>
           <View style={[styles.iconContainer, pal.btn]}>
             <FontAwesomeIcon
-              icon="language"
+              icon={['far', 'comments']}
               style={pal.text as FontAwesomeIconStyle}
+              size={18}
             />
           </View>
           <Text type="lg" style={pal.text}>
-            <Trans>Languages</Trans>
+            <Trans>Thread Preferences</Trans>
           </Text>
         </TouchableOpacity>
         <TouchableOpacity
-          testID="moderationBtn"
+          testID="savedFeedsBtn"
           style={[
             styles.linkCard,
             pal.view,
             isSwitchingAccounts && styles.dimmed,
           ]}
-          onPress={
-            isSwitchingAccounts
-              ? undefined
-              : () => navigation.navigate('Moderation')
-          }
+          onPress={onPressSavedFeeds}
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Moderation settings`)}
-          accessibilityHint={_(msg`Opens moderation settings`)}>
+          accessibilityLabel={_(msg`My saved feeds`)}
+          accessibilityHint={_(msg`Opens screen with all saved feeds`)}>
           <View style={[styles.iconContainer, pal.btn]}>
-            <HandIcon style={pal.text} size={18} strokeWidth={6} />
+            <HashtagIcon style={pal.text} size={18} strokeWidth={3} />
           </View>
           <Text type="lg" style={pal.text}>
-            <Trans>Moderation</Trans>
+            <Trans>My Saved Feeds</Trans>
           </Text>
         </TouchableOpacity>
 
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx
index 3972797b7..8145fa408 100644
--- a/src/view/shell/Drawer.tsx
+++ b/src/view/shell/Drawer.tsx
@@ -30,7 +30,6 @@ import {
   BellIcon,
   BellIconSolid,
   CogIcon,
-  HandIcon,
   HashtagIcon,
   HomeIcon,
   HomeIconSolid,
@@ -177,12 +176,6 @@ let DrawerContent = ({}: {}): React.ReactNode => {
     setDrawerOpen(false)
   }, [navigation, track, setDrawerOpen])
 
-  const onPressModeration = React.useCallback(() => {
-    track('Menu:ItemClicked', {url: 'Moderation'})
-    navigation.navigate('Moderation')
-    setDrawerOpen(false)
-  }, [navigation, track, setDrawerOpen])
-
   const onPressSettings = React.useCallback(() => {
     track('Menu:ItemClicked', {url: 'Settings'})
     navigation.navigate('Settings')
@@ -240,7 +233,6 @@ let DrawerContent = ({}: {}): React.ReactNode => {
               />
               <FeedsMenuItem isActive={isAtFeeds} onPress={onPressMyFeeds} />
               <ListsMenuItem onPress={onPressLists} />
-              <ModerationMenuItem onPress={onPressModeration} />
               <ProfileMenuItem
                 isActive={isAtMyProfile}
                 onPress={onPressProfile}
@@ -507,25 +499,6 @@ let ListsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => {
 }
 ListsMenuItem = React.memo(ListsMenuItem)
 
-let ModerationMenuItem = ({
-  onPress,
-}: {
-  onPress: () => void
-}): React.ReactNode => {
-  const {_} = useLingui()
-  const pal = usePalette('default')
-  return (
-    <MenuItem
-      icon={<HandIcon strokeWidth={5} style={pal.text} size={24} />}
-      label={_(msg`Moderation`)}
-      accessibilityLabel={_(msg`Moderation`)}
-      accessibilityHint=""
-      onPress={onPress}
-    />
-  )
-}
-ModerationMenuItem = React.memo(ModerationMenuItem)
-
 let ProfileMenuItem = ({
   isActive,
   onPress,
diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx
index 097ca2fbf..47daed6ce 100644
--- a/src/view/shell/desktop/LeftNav.tsx
+++ b/src/view/shell/desktop/LeftNav.tsx
@@ -1,52 +1,52 @@
 import React from 'react'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
-import {PressableWithHover} from 'view/com/util/PressableWithHover'
+import {
+  FontAwesomeIcon,
+  FontAwesomeIconStyle,
+} from '@fortawesome/react-native-fontawesome'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
 import {
   useLinkProps,
   useNavigation,
   useNavigationState,
 } from '@react-navigation/native'
-import {
-  FontAwesomeIcon,
-  FontAwesomeIconStyle,
-} from '@fortawesome/react-native-fontawesome'
-import {Text} from 'view/com/util/text/Text'
-import {UserAvatar} from 'view/com/util/UserAvatar'
-import {Link} from 'view/com/util/Link'
-import {LoadingPlaceholder} from 'view/com/util/LoadingPlaceholder'
+
+import {isInvalidHandle} from '#/lib/strings/handles'
+import {emitSoftReset} from '#/state/events'
+import {useFetchHandle} from '#/state/queries/handle'
+import {useUnreadNotifications} from '#/state/queries/notifications/unread'
+import {useProfileQuery} from '#/state/queries/profile'
+import {useSession} from '#/state/session'
+import {useComposerControls} from '#/state/shell/composer'
 import {usePalette} from 'lib/hooks/usePalette'
 import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
-import {s, colors} from 'lib/styles'
 import {
-  HomeIcon,
-  HomeIconSolid,
-  MagnifyingGlassIcon2,
-  MagnifyingGlassIcon2Solid,
   BellIcon,
   BellIconSolid,
-  UserIcon,
-  UserIconSolid,
   CogIcon,
   CogIconSolid,
   ComposeIcon2,
-  ListIcon,
   HashtagIcon,
-  HandIcon,
+  HomeIcon,
+  HomeIconSolid,
+  ListIcon,
+  MagnifyingGlassIcon2,
+  MagnifyingGlassIcon2Solid,
+  UserIcon,
+  UserIconSolid,
 } from 'lib/icons'
-import {getCurrentRoute, isTab, isStateAtTabRoot} from 'lib/routes/helpers'
-import {NavigationProp, CommonNavigatorParams} from 'lib/routes/types'
-import {router} from '../../../routes'
+import {getCurrentRoute, isStateAtTabRoot, isTab} from 'lib/routes/helpers'
 import {makeProfileLink} from 'lib/routes/links'
-import {useLingui} from '@lingui/react'
-import {Trans, msg} from '@lingui/macro'
-import {useProfileQuery} from '#/state/queries/profile'
-import {useSession} from '#/state/session'
-import {useUnreadNotifications} from '#/state/queries/notifications/unread'
-import {useComposerControls} from '#/state/shell/composer'
-import {useFetchHandle} from '#/state/queries/handle'
-import {emitSoftReset} from '#/state/events'
+import {CommonNavigatorParams, NavigationProp} from 'lib/routes/types'
+import {colors, s} from 'lib/styles'
 import {NavSignupCard} from '#/view/shell/NavSignupCard'
-import {isInvalidHandle} from '#/lib/strings/handles'
+import {Link} from 'view/com/util/Link'
+import {LoadingPlaceholder} from 'view/com/util/LoadingPlaceholder'
+import {PressableWithHover} from 'view/com/util/PressableWithHover'
+import {Text} from 'view/com/util/text/Text'
+import {UserAvatar} from 'view/com/util/UserAvatar'
+import {router} from '../../../routes'
 
 function ProfileCard() {
   const {currentAccount} = useSession()
@@ -383,24 +383,6 @@ export function DesktopLeftNav() {
             label={_(msg`Lists`)}
           />
           <NavItem
-            href="/moderation"
-            icon={
-              <HandIcon
-                style={pal.text}
-                size={isDesktop ? 24 : 27}
-                strokeWidth={5.5}
-              />
-            }
-            iconFilled={
-              <FontAwesomeIcon
-                icon="hand"
-                style={pal.text as FontAwesomeIconStyle}
-                size={isDesktop ? 23 : 26}
-              />
-            }
-            label={_(msg`Moderation`)}
-          />
-          <NavItem
             href={currentAccount ? makeProfileLink(currentAccount) : '/'}
             icon={
               <UserIcon
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-10-11 14:31:17 +0000