From 6d8f16e86fecaee0b9f90b1990df66d12acf7cb9 Mon Sep 17 00:00:00 2001
From: Pixel Perfect <me@pixp.cc>
Date: Thu, 22 Oct 2026 00:56:47 -0700
Subject: [PATCH 1/2] fix(mobile): use the Android sheet header for Add
 environment

---
 .../settings/components/SettingsScreen.tsx    | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/apps/mobile/src/features/settings/components/SettingsScreen.tsx b/apps/mobile/src/features/settings/components/SettingsScreen.tsx
index b3f8176ebcebf..af0c1b0fd2920 100644
--- a/apps/mobile/src/features/settings/components/SettingsScreen.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsScreen.tsx
@@ -2,6 +2,7 @@ import { useNavigation, useNavigationState, useRoute } from "@react-navigation/n
 import type { ReactNode } from "react";
 import { Platform, View } from "react-native";
 
+import { AndroidSheetHeader } from "../../../components/ui/AndroidScreenHeader";
 import type { AppBarProps } from "../../../components/ui/AppBar.types";
 import { AppBar } from "../../../components/ui/AppBar";
 import { ScreenContent as SettingsScreenContent } from "../../../components/ui/ScreenContent";
@@ -25,15 +26,25 @@ export function SettingsScreen(
 
   return (
     <View collapsable={false} className="flex-1 bg-sheet">
-      <AppBar
-        title={props.title}
-        actions={props.actions}
-        trailing={Platform.OS === "android" ? props.trailing : undefined}
-        sidebar={false}
-        onBack={workspaceRoot ? undefined : () => navigation.goBack()}
-        hideBottomBorder={!props.formSheet}
-      />
-      {props.formSheet ? (
+      {Platform.OS === "android" && props.formSheet ? (
+        <AndroidSheetHeader
+          title={props.title}
+          actions={props.actions}
+          trailing={props.trailing}
+          onBack={() => navigation.goBack()}
+          hideBottomBorder
+        />
+      ) : (
+        <AppBar
+          title={props.title}
+          actions={props.actions}
+          trailing={Platform.OS === "android" ? props.trailing : undefined}
+          sidebar={false}
+          onBack={workspaceRoot ? undefined : () => navigation.goBack()}
+          hideBottomBorder={!props.formSheet}
+        />
+      )}
+      {props.formSheet && Platform.OS !== "android" ? (
         props.children
       ) : (
         <SettingsScreenContent>{props.children}</SettingsScreenContent>

From 1c815d9d2b3f7643f4e6a076bd80bd4857c2b299 Mon Sep 17 00:00:00 2001
From: Pixel Perfect <me@pixp.cc>
Date: Thu, 22 Oct 2026 07:04:48 -0700
Subject: [PATCH 2/2] fix(mobile): round the Add environment sheet's outer
 corners

---
 apps/mobile/src/Stack.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx
index f74f13acd50b1..34f16cf335135 100644
--- a/apps/mobile/src/Stack.tsx
+++ b/apps/mobile/src/Stack.tsx
@@ -1000,6 +1000,7 @@ const RootStackConfig = createWorkspaceStackNavigator({
         ...HORIZONTAL_FORM_SHEET_OPTIONS,
         sheetAllowedDetents: [0.55, 0.7],
         sheetGrabberVisible: true,
+        sheetCornerRadius: Platform.OS === "android" ? 28 : undefined,
       },
     }),
     NewTaskSheet: createNativeStackScreen({