@rapidmx/web-client 0.21.0 → 0.22.0

package/apps/shared/components/mail/compose/ComposeWindow.tsx

@@ -13,7 +13,7 @@ import {
     HiOutlineTrash,
     HiOutlineXMark,
 } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
 import {
     Attachment,
     ComposeRecipientInput,
@@ -28,16 +28,16 @@ import {
     listFolders,
     listMailboxes,
     uploadAttachment,
-} from "@rapidmx/react-shared/mail/mailApi.js";
-import { listMailSignatures } from "@rapidmx/react-shared/mail/mailSignaturesApi.js";
-import { buildComposeBodyHtml } from "@rapidmx/react-shared/mail/compose/composeQuoting.js";
+} from "../../../../../lib/mail/mailApi.js";
+import { listMailSignatures } from "../../../../../lib/mail/mailSignaturesApi.js";
+import { buildComposeBodyHtml } from "../../../../../lib/mail/compose/composeQuoting.js";
 import { peekMailboxWritability, useMailboxWritability } from "../writableMailboxes.js";
 import { orderMailboxes, primaryMailboxUid } from "../../../mail/primaryMailbox.js";
-import { resolveRecipientEncryption, RecipientEncryptionStatus } from "@rapidmx/react-shared/crypto/composeSecurity.js";
-import { getUnlockedKeys, subscribeKeySession } from "@rapidmx/react-shared/crypto/keySession.js";
-import { EncryptionPolicy, findActivePublicKey, getEncryptionPolicy, lookupKeys } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import { resolveRecipientEncryption, RecipientEncryptionStatus } from "../../../../../lib/crypto/composeSecurity.js";
+import { getUnlockedKeys, subscribeKeySession } from "../../../../../lib/crypto/keySession.js";
+import { EncryptionPolicy, findActivePublicKey, getEncryptionPolicy, lookupKeys } from "../../../../../lib/crypto/keyvaultApi.js";
 import { useUnlockPrompt } from "../../layout/UnlockPromptProvider.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { notify } from "../../../notifications/store.js";
 import { evaluateEncryptionRequirement } from "./encryptionRequirement.js";
 import { decideSend, SendBlock } from "../../../mail/outbox/sendDecision.js";
@@ -53,9 +53,9 @@ import RecipientInput from "./RecipientInput.js";
 import { parseRecipientList } from "./recipients.js";
 import RichTextEditor from "./RichTextEditor.js";
 import ScheduleSendPicker from "./ScheduleSendPicker.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 Alert from "../../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import Modal from "../../../../../lib/components/overlays/Modal.js";
 
 export interface ComposeWindowProps {
     session: ComposeSession;
@@ -221,7 +221,11 @@ export default function ComposeWindow({
     const [hasUploads, setHasUploads] = useState(!!resume && resume.attachments.length > 0);
     const isMobile = useIsMobile();
     const { requestUnlock } = useUnlockPrompt();
-    const { openCompose } = useCompose();
+    // Resolved once by `ComposeProvider` (see `ComposeContext.tsx`'s own doc comment on `ComposeContextValue.client`)
+    // rather than calling `useApiClient()` again here - every REST call below (including `startSend()`'s own,
+    // see `sendJob.ts`) passes it through as the trailing `client` argument, `undefined` (the default global
+    // cookie-based fetch) for every existing caller.
+    const { openCompose, client } = useCompose();
     const keyEnv = useKeyEnvironment();
     // Bumped after a successful on-demand unlock to force a re-render - `getUnlockedKeys()` below is a
     // plain read from a module-level store, not React state, so nothing else would pick up the change.
@@ -325,7 +329,7 @@ export default function ComposeWindow({
 
     useEffect(() => {
         let cancelled = false;
-        listMailboxes({ limit: 100 })
+        listMailboxes({ limit: 100 }, client)
             .then((result) => {
                 if (cancelled) {
                     return;
@@ -363,7 +367,7 @@ export default function ComposeWindow({
         async function load() {
             await Promise.all([
                 mailboxLoaded ||
-                    getMailbox(mailboxUid!).then(
+                    getMailbox(mailboxUid!, {}, client).then(
                         (result) => {
                             mailboxLoaded = true;
                             if (!cancelled) {
@@ -373,7 +377,7 @@ export default function ComposeWindow({
                         () => undefined,
                     ),
                 policyLoaded ||
-                    getEncryptionPolicy().then(
+                    getEncryptionPolicy(client).then(
                         (result) => {
                             policyLoaded = true;
                             if (!cancelled) {
@@ -401,7 +405,7 @@ export default function ComposeWindow({
         // Cancellable so a slow response for a mailbox the user has since switched away from can't point
         // the new draft at the wrong mailbox's Drafts folder.
         let cancelled = false;
-        listFolders(mailboxUid)
+        listFolders(mailboxUid, client)
             .then((folders) => {
                 if (!cancelled) {
                     setDraftsFolderUid(folders.find((f) => f.type === "drafts")?.uid);
@@ -441,7 +445,7 @@ export default function ComposeWindow({
         for (const recipient of unchecked) {
             const key = addressCacheKey(recipient.address);
             inFlight.add(key);
-            void lookupKeys(mailbox.uid, recipient.address)
+            void lookupKeys(mailbox.uid, recipient.address, client)
                 .then(
                     (lookup) => ({ lookup }),
                     () => null,
@@ -512,7 +516,7 @@ export default function ComposeWindow({
         if (!mailboxUid || contentReady || defaultSignature) {
             return;
         }
-        listMailSignatures(mailboxUid)
+        listMailSignatures(mailboxUid, {}, client)
             .then((signatures) => {
                 const signature = signatures.find((s) =>
                     signatureContext === "new" ? s.isDefaultForNewMessages : s.isDefaultForReplyForward,
@@ -548,11 +552,11 @@ export default function ComposeWindow({
         // `In-Reply-To`/`References` and groups the message into the thread being answered. Recorded on
         // every draft this window creates, including the replacement one a From switch makes - the thread
         // doesn't change because the sending mailbox did.
-        createDraft(mailboxUid, draftsFolderUid, session.threading)
+        createDraft(mailboxUid, draftsFolderUid, session.threading, client)
             .then((created) => {
                 if (cancelled) {
                     // The sender changed while this was in flight - discard the now-orphaned draft.
-                    void deleteMessage(created.uid, created.version).catch(() => undefined);
+                    void deleteMessage(created.uid, created.version, client).catch(() => undefined);
                     return;
                 }
                 setDraft(created);
@@ -597,12 +601,12 @@ export default function ComposeWindow({
         // Once it's out of `supersededDraftsRef` a landing save can't update `superseded.version` any more.
         const version = saved?.uid === superseded.uid ? saved.version : superseded.version;
         try {
-            await deleteMessage(superseded.uid, version);
+            await deleteMessage(superseded.uid, version, client);
         } catch {
             try {
-                const fresh = await getMessage(superseded.uid);
+                const fresh = await getMessage(superseded.uid, client);
                 if (isStillDraft(fresh, superseded.folderUid)) {
-                    await deleteMessage(fresh.uid, fresh.version);
+                    await deleteMessage(fresh.uid, fresh.version, client);
                 }
             } catch {
                 // Already gone, or the server is unreachable - nothing more to do from here.
@@ -741,7 +745,7 @@ export default function ComposeWindow({
      * current version. */
     async function refreshDraftVersion(uid: string) {
         try {
-            const fresh = await getMessage(uid);
+            const fresh = await getMessage(uid, client);
             setDraft((prev) => (prev?.uid === fresh.uid && fresh.version > prev.version ? { ...prev, version: fresh.version } : prev));
         } catch {
             // Discard's own retry covers a version this couldn't refresh.
@@ -851,7 +855,7 @@ export default function ComposeWindow({
             }
             pendingSaveRef.current = false;
             finishedRef.current = true;
-            if (!startSend(request)) {
+            if (!startSend(request, client)) {
                 finishedRef.current = false;
                 setSendError("This message is already being sent.");
                 return;
@@ -917,7 +921,7 @@ export default function ComposeWindow({
                     bcc: parseAddresses(current.bcc),
                     subject: current.subject,
                     html: current.html,
-                });
+                }, client);
                 lastSavedRef.current = savedKey;
                 saveErrorRef.current = null;
                 // A From switch may have replaced the draft while this was in flight - never resurrect it,
@@ -958,12 +962,12 @@ export default function ComposeWindow({
         const saved = await saveInFlightRef.current;
         const version = Math.max(current.version, saved?.uid === current.uid ? saved.version : 0);
         try {
-            await deleteMessage(current.uid, version);
+            await deleteMessage(current.uid, version, client);
         } catch (err) {
             if (!(err instanceof ApiRequestError) || (err.status !== 404 && err.status !== 409)) {
                 throw err;
             }
-            const fresh = await getMessage(current.uid).catch((getErr: unknown) => {
+            const fresh = await getMessage(current.uid, client).catch((getErr: unknown) => {
                 if (getErr instanceof ApiRequestError && getErr.status === 404) {
                     return null;
                 }
@@ -976,7 +980,7 @@ export default function ComposeWindow({
             if (!isStillDraft(fresh, current.folderUid)) {
                 throw new ApiRequestError(NO_LONGER_A_DRAFT_MESSAGE, 409);
             }
-            await deleteMessage(fresh.uid, fresh.version);
+            await deleteMessage(fresh.uid, fresh.version, client);
         }
     }
 
@@ -1130,7 +1134,7 @@ export default function ComposeWindow({
             await previous;
             try {
                 // Its answer (the new version) is what a later delete waits for through `saveInFlightRef`, like any save's.
-                return await assembleDraft(target.uid, { to: [], cc: [], bcc: [], subject: "", html: "" });
+                return await assembleDraft(target.uid, { to: [], cc: [], bcc: [], subject: "", html: "" }, client);
             } catch {
                 notify({
                     id: `scrub-draft:${target.uid}`,

package/apps/shared/components/mail/compose/ComposeWindowPlaceholder.tsx

@@ -4,10 +4,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useEffect } from "react";
 import { HiOutlineMinus, HiOutlineXMark } from "react-icons/hi2";
-import Skeleton from "@rapidmx/react-shared/components/feedback/Skeleton.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import Skeleton from "../../../../../lib/components/feedback/Skeleton.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import type { ComposeSession } from "./ComposeContext.js";
 import { markComposePhase } from "./composePerf.js";
 

package/apps/shared/components/mail/compose/EmojiPicker.tsx

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { RefObject } from "react";
-import { EMOJI_CATEGORIES } from "@rapidmx/react-shared/mail/compose/emojiData.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import { EMOJI_CATEGORIES } from "../../../../../lib/mail/compose/emojiData.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 
 export interface EmojiPickerProps {
     anchorRef: RefObject<HTMLElement | null>;

package/apps/shared/components/mail/compose/GifPicker.tsx

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { RefObject, useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { GiphyGif, searchGifs } from "@rapidmx/react-shared/mail/compose/giphyApi.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { GiphyGif, searchGifs } from "../../../../../lib/mail/compose/giphyApi.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 
 export interface GifPickerProps {
     anchorRef: RefObject<HTMLElement | null>;

package/apps/shared/components/mail/compose/RecipientInput.tsx

@@ -11,7 +11,7 @@ import {
     type ContactSuggestionOptions,
     type RecipientSuggestion,
     type RecipientSuggestionKind,
-} from "@rapidmx/react-shared/mail/directoryApi.js";
+} from "../../../../../lib/mail/directoryApi.js";
 import { formatRecipient, isValidRecipientAddress, parseRecipient, splitRecipientList, splitTypedRecipients } from "./recipients.js";
 
 /** How long typing must pause before suggestions are requested. */

package/apps/shared/components/mail/compose/ScheduleSendPicker.tsx

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { FormEvent, RefObject, useState } from "react";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 
 export interface ScheduleSendPickerProps {
     anchorRef: RefObject<HTMLElement | null>;

package/apps/shared/components/mail/compose/encryptionRequirement.ts

@@ -2,8 +2,8 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { RecipientEncryptionStatus, decideMessageEncryption } from "@rapidmx/react-shared/crypto/composeSecurity.js";
-import type { EncryptionPolicy } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import { RecipientEncryptionStatus, decideMessageEncryption } from "../../../../../lib/crypto/composeSecurity.js";
+import type { EncryptionPolicy } from "../../../../../lib/crypto/keyvaultApi.js";
 
 /**
  * Whether a message must be treated as encrypted - the one place that decides it, as a pure function of what is *known*.

package/apps/shared/components/mail/compose/quotedBody.ts

@@ -2,11 +2,11 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { apiUrl } from "@rapidmx/react-shared/util/api.js";
-import { Message, Recipient, getMessageRawContent } from "@rapidmx/react-shared/mail/mailApi.js";
-import type { QuotedBody } from "@rapidmx/react-shared/mail/compose/composeQuoting.js";
-import type { MessageSecurityResult } from "@rapidmx/react-shared/crypto/messageSecurity.js";
-import { decodeHeaderText, extractDisplayBody, parseMimeEntity } from "@rapidmx/react-shared/crypto/mime.js";
+import { apiUrl } from "../../../../../lib/util/api.js";
+import { Message, Recipient, getMessageRawContent } from "../../../../../lib/mail/mailApi.js";
+import type { QuotedBody } from "../../../../../lib/mail/compose/composeQuoting.js";
+import type { MessageSecurityResult } from "../../../../../lib/crypto/messageSecurity.js";
+import { decodeHeaderText, extractDisplayBody, parseMimeEntity } from "../../../../../lib/crypto/mime.js";
 import { parseRecipientList } from "./recipients.js";
 
 /** What a Reply/Reply All/Forward needs from the message being answered, beyond what its `Message` record holds. */

package/apps/shared/components/mail/compose/recipients.ts

@@ -7,7 +7,7 @@
  * semicolons, each either a bare address or `Display Name <address>` (the name optionally quoted, so it can hold a comma
  * or semicolon itself). Separators inside quotes or angle brackets don't split.
  */
-import type { ComposeRecipientInput } from "@rapidmx/react-shared/mail/mailApi.js";
+import type { ComposeRecipientInput } from "../../../../../lib/mail/mailApi.js";
 
 /** One plain address: something, one `@`, something - no whitespace, brackets, quotes or separators. */
 const ADDRESS_PATTERN = /^[^\s@<>()",;]+@[^\s@<>()",;]+$/;

package/apps/shared/components/mail/invite/InviteRowChip.tsx

@@ -4,8 +4,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useRef, useState } from "react";
 import { HiOutlineCalendarDays } from "react-icons/hi2";
-import type { Message } from "@rapidmx/react-shared/mail/mailApi.js";
-import type { MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import type { Message } from "../../../../../lib/mail/mailApi.js";
+import type { MessageInvite } from "../../../../../lib/calendar/inviteApi.js";
 import { ANSWER_LABEL, formatRowStart } from "./inviteFormat.js";
 import { useMessageInvite } from "./inviteStore.js";
 import InviteRsvpPopover from "./InviteRsvpPopover.js";

package/apps/shared/components/mail/invite/InviteRsvpPopover.tsx

@@ -4,11 +4,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { RefObject, useEffect, useId, useRef, useState } from "react";
 import { HiOutlineCheck, HiOutlineEllipsisHorizontal } from "react-icons/hi2";
-import { InviteResponse, MessageInvite, ProposedTime, proposeNewTime, respondToMessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import { InviteResponse, MessageInvite, ProposedTime, proposeNewTime, respondToMessageInvite } from "../../../../../lib/calendar/inviteApi.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import Modal from "../../../../../lib/components/overlays/Modal.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { notifyApiError } from "../../../notifications/apiErrors.js";
 import { calendarHref, conflictSummary, formatInviteWhen } from "./inviteFormat.js";
 import InviteTimeline from "./InviteTimeline.js";
@@ -58,6 +59,7 @@ interface RsvpPanelProps {
 /** What is inside the RSVP popover (or dialog): the meeting, a day view around it and the buttons that answer it. */
 function RsvpPanel({ messageUid, invite, onDone, onClose, onProposingChange }: RsvpPanelProps) {
     const titleId = useId();
+    const client = useApiClient();
     const [pending, setPending] = useState<InviteResponse | "propose" | null>(null);
     const [proposing, setProposingState] = useState(false);
     const [menuOpen, setMenuOpen] = useState(false);
@@ -80,7 +82,7 @@ function RsvpPanel({ messageUid, invite, onDone, onClose, onProposingChange }: R
     async function answer(response: InviteResponse, failure: string) {
         setPending(response);
         try {
-            onDone(await respondToMessageInvite(messageUid, response));
+            onDone(await respondToMessageInvite(messageUid, response, client));
         } catch (err) {
             notifyApiError(err, failure);
             setPending(null);
@@ -90,7 +92,7 @@ function RsvpPanel({ messageUid, invite, onDone, onClose, onProposingChange }: R
     async function propose(proposal: ProposedTime) {
         setPending("propose");
         try {
-            onDone(await proposeNewTime(messageUid, proposal));
+            onDone(await proposeNewTime(messageUid, proposal, client));
         } catch (err) {
             notifyApiError(err, "Couldn't send the proposed time");
             setPending(null);

package/apps/shared/components/mail/invite/InviteTimeline.tsx

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React from "react";
-import type { InviteScheduleEntry, MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import type { InviteScheduleEntry, MessageInvite } from "../../../../../lib/calendar/inviteApi.js";
 import { validDate } from "./inviteFormat.js";
 
 /** How tall one hour is drawn, in px. */

package/apps/shared/components/mail/invite/ProposeTimeForm.tsx

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useId, useState } from "react";
-import type { MessageInvite, ProposedTime } from "@rapidmx/react-shared/calendar/inviteApi.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import type { MessageInvite, ProposedTime } from "../../../../../lib/calendar/inviteApi.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
 import { isoDay, validDate } from "./inviteFormat.js";
 
 const INPUT_CLASS = "w-full text-sm border border-border rounded-sm py-1.5 px-2 bg-surface text-text";

package/apps/shared/components/mail/invite/inviteFormat.ts

@@ -2,8 +2,8 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import type { Attachment } from "@rapidmx/react-shared/mail/mailApi.js";
-import type { InviteResponse, MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import type { Attachment } from "../../../../../lib/mail/mailApi.js";
+import type { InviteResponse, MessageInvite } from "../../../../../lib/calendar/inviteApi.js";
 import { APP_HREFS } from "../../../navigation/appHrefs.js";
 
 /** Whether an attachment is a calendar file - what tells the pane a message may carry an invitation worth asking the server about. By type

package/apps/shared/components/mail/invite/inviteStore.ts

@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useCallback, useEffect, useReducer } from "react";
-import { MessageInvite, getMessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import { MessageInvite, getMessageInvite } from "../../../../../lib/calendar/inviteApi.js";
+import { ApiClient } from "../../../../../lib/util/api.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
 
 /**
  * A per-message cache of the calendar invitation the server reads out of a message, shared by everything that draws one: the reading pane's
@@ -41,15 +43,20 @@ function normalize(invite: MessageInvite | null): MessageInvite | null {
     return { ...invite, attendees: partial.attendees ?? [], conflicts: partial.conflicts ?? [], schedule: partial.schedule ?? [] };
 }
 
-/** Reads a message's invitation, from the cache when it is fresh. Rejects when the lookup fails. */
-export function loadInvite(uid: string): Promise<MessageInvite | null> {
+/**
+ * Reads a message's invitation, from the cache when it is fresh. Rejects when the lookup fails. `client` (see
+ * `useApiClient()`) is only consulted for a lookup this call actually makes - a fresh entry already in flight or
+ * cached keeps whichever client (or lack of one) started it, same as every other cache-by-uid shortcut here; the
+ * cache itself is keyed only by `uid`, not by account, so it assumes distinct accounts never share one.
+ */
+export function loadInvite(uid: string, client?: ApiClient): Promise<MessageInvite | null> {
     const existing = entries.get(uid);
     if (existing && (existing.value === undefined || Date.now() - existing.at < INVITE_TTL_MS)) {
         return existing.promise;
     }
     const entry: Entry = {
         at: Date.now(),
-        promise: getMessageInvite(uid).then(
+        promise: getMessageInvite(uid, client).then(
             (invite) => {
                 entry.value = normalize(invite);
                 entry.at = Date.now();
@@ -87,6 +94,7 @@ export function clearInviteCache(): void {
  */
 export function useMessageInvite(uid: string, enabled = true): { invite: MessageInvite | null; settled: boolean; setInvite: (invite: MessageInvite) => void } {
     const [, rerender] = useReducer((n: number) => n + 1, 0);
+    const client = useApiClient();
     useEffect(() => {
         if (!enabled) {
             return;
@@ -100,14 +108,14 @@ export function useMessageInvite(uid: string, enabled = true): { invite: Message
         const set = listeners.get(uid) ?? new Set();
         set.add(update);
         listeners.set(uid, set);
-        loadInvite(uid).then(update, () => {
+        loadInvite(uid, client).then(update, () => {
             // Nothing to show, and nothing worth interrupting the reader with: the message reads the same without it.
         });
         return () => {
             cancelled = true;
             set.delete(update);
         };
-    }, [uid, enabled]);
+    }, [uid, enabled, client]);
     const setInvite = useCallback((invite: MessageInvite) => storeInvite(uid, invite), [uid]);
     const value = enabled ? entries.get(uid)?.value : undefined;
     return { invite: value ?? null, settled: value !== undefined, setInvite };

package/apps/shared/components/mail/labelMenu.tsx

@@ -4,12 +4,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useState } from "react";
 import { HiOutlineTag } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { Label, createLabel } from "@rapidmx/react-shared/mail/labelsApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { Label, createLabel } from "../../../../lib/mail/labelsApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../lib/components/forms/FormField.js";
+import Modal from "../../../../lib/components/overlays/Modal.js";
 import MenuButton, { MenuSectionSpec } from "./MenuButton.js";
 
 /**
@@ -159,6 +160,7 @@ export interface NewLabelDialogProps {
  * has no place for a text field. Colour is left to Settings > Labels; this is the quick path from a
  * message, so it only asks for the name. */
 export function NewLabelDialog({ open, onClose, mailboxUid, onCreated }: NewLabelDialogProps) {
+    const client = useApiClient();
     const [name, setName] = useState("");
     const [saving, setSaving] = useState(false);
     const [error, setError] = useState<string | null>(null);
@@ -167,7 +169,7 @@ export function NewLabelDialog({ open, onClose, mailboxUid, onCreated }: NewLabe
         setSaving(true);
         setError(null);
         try {
-            onCreated(await createLabel({ mailboxUid, name: name.trim() }));
+            onCreated(await createLabel({ mailboxUid, name: name.trim() }, client));
             setName("");
             onClose();
         } catch (err) {

package/apps/shared/components/mail/layout/MailShell.tsx

@@ -4,10 +4,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { createContext, PropsWithChildren, ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react";
 import { HiOutlineBars3, HiOutlinePencilSquare } from "react-icons/hi2";
-import Drawer from "@rapidmx/react-shared/components/overlays/Drawer.js";
-import { Folder, Mailbox, Message } from "@rapidmx/react-shared/mail/mailApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Skeleton, { SkeletonList } from "@rapidmx/react-shared/components/feedback/Skeleton.js";
+import Drawer from "../../../../../lib/components/overlays/Drawer.js";
+import { Folder, Mailbox, Message } from "../../../../../lib/mail/mailApi.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Skeleton, { SkeletonList } from "../../../../../lib/components/feedback/Skeleton.js";
 import AppShell, { AppShellProps } from "../../layout/AppShell.js";
 import FloatingActionButton from "../../layout/FloatingActionButton.js";
 import { useLocation, useNavigate } from "../../../navigation/index.js";

package/apps/shared/components/mail/listPreferences.ts

@@ -22,8 +22,8 @@ import {
     MessageListFilter,
     MessageListSort,
     MessageSortOrder,
-} from "@rapidmx/react-shared/mail/mailApi.js";
-import { ConversationSummary } from "@rapidmx/react-shared/mail/conversationsApi.js";
+} from "../../../../lib/mail/mailApi.js";
+import { ConversationSummary } from "../../../../lib/mail/conversationsApi.js";
 
 const STORAGE_KEY_PREFIX = "rapidmx:mail-list-preferences:";