Move labelers query on Mod screen

src/screens/Moderation/index.tsx

@@ -4,7 +4,7 @@ import {useFocusEffect} from '@react-navigation/native'
 import {ComAtprotoLabelDefs} from '@atproto/api'
 import {Trans, msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {AppBskyLabelerDefs, LABELS} from '@atproto/api'
+import {LABELS} from '@atproto/api'
 import {useSafeAreaFrame} from 'react-native-safe-area-context'
 
 import {NativeStackScreenProps, CommonNavigatorParams} from '#/lib/routes/types'
@@ -86,16 +86,11 @@ export function ModerationScreen(
     error: preferencesError,
     data: preferences,
   } = usePreferencesQuery()
-  const {
-    isLoading: isLabelersLoading,
-    data: labelers,
-    error: labelersError,
-  } = useMyLabelers()
   const {gtMobile} = useBreakpoints()
   const {height} = useSafeAreaFrame()
 
-  const isLoading = isPreferencesLoading || isLabelersLoading
+  const isLoading = isPreferencesLoading
-  const error = preferencesError || labelersError
+  const error = preferencesError
 
   return (
     <CenteredView
@@ -120,7 +115,7 @@ export function ModerationScreen(
           }
         />
       ) : (
-        <ModerationScreenInner preferences={preferences} labelers={labelers} />
+        <ModerationScreenInner preferences={preferences} />
       )}
     </CenteredView>
   )
@@ -128,10 +123,8 @@ export function ModerationScreen(
 
 export function ModerationScreenInner({
   preferences,
-  labelers = [],
 }: {
   preferences: UsePreferencesQueryResponse
-  labelers?: AppBskyLabelerDefs.LabelerViewDetailed[]
 }) {
   const {_} = useLingui()
   const t = useTheme()
@@ -140,6 +133,11 @@ export function ModerationScreenInner({
   const {gtMobile} = useBreakpoints()
   const {mutedWordsDialogControl} = useGlobalDialogsControlContext()
   const {openModal} = useModalControls()
+  const {
+    isLoading: isLabelersLoading,
+    data: labelers,
+    error: labelersError,
+  } = useMyLabelers()
 
   useFocusEffect(
     React.useCallback(() => {
@@ -381,30 +379,43 @@ export function ModerationScreenInner({
           ]}>
           <Trans>Advanced</Trans>
         </Text>
-        <View style={[a.rounded_sm, t.atoms.bg_contrast_25]}>
+
-          {labelers.map((mod, i) => {
+        {isLabelersLoading ? (
-            return (
+          <Loader />
-              <React.Fragment key={mod.creator.did}>
+        ) : labelersError || !labelers ? (
-                {i !== 0 && <Divider />}
+          <View style={[a.p_lg, a.rounded_sm, t.atoms.bg_contrast_25]}>
-                <ModerationServiceCard.Link labeler={mod}>
+            <Text>
-                  <ModerationServiceCard.Card.Outer>
+              <Trans>
-                    <ModerationServiceCard.Card.Avatar
+                We were unable to load your configured labelers at this time.
-                      avatar={mod.creator.avatar}
+              </Trans>
-                    />
+            </Text>
-                    <ModerationServiceCard.Card.Content
+          </View>
-                      title={getModerationServiceTitle({
+        ) : (
-                        displayName: mod.creator.displayName,
+          <View style={[a.rounded_sm, t.atoms.bg_contrast_25]}>
-                        handle: mod.creator.handle,
+            {labelers.map((mod, i) => {
-                      })}
+              return (
-                      handle={mod.creator.handle}
+                <React.Fragment key={mod.creator.did}>
-                      description={mod.creator.description || ''}
+                  {i !== 0 && <Divider />}
-                    />
+                  <ModerationServiceCard.Link labeler={mod}>
-                  </ModerationServiceCard.Card.Outer>
+                    <ModerationServiceCard.Card.Outer>
-                </ModerationServiceCard.Link>
+                      <ModerationServiceCard.Card.Avatar
-              </React.Fragment>
+                        avatar={mod.creator.avatar}
-            )
+                      />
-          })}
+                      <ModerationServiceCard.Card.Content
-        </View>
+                        title={getModerationServiceTitle({
+                          displayName: mod.creator.displayName,
+                          handle: mod.creator.handle,
+                        })}
+                        handle={mod.creator.handle}
+                        description={mod.creator.description || ''}
+                      />
+                    </ModerationServiceCard.Card.Outer>
+                  </ModerationServiceCard.Link>
+                </React.Fragment>
+              )
+            })}
+          </View>
+        )}
 
         <Text
           style={[