diff --git a/src/components/LabelingServiceCard/index.tsx b/src/components/LabelingServiceCard/index.tsx
index 542f2d2993..ff32c36bc9 100644
--- a/src/components/LabelingServiceCard/index.tsx
+++ b/src/components/LabelingServiceCard/index.tsx
@@ -9,6 +9,7 @@ import {sanitizeHandle} from '#/lib/strings/handles'
import {useLabelerInfoQuery} from '#/state/queries/labeler'
import {UserAvatar} from '#/view/com/util/UserAvatar'
import {atoms as a, useTheme, ViewStyleProp} from '#/alf'
+import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
import {Link as InternalLink, LinkProps} from '#/components/Link'
import {RichText} from '#/components/RichText'
import {Text} from '#/components/Typography'
@@ -43,21 +44,40 @@ export function Avatar({avatar}: {avatar?: string}) {
}
export function Title({value}: {value: string}) {
- return {value}
+ return {value}
}
export function Description({value, handle}: {value?: string; handle: string}) {
return value ? (
-
+
) : (
-
+
By {sanitizeHandle(handle, '@')}
)
}
+export function RegionalNotice() {
+ const t = useTheme()
+ return (
+
+
+
+ Required in your region
+
+
+ )
+}
+
export function LikeCount({count}: {count: number}) {
const t = useTheme()
return (
@@ -85,7 +105,7 @@ export function Content({children}: React.PropsWithChildren<{}>) {
a.align_center,
a.justify_between,
]}>
- {children}
+ {children}
diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx
index a3111700b8..ad59c42dc2 100644
--- a/src/screens/Moderation/index.tsx
+++ b/src/screens/Moderation/index.tsx
@@ -39,7 +39,6 @@ import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components
import {CircleBanSign_Stroke2_Corner0_Rounded as CircleBanSign} from '#/components/icons/CircleBanSign'
import {Props as SVGIconProps} from '#/components/icons/common'
import {Filter_Stroke2_Corner0_Rounded as Filter} from '#/components/icons/Filter'
-import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
import {Group3_Stroke2_Corner0_Rounded as Group} from '#/components/icons/Group'
import {Person_Stroke2_Corner0_Rounded as Person} from '#/components/icons/Person'
import * as LabelingService from '#/components/LabelingServiceCard'
@@ -425,76 +424,51 @@ export function ModerationScreenInner({
) : (
- {labelers
- .filter(
- labeler =>
- !isNonConfigurableModerationAuthority(labeler.creator.did),
- )
- .map((labeler, i) => {
- return (
-
- {i !== 0 && }
-
- {state => (
-
- {
+ return (
+
+ {i !== 0 && }
+
+ {state => (
+
+
+
+
-
-
-
-
-
- )}
-
-
- )
- })}
+
+ {isNonConfigurableModerationAuthority(
+ labeler.creator.did,
+ ) && }
+
+
+ )}
+
+
+ )
+ })}
)}
- {labelers?.some(
- labeler => !isNonConfigurableModerationAuthority(labeler.creator.did),
- ) && (
-
-
-
- Additional moderation may apply in your region.
-
-
- )}
-
-
-