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

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

fix(mobile): settings filter keeps a selected environment while it is disconnected (#38196)

Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Wout Stiens committed Nov 17, 2026 at 18:19 UTC 3fdd9fc80ccbffabb36c53e893679dbce1a2b162
3 files changed +58 -7
apps/mobile/src/features/settings/settings-environment-filter.logic.test.ts new
+46
@@ -0,0 +1,46 @@
1 +import { EnvironmentId } from "@t3tools/contracts";
2 +import { describe, expect, it } from "vite-plus/test";
3 +
4 +import { toggleSettingsEnvironment } from "./settings-environment-filter.logic";
5 +
6 +describe("settings selection across disconnected environments", () => {
7 + const a = EnvironmentId.make("a");
8 + const b = EnvironmentId.make("b");
9 + const c = EnvironmentId.make("c");
10 + const d = EnvironmentId.make("d");
11 + const all = [a, b, c, d].map((environmentId) => ({ environmentId }));
12 + const connected = all.filter((entry) => entry.environmentId !== b);
13 +
14 + it.each([
15 + {
16 + name: "keeps offline environments selected from All",
17 + selected: null,
18 + toggles: [c],
19 + expected: [a, b, d],
20 + },
21 + {
22 + name: "keeps offline environments deselected after toggling off and on",
23 + selected: new Set([a, c, d]),
24 + toggles: [c, c],
25 + expected: [a, c, d],
26 + },
27 + {
28 + name: "ignores toggles of offline environments",
29 + selected: new Set([a]),
30 + toggles: [b],
31 + expected: [a],
32 + },
33 + {
34 + name: "returns to All when every known environment is selected",
35 + selected: new Set([a, b, d]),
36 + toggles: [c],
37 + expected: null,
38 + },
39 + ])("$name", ({ selected, toggles, expected }) => {
40 + let next: ReadonlySet<EnvironmentId> | null = selected;
41 + for (const id of toggles) {
42 + next = toggleSettingsEnvironment(next, connected, id, all);
43 + }
44 + expect(next).toEqual(expected === null ? null : new Set(expected));
45 + });
46 +});
apps/mobile/src/features/settings/settings-environment-filter.logic.ts
+10 -6
@@ -1,16 +1,20 @@
1 import type { EnvironmentId } from "@t3tools/contracts";
2
3 +/**
4 + * Toggles one connected environment in the Settings scope. `null` means every environment.
5 + * Known offline environments keep their selection when they reconnect.
6 + */
7 export function toggleSettingsEnvironment(
8 selected: ReadonlySet<EnvironmentId> | null,
9 available: readonly { readonly environmentId: EnvironmentId }[],
10 toggledId: EnvironmentId,
11 + known: readonly { readonly environmentId: EnvironmentId }[] = available,
12 ): ReadonlySet<EnvironmentId> | null {
8 - const ids = available.map((entry) => entry.environmentId);
9 - const next = new Set(ids.filter((id) => selected === null || selected.has(id)));
10 - if (ids.includes(toggledId)) {
11 - if (next.has(toggledId)) next.delete(toggledId);
12 - else next.add(toggledId);
13 - }
13 + if (!available.some((entry) => entry.environmentId === toggledId)) return selected;
14 + const ids = known.map((entry) => entry.environmentId);
15 + const next = new Set(selected ?? ids);
16 + if (next.has(toggledId)) next.delete(toggledId);
17 + else next.add(toggledId);
18 return ids.every((id) => next.has(id)) ? null : next;
19 }
20
apps/mobile/src/features/settings/settings-environment-filter.tsx
+2 -1
@@ -146,10 +146,11 @@ export function useSettingsEnvironmentFilter() {
146 selectAll: () => setSelectedIds(null),
147 toggleEnvironment: (environmentId: EnvironmentId) =>
148 setSelectedIds((current) =>
149 - toggleSettingsEnvironment(current, availableTargets, environmentId),
149 + toggleSettingsEnvironment(current, availableTargets, environmentId, environments),
150 ),
151 }),
152 [
153 + environments,
154 availableTargets,
155 selectedTargets,
156 selectedIds,