From 276143c92ba7d3679c322e80b96bfc1fbc2259ed Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Wed, 6 May 2026 09:35:48 -0700
Subject: [PATCH] Display chat message underneath embed, not above (#10423)

---
 src/components/dms/MessageItem.tsx | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index d01743b18a..bc45a56b60 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -182,13 +182,11 @@ let MessageItem = ({
   const hasEmbedAndText =
     AppBskyEmbedRecord.isView(message.embed) && rt.text.length > 0
 
-  const targetBottomRadius =
-    squaredBottomCorner || hasEmbedAndText
-      ? SQUARED_BORDER_RADIUS
-      : BORDER_RADIUS
-  const targetTopRadius = squaredTopCorner
+  const targetBottomRadius = squaredBottomCorner
     ? SQUARED_BORDER_RADIUS
     : BORDER_RADIUS
+  const targetTopRadius =
+    squaredTopCorner || hasEmbedAndText ? SQUARED_BORDER_RADIUS : BORDER_RADIUS
 
   const bottomRadiusSV = useSharedValue(targetBottomRadius)
   const topRadiusSV = useSharedValue(targetTopRadius)
@@ -463,6 +461,14 @@ let MessageItem = ({
                   toggleDivider(message.id)
                 }
               }}>
+              {AppBskyEmbedRecord.isView(message.embed) && (
+                <MessageItemEmbed
+                  embed={message.embed}
+                  isFromSelf={isFromSelf}
+                  squaredBottomCorner={squaredBottomCorner || hasEmbedAndText}
+                  squaredTopCorner={squaredTopCorner}
+                />
+              )}
               {rt.text.length > 0 && (
                 <Animated.View
                   accessibilityHint={l`Double tap or long press the message to add a reaction`}
@@ -514,14 +520,6 @@ let MessageItem = ({
                   />
                 </Animated.View>
               )}
-              {AppBskyEmbedRecord.isView(message.embed) && (
-                <MessageItemEmbed
-                  embed={message.embed}
-                  isFromSelf={isFromSelf}
-                  squaredBottomCorner={squaredBottomCorner}
-                  squaredTopCorner={squaredTopCorner || hasEmbedAndText}
-                />
-              )}
               {appliedReactions}
             </ActionsWrapper>
           </View>