@rapidmx/web-client 0.21.0 → 0.22.0

package/apps/shared/search/searchTier2.ts

@@ -17,9 +17,9 @@
  * alongside Tier 1/Tier 3 (`apps/www/index.tsx`'s own search orchestration) must never see the *whole
  * search* fail just because this one, most novel piece had a bad moment.
  */
-import type { UnlockedKeys } from "@rapidmx/react-shared/crypto/keySession.js";
-import type { ParsedSearchQuery } from "@rapidmx/react-shared/search/queryGrammar.js";
-import type { SearchResult } from "@rapidmx/react-shared/search/searchApi.js";
+import type { UnlockedKeys } from "../../../lib/crypto/keySession.js";
+import type { ParsedSearchQuery } from "../../../lib/search/queryGrammar.js";
+import type { SearchResult } from "../../../lib/search/searchApi.js";
 import { deriveLocalIndexKey } from "./localIndexKey.js";
 import { getLocalCoverage, initLocalIndex, searchLocal } from "./localIndexRpcClient.js";
 import type { Coverage } from "./localIndexWorker.js";

package/apps/shared/signing/enrollmentTracker.ts

@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useSyncExternalStore } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { ApiRequestError } from "../../../lib/util/api.js";
 import {
     CurrentSignEnrollment,
     EnrollmentResult,
     checkNowRetryAfterSeconds,
     checkSignEnrollmentNow,
     checkSignEnrollmentStatus,
-} from "@rapidmx/react-shared/crypto/keyvaultApi.js";
-import { SIGNING_ENROLLMENT_UNKNOWN } from "@rapidmx/react-shared/crypto/signingProviderApi.js";
+} from "../../../lib/crypto/keyvaultApi.js";
+import { SIGNING_ENROLLMENT_UNKNOWN } from "../../../lib/crypto/signingProviderApi.js";
 import { storeSignEnrollment } from "./enrollmentStorage.js";
 import { resetSigningInfo } from "./signingInfo.js";
 

package/apps/shared/signing/enrollmentView.ts

@@ -2,7 +2,7 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import type { EnrollmentResult, SignEnrollmentStage, SignEnrollmentStep } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import type { EnrollmentResult, SignEnrollmentStage, SignEnrollmentStep } from "../../../lib/crypto/keyvaultApi.js";
 import type { SigningEnrollmentInfo } from "./signingInfo.js";
 
 /** Warn about an expiring certificate this many days ahead. */

package/apps/shared/signing/signingInfo.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { SigningEnrollmentInfo, getSigningEnrollmentInfo } from "@rapidmx/react-shared/crypto/signingProviderApi.js";
+import { SigningEnrollmentInfo, getSigningEnrollmentInfo } from "../../../lib/crypto/signingProviderApi.js";
 
 // The type and the request both come from react-shared's `signingProviderApi.js` (R6's) - this module only adds the caching, the
 // never-rejects contract and the hook that Settings > Encryption and its card want. Re-exported so the rest of `signing/` and

package/apps/shared/signing/useSigningEnrollmentWatcher.ts

@@ -3,8 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef } from "react";
-import type { Mailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import { getCurrentSignEnrollment } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import type { Mailbox } from "../../../lib/mail/mailApi.js";
+import { getCurrentSignEnrollment } from "../../../lib/crypto/keyvaultApi.js";
+import { useApiClient } from "../../../lib/util/apiClientContext.js";
 import { notify } from "../notifications/store.js";
 import { readStoredSignEnrollment, storeSignEnrollment } from "./enrollmentStorage.js";
 import { EnrollmentSnapshot, onEnrollmentEnded, watchCurrentEnrollment, watchEnrollment } from "./enrollmentTracker.js";
@@ -22,6 +23,7 @@ export const SIGNING_SETTINGS_HREF = "/settings/encryption";
  * was seen pending - never for a certificate issued long ago.
  */
 export function useSigningEnrollmentWatcher({ userUid, mailboxes, enabled }: { userUid?: string; mailboxes: Mailbox[]; enabled: boolean }): void {
+    const client = useApiClient();
     const mailboxesRef = useRef(mailboxes);
     mailboxesRef.current = mailboxes;
     // Keyed on the uids of the mailboxes the user owns: a refreshed list of the same mailboxes must not start over.
@@ -45,7 +47,7 @@ export function useSigningEnrollmentWatcher({ userUid, mailboxes, enabled }: { u
             // Never throws or rejects: a lookup that cannot be made (an older server, offline, anything) is "nothing is pending", and the frame goes on.
             void (async () => {
                 try {
-                    const current = await getCurrentSignEnrollment(mailboxUid);
+                    const current = await getCurrentSignEnrollment(mailboxUid, client);
                     if (!cancelled && current?.status === "pending") {
                         storeSignEnrollment(mailboxUid, current.enrollmentId);
                         releases.push(watchCurrentEnrollment(mailboxUid, current));
@@ -61,7 +63,7 @@ export function useSigningEnrollmentWatcher({ userUid, mailboxes, enabled }: { u
             stopListening();
             releases.forEach((release) => release());
         };
-    }, [enabled, userUid, ownedKey]);
+    }, [enabled, userUid, ownedKey, client]);
 }
 
 /** The pop-up for an enrollment that just ended - issued or failed (the tracker announces nothing else, and always with its answer). */

package/apps/shared/styles/app.css

@@ -10,27 +10,6 @@
  */
 @import "tailwindcss";
 
-/*
- * Tailwind v4's automatic content scanning excludes `node_modules` by default, which is exactly where
- * `@rapidmx/react-shared`'s components live - without these, none of its Tailwind classnames (Modal/
- * Drawer/Button/Alert/Skeleton/FormField/PopoverPortal/ContactAvatar/MiniDatePicker/BottomTabBar) are
- * generated, and e.g. a Modal renders with no overlay, position or width. The published package ships
- * only its compiled `dist` (no `src`), and `@source` paths resolve from this file's directory
- * (`apps/shared/styles/`), so both install layouts are listed; a path that doesn't exist is skipped:
- * - `../../../node_modules/...`: react-shared under this package's own `node_modules` - this repo's
- *   checkout, or a consumer install that nests it under web-client.
- * - `../../../../react-shared/dist`: react-shared hoisted beside this package, i.e. this file at
- *   `<consumer>/node_modules/@rapidmx/web-client/apps/shared/styles/` and react-shared at
- *   `<consumer>/node_modules/@rapidmx/react-shared` - how `server` installs both, for its pages and
- *   for the plugin pages' `plugin-ui.css`, which imports this file from there.
- * `electron-client` links `node_modules/@rapidmx/web-client` to a checkout of this repo, so one of the
- * two matches whether this file is reached through the link or its real path. From a checkout, the
- * second path can also find a sibling `react-shared` checkout's build, which only adds classes
- * react-shared itself uses.
- */
-@source "../../../node_modules/@rapidmx/react-shared/dist";
-@source "../../../../react-shared/dist";
-
 /*
  * `server`'s own build (unlike `electron-client`, which already explicitly sourced this same tree in
  * its own `styles.css`) has no explicit `@source` for this package's *own* `apps/**` tree at all,
@@ -42,11 +21,23 @@
  * `max-w-md`, ...) used by `AdminShell.tsx` (which has its own, separate `import "./app.css"`) was
  * silently absent from the built stylesheet, even though `AdminShell.tsx` itself was very much in the
  * bundle - verified directly by diffing every classname `AdminShell.tsx` uses against the actual built
- * CSS. An explicit `@source` here makes the scan independent of Vite's per-entry chunking, the same
- * fix this file applies to `react-shared` above, just for this package's own source too.
+ * CSS. An explicit `@source` here makes the scan independent of Vite's per-entry chunking.
  */
 @source "../../";
 
+/*
+ * `lib/` (this package's own `admin/`, `appearance/`, `auth/`, `branding/`, `calendar/`, `components/`,
+ * `contacts/`, `crypto/`, `mail/`, `search/`, `tasks/`, `util/`, `videoconf/` - merged in from the former
+ * `@rapidmx/react-shared` package, 2026-09-27, see `.claude/NOTES.md`) is a sibling of `apps/`, not a
+ * descendant of it, so the `@source "../../"` above does not reach it. Its `components/` tree (Modal/
+ * Drawer/Button/Alert/Skeleton/FormField/PopoverPortal/ContactAvatar/MiniDatePicker/BottomTabBar) needs
+ * the same explicit `@source` as `apps/**` does, for the same per-chunk-scanning reason, and for the same
+ * reason wherever this file is consumed from a `node_modules/@rapidmx/web-client/apps/shared/styles/`
+ * install too: `lib/` ships alongside `apps/` there as well, so this one relative path resolves correctly
+ * from both this repo's own checkout and a consumer's install.
+ */
+@source "../../../lib";
+
 /*
  * Self-hosted display typeface — the four weights shipped in `public/fonts/`. Matches the
  * Book/Medium/Bold/Heavy naming + 400/500/700/800 weight mapping from the brand style guide

package/apps/www/_layout.tsx

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { PropsWithChildren } from "react";
-import { Branding } from "@rapidmx/react-shared/branding/brandingApi.js";
+import { Branding } from "../../lib/branding/brandingApi.js";
 import { AppearanceHead, appearanceHtmlAttributes } from "../shared/appearance/AppearanceHead.js";
-import { CUSTOM_STYLESHEET_LINK_ID } from "@rapidmx/react-shared/branding/useBranding.js";
+import { CUSTOM_STYLESHEET_LINK_ID } from "../../lib/branding/useBranding.js";
 
 export interface LayoutProps {
     /**

package/apps/www/calendar/index.tsx

@@ -20,27 +20,28 @@ import {
     startOfMonth,
     startOfWeek,
 } from "date-fns";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
-import { CalendarEvent, getCalendarEvent, listCalendarEvents } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import { getPushClient } from "@rapidmx/react-shared/mail/pushClient.js";
-import { moveOccurrence, resizeOccurrenceEnd } from "@rapidmx/react-shared/calendar/calendarMutations.js";
-import { resolveDragAction } from "@rapidmx/react-shared/calendar/calendarDragIds.js";
-import { createFolder } from "@rapidmx/react-shared/mail/mailApi.js";
-import { CalendarOccurrence, expandAllOccurrences } from "@rapidmx/react-shared/calendar/recurrence.js";
-import Drawer from "@rapidmx/react-shared/components/overlays/Drawer.js";
+import { ApiRequestError } from "../../../lib/util/api.js";
+import { useApiClient } from "../../../lib/util/apiClientContext.js";
+import useIsMobile from "../../../lib/util/useIsMobile.js";
+import { CalendarEvent, getCalendarEvent, listCalendarEvents } from "../../../lib/calendar/calendarApi.js";
+import { getPushClient } from "../../../lib/mail/pushClient.js";
+import { moveOccurrence, resizeOccurrenceEnd } from "../../../lib/calendar/calendarMutations.js";
+import { resolveDragAction } from "../../../lib/calendar/calendarDragIds.js";
+import { createFolder } from "../../../lib/mail/mailApi.js";
+import { CalendarOccurrence, expandAllOccurrences } from "../../../lib/calendar/recurrence.js";
+import Drawer from "../../../lib/components/overlays/Drawer.js";
 import CalendarShell, { CalendarShellProps, useCalendarShell } from "../../shared/components/calendar/layout/CalendarShell.js";
 import CalendarListSidebar from "../../shared/components/calendar/CalendarListSidebar.js";
 import { useWritableMailboxes } from "../../shared/components/mail/writableMailboxes.js";
 import EventModal from "../../shared/components/calendar/EventModal.js";
 import FloatingActionButton from "../../shared/components/layout/FloatingActionButton.js";
 import { EventAnchor, anchorOf } from "../../shared/components/calendar/EventShell.js";
-import MiniDatePicker from "@rapidmx/react-shared/components/pickers/MiniDatePicker.js";
+import MiniDatePicker from "../../../lib/components/pickers/MiniDatePicker.js";
 import MonthView from "../../shared/components/calendar/MonthView.js";
 import SplitDayView from "../../shared/components/calendar/SplitDayView.js";
 import TimeGridView from "../../shared/components/calendar/TimeGridView.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Alert from "../../../lib/components/feedback/Alert.js";
+import Button from "../../../lib/components/buttons/Button.js";
 import { SWIPE_PERIOD_SHIFT } from "../../shared/components/calendar/swipeNavigation.js";
 import { useSwipeSlide } from "../../shared/gestures/useSwipeSlide.js";
 import { useEnterSlide } from "../../shared/gestures/useEnterSlide.js";
@@ -108,6 +109,7 @@ interface ModalState {
 
 function CalendarContent({ userUid, bookingHref }: { userUid?: string; bookingHref?: string }) {
     const { mailboxUid, folderUid, calendarFolders, mailboxCalendars, mailboxes, reloadFolders, colorFor } = useCalendarShell();
+    const client = useApiClient();
     // `PointerSensor` alone activates a drag on the very first touch-move, indistinguishable from a
     // scroll gesture on a touch device. `MouseSensor` (a small `distance` — desktop drags still start
     // immediately on a deliberate movement, no change from before) + `TouchSensor` (a `delay`+`tolerance`
@@ -166,7 +168,7 @@ function CalendarContent({ userUid, bookingHref }: { userUid?: string; bookingHr
     }
 
     async function handleAddCalendar(targetMailboxUid: string, name: string, color: string) {
-        const created = await createFolder({ mailboxUid: targetMailboxUid, name, type: "calendar", color });
+        const created = await createFolder({ mailboxUid: targetMailboxUid, name, type: "calendar", color }, client);
         setCheckedFolderUidsState((prev) => new Set([...(prev ?? calendarFolders.map((f) => f.uid)), created.uid]));
         reloadFolders();
     }
@@ -209,7 +211,7 @@ function CalendarContent({ userUid, bookingHref }: { userUid?: string; bookingHr
         }
         setLoading(true);
         setError(null);
-        void Promise.allSettled(targets.map((f) => listCalendarEvents(f.uid)))
+        void Promise.allSettled(targets.map((f) => listCalendarEvents(f.uid, client)))
             .then((results) => {
                 if (seq !== reloadSeqRef.current) {
                     return;
@@ -264,7 +266,7 @@ function CalendarContent({ userUid, bookingHref }: { userUid?: string; bookingHr
                 if (!uid) {
                     return;
                 }
-                void getCalendarEvent(uid).then(
+                void getCalendarEvent(uid, client).then(
                     (fresh) => {
                         if (checkedFolderUidsRef.current.has(fresh.folderUid)) {
                             setEvents((previous) =>
@@ -281,7 +283,7 @@ function CalendarContent({ userUid, bookingHref }: { userUid?: string; bookingHr
                     },
                 );
             }),
-        [],
+        [client],
     );
 
     const occurrences = useMemo(
@@ -406,9 +408,9 @@ function CalendarContent({ userUid, bookingHref }: { userUid?: string; bookingHr
         }
         try {
             if (action.type === "move") {
-                await moveOccurrence(action.occurrence, action.deltaMs);
+                await moveOccurrence(action.occurrence, action.deltaMs, client);
             } else {
-                await resizeOccurrenceEnd(action.occurrence, action.newEnd);
+                await resizeOccurrenceEnd(action.occurrence, action.newEnd, client);
             }
             reload();
         } catch (err) {

package/apps/www/contacts/[uid].tsx

@@ -5,12 +5,13 @@
 import { pageTitle } from "../../shared/navigation/pageTitle.js";
 import { useNavigate } from "../../shared/navigation/index.js";
 import React, { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { Contact, deleteContact, getContact } from "@rapidmx/react-shared/contacts/contactsApi.js";
+import { ApiRequestError } from "../../../lib/util/api.js";
+import { Contact, deleteContact, getContact } from "../../../lib/contacts/contactsApi.js";
+import { useApiClient } from "../../../lib/util/apiClientContext.js";
 import ContactsShell, { ContactsShellProps } from "../../shared/components/contacts/layout/ContactsShell.js";
 import ContactDetailPane from "../../shared/components/contacts/ContactDetailPane.js";
 import ContactForm from "../../shared/components/contacts/ContactForm.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
+import Alert from "../../../lib/components/feedback/Alert.js";
 import { clearPinnedSignerCache } from "../../shared/components/mail/pinnedSigners.js";
 import { notifyApiError } from "../../shared/notifications/apiErrors.js";
 
@@ -32,6 +33,7 @@ type Mode = "view" | "edit";
 
 function ContactDetailContent({ uid }: { uid: string }) {
     const navigate = useNavigate();
+    const client = useApiClient();
     const [contact, setContact] = useState<Contact | null>(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
@@ -40,7 +42,7 @@ function ContactDetailContent({ uid }: { uid: string }) {
     useEffect(() => {
         setLoading(true);
         setError(null);
-        getContact(uid)
+        getContact(uid, client)
             .then(setContact)
             .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load this contact."))
             .finally(() => setLoading(false));
@@ -52,7 +54,7 @@ function ContactDetailContent({ uid }: { uid: string }) {
     // never runs with a stale/absent contact — no redundant null check needed here.
     async function handleDelete(contact: Contact) {
         try {
-            await deleteContact(contact.uid, contact.version);
+            await deleteContact(contact.uid, contact.version, client);
             // A deleted contact's pinned signing keys must stop vouching for signatures.
             clearPinnedSignerCache();
             navigate("/contacts");
@@ -64,7 +66,7 @@ function ContactDetailContent({ uid }: { uid: string }) {
 
     // After a key change was resolved (or found stale): re-read the contact, keeping the one shown if that fails.
     function handleKeysChanged() {
-        getContact(uid).then(setContact, () => undefined);
+        getContact(uid, client).then(setContact, () => undefined);
     }
 
     if (loading) {

package/apps/www/contacts/index.tsx

@@ -5,7 +5,7 @@
 import { pageTitle } from "../../shared/navigation/pageTitle.js";
 import { useNavigate } from "../../shared/navigation/index.js";
 import React, { useEffect, useMemo, useRef, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { ApiRequestError } from "../../../lib/util/api.js";
 import {
     Contact,
     createContact,
@@ -14,23 +14,24 @@ import {
     listDeletedContacts,
     setContactFavorite,
     updateContact,
-} from "@rapidmx/react-shared/contacts/contactsApi.js";
-import { contactsToVCardFile, contactToVCard, parseVCards } from "@rapidmx/react-shared/contacts/vcard.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+} from "../../../lib/contacts/contactsApi.js";
+import { contactsToVCardFile, contactToVCard, parseVCards } from "../../../lib/contacts/vcard.js";
+import useIsMobile from "../../../lib/util/useIsMobile.js";
+import { useApiClient } from "../../../lib/util/apiClientContext.js";
 import { useCompose } from "../../shared/components/mail/compose/ComposeContext.js";
 import ContactsShell, { ContactsShellProps, useContactsShell } from "../../shared/components/contacts/layout/ContactsShell.js";
 import ContactsSidebar, { ContactsView } from "../../shared/components/contacts/ContactsSidebar.js";
 import ContactsToolbar from "../../shared/components/contacts/ContactsToolbar.js";
 import FloatingActionButton from "../../shared/components/layout/FloatingActionButton.js";
 import { HiOutlineUserPlus } from "react-icons/hi2";
-import ContactAvatar from "@rapidmx/react-shared/components/avatar/ContactAvatar.js";
+import ContactAvatar from "../../../lib/components/avatar/ContactAvatar.js";
 import ContactDetailPane from "../../shared/components/contacts/ContactDetailPane.js";
 import ContactForm from "../../shared/components/contacts/ContactForm.js";
 import { useWritableMailboxes } from "../../shared/components/mail/writableMailboxes.js";
-import { getMyMailboxAccess } from "@rapidmx/react-shared/mail/mailboxAccessApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
+import { getMyMailboxAccess } from "../../../lib/mail/mailboxAccessApi.js";
+import Alert from "../../../lib/components/feedback/Alert.js";
+import Button from "../../../lib/components/buttons/Button.js";
+import Modal from "../../../lib/components/overlays/Modal.js";
 import { LIST_PAGE_SIZE, MAX_LIST_PAGES, listAllPages } from "../../shared/mail/listAllPages.js";
 import { clearPinnedSignerCache } from "../../shared/components/mail/pinnedSigners.js";
 import { SHORTCUTS } from "../../shared/keyboard/keymap.js";
@@ -81,6 +82,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
     const { openCompose } = useCompose();
     const isMobile = useIsMobile();
     const navigate = useNavigate();
+    const client = useApiClient();
     const [contacts, setContacts] = useState<Contact[]>([]);
     const [deletedContacts, setDeletedContacts] = useState<Contact[]>([]);
     const [deletedLoading, setDeletedLoading] = useState(false);
@@ -113,7 +115,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
         }
         setLoading(true);
         setError(null);
-        return listAllPages((page) => listContacts(folderUid, { limit: LIST_PAGE_SIZE, page }))
+        return listAllPages((page) => listContacts(folderUid, { limit: LIST_PAGE_SIZE, page }, client))
             .then((result) => {
                 setContacts(result.items);
                 setTruncated(result.truncated);
@@ -142,7 +144,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
             return;
         }
         let cancelled = false;
-        getMyMailboxAccess(mailboxUid!).then(
+        getMyMailboxAccess(mailboxUid!, client).then(
             (access) => {
                 if (!cancelled) {
                     setDelegateCanViewDeleted(access.canDelete && access.canUpdate);
@@ -163,7 +165,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
         }
         setDeletedLoading(true);
         setDeletedError(null);
-        listAllPages((page) => listDeletedContacts(folderUid, { limit: LIST_PAGE_SIZE, page }))
+        listAllPages((page) => listDeletedContacts(folderUid, { limit: LIST_PAGE_SIZE, page }, client))
             .then((result) => {
                 // A server that dropped the `deleted` filter (no delete+update right on this folder) answers with live
                 // contacts, which must never be listed as deleted.
@@ -294,7 +296,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
 
     async function handleDelete(contact: Contact) {
         try {
-            await deleteContact(contact.uid, contact.version);
+            await deleteContact(contact.uid, contact.version, client);
             // Trusted signer pins come from contacts - a deleted contact's keys must stop vouching for signatures.
             clearPinnedSignerCache();
             setSelectedUid(null);
@@ -310,7 +312,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
         setConfirmingBulkDelete(false);
         for (const contact of checkedContacts) {
             try {
-                await deleteContact(contact.uid, contact.version);
+                await deleteContact(contact.uid, contact.version, client);
             } catch (err) {
                 notifyApiError(err, "Couldn't delete some of the contacts");
             }
@@ -340,7 +342,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
         const allFavorited = checkedContacts.every((c) => c.favorite);
         for (const contact of checkedContacts) {
             try {
-                await setContactFavorite(contact, !allFavorited);
+                await setContactFavorite(contact, !allFavorited, client);
             } catch (err) {
                 notifyApiError(err, "Couldn't update some of the contacts");
             }
@@ -359,7 +361,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
             try {
                 // Only the changed field - sending the whole fetched contact back includes server-managed
                 // fields restapi rejects, and would overwrite any concurrent edit to the other fields.
-                await updateContact({ uid: contact.uid, version: contact.version, categories });
+                await updateContact({ uid: contact.uid, version: contact.version, categories }, client);
             } catch (err) {
                 notifyApiError(err, "Couldn't update some of the contacts");
             }
@@ -383,7 +385,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
         const parsed = parseVCards(text);
         for (const input of parsed) {
             try {
-                await createContact({ mailboxUid, folderUid, ...input });
+                await createContact({ mailboxUid, folderUid, ...input }, client);
             } catch (err) {
                 notifyApiError(err, "Couldn't import some of the contacts");
             }