@remit/web-client 0.0.256 → 0.0.258

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.256",
+  "version": "0.0.258",
   "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/public/locales/de/mail.json

@@ -5,7 +5,6 @@
     "drafts": "Entwürfe",
     "trash": "Papierkorb",
     "archive": "Archiv",
-    "spam": "Spam",
     "junk": "Spam",
     "flagged": "Markiert",
     "all": "Alle E-Mails"

package/public/locales/en/common.json

@@ -1,26 +1,5 @@
 {
-  "app": {
-    "title": "Remit",
-    "loading": "Loading...",
-    "error": "Something went wrong"
-  },
-  "actions": {
-    "save": "Save",
-    "cancel": "Cancel",
-    "delete": "Delete",
-    "close": "Close",
-    "confirm": "Confirm"
-  },
-  "pagination": {
-    "previous": "Previous",
-    "next": "Next",
-    "page": "Page {{current}} of {{total}}",
-    "showing": "Showing {{from}}-{{to}} of {{total}}"
-  },
   "accessibility": {
-    "skipToContent": "Skip to main content",
-    "loading": "Loading content",
-    "menuOpen": "Open menu",
-    "menuClose": "Close menu"
+    "skipToContent": "Skip to main content"
   }
 }

package/public/locales/en/mail.json

@@ -5,65 +5,8 @@
     "drafts": "Drafts",
     "trash": "Trash",
     "archive": "Archive",
-    "spam": "Spam",
     "junk": "Spam",
     "flagged": "Starred",
-    "all": "All Mail",
-    "noAccounts": "No accounts configured",
-    "noMailboxes": "No mailboxes"
-  },
-  "emptyState": {
-    "selectMailbox": "Select a mailbox to view messages",
-    "selectMessage": "Select a message to read",
-    "noMessages": "No messages in this mailbox",
-    "messageNotFound": "Message not found"
-  },
-  "inbox": {
-    "title": "Inbox",
-    "empty": "No messages in your inbox",
-    "emptyFiltered": "No {{filter}} messages",
-    "noSubject": "(No subject)"
-  },
-  "thread": {
-    "messageCount": "{{count}} message",
-    "messageCount_other": "{{count}} messages",
-    "unreadCount": "{{count}} unread",
-    "participants": "{{count}} participant",
-    "participants_other": "{{count}} participants"
-  },
-  "filters": {
-    "all": "All",
-    "unread": "Unread",
-    "starred": "Starred",
-    "attachments": "Has attachments"
-  },
-  "actions": {
-    "compose": "Compose",
-    "reply": "Reply",
-    "replyAll": "Reply all",
-    "forward": "Forward",
-    "archive": "Archive",
-    "markRead": "Mark as read",
-    "markUnread": "Mark as unread",
-    "star": "Star",
-    "unstar": "Remove star",
-    "moveToTrash": "Move to trash"
-  },
-  "compose": {
-    "title": "New message",
-    "description": "Compose a new email message",
-    "to": "To",
-    "cc": "Cc",
-    "bcc": "Bcc",
-    "subject": "Subject",
-    "body": "Message",
-    "send": "Send",
-    "discard": "Discard",
-    "attachFiles": "Attach files"
-  },
-  "time": {
-    "justNow": "Just now",
-    "today": "Today",
-    "yesterday": "Yesterday"
+    "all": "All Mail"
   }
 }

package/public/locales/fr/mail.json

@@ -5,7 +5,6 @@
     "drafts": "Brouillons",
     "trash": "Corbeille",
     "archive": "Archives",
-    "spam": "Indésirables",
     "junk": "Indésirables",
     "flagged": "Suivis",
     "all": "Tous les messages"

package/public/locales/nl/mail.json

@@ -5,7 +5,6 @@
     "drafts": "Concepten",
     "trash": "Prullenbak",
     "archive": "Archief",
-    "spam": "Ongewenst",
     "junk": "Ongewenst",
     "flagged": "Met ster",
     "all": "Alle berichten"

package/src/components/mail/DailyBrief.tsx

@@ -24,11 +24,14 @@
  * chips and the account source group, in a panel the list header's caret opens
  * over the rows. `FilterPanelProvider` shares that panel's open state between
  * the caret and the sheet, the same shape `MailViewChrome` gives the mailbox and
- * Starred views. The category and the chips narrow the grouped sections
- * themselves, and the phone search takeover reads the same selection, so a
- * filter set on one surface holds on the other. Under a query the chips are
- * terms of that query — see `briefChipFilters` — so what narrows the list is
- * readable and editable in the search field.
+ * Starred views. The list draws those controls but applies none of them: the
+ * category and every chip a parameter can express travel with the section
+ * requests, and the two that cannot ("From contacts", "Today") are applied here
+ * alongside the residual tokens (#314). The phone search takeover reads the same
+ * selection and the same rows, so a filter set on one surface holds on the
+ * other. Under a query the chips are terms of that query — see
+ * `briefChipFilters` — so what narrows the list is readable and editable in the
+ * search field.
  *
  * Multi-select is the mailbox list's, not a copy of it: the same
  * `ThreadListInteraction` cursor and `useSelection` state, and the same
@@ -114,7 +117,11 @@ import {
 	matchesSearchTokens,
 	toThreadRowData,
 } from "@/lib/brief";
-import { briefCountsMatchRows, briefCriteria } from "@/lib/brief-criteria";
+import {
+	briefClientOnlyFilters,
+	briefCountsMatchRows,
+	briefCriteria,
+} from "@/lib/brief-criteria";
 import { isServerError } from "@/lib/error-classifier";
 import { junkDestination } from "@/lib/junk-destination";
 import type { ListHeaderChrome } from "@/lib/list-header-chrome";
@@ -659,11 +666,16 @@ export function DailyBrief({
 		refetchSections();
 	}, [underQuery, refetchSearch, refetchSections]);
 
-	// What the request could not carry: muted senders, the account pill, and the
+	// What the request could not carry: muted senders, the account pill, the two
+	// chips no endpoint takes a parameter for ("From contacts", "Today"), and the
 	// residual tokens (`from:`, `subject:`, `before:`, `after:`, `in:`,
 	// `account:`) that `listAllThreads` has no parameter for. Everything else was
 	// answered over the whole scope by the request itself, and the order the rows
 	// arrived in is kept — narrowing never re-sorts.
+	const clientOnlyFilters = useMemo(
+		() => briefClientOnlyFilters(requestFilters),
+		[requestFilters],
+	);
 	const narrowRows = useCallback(
 		(rows: RemitImapThreadMessageResponse[]): ThreadRowData[] =>
 			// One row per conversation, because that is what the server counted:
@@ -676,9 +688,10 @@ export function DailyBrief({
 					(t) =>
 						(selectedAccountId === "all" ||
 							t.accountId === selectedAccountId) &&
+						matchesBriefFilters(t, clientOnlyFilters) &&
 						matchesSearchTokens(t, residualTokens),
 				),
-		[selectedAccountId, residualTokens],
+		[selectedAccountId, clientOnlyFilters, residualTokens],
 	);
 
 	const briefRows = useMemo<BriefCategoryResult[]>(
@@ -826,18 +839,13 @@ export function DailyBrief({
 		[refreshState, onRefreshBrief, refreshError, hasNewMail, refreshAccountIds],
 	);
 
-	// The phone search takeover renders the account/free-text-narrowed rows,
-	// further narrowed by the same category and attribute chips the list applies.
+	// The phone search takeover renders the rows the list renders: the same
+	// requests answered the category and the chips, so a second pass here would
+	// narrow one surface by a criterion the other already applied to the whole
+	// scope.
 	const searchResults = useMemo<SearchResult[]>(
-		() =>
-			filteredRows
-				.filter(
-					(t) =>
-						(chipCategory === "all" || t.category === chipCategory) &&
-						matchesBriefFilters(t, chipFilters),
-				)
-				.map((row) => rowToSearchResult(row, resultFolderIndex)),
-		[filteredRows, chipCategory, chipFilters, resultFolderIndex],
+		() => filteredRows.map((row) => rowToSearchResult(row, resultFolderIndex)),
+		[filteredRows, resultFolderIndex],
 	);
 
 	// "Related" (semantic) spans every account here — the brief is the

package/src/components/mail/MailViewChrome.tsx

@@ -14,8 +14,8 @@
  * restores the sheet exactly as it was.
  *
  * The daily brief composes the same three parts itself — provider, header,
- * sheet — around the kit `BriefSections`, whose sheet narrows the grouped
- * sections and flattens them when scoped to one category.
+ * sheet — around the kit `BriefSections`, whose sheet reports the selection and
+ * flattens the sections when the brief is scoped to one category.
  */
 import {
 	FilterPanelProvider,

package/src/components/mail/MoveToTrigger.tsx

@@ -17,7 +17,6 @@ import {
 	useRef,
 	useState,
 } from "react";
-import { useTranslation } from "react-i18next";
 import { Drawer } from "vaul";
 import { ErrorState } from "@/components/ui/ErrorState";
 import { useFolderAppointments } from "@/hooks/useArchiveMailbox";
@@ -86,7 +85,6 @@ export const MoveToTrigger = ({
 	const triggerRef = useRef<HTMLButtonElement>(null);
 	const triggerLabel = label ?? "Move to folder";
 	const popoverId = useId();
-	const { t } = useTranslation("mail", { useSuspense: false });
 	const translator = useFolderLabelTranslator();
 
 	const {
@@ -223,12 +221,8 @@ export const MoveToTrigger = ({
 			// drawer runs its own focus and must not raise a phone keyboard.
 			autoFocusFilter={isDesktop}
 			labels={{
-				filterPlaceholder: t("move_picker_filter_placeholder", {
-					defaultValue: "Filter folders…",
-				}),
-				filterAriaLabel: t("move_picker_filter_label", {
-					defaultValue: "Filter folders",
-				}),
+				filterPlaceholder: "Filter folders…",
+				filterAriaLabel: "Filter folders",
 			}}
 		/>
 	);

package/src/lib/brief-criteria.ts

@@ -18,6 +18,7 @@
  * the request is wider than the list and the section totals are not the list's
  * size. `briefCountsMatchRows` is how a caller knows to show no number instead.
  */
+import type { BriefFilterId } from "@remit/ui";
 import type { InboxFilterParams } from "./inbox-filters.js";
 import { inboxFilterParams } from "./inbox-filters.js";
 import type { SearchToken } from "./search-tokens.js";
@@ -34,12 +35,23 @@ export const BRIEF_TOKEN_PARAMS: readonly ThreadSearchTokenParamName[] = [
 	"attachments",
 ];
 
-/** Chips the request cannot express, so the kit applies them over the rows. */
-export const BRIEF_CLIENT_ONLY_FILTERS: readonly string[] = [
+/** Chips the request cannot express, so the caller applies them over the rows. */
+export const BRIEF_CLIENT_ONLY_FILTERS: readonly BriefFilterId[] = [
 	"contacts",
 	"today",
 ];
 
+/**
+ * The chips on screen that no request carries, as the set to apply over the rows
+ * that came back. Every other chip was answered by the server over the whole
+ * scope, and applying one of those again here would narrow one page by a
+ * criterion the request already applied to everything (#312).
+ */
+export const briefClientOnlyFilters = (
+	attributes: ReadonlySet<string>,
+): ReadonlySet<BriefFilterId> =>
+	new Set(BRIEF_CLIENT_ONLY_FILTERS.filter((id) => attributes.has(id)));
+
 /** Everything a section request narrows by except its own category. */
 export type BriefSectionParams = Omit<InboxFilterParams, "category">;