Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ import { newTaskFlowKey } from "./new-task-flow-state";
import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
import { ConnectionStatusDot } from "../connection/ConnectionStatusDot";
import { appAtomRegistry } from "../../state/atom-registry";
import { mobilePreferencesAtom } from "../../state/preferences";

import { readEnvironmentScope, useEnvironmentScope } from "../../state/session";

Expand Down Expand Up @@ -473,13 +474,17 @@ export function NewTaskDraftScreen(props: {
return;
}

const preferences = appAtomRegistry.get(mobilePreferencesAtom);
const saved = AsyncResult.isSuccess(preferences) ? preferences.value : undefined;
const selection = resolveDraftProjectSelection(
selectedProjectKey,
projects,
pickableProjectGroups(projectScopes),
{
incomingShareId: props.incomingShareId,
pickerClosed: initialPickerRef.current === "open" && isFocused,
useLastProject: saved?.useLastProjectForNewThreads,
lastProject: saved?.lastThreadProject,
},
);
if (selection.kind === "preserve") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,30 @@ describe("resolveDraftProjectSelection", () => {
}),
).toEqual({ kind: "pick" });
});

it("starts a share draft in the last project when Use last project is on", () => {
const scopes = [makeScope([projects[0]!]), makeScope([projects[1]!])];
const shareDraft = {
incomingShareId: "share",
pickerClosed: false,
useLastProject: undefined,
lastProject: { environmentId: "environment", projectId: "t3code-2" },
};
expect(resolveDraftProjectSelection(null, projects, scopes, shareDraft)).toEqual({
kind: "select",
project: projects[1],
});
expect(
resolveDraftProjectSelection(null, projects, scopes, {
...shareDraft,
useLastProject: false,
}),
).toEqual({ kind: "pick" });
const archived = [projects[0]!, { ...projects[1]!, archivedAt: "2026-07-02T00:00:00.000Z" }];
expect(resolveDraftProjectSelection(null, archived, scopes, shareDraft)).toEqual({
kind: "pick",
});
});
});

describe("newTaskDestination", () => {
Expand Down
20 changes: 18 additions & 2 deletions apps/mobile/src/features/threads/new-task-project-selection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ export function resolveDraftProjectSelection(
readonly incomingShareId: string | undefined;
/** The draft's first project picker closed and the draft is showing again. */
readonly pickerClosed: boolean;
readonly useLastProject?: boolean | undefined;
readonly lastProject?: ProjectRef | undefined;
},
): DraftProjectSelectionResolution {
const hasExplicitProjectSelection =
Expand All @@ -153,8 +155,22 @@ export function resolveDraftProjectSelection(
return { kind: "dismiss" };
}

const onlyScope =
draft.incomingShareId !== undefined && projectScopes.length === 1 ? projectScopes[0] : null;
if (draft.incomingShareId === undefined) {
return { kind: "pick" };
}
const last =
draft.useLastProject === false
? undefined
: projects.find(
(project) =>
project.environmentId === draft.lastProject?.environmentId &&
project.id === draft.lastProject.projectId &&
project.archivedAt == null,
);
if (last) {
return { kind: "select", project: last };
}
const onlyScope = projectScopes.length === 1 ? projectScopes[0] : null;
return onlyScope ? { kind: "select", project: onlyScope.representative } : { kind: "pick" };
}

Expand Down
Loading