The best way to control Claude Code, Codex and more from any computer or phone
fix(mobile): Usage and Settings use the glass header and the Duo rail (#24348)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Oct 24, 2026 at 01:01 UTC
aaf4a901c490da4f0943afe1d941f3a8d58dc1c8
5 files changed
+32
-36
apps/mobile/src/features/settings/SettingsRouteScreen.tsx
-10
@@ -19,7 +19,6 @@ import { Platform, View } from "react-native";
19
import { useWorkspaceSurface } from "../workspace/useWorkspaceSurface";
20
import { useDeviceType } from "../../native/native-layout-metrics";
21
import { useCompactWorkspaceTabs } from "../workspace/useSystemWorkspaceTabBar";
22
-import { NativeStackScreenOptions } from "../../native/StackHeader";
22
import { deriveProjectGroupLabel } from "@t3tools/client-runtime/state/project-grouping";
23
import { useSafeAreaInsets } from "react-native-safe-area-context";
24
@@ -47,15 +46,6 @@ export function SettingsRouteScreen() {
46
47
return (
48
<View className={`flex-1 ${surface.className}`}>
50
- {Platform.OS === "ios" ? (
51
- <NativeStackScreenOptions
52
- options={{
53
- headerTransparent: false,
54
- headerStyle: { backgroundColor: surface.backgroundColor },
55
- contentStyle: { backgroundColor: surface.backgroundColor },
56
- }}
57
- />
58
- ) : null}
49
<SettingsEnvironmentFilterHeader />
50
<ScreenScrollViewBottomInset value={deviceType === "pad" || compactTabs ? 80 : 0}>
51
{Platform.OS === "android" ? (
apps/mobile/src/features/settings/components/SettingsScreen.tsx
-10
@@ -8,7 +8,6 @@ import { ScreenContent as SettingsScreenContent } from "../../../components/ui/S
8
import { useWorkspaceTabs } from "../../workspace/WorkspaceTabsContext";
9
import { useWorkspaceSurface } from "../../workspace/useWorkspaceSurface";
10
import { useDeviceType } from "../../../native/native-layout-metrics";
11
-import { NativeStackScreenOptions } from "../../../native/StackHeader";
11
import { useCompactWorkspaceTabs } from "../../workspace/useSystemWorkspaceTabBar";
12
import { ScreenScrollViewBottomInset } from "../../../components/ui/ScreenScrollView";
13
@@ -47,15 +46,6 @@ export function SettingsScreen(
46
onBack={workspaceRoot ? undefined : () => navigation.goBack()}
47
hideBottomBorder={!props.formSheet}
48
/>
50
- {Platform.OS === "ios" && (workspaceRoot || cover) ? (
51
- <NativeStackScreenOptions
52
- options={{
53
- headerTransparent: false,
54
- headerStyle: { backgroundColor: surface.backgroundColor },
55
- contentStyle: { backgroundColor: surface.backgroundColor },
56
- }}
57
- />
58
- ) : null}
49
<ScreenScrollViewBottomInset value={deviceType === "pad" || compactTabs ? 80 : 0}>
50
{props.formSheet ? (
51
props.children
apps/mobile/src/features/usage/UsageRouteScreen.tsx
+26
-2
@@ -56,6 +56,7 @@ import { UsageLimitsSection } from "./UsageLimitsPooled";
56
import { Menu } from "../../components/ui/Menu";
57
import { SymbolView } from "../../components/ui/AppSymbol";
58
import { NativeStackScreenOptions } from "../../native/StackHeader";
59
+import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
60
import type { UsageChartMetric } from "./usageChartData";
61
import { PROVIDER_LABEL, useProviderColors, useUsageMixColors } from "./usageProviders";
62
@@ -245,8 +246,31 @@ function UsageScreen(props: {
246
<SettingsScreen title="Usage" trailing={environmentFilter} workspaceRoot={props.workspace}>
247
{Platform.OS === "ios" ? (
248
<NativeStackScreenOptions
248
- optionsVersion={environmentFilter}
249
- options={{ headerRight: () => environmentFilter }}
249
+ optionsVersion={JSON.stringify({ showEnvironmentFilter, filterIcon, environmentActions })}
250
+ options={{
251
+ // A native menu item, unlike a custom view, moves into the Duo's vertical bar.
252
+ unstable_headerRightItems: () =>
253
+ showEnvironmentFilter
254
+ ? [
255
+ withNativeGlassHeaderItem({
256
+ accessibilityLabel: "Filter usage environments",
257
+ icon: { name: filterIcon, type: "sfSymbol" },
258
+ label: "",
259
+ type: "menu",
260
+ menu: {
261
+ title: "Environments",
262
+ items: environmentActions.map((action) => ({
263
+ type: "action" as const,
264
+ label: action.title,
265
+ description: action.subtitle,
266
+ state: action.state === "on" ? ("on" as const) : undefined,
267
+ onPress: () => selectEnvironment(action.id),
268
+ })),
269
+ },
270
+ }),
271
+ ]
272
+ : [],
273
+ }}
274
/>
275
) : null}
276
<ScrollView
apps/mobile/src/features/workspace/WorkspaceExtraTab.tsx
+1
-3
@@ -7,9 +7,7 @@ export function WorkspaceExtraTab(_props: {
7
}) {
8
return (
9
<>
10
- <NativeStackScreenOptions
11
- options={{ headerSearchBarOptions: undefined, unstable_headerRightItems: undefined }}
12
- />
10
+ <NativeStackScreenOptions options={{ headerSearchBarOptions: undefined }} />
11
<UsageRouteScreen workspace />
12
</>
13
);
apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx
+5
-11
@@ -93,7 +93,6 @@ function WorkspaceRootContent() {
93
const keyboardHeight = useKeyboardState((keyboard) => keyboard.height);
94
const workspace = useWorkspaceTabs()!;
95
const { state } = workspace;
96
- const solidHeader = deviceType === "duo-folded" || state.selectedTab === "usage";
96
const renderHeaderTitle = useCallback(
97
() => (
98
<WorkspaceRootTitle
@@ -150,16 +149,11 @@ function WorkspaceRootContent() {
149
options={{
150
title: enabled.length ? TAB_TITLES[state.selectedTab] : "Navigation",
151
headerShown: true,
153
- headerTransparent: solidHeader ? false : NATIVE_LIQUID_GLASS_SUPPORTED,
154
- headerStyle: solidHeader
155
- ? { backgroundColor: surface.backgroundColor }
156
- : NATIVE_LIQUID_GLASS_SUPPORTED
157
- ? { backgroundColor: "transparent" }
158
- : undefined,
159
- contentStyle: solidHeader ? { backgroundColor: surface.backgroundColor } : undefined,
160
- ...(state.selectedTab !== "usage" || enabled.length === 0
161
- ? { headerRight: undefined }
162
- : {}),
152
+ headerTransparent: NATIVE_LIQUID_GLASS_SUPPORTED,
153
+ headerStyle: NATIVE_LIQUID_GLASS_SUPPORTED
154
+ ? { backgroundColor: "transparent" }
155
+ : undefined,
156
+ contentStyle: undefined,
157
...(enabled.length === 0
158
? { headerSearchBarOptions: undefined, unstable_headerRightItems: () => [] }
159
: {}),