From 8013fe09fa25a402bc5c72eea33a29c9eba9a8f8 Mon Sep 17 00:00:00 2001
From: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2026 20:43:35 +0200
Subject: [PATCH] fix(mobile): keep conversation feed visible

---
 .../features/threads/ThreadRouteScreen.tsx    |  4 +--
 .../mobile/src/mobileSurfaceExistence.test.ts | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 apps/mobile/src/mobileSurfaceExistence.test.ts

diff --git a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx b/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
index d9741cd51b5..116012a894d 100644
--- a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
@@ -764,12 +764,12 @@ function ThreadRouteContent(
   const renderThreadRouteBody = (showActionControls: boolean) => (
     // A real flex host (not a fragment) keeps the thread body filling the
     // screen so the absolute composer overlay anchors to the true bottom.
-    <View className="flex-1 bg-screen">
+    <View testID="thread-conversation-surface" className="flex-1 bg-screen" style={{ flex: 1 }}>
       <ThreadGitControls {...threadGitControlProps} showActionControls={showActionControls} />
 
       <GitActionProgressOverlay progress={gitActionProgress} onDismiss={dismissGitActionResult} />
 
-      <View className="flex-1">
+      <View className="flex-1" style={{ flex: 1 }}>
         <ThreadDetailScreen
           selectedThread={selectedThreadWithDraftSettings ?? selectedThread}
           contentPresentation={contentPresentation}
diff --git a/apps/mobile/src/mobileSurfaceExistence.test.ts b/apps/mobile/src/mobileSurfaceExistence.test.ts
new file mode 100644
index 00000000000..878e80c0f3d
--- /dev/null
+++ b/apps/mobile/src/mobileSurfaceExistence.test.ts
@@ -0,0 +1,29 @@
+/**
+ * Existence contracts for mobile product surfaces that stack conflict
+ * resolution can accidentally leave structurally present but unrenderable.
+ */
+// @effect-diagnostics nodeBuiltinImport:off - existence contract reads source text on disk.
+import * as NodeFS from "node:fs";
+import * as NodePath from "node:path";
+import * as NodeURL from "node:url";
+import { describe, expect, it } from "vite-plus/test";
+
+const root = NodePath.dirname(NodeURL.fileURLToPath(import.meta.url));
+
+function readSrc(relativePath: string): string {
+  return NodeFS.readFileSync(NodePath.join(root, relativePath), "utf8");
+}
+
+describe("mobile surface existence (anti stack-drop)", () => {
+  it("keeps the conversation feed inside an explicit flex host", () => {
+    const threadRoute = readSrc("features/threads/ThreadRouteScreen.tsx");
+
+    expect(threadRoute).toContain('testID="thread-conversation-surface"');
+    expect(threadRoute).toMatch(
+      /testID="thread-conversation-surface"[\s\S]*?style=\{\{ flex: 1 \}\}/,
+    );
+    expect(threadRoute).toMatch(
+      /<View className="flex-1" style=\{\{ flex: 1 \}\}>[\s\S]*?<ThreadDetailScreen/,
+    );
+  });
+});