@bwalletx/connect 0.5.3 → 0.5.6

package/dist/react.d.cts

@@ -1,8 +1,8 @@
 import { ReactNode, ReactElement, CSSProperties } from 'react';
 import { WalletInterface } from '@bsv/sdk';
-import { C as ConnectedWallet, W as WalletOption, P as PayRequest, a as PayResult, B as BuyTokenRequest, b as PayOptions } from './wallets-VOKIKBbO.cjs';
-export { H as HandCashAdapterOptions, c as PaymentError, d as brc100Option, e as discoverWallets, h as handcashAdapter, p as pairingOption } from './wallets-VOKIKBbO.cjs';
-import { SigninSize, SigninTheme, SigninLabel, SigninBrand } from './element.cjs';
+import { C as ConnectedWallet, W as WalletOption, P as PayRequest, a as PayResult, B as BuyTokenRequest, A as AttemptHook, b as PayOptions } from './choice-DCh-tgpT.cjs';
+export { H as HandCashAdapterOptions, c as PaymentError, d as autoChoice, e as brc100Option, f as discoverWallets, h as handcashAdapter, p as pairingOption } from './choice-DCh-tgpT.cjs';
+import { S as SigninSize, a as SigninTheme, b as SigninLabel, c as SigninBrand, d as SigninState } from './element-D9Zl-x12.cjs';
 
 /**
  * React wrapper for <bwalletx-signin>. React is an optional peer dependency; the button itself is
@@ -40,6 +40,20 @@ interface BwalletxSigninProps {
     redirectUri?: string;
     scope?: string;
     discoverMs?: number;
+    /** "Other wallets" link under the button: 'auto' (default: lg/md), 'on' or 'off'. */
+    otherWallets?: 'auto' | 'on' | 'off';
+    /** Without a provider: GET → { identityKey, handle?, paymail? } restores the signed-in badge on load. */
+    sessionUrl?: string;
+    /** Without a provider: POST on Disconnect. */
+    logoutUrl?: string;
+    /** Paymail lookup for the badge; 'off' to skip. */
+    lookupUrl?: string;
+    /**
+     * Show the signed-in badge and the pending / error states (default true). Inside <BwalletXProvider> the button
+     * follows the provider: click → connect() (one wallet sheet), badge when signed in, Disconnect → disconnect()
+     * (logoutUrl). Set false for the pre-0.5.5 plain button.
+     */
+    stateful?: boolean;
     'aria-label'?: string;
     className?: string;
     style?: CSSProperties;
@@ -51,7 +65,11 @@ interface BwalletxSigninProps {
     onSignedIn?: (d: SignedInDetail) => void;
     onNotFound?: () => void;
     onError?: (error: unknown) => void;
+    /** After Disconnect in the badge menu. */
+    onSignedOut?: () => void;
 }
+/** The element state for the provider's state. */
+declare function signinStateFor(v: Pick<BwalletXState, 'status' | 'identityKey'>): SigninState;
 declare function BwalletxSignin(props: BwalletxSigninProps): ReactElement;
 
 type BwalletXStatus = 'idle' | 'restoring' | 'connecting' | 'connected' | 'error';
@@ -64,6 +82,8 @@ interface BwalletXState {
     wallet: WalletInterface | null;
     /** Which option connected (e.g. 'com.bwalletx.extension', 'bwalletx-pairing', 'handcash'). */
     walletId: string | null;
+    /** 'bwalletx' for any bWalletX, else the wallet's rdns / option id (0.5.6). null until connect(). */
+    walletType: string | null;
     /** True while the transitional HandCash adapter is in use. */
     transitional: boolean;
     /** The server session (verifyUrl/sessionUrl) is in place. */
@@ -71,9 +91,14 @@ interface BwalletXState {
     error: Error | null;
 }
 interface BwalletXContextValue extends BwalletXState {
-    /** Find wallets, show the picker if there is a choice, connect, and sign in if verifyUrl is set. */
+    /**
+     * Find wallets, connect, and sign in if verifyUrl is set. bWalletX in this browser is used straight away (0.5.6);
+     * without it the chooser opens with "Get bWalletX" first. `chooser: true` is the "Other wallets" link: the chooser
+     * even when bWalletX is here.
+     */
     connect(opts?: {
         walletId?: string;
+        chooser?: boolean;
     }): Promise<ConnectedWallet | null>;
     disconnect(): Promise<void>;
     /** The wallets found on the last connect() (or listWallets()). */
@@ -85,7 +110,7 @@ interface BwalletXContextValue extends BwalletXState {
 }
 interface BwalletXProviderProps {
     children?: ReactNode;
-    /** POST { identityKey } → challenge. With verifyUrl, connect() also signs in. */
+    /** POST {} (or { identityKey }) → challenge. With verifyUrl, connect() also signs in, in ONE wallet sheet. */
     challengeUrl?: string;
     /** POST { identityKey, nonce, signature } → { identityKey, handle?, paymail? } and sets the cookie. */
     verifyUrl?: string;
@@ -95,12 +120,33 @@ interface BwalletXProviderProps {
     sessionUrl?: string;
     /** Offer phone pairing with the built-in QR modal. Default true. */
     pairing?: boolean;
-    /** Show the built-in picker when more than one wallet is available. Default true. */
+    /**
+     * Show the built-in picker when there is a real choice. Default true. One wallet found in this browser (and no
+     * app-supplied option such as HandCash) is used straight away, with no picker; phone pairing is then not offered.
+     */
     picker?: boolean;
+    /**
+     * Your challenge route is older than 0.5.5 and needs the identity key first (two wallet sheets). Normally not
+     * needed: such a server is detected and retried. Upgrade the server to @bwalletx/connect 0.5.5 for one sheet.
+     */
+    challengeNeedsIdentityKey?: boolean;
+    /** Paymail lookup by identity key for the signed-in badge (best effort). Default pay.bwallet.space; 'off' to skip. */
+    lookupUrl?: string;
     /** Extra options, e.g. [handcashAdapter({ login })]. */
     extraWallets?: WalletOption[];
-    /** Probe desktop wallets on localhost. Default false. */
+    /**
+     * Probe desktop wallets on localhost while listing. Default false, and best left off (Chrome's Local Network Access
+     * prompt): the chooser offers "Desktop wallet", which probes only when tapped.
+     */
     probeLocal?: boolean;
+    /**
+     * bWalletX first (0.5.6, default true): with bWalletX in this browser connect() goes straight to its sheet, no
+     * chooser; without it the chooser opens, "Get bWalletX" first, and another wallet is connected only when picked.
+     * false: the 0.5.5 picker rule (one detected wallet of any brand was used without asking).
+     */
+    fastPath?: boolean;
+    /** Called once per connect attempt with { walletType, substrate, outcome, ms }. No keys, addresses or identity data. */
+    onAttempt?: AttemptHook;
     /**
      * A theme the wallet already bundles (e.g. 'npgx') for bWalletX to wear while this site is connected and is the
      * active tab. Declared only while connecting or connected; withdrawn on disconnect. See declareWalletTheme.
@@ -114,8 +160,29 @@ interface BwalletXProviderProps {
 declare function BwalletXProvider(p: BwalletXProviderProps): ReactElement;
 /** The wallet + session state. Must be inside <BwalletXProvider>. */
 declare function useBwalletX(): BwalletXContextValue;
+type BwalletXAccountStatus = 'restoring' | 'signed-out' | 'pending' | 'signed-in' | 'error';
+interface BwalletXAccount {
+    status: BwalletXAccountStatus;
+    identityKey: string | null;
+    paymail: string | null;
+    handle: string | null;
+    /** $alice, a site handle, the paymail, or a short key: what the badge shows. */
+    label: string | null;
+    /** The bAvatar picture for the identity key (gold by default), or null when signed out. */
+    avatarUrl: string | null;
+    /** One plain line for the last error ("Sign-in cancelled" for a no in the wallet), or null. */
+    error: string | null;
+    /** Sign in (the provider's connect(): one wallet sheet). Never throws; failures show in `status`/`error`. */
+    login(): Promise<void>;
+    /** Sign out: the provider's disconnect() (posts logoutUrl). */
+    logout(): Promise<void>;
+}
+/** The account view of a provider state (what useBwalletXAccount returns). */
+declare function accountFor(v: BwalletXContextValue): BwalletXAccount;
+/** The signed-in account for your own UI: { status, identityKey, paymail, handle, avatarUrl, logout, … }. Inside <BwalletXProvider>. */
+declare function useBwalletXAccount(): BwalletXAccount;
 
 /** Alias with the casing used by <BwalletxSignin>. */
 declare const BwalletxProvider: typeof BwalletXProvider;
 
-export { BuyTokenRequest, type BwalletXContextValue, BwalletXProvider, type BwalletXProviderProps, type BwalletXState, type BwalletXStatus, BwalletxProvider, BwalletxSignin, type BwalletxSigninProps, ConnectedWallet, PayOptions, PayRequest, PayResult, type SignedInDetail, WalletOption, BwalletxSignin as default, useBwalletX };
+export { BuyTokenRequest, type BwalletXAccount, type BwalletXAccountStatus, type BwalletXContextValue, BwalletXProvider, type BwalletXProviderProps, type BwalletXState, type BwalletXStatus, BwalletxProvider, BwalletxSignin, type BwalletxSigninProps, ConnectedWallet, PayOptions, PayRequest, PayResult, type SignedInDetail, WalletOption, accountFor, BwalletxSignin as default, signinStateFor, useBwalletX, useBwalletXAccount };

package/dist/react.d.ts

@@ -1,8 +1,8 @@
 import { ReactNode, ReactElement, CSSProperties } from 'react';
 import { WalletInterface } from '@bsv/sdk';
-import { C as ConnectedWallet, W as WalletOption, P as PayRequest, a as PayResult, B as BuyTokenRequest, b as PayOptions } from './wallets-VOKIKBbO.js';
-export { H as HandCashAdapterOptions, c as PaymentError, d as brc100Option, e as discoverWallets, h as handcashAdapter, p as pairingOption } from './wallets-VOKIKBbO.js';
-import { SigninSize, SigninTheme, SigninLabel, SigninBrand } from './element.js';
+import { C as ConnectedWallet, W as WalletOption, P as PayRequest, a as PayResult, B as BuyTokenRequest, A as AttemptHook, b as PayOptions } from './choice-DCh-tgpT.js';
+export { H as HandCashAdapterOptions, c as PaymentError, d as autoChoice, e as brc100Option, f as discoverWallets, h as handcashAdapter, p as pairingOption } from './choice-DCh-tgpT.js';
+import { S as SigninSize, a as SigninTheme, b as SigninLabel, c as SigninBrand, d as SigninState } from './element-D9Zl-x12.js';
 
 /**
  * React wrapper for <bwalletx-signin>. React is an optional peer dependency; the button itself is
@@ -40,6 +40,20 @@ interface BwalletxSigninProps {
     redirectUri?: string;
     scope?: string;
     discoverMs?: number;
+    /** "Other wallets" link under the button: 'auto' (default: lg/md), 'on' or 'off'. */
+    otherWallets?: 'auto' | 'on' | 'off';
+    /** Without a provider: GET → { identityKey, handle?, paymail? } restores the signed-in badge on load. */
+    sessionUrl?: string;
+    /** Without a provider: POST on Disconnect. */
+    logoutUrl?: string;
+    /** Paymail lookup for the badge; 'off' to skip. */
+    lookupUrl?: string;
+    /**
+     * Show the signed-in badge and the pending / error states (default true). Inside <BwalletXProvider> the button
+     * follows the provider: click → connect() (one wallet sheet), badge when signed in, Disconnect → disconnect()
+     * (logoutUrl). Set false for the pre-0.5.5 plain button.
+     */
+    stateful?: boolean;
     'aria-label'?: string;
     className?: string;
     style?: CSSProperties;
@@ -51,7 +65,11 @@ interface BwalletxSigninProps {
     onSignedIn?: (d: SignedInDetail) => void;
     onNotFound?: () => void;
     onError?: (error: unknown) => void;
+    /** After Disconnect in the badge menu. */
+    onSignedOut?: () => void;
 }
+/** The element state for the provider's state. */
+declare function signinStateFor(v: Pick<BwalletXState, 'status' | 'identityKey'>): SigninState;
 declare function BwalletxSignin(props: BwalletxSigninProps): ReactElement;
 
 type BwalletXStatus = 'idle' | 'restoring' | 'connecting' | 'connected' | 'error';
@@ -64,6 +82,8 @@ interface BwalletXState {
     wallet: WalletInterface | null;
     /** Which option connected (e.g. 'com.bwalletx.extension', 'bwalletx-pairing', 'handcash'). */
     walletId: string | null;
+    /** 'bwalletx' for any bWalletX, else the wallet's rdns / option id (0.5.6). null until connect(). */
+    walletType: string | null;
     /** True while the transitional HandCash adapter is in use. */
     transitional: boolean;
     /** The server session (verifyUrl/sessionUrl) is in place. */
@@ -71,9 +91,14 @@ interface BwalletXState {
     error: Error | null;
 }
 interface BwalletXContextValue extends BwalletXState {
-    /** Find wallets, show the picker if there is a choice, connect, and sign in if verifyUrl is set. */
+    /**
+     * Find wallets, connect, and sign in if verifyUrl is set. bWalletX in this browser is used straight away (0.5.6);
+     * without it the chooser opens with "Get bWalletX" first. `chooser: true` is the "Other wallets" link: the chooser
+     * even when bWalletX is here.
+     */
     connect(opts?: {
         walletId?: string;
+        chooser?: boolean;
     }): Promise<ConnectedWallet | null>;
     disconnect(): Promise<void>;
     /** The wallets found on the last connect() (or listWallets()). */
@@ -85,7 +110,7 @@ interface BwalletXContextValue extends BwalletXState {
 }
 interface BwalletXProviderProps {
     children?: ReactNode;
-    /** POST { identityKey } → challenge. With verifyUrl, connect() also signs in. */
+    /** POST {} (or { identityKey }) → challenge. With verifyUrl, connect() also signs in, in ONE wallet sheet. */
     challengeUrl?: string;
     /** POST { identityKey, nonce, signature } → { identityKey, handle?, paymail? } and sets the cookie. */
     verifyUrl?: string;
@@ -95,12 +120,33 @@ interface BwalletXProviderProps {
     sessionUrl?: string;
     /** Offer phone pairing with the built-in QR modal. Default true. */
     pairing?: boolean;
-    /** Show the built-in picker when more than one wallet is available. Default true. */
+    /**
+     * Show the built-in picker when there is a real choice. Default true. One wallet found in this browser (and no
+     * app-supplied option such as HandCash) is used straight away, with no picker; phone pairing is then not offered.
+     */
     picker?: boolean;
+    /**
+     * Your challenge route is older than 0.5.5 and needs the identity key first (two wallet sheets). Normally not
+     * needed: such a server is detected and retried. Upgrade the server to @bwalletx/connect 0.5.5 for one sheet.
+     */
+    challengeNeedsIdentityKey?: boolean;
+    /** Paymail lookup by identity key for the signed-in badge (best effort). Default pay.bwallet.space; 'off' to skip. */
+    lookupUrl?: string;
     /** Extra options, e.g. [handcashAdapter({ login })]. */
     extraWallets?: WalletOption[];
-    /** Probe desktop wallets on localhost. Default false. */
+    /**
+     * Probe desktop wallets on localhost while listing. Default false, and best left off (Chrome's Local Network Access
+     * prompt): the chooser offers "Desktop wallet", which probes only when tapped.
+     */
     probeLocal?: boolean;
+    /**
+     * bWalletX first (0.5.6, default true): with bWalletX in this browser connect() goes straight to its sheet, no
+     * chooser; without it the chooser opens, "Get bWalletX" first, and another wallet is connected only when picked.
+     * false: the 0.5.5 picker rule (one detected wallet of any brand was used without asking).
+     */
+    fastPath?: boolean;
+    /** Called once per connect attempt with { walletType, substrate, outcome, ms }. No keys, addresses or identity data. */
+    onAttempt?: AttemptHook;
     /**
      * A theme the wallet already bundles (e.g. 'npgx') for bWalletX to wear while this site is connected and is the
      * active tab. Declared only while connecting or connected; withdrawn on disconnect. See declareWalletTheme.
@@ -114,8 +160,29 @@ interface BwalletXProviderProps {
 declare function BwalletXProvider(p: BwalletXProviderProps): ReactElement;
 /** The wallet + session state. Must be inside <BwalletXProvider>. */
 declare function useBwalletX(): BwalletXContextValue;
+type BwalletXAccountStatus = 'restoring' | 'signed-out' | 'pending' | 'signed-in' | 'error';
+interface BwalletXAccount {
+    status: BwalletXAccountStatus;
+    identityKey: string | null;
+    paymail: string | null;
+    handle: string | null;
+    /** $alice, a site handle, the paymail, or a short key: what the badge shows. */
+    label: string | null;
+    /** The bAvatar picture for the identity key (gold by default), or null when signed out. */
+    avatarUrl: string | null;
+    /** One plain line for the last error ("Sign-in cancelled" for a no in the wallet), or null. */
+    error: string | null;
+    /** Sign in (the provider's connect(): one wallet sheet). Never throws; failures show in `status`/`error`. */
+    login(): Promise<void>;
+    /** Sign out: the provider's disconnect() (posts logoutUrl). */
+    logout(): Promise<void>;
+}
+/** The account view of a provider state (what useBwalletXAccount returns). */
+declare function accountFor(v: BwalletXContextValue): BwalletXAccount;
+/** The signed-in account for your own UI: { status, identityKey, paymail, handle, avatarUrl, logout, … }. Inside <BwalletXProvider>. */
+declare function useBwalletXAccount(): BwalletXAccount;
 
 /** Alias with the casing used by <BwalletxSignin>. */
 declare const BwalletxProvider: typeof BwalletXProvider;
 
-export { BuyTokenRequest, type BwalletXContextValue, BwalletXProvider, type BwalletXProviderProps, type BwalletXState, type BwalletXStatus, BwalletxProvider, BwalletxSignin, type BwalletxSigninProps, ConnectedWallet, PayOptions, PayRequest, PayResult, type SignedInDetail, WalletOption, BwalletxSignin as default, useBwalletX };
+export { BuyTokenRequest, type BwalletXAccount, type BwalletXAccountStatus, type BwalletXContextValue, BwalletXProvider, type BwalletXProviderProps, type BwalletXState, type BwalletXStatus, BwalletxProvider, BwalletxSignin, type BwalletxSigninProps, ConnectedWallet, PayOptions, PayRequest, PayResult, type SignedInDetail, WalletOption, accountFor, BwalletxSignin as default, signinStateFor, useBwalletX, useBwalletXAccount };

package/dist/react.js

@@ -1,22 +1,27 @@
 import {
   PaymentError,
-  brc100Option,
   buyToken,
   declareWalletTheme,
-  discoverWallets,
-  handcashAdapter,
-  pairingModal,
-  pairingOption,
   pay,
-  pickWallet,
+  runConnect,
   tip
-} from "./chunk-PI42H3XY.js";
+} from "./chunk-IFGOAROM.js";
 import {
-  atStage,
+  accountLabel,
+  autoChoice,
+  avatarUrlFor,
+  brc100Option,
+  chooseWallet,
   clearPairing,
   defineBwalletxSignin,
-  signInWithBwalletX
-} from "./chunk-IUDD7YTQ.js";
+  discoverWallets,
+  handcashAdapter,
+  lookupPaymail,
+  pairingModal,
+  pairingOption,
+  pickWallet,
+  signInErrorText
+} from "./chunk-LS6AYEBO.js";
 import "./chunk-MWD4BCO5.js";
 
 // src/react.ts
@@ -30,19 +35,52 @@ import {
   useRef,
   useState
 } from "react";
+function signinStateFor(v) {
+  if (v.status === "restoring") return "restoring";
+  if (v.status === "connecting") return "pending";
+  if (v.status === "error") return "error";
+  if (v.status === "connected" && v.identityKey) return "signed-in";
+  return "signed-out";
+}
 function BwalletxSignin(props) {
   const ref = useRef(null);
   const cb = useRef(props);
   cb.current = props;
+  const ctx = useContext(Ctx);
+  const ctxRef = useRef(ctx);
+  ctxRef.current = ctx;
+  const driven = !!ctx && props.stateful !== false;
   useEffect(() => {
     defineBwalletxSignin();
     const el = ref.current;
     if (!el) return;
     const on = [
-      ["bwalletx-signin", (e) => cb.current.onClick?.(e)],
+      [
+        "bwalletx-signin",
+        (e) => {
+          cb.current.onClick?.(e);
+          const c = ctxRef.current;
+          if (!e.defaultPrevented && c && cb.current.stateful !== false) {
+            e.preventDefault();
+            const mode = e.detail?.mode;
+            c.connect(mode === "chooser" ? { chooser: true } : {}).catch(() => void 0);
+          }
+        }
+      ],
       ["bwalletx-signed-in", (e) => cb.current.onSignedIn?.(e.detail)],
       ["bwalletx-not-found", () => cb.current.onNotFound?.()],
-      ["bwalletx-error", (e) => cb.current.onError?.(e.detail.error)]
+      ["bwalletx-error", (e) => cb.current.onError?.(e.detail.error)],
+      [
+        "bwalletx-disconnect",
+        (e) => {
+          const c = ctxRef.current;
+          if (c && cb.current.stateful !== false) {
+            e.preventDefault();
+            void c.disconnect().then(() => cb.current.onSignedOut?.());
+          }
+        }
+      ],
+      ["bwalletx-signed-out", () => cb.current.onSignedOut?.()]
     ];
     for (const [t, f] of on) el.addEventListener(t, f);
     return () => {
@@ -51,6 +89,7 @@ function BwalletxSignin(props) {
   }, []);
   const p = props;
   const flag = (v) => v ? "" : void 0;
+  const state = driven ? signinStateFor(ctx) : void 0;
   return createElement("bwalletx-signin", {
     ref,
     id: p.id,
@@ -66,6 +105,16 @@ function BwalletxSignin(props) {
     disabled: flag(p.disabled),
     "challenge-url": p.challengeUrl,
     "verify-url": p.verifyUrl,
+    "session-url": driven ? void 0 : p.sessionUrl,
+    "logout-url": driven ? void 0 : p.logoutUrl,
+    "lookup-url": p.lookupUrl,
+    stateless: p.stateful === false ? "" : void 0,
+    state,
+    "identity-key": driven ? ctx.identityKey ?? void 0 : void 0,
+    paymail: driven ? ctx.paymail ?? void 0 : void 0,
+    handle: driven ? ctx.handle ?? void 0 : void 0,
+    "avatar-url": driven ? avatarUrlFor(ctx.identityKey) ?? void 0 : void 0,
+    error: driven && ctx.status === "error" ? signInErrorText(ctx.error) : void 0,
     "get-url": p.getUrl,
     "web-url": p.webUrl,
     href: p.href,
@@ -74,6 +123,7 @@ function BwalletxSignin(props) {
     "redirect-uri": p.redirectUri,
     scope: p.scope,
     "discover-ms": p.discoverMs,
+    "other-wallets": p.otherWallets,
     "aria-label": p["aria-label"]
   });
 }
@@ -85,6 +135,7 @@ var empty = {
   paymail: null,
   wallet: null,
   walletId: null,
+  walletType: null,
   transitional: false,
   signedIn: false,
   error: null
@@ -146,45 +197,42 @@ function BwalletXProvider(p) {
       setState((s) => ({ ...s, status: "connecting", error: null }));
       try {
         const list = await listWallets();
-        let choice = opts.walletId ? list.find((w) => w.id === opts.walletId) : void 0;
-        if (!choice) {
-          const direct = list.filter((w) => w.kind !== "pairing");
-          choice = c.picker !== false && list.length > 1 ? await pickWallet(list) : direct[0] ?? list[0] ?? null;
-        }
-        if (!choice) {
-          if (!list.length) throw Object.assign(new Error("No wallet found. Get bWalletX at bwalletx.com."), { code: "NOT_FOUND" });
-          setState((s) => ({ ...s, status: s.identityKey ? "connected" : "idle" }));
+        const fast = c.fastPath !== false;
+        const r = await runConnect({
+          list,
+          walletId: opts.walletId,
+          chooser: opts.chooser,
+          picker: c.picker,
+          fastPath: fast,
+          pick: fast ? (l) => chooseWallet(l) : pickWallet,
+          onAttempt: c.onAttempt,
+          challengeUrl: c.challengeUrl,
+          verifyUrl: c.verifyUrl,
+          challengeNeedsIdentityKey: c.challengeNeedsIdentityKey,
+          post: postJson
+        });
+        if (!r) {
+          setState((s) => ({ ...s, status: s.identityKey && s.signedIn ? "connected" : "idle" }));
           return null;
         }
-        const cw = await choice.connect();
-        let { handle = null, paymail = null } = cw;
-        let signedIn = false;
-        if (cw.wallet && c.challengeUrl && c.verifyUrl) {
-          const r = await signInWithBwalletX({
-            wallet: cw.wallet,
-            challenge: (identityKey) => postJson(c.challengeUrl, { identityKey })
-          });
-          const v = await atStage("verify", () => postJson(c.verifyUrl, { identityKey: r.identityKey, nonce: r.nonce, signature: r.signature }));
-          handle = v.handle ?? handle;
-          paymail = v.paymail ?? paymail;
-          signedIn = true;
-        }
+        const cw = r.connected;
         payer.current = cw.payer;
         setState({
           status: "connected",
-          identityKey: cw.identityKey,
-          handle,
-          paymail,
+          identityKey: r.identityKey,
+          handle: r.handle,
+          paymail: r.paymail,
           wallet: cw.wallet,
           walletId: cw.optionId,
+          walletType: r.walletType,
           transitional: !!cw.transitional,
-          signedIn,
+          signedIn: r.signedIn,
           error: null
         });
-        return cw;
+        return { ...cw, identityKey: r.identityKey, handle: r.handle ?? void 0, paymail: r.paymail ?? void 0 };
       } catch (e) {
         if (e?.message === "cancelled") {
-          setState((s) => ({ ...s, status: s.identityKey ? "connected" : "idle" }));
+          setState((s) => ({ ...s, status: s.identityKey && s.signedIn ? "connected" : "idle" }));
           return null;
         }
         throw fail(e);
@@ -200,6 +248,17 @@ function BwalletXProvider(p) {
     payer.current = null;
     setState(empty);
   }, [state.walletId]);
+  useEffect(() => {
+    const key = state.identityKey;
+    if (!key || state.paymail || p.lookupUrl === "off") return;
+    let live = true;
+    void lookupPaymail(key, p.lookupUrl).then((pm) => {
+      if (live && pm) setState((s) => s.identityKey === key && !s.paymail ? { ...s, paymail: pm } : s);
+    });
+    return () => {
+      live = false;
+    };
+  }, [state.identityKey, state.paymail, p.lookupUrl]);
   const need = () => {
     if (!payer.current) throw new PaymentError("NOT_SUPPORTED", "Connect a wallet first (connect()).");
     return payer.current;
@@ -224,17 +283,39 @@ function useBwalletX() {
   if (!v) throw new Error("useBwalletX() must be used inside <BwalletXProvider>");
   return v;
 }
+function accountFor(v) {
+  const status = signinStateFor(v);
+  const signedIn = status === "signed-in";
+  return {
+    status,
+    identityKey: signedIn ? v.identityKey : null,
+    paymail: signedIn ? v.paymail : null,
+    handle: signedIn ? v.handle : null,
+    label: signedIn ? accountLabel(v) : null,
+    avatarUrl: signedIn ? avatarUrlFor(v.identityKey) : null,
+    error: status === "error" ? signInErrorText(v.error) : null,
+    login: () => v.connect().then(() => void 0, () => void 0),
+    logout: () => v.disconnect()
+  };
+}
+function useBwalletXAccount() {
+  return accountFor(useBwalletX());
+}
 var BwalletxProvider = BwalletXProvider;
 export {
   BwalletXProvider,
   BwalletxProvider,
   BwalletxSignin,
   PaymentError,
+  accountFor,
+  autoChoice,
   brc100Option,
   react_default as default,
   discoverWallets,
   handcashAdapter,
   pairingOption,
-  useBwalletX
+  signinStateFor,
+  useBwalletX,
+  useBwalletXAccount
 };
 //# sourceMappingURL=react.js.map