From 7a9eabbf757c7c662324b1bbf303b87c041b6827 Mon Sep 17 00:00:00 2001
From: vineyardbovines <spencerfpope@gmail.com>
Date: Thu, 4 Jun 2026 17:29:06 -0400
Subject: [PATCH] Resolve merge: keep fallback path for gallery embeds

10707 grouped 'gallery' with 'images' through ImageEmbed. On the OTA
branch, gallery should dispatch to GalleryFallbackEmbed instead so older
native builds show the update prompt. Also dedupes the duplicate gallery
branches the auto-merge left in the Embed type union and parseEmbed.
---
 src/components/Post/Embed/index.tsx | 6 ++----
 src/types/bsky/post.ts              | 9 ---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/Post/Embed/index.tsx b/src/components/Post/Embed/index.tsx
index 98a89a77e5..eba80a8d85 100644
--- a/src/components/Post/Embed/index.tsx
+++ b/src/components/Post/Embed/index.tsx
@@ -57,8 +57,7 @@ export function Embed({embed: rawEmbed, ...rest}: EmbedProps) {
     case 'images':
     case 'gallery':
     case 'link':
-    case 'video':
-    case 'gallery': {
+    case 'video': {
       return <MediaEmbed embed={embed} {...rest} />
     }
     case 'feed':
@@ -92,8 +91,7 @@ function MediaEmbed({
   embed: TEmbed
 }) {
   switch (embed.type) {
-    case 'images':
-    case 'gallery': {
+    case 'images': {
       return (
         <ContentHider
           modui={rest.moderation?.ui('contentMedia')}
diff --git a/src/types/bsky/post.ts b/src/types/bsky/post.ts
index 1e165b2d36..43621ef63b 100644
--- a/src/types/bsky/post.ts
+++ b/src/types/bsky/post.ts
@@ -60,10 +60,6 @@ export type Embed =
       type: 'video'
       view: $Typed<AppBskyEmbedVideo.View>
     }
-  | {
-      type: 'gallery'
-      view: $Typed<AppBskyEmbedGallery.View>
-    }
   | {
       type: 'post_with_media'
       view: Embed
@@ -154,11 +150,6 @@ export function parseEmbed(embed: AppBskyFeedDefs.PostView['embed']): Embed {
       view: parseEmbedRecordView(embed.record),
       media: parseEmbed(embed.media),
     }
-  } else if (AppBskyEmbedGallery.isView(embed)) {
-    return {
-      type: 'gallery',
-      view: embed,
-    }
   } else {
     return {
       type: 'unknown',