From 05212ca9e34ea6dd2bc1c9d411ccf7035eff5bd6 Mon Sep 17 00:00:00 2001
From: dan <dan.abramov@gmail.com>
Date: Wed, 24 Apr 2024 21:37:16 +0100
Subject: Remove Moderation from sidebar (#3692)

---
 src/view/screens/Settings/index.tsx | 76 ++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'src/view/screens/Settings/index.tsx')

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>
 
-- 
cgit 1.4.1

