@remit/web-client 0.0.176 → 0.0.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.176",
+  "version": "0.0.178",
   "type": "module",
   "description": "Remit web client, published as composable primitives — the app shell, auth shells, and runtime config. A distributor imports what it composes and bundles it.",
   "exports": {

package/src/components/mail/MessageList.tsx

@@ -21,7 +21,7 @@ import type { RefObject } from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useErrorBanners } from "@/components/ui/ErrorBannerProvider";
 import { formatErrorMessage } from "@/components/ui/ErrorState";
-import { useJunkMailbox } from "@/hooks/useArchiveMailbox";
+import { useJunkMailbox, useTrashMailbox } from "@/hooks/useArchiveMailbox";
 import {
 	type EscalatedAction,
 	type EscalationSearchQuery,
@@ -46,7 +46,11 @@ import {
 	escalatedStatusLabel,
 	escalationActionLabel,
 } from "@/lib/escalation-label";
-import { formatDeleteToTrashTitle, formatEmailDate } from "@/lib/format";
+import {
+	type DeleteOutcome,
+	deleteConfirmationCopy,
+	formatEmailDate,
+} from "@/lib/format";
 import { junkDestination } from "@/lib/junk-destination";
 import { tabStopId } from "@/lib/list-focus";
 import { useListHeaderChrome } from "@/lib/list-header-chrome";
@@ -296,6 +300,18 @@ export const MessageList = ({
 	const { junkMailboxId } = useJunkMailbox(accountId);
 	const junkDestinationId = junkDestination(junkMailboxId, mailboxId);
 
+	// Deleting inside Trash is an expunge on the mail server, not a move, so the
+	// confirmation has to ask that question instead of "move to Trash?" (#845).
+	// Until the appointment resolves the outcome is genuinely unknown, and the
+	// dialog says so rather than guessing the reversible half of the answer.
+	const { trashMailboxId, isLoading: isTrashRoleLoading } =
+		useTrashMailbox(accountId);
+	const deleteOutcome: DeleteOutcome = isTrashRoleLoading
+		? "unknown"
+		: trashMailboxId === mailboxId
+			? "permanent"
+			: "trash";
+
 	// Selection state
 	const {
 		selectedIds,
@@ -1339,11 +1355,9 @@ export const MessageList = ({
 			/>
 			<ConfirmDialog
 				isOpen={pendingDelete !== null}
-				title={formatDeleteToTrashTitle(pendingDelete?.length ?? 0)}
-				description="You can restore them from Trash later."
-				confirmLabel="Move to Trash"
+				{...deleteConfirmationCopy(pendingDelete?.length ?? 0, deleteOutcome)}
 				destructive
-				isBusy={isDeleting}
+				isBusy={isDeleting || deleteOutcome === "unknown"}
 				onConfirm={handleConfirmDelete}
 				onCancel={handleCancelDelete}
 			/>

package/src/hooks/useArchiveMailbox.ts

@@ -80,6 +80,18 @@ export const useJunkMailbox = (
 	return { junkMailboxId: mailboxId, isLoading };
 };
 
+/**
+ * Returns the account's appointed Trash mailbox id. The delete confirmation
+ * needs it to tell a move-to-Trash apart from a delete inside Trash, which is
+ * an unrecoverable expunge and has to be asked as one (#845).
+ */
+export const useTrashMailbox = (
+	accountId: string | undefined,
+): { trashMailboxId: string | undefined; isLoading: boolean } => {
+	const { mailboxId, isLoading } = useFolderRoleMailbox(accountId, "Trash");
+	return { trashMailboxId: mailboxId, isLoading };
+};
+
 /**
  * Returns an account's full role→mailbox appointment map, for callers that
  * need more than one role at once (e.g. the Move-to picker excluding both

package/src/lib/format.test.ts

@@ -1,6 +1,7 @@
 import assert from "node:assert";
 import { describe, test } from "node:test";
 import {
+	deleteConfirmationCopy,
 	formatDate,
 	formatDatePreset,
 	formatDeleteToTrashTitle,
@@ -120,3 +121,37 @@ describe("formatDeleteToTrashTitle", () => {
 		);
 	});
 });
+
+describe("deleteConfirmationCopy", () => {
+	test("asks to move when the delete files the mail in Trash", () => {
+		assert.deepStrictEqual(deleteConfirmationCopy(3, "trash"), {
+			title: "Move 3 messages to Trash?",
+			description: "You can restore them from Trash later.",
+			confirmLabel: "Move to Trash",
+		});
+	});
+
+	test("asks about destruction when the delete expunges", () => {
+		assert.deepStrictEqual(deleteConfirmationCopy(3, "permanent"), {
+			title: "Permanently delete 3 messages?",
+			description:
+				"They are erased from the mail server and cannot be restored.",
+			confirmLabel: "Delete permanently",
+		});
+	});
+
+	test("uses the singular noun for one message on the permanent path", () => {
+		assert.strictEqual(
+			deleteConfirmationCopy(1, "permanent").title,
+			"Permanently delete 1 message?",
+		);
+	});
+
+	test("commits to neither wording until the Trash appointment resolves", () => {
+		assert.deepStrictEqual(deleteConfirmationCopy(3, "unknown"), {
+			title: "Delete 3 messages?",
+			description: "Checking where this account files deleted mail…",
+			confirmLabel: "Delete",
+		});
+	});
+});

package/src/lib/format.ts

@@ -160,3 +160,53 @@ export const formatDeleteToTrashTitle = (count: number): string => {
 	const noun = count === 1 ? "message" : "messages";
 	return `Move ${quantity} ${noun} to Trash?`;
 };
+
+export interface DeleteConfirmationCopy {
+	title: string;
+	description: string;
+	confirmLabel: string;
+}
+
+/**
+ * What a delete will actually do to the selected mail. `unknown` is the state
+ * before the account's Trash appointment has resolved — a real state on a cold
+ * open, and the one the copy must not guess at, because guessing "move to
+ * Trash" over an expunge is the dishonesty this whole flow exists to remove.
+ */
+export type DeleteOutcome = "trash" | "permanent" | "unknown";
+
+/**
+ * The confirmation for a delete, worded for what the delete actually does.
+ * Deleting mail that already sits in Trash expunges it on the server and
+ * nothing survives that, so it is asked as a permanent delete — a dialog that
+ * says "Move to Trash" over an expunge collects an answer to a question the
+ * user was never asked.
+ */
+export const deleteConfirmationCopy = (
+	count: number,
+	outcome: DeleteOutcome,
+): DeleteConfirmationCopy => {
+	const quantity = count === 1 ? "1" : formatNumber(count);
+	const noun = count === 1 ? "message" : "messages";
+
+	if (outcome === "unknown") {
+		return {
+			title: `Delete ${quantity} ${noun}?`,
+			description: "Checking where this account files deleted mail…",
+			confirmLabel: "Delete",
+		};
+	}
+	if (outcome === "permanent") {
+		return {
+			title: `Permanently delete ${quantity} ${noun}?`,
+			description:
+				"They are erased from the mail server and cannot be restored.",
+			confirmLabel: "Delete permanently",
+		};
+	}
+	return {
+		title: formatDeleteToTrashTitle(count),
+		description: "You can restore them from Trash later.",
+		confirmLabel: "Move to Trash",
+	};
+};

package/src/lib/junk-destination.test.ts

@@ -31,7 +31,7 @@ describe("junkWithheldReason", () => {
 
 	it("names the setting that appoints a folder", () => {
 		assert.equal(junkWithheldReason(undefined, INBOX), NO_JUNK_FOLDER_REASON);
-		assert.match(NO_JUNK_FOLDER_REASON, /Settings › Folders/);
+		assert.match(NO_JUNK_FOLDER_REASON, /Settings › Folder roles/);
 	});
 
 	it("says the mail is already where the verb would put it", () => {

package/src/lib/junk-destination.ts

@@ -6,7 +6,7 @@
  */
 
 export const NO_JUNK_FOLDER_REASON =
-	"This account has no Junk folder appointed, so there is nowhere to file these. Appoint one under Settings › Folders.";
+	"This account has no Junk folder appointed, so there is nowhere to file these. Appoint one under Settings › Folder roles.";
 
 export const ALREADY_IN_JUNK_REASON =
 	"These are already in Junk, so there is nowhere to file them.";