@remit/ui 0.0.121 → 0.0.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/ui",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "type": "module",
   "files": [
     "src"

package/src/components/selection-wizard.render.test.ts

@@ -3,7 +3,11 @@ import { describe, it } from "node:test";
 import { createElement } from "react";
 import { renderToString } from "react-dom/server";
 import type { MatchCount, StepId, WizardDraft } from "../lib/wizard-steps.js";
-import { stepsFor } from "../lib/wizard-steps.js";
+import {
+	matchDoorsFor,
+	stepBlockedReason,
+	stepsFor,
+} from "../lib/wizard-steps.js";
 import {
 	type RuleClause,
 	UNCOUNTABLE_PREDICATE_REASON,
@@ -57,6 +61,7 @@ const sample = { messages, count: counted(2), label: "Your selection" };
 const matchProps = {
 	selectedCount: 2,
 	mode: "selected" as const,
+	accountId: "acc-personal",
 	onModeChange: noop,
 	onSemanticFallback: noop,
 	sample,
@@ -291,6 +296,42 @@ describe("MatchStepBody", () => {
 	});
 });
 
+/**
+ * Starred, and any other surface whose rows span accounts (#523). Both widened
+ * doors are counted through a preview one account answers, so offering them
+ * walks the user to a review waiting on a count nobody can take, with Back the
+ * only way on. They are withheld, and the step says why.
+ */
+describe("MatchStepBody with no single account", () => {
+	const spanning = { ...matchProps, accountId: undefined };
+
+	it("offers the ticked rows alone, and states the restriction", () => {
+		const html = text(renderToString(createElement(MatchStepBody, spanning)));
+		assert.match(html, /These 2 messages/);
+		assert.doesNotMatch(html, /Similar to these/);
+		assert.doesNotMatch(html, /Its properties/);
+		assert.match(html, /only works within one account/);
+	});
+
+	it("leaves a review that commits rather than one pinned on the count", () => {
+		assert.deepEqual([...matchDoorsFor(undefined)], ["selected"]);
+		// The only door left is its own count, so nothing about the match is still
+		// settling by the time the review is reached.
+		const blockedReason = stepBlockedReason("review", draft(), counted(2));
+		assert.equal(blockedReason, undefined);
+		const html = text(
+			renderToString(
+				createElement(
+					SelectionWizard,
+					wizardProps({ step: "review", match: spanning, blockedReason }),
+				),
+			),
+		);
+		assert.doesNotMatch(html, /Counting matches/);
+		assert.match(html, /2 messages/);
+	});
+});
+
 describe("PropertiesStepBody", () => {
 	it("renders the rule as the shipped chips, with the join between them", () => {
 		const html = renderToString(

package/src/components/selection-wizard.tsx

@@ -21,6 +21,7 @@ import { Fragment, type ReactNode, useEffect, useId, useRef } from "react";
 import { cn } from "../lib/cn.js";
 import {
 	backExits,
+	crossAccountMatchReason,
 	ESCALATED_MATCH_HINT,
 	ESCALATED_REVIEW_WARNING,
 	ESCALATED_SCOPE_FALLBACK,
@@ -30,6 +31,7 @@ import {
 	type MatchMode,
 	matchDoorHint,
 	matchDoorLabel,
+	matchDoorsFor,
 	matchPhrase,
 	matchSummary,
 	type RunCopy,
@@ -364,6 +366,13 @@ export function FooterNav({
 export interface MatchStepProps {
 	selectedCount: number;
 	mode: MatchMode;
+	/**
+	 * The one account this selection belongs to, absent when it spans several
+	 * (#523). Both widened doors are counted through a preview that account
+	 * answers, so without one they are withheld and the step states the
+	 * restriction — the ticked rows are their own match and stay on offer.
+	 */
+	accountId?: string;
 	/**
 	 * Answers the door. Typed to the three doors rather than to every mode, so
 	 * no driver can set `escalated` from a screen — the list escalates a
@@ -396,6 +405,7 @@ export interface MatchStepProps {
 export function MatchStepBody({
 	selectedCount,
 	mode,
+	accountId,
 	onModeChange,
 	semanticUnavailable,
 	semanticErrorDetail,
@@ -419,44 +429,55 @@ export function MatchStepBody({
 			</>
 		);
 	}
+	const doors = matchDoorsFor(accountId);
+	const widened = doors.length > 1;
 	return (
 		<>
 			<div className="space-y-2">
+				{!widened && (
+					<p className="px-1 text-2xs text-warning">
+						{crossAccountMatchReason}
+					</p>
+				)}
 				<ChoiceCard
 					selected={mode === "selected"}
 					onSelect={() => onModeChange("selected")}
 					title={matchDoorLabel("selected", selectedCount)}
 					description={matchDoorHint("selected")}
 				/>
-				<ChoiceCard
-					selected={mode === "similar"}
-					unavailable={semanticUnavailable}
-					onSelect={
-						semanticUnavailable
-							? onSemanticFallback
-							: () => onModeChange("similar")
-					}
-					title={matchDoorLabel("similar", selectedCount)}
-					description={matchDoorHint("similar")}
-				>
-					{semanticErrorDetail && (
-						<p role="status" className="px-1 text-2xs text-danger">
-							Couldn't find similar messages: {semanticErrorDetail}
-						</p>
-					)}
-					{semanticFallbackTaken && (
-						<p role="status" className="px-1 text-2xs text-fg-subtle">
-							Similar-mail matching is unavailable right now — matching on the
-							senders instead.
-						</p>
-					)}
-				</ChoiceCard>
-				<ChoiceCard
-					selected={mode === "properties"}
-					onSelect={() => onModeChange("properties")}
-					title={matchDoorLabel("properties", selectedCount)}
-					description={matchDoorHint("properties")}
-				/>
+				{widened && (
+					<ChoiceCard
+						selected={mode === "similar"}
+						unavailable={semanticUnavailable}
+						onSelect={
+							semanticUnavailable
+								? onSemanticFallback
+								: () => onModeChange("similar")
+						}
+						title={matchDoorLabel("similar", selectedCount)}
+						description={matchDoorHint("similar")}
+					>
+						{semanticErrorDetail && (
+							<p role="status" className="px-1 text-2xs text-danger">
+								Couldn't find similar messages: {semanticErrorDetail}
+							</p>
+						)}
+						{semanticFallbackTaken && (
+							<p role="status" className="px-1 text-2xs text-fg-subtle">
+								Similar-mail matching is unavailable right now — matching on the
+								senders instead.
+							</p>
+						)}
+					</ChoiceCard>
+				)}
+				{widened && (
+					<ChoiceCard
+						selected={mode === "properties"}
+						onSelect={() => onModeChange("properties")}
+						title={matchDoorLabel("properties", selectedCount)}
+						description={matchDoorHint("properties")}
+					/>
+				)}
 			</div>
 			<div className="mt-4">
 				<SelectionSample {...sample} />

package/src/lib/wizard-steps.test.ts

@@ -9,6 +9,7 @@ import {
 	backExits,
 	clauseSentence,
 	clauseWords,
+	crossAccountMatchReason,
 	ESCALATED_MATCH_HINT,
 	ESCALATED_REVIEW_WARNING,
 	escalatedMatchLabel,
@@ -16,6 +17,7 @@ import {
 	type MatchMode,
 	matchDoorHint,
 	matchDoorLabel,
+	matchDoorsFor,
 	matchPhrase,
 	matchSummary,
 	type RunState,
@@ -683,6 +685,15 @@ describe("sample and door vocabulary", () => {
 		assert.match(ESCALATED_REVIEW_WARNING, /by the time it runs/);
 	});
 
+	it("withholds the widened doors where there is no single account", () => {
+		assert.deepEqual(
+			[...matchDoorsFor("acc-personal")],
+			["selected", "similar", "properties"],
+		);
+		assert.deepEqual([...matchDoorsFor(undefined)], ["selected"]);
+		assert.match(crossAccountMatchReason, /within one account/);
+	});
+
 	it("names each door and what it does", () => {
 		assert.equal(matchDoorLabel("selected", 3), "These 3 messages");
 		assert.equal(matchDoorLabel("similar", 3), "Similar to these 3");

package/src/lib/wizard-steps.ts

@@ -223,6 +223,27 @@ export const crossAccountRuleReason =
 export const crossAccountDestinationReason =
 	"A destination only works within one account — clear the selection, or pick messages from a single account.";
 
+/**
+ * The same restriction on the step that asks what the action applies to (#523).
+ * Both widened doors are resolved by a preview one account answers, so a
+ * selection with no single account has nothing to count them against. The ticked
+ * rows are their own match and are unaffected.
+ */
+export const crossAccountMatchReason =
+	"Matching beyond the messages you picked only works within one account — clear the selection, or pick messages from a single account.";
+
+/**
+ * The doors the match step offers. Withholding the two widened ones is what
+ * keeps a selection spanning accounts off a review that waits on a count nobody
+ * can take; the step says why in `crossAccountMatchReason`.
+ */
+export const matchDoorsFor = (
+	accountId: string | undefined,
+): readonly MatchDoor[] =>
+	accountId === undefined
+		? ["selected"]
+		: ["selected", "similar", "properties"];
+
 /**
  * The match reached nothing, so committing it would report a bulk action that
  * touched no mail. Reachable both from a predicate that matches nothing and from