1 files changed, 61 insertions, 19 deletions
diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx
index 6ba6fac1b..a07d91899 100644
--- a/src/view/com/util/PostMeta.tsx
+++ b/src/view/com/util/PostMeta.tsx
@@ -1,37 +1,74 @@
 import React from 'react'
-import {Platform, StyleSheet, View} from 'react-native'
+import {StyleSheet, View} from 'react-native'
 import {Text} from './text/Text'
 import {ago} from 'lib/strings/time'
 import {usePalette} from 'lib/hooks/usePalette'
+import {useStores} from 'state/index'
+import {observer} from 'mobx-react-lite'
+import FollowButton from '../profile/FollowButton'
 
 interface PostMetaOpts {
   authorHandle: string
   authorDisplayName: string | undefined
   timestamp: string
+  did: string
+  declarationCid: string
+  showFollowBtn?: boolean
 }
 
-export function PostMeta(opts: PostMetaOpts) {
+export const PostMeta = observer(function (opts: PostMetaOpts) {
   const pal = usePalette('default')
   let displayName = opts.authorDisplayName || opts.authorHandle
   let handle = opts.authorHandle
+  const store = useStores()
+  const isMe = opts.did === store.me.did
 
-  // HACK
-  // Android simply cannot handle the truncation case we need
-  // so we have to do it manually here
-  // -prf
-  if (Platform.OS === 'android') {
-    if (displayName.length + handle.length > 26) {
-      if (displayName.length > 26) {
-        displayName = displayName.slice(0, 23) + '...'
-      } else {
-        handle = handle.slice(0, 23 - displayName.length) + '...'
-        if (handle.endsWith('....')) {
-          handle = handle.slice(0, -4) + '...'
-        }
-      }
-    }
+  // NOTE we capture `isFollowing` via a memo so that follows
+  //      don't change this UI immediately, but rather upon future
+  //      renders
+  const isFollowing = React.useMemo(
+    () => store.me.follows.isFollowing(opts.did),
+    [opts.did, store.me.follows],
+  )
+
+  if (opts.showFollowBtn && !isMe && !isFollowing) {
+    // two-liner with follow button
+    return (
+      <View style={[styles.metaTwoLine]}>
+        <View>
+          <Text
+            type="lg-bold"
+            style={[pal.text]}
+            numberOfLines={1}
+            lineHeight={1.2}>
+            {displayName}{' '}
+            <Text
+              type="md"
+              style={[styles.metaItem, pal.textLight]}
+              lineHeight={1.2}>
+              &middot; {ago(opts.timestamp)}
+            </Text>
+          </Text>
+          <Text
+            type="md"
+            style={[styles.metaItem, pal.textLight]}
+            lineHeight={1.2}>
+            {handle ? (
+              <Text type="md" style={[pal.textLight]}>
+                @{handle}
+              </Text>
+            ) : undefined}
+          </Text>
+        </View>
+
+        <View>
+          <FollowButton did={opts.did} declarationCid={opts.declarationCid} />
+        </View>
+      </View>
+    )
   }
 
+  // one-liner
   return (
     <View style={styles.meta}>
       <View style={[styles.metaItem, styles.maxWidth]}>
@@ -53,13 +90,18 @@ export function PostMeta(opts: PostMetaOpts) {
       </Text>
     </View>
   )
-}
+})
 
 const styles = StyleSheet.create({
   meta: {
     flexDirection: 'row',
     alignItems: 'baseline',
-    paddingTop: 0,
+    paddingBottom: 2,
+  },
+  metaTwoLine: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
     paddingBottom: 2,
   },
   metaItem: {