@cosmoops/connect-sdk 0.40.0 → 0.42.0

package/dist/cjs/client/components/call-button.js

@@ -0,0 +1,398 @@
+"use client";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useConnectCall = useConnectCall;
+exports.ConnectCallProvider = ConnectCallProvider;
+exports.ConnectCallButton = ConnectCallButton;
+exports.ConnectCallingStatus = ConnectCallingStatus;
+exports.ConnectActiveCallBar = ConnectActiveCallBar;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const react_2 = require("@heroui/react");
+const lucide_react_1 = require("lucide-react");
+const cn_js_1 = require("../../cn.js");
+const provider_js_1 = require("../provider.js");
+const portal_links_js_1 = require("../portal-links.js");
+const ConnectCallContext = (0, react_1.createContext)(null);
+/** Start a call yourself. Must be inside `<ConnectCallProvider>`. */
+function useConnectCall() {
+    const value = (0, react_1.useContext)(ConnectCallContext);
+    if (!value) {
+        throw new Error("useConnectCall() needs a <ConnectCallProvider> above it.");
+    }
+    return value;
+}
+/** How long the SDK may take to sign in before the attempt is abandoned. */
+const LOGIN_TIMEOUT_MS = 15_000;
+/** How long the "Call ended" card stays before the bar goes away. */
+const ENDED_CARD_MS = 4_000;
+/** How long after a call to re-read the balance - the carrier's report settles it. */
+const AVAILABILITY_SETTLE_MS = 3_000;
+function messageFromCause(cause) {
+    if (typeof cause === "string" && cause.trim())
+        return cause.trim();
+    return "The call couldn't be connected.";
+}
+function errorMessage(cause) {
+    return cause instanceof Error && cause.message ? cause.message : "Something went wrong.";
+}
+/**
+ * Holds the call in progress and draws the in-call bar. See the module comment.
+ */
+function ConnectCallProvider({ children, onCallEnded, onError, className, }) {
+    const { mutateResource } = (0, provider_js_1.useConnect)();
+    const [call, setCall] = (0, react_1.useState)(null);
+    const { data: availability, refetch: refreshAvailability } = (0, provider_js_1.useConnectResource)("/calls/availability");
+    // Read inside `finish`, which is wired to SDK events once.
+    const refreshRef = (0, react_1.useRef)(refreshAvailability);
+    (0, react_1.useEffect)(() => {
+        refreshRef.current = refreshAvailability;
+    }, [refreshAvailability]);
+    const clientRef = (0, react_1.useRef)(null);
+    const placedRef = (0, react_1.useRef)(false);
+    const targetRef = (0, react_1.useRef)(null);
+    const callIdRef = (0, react_1.useRef)(null);
+    const endedRef = (0, react_1.useRef)(false);
+    const dismissTimer = (0, react_1.useRef)(null);
+    // Read inside SDK event handlers wired once, so they always see the latest.
+    const onCallEndedRef = (0, react_1.useRef)(onCallEnded);
+    (0, react_1.useEffect)(() => {
+        onCallEndedRef.current = onCallEnded;
+    }, [onCallEnded]);
+    const cancelOnServer = (0, react_1.useCallback)(() => {
+        const callId = callIdRef.current;
+        if (!callId)
+            return;
+        // Best effort: Connect closes an unclaimed call on its own within minutes.
+        void mutateResource("/calls/cancel", { callId }).catch(() => undefined);
+    }, [mutateResource]);
+    const finish = (0, react_1.useCallback)((notice) => {
+        if (endedRef.current)
+            return;
+        endedRef.current = true;
+        const callId = callIdRef.current;
+        const target = targetRef.current;
+        placedRef.current = false;
+        setCall((current) => current
+            ? {
+                ...current,
+                phase: "ended",
+                notice,
+                endedAfterSeconds: current.connectedAt
+                    ? Math.round((Date.now() - current.connectedAt) / 1000)
+                    : null,
+            }
+            : current);
+        if (dismissTimer.current)
+            clearTimeout(dismissTimer.current);
+        dismissTimer.current = setTimeout(() => setCall(null), ENDED_CARD_MS);
+        // The charge lands a moment after the line drops, so the minutes shown
+        // are re-read once it has had time to.
+        setTimeout(() => refreshRef.current(), AVAILABILITY_SETTLE_MS);
+        if (target) {
+            target.onEnded?.({ callId });
+            onCallEndedRef.current?.({ callId, phone: target.phone });
+        }
+    }, []);
+    const wire = (0, react_1.useCallback)((client) => {
+        const ringing = () => setCall((current) => (current ? { ...current, phase: "ringing" } : current));
+        client.on("onCalling", ringing);
+        client.on("onCallRemoteRinging", ringing);
+        client.on("onCallAnswered", () => setCall((current) => current ? { ...current, phase: "in-call", connectedAt: Date.now() } : current));
+        client.on("onCallTerminated", () => finish(null));
+        client.on("onCallFailed", (cause) => {
+            if (!placedRef.current)
+                cancelOnServer();
+            finish(messageFromCause(cause));
+        });
+        client.on("onMediaPermission", (event) => {
+            if (event?.status === "failure") {
+                cancelOnServer();
+                finish("Allow microphone access in your browser to make calls.");
+            }
+        });
+    }, [cancelOnServer, finish]);
+    const signIn = (0, react_1.useCallback)(async () => {
+        let client = clientRef.current;
+        if (!client) {
+            const { default: Plivo } = await Promise.resolve().then(() => __importStar(require("plivo-browser-sdk")));
+            client = new Plivo({
+                debug: "ERROR",
+                // Ask for the microphone when a call starts, not on page load.
+                permOnClick: true,
+                // Warn before a tab mid-call is closed.
+                closeProtection: true,
+                enableTracking: false,
+            }).client;
+            clientRef.current = client;
+            wire(client);
+        }
+        if (client.isLoggedIn)
+            return client;
+        const { token } = await mutateResource("/calls/browser-token", {});
+        const signedIn = client;
+        await new Promise((resolve, reject) => {
+            const timer = setTimeout(() => {
+                cleanup();
+                reject(new Error("Signing in to the phone service timed out."));
+            }, LOGIN_TIMEOUT_MS);
+            const onLogin = () => {
+                cleanup();
+                resolve();
+            };
+            const onLoginFailed = (cause) => {
+                cleanup();
+                reject(new Error(`Couldn't sign in to the phone service: ${messageFromCause(cause)}`));
+            };
+            function cleanup() {
+                clearTimeout(timer);
+                signedIn.off("onLogin", onLogin);
+                signedIn.off("onLoginFailed", onLoginFailed);
+            }
+            signedIn.on("onLogin", onLogin);
+            signedIn.on("onLoginFailed", onLoginFailed);
+            if (!signedIn.loginWithAccessToken(token)) {
+                cleanup();
+                reject(new Error("Couldn't sign in to the phone service."));
+            }
+        });
+        return signedIn;
+    }, [mutateResource, wire]);
+    const isBusy = call !== null && call.phase !== "ended";
+    const startCall = (0, react_1.useCallback)(async (target) => {
+        if (isBusy) {
+            onError?.("You're already on a call.");
+            return;
+        }
+        if (dismissTimer.current)
+            clearTimeout(dismissTimer.current);
+        targetRef.current = target;
+        callIdRef.current = null;
+        placedRef.current = false;
+        endedRef.current = false;
+        setCall({
+            phase: "connecting",
+            label: target.name?.trim() || target.phone,
+            number: target.phone,
+            callId: null,
+            connectedAt: null,
+            endedAfterSeconds: null,
+            muted: false,
+            notice: null,
+        });
+        try {
+            const client = await signIn();
+            const started = await mutateResource("/calls/start", {
+                phone: target.phone,
+            });
+            callIdRef.current = started.callId;
+            setCall((current) => current ? { ...current, callId: started.callId, number: started.toNumber } : current);
+            // Connect dials the number on the record, not this one - it is passed
+            // because the SDK requires a destination.
+            if (!client.call(started.toNumber.replace(/^\+/, ""), started.headers)) {
+                throw new Error("The phone service didn't accept the call.");
+            }
+            placedRef.current = true;
+        }
+        catch (cause) {
+            cancelOnServer();
+            // A refusal is usually news about the workspace - an empty balance, a
+            // number that has gone - so the buttons should learn it too.
+            refreshRef.current();
+            const message = errorMessage(cause);
+            if (onError) {
+                onError(message);
+                endedRef.current = true;
+                setCall(null);
+                target.onEnded?.({ callId: callIdRef.current });
+                onCallEndedRef.current?.({ callId: callIdRef.current, phone: target.phone });
+            }
+            else {
+                finish(message);
+            }
+        }
+    }, [cancelOnServer, finish, isBusy, mutateResource, onError, signIn]);
+    const hangUp = (0, react_1.useCallback)(() => {
+        const client = clientRef.current;
+        if (placedRef.current && client) {
+            client.hangup();
+            return; // `onCallTerminated` takes it from here.
+        }
+        cancelOnServer();
+        finish(null);
+    }, [cancelOnServer, finish]);
+    const toggleMute = (0, react_1.useCallback)(() => {
+        const client = clientRef.current;
+        if (!client)
+            return;
+        setCall((current) => {
+            if (!current)
+                return current;
+            if (current.muted)
+                client.unmute();
+            else
+                client.mute();
+            return { ...current, muted: !current.muted };
+        });
+    }, []);
+    // Sign out of the carrier when the provider unmounts.
+    (0, react_1.useEffect)(() => () => {
+        clientRef.current?.logout();
+        if (dismissTimer.current)
+            clearTimeout(dismissTimer.current);
+    }, []);
+    const value = (0, react_1.useMemo)(() => ({ isBusy, startCall, availability, refreshAvailability }), [isBusy, startCall, availability, refreshAvailability]);
+    return ((0, jsx_runtime_1.jsxs)(ConnectCallContext.Provider, { value: value, children: [children, call && ((0, jsx_runtime_1.jsx)(ConnectActiveCallBar, { call: call, onHangUp: hangUp, onToggleMute: toggleMute, className: className }))] }));
+}
+/**
+ * Rings `phone` from the workspace's number. Needs `<ConnectCallProvider>`
+ * above it, and a member with "Make calls" - render it only for them, since a
+ * button the server refuses for everyone else helps nobody.
+ */
+function ConnectCallButton({ phone, name, onEnded, variant = "default", children, isDisabled, className, }) {
+    const { isBusy, startCall, availability } = useConnectCall();
+    const press = () => void startCall({ phone, name, onEnded });
+    // Not offered at all to someone who may not call - a button that always
+    // refuses helps nobody.
+    if (availability?.status === "no_permission")
+        return null;
+    // Anything else short of `available` says why, where the button would be,
+    // with the next step for whoever can take it.
+    if (availability && availability.status !== "available") {
+        return variant === "compact" ? ((0, jsx_runtime_1.jsx)(react_2.Button, { isIconOnly: true, size: "sm", variant: "ghost", "aria-label": unavailableReason(availability).text, isDisabled: true, className: className, children: (0, jsx_runtime_1.jsx)(lucide_react_1.Phone, { className: "size-3.5" }) })) : ((0, jsx_runtime_1.jsx)(ConnectCallUnavailable, { availability: availability, className: className }));
+    }
+    if (variant === "compact") {
+        return ((0, jsx_runtime_1.jsx)(react_2.Button, { isIconOnly: true, size: "sm", variant: "ghost", "aria-label": `Call ${name?.trim() || phone}`, isDisabled: isBusy || isDisabled, onPress: press, className: className, children: (0, jsx_runtime_1.jsx)(lucide_react_1.Phone, { className: "size-3.5" }) }));
+    }
+    return ((0, jsx_runtime_1.jsxs)(react_2.Button, { size: "sm", variant: "primary", isDisabled: isBusy || isDisabled || availability === null, onPress: press, className: (0, cn_js_1.cn)("shrink-0", className), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.Phone, { className: "size-4" }), children ?? "Call"] }));
+}
+/**
+ * What to say when a member cannot call, and the one link that fixes it -
+ * offered only to someone with the permission to follow it.
+ */
+function unavailableReason(availability) {
+    switch (availability.status) {
+        case "no_number":
+            return availability.canManageNumber && availability.offer
+                ? {
+                    text: "Calling needs a business number.",
+                    action: {
+                        label: `Add ${availability.offer.addonName}`,
+                        path: `/billing/subscriptions/${availability.offer.subscriptionId}`,
+                    },
+                }
+                : { text: "Calling needs a business number - ask a workspace admin.", action: null };
+        case "number_pending":
+            return availability.canManageNumber
+                ? {
+                    text: "Your business number is still being set up.",
+                    action: { label: "Check calling", path: "/calling" },
+                }
+                : { text: "Your business number is still being set up.", action: null };
+        case "no_balance":
+            return availability.canTopUp
+                ? { text: "Out of calling minutes.", action: { label: "Top up", path: "/calling" } }
+                : { text: "Out of calling minutes - ask a workspace admin to top up.", action: null };
+        default:
+            return { text: "Calling isn't available.", action: null };
+    }
+}
+/** The inline "why not" a Call button becomes when the member cannot call. */
+function ConnectCallUnavailable({ availability, className, }) {
+    const { text, action } = unavailableReason(availability);
+    const href = (0, portal_links_js_1.useConnectPortalUrl)(action?.path ?? "/calling");
+    return ((0, jsx_runtime_1.jsxs)("p", { className: (0, cn_js_1.cn)("text-xs text-muted", className), children: [text, " ", action && ((0, jsx_runtime_1.jsx)("a", { href: href, className: "font-medium text-accent hover:underline", children: action.label }))] }));
+}
+function formatRupees(paise) {
+    return `₹${(paise / 100).toLocaleString("en-IN", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+    })}`;
+}
+/**
+ * The workspace's calling at a glance - its business number, the minutes
+ * left, and the next step - for a settings page. Reads the same availability
+ * the Call buttons do, so the two never disagree. Buying minutes and adding a
+ * number happen in Connect, and come back here when done.
+ */
+function ConnectCallingStatus({ className }) {
+    const { availability } = useConnectCall();
+    const callingHref = (0, portal_links_js_1.useConnectPortalUrl)("/calling");
+    const offerHref = (0, portal_links_js_1.useConnectPortalUrl)(availability?.offer ? `/billing/subscriptions/${availability.offer.subscriptionId}` : "/calling");
+    if (!availability) {
+        return (0, jsx_runtime_1.jsx)("div", { className: (0, cn_js_1.cn)("h-24 animate-pulse rounded-lg bg-surface-secondary", className) });
+    }
+    const rate = formatRupees(availability.ratePaisePerMinute);
+    return ((0, jsx_runtime_1.jsxs)("div", { className: (0, cn_js_1.cn)("space-y-3 rounded-lg border border-separator bg-surface p-4", className), children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex flex-wrap items-start justify-between gap-3", children: [(0, jsx_runtime_1.jsxs)("div", { className: "min-w-0", children: [(0, jsx_runtime_1.jsx)("p", { className: "text-xs text-muted", children: "Business number" }), (0, jsx_runtime_1.jsx)("p", { className: "text-sm font-medium tabular-nums", children: availability.number ?? (availability.status === "number_pending" ? "Being set up…" : "None") })] }), availability.number && ((0, jsx_runtime_1.jsxs)("div", { className: "text-right", children: [(0, jsx_runtime_1.jsx)("p", { className: "text-xs text-muted", children: "Calling minutes" }), (0, jsx_runtime_1.jsxs)("p", { className: (0, cn_js_1.cn)("text-sm font-medium tabular-nums", availability.lowBalance && "text-danger"), children: [formatRupees(availability.available), " \u00B7 about ", availability.availableMinutes, " min"] })] }))] }), availability.status === "no_permission" ? ((0, jsx_runtime_1.jsx)("p", { className: "text-xs text-muted", children: "You don't have permission to make calls here." })) : !availability.number ? ((0, jsx_runtime_1.jsxs)("p", { className: "text-xs text-muted", children: ["Call customers from their record, from your own business number. Calls are not recorded, and minutes are prepaid at ", rate, " + GST a minute.", " ", availability.status === "number_pending"
+                        ? availability.canManageNumber && ((0, jsx_runtime_1.jsx)("a", { href: callingHref, className: "font-medium text-accent hover:underline", children: "Check on your number" }))
+                        : availability.canManageNumber && availability.offer
+                            ? ((0, jsx_runtime_1.jsxs)("a", { href: offerHref, className: "font-medium text-accent hover:underline", children: ["Add ", availability.offer.addonName, " (", formatRupees(availability.offer.price), " + GST)"] }))
+                            : "Ask a workspace admin to add a business number."] })) : ((0, jsx_runtime_1.jsxs)("p", { className: "text-xs text-muted", children: [availability.lowBalance
+                        ? "Calling minutes are running low. "
+                        : `Calls cost ${rate} + GST a minute, from prepaid minutes. `, availability.canTopUp ? ((0, jsx_runtime_1.jsx)("a", { href: callingHref, className: "font-medium text-accent hover:underline", children: "Top up minutes" })) : ("A workspace admin can top up.")] }))] }));
+}
+const PHASE_LABEL = {
+    connecting: "Connecting…",
+    ringing: "Calling…",
+    ended: "Call ended",
+};
+function formatSeconds(seconds) {
+    const whole = Math.max(0, Math.round(seconds));
+    const minutes = Math.floor(whole / 60);
+    return `${minutes}:${String(whole % 60).padStart(2, "0")}`;
+}
+/** The floating in-call card. Exported for Storybook only - the provider draws it. */
+function ConnectActiveCallBar({ call, onHangUp, onToggleMute, className, }) {
+    const elapsed = useElapsedSeconds(call.phase === "in-call" ? call.connectedAt : null);
+    const live = call.phase !== "ended";
+    const status = call.phase === "in-call"
+        ? formatSeconds(elapsed)
+        : call.phase === "ended" && call.endedAfterSeconds !== null
+            ? `Call ended · ${formatSeconds(call.endedAfterSeconds)}`
+            : PHASE_LABEL[call.phase];
+    return ((0, jsx_runtime_1.jsx)("div", { role: "status", "aria-live": "polite", className: (0, cn_js_1.cn)("fixed inset-x-0 bottom-4 z-50 flex justify-center px-4", className), children: (0, jsx_runtime_1.jsxs)("div", { className: "flex w-full max-w-sm items-center gap-3 rounded-2xl border border-separator bg-surface p-3 shadow-lg", children: [(0, jsx_runtime_1.jsx)("span", { className: "flex size-9 shrink-0 items-center justify-center rounded-full bg-accent-soft text-accent", children: (0, jsx_runtime_1.jsx)(lucide_react_1.PhoneOutgoing, { "aria-hidden": true, className: "size-4" }) }), (0, jsx_runtime_1.jsxs)("div", { className: "min-w-0 flex-1", children: [(0, jsx_runtime_1.jsx)("p", { className: "truncate text-sm font-medium", children: call.label }), (0, jsx_runtime_1.jsxs)("p", { className: "truncate text-xs text-muted tabular-nums", children: [status, call.notice ? ` · ${call.notice}` : call.label === call.number ? "" : ` · ${call.number}`] })] }), live && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_2.Button, { isIconOnly: true, size: "sm", variant: "secondary", "aria-label": call.muted ? "Unmute" : "Mute", isDisabled: call.phase !== "in-call", onPress: onToggleMute, children: call.muted ? (0, jsx_runtime_1.jsx)(lucide_react_1.MicOff, { className: "size-4" }) : (0, jsx_runtime_1.jsx)(lucide_react_1.Mic, { className: "size-4" }) }), (0, jsx_runtime_1.jsx)(react_2.Button, { isIconOnly: true, size: "sm", variant: "danger", "aria-label": "Hang up", onPress: onHangUp, children: (0, jsx_runtime_1.jsx)(lucide_react_1.PhoneOff, { className: "size-4" }) })] }))] }) }));
+}
+/** Seconds since `since`, ticking once a second. `0` while there is nothing to time. */
+function useElapsedSeconds(since) {
+    const [now, setNow] = (0, react_1.useState)(() => Date.now());
+    (0, react_1.useEffect)(() => {
+        if (since === null)
+            return;
+        const timer = setInterval(() => setNow(Date.now()), 1_000);
+        return () => clearInterval(timer);
+    }, [since]);
+    return since === null ? 0 : Math.max(0, Math.round((now - since) / 1000));
+}

package/dist/cjs/client/components/plans.js

@@ -165,6 +165,7 @@ function ConnectCheckoutStatusRow({ checkout, }) {
     return ((0, jsx_runtime_1.jsx)(motion_js_1.AnimatePresence, { mode: "wait", initial: false, children: checkout.status !== "idle" && ((0, jsx_runtime_1.jsx)(motion_js_1.m.div, { initial: { opacity: 0, y: 4 }, animate: { opacity: 1, y: 0 }, exit: { opacity: 0, y: -4 }, transition: { duration: 0.18 }, children: (0, jsx_runtime_1.jsx)(CheckoutStatusRowContent, { checkout: checkout }) }, checkout.status)) }));
 }
 function CheckoutStatusRowContent({ checkout, }) {
+    const { openConnect } = (0, provider_js_1.useConnect)();
     if (checkout.status === "waiting") {
         return ((0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2 rounded-lg border border-separator px-3 py-2 text-sm text-muted", children: [(0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "size-4 shrink-0 animate-spin", "aria-hidden": "true" }), (0, jsx_runtime_1.jsx)("span", { children: "Finish up in the Connect window. This page updates on its own." })] }));
     }
@@ -175,7 +176,11 @@ function CheckoutStatusRowContent({ checkout, }) {
     // are fixed by going to the same URL - so offer it rather than explaining.
     return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-wrap items-center justify-between gap-3 rounded-lg border border-separator px-3 py-2 text-sm text-muted", children: [(0, jsx_runtime_1.jsx)("span", { children: checkout.status === "blocked"
                     ? "Your browser blocked the Connect window."
-                    : "Nothing changed - the Connect window closed before it was finished." }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [checkout.url && ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", onPress: () => window.open(checkout.url, "_blank", "noopener,noreferrer"), children: ["Open Connect", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] })), (0, jsx_runtime_1.jsx)(react_1.Button, { variant: "tertiary", onPress: checkout.reset, children: "Dismiss" })] })] }));
+                    : "Nothing changed - the Connect window closed before it was finished." }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [checkout.url && ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", 
+                        // Not watched by the checkout poll - that run has ended - but a
+                        // hand-off all the same: Connect reports back when it is done, and
+                        // the provider re-reads every resource on this page.
+                        onPress: () => openConnect(checkout.url), children: ["Open Connect", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] })), (0, jsx_runtime_1.jsx)(react_1.Button, { variant: "tertiary", onPress: checkout.reset, children: "Dismiss" })] })] }));
 }
 /**
  * Cancellation, kept out of the plan grid and stated plainly.
@@ -195,9 +200,10 @@ function CheckoutStatusRowContent({ checkout, }) {
  * version.
  */
 function ConnectUnsubscribeRow({ subscription, appUrl, checkout, }) {
+    const { openConnect } = (0, provider_js_1.useConnect)();
     const endsOn = subscription.currentBillingCycle?.endDate;
     if (subscription.cancelAtPeriodEnd) {
-        return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-wrap items-center justify-between gap-3 border-t border-separator pt-4", children: [(0, jsx_runtime_1.jsxs)("p", { className: "text-sm text-muted", children: ["Cancels", endsOn ? ` on ${new Date(endsOn).toLocaleDateString()}` : " at the end of this cycle", ". You keep access until then."] }), (0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", onPress: () => window.open(`${appUrl}/billing/subscriptions/${subscription.id}`, "_blank", "noopener,noreferrer"), children: ["View on Connect", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] })] }));
+        return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-wrap items-center justify-between gap-3 border-t border-separator pt-4", children: [(0, jsx_runtime_1.jsxs)("p", { className: "text-sm text-muted", children: ["Cancels", endsOn ? ` on ${new Date(endsOn).toLocaleDateString()}` : " at the end of this cycle", ". You keep access until then."] }), (0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", onPress: () => openConnect(`/billing/subscriptions/${encodeURIComponent(subscription.id)}`), children: ["View on Connect", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] })] }));
     }
     return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-wrap items-center justify-between gap-3 border-t border-separator pt-4", children: [(0, jsx_runtime_1.jsx)("p", { className: "text-sm text-muted", children: "Cancel any time. Access continues to the end of the paid cycle." }), (0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", className: "text-danger", isDisabled: checkout.status === "waiting", onPress: () => checkout.start({
                     url: (0, use_checkout_js_1.buildCancelUrl)({ appUrl, subscriptionId: subscription.id }),

package/dist/cjs/client/components/readiness.js

@@ -72,9 +72,10 @@ function ConnectReadinessBanner({ includeAdvisory = false, hideWhenReady = true,
     return ((0, jsx_runtime_1.jsx)(motion_js_1.MotionProvider, { children: (0, jsx_runtime_1.jsx)(motion_js_1.m.div, { className: (0, cn_js_1.cn)("flex flex-col gap-2", className), role: "status", initial: { opacity: 0, y: -6 }, animate: { opacity: 1, y: 0 }, transition: motion_js_1.ENTER, children: blockers.map((blocker) => ((0, jsx_runtime_1.jsx)(BlockerRow, { blocker: blocker }, `${blocker.code}-${blocker.message}`))) }) }));
 }
 function BlockerRow({ blocker }) {
+    const { openConnect } = (0, provider_js_1.useConnect)();
     const inProgress = IN_PROGRESS_CODES.has(blocker.code);
     const isBlocking = blocker.severity === "blocking";
-    return ((0, jsx_runtime_1.jsxs)("div", { className: `flex flex-wrap items-center justify-between gap-3 rounded-lg px-3 py-2 text-sm ${inProgress || !isBlocking ? "bg-surface text-muted" : "bg-danger-soft text-danger"}`, children: [(0, jsx_runtime_1.jsxs)("span", { className: "flex items-center gap-2", children: [inProgress || !isBlocking ? ((0, jsx_runtime_1.jsx)(lucide_react_1.Info, { className: "size-4 shrink-0", "aria-hidden": "true" })) : ((0, jsx_runtime_1.jsx)(lucide_react_1.AlertTriangle, { className: "size-4 shrink-0", "aria-hidden": "true" })), blocker.message] }), blocker.resolveUrl && !inProgress && ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", onPress: () => window.open(blocker.resolveUrl, "_blank", "noopener,noreferrer"), children: [actionLabel(blocker), (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] }))] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { className: `flex flex-wrap items-center justify-between gap-3 rounded-lg px-3 py-2 text-sm ${inProgress || !isBlocking ? "bg-surface text-muted" : "bg-danger-soft text-danger"}`, children: [(0, jsx_runtime_1.jsxs)("span", { className: "flex items-center gap-2", children: [inProgress || !isBlocking ? ((0, jsx_runtime_1.jsx)(lucide_react_1.Info, { className: "size-4 shrink-0", "aria-hidden": "true" })) : ((0, jsx_runtime_1.jsx)(lucide_react_1.AlertTriangle, { className: "size-4 shrink-0", "aria-hidden": "true" })), blocker.message] }), blocker.resolveUrl && !inProgress && ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", onPress: () => openConnect(blocker.resolveUrl), children: [actionLabel(blocker), (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] }))] }));
 }
 function ReadyRow({ className }) {
     return ((0, jsx_runtime_1.jsx)("p", { className: (0, cn_js_1.cn)("text-sm text-muted", className), children: "This workspace is cleared to use every part of the application." }));

package/dist/cjs/client/components/subscription.js

@@ -80,13 +80,13 @@ function ConnectNoSubscriptionCard({ plansHref = DEFAULT_PLANS_HREF, title = "Yo
  * impure and re-renders wrong.
  */
 function ConnectSubscriptionCard({ plansHref, className }) {
-    const { appUrl } = (0, provider_js_1.useConnect)();
+    const { openConnect } = (0, provider_js_1.useConnect)();
     const { isLoading, detail, plan, state } = useSubscriptionState();
     if (isLoading)
         return (0, jsx_runtime_1.jsx)(react_1.Skeleton, { className: (0, cn_js_1.cn)("h-48 rounded-xl", className) });
     if (!detail || !plan)
         return (0, jsx_runtime_1.jsx)(ConnectNoSubscriptionCard, { plansHref: plansHref, className: className });
-    return ((0, jsx_runtime_1.jsx)(motion_js_1.MotionProvider, { children: (0, jsx_runtime_1.jsx)(motion_js_1.m.div, { initial: { opacity: 0 }, animate: { opacity: 1 }, transition: { duration: 0.2 }, children: (0, jsx_runtime_1.jsxs)(react_1.Card, { className: className, children: [(0, jsx_runtime_1.jsxs)(react_1.Card.Header, { children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-start justify-between gap-2", children: [(0, jsx_runtime_1.jsx)(react_1.Card.Title, { children: plan.name }), (0, jsx_runtime_1.jsx)(SubscriptionChip, { state: state })] }), (0, jsx_runtime_1.jsxs)(react_1.Card.Description, { children: [(0, plan_pricing_js_1.formatPrice)(plan.price), " + ", plan.gstRate, "% GST per", " ", (0, plan_pricing_js_1.intervalLabel)(plan.billingInterval).per] })] }), (0, jsx_runtime_1.jsxs)(react_1.Card.Content, { className: "flex flex-col gap-2 text-sm", children: [(0, jsx_runtime_1.jsx)(NextEvent, { detail: detail, state: state }), (0, jsx_runtime_1.jsx)(ConnectSeatUsage, { plan: plan, detail: detail })] }), (0, jsx_runtime_1.jsxs)(react_1.Card.Footer, { className: "flex flex-wrap gap-2", children: [(0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", onPress: () => window.open(`${appUrl}/billing/subscriptions/${detail.id}`, "_blank", "noopener,noreferrer"), children: ["Manage on Connect", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] }), (0, jsx_runtime_1.jsx)(link_button_js_1.ConnectLinkButton, { href: plansHref ?? DEFAULT_PLANS_HREF, variant: "tertiary", children: "Change plan" })] })] }) }) }));
+    return ((0, jsx_runtime_1.jsx)(motion_js_1.MotionProvider, { children: (0, jsx_runtime_1.jsx)(motion_js_1.m.div, { initial: { opacity: 0 }, animate: { opacity: 1 }, transition: { duration: 0.2 }, children: (0, jsx_runtime_1.jsxs)(react_1.Card, { className: className, children: [(0, jsx_runtime_1.jsxs)(react_1.Card.Header, { children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-start justify-between gap-2", children: [(0, jsx_runtime_1.jsx)(react_1.Card.Title, { children: plan.name }), (0, jsx_runtime_1.jsx)(SubscriptionChip, { state: state })] }), (0, jsx_runtime_1.jsxs)(react_1.Card.Description, { children: [(0, plan_pricing_js_1.formatPrice)(plan.price), " + ", plan.gstRate, "% GST per", " ", (0, plan_pricing_js_1.intervalLabel)(plan.billingInterval).per] })] }), (0, jsx_runtime_1.jsxs)(react_1.Card.Content, { className: "flex flex-col gap-2 text-sm", children: [(0, jsx_runtime_1.jsx)(NextEvent, { detail: detail, state: state }), (0, jsx_runtime_1.jsx)(ConnectSeatUsage, { plan: plan, detail: detail })] }), (0, jsx_runtime_1.jsxs)(react_1.Card.Footer, { className: "flex flex-wrap gap-2", children: [(0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", onPress: () => openConnect(`/billing/subscriptions/${encodeURIComponent(detail.id)}`), children: ["Manage on Connect", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] }), (0, jsx_runtime_1.jsx)(link_button_js_1.ConnectLinkButton, { href: plansHref ?? DEFAULT_PLANS_HREF, variant: "tertiary", children: "Change plan" })] })] }) }) }));
 }
 function SubscriptionChip({ state }) {
     switch (state) {
@@ -157,11 +157,11 @@ function ConnectSeatUsage({ plan, detail, className, }) {
  * actually cares about anyway.
  */
 function ConnectTrialBanner({ plansHref, className }) {
-    const { appUrl } = (0, provider_js_1.useConnect)();
+    const { openConnect } = (0, provider_js_1.useConnect)();
     const { detail, state } = useSubscriptionState();
     if (state !== "trialing" || !detail)
         return null;
-    return ((0, jsx_runtime_1.jsxs)("div", { className: (0, cn_js_1.cn)("flex flex-wrap items-center justify-between gap-3 rounded-lg bg-accent-soft px-3 py-2 text-sm text-accent", className), children: [(0, jsx_runtime_1.jsxs)("span", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)(lucide_react_1.Clock, { className: "size-4 shrink-0", "aria-hidden": "true" }), "You're on a free trial", detail.nextBillingDate ? `. Your first charge is on ${formatDate(detail.nextBillingDate)}.` : "."] }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)(link_button_js_1.ConnectLinkButton, { href: plansHref ?? DEFAULT_PLANS_HREF, variant: "tertiary", children: "Compare plans" }), (0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", onPress: () => window.open(`${appUrl}/billing/subscriptions/${detail.id}`, "_blank", "noopener,noreferrer"), children: ["Manage", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] })] })] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { className: (0, cn_js_1.cn)("flex flex-wrap items-center justify-between gap-3 rounded-lg bg-accent-soft px-3 py-2 text-sm text-accent", className), children: [(0, jsx_runtime_1.jsxs)("span", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)(lucide_react_1.Clock, { className: "size-4 shrink-0", "aria-hidden": "true" }), "You're on a free trial", detail.nextBillingDate ? `. Your first charge is on ${formatDate(detail.nextBillingDate)}.` : "."] }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)(link_button_js_1.ConnectLinkButton, { href: plansHref ?? DEFAULT_PLANS_HREF, variant: "tertiary", children: "Compare plans" }), (0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", onPress: () => openConnect(`/billing/subscriptions/${encodeURIComponent(detail.id)}`), children: ["Manage", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5" })] })] })] }));
 }
 /**
  * Renders `children` for a subscribed workspace, and the "pick a plan" card for

package/dist/cjs/client/components/user-menu.js

@@ -13,7 +13,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("@heroui/react");
 const lucide_react_1 = require("lucide-react");
 const provider_js_1 = require("../provider.js");
-const portal_links_js_1 = require("../portal-links.js");
 const mark_js_1 = require("../mark.js");
 const identity_js_1 = require("./identity.js");
 const account_sessions_js_1 = require("./account-sessions.js");
@@ -26,6 +25,12 @@ const THEME_OPTIONS = [
     { value: "dark", label: "Dark", icon: lucide_react_1.Moon },
     { value: "system", label: "System", icon: lucide_react_1.Laptop },
 ];
+/**
+ * Connect's front page, which is a destination rather than a task - nothing to
+ * finish, so nothing to come back from. Every *task* destination here (Profile,
+ * Billing, Invoices) goes through `openConnect` instead, which brings the
+ * visitor back when they are done.
+ */
 function openExternal(url) {
     window.open(url, "_blank", "noopener,noreferrer");
 }
@@ -100,8 +105,8 @@ function subscriptionChip(subscription) {
  * 44%, and takes the tile down to ~88px while making its contents read
  * bigger, not smaller.
  */
-function DestinationTile({ icon, label, url, }) {
-    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", "aria-label": `${label} (opens in a new tab)`, className: `relative h-auto w-full flex-col items-center justify-center gap-2 rounded-xl border border-border ${surfaces_js_1.PANEL_FILL} p-3 hover:border-accent hover:bg-surface-secondary`, onPress: () => openExternal(url), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "absolute end-2 top-2 size-3.5 text-muted", "aria-hidden": "true" }), (0, jsx_runtime_1.jsx)("span", { className: `flex ${surfaces_js_1.MEDALLION} items-center justify-center rounded-xl bg-surface text-muted`, children: icon }), (0, jsx_runtime_1.jsx)("span", { className: "text-xs font-medium text-foreground", children: label })] }));
+function DestinationTile({ icon, label, onPress, newTab, }) {
+    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", "aria-label": newTab ? `${label} (opens in a new tab)` : label, className: `relative h-auto w-full flex-col items-center justify-center gap-2 rounded-xl border border-border ${surfaces_js_1.PANEL_FILL} p-3 hover:border-accent hover:bg-surface-secondary`, onPress: onPress, children: [newTab && (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "absolute end-2 top-2 size-3.5 text-muted", "aria-hidden": "true" }), (0, jsx_runtime_1.jsx)("span", { className: `flex ${surfaces_js_1.MEDALLION} items-center justify-center rounded-xl bg-surface text-muted`, children: icon }), (0, jsx_runtime_1.jsx)("span", { className: "text-xs font-medium text-foreground", children: label })] }));
 }
 /**
  * The account modal's contents - identity card, the three Connect
@@ -122,14 +127,14 @@ function DestinationTile({ icon, label, url, }) {
  * three navigations.
  */
 function ProfileSurface({ onSignOut, theme, onThemeChange, }) {
-    const { session, signOut, appUrl, clientId } = (0, provider_js_1.useConnect)();
+    const { session, signOut, appUrl, openConnect, handoffMode } = (0, provider_js_1.useConnect)();
     const user = session?.user;
     if (!user)
         return null;
     const label = user.displayName ?? user.email ?? "Account";
     const role = session?.role ?? null;
     const planChip = subscriptionChip(session?.subscription ?? null);
-    return ((0, jsx_runtime_1.jsx)(react_1.Modal.Backdrop, { children: (0, jsx_runtime_1.jsx)(react_1.Modal.Container, { size: "md", scroll: "inside", children: (0, jsx_runtime_1.jsxs)(react_1.Modal.Dialog, { children: [(0, jsx_runtime_1.jsx)(react_1.Modal.CloseTrigger, {}), (0, jsx_runtime_1.jsx)(react_1.Modal.Header, { children: (0, jsx_runtime_1.jsx)(react_1.Modal.Heading, { children: "Account" }) }), (0, jsx_runtime_1.jsxs)(react_1.Modal.Body, { className: "flex flex-col gap-5", children: [(0, jsx_runtime_1.jsxs)("div", { className: `flex items-start gap-3 rounded-xl border border-border ${surfaces_js_1.PANEL_FILL} p-4`, children: [(0, jsx_runtime_1.jsx)(UserAvatar, { user: user, size: "lg" }), (0, jsx_runtime_1.jsxs)("div", { className: "flex min-w-0 flex-1 flex-col gap-0.5", children: [(0, jsx_runtime_1.jsx)("p", { className: "truncate text-sm font-semibold text-foreground", children: label }), user.email && (0, jsx_runtime_1.jsx)("p", { className: "truncate text-xs text-muted", children: user.email }), (0, jsx_runtime_1.jsx)("p", { className: "truncate text-xs text-muted", children: user.workspaceName }), (role || planChip || !user.emailVerified) && ((0, jsx_runtime_1.jsxs)("div", { className: "mt-1.5 flex flex-wrap items-center gap-1.5", children: [role && ((0, jsx_runtime_1.jsx)(react_1.Chip, { size: "sm", variant: "soft", color: "accent", children: humanizeRole(role) })), planChip, !user.emailVerified && ((0, jsx_runtime_1.jsx)(react_1.Chip, { size: "sm", variant: "soft", color: "warning", children: "Email unverified" }))] }))] })] }), (0, jsx_runtime_1.jsxs)("div", { className: "grid grid-cols-3 gap-2", children: [(0, jsx_runtime_1.jsx)(DestinationTile, { icon: (0, jsx_runtime_1.jsx)(lucide_react_1.UserRound, { className: surfaces_js_1.ICON, "aria-hidden": "true" }), label: "Profile", url: (0, portal_links_js_1.connectPortalUrl)(appUrl, clientId, "/profile") }), (0, jsx_runtime_1.jsx)(DestinationTile, { icon: (0, jsx_runtime_1.jsx)(lucide_react_1.CreditCard, { className: surfaces_js_1.ICON, "aria-hidden": "true" }), label: "Billing", url: `${appUrl}/billing` }), (0, jsx_runtime_1.jsx)(DestinationTile, { icon: (0, jsx_runtime_1.jsx)(mark_js_1.ConnectMark, { className: surfaces_js_1.ICON }), label: "Connect", url: appUrl })] }), theme && onThemeChange && ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col gap-2", children: [(0, jsx_runtime_1.jsx)("p", { className: "text-sm font-medium text-foreground", children: "Appearance" }), (0, jsx_runtime_1.jsx)(react_1.ToggleButtonGroup, { fullWidth: true, "aria-label": "Theme", selectionMode: "single", disallowEmptySelection: true, selectedKeys: [theme], onSelectionChange: (keys) => {
+    return ((0, jsx_runtime_1.jsx)(react_1.Modal.Backdrop, { children: (0, jsx_runtime_1.jsx)(react_1.Modal.Container, { size: "md", scroll: "inside", children: (0, jsx_runtime_1.jsxs)(react_1.Modal.Dialog, { children: [(0, jsx_runtime_1.jsx)(react_1.Modal.CloseTrigger, {}), (0, jsx_runtime_1.jsx)(react_1.Modal.Header, { children: (0, jsx_runtime_1.jsx)(react_1.Modal.Heading, { children: "Account" }) }), (0, jsx_runtime_1.jsxs)(react_1.Modal.Body, { className: "flex flex-col gap-5", children: [(0, jsx_runtime_1.jsxs)("div", { className: `flex items-start gap-3 rounded-xl border border-border ${surfaces_js_1.PANEL_FILL} p-4`, children: [(0, jsx_runtime_1.jsx)(UserAvatar, { user: user, size: "lg" }), (0, jsx_runtime_1.jsxs)("div", { className: "flex min-w-0 flex-1 flex-col gap-0.5", children: [(0, jsx_runtime_1.jsx)("p", { className: "truncate text-sm font-semibold text-foreground", children: label }), user.email && (0, jsx_runtime_1.jsx)("p", { className: "truncate text-xs text-muted", children: user.email }), (0, jsx_runtime_1.jsx)("p", { className: "truncate text-xs text-muted", children: user.workspaceName }), (role || planChip || !user.emailVerified) && ((0, jsx_runtime_1.jsxs)("div", { className: "mt-1.5 flex flex-wrap items-center gap-1.5", children: [role && ((0, jsx_runtime_1.jsx)(react_1.Chip, { size: "sm", variant: "soft", color: "accent", children: humanizeRole(role) })), planChip, !user.emailVerified && ((0, jsx_runtime_1.jsx)(react_1.Chip, { size: "sm", variant: "soft", color: "warning", children: "Email unverified" }))] }))] })] }), (0, jsx_runtime_1.jsxs)("div", { className: "grid grid-cols-3 gap-2", children: [(0, jsx_runtime_1.jsx)(DestinationTile, { icon: (0, jsx_runtime_1.jsx)(lucide_react_1.UserRound, { className: surfaces_js_1.ICON, "aria-hidden": "true" }), label: "Profile", onPress: () => openConnect("/profile"), newTab: handoffMode === "popup" }), (0, jsx_runtime_1.jsx)(DestinationTile, { icon: (0, jsx_runtime_1.jsx)(lucide_react_1.CreditCard, { className: surfaces_js_1.ICON, "aria-hidden": "true" }), label: "Billing", onPress: () => openConnect("/billing"), newTab: handoffMode === "popup" }), (0, jsx_runtime_1.jsx)(DestinationTile, { icon: (0, jsx_runtime_1.jsx)(mark_js_1.ConnectMark, { className: surfaces_js_1.ICON }), label: "Connect", onPress: () => openExternal(appUrl), newTab: true })] }), theme && onThemeChange && ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col gap-2", children: [(0, jsx_runtime_1.jsx)("p", { className: "text-sm font-medium text-foreground", children: "Appearance" }), (0, jsx_runtime_1.jsx)(react_1.ToggleButtonGroup, { fullWidth: true, "aria-label": "Theme", selectionMode: "single", disallowEmptySelection: true, selectedKeys: [theme], onSelectionChange: (keys) => {
                                             const [next] = [...keys];
                                             if (typeof next === "string")
                                                 onThemeChange(next);
@@ -207,8 +212,8 @@ function ConnectUserMenu({ compact = false, ...rest }) {
  * state, a settings page.
  */
 function ConnectManageSubscriptionButton({ className }) {
-    const { appUrl } = (0, provider_js_1.useConnect)();
-    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", className: className, onPress: () => openExternal(`${appUrl}/billing`), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.CreditCard, { className: "size-4 shrink-0" }), "Manage subscription", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5 shrink-0 text-muted" })] }));
+    const { openConnect } = (0, provider_js_1.useConnect)();
+    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "secondary", className: className, onPress: () => openConnect("/billing"), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.CreditCard, { className: "size-4 shrink-0" }), "Manage subscription", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5 shrink-0 text-muted" })] }));
 }
 /**
  * Invoices and payment history, on Connect.
@@ -221,10 +226,10 @@ function ConnectManageSubscriptionButton({ className }) {
  * version of a record that must have exactly one.
  */
 function ConnectInvoicesButton({ className }) {
-    const { session, appUrl } = (0, provider_js_1.useConnect)();
+    const { session, openConnect } = (0, provider_js_1.useConnect)();
     if (!session?.user)
         return null;
-    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", className: className, onPress: () => openExternal(`${appUrl}/billing/invoices`), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.ReceiptText, { className: "size-4 shrink-0" }), "Invoices", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5 shrink-0 text-muted" })] }));
+    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", className: className, onPress: () => openConnect("/billing/invoices"), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.ReceiptText, { className: "size-4 shrink-0" }), "Invoices", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5 shrink-0 text-muted" })] }));
 }
 /**
  * The "Profile" action on its own - the third of the three Connect
@@ -236,10 +241,10 @@ function ConnectInvoicesButton({ className }) {
  * and got no `return_to`, so the user had no way back.
  */
 function ConnectProfileButton({ className }) {
-    const { session, appUrl, clientId } = (0, provider_js_1.useConnect)();
+    const { session, openConnect } = (0, provider_js_1.useConnect)();
     if (!session?.user)
         return null;
-    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", className: className, onPress: () => openExternal((0, portal_links_js_1.connectPortalUrl)(appUrl, clientId, "/profile")), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.UserRound, { className: "size-4 shrink-0" }), "Profile", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5 shrink-0 text-muted" })] }));
+    return ((0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "tertiary", className: className, onPress: () => openConnect("/profile"), children: [(0, jsx_runtime_1.jsx)(lucide_react_1.UserRound, { className: "size-4 shrink-0" }), "Profile", (0, jsx_runtime_1.jsx)(lucide_react_1.ExternalLink, { className: "size-3.5 shrink-0 text-muted" })] }));
 }
 /** A plain "Open Connect" button, for a footer or a help menu. */
 function ConnectHomeButton({ className }) {