From a887da1a146e1c5a9366f403899290d55fc875bb Mon Sep 17 00:00:00 2001
From: Pixel Perfect <me@pixp.cc>
Date: Thu, 8 Oct 2026 04:05:28 -0700
Subject: [PATCH 1/2] fix(mobile): let sheet lists scroll before dismissal

---
 .../cloud/ConnectOnboardingRouteScreen.tsx    | 39 ++++++++++++-------
 .../connection/ConnectionsNewRouteScreen.tsx  |  1 +
 .../features/threads/ThreadAgentsSheet.tsx    |  1 +
 .../features/threads/ThreadQueueControl.tsx   |  1 +
 .../features/threads/git/GitBranchesSheet.tsx |  1 +
 .../features/threads/git/GitCommitSheet.tsx   |  1 +
 .../features/threads/git/GitConfirmSheet.tsx  |  1 +
 .../features/threads/git/GitOverviewSheet.tsx | 36 +++++++++++------
 8 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx b/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
index b0e25c6dcdb9..ec57efbd98f4 100644
--- a/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
+++ b/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
@@ -3,7 +3,7 @@ import { NativeHeaderToolbar } from "../../native/StackHeader";
 import { useAuth } from "@clerk/expo";
 import { StackActions, useNavigation } from "@react-navigation/native";
 import { useCallback, useEffect, useState } from "react";
-import { Platform, Pressable, RefreshControl, View } from "react-native";
+import { Platform, Pressable, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { reportAtomCommandResult, settlePromise } from "@t3tools/client-runtime/state/runtime";
@@ -54,15 +54,15 @@ function ConfiguredConnectOnboardingRouteScreen() {
     cloudEnvironments: null,
   });
 
-  // Pull-to-refresh tracks its own spinner instead of discovery's refreshing
-  // flag, so background refreshes (e.g. the sign-in one) don't yank the
-  // content down.
-  const [isPullRefreshing, setIsPullRefreshing] = useState(false);
-  const handlePullRefresh = useCallback(() => {
+  const [isRefreshing, setIsRefreshing] = useState(false);
+  const handleRefresh = useCallback(() => {
     void (async () => {
-      setIsPullRefreshing(true);
-      await refreshRelayEnvironments();
-      setIsPullRefreshing(false);
+      setIsRefreshing(true);
+      try {
+        await refreshRelayEnvironments();
+      } finally {
+        setIsRefreshing(false);
+      }
     })();
   }, [refreshRelayEnvironments]);
 
@@ -87,14 +87,30 @@ function ConfiguredConnectOnboardingRouteScreen() {
       {Platform.OS === "android" ? (
         <AndroidSheetHeader
           title="Set up T3 Connect"
-          actions={[{ accessibilityLabel: "Close", icon: "xmark", onPress: handleClose }]}
+          actions={[
+            {
+              accessibilityLabel: "Refresh environments",
+              disabled: isRefreshing,
+              icon: "arrow.clockwise",
+              loading: isRefreshing,
+              onPress: handleRefresh,
+            },
+            { accessibilityLabel: "Close", icon: "xmark", onPress: handleClose },
+          ]}
         />
       ) : (
         <NativeHeaderToolbar placement="right">
+          <NativeHeaderToolbar.Button
+            accessibilityLabel="Refresh environments"
+            disabled={isRefreshing}
+            icon="arrow.clockwise"
+            onPress={handleRefresh}
+          />
           <NativeHeaderToolbar.Button icon="xmark" onPress={handleClose} separateBackground />
         </NativeHeaderToolbar>
       )}
       <ScrollView
+        nestedScrollEnabled
         alwaysBounceVertical
         contentInsetAdjustmentBehavior="automatic"
         showsVerticalScrollIndicator={false}
@@ -105,9 +121,6 @@ function ConfiguredConnectOnboardingRouteScreen() {
           paddingHorizontal: 20,
           paddingTop: 16,
         }}
-        refreshControl={
-          <RefreshControl refreshing={isPullRefreshing} onRefresh={handlePullRefresh} />
-        }
       >
         {isSignedIn ? (
           <CloudEnvironmentRows
diff --git a/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx b/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
index 81d48a94848c..89580939d4c5 100644
--- a/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
+++ b/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
@@ -212,6 +212,7 @@ export function ConnectionsNewRouteScreen({
       ]}
     >
       <ScrollView
+        nestedScrollEnabled
         contentInsetAdjustmentBehavior="automatic"
         keyboardShouldPersistTaps="handled"
         showsVerticalScrollIndicator={false}
diff --git a/apps/mobile/src/features/threads/ThreadAgentsSheet.tsx b/apps/mobile/src/features/threads/ThreadAgentsSheet.tsx
index 1d082515172d..44848db16b3e 100644
--- a/apps/mobile/src/features/threads/ThreadAgentsSheet.tsx
+++ b/apps/mobile/src/features/threads/ThreadAgentsSheet.tsx
@@ -53,6 +53,7 @@ export function ThreadAgentsSheet({ route }: StaticScreenProps<AgentsTarget>) {
 
   const content = (
     <ScrollView
+      nestedScrollEnabled
       className="flex-1"
       // The iOS header is translucent and floats over this view; UIKit has to
       // inset the content or the first row sits underneath the title.
diff --git a/apps/mobile/src/features/threads/ThreadQueueControl.tsx b/apps/mobile/src/features/threads/ThreadQueueControl.tsx
index 5aa56b3d2723..89c007f95331 100644
--- a/apps/mobile/src/features/threads/ThreadQueueControl.tsx
+++ b/apps/mobile/src/features/threads/ThreadQueueControl.tsx
@@ -176,6 +176,7 @@ export function ThreadQueueSheet({ route }: StaticScreenProps<QueueTarget>) {
     queuedRuns.map(({ run }) => ({ id: run.id, ...rowLayouts.current.get(run.id) }));
   const content = (
     <ScrollView
+      nestedScrollEnabled
       className="flex-1"
       scrollEnabled={draggedRunId === null}
       // The iOS header is translucent and floats over this view; UIKit has to
diff --git a/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx b/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
index 13d1c37f0fcc..1216608244e8 100644
--- a/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
@@ -84,6 +84,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
       ) : null}
       <MaterialScreenContent fitToContents>
         <ScrollView
+          nestedScrollEnabled
           className="android:shrink android:grow-0 ios:flex-1"
           keyboardShouldPersistTaps="handled"
           showsVerticalScrollIndicator={false}
diff --git a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
index 59e2a0a1c5aa..d1dfa0021ac3 100644
--- a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
@@ -103,6 +103,7 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
       ) : null}
       <MaterialScreenContent fitToContents>
         <ScrollView
+          nestedScrollEnabled
           className="android:shrink android:grow-0 ios:flex-1"
           keyboardShouldPersistTaps="handled"
           showsVerticalScrollIndicator={false}
diff --git a/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx b/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
index 3c695fef8616..b9a509b435c4 100644
--- a/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
@@ -141,6 +141,7 @@ export function GitConfirmSheet(props: GitConfirmSheetProps) {
 
       <MaterialScreenContent fitToContents>
         <ScrollView
+          nestedScrollEnabled
           className="android:shrink android:grow-0 ios:flex-1"
           showsVerticalScrollIndicator={false}
           contentContainerClassName="android:gap-2 android:p-2"
diff --git a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
index 1741c527d91d..2298716a328f 100644
--- a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
@@ -252,21 +252,22 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
 
   const behindCount = gitStatus.data?.behindCount ?? 0;
 
-  // Deterministic pull-to-refresh state. Tying RefreshControl to the query's
+  // Deterministic refresh state. Tying RefreshControl to the query's
   // isPending flag left the spinner stuck (the status query reports pending
   // during quiet background refreshes too).
-  const [isPullRefreshing, setIsPullRefreshing] = useState(false);
-  const handlePullRefresh = useCallback(async () => {
-    setIsPullRefreshing(true);
+  const [isRefreshing, setIsRefreshing] = useState(false);
+  const handleRefresh = useCallback(async () => {
+    setIsRefreshing(true);
     try {
       await gitActions.refreshSelectedThreadGitStatus();
     } finally {
-      setIsPullRefreshing(false);
+      setIsRefreshing(false);
     }
   }, [gitActions]);
 
   const content = (
     <ScrollView
+      nestedScrollEnabled
       alwaysBounceVertical
       className="flex-1 android:bg-sheet-solid ios:bg-screen"
       contentInsetAdjustmentBehavior={Platform.OS === "ios" ? "automatic" : "never"}
@@ -278,7 +279,9 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
         gap: Platform.OS === "android" ? 8 : 14,
       }}
       refreshControl={
-        <RefreshControl refreshing={isPullRefreshing} onRefresh={() => void handlePullRefresh()} />
+        isInspector ? (
+          <RefreshControl refreshing={isRefreshing} onRefresh={() => void handleRefresh()} />
+        ) : undefined
       }
     >
       <View
@@ -434,9 +437,8 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
   if (Platform.OS === "ios") {
     // Compact form sheet: a plain screen presented as formSheet never renders a
     // stack header, so — like the Settings sheet — the header must come from a
-    // nested native stack INSIDE the sheet. This reuses the exact structure of the
-    // inspector branch below: branch as the title, status summary as the native
-    // subtitle, and content that owns pull-to-refresh.
+    // nested native stack INSIDE the sheet. Refresh belongs in the header so
+    // dragging down at the top of the content can dismiss the sheet.
     return (
       <View collapsable={false} className="flex-1 bg-sheet">
         <ScreenStack style={{ flex: 1 }}>
@@ -452,6 +454,18 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
             <ScreenStackHeaderConfig
               backgroundColor="rgba(0,0,0,0)"
               color={foregroundColor}
+              headerRightBarButtonItems={[
+                {
+                  accessibilityLabel: "Refresh repository status",
+                  disabled: busy || isRefreshing,
+                  icon: { name: "arrow.clockwise", type: "sfSymbol" },
+                  identifier: "thread-git-sheet-refresh",
+                  onPress: () => void handleRefresh(),
+                  sharesBackground: false,
+                  tintColor: foregroundColor,
+                  type: "button",
+                },
+              ]}
               hideBackButton
               hideShadow={false}
               navigationItemStyle="editor"
@@ -474,11 +488,11 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
         {
           id: "refresh",
           title: "Refresh repository status",
-          attributes: { disabled: busy || isPullRefreshing },
+          attributes: { disabled: busy || isRefreshing },
         },
       ]}
       onPressAction={({ nativeEvent }) => {
-        if (nativeEvent.event === "refresh") void handlePullRefresh();
+        if (nativeEvent.event === "refresh") void handleRefresh();
       }}
     >
       {(open) => (

From ff6bb2647ed0e2a3ed5a586e421ee3c2bb8fda92 Mon Sep 17 00:00:00 2001
From: Pixel Perfect <me@pixp.cc>
Date: Thu, 8 Oct 2026 04:18:53 -0700
Subject: [PATCH 2/2] fix(mobile): preserve iOS sheet refresh gestures

---
 .../cloud/ConnectOnboardingRouteScreen.tsx    | 13 ++++++-------
 .../features/threads/git/GitOverviewSheet.tsx | 19 ++++---------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx b/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
index ec57efbd98f4..7987e8ff6d66 100644
--- a/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
+++ b/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
@@ -3,7 +3,7 @@ import { NativeHeaderToolbar } from "../../native/StackHeader";
 import { useAuth } from "@clerk/expo";
 import { StackActions, useNavigation } from "@react-navigation/native";
 import { useCallback, useEffect, useState } from "react";
-import { Platform, Pressable, View } from "react-native";
+import { Platform, Pressable, RefreshControl, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { reportAtomCommandResult, settlePromise } from "@t3tools/client-runtime/state/runtime";
@@ -100,12 +100,6 @@ function ConfiguredConnectOnboardingRouteScreen() {
         />
       ) : (
         <NativeHeaderToolbar placement="right">
-          <NativeHeaderToolbar.Button
-            accessibilityLabel="Refresh environments"
-            disabled={isRefreshing}
-            icon="arrow.clockwise"
-            onPress={handleRefresh}
-          />
           <NativeHeaderToolbar.Button icon="xmark" onPress={handleClose} separateBackground />
         </NativeHeaderToolbar>
       )}
@@ -121,6 +115,11 @@ function ConfiguredConnectOnboardingRouteScreen() {
           paddingHorizontal: 20,
           paddingTop: 16,
         }}
+        refreshControl={
+          Platform.OS === "ios" ? (
+            <RefreshControl refreshing={isRefreshing} onRefresh={handleRefresh} />
+          ) : undefined
+        }
       >
         {isSignedIn ? (
           <CloudEnvironmentRows
diff --git a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
index 2298716a328f..094e385e6ab9 100644
--- a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
@@ -279,7 +279,7 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
         gap: Platform.OS === "android" ? 8 : 14,
       }}
       refreshControl={
-        isInspector ? (
+        Platform.OS === "ios" || isInspector ? (
           <RefreshControl refreshing={isRefreshing} onRefresh={() => void handleRefresh()} />
         ) : undefined
       }
@@ -437,8 +437,9 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
   if (Platform.OS === "ios") {
     // Compact form sheet: a plain screen presented as formSheet never renders a
     // stack header, so — like the Settings sheet — the header must come from a
-    // nested native stack INSIDE the sheet. Refresh belongs in the header so
-    // dragging down at the top of the content can dismiss the sheet.
+    // nested native stack INSIDE the sheet. This reuses the exact structure of the
+    // inspector branch below: branch as the title, status summary as the native
+    // subtitle, and content that owns pull-to-refresh.
     return (
       <View collapsable={false} className="flex-1 bg-sheet">
         <ScreenStack style={{ flex: 1 }}>
@@ -454,18 +455,6 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
             <ScreenStackHeaderConfig
               backgroundColor="rgba(0,0,0,0)"
               color={foregroundColor}
-              headerRightBarButtonItems={[
-                {
-                  accessibilityLabel: "Refresh repository status",
-                  disabled: busy || isRefreshing,
-                  icon: { name: "arrow.clockwise", type: "sfSymbol" },
-                  identifier: "thread-git-sheet-refresh",
-                  onPress: () => void handleRefresh(),
-                  sharesBackground: false,
-                  tintColor: foregroundColor,
-                  type: "button",
-                },
-              ]}
               hideBackButton
               hideShadow={false}
               navigationItemStyle="editor"