From 7727df60fd6f2157a5d9cd692211c3d52df3edf2 Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Mon, 9 Sep 2024 08:21:51 -0700
Subject: [PATCH] move handle below display name

---
 src/view/com/posts/FeedItem.tsx |   1 +
 src/view/com/util/PostMeta.tsx  | 135 ++++++++++++++++----------------
 2 files changed, 67 insertions(+), 69 deletions(-)

diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx
index 7537a46448..cfb293001d 100644
--- a/src/view/com/posts/FeedItem.tsx
+++ b/src/view/com/posts/FeedItem.tsx
@@ -603,6 +603,7 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     flexWrap: 'wrap',
+    paddingTop: 4,
     paddingBottom: 2,
     overflow: 'hidden',
   },
diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx
index 3bd350bf32..8cb84d62f6 100644
--- a/src/view/com/util/PostMeta.tsx
+++ b/src/view/com/util/PostMeta.tsx
@@ -8,12 +8,12 @@ import {precacheProfile} from '#/state/queries/profile'
 import {usePalette} from 'lib/hooks/usePalette'
 import {makeProfileLink} from 'lib/routes/links'
 import {forceLTR} from 'lib/strings/bidi'
-import {NON_BREAKING_SPACE} from 'lib/strings/constants'
 import {sanitizeDisplayName} from 'lib/strings/display-names'
 import {sanitizeHandle} from 'lib/strings/handles'
 import {niceDate} from 'lib/strings/time'
 import {TypographyVariant} from 'lib/ThemeContext'
 import {isAndroid} from 'platform/detection'
+import {atoms as a} from '#/alf'
 import {ProfileHoverCard} from '#/components/ProfileHoverCard'
 import {TextLinkOnWebOnly} from './Link'
 import {Text} from './text/Text'
@@ -39,8 +39,11 @@ let PostMeta = (opts: PostMetaOpts): React.ReactNode => {
   const {i18n} = useLingui()
 
   const pal = usePalette('default')
-  const displayName = opts.author.displayName || opts.author.handle
-  const handle = opts.author.handle
+  const displayName = sanitizeDisplayName(
+    opts.author.displayName || opts.author.handle,
+    opts.moderation?.ui('displayName'),
+  )
+  const handle = sanitizeHandle(opts.author.handle, '@')
   const profileLink = makeProfileLink(opts.author)
   const queryClient = useQueryClient()
   const onOpenAuthor = opts.onOpenAuthor
@@ -53,65 +56,67 @@ let PostMeta = (opts: PostMetaOpts): React.ReactNode => {
   }, [queryClient, opts.author])
 
   return (
-    <View style={[styles.container, opts.style]}>
-      {opts.showAvatar && (
-        <View style={styles.avatar}>
-          <PreviewableUserAvatar
-            size={opts.avatarSize || 16}
-            profile={opts.author}
-            moderation={opts.avatarModeration}
-            type={opts.author.associated?.labeler ? 'labeler' : 'user'}
-          />
-        </View>
-      )}
-      <ProfileHoverCard inline did={opts.author.did}>
-        <Text
-          numberOfLines={1}
-          style={[styles.maxWidth, pal.textLight, opts.displayNameStyle]}>
-          <TextLinkOnWebOnly
-            type={opts.displayNameType || 'lg-bold'}
-            style={[pal.text]}
-            lineHeight={1.2}
-            disableMismatchWarning
-            text={forceLTR(
-              sanitizeDisplayName(
-                displayName,
-                opts.moderation?.ui('displayName'),
-              ),
-            )}
-            href={profileLink}
-            onBeforePress={onBeforePressAuthor}
-          />
-          <TextLinkOnWebOnly
-            type="md"
-            disableMismatchWarning
-            style={[pal.textLight, {flexShrink: 4}]}
-            text={NON_BREAKING_SPACE + sanitizeHandle(handle, '@')}
-            href={profileLink}
-            onBeforePress={onBeforePressAuthor}
-            anchorNoUnderline
-          />
-        </Text>
-      </ProfileHoverCard>
-      {!isAndroid && (
-        <Text type="md" style={pal.textLight} accessible={false}>
-          &middot;
-        </Text>
-      )}
-      <TimeElapsed timestamp={opts.timestamp}>
-        {({timeElapsed}) => (
-          <TextLinkOnWebOnly
-            type="md"
-            style={pal.textLight}
-            text={timeElapsed}
-            accessibilityLabel={niceDate(i18n, opts.timestamp)}
-            title={niceDate(i18n, opts.timestamp)}
-            accessibilityHint=""
-            href={opts.postHref}
-            onBeforePress={onBeforePressPost}
-          />
+    <View style={[a.flex_1, a.flex_col, {gap: 1}]}>
+      <View style={[a.flex_row, a.align_end, a.gap_xs, opts.style]}>
+        {opts.showAvatar && (
+          <View style={styles.avatar}>
+            <PreviewableUserAvatar
+              size={opts.avatarSize || 16}
+              profile={opts.author}
+              moderation={opts.avatarModeration}
+              type={opts.author.associated?.labeler ? 'labeler' : 'user'}
+            />
+          </View>
         )}
-      </TimeElapsed>
+        <ProfileHoverCard inline did={opts.author.did}>
+          <Text
+            numberOfLines={1}
+            style={[styles.maxWidth, pal.textLight, opts.displayNameStyle]}>
+            <TextLinkOnWebOnly
+              type={opts.displayNameType || 'lg-bold'}
+              style={[pal.text]}
+              lineHeight={1.2}
+              disableMismatchWarning
+              text={forceLTR(
+                sanitizeDisplayName(
+                  displayName,
+                  opts.moderation?.ui('displayName'),
+                ),
+              )}
+              href={profileLink}
+              onBeforePress={onBeforePressAuthor}
+            />
+          </Text>
+        </ProfileHoverCard>
+        {!isAndroid && (
+          <Text type="md" style={pal.textLight} accessible={false}>
+            &middot;
+          </Text>
+        )}
+        <TimeElapsed timestamp={opts.timestamp}>
+          {({timeElapsed}) => (
+            <TextLinkOnWebOnly
+              type="md"
+              style={pal.textLight}
+              text={timeElapsed}
+              accessibilityLabel={niceDate(i18n, opts.timestamp)}
+              title={niceDate(i18n, opts.timestamp)}
+              accessibilityHint=""
+              href={opts.postHref}
+              onBeforePress={onBeforePressPost}
+            />
+          )}
+        </TimeElapsed>
+      </View>
+      <TextLinkOnWebOnly
+        type="md"
+        disableMismatchWarning
+        style={[pal.textLight]}
+        text={handle}
+        href={profileLink}
+        onBeforePress={onBeforePressAuthor}
+        anchorNoUnderline
+      />
     </View>
   )
 }
@@ -119,14 +124,6 @@ PostMeta = memo(PostMeta)
 export {PostMeta}
 
 const styles = StyleSheet.create({
-  container: {
-    flexDirection: 'row',
-    alignItems: 'flex-end',
-    paddingBottom: 2,
-    gap: 4,
-    zIndex: 1,
-    flex: 1,
-  },
   avatar: {
     alignSelf: 'center',
   },