@devries-cameron20 / t3code-1 / commits / 3d68b7a05d
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(mobile): Android commit sheet scrolls to the commit buttons (#28272)

Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

shivam committed Nov 1, 2026 at 07:49 UTC 3d68b7a05d634ddfbebe520e510284f86a3560f7
1 file changed +18 -10
apps/mobile/src/features/threads/git/GitCommitSheet.tsx
+18 -10
@@ -67,24 +67,31 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
67 });
68 };
69
70 + const android = Platform.OS === "android";
71 + const header = (
72 + <SheetHeader
73 + presentation={android ? "inline" : "native"}
74 + title="Commit changes"
75 + subtitle={gitStatus.data?.refName ?? "(detached HEAD)"}
76 + onCancel={() => navigation.goBack()}
77 + accessibilityLabel="Cancel commit"
78 + />
79 + );
80 +
81 return (
82 + // Material sheet drags follow the first nested-scrolling native view, and the inline
83 + // header's Compose button is one, so Android renders content first and reverses the column.
84 <View
85 collapsable={false}
73 - className="bg-sheet ios:flex-1"
74 - style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
86 + className="bg-sheet ios:flex-1 android:flex-col-reverse"
87 + style={android ? { maxHeight: windowHeight * 0.92 } : undefined}
88 >
76 - {Platform.OS === "android" ? (
89 + {android ? (
90 <NativeStackScreenOptions
91 options={{ sheetCornerRadius: 28, sheetAllowedDetents: "fitToContents" }}
92 />
93 ) : null}
81 - <SheetHeader
82 - presentation={Platform.OS === "android" ? "inline" : "native"}
83 - title="Commit changes"
84 - subtitle={gitStatus.data?.refName ?? "(detached HEAD)"}
85 - onCancel={() => navigation.goBack()}
86 - accessibilityLabel="Cancel commit"
87 - />
94 + {android ? null : header}
95 <ScreenContent fitToContents>
96 <ScrollView
97 nestedScrollEnabled
@@ -228,6 +235,7 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
235 </View>
236 </ScrollView>
237 </ScreenContent>
238 + {android ? header : null}
239 </View>
240 );
241 }