2 files changed, 3 insertions, 66 deletions
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index 81f3b8c45..af78a951b 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -206,8 +206,7 @@ const PostLoaded = observer(
       <PostHider
         href={itemHref}
         style={[styles.outer, pal.view, pal.border, style]}
-        isMuted={item.post.author.viewer?.muted === true}
-        labels={item.post.labels}>
+        moderation={item.moderation.list}>
         {showReplyLine && <View style={styles.replyLine} />}
         <View style={styles.layout}>
           <View style={styles.layoutAvi}>
@@ -215,7 +214,7 @@ const PostLoaded = observer(
               <UserAvatar
                 size={52}
                 avatar={item.post.author.avatar}
-                hasWarning={!!item.post.author.labels?.length}
+                moderation={item.moderation.avatar}
               />
             </Link>
           </View>
@@ -247,7 +246,7 @@ const PostLoaded = observer(
               </View>
             )}
             <ContentHider
-              labels={item.post.labels}
+              moderation={item.moderation.list}
               containerStyle={styles.contentHider}>
               {item.richText?.text ? (
                 <View style={styles.postTextContainer}>
diff --git a/src/view/com/post/PostText.tsx b/src/view/com/post/PostText.tsx
deleted file mode 100644
index 1a56a5dbf..000000000
--- a/src/view/com/post/PostText.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, {useState, useEffect} from 'react'
-import {observer} from 'mobx-react-lite'
-import {StyleProp, StyleSheet, TextStyle, View} from 'react-native'
-import {LoadingPlaceholder} from '../util/LoadingPlaceholder'
-import {ErrorMessage} from '../util/error/ErrorMessage'
-import {Text} from '../util/text/Text'
-import {PostModel} from 'state/models/content/post'
-import {useStores} from 'state/index'
-
-export const PostText = observer(function PostText({
-  uri,
-  style,
-}: {
-  uri: string
-  style?: StyleProp<TextStyle>
-}) {
-  const store = useStores()
-  const [model, setModel] = useState<PostModel | undefined>()
-
-  useEffect(() => {
-    if (model?.uri === uri) {
-      return // no change needed? or trigger refresh?
-    }
-    const newModel = new PostModel(store, uri)
-    setModel(newModel)
-    newModel.setup().catch(err => store.log.error('Failed to fetch post', err))
-  }, [uri, model?.uri, store])
-
-  // loading
-  // =
-  if (!model || model.isLoading || model.uri !== uri) {
-    return (
-      <View>
-        <LoadingPlaceholder width="100%" height={8} style={styles.mt6} />
-        <LoadingPlaceholder width="100%" height={8} style={styles.mt6} />
-        <LoadingPlaceholder width={100} height={8} style={styles.mt6} />
-      </View>
-    )
-  }
-
-  // error
-  // =
-  if (model.hasError) {
-    return (
-      <View>
-        <ErrorMessage style={style} message={model.error} />
-      </View>
-    )
-  }
-
-  // loaded
-  // =
-  return (
-    <View>
-      <Text style={style}>{model.text}</Text>
-    </View>
-  )
-})
-
-const styles = StyleSheet.create({
-  mt6: {marginTop: 6},
-})