@swype-org/react-sdk 0.2.375 → 0.2.399

package/dist/index.js

@@ -11,6 +11,7 @@ import { getAccount, reconnect, disconnect, getWalletClient, getConnectors } fro
 import { encodeFunctionData, recoverTypedDataAddress, decodeAbiParameters } from 'viem';
 import { parseErc6492Signature } from 'viem/utils';
 import * as QRCode from 'qrcode';
+import posthog from 'posthog-js';
 import * as Select from '@radix-ui/react-select';
 
 var __defProp = Object.defineProperty;
@@ -54,7 +55,11 @@ var darkTheme = {
   shadowLg: "0 18px 44px rgba(0,0,0,0.42)",
   radius: "14px",
   radiusLg: "24px",
-  fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif'
+  fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
+  fontWeightRegular: 400,
+  fontWeightMedium: 500,
+  fontWeightSemibold: 600,
+  fontWeightBold: 700
 };
 var lightTheme = {
   bg: "#ebf9fb",
@@ -86,7 +91,11 @@ var lightTheme = {
   shadowLg: "0 20px 48px rgba(19, 61, 75, 0.14)",
   radius: "14px",
   radiusLg: "24px",
-  fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif'
+  fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
+  fontWeightRegular: 400,
+  fontWeightMedium: 500,
+  fontWeightSemibold: 600,
+  fontWeightBold: 700
 };
 var lightTransparentTheme = {
   ...lightTheme
@@ -129,7 +138,13 @@ var lightThemeNew = {
   shadowLg: "0 20px 48px rgba(0, 0, 0, 0.14)",
   radius: "14px",
   radiusLg: "24px",
-  fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif'
+  // Figma redesign uses Inter; fall back to the system stack when the host
+  // page hasn't loaded the Inter webfont.
+  fontFamily: 'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
+  fontWeightRegular: 400,
+  fontWeightMedium: 500,
+  fontWeightSemibold: 600,
+  fontWeightBold: 700
 };
 var darkThemeNew = { ...lightThemeNew };
 var lightTransparentThemeNew = { ...lightThemeNew };
@@ -299,7 +314,7 @@ function resolveDepositPriorityContext(accounts, chains, destination) {
   for (const account of accounts) {
     for (const wallet of account.wallets) {
       if (wallet.chain.name !== destinationChainName) continue;
-      const source = wallet.sources.find(
+      const source = (wallet.sources ?? []).find(
         (candidate) => candidate.address.toLowerCase() === destinationTokenAddress
       );
       if (source) {
@@ -333,6 +348,11 @@ function getWalletAddress(wallet) {
   const address = wallet.name.trim();
   return address.length > 0 ? address : null;
 }
+function truncateMiddle(address, head = 8, tail = 6) {
+  const trimmed = address.trim();
+  if (trimmed.length <= head + tail + 4) return trimmed;
+  return `${trimmed.slice(0, head)}...${trimmed.slice(-tail)}`;
+}
 function getAddressableWallets(account) {
   return account.wallets.filter((wallet) => getWalletAddress(wallet) != null);
 }
@@ -340,7 +360,7 @@ function getPreferredDepositWallet(account, transferAmount, priorityContext) {
   const wallets = getAddressableWallets(account);
   if (wallets.length === 0) return null;
   const ranked = wallets.map((wallet, walletIndex) => {
-    const bestSource = wallet.sources.map((source, sourceIndex) => ({
+    const bestSource = (wallet.sources ?? []).map((source, sourceIndex) => ({
       source,
       sourceIndex
     })).sort((a, b) => {
@@ -365,7 +385,7 @@ function getPreferredDepositWallet(account, transferAmount, priorityContext) {
     if (a.wallet.status !== b.wallet.status) {
       return a.wallet.status === "ACTIVE" ? -1 : 1;
     }
-    const balanceDiff = b.wallet.balance.available.amount - a.wallet.balance.available.amount;
+    const balanceDiff = (b.wallet.balance?.available.amount ?? 0) - (a.wallet.balance?.available.amount ?? 0);
     if (balanceDiff !== 0) return balanceDiff;
     return a.walletIndex - b.walletIndex;
   });
@@ -381,7 +401,7 @@ function resolveDepositSelectionAfterRefresh(accounts, transferAmount, prev, pri
     const wallet = acct?.wallets.find((w) => w.id === selectedWalletId);
     if (wallet) {
       if (selectedTokenSymbol) {
-        const hasToken = wallet.sources.some((s) => s.token.symbol === selectedTokenSymbol);
+        const hasToken = wallet.sources == null || wallet.sources.some((s) => s.token.symbol === selectedTokenSymbol);
         if (hasToken) {
           return {
             defaults: { accountId: selectedAccountId, walletId: selectedWalletId },
@@ -419,7 +439,9 @@ function resolveDepositSelection(accounts, transferAmount, selectedAccountId, pr
   const eligibleAccounts = getDepositEligibleAccounts(accounts);
   if (eligibleAccounts.length === 0) return null;
   const accountHasSufficientBalanceWallet = (account) => getAddressableWallets(account).some(
-    (wallet) => wallet.status === "ACTIVE" && wallet.sources.some((source) => source.balance.available.amount >= transferAmount)
+    (wallet) => wallet.status === "ACTIVE" && (wallet.sources ?? []).some(
+      (source) => source.balance.available.amount >= transferAmount
+    )
   );
   if (transferAmount <= 0 && selectedAccountId) {
     const selectedAccount = eligibleAccounts.find((account) => account.id === selectedAccountId);
@@ -441,7 +463,7 @@ function resolveDepositSelection(accounts, transferAmount, selectedAccountId, pr
       transferAmount,
       priorityContext
     );
-    const preferredSource = preferredWallet ? [...preferredWallet.sources].sort((a, b) => compareDepositSourcePriority(
+    const preferredSource = preferredWallet ? [...preferredWallet.sources ?? []].sort((a, b) => compareDepositSourcePriority(
       sourcePriorityInput(preferredWallet.chain.name, a, transferAmount, priorityContext),
       sourcePriorityInput(preferredWallet.chain.name, b, transferAmount, priorityContext)
     ))[0] : void 0;
@@ -507,7 +529,7 @@ function buildNativeUnsupportedEntries(options) {
     logoURI: option.logoURI ?? null
   })).filter((entry) => entry.amount > 0);
 }
-function buildSelectSourceChoices(options, minTransferAmountUsd = DEFAULT_MIN_SEND_AMOUNT_USD) {
+function buildSelectSourceChoices(options, minTransferAmountUsd = DEFAULT_MIN_SEND_AMOUNT_USD, includeUnfundedTokens = false) {
   const chainChoices = [];
   const chainIndexByName = /* @__PURE__ */ new Map();
   for (const option of options) {
@@ -548,7 +570,7 @@ function buildSelectSourceChoices(options, minTransferAmountUsd = DEFAULT_MIN_SE
     }
   }
   return chainChoices.map((chain) => {
-    const visibleTokens = chain.tokens.filter((t) => isSelectableDepositSourceAmountUsd(t.balance, minTransferAmountUsd));
+    const visibleTokens = includeUnfundedTokens ? chain.tokens : chain.tokens.filter((t) => isSelectableDepositSourceAmountUsd(t.balance, minTransferAmountUsd));
     return {
       ...chain,
       balance: visibleTokens.reduce((sum, token) => sum + token.balance, 0),
@@ -1553,11 +1575,11 @@ function detachAccountChangeListeners() {
   accountChangeBinding = null;
 }
 function providerKey(selection) {
-  const providerName = selection.providerName?.trim();
-  if (!providerName) {
+  const providerName2 = selection.providerName?.trim();
+  if (!providerName2) {
     throw new Error("Solana wallet metadata is missing providerName.");
   }
-  return `${selection.providerId ?? ""}:${providerName.toLowerCase()}`;
+  return `${selection.providerId ?? ""}:${providerName2.toLowerCase()}`;
 }
 function assertSupportedProvider(selection) {
   const name = selection.providerName?.trim().toLowerCase();
@@ -1936,464 +1958,197 @@ function screenForPhase(phase) {
   }
 }
 
-// src/passkey-delegation.ts
-var PasskeyIframeBlockedError = class extends Error {
-  constructor(message = "Passkey creation is not supported in this browser context.") {
-    super(message);
-    this.name = "PasskeyIframeBlockedError";
+// src/api.ts
+var api_exports = {};
+__export(api_exports, {
+  createAccount: () => createAccount,
+  createAccountAuthorizationSession: () => createAccountAuthorizationSession,
+  createManualTransfer: () => createManualTransfer,
+  createTransfer: () => createTransfer,
+  fetchAccount: () => fetchAccount,
+  fetchAccountBalances: () => fetchAccountBalances,
+  fetchAccounts: () => fetchAccounts,
+  fetchAuthorizationSession: () => fetchAuthorizationSession,
+  fetchAuthorizationSessionByToken: () => fetchAuthorizationSessionByToken,
+  fetchChains: () => fetchChains,
+  fetchManualTransferSession: () => fetchManualTransferSession,
+  fetchManualTransferSources: () => fetchManualTransferSources,
+  fetchMerchantPublicKey: () => fetchMerchantPublicKey,
+  fetchProviders: () => fetchProviders,
+  fetchTransfer: () => fetchTransfer,
+  fetchUserConfig: () => fetchUserConfig,
+  postTransferQuote: () => postTransferQuote,
+  probeActionCompletion: () => probeActionCompletion,
+  refreshManualTransferQuote: () => refreshManualTransferQuote,
+  regenerateTransferSignPayload: () => regenerateTransferSignPayload,
+  registerPasskey: () => registerPasskey,
+  reportActionCompletion: () => reportActionCompletion,
+  reportPasskeyActivity: () => reportPasskeyActivity,
+  setAuthorizationSessionPaymentIntentAmount: () => setAuthorizationSessionPaymentIntentAmount,
+  setAuthorizationSessionProvider: () => setAuthorizationSessionProvider,
+  signTransfer: () => signTransfer,
+  updateManualTransferDepositTargetChain: () => updateManualTransferDepositTargetChain,
+  updateUserConfig: () => updateUserConfig,
+  updateUserConfigBySession: () => updateUserConfigBySession,
+  waitForActionTransactionReceipt: () => waitForActionTransactionReceipt
+});
+var DEBUG_BUFFER_CAPACITY = 200;
+var nextId = 1;
+var entries = [];
+var listeners = /* @__PURE__ */ new Set();
+function notify() {
+  for (const listener of listeners) {
+    try {
+      listener();
+    } catch (err) {
+      console.error("[blink-sdk][debug-log] listener threw:", err);
+    }
   }
-};
-function isInCrossOriginIframe() {
-  if (typeof window === "undefined") return false;
-  if (window.parent === window) return false;
-  try {
-    void window.parent.location.origin;
-    return false;
-  } catch {
-    return true;
+}
+function appendDebug(level, message, data) {
+  const entry = {
+    id: nextId++,
+    ts: Date.now(),
+    level,
+    message,
+    data
+  };
+  const next = entries.length >= DEBUG_BUFFER_CAPACITY ? entries.slice(entries.length - DEBUG_BUFFER_CAPACITY + 1) : entries.slice();
+  next.push(entry);
+  entries = next;
+  const prefix = "[blink-sdk][debug]";
+  const sink = level === "error" ? console.error : level === "warn" ? console.warn : console.info;
+  if (data !== void 0) {
+    sink(`${prefix} ${message}`, data);
+  } else {
+    sink(`${prefix} ${message}`);
   }
+  notify();
 }
-function isSafari() {
-  if (typeof navigator === "undefined") return false;
-  const ua = navigator.userAgent;
-  return /Safari/i.test(ua) && !/Chrome|CriOS|Chromium|Edg|OPR|Firefox/i.test(ua);
+function subscribeDebug(listener) {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
 }
-var VERIFY_POPUP_TIMEOUT_MS = 6e4;
-var POPUP_CLOSED_POLL_MS = 500;
-var POPUP_CLOSED_GRACE_MS = 1e3;
-function findDevicePasskeyViaPopup(options) {
-  return new Promise((resolve, reject) => {
-    const verificationToken = crypto.randomUUID();
-    const payload = {
-      ...options,
-      verificationToken
-    };
-    const encoded = btoa(JSON.stringify(payload));
-    const popupUrl = `${window.location.origin}/passkey-verify#${encoded}`;
-    const popup = window.open(popupUrl, "blink-passkey-verify");
-    if (!popup) {
-      reject(new Error("Pop-up blocked. Please allow pop-ups for this site and try again."));
-      return;
-    }
-    let settled = false;
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve(null);
-    }, VERIFY_POPUP_TIMEOUT_MS);
-    const closedPoll = setInterval(() => {
-      if (popup.closed && !settled) {
-        clearInterval(closedPoll);
-        setTimeout(() => {
-          if (!settled) {
-            settled = true;
-            cleanup();
-            checkServerForPasskeyByToken(
-              options.authToken,
-              options.apiBaseUrl,
-              verificationToken
-            ).then((result) => {
-              resolve(result?.credentialId ?? null);
-            }).catch(() => {
-              resolve(null);
-            });
-          }
-        }, POPUP_CLOSED_GRACE_MS);
+function getDebugEntries() {
+  return entries;
+}
+function clearDebugEntries() {
+  entries = [];
+  notify();
+}
+function useBlinkDebugLog() {
+  return useSyncExternalStore(subscribeDebug, getDebugEntries, getDebugEntries);
+}
+
+// src/fetchWithRetry.ts
+var DEFAULT_MAX_RETRIES = 3;
+var DEFAULT_BASE_DELAY_MS = 500;
+var DEFAULT_MAX_JITTER_MS = 200;
+function isNetworkTypeError(err) {
+  return err instanceof TypeError && /fetch|network|load failed/i.test(err.message);
+}
+async function fetchWithRetry(input, init, options) {
+  const maxRetries = DEFAULT_MAX_RETRIES;
+  const baseDelayMs = DEFAULT_BASE_DELAY_MS;
+  const maxJitterMs = DEFAULT_MAX_JITTER_MS;
+  const label = String(input).replace(/https?:\/\/[^/]+/, "");
+  let lastError;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      return await fetch(input, init);
+    } catch (err) {
+      lastError = err;
+      if (!isNetworkTypeError(err)) {
+        throw err;
+      }
+      if (attempt < maxRetries) {
+        const delay = baseDelayMs * Math.pow(2, attempt) + Math.random() * maxJitterMs;
+        appendDebug("warn", `fetchWithRetry: network error, retrying ${label}`, {
+          attempt: attempt + 1,
+          maxRetries,
+          delayMs: Math.round(delay),
+          error: err instanceof Error ? err.message : String(err)
+        });
+        await new Promise((resolve) => setTimeout(resolve, delay));
       }
-    }, POPUP_CLOSED_POLL_MS);
-    function cleanup() {
-      clearTimeout(timer);
-      clearInterval(closedPoll);
     }
+  }
+  throw lastError;
+}
+
+// src/apiError.ts
+var ApiError = class extends Error {
+  status;
+  code;
+  constructor(status, code, message) {
+    super(message);
+    this.name = "ApiError";
+    this.status = status;
+    this.code = code;
+  }
+};
+function isApiError(err) {
+  if (err instanceof ApiError) return true;
+  return typeof err === "object" && err !== null && "name" in err && err.name === "ApiError";
+}
+var SVM_SIGN_PAYLOAD_EXPIRED_CODE = "SVM_SIGN_PAYLOAD_EXPIRED";
+function isSvmSignExpiredError(err) {
+  return isApiError(err) && err.code === SVM_SIGN_PAYLOAD_EXPIRED_CODE;
+}
+
+// src/api.ts
+async function throwApiError(res) {
+  const body = await res.json().catch(() => null);
+  const detail = body?.error ?? body;
+  const msg = detail?.message ?? res.statusText;
+  const code = detail?.code ?? String(res.status);
+  throw new ApiError(res.status, code, `${res.status} \u2014 ${code}: ${msg}`);
+}
+async function fetchProviders(apiBaseUrl, token) {
+  const headers = {};
+  if (token) {
+    headers.Authorization = `Bearer ${token}`;
+  }
+  const res = await fetchWithRetry(`${apiBaseUrl}/v1/providers`, { headers });
+  if (!res.ok) await throwApiError(res);
+  const data = await res.json();
+  return data.items;
+}
+async function fetchChains(apiBaseUrl, token) {
+  const res = await fetchWithRetry(`${apiBaseUrl}/v1/chains`, {
+    headers: { Authorization: `Bearer ${token}` }
   });
+  if (!res.ok) await throwApiError(res);
+  const data = await res.json();
+  return data.items;
 }
-async function checkServerForPasskeyByToken(authToken, apiBaseUrl, verificationToken) {
-  if (!authToken || !apiBaseUrl) return null;
-  const res = await fetch(`${apiBaseUrl}/v1/users/config`, {
-    headers: { Authorization: `Bearer ${authToken}` }
+async function fetchAccounts(apiBaseUrl, token, credentialId) {
+  const params = new URLSearchParams({ credentialId });
+  const res = await fetchWithRetry(`${apiBaseUrl}/v1/accounts?${params.toString()}`, {
+    headers: { Authorization: `Bearer ${token}` }
   });
-  if (!res.ok) return null;
-  const body = await res.json();
-  const passkeys = body.config.passkeys ?? [];
-  const matched = passkeys.find((p) => p.lastVerificationToken === verificationToken);
-  return matched ? { credentialId: matched.credentialId, publicKey: matched.publicKey } : null;
+  if (!res.ok) await throwApiError(res);
+  const data = await res.json();
+  return data.items;
 }
-function shouldUsePasskeySignupPopup() {
-  return isSafari() && isInCrossOriginIframe();
+async function fetchAccount(apiBaseUrl, token, accountId, credentialId) {
+  const params = new URLSearchParams({ credentialId });
+  const res = await fetchWithRetry(`${apiBaseUrl}/v1/accounts/${accountId}?${params.toString()}`, {
+    headers: { Authorization: `Bearer ${token}` }
+  });
+  if (!res.ok) await throwApiError(res);
+  return await res.json();
 }
-var SIGNUP_POPUP_TIMEOUT_MS = 12e4;
-function signupWithPasskeyViaPopup() {
-  return new Promise((resolve, reject) => {
-    const popupUrl = `${window.location.origin}/passkey-signup`;
-    const popup = window.open(popupUrl, "blink-passkey-signup");
-    if (!popup) {
-      reject(new Error("Pop-up blocked. Please allow pop-ups for this site and try again."));
-      return;
-    }
-    let settled = false;
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve(null);
-    }, SIGNUP_POPUP_TIMEOUT_MS);
-    function onMessage(event) {
-      if (event.origin !== window.location.origin) return;
-      if (event.source !== popup) return;
-      const data = event.data;
-      if (!data || data.type !== "blink:passkey-signup-complete") return;
-      if (typeof data.accessToken !== "string" || typeof data.credentialId !== "string" || typeof data.publicKey !== "string") return;
-      settled = true;
-      cleanup();
-      resolve({
-        accessToken: data.accessToken,
-        credentialId: data.credentialId,
-        publicKey: data.publicKey
-      });
-    }
-    window.addEventListener("message", onMessage);
-    const closedPoll = setInterval(() => {
-      if (popup.closed && !settled) {
-        settled = true;
-        cleanup();
-        resolve(null);
-      }
-    }, POPUP_CLOSED_POLL_MS);
-    function cleanup() {
-      clearTimeout(timer);
-      clearInterval(closedPoll);
-      window.removeEventListener("message", onMessage);
-    }
-  });
-}
-var LOGIN_POPUP_TIMEOUT_MS = 12e4;
-function loginWithPasskeyViaPopup() {
-  return new Promise((resolve, reject) => {
-    const popupUrl = `${window.location.origin}/passkey-login`;
-    const popup = window.open(popupUrl, "blink-passkey-login");
-    if (!popup) {
-      reject(new Error("Pop-up blocked. Please allow pop-ups for this site and try again."));
-      return;
-    }
-    let settled = false;
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve(null);
-    }, LOGIN_POPUP_TIMEOUT_MS);
-    function onMessage(event) {
-      if (event.origin !== window.location.origin) return;
-      if (event.source !== popup) return;
-      const data = event.data;
-      if (!data || data.type !== "blink:passkey-login-complete") return;
-      if (typeof data.accessToken !== "string" || typeof data.credentialId !== "string" || typeof data.publicKey !== "string") return;
-      settled = true;
-      cleanup();
-      resolve({
-        accessToken: data.accessToken,
-        credentialId: data.credentialId,
-        publicKey: data.publicKey
-      });
-    }
-    window.addEventListener("message", onMessage);
-    const closedPoll = setInterval(() => {
-      if (popup.closed && !settled) {
-        settled = true;
-        cleanup();
-        resolve(null);
-      }
-    }, POPUP_CLOSED_POLL_MS);
-    function cleanup() {
-      clearTimeout(timer);
-      clearInterval(closedPoll);
-      window.removeEventListener("message", onMessage);
-    }
-  });
-}
-
-// src/credentialIdEncoding.ts
-function credentialIdBase64ToBytes(value) {
-  const normalized = value.replace(/-/g, "+").replace(/_/g, "/");
-  const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
-  const raw = atob(padded);
-  const bytes = new Uint8Array(raw.length);
-  for (let i = 0; i < raw.length; i++) {
-    bytes[i] = raw.charCodeAt(i);
-  }
-  return bytes;
-}
-
-// src/passkeyRpId.ts
-function normalizeConfiguredDomain(value) {
-  return value.replace(/^https?:\/\//, "").replace(/\/.*$/, "").replace(/^\./, "").trim();
-}
-function resolveRootDomainFromHostname(hostname) {
-  const trimmedHostname = hostname.trim().toLowerCase();
-  if (!trimmedHostname) {
-    return "localhost";
-  }
-  if (trimmedHostname === "localhost" || /^\d{1,3}(?:\.\d{1,3}){3}$/.test(trimmedHostname)) {
-    return trimmedHostname;
-  }
-  const parts = trimmedHostname.split(".").filter(Boolean);
-  if (parts.length < 2) {
-    return trimmedHostname;
-  }
-  return parts.slice(-2).join(".");
-}
-
-// src/hooks/passkeyPublic.ts
-function waitForDocumentFocus(timeoutMs = 5e3, intervalMs = 100) {
-  return new Promise((resolve) => {
-    if (typeof document === "undefined") {
-      resolve();
-      return;
-    }
-    if (document.hasFocus()) {
-      resolve();
-      return;
-    }
-    const deadline = Date.now() + timeoutMs;
-    const timer = setInterval(() => {
-      if (document.hasFocus()) {
-        clearInterval(timer);
-        resolve();
-      } else if (Date.now() >= deadline) {
-        clearInterval(timer);
-        resolve();
-      }
-    }, intervalMs);
-  });
-}
-function toBase64(buffer) {
-  return btoa(String.fromCharCode(...new Uint8Array(buffer)));
-}
-function readEnvValue(name) {
-  const meta = import.meta;
-  const metaValue = meta.env?.[name];
-  if (typeof metaValue === "string" && metaValue.trim().length > 0) {
-    return metaValue.trim();
-  }
-  const processValue = globalThis.process?.env?.[name];
-  if (typeof processValue === "string" && processValue.trim().length > 0) {
-    return processValue.trim();
-  }
-  return void 0;
-}
-function resolvePasskeyRpId() {
-  const configuredDomain = readEnvValue("VITE_DOMAIN") ?? readEnvValue("BLINK_DOMAIN");
-  if (configuredDomain) {
-    return normalizeConfiguredDomain(configuredDomain);
-  }
-  if (typeof window !== "undefined") {
-    return resolveRootDomainFromHostname(window.location.hostname);
-  }
-  return "localhost";
-}
-async function deviceHasPasskey(credentialId) {
-  const found = await findDevicePasskey([credentialId]);
-  return found != null;
-}
-async function findDevicePasskey(credentialIds) {
-  if (credentialIds.length === 0) return null;
-  try {
-    const challenge = new Uint8Array(32);
-    crypto.getRandomValues(challenge);
-    await waitForDocumentFocus();
-    const assertion = await navigator.credentials.get({
-      publicKey: {
-        challenge,
-        rpId: resolvePasskeyRpId(),
-        allowCredentials: credentialIds.map((id) => ({
-          type: "public-key",
-          id: credentialIdBase64ToBytes(id)
-        })),
-        userVerification: "discouraged",
-        timeout: 3e4
-      }
-    });
-    if (!assertion) return null;
-    return toBase64(assertion.rawId);
-  } catch {
-    return null;
-  }
-}
-
-// src/api.ts
-var api_exports = {};
-__export(api_exports, {
-  createAccount: () => createAccount,
-  createAccountAuthorizationSession: () => createAccountAuthorizationSession,
-  createManualTransfer: () => createManualTransfer,
-  createTransfer: () => createTransfer,
-  fetchAccount: () => fetchAccount,
-  fetchAccounts: () => fetchAccounts,
-  fetchAuthorizationSession: () => fetchAuthorizationSession,
-  fetchAuthorizationSessionByToken: () => fetchAuthorizationSessionByToken,
-  fetchChains: () => fetchChains,
-  fetchManualTransferSession: () => fetchManualTransferSession,
-  fetchManualTransferSources: () => fetchManualTransferSources,
-  fetchMerchantPublicKey: () => fetchMerchantPublicKey,
-  fetchProviders: () => fetchProviders,
-  fetchTransfer: () => fetchTransfer,
-  fetchUserConfig: () => fetchUserConfig,
-  postTransferQuote: () => postTransferQuote,
-  probeActionCompletion: () => probeActionCompletion,
-  refreshManualTransferQuote: () => refreshManualTransferQuote,
-  regenerateTransferSignPayload: () => regenerateTransferSignPayload,
-  registerPasskey: () => registerPasskey,
-  reportActionCompletion: () => reportActionCompletion,
-  reportPasskeyActivity: () => reportPasskeyActivity,
-  setAuthorizationSessionPaymentIntentAmount: () => setAuthorizationSessionPaymentIntentAmount,
-  setAuthorizationSessionProvider: () => setAuthorizationSessionProvider,
-  signTransfer: () => signTransfer,
-  updateManualTransferDepositTargetChain: () => updateManualTransferDepositTargetChain,
-  updateUserConfig: () => updateUserConfig,
-  updateUserConfigBySession: () => updateUserConfigBySession,
-  waitForActionTransactionReceipt: () => waitForActionTransactionReceipt
-});
-var DEBUG_BUFFER_CAPACITY = 200;
-var nextId = 1;
-var entries = [];
-var listeners = /* @__PURE__ */ new Set();
-function notify() {
-  for (const listener of listeners) {
-    try {
-      listener();
-    } catch (err) {
-      console.error("[blink-sdk][debug-log] listener threw:", err);
-    }
-  }
-}
-function appendDebug(level, message, data) {
-  const entry = {
-    id: nextId++,
-    ts: Date.now(),
-    level,
-    message,
-    data
-  };
-  const next = entries.length >= DEBUG_BUFFER_CAPACITY ? entries.slice(entries.length - DEBUG_BUFFER_CAPACITY + 1) : entries.slice();
-  next.push(entry);
-  entries = next;
-  const prefix = "[blink-sdk][debug]";
-  const sink = level === "error" ? console.error : level === "warn" ? console.warn : console.info;
-  if (data !== void 0) {
-    sink(`${prefix} ${message}`, data);
-  } else {
-    sink(`${prefix} ${message}`);
-  }
-  notify();
-}
-function subscribeDebug(listener) {
-  listeners.add(listener);
-  return () => {
-    listeners.delete(listener);
-  };
-}
-function getDebugEntries() {
-  return entries;
-}
-function clearDebugEntries() {
-  entries = [];
-  notify();
-}
-function useBlinkDebugLog() {
-  return useSyncExternalStore(subscribeDebug, getDebugEntries, getDebugEntries);
-}
-
-// src/fetchWithRetry.ts
-var DEFAULT_MAX_RETRIES = 3;
-var DEFAULT_BASE_DELAY_MS = 500;
-var DEFAULT_MAX_JITTER_MS = 200;
-function isNetworkTypeError(err) {
-  return err instanceof TypeError && /fetch|network|load failed/i.test(err.message);
-}
-async function fetchWithRetry(input, init, options) {
-  const maxRetries = DEFAULT_MAX_RETRIES;
-  const baseDelayMs = DEFAULT_BASE_DELAY_MS;
-  const maxJitterMs = DEFAULT_MAX_JITTER_MS;
-  const label = String(input).replace(/https?:\/\/[^/]+/, "");
-  let lastError;
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
-    try {
-      return await fetch(input, init);
-    } catch (err) {
-      lastError = err;
-      if (!isNetworkTypeError(err)) {
-        throw err;
-      }
-      if (attempt < maxRetries) {
-        const delay = baseDelayMs * Math.pow(2, attempt) + Math.random() * maxJitterMs;
-        appendDebug("warn", `fetchWithRetry: network error, retrying ${label}`, {
-          attempt: attempt + 1,
-          maxRetries,
-          delayMs: Math.round(delay),
-          error: err instanceof Error ? err.message : String(err)
-        });
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      }
-    }
-  }
-  throw lastError;
-}
-
-// src/apiError.ts
-var ApiError = class extends Error {
-  status;
-  code;
-  constructor(status, code, message) {
-    super(message);
-    this.name = "ApiError";
-    this.status = status;
-    this.code = code;
-  }
-};
-function isApiError(err) {
-  if (err instanceof ApiError) return true;
-  return typeof err === "object" && err !== null && "name" in err && err.name === "ApiError";
-}
-var SVM_SIGN_PAYLOAD_EXPIRED_CODE = "SVM_SIGN_PAYLOAD_EXPIRED";
-function isSvmSignExpiredError(err) {
-  return isApiError(err) && err.code === SVM_SIGN_PAYLOAD_EXPIRED_CODE;
-}
-
-// src/api.ts
-async function throwApiError(res) {
-  const body = await res.json().catch(() => null);
-  const detail = body?.error ?? body;
-  const msg = detail?.message ?? res.statusText;
-  const code = detail?.code ?? String(res.status);
-  throw new ApiError(res.status, code, `${res.status} \u2014 ${code}: ${msg}`);
-}
-async function fetchProviders(apiBaseUrl, token) {
-  const headers = {};
-  if (token) {
-    headers.Authorization = `Bearer ${token}`;
-  }
-  const res = await fetchWithRetry(`${apiBaseUrl}/v1/providers`, { headers });
-  if (!res.ok) await throwApiError(res);
-  const data = await res.json();
-  return data.items;
-}
-async function fetchChains(apiBaseUrl, token) {
-  const res = await fetchWithRetry(`${apiBaseUrl}/v1/chains`, {
-    headers: { Authorization: `Bearer ${token}` }
-  });
-  if (!res.ok) await throwApiError(res);
-  const data = await res.json();
-  return data.items;
-}
-async function fetchAccounts(apiBaseUrl, token, credentialId) {
-  const params = new URLSearchParams({ credentialId });
-  const res = await fetchWithRetry(`${apiBaseUrl}/v1/accounts?${params.toString()}`, {
-    headers: { Authorization: `Bearer ${token}` }
-  });
-  if (!res.ok) await throwApiError(res);
-  const data = await res.json();
-  return data.items;
-}
-async function fetchAccount(apiBaseUrl, token, accountId, credentialId) {
-  const params = new URLSearchParams({ credentialId });
-  const res = await fetchWithRetry(`${apiBaseUrl}/v1/accounts/${accountId}?${params.toString()}`, {
-    headers: { Authorization: `Bearer ${token}` }
-  });
+async function fetchAccountBalances(apiBaseUrl, token, accountId, credentialId) {
+  const params = new URLSearchParams({ credentialId });
+  const res = await fetchWithRetry(
+    `${apiBaseUrl}/v1/accounts/${accountId}/balances?${params.toString()}`,
+    {
+      headers: { Authorization: `Bearer ${token}` }
+    }
+  );
   if (!res.ok) await throwApiError(res);
   return await res.json();
 }
@@ -2714,44 +2469,323 @@ async function waitForActionTransactionReceipt(apiBaseUrl, actionId, txHash) {
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ txHash })
     }
-  );
-  if (!res.ok) await throwApiError(res);
-  return await res.json();
+  );
+  if (!res.ok) await throwApiError(res);
+  return await res.json();
+}
+async function probeActionCompletion(apiBaseUrl, actionId) {
+  const res = await fetchWithRetry(
+    `${apiBaseUrl}/v1/authorization-actions/${actionId}`,
+    {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ status: "COMPLETED", result: {} })
+    }
+  );
+  if (res.ok) {
+    const session = await res.json();
+    return { detected: true, session };
+  }
+  const body = await res.json().catch(() => null);
+  const detail = body?.error ?? body;
+  const code = detail?.code;
+  const message = detail?.message ?? res.statusText ?? `HTTP ${res.status}`;
+  if (res.status === 422 && code === "DEPOSIT_TX_NOT_FOUND") {
+    return { detected: false, reason: "not-found", status: res.status, code, message };
+  }
+  const approvalNotDetectedCodes = /* @__PURE__ */ new Set([
+    "APPROVE_NOT_DETECTED",
+    "APPROVE_SPL_NOT_DETECTED",
+    "SPL_DELEGATE_MISSING",
+    "SPL_DELEGATE_INSUFFICIENT",
+    "SPL_DELEGATE_WRONG_OWNER"
+  ]);
+  if (res.status === 422 && code && approvalNotDetectedCodes.has(code)) {
+    return { detected: false, reason: "not-found", status: res.status, code, message };
+  }
+  if (res.status === 422 && code === "INVALID_TRANSFER_STATE") {
+    return { detected: false, reason: "invalid-state", status: res.status, code, message };
+  }
+  return { detected: false, reason: "error", status: res.status, code, message };
+}
+
+// src/passkey-delegation.ts
+var PasskeyIframeBlockedError = class extends Error {
+  constructor(message = "Passkey creation is not supported in this browser context.") {
+    super(message);
+    this.name = "PasskeyIframeBlockedError";
+  }
+};
+function isInCrossOriginIframe() {
+  if (typeof window === "undefined") return false;
+  if (window.parent === window) return false;
+  try {
+    void window.parent.location.origin;
+    return false;
+  } catch {
+    return true;
+  }
+}
+function isSafari() {
+  if (typeof navigator === "undefined") return false;
+  const ua = navigator.userAgent;
+  return /Safari/i.test(ua) && !/Chrome|CriOS|Chromium|Edg|OPR|Firefox/i.test(ua);
+}
+var VERIFY_POPUP_TIMEOUT_MS = 6e4;
+var POPUP_CLOSED_POLL_MS = 500;
+var POPUP_CLOSED_GRACE_MS = 1e3;
+function findDevicePasskeyViaPopup(options) {
+  return new Promise((resolve, reject) => {
+    const verificationToken = crypto.randomUUID();
+    const payload = {
+      ...options,
+      verificationToken
+    };
+    const encoded = btoa(JSON.stringify(payload));
+    const popupUrl = `${window.location.origin}/passkey-verify#${encoded}`;
+    const popup = window.open(popupUrl, "blink-passkey-verify");
+    if (!popup) {
+      reject(new Error("Pop-up blocked. Please allow pop-ups for this site and try again."));
+      return;
+    }
+    let settled = false;
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve(null);
+    }, VERIFY_POPUP_TIMEOUT_MS);
+    const closedPoll = setInterval(() => {
+      if (popup.closed && !settled) {
+        clearInterval(closedPoll);
+        setTimeout(() => {
+          if (!settled) {
+            settled = true;
+            cleanup();
+            checkServerForPasskeyByToken(
+              options.authToken,
+              options.apiBaseUrl,
+              verificationToken
+            ).then((result) => {
+              resolve(result?.credentialId ?? null);
+            }).catch(() => {
+              resolve(null);
+            });
+          }
+        }, POPUP_CLOSED_GRACE_MS);
+      }
+    }, POPUP_CLOSED_POLL_MS);
+    function cleanup() {
+      clearTimeout(timer);
+      clearInterval(closedPoll);
+    }
+  });
+}
+async function checkServerForPasskeyByToken(authToken, apiBaseUrl, verificationToken) {
+  if (!authToken || !apiBaseUrl) return null;
+  const res = await fetch(`${apiBaseUrl}/v1/users/config`, {
+    headers: { Authorization: `Bearer ${authToken}` }
+  });
+  if (!res.ok) return null;
+  const body = await res.json();
+  const passkeys = body.config.passkeys ?? [];
+  const matched = passkeys.find((p) => p.lastVerificationToken === verificationToken);
+  return matched ? { credentialId: matched.credentialId, publicKey: matched.publicKey } : null;
+}
+function shouldUsePasskeySignupPopup() {
+  return isSafari() && isInCrossOriginIframe();
+}
+var SIGNUP_POPUP_TIMEOUT_MS = 12e4;
+function signupWithPasskeyViaPopup() {
+  return new Promise((resolve, reject) => {
+    const popupUrl = `${window.location.origin}/passkey-signup`;
+    const popup = window.open(popupUrl, "blink-passkey-signup");
+    if (!popup) {
+      reject(new Error("Pop-up blocked. Please allow pop-ups for this site and try again."));
+      return;
+    }
+    let settled = false;
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve(null);
+    }, SIGNUP_POPUP_TIMEOUT_MS);
+    function onMessage(event) {
+      if (event.origin !== window.location.origin) return;
+      if (event.source !== popup) return;
+      const data = event.data;
+      if (!data || data.type !== "blink:passkey-signup-complete") return;
+      if (typeof data.accessToken !== "string" || typeof data.credentialId !== "string" || typeof data.publicKey !== "string") return;
+      settled = true;
+      cleanup();
+      resolve({
+        accessToken: data.accessToken,
+        credentialId: data.credentialId,
+        publicKey: data.publicKey
+      });
+    }
+    window.addEventListener("message", onMessage);
+    const closedPoll = setInterval(() => {
+      if (popup.closed && !settled) {
+        settled = true;
+        cleanup();
+        resolve(null);
+      }
+    }, POPUP_CLOSED_POLL_MS);
+    function cleanup() {
+      clearTimeout(timer);
+      clearInterval(closedPoll);
+      window.removeEventListener("message", onMessage);
+    }
+  });
+}
+var LOGIN_POPUP_TIMEOUT_MS = 12e4;
+function loginWithPasskeyViaPopup() {
+  return new Promise((resolve, reject) => {
+    const popupUrl = `${window.location.origin}/passkey-login`;
+    const popup = window.open(popupUrl, "blink-passkey-login");
+    if (!popup) {
+      reject(new Error("Pop-up blocked. Please allow pop-ups for this site and try again."));
+      return;
+    }
+    let settled = false;
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve(null);
+    }, LOGIN_POPUP_TIMEOUT_MS);
+    function onMessage(event) {
+      if (event.origin !== window.location.origin) return;
+      if (event.source !== popup) return;
+      const data = event.data;
+      if (!data || data.type !== "blink:passkey-login-complete") return;
+      if (typeof data.accessToken !== "string" || typeof data.credentialId !== "string" || typeof data.publicKey !== "string") return;
+      settled = true;
+      cleanup();
+      resolve({
+        accessToken: data.accessToken,
+        credentialId: data.credentialId,
+        publicKey: data.publicKey
+      });
+    }
+    window.addEventListener("message", onMessage);
+    const closedPoll = setInterval(() => {
+      if (popup.closed && !settled) {
+        settled = true;
+        cleanup();
+        resolve(null);
+      }
+    }, POPUP_CLOSED_POLL_MS);
+    function cleanup() {
+      clearTimeout(timer);
+      clearInterval(closedPoll);
+      window.removeEventListener("message", onMessage);
+    }
+  });
+}
+
+// src/credentialIdEncoding.ts
+function credentialIdBase64ToBytes(value) {
+  const normalized = value.replace(/-/g, "+").replace(/_/g, "/");
+  const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
+  const raw = atob(padded);
+  const bytes = new Uint8Array(raw.length);
+  for (let i = 0; i < raw.length; i++) {
+    bytes[i] = raw.charCodeAt(i);
+  }
+  return bytes;
+}
+
+// src/passkeyRpId.ts
+function normalizeConfiguredDomain(value) {
+  return value.replace(/^https?:\/\//, "").replace(/\/.*$/, "").replace(/^\./, "").trim();
+}
+function resolveRootDomainFromHostname(hostname) {
+  const trimmedHostname = hostname.trim().toLowerCase();
+  if (!trimmedHostname) {
+    return "localhost";
+  }
+  if (trimmedHostname === "localhost" || /^\d{1,3}(?:\.\d{1,3}){3}$/.test(trimmedHostname)) {
+    return trimmedHostname;
+  }
+  const parts = trimmedHostname.split(".").filter(Boolean);
+  if (parts.length < 2) {
+    return trimmedHostname;
+  }
+  return parts.slice(-2).join(".");
+}
+
+// src/hooks/passkeyPublic.ts
+function waitForDocumentFocus(timeoutMs = 5e3, intervalMs = 100) {
+  return new Promise((resolve) => {
+    if (typeof document === "undefined") {
+      resolve();
+      return;
+    }
+    if (document.hasFocus()) {
+      resolve();
+      return;
+    }
+    const deadline = Date.now() + timeoutMs;
+    const timer = setInterval(() => {
+      if (document.hasFocus()) {
+        clearInterval(timer);
+        resolve();
+      } else if (Date.now() >= deadline) {
+        clearInterval(timer);
+        resolve();
+      }
+    }, intervalMs);
+  });
 }
-async function probeActionCompletion(apiBaseUrl, actionId) {
-  const res = await fetchWithRetry(
-    `${apiBaseUrl}/v1/authorization-actions/${actionId}`,
-    {
-      method: "PATCH",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ status: "COMPLETED", result: {} })
-    }
-  );
-  if (res.ok) {
-    const session = await res.json();
-    return { detected: true, session };
+function toBase64(buffer) {
+  return btoa(String.fromCharCode(...new Uint8Array(buffer)));
+}
+function readEnvValue(name) {
+  const meta = import.meta;
+  const metaValue = meta.env?.[name];
+  if (typeof metaValue === "string" && metaValue.trim().length > 0) {
+    return metaValue.trim();
   }
-  const body = await res.json().catch(() => null);
-  const detail = body?.error ?? body;
-  const code = detail?.code;
-  const message = detail?.message ?? res.statusText ?? `HTTP ${res.status}`;
-  if (res.status === 422 && code === "DEPOSIT_TX_NOT_FOUND") {
-    return { detected: false, reason: "not-found", status: res.status, code, message };
+  const processValue = globalThis.process?.env?.[name];
+  if (typeof processValue === "string" && processValue.trim().length > 0) {
+    return processValue.trim();
   }
-  const approvalNotDetectedCodes = /* @__PURE__ */ new Set([
-    "APPROVE_NOT_DETECTED",
-    "APPROVE_SPL_NOT_DETECTED",
-    "SPL_DELEGATE_MISSING",
-    "SPL_DELEGATE_INSUFFICIENT",
-    "SPL_DELEGATE_WRONG_OWNER"
-  ]);
-  if (res.status === 422 && code && approvalNotDetectedCodes.has(code)) {
-    return { detected: false, reason: "not-found", status: res.status, code, message };
+  return void 0;
+}
+function resolvePasskeyRpId() {
+  const configuredDomain = readEnvValue("VITE_DOMAIN") ?? readEnvValue("BLINK_DOMAIN");
+  if (configuredDomain) {
+    return normalizeConfiguredDomain(configuredDomain);
   }
-  if (res.status === 422 && code === "INVALID_TRANSFER_STATE") {
-    return { detected: false, reason: "invalid-state", status: res.status, code, message };
+  if (typeof window !== "undefined") {
+    return resolveRootDomainFromHostname(window.location.hostname);
+  }
+  return "localhost";
+}
+async function deviceHasPasskey(credentialId) {
+  const found = await findDevicePasskey([credentialId]);
+  return found != null;
+}
+async function findDevicePasskey(credentialIds) {
+  if (credentialIds.length === 0) return null;
+  try {
+    const challenge = new Uint8Array(32);
+    crypto.getRandomValues(challenge);
+    await waitForDocumentFocus();
+    const assertion = await navigator.credentials.get({
+      publicKey: {
+        challenge,
+        rpId: resolvePasskeyRpId(),
+        allowCredentials: credentialIds.map((id) => ({
+          type: "public-key",
+          id: credentialIdBase64ToBytes(id)
+        })),
+        userVerification: "discouraged",
+        timeout: 3e4
+      }
+    });
+    if (!assertion) return null;
+    return toBase64(assertion.rawId);
+  } catch {
+    return null;
   }
-  return { detected: false, reason: "error", status: res.status, code, message };
 }
 
 // src/transferPolling.ts
@@ -4125,14 +4159,14 @@ function isBatchableAction(action) {
   return BATCHABLE_ACTION_TYPES.has(action.type);
 }
 function getSolanaWalletSelection(action) {
-  const providerName = action.metadata?.providerName;
-  if (typeof providerName !== "string" || providerName.trim() === "") {
+  const providerName2 = action.metadata?.providerName;
+  if (typeof providerName2 !== "string" || providerName2.trim() === "") {
     throw new Error(`${action.type} metadata is missing providerName.`);
   }
   const providerId = action.metadata?.providerId;
   return {
     ...typeof providerId === "string" && providerId.trim() !== "" ? { providerId } : {},
-    providerName
+    providerName: providerName2
   };
 }
 function isPhantomEvmProviderAvailable() {
@@ -5782,6 +5816,43 @@ function useAuthorizationExecutor(options) {
     }),
     []
   );
+  const [awaitingApproval, setAwaitingApproval] = useState(false);
+  const [approvalDestinationAddress, setApprovalDestinationAddress] = useState(null);
+  const approvalResolverRef = useRef(null);
+  const approvalRejectRef = useRef(null);
+  const approvalInitiatedRef = useRef(false);
+  const waitForApproval = useCallback(
+    (action, destinationAddress) => {
+      if (approvalInitiatedRef.current) return Promise.resolve();
+      return new Promise((resolve, reject) => {
+        approvalResolverRef.current = resolve;
+        approvalRejectRef.current = reject;
+        setCurrentAction(action);
+        setApprovalDestinationAddress(destinationAddress);
+        setAwaitingApproval(true);
+      });
+    },
+    []
+  );
+  const approveAuthorization = useCallback(() => {
+    approvalInitiatedRef.current = true;
+    setAwaitingApproval(false);
+    if (approvalResolverRef.current) {
+      approvalResolverRef.current();
+      approvalResolverRef.current = null;
+      approvalRejectRef.current = null;
+    }
+  }, []);
+  const resetApprovalGate = useCallback(() => {
+    approvalInitiatedRef.current = false;
+    setAwaitingApproval(false);
+    setApprovalDestinationAddress(null);
+    if (approvalRejectRef.current) {
+      approvalRejectRef.current(new AuthorizationSessionCancelledError());
+      approvalRejectRef.current = null;
+      approvalResolverRef.current = null;
+    }
+  }, []);
   const cancelPendingExecution = useCallback(() => {
     if (selectSourceRejectRef.current) {
       selectSourceRejectRef.current(new AuthorizationSessionCancelledError());
@@ -5789,6 +5860,12 @@ function useAuthorizationExecutor(options) {
       selectSourceResolverRef.current = null;
       setPendingSelectSource(null);
     }
+    if (approvalRejectRef.current) {
+      approvalRejectRef.current(new AuthorizationSessionCancelledError());
+      approvalRejectRef.current = null;
+      approvalResolverRef.current = null;
+    }
+    setAwaitingApproval(false);
     setError(null);
     setCurrentAction(null);
     setApproveSplConfirming(null);
@@ -6191,6 +6268,11 @@ function useAuthorizationExecutor(options) {
     currentAction,
     approveSplConfirming,
     pendingSelectSource,
+    awaitingApproval,
+    approvalDestinationAddress,
+    waitForApproval,
+    approveAuthorization,
+    resetApprovalGate,
     resolveSelectSource,
     cancelPendingExecution,
     resetWalletConnect,
@@ -6485,6 +6567,7 @@ function useAuthorizationOrchestrator(deps) {
   const [pendingSelectSourceAction, setPendingSelectSourceAction] = useState(null);
   const [orchestratorCompleted, setOrchestratorCompleted] = useState(false);
   const [sourceSelectionResolved, setSourceSelectionResolved] = useState(false);
+  const [approvalSmartAccountAddress, setApprovalSmartAccountAddress] = useState(null);
   const selectSourceResolverRef = useRef(null);
   const selectSourceRejectRef = useRef(null);
   const submittedApprovePermit2ActionIdsRef = useRef(/* @__PURE__ */ new Set());
@@ -6510,6 +6593,7 @@ function useAuthorizationOrchestrator(deps) {
     const cancellation = new AuthorizationSessionCancelledError();
     setOrchestratorCompleted(false);
     setSourceSelectionResolved(false);
+    setApprovalSmartAccountAddress(null);
     if (selectSourceRejectRef.current) {
       selectSourceRejectRef.current(cancellation);
       selectSourceRejectRef.current = null;
@@ -6532,6 +6616,10 @@ function useAuthorizationOrchestrator(deps) {
       lastRunRef.current = { sessionId, options };
       setOrchestratorCompleted(false);
       setSourceSelectionResolved(false);
+      setApprovalSmartAccountAddress(null);
+      if (!options?.keepApprovalGate) {
+        authExecutor.resetApprovalGate();
+      }
       if (!authExecutor.beginExecution()) {
         appendDebug("warn", "orchestrator:run aborted \u2014 already executing");
         return { status: "cancelled" };
@@ -6560,6 +6648,8 @@ function useAuthorizationOrchestrator(deps) {
           let action = mergedPending[0];
           if (completedIds.has(action.id)) break;
           const ownerSessionId = actionSessionMap.get(action.id) ?? sessionId;
+          const ownerSessionSca = sessions.find((s) => s.id === ownerSessionId)?.session.smartAccountAddress;
+          if (ownerSessionSca) setApprovalSmartAccountAddress(ownerSessionSca);
           console.info("[blink-sdk][orchestrator] Next pending action.", {
             actionId: action.id,
             actionType: action.type,
@@ -6584,6 +6674,7 @@ function useAuthorizationOrchestrator(deps) {
               const autoResult = createSelectSourceResult(action, options.autoResolveSource);
               completedIds.add(action.id);
               authExecutor.addResult(autoResult);
+              setSourceSelectionResolved(true);
               const reportedSession3 = await reportActionCompletionWithLogging(
                 apiBaseUrl,
                 action,
@@ -6677,6 +6768,13 @@ function useAuthorizationOrchestrator(deps) {
               throw new Error(SIGN_PERMIT2_CONFIRMING_MESSAGE);
             }
           }
+          if (isApprovalGatedAction(action)) {
+            const sessionSca = sessions.find((s) => s.id === ownerSessionId)?.session.smartAccountAddress;
+            await authExecutor.waitForApproval(
+              action,
+              sessionSca ?? readActionMetadataString(action.metadata, "smartAccountAddress") ?? readActionMetadataString(action.metadata, "ownerPubkey")
+            );
+          }
           appendDebug("info", `orchestrator:executeAction start ${action.type}`, {
             actionId: action.id,
             ownerSessionId
@@ -6873,7 +6971,8 @@ function useAuthorizationOrchestrator(deps) {
     authExecutor.setError(null);
     return run(lastRun.sessionId, {
       ...lastRun.options,
-      probeBeforePrompt: true
+      probeBeforePrompt: true,
+      keepApprovalGate: true
     });
   }, [authExecutor, run, cancelPendingFlow]);
   return {
@@ -6883,9 +6982,17 @@ function useAuthorizationOrchestrator(deps) {
     resolveSelectSource,
     sourceSelectionResolved,
     orchestratorCompleted,
+    approvalSmartAccountAddress,
     cancelPendingFlow
   };
 }
+function readActionMetadataString(metadata, key) {
+  const value = metadata?.[key];
+  return typeof value === "string" && value.trim() !== "" ? value : null;
+}
+function isApprovalGatedAction(action) {
+  return action.type === "APPROVE_PERMIT2" || action.type === "SIGN_PERMIT2" || action.type === "APPROVE_SPL";
+}
 function createSelectSourceResult(action, selection) {
   return {
     actionId: action.id,
@@ -7856,6 +7963,26 @@ function deriveSourceTypeAndId(state) {
   }
   return { sourceType: "accountId", sourceId: "" };
 }
+function hasAnyBalances(accounts) {
+  return accounts.some(
+    (account) => account.wallets.some(
+      (wallet) => wallet.balance !== void 0 || wallet.sources !== void 0
+    )
+  );
+}
+function carryOverBalances(prev, next) {
+  const prevWallets = new Map(
+    prev.flatMap((account) => account.wallets.map((wallet) => [wallet.id, wallet]))
+  );
+  return next.map((account) => ({
+    ...account,
+    wallets: account.wallets.map((wallet) => {
+      if (wallet.balance !== void 0 || wallet.sources !== void 0) return wallet;
+      const prior = prevWallets.get(wallet.id);
+      return prior && (prior.balance !== void 0 || prior.sources !== void 0) ? { ...wallet, balance: prior.balance, sources: prior.sources } : wallet;
+    })
+  }));
+}
 function clearStaleSelection(state) {
   if (state.selectedAccountId == null) return state;
   if (state.desktopWait != null || state.standardDesktopInlineOpenWallet) return state;
@@ -7877,6 +8004,7 @@ function createInitialState(config) {
     accounts: [],
     chains: [],
     loadingData: false,
+    balancesLoading: false,
     depositSelectionRefreshing: false,
     selectedProviderId: null,
     selectedAccountId: null,
@@ -7906,6 +8034,7 @@ function createInitialState(config) {
     privyAuthenticated: false,
     lastResumedAt: 0,
     setupDepositToken: null,
+    setupSpendingLimit: null,
     guestWalletPrepared: null,
     guestWalletDeeplinksPreparing: false,
     amountTooLow: null,
@@ -7925,6 +8054,7 @@ function clearAuthenticatedSessionState(state) {
     accounts: [],
     chains: [],
     loadingData: false,
+    balancesLoading: false,
     depositSelectionRefreshing: false,
     selectedProviderId: null,
     selectedAccountId: null,
@@ -7950,6 +8080,7 @@ function clearAuthenticatedSessionState(state) {
     mobileTokenAuthorizationPending: false,
     linkSettling: false,
     setupDepositToken: null,
+    setupSpendingLimit: null,
     guestWalletPrepared: null,
     guestWalletDeeplinksPreparing: false,
     amountTooLow: null,
@@ -8018,6 +8149,8 @@ function applyAction(state, action) {
         providers: action.providers,
         accounts: action.accounts,
         chains: action.chains,
+        // Accounts arrive balance-free; balances follow via BALANCES_LOADED.
+        balancesLoading: true,
         depositSelectionRefreshing: false,
         initialDataLoaded: true
       };
@@ -8041,10 +8174,12 @@ function applyAction(state, action) {
         depositSelectionRefreshing: false
       };
     case "ACCOUNTS_RELOADED": {
+      const hadBalances = hasAnyBalances(state.accounts);
       const next = {
         ...state,
-        accounts: action.accounts,
+        accounts: carryOverBalances(state.accounts, action.accounts),
         providers: action.providers,
+        balancesLoading: !hadBalances,
         initialDataLoaded: true
       };
       if (action.defaults) {
@@ -8056,6 +8191,24 @@ function applyAction(state, action) {
       }
       return clearStaleSelection(next);
     }
+    case "BALANCES_LOADED": {
+      const { balancesByAccountId } = action;
+      const accounts = state.accounts.map((account) => {
+        const accountBalances = balancesByAccountId[account.id];
+        if (!accountBalances) return account;
+        const balancesByWalletId = new Map(
+          accountBalances.wallets.map((w) => [w.id, w])
+        );
+        return {
+          ...account,
+          wallets: account.wallets.map((wallet) => {
+            const merged = balancesByWalletId.get(wallet.id);
+            return merged ? { ...wallet, balance: merged.balance, sources: merged.sources } : wallet;
+          })
+        };
+      });
+      return { ...state, accounts, balancesLoading: false };
+    }
     case "SET_DEPOSIT_SELECTION_REFRESHING":
       return { ...state, depositSelectionRefreshing: action.value };
     case "SAVE_SELECTION":
@@ -8127,6 +8280,7 @@ function applyAction(state, action) {
         mobileFlow: false,
         mobileTokenAuthorizationPending: false,
         setupDepositToken: null,
+        setupSpendingLimit: null,
         setupFlowScreen: null
       };
     case "PAY_ENDED":
@@ -8372,6 +8526,7 @@ function applyAction(state, action) {
         linkSettling: false,
         savedSelection: null,
         setupDepositToken: null,
+        setupSpendingLimit: null,
         setupFlowScreen: null,
         guestWalletPrepared: null,
         guestWalletDeeplinksPreparing: false,
@@ -8437,12 +8592,217 @@ function applyAction(state, action) {
           ...action.chainId != null ? { chainId: action.chainId } : {}
         }
       };
+    case "SET_SETUP_SPENDING_LIMIT":
+      return { ...state, setupSpendingLimit: action.limit };
     case "CLEAR_SETUP_DEPOSIT_TOKEN":
-      return { ...state, setupDepositToken: null };
+      return { ...state, setupDepositToken: null, setupSpendingLimit: null };
     default:
       return state;
   }
 }
+var BLOCKED_SUBSTRINGS = [
+  "bearer",
+  "signature",
+  "signedpayload",
+  "userop",
+  "jwt",
+  "secret",
+  "password",
+  "privatekey",
+  "mnemonic",
+  "seedphrase"
+];
+function isBlockedKey(key) {
+  const lower = key.toLowerCase();
+  if (lower === "token" || lower.endsWith("token")) return true;
+  return BLOCKED_SUBSTRINGS.some((blocked) => lower.includes(blocked));
+}
+function isReady() {
+  return typeof posthog !== "undefined" && posthog.__loaded === true;
+}
+function sanitizeProps(props) {
+  if (!props) return props;
+  const clean = {};
+  for (const [key, value] of Object.entries(props)) {
+    if (isBlockedKey(key)) continue;
+    if (value === void 0) continue;
+    clean[key] = value;
+  }
+  return clean;
+}
+function registerSuperProps(props) {
+  if (!isReady()) return;
+  try {
+    posthog.register(sanitizeProps(props) ?? {});
+  } catch {
+  }
+}
+function track(event, props) {
+  if (!isReady()) return;
+  try {
+    posthog.capture(event, sanitizeProps(props));
+  } catch {
+  }
+}
+function identifyUser(privyUserId, props) {
+  if (!isReady() || !privyUserId) return;
+  try {
+    posthog.identify(privyUserId, sanitizeProps(props));
+  } catch {
+  }
+}
+function resolveAnalyticsEnvironment(opts) {
+  const explicit = opts.explicit?.trim();
+  if (explicit) return explicit;
+  const raw = opts.apiBaseUrl ?? "";
+  let host = raw;
+  try {
+    host = new URL(raw).hostname;
+  } catch {
+  }
+  const h = host.toLowerCase();
+  if (h === "" || h.includes("localhost") || h.startsWith("127.")) return "development";
+  if (h.includes("smokebox")) return "smokebox";
+  if (h.includes("sandbox")) return "sandbox";
+  if (h.includes("staging")) return "staging";
+  return "production";
+}
+function resetUser() {
+  if (!isReady()) return;
+  try {
+    posthog.reset();
+  } catch {
+  }
+}
+
+// src/analyticsEvents.ts
+function providerName(state, providerId) {
+  return state.providers.find((p) => p.id === providerId)?.name;
+}
+function amountUsd(transfer) {
+  return transfer.amount?.currency === "USD" ? transfer.amount.amount : transfer.amount?.amount;
+}
+function sourceChain(transfer) {
+  return transfer.sources?.[0]?.provider?.chainFamily;
+}
+function trackAction(action, state, ctx) {
+  const device = ctx.device;
+  switch (action.type) {
+    case "PASSKEY_ACTIVATED":
+      track("auth_succeeded", { method: "passkey", device });
+      break;
+    case "SELECT_PROVIDER":
+      track("wallet_provider_selected", {
+        device,
+        providerId: action.providerId,
+        providerName: providerName(state, action.providerId),
+        transport: device === "desktop" ? "inline" : "deeplink"
+      });
+      break;
+    case "MOBILE_DEEPLINK_READY":
+      track("wallet_deeplink_opened", { device });
+      break;
+    case "SET_SETUP_DEPOSIT_TOKEN":
+      track("token_selected", {
+        device,
+        tokenSymbol: action.symbol,
+        chainName: action.chainName
+      });
+      break;
+    case "FINALIZE_AMOUNT": {
+      const parsed = Number(state.amount);
+      track("amount_entered", {
+        device,
+        amountUsd: Number.isFinite(parsed) ? parsed : void 0
+      });
+      break;
+    }
+    case "PAY_STARTED":
+      track("deposit_clicked", { device });
+      break;
+    case "TRANSFER_CREATED":
+      track("transfer_created", {
+        device,
+        chainFamily: sourceChain(action.transfer)
+      });
+      break;
+    case "TRANSFER_SIGNED":
+      track("transfer_signed", { device });
+      break;
+    case "TRANSFER_COMPLETED":
+      track("transfer_completed", {
+        device,
+        amountUsd: amountUsd(action.transfer),
+        chainFamily: sourceChain(action.transfer)
+      });
+      break;
+    case "CONFIRM_SIGN_SUCCESS":
+      track("confirm_sign_success", { device });
+      break;
+    case "MOBILE_SETUP_COMPLETE":
+      track("wallet_setup_complete", { device });
+      break;
+    case "TRANSFER_FAILED":
+      track("transfer_error", {
+        device,
+        type: "transfer_failed",
+        stage: "processing",
+        message: action.error
+      });
+      break;
+    case "PROCESSING_TIMEOUT":
+      track("transfer_error", {
+        device,
+        type: "processing_timeout",
+        stage: "processing",
+        message: action.error
+      });
+      break;
+    case "SIGN_PAYLOAD_EXPIRED":
+      track("transfer_error", {
+        device,
+        type: "sign_payload_expired",
+        stage: "signing",
+        message: action.error
+      });
+      break;
+    case "PAY_ERROR":
+      track("transfer_error", {
+        device,
+        type: "pay_error",
+        stage: "creation",
+        message: action.error
+      });
+      break;
+  }
+}
+function useAnalyticsScreenView(phase, device) {
+  const lastScreenRef = useRef(null);
+  const screen = screenForPhase(phase);
+  useEffect(() => {
+    if (lastScreenRef.current === screen) return;
+    lastScreenRef.current = screen;
+    track("screen_viewed", { screen, phase: phase.step, device });
+  }, [screen, phase.step, device]);
+}
+function usePostHogIdentify() {
+  const { ready, authenticated, user } = usePrivy();
+  const identifiedIdRef = useRef(null);
+  useEffect(() => {
+    if (!ready) return;
+    if (authenticated && user?.id) {
+      if (identifiedIdRef.current !== user.id) {
+        identifyUser(user.id);
+        identifiedIdRef.current = user.id;
+      }
+      return;
+    }
+    if (identifiedIdRef.current !== null) {
+      resetUser();
+      identifiedIdRef.current = null;
+    }
+  }, [ready, authenticated, user?.id]);
+}
 
 // src/setupDepositConfirmation.ts
 function deriveEffectiveSetupSource(setupDepositToken, setupSelectedSourceOption) {
@@ -9021,9 +9381,12 @@ function PrimaryButton({
     }
   );
 }
+var BUTTON_MIN_HEIGHT = 60;
 var progressButtonStyle = (tokens, paused) => ({
   position: "relative",
   width: "100%",
+  minHeight: BUTTON_MIN_HEIGHT,
+  boxSizing: "border-box",
   padding: "18px 24px",
   background: `linear-gradient(180deg, ${tokens.accent}88, ${tokens.accentHover}88)`,
   color: tokens.accentText,
@@ -9060,6 +9423,8 @@ var buttonStyle2 = (tokens, state) => {
   const gradient = `linear-gradient(180deg, ${tokens.accent}, ${tokens.accentHover})`;
   return {
     width: "100%",
+    minHeight: BUTTON_MIN_HEIGHT,
+    boxSizing: "border-box",
     padding: "18px 24px",
     // Layer a faint white film over the gradient on hover rather than using
     // `filter: brightness()` — the accent gradient is near-black in the new
@@ -9307,6 +9672,7 @@ var USDH_LOGO = svgToDataUri(USDH_SVG);
 var ETH_LOGO = "https://assets.relay.link/icons/currencies/eth.png";
 var SOL_LOGO = "https://assets.relay.link/icons/currencies/sol.png";
 var MON_LOGO = "https://assets.relay.link/icons/currencies/mon.png";
+var BNB_LOGO = "https://assets.relay.link/icons/currencies/bnb.png";
 var KNOWN_LOGOS = {
   metamask: METAMASK_LOGO,
   base: BASE_LOGO,
@@ -9325,7 +9691,8 @@ var TOKEN_LOGOS = {
   USDH: USDH_LOGO,
   ETH: ETH_LOGO,
   SOL: SOL_LOGO,
-  MON: MON_LOGO
+  MON: MON_LOGO,
+  BNB: BNB_LOGO
 };
 var CHAIN_LOGOS = {
   base: BASE_CHAIN_LOGO,
@@ -9984,6 +10351,8 @@ function SourcePill({
   logo,
   name,
   balance,
+  nameSlot,
+  balanceSlot,
   expanded,
   showChevron = true,
   icon
@@ -9991,8 +10360,8 @@ function SourcePill({
   const { tokens } = useBlinkConfig();
   return /* @__PURE__ */ jsxs("span", { style: pillStyle2(tokens.bgCardTranslucent), children: [
     icon ?? (logo ? /* @__PURE__ */ jsx("img", { src: logo, alt: "", "aria-hidden": "true", style: logoStyle }) : name ? /* @__PURE__ */ jsx("span", { style: logoFallbackStyle(tokens.bgInput, tokens.textMuted), children: name.charAt(0).toUpperCase() }) : null),
-    name && /* @__PURE__ */ jsx("span", { style: labelStyle2(tokens.text), children: name }),
-    balance && /* @__PURE__ */ jsx("span", { style: balanceStyle(tokens.text), children: balance }),
+    nameSlot ?? (name && /* @__PURE__ */ jsx("span", { style: labelStyle2(tokens.text), children: name })),
+    balanceSlot ?? (balance && /* @__PURE__ */ jsx("span", { style: balanceStyle(tokens.text), children: balance })),
     showChevron && /* @__PURE__ */ jsx("svg", { width: "17", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: expanded ? /* @__PURE__ */ jsx(
       "path",
       {
@@ -10055,6 +10424,37 @@ var balanceStyle = (color) => ({
   color,
   whiteSpace: "nowrap"
 });
+var SHIMMER_KEYFRAMES = `
+@keyframes blink-shimmer-sweep {
+  0% { background-position: 200% 0; }
+  100% { background-position: -200% 0; }
+}`;
+function Shimmer({
+  width,
+  height,
+  borderRadius = 999,
+  baseColor,
+  highlightColor,
+  style
+}) {
+  return /* @__PURE__ */ jsxs("span", { "aria-hidden": "true", style: { display: "inline-block", ...style }, children: [
+    /* @__PURE__ */ jsx("style", { children: SHIMMER_KEYFRAMES }),
+    /* @__PURE__ */ jsx(
+      "span",
+      {
+        style: {
+          display: "block",
+          width,
+          height,
+          borderRadius,
+          background: `linear-gradient(90deg, ${baseColor} 0%, ${highlightColor} 50%, ${baseColor} 100%)`,
+          backgroundSize: "200% 100%",
+          animation: "blink-shimmer-sweep 1.4s ease-in-out infinite"
+        }
+      }
+    )
+  ] });
+}
 function formatUsdTwoDecimals(value) {
   const n = Number(value);
   return (Number.isFinite(n) ? n : 0).toLocaleString("en-US", {
@@ -10755,6 +11155,14 @@ function LockIcon({ size = 24 }) {
     /* @__PURE__ */ jsx("path", { d: "M8 11V8a4 4 0 1 1 8 0v3", stroke: "currentColor", strokeWidth: "1.7", strokeLinecap: "round" })
   ] });
 }
+function KeyIcon({ size = 24 }) {
+  return /* @__PURE__ */ jsxs("svg", { width: size, height: size, viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx("circle", { cx: "7", cy: "12", r: "3.6", stroke: "currentColor", strokeWidth: "2" }),
+    /* @__PURE__ */ jsx("path", { d: "M10.6 12H20", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" }),
+    /* @__PURE__ */ jsx("path", { d: "M17 12v3.2", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" }),
+    /* @__PURE__ */ jsx("path", { d: "M20 12v3.2", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" })
+  ] });
+}
 function FaceIdIcon({ size = 24 }) {
   return /* @__PURE__ */ jsxs("svg", { width: size, height: size, viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
     /* @__PURE__ */ jsx("path", { d: "M4 9V6a2 2 0 0 1 2-2h3", stroke: "currentColor", strokeWidth: "1.7", strokeLinecap: "round" }),
@@ -10768,6 +11176,21 @@ function FaceIdIcon({ size = 24 }) {
     /* @__PURE__ */ jsx("path", { d: "M9.5 16c.7.6 1.6 1 2.5 1s1.8-.4 2.5-1", stroke: "currentColor", strokeWidth: "1.7", strokeLinecap: "round" })
   ] });
 }
+function PencilIcon({ size = 18 } = {}) {
+  return /* @__PURE__ */ jsxs("svg", { width: size, height: size, viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "M4 20h4l10.5-10.5a2 2 0 0 0 0-2.83l-1.17-1.17a2 2 0 0 0-2.83 0L4 16v4Z",
+        stroke: "currentColor",
+        strokeWidth: "1.7",
+        strokeLinecap: "round",
+        strokeLinejoin: "round"
+      }
+    ),
+    /* @__PURE__ */ jsx("path", { d: "M13.5 6.5l4 4", stroke: "currentColor", strokeWidth: "1.7", strokeLinecap: "round", strokeLinejoin: "round" })
+  ] });
+}
 function WalletIcon() {
   return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
     /* @__PURE__ */ jsx(
@@ -11139,7 +11562,7 @@ function CopyAddressButton({
 }) {
   const { tokens } = useBlinkConfig();
   const [hovered, setHovered] = useState(false);
-  const short = address.length > 18 ? `${address.slice(0, 8)}...${address.slice(-6)}` : address;
+  const short = truncateMiddle(address);
   return /* @__PURE__ */ jsxs(
     "button",
     {
@@ -13099,7 +13522,7 @@ var lockBannerTextStyle = (color) => ({
 function ManualTransferPasskeyScreen({
   onCreatePasskey,
   onNoThanks,
-  amountUsd,
+  amountUsd: amountUsd2,
   loading = false,
   error,
   onBack,
@@ -13297,7 +13720,6 @@ var errorBannerStyle6 = (tokens) => ({
   textAlign: "left",
   boxSizing: "border-box"
 });
-var SHIMMER_ROWS = 3;
 function LinkTokensScreen({
   entries: entries2,
   selectedIndex,
@@ -13310,44 +13732,75 @@ function LinkTokensScreen({
   approving = false
 }) {
   const { tokens: t } = useBlinkConfig();
+  const [view, setView] = useState("summary");
+  const [pendingIndex, setPendingIndex] = useState(selectedIndex);
+  const [limit, setLimit] = useState("unlimited");
+  const [editing, setEditing] = useState(false);
   const showShimmer = loading && entries2.length === 0;
   const showEmpty = !loading && entries2.length === 0;
   const selected = entries2[selectedIndex];
+  const limitUsd = limit === "unlimited" ? null : parseAmount(limit);
+  const isUnlimited = limitUsd == null;
+  const limitLabel = isUnlimited ? "Unlimited" : `$${limit}`;
+  const currentSelection = () => limitUsd == null ? { unlimited: true } : { usd: limitUsd };
   const approveDisabled = loading || approving || entries2.length === 0 || selectedIndex < 0 || selectedIndex >= entries2.length || !!selected?.notSupported;
-  const ctaLabel = selected ? `Authorize ${selected.tokenSymbol} on ${shortChainName(selected.chainName)}` : "Approve";
-  return /* @__PURE__ */ jsxs(
-    ScreenLayout,
-    {
-      scrollableBody: false,
-      footer: /* @__PURE__ */ jsxs("div", { style: footerStackStyle4, children: [
-        /* @__PURE__ */ jsxs("div", { style: lockBannerStyle2, children: [
-          /* @__PURE__ */ jsx("span", { style: lockIconWrapStyle2(t.text), children: /* @__PURE__ */ jsx(LockIcon3, {}) }),
-          /* @__PURE__ */ jsx("p", { style: lockBannerTextStyle2(t.text), children: "Your passkey is required each time you deposit. Funds cannot move without your approval." })
-        ] }),
-        /* @__PURE__ */ jsx(PrimaryButton, { onClick: onApprove, disabled: approveDisabled, loading: approving, children: ctaLabel })
-      ] }),
-      children: [
-        /* @__PURE__ */ jsx("style", { children: `
-        @keyframes blink-link-tokens-shimmer {
-          0% { background-position: 200% 0; }
-          100% { background-position: -200% 0; }
-        }
-        .blink-link-tokens-list {
-          scrollbar-width: thin;
-          scrollbar-color: ${t.textTertiary} transparent;
-        }
-        .blink-link-tokens-list::-webkit-scrollbar {
-          width: 4px;
-        }
-        .blink-link-tokens-list::-webkit-scrollbar-track {
-          background: transparent;
-          margin: 8px 0;
-        }
-        .blink-link-tokens-list::-webkit-scrollbar-thumb {
-          background: ${t.textTertiary};
-          border-radius: 999px;
-        }
-      ` }),
+  function openSelectToken() {
+    setPendingIndex(selectedIndex);
+    setView("selectToken");
+  }
+  function commitSelectToken() {
+    const row = entries2[pendingIndex];
+    if (row && !row.notSupported) onSelect(pendingIndex);
+    setView("summary");
+  }
+  if (view === "selectToken") {
+    const pending = entries2[pendingIndex];
+    const continueDisabled = !pending || !!pending.notSupported || entries2.length === 0;
+    return /* @__PURE__ */ jsxs(
+      ScreenLayout,
+      {
+        scrollableBody: false,
+        footer: /* @__PURE__ */ jsx(PrimaryButton, { onClick: commitSelectToken, disabled: continueDisabled, children: "Continue" }),
+        children: [
+          /* @__PURE__ */ jsx(ListScrollbarStyles, { textTertiary: t.textTertiary }),
+          /* @__PURE__ */ jsx(
+            ScreenHeader,
+            {
+              onBack: () => setView("summary"),
+              center: /* @__PURE__ */ jsx("img", { src: BLINK_WORDMARK, alt: "Blink", style: wordmarkImgStyle3 })
+            }
+          ),
+          /* @__PURE__ */ jsxs("div", { style: contentStyle10, children: [
+            /* @__PURE__ */ jsx("h2", { style: headingStyle7(t.text, t.fontWeightBold), children: "Select token" }),
+            /* @__PURE__ */ jsxs("div", { className: "blink-link-tokens-list", style: listCardStyle(t.bgRecessed), children: [
+              entries2.map((entry, i) => /* @__PURE__ */ jsx(
+                TokenSourceRow,
+                {
+                  symbol: entry.tokenSymbol,
+                  chainName: entry.chainName,
+                  tokenLogoUri: entry.tokenLogoUri,
+                  balance: entry.balanceLabel == null ? entry.balanceUsd : void 0,
+                  balanceLabel: entry.balanceLabel,
+                  selected: i === pendingIndex,
+                  notSupported: entry.notSupported,
+                  onClick: () => setPendingIndex(i)
+                },
+                `${entry.tokenSymbol}-${entry.chainName}-${i}`
+              )),
+              showEmpty && /* @__PURE__ */ jsx("div", { style: emptyStyle(t.textMuted), children: "No tokens available to link. Switch wallets or fund this account to continue." })
+            ] })
+          ] })
+        ]
+      }
+    );
+  }
+  return /* @__PURE__ */ jsxs(
+    ScreenLayout,
+    {
+      scrollableBody: false,
+      footer: /* @__PURE__ */ jsx(PrimaryButton, { onClick: () => onApprove(currentSelection()), disabled: approveDisabled, loading: approving, children: "Review" }),
+      children: [
+        /* @__PURE__ */ jsx(ListScrollbarStyles, { textTertiary: t.textTertiary }),
         /* @__PURE__ */ jsx(
           ScreenHeader,
           {
@@ -13357,71 +13810,198 @@ function LinkTokensScreen({
           }
         ),
         /* @__PURE__ */ jsxs("div", { style: contentStyle10, children: [
-          /* @__PURE__ */ jsx("h2", { style: headingStyle7(t.text), children: "Pick your stablecoin for passkey deposits" }),
-          /* @__PURE__ */ jsxs("div", { className: "blink-link-tokens-list", style: listCardStyle(t.bgRecessed), children: [
-            showShimmer ? Array.from({ length: SHIMMER_ROWS }).map((_, i) => /* @__PURE__ */ jsxs(
-              "div",
-              {
-                "data-testid": "link-tokens-shimmer-row",
-                "aria-hidden": "true",
-                style: shimmerRowStyle,
-                children: [
-                  /* @__PURE__ */ jsx("div", { style: shimmerCircleStyle(t.bgInput, t.border) }),
-                  /* @__PURE__ */ jsxs("div", { style: shimmerInfoStyle, children: [
-                    /* @__PURE__ */ jsx("div", { style: shimmerLineStyle(72, t.bgInput, t.border) }),
-                    /* @__PURE__ */ jsx("div", { style: shimmerLineStyle(48, t.bgInput, t.border) })
-                  ] }),
+          /* @__PURE__ */ jsx("div", { style: flexSpacerStyle }),
+          /* @__PURE__ */ jsxs("div", { style: topGroupStyle, children: [
+            /* @__PURE__ */ jsx("h2", { style: headingStyle7(t.text, t.fontWeightBold), children: "Let your passkey spend" }),
+            /* @__PURE__ */ jsxs("div", { style: pillsGroupStyle, children: [
+              showShimmer ? /* @__PURE__ */ jsxs("div", { "data-testid": "link-tokens-summary-shimmer", "aria-hidden": "true", style: pillStyle3(t.bgRecessed), children: [
+                /* @__PURE__ */ jsx("div", { style: shimmerCircleStyle(t.bgInput, t.border) }),
+                /* @__PURE__ */ jsxs("div", { style: shimmerInfoStyle, children: [
+                  /* @__PURE__ */ jsx("div", { style: shimmerLineStyle(96, t.bgInput, t.border) }),
                   /* @__PURE__ */ jsx("div", { style: shimmerLineStyle(56, t.bgInput, t.border) })
-                ]
-              },
-              `shimmer-${i}`
-            )) : entries2.map((entry, i) => /* @__PURE__ */ jsx(
-              TokenSourceRow,
-              {
-                symbol: entry.tokenSymbol,
-                chainName: entry.chainName,
-                tokenLogoUri: entry.tokenLogoUri,
-                balance: entry.balanceLabel == null ? entry.balanceUsd : void 0,
-                balanceLabel: entry.balanceLabel,
-                selected: i === selectedIndex,
-                notSupported: entry.notSupported,
-                onClick: () => onSelect(i)
-              },
-              `${entry.tokenSymbol}-${entry.chainName}-${i}`
-            )),
-            showEmpty && /* @__PURE__ */ jsx("div", { style: emptyStyle(t.textMuted), children: "No tokens available to link. Switch wallets or fund this account to continue." })
+                ] })
+              ] }) : selected ? /* @__PURE__ */ jsxs(
+                "button",
+                {
+                  type: "button",
+                  onClick: openSelectToken,
+                  style: pillButtonStyle(t.bgRecessed),
+                  "aria-label": `Selected token ${selected.tokenSymbol} on ${selected.chainName}. Change token.`,
+                  "data-testid": "link-tokens-selected-pill",
+                  children: [
+                    /* @__PURE__ */ jsx(TokenPillLogo, { entry: selected, fallbackBg: t.bgRecessed, fallbackColor: t.textMuted }),
+                    /* @__PURE__ */ jsxs("span", { style: pillTextColStyle, children: [
+                      /* @__PURE__ */ jsxs("span", { style: pillTitleStyle(t.text, t.fontWeightRegular), children: [
+                        selected.tokenSymbol,
+                        " on ",
+                        selected.chainName
+                      ] }),
+                      /* @__PURE__ */ jsx("span", { style: pillSubStyle(t.textMuted, t.fontWeightRegular), children: selected.balanceLabel ?? `$${formatUsdTwoDecimals2(selected.balanceUsd)}` })
+                    ] }),
+                    /* @__PURE__ */ jsx("span", { style: pillChevronStyle(t.textMuted), children: /* @__PURE__ */ jsx(ChevronDownIcon, { color: t.textMuted }) })
+                  ]
+                }
+              ) : null,
+              editing ? /* @__PURE__ */ jsxs("div", { style: pillStyle3(t.bgRecessed), children: [
+                /* @__PURE__ */ jsx("span", { style: limitEditLabelStyle(t.text, t.fontWeightRegular), children: "Spending limit" }),
+                /* @__PURE__ */ jsxs("div", { style: limitEditRightStyle, children: [
+                  /* @__PURE__ */ jsxs("span", { style: limitAmountStyle(t.text, t.fontWeightRegular), children: [
+                    /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: limitDollarStyle(isUnlimited, t.text), children: "$" }),
+                    /* @__PURE__ */ jsx(
+                      "input",
+                      {
+                        type: "text",
+                        inputMode: "decimal",
+                        autoFocus: true,
+                        placeholder: "0",
+                        "aria-label": "Lifetime spending limit",
+                        value: limit === "unlimited" ? "" : limit,
+                        onChange: (e) => setLimit(sanitizeRawInput(e.target.value)),
+                        onBlur: () => setEditing(false),
+                        "data-testid": "link-tokens-limit-input",
+                        style: limitInputStyle(t.text, t.textMuted)
+                      }
+                    )
+                  ] }),
+                  /* @__PURE__ */ jsx(
+                    "button",
+                    {
+                      type: "button",
+                      onMouseDown: (e) => e.preventDefault(),
+                      onClick: () => {
+                        setLimit("unlimited");
+                        setEditing(false);
+                      },
+                      style: limitResetStyle(t.border, t.textMuted, t.fontWeightMedium),
+                      "data-testid": "link-tokens-limit-reset",
+                      children: "Unlimited"
+                    }
+                  )
+                ] })
+              ] }) : /* @__PURE__ */ jsxs(
+                "button",
+                {
+                  type: "button",
+                  onClick: () => setEditing(true),
+                  style: pillButtonStyle(t.bgRecessed),
+                  "aria-label": `Lifetime spending limit: ${limitLabel}. Edit.`,
+                  "data-testid": "link-tokens-limit-pill",
+                  children: [
+                    /* @__PURE__ */ jsx("span", { style: pillTitleStyle(t.text, t.fontWeightRegular), children: "Lifetime spending limit" }),
+                    /* @__PURE__ */ jsxs("span", { style: limitValueStyle, children: [
+                      /* @__PURE__ */ jsx("span", { style: pillSubStyle(isUnlimited ? t.textMuted : t.text, t.fontWeightRegular), children: limitLabel }),
+                      /* @__PURE__ */ jsx("span", { style: pillChevronStyle(t.textMuted), children: /* @__PURE__ */ jsx(PencilIcon, { size: 16 }) })
+                    ] })
+                  ]
+                }
+              )
+            ] })
           ] }),
-          error && /* @__PURE__ */ jsx("div", { style: bannerSlotStyle, children: /* @__PURE__ */ jsx(NotificationBanner, { title: "Something went wrong", description: error }) })
+          /* @__PURE__ */ jsx("div", { style: flexSpacerStyle }),
+          /* @__PURE__ */ jsxs("div", { style: bottomGroupStyle, children: [
+            /* @__PURE__ */ jsxs("div", { style: infoCardStyle3(t.bgRecessed), children: [
+              /* @__PURE__ */ jsx(
+                InfoRow,
+                {
+                  icon: /* @__PURE__ */ jsx(LockIcon, { size: 22 }),
+                  title: "Blink is non-custodial",
+                  body: "Your passkey moves money, not Blink.",
+                  t
+                }
+              ),
+              /* @__PURE__ */ jsx(
+                InfoRow,
+                {
+                  icon: /* @__PURE__ */ jsx(FaceIdIcon, { size: 22 }),
+                  title: "Every transaction is signed",
+                  body: "Nothing can move without your direct approval.",
+                  t
+                }
+              )
+            ] }),
+            error && /* @__PURE__ */ jsx("div", { style: bannerSlotStyle, children: /* @__PURE__ */ jsx(NotificationBanner, { title: "Something went wrong", description: error }) })
+          ] })
         ] })
       ]
     }
   );
 }
-function shortChainName(chainName) {
-  return chainName.replace(/\s+One$/i, "");
+function TokenPillLogo({
+  entry,
+  fallbackBg,
+  fallbackColor
+}) {
+  const logo = entry.tokenLogoUri ?? TOKEN_LOGOS[entry.tokenSymbol];
+  return /* @__PURE__ */ jsx("span", { style: pillLogoSlotStyle, children: logo ? /* @__PURE__ */ jsx("img", { src: logo, alt: "", "aria-hidden": "true", style: pillLogoImgStyle }) : /* @__PURE__ */ jsx("span", { style: pillLogoFallbackStyle(fallbackBg, fallbackColor), children: entry.tokenSymbol.charAt(0).toUpperCase() }) });
 }
-function LockIcon3() {
-  return /* @__PURE__ */ jsx("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx(
-    "path",
-    {
-      d: "M7 10V8a5 5 0 0 1 10 0v2m-12 0h14a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1v-8a1 1 0 0 1 1-1z",
-      stroke: "currentColor",
-      strokeWidth: "2",
-      strokeLinecap: "round",
-      strokeLinejoin: "round"
-    }
-  ) });
+function InfoRow({
+  icon,
+  title,
+  body,
+  t
+}) {
+  return /* @__PURE__ */ jsxs("div", { style: infoRowStyle2, children: [
+    /* @__PURE__ */ jsx("span", { style: infoIconStyle(t.text), children: icon }),
+    /* @__PURE__ */ jsxs("span", { style: infoTextColStyle, children: [
+      /* @__PURE__ */ jsx("span", { style: infoTitleStyle2(t.text, t.fontWeightSemibold), children: title }),
+      /* @__PURE__ */ jsx("span", { style: infoBodyStyle(t.textMuted, t.fontWeightMedium), children: body })
+    ] })
+  ] });
+}
+function ListScrollbarStyles({ textTertiary }) {
+  return /* @__PURE__ */ jsx("style", { children: `
+      @keyframes blink-link-tokens-shimmer {
+        0% { background-position: 200% 0; }
+        100% { background-position: -200% 0; }
+      }
+      .blink-link-tokens-list {
+        scrollbar-width: thin;
+        scrollbar-color: ${textTertiary} transparent;
+      }
+      .blink-link-tokens-list::-webkit-scrollbar { width: 4px; }
+      .blink-link-tokens-list::-webkit-scrollbar-track {
+        background: transparent;
+        margin: 8px 0;
+      }
+      .blink-link-tokens-list::-webkit-scrollbar-thumb {
+        background: ${textTertiary};
+        border-radius: 999px;
+      }
+      input[data-testid="link-tokens-limit-input"]::placeholder {
+        color: var(--link-limit-placeholder);
+        opacity: 1;
+      }
+    ` });
 }
 var contentStyle10 = {
   display: "flex",
   flexDirection: "column",
-  alignItems: "center",
-  gap: 16,
-  paddingTop: 8,
   flex: 1,
   minHeight: 0,
   width: "100%"
 };
+var flexSpacerStyle = {
+  flex: 1,
+  minHeight: 16
+};
+var topGroupStyle = {
+  display: "flex",
+  flexDirection: "column",
+  gap: 24,
+  width: "100%"
+};
+var bottomGroupStyle = {
+  display: "flex",
+  flexDirection: "column",
+  gap: 12,
+  width: "100%"
+};
+var pillsGroupStyle = {
+  display: "flex",
+  flexDirection: "column",
+  gap: 8,
+  width: "100%"
+};
 var wordmarkImgStyle3 = {
   height: 22,
   width: "auto",
@@ -13429,9 +14009,9 @@ var wordmarkImgStyle3 = {
   pointerEvents: "none",
   userSelect: "none"
 };
-var headingStyle7 = (color) => ({
+var headingStyle7 = (color, weight) => ({
   fontSize: 24,
-  fontWeight: 700,
+  fontWeight: weight,
   lineHeight: "normal",
   letterSpacing: 0,
   color,
@@ -13451,68 +14031,155 @@ var listCardStyle = (bg) => ({
   minHeight: 0,
   overflowY: "auto"
 });
-var shimmerRowStyle = {
+var pillStyle3 = (bg) => ({
   display: "flex",
   alignItems: "center",
   gap: 16,
-  padding: "12px 16px 12px 12px",
-  background: "transparent",
-  border: "none",
-  borderRadius: 16,
   width: "100%",
-  boxSizing: "border-box"
+  boxSizing: "border-box",
+  padding: "14px 16px",
+  borderRadius: 20,
+  background: bg
+});
+var pillButtonStyle = (bg) => ({
+  ...pillStyle3(bg),
+  border: "none",
+  cursor: "pointer",
+  fontFamily: "inherit",
+  textAlign: "left"
+});
+var pillTextColStyle = {
+  display: "flex",
+  flexDirection: "column",
+  flex: 1,
+  minWidth: 0,
+  gap: 2
 };
-var shimmerCircleStyle = (baseColor, highlightColor) => ({
+var pillTitleStyle = (color, weight) => ({
+  fontSize: "1rem",
+  fontWeight: weight,
+  lineHeight: "normal",
+  color,
+  whiteSpace: "nowrap",
+  overflow: "hidden",
+  textOverflow: "ellipsis"
+});
+var pillSubStyle = (color, weight) => ({
+  fontSize: "0.95rem",
+  fontWeight: weight,
+  color
+});
+var pillChevronStyle = (color) => ({
+  flexShrink: 0,
+  display: "inline-flex",
+  alignItems: "center",
+  color
+});
+var limitValueStyle = {
+  marginLeft: "auto",
+  display: "inline-flex",
+  alignItems: "center",
+  gap: 8
+};
+var pillLogoSlotStyle = {
+  position: "relative",
   width: 40,
   height: 40,
-  borderRadius: "50%",
   flexShrink: 0,
-  background: `linear-gradient(90deg, ${baseColor} 0%, ${highlightColor} 50%, ${baseColor} 100%)`,
-  backgroundSize: "200% 100%",
-  animation: "blink-link-tokens-shimmer 1.4s ease-in-out infinite"
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center"
+};
+var pillLogoImgStyle = {
+  width: "100%",
+  height: "100%",
+  borderRadius: "50%",
+  objectFit: "cover"
+};
+var pillLogoFallbackStyle = (bg, color) => ({
+  width: "100%",
+  height: "100%",
+  borderRadius: "50%",
+  background: bg,
+  color,
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center",
+  fontSize: "0.95rem",
+  fontWeight: 700
 });
-var shimmerInfoStyle = {
+var limitEditLabelStyle = (color, weight) => ({
+  fontSize: "1rem",
+  fontWeight: weight,
+  lineHeight: "normal",
+  color,
+  whiteSpace: "nowrap",
+  flexShrink: 0
+});
+var limitEditRightStyle = {
+  marginLeft: "auto",
   display: "flex",
-  flexDirection: "column",
-  gap: 6,
-  flex: 1,
+  alignItems: "center",
+  gap: 8,
   minWidth: 0
 };
-var shimmerLineStyle = (width, baseColor, highlightColor) => ({
-  width,
-  height: 12,
-  borderRadius: 6,
-  background: `linear-gradient(90deg, ${baseColor} 0%, ${highlightColor} 50%, ${baseColor} 100%)`,
-  backgroundSize: "200% 100%",
-  animation: "blink-link-tokens-shimmer 1.4s ease-in-out infinite"
+var limitAmountStyle = (color, weight) => ({
+  display: "inline-flex",
+  alignItems: "baseline",
+  gap: 1,
+  color,
+  fontSize: "1rem",
+  fontWeight: weight
 });
-var emptyStyle = (color) => ({
-  padding: "32px 16px",
-  textAlign: "center",
+var limitDollarStyle = (isZero, color) => ({
+  opacity: isZero ? 0.5 : 1,
+  color
+});
+var limitInputStyle = (color, mutedColor) => ({
+  background: "transparent",
+  border: "none",
+  outline: "none",
   color,
-  fontSize: "0.92rem"
+  font: "inherit",
+  textAlign: "right",
+  padding: 0,
+  margin: 0,
+  width: "auto",
+  minWidth: "1ch",
+  ...{ fieldSizing: "content" },
+  fontVariantNumeric: "tabular-nums",
+  caretColor: color,
+  ["--link-limit-placeholder"]: mutedColor
 });
-var bannerSlotStyle = {
-  display: "flex",
-  justifyContent: "center",
-  width: "100%"
-};
-var footerStackStyle4 = {
+var limitResetStyle = (borderColor, color, weight) => ({
+  flexShrink: 0,
+  padding: "5px 12px",
+  borderRadius: 999,
+  fontSize: "0.8rem",
+  fontWeight: weight,
+  fontFamily: "inherit",
+  cursor: "pointer",
+  border: `1.5px solid ${borderColor}`,
+  background: "transparent",
+  color
+});
+var infoCardStyle3 = (bg) => ({
   display: "flex",
   flexDirection: "column",
   gap: 16,
-  width: "100%"
-};
-var lockBannerStyle2 = {
+  width: "100%",
+  boxSizing: "border-box",
+  padding: 16,
+  borderRadius: 20,
+  background: bg
+});
+var infoRowStyle2 = {
   display: "flex",
   alignItems: "flex-start",
-  gap: 16,
-  padding: "12px 16px 12px 12px",
-  borderRadius: 16,
-  width: "100%",
-  boxSizing: "border-box"
+  gap: 14,
+  width: "100%"
 };
-var lockIconWrapStyle2 = (color) => ({
+var infoIconStyle = (color) => ({
   flexShrink: 0,
   width: 24,
   height: 24,
@@ -13521,14 +14188,60 @@ var lockIconWrapStyle2 = (color) => ({
   justifyContent: "center",
   color
 });
-var lockBannerTextStyle2 = (color) => ({
-  margin: 0,
-  flex: 1,
-  fontSize: 12,
-  fontWeight: 500,
-  lineHeight: "normal",
-  color
+var infoTextColStyle = {
+  display: "flex",
+  flexDirection: "column",
+  gap: 2,
+  flex: 1,
+  minWidth: 0
+};
+var infoTitleStyle2 = (color, weight) => ({
+  fontSize: "1rem",
+  fontWeight: weight,
+  lineHeight: "normal",
+  color
+});
+var infoBodyStyle = (color, weight) => ({
+  fontSize: "0.85rem",
+  fontWeight: weight,
+  lineHeight: 1.4,
+  color
+});
+var shimmerCircleStyle = (baseColor, highlightColor) => ({
+  width: 40,
+  height: 40,
+  borderRadius: "50%",
+  flexShrink: 0,
+  background: `linear-gradient(90deg, ${baseColor} 0%, ${highlightColor} 50%, ${baseColor} 100%)`,
+  backgroundSize: "200% 100%",
+  animation: "blink-link-tokens-shimmer 1.4s ease-in-out infinite"
+});
+var shimmerInfoStyle = {
+  display: "flex",
+  flexDirection: "column",
+  gap: 6,
+  flex: 1,
+  minWidth: 0
+};
+var shimmerLineStyle = (width, baseColor, highlightColor) => ({
+  width,
+  height: 12,
+  borderRadius: 6,
+  background: `linear-gradient(90deg, ${baseColor} 0%, ${highlightColor} 50%, ${baseColor} 100%)`,
+  backgroundSize: "200% 100%",
+  animation: "blink-link-tokens-shimmer 1.4s ease-in-out infinite"
+});
+var emptyStyle = (color) => ({
+  padding: "32px 16px",
+  textAlign: "center",
+  color,
+  fontSize: "0.92rem"
 });
+var bannerSlotStyle = {
+  display: "flex",
+  justifyContent: "center",
+  width: "100%"
+};
 function DepositCompleteScreen({ amount }) {
   const { tokens } = useBlinkConfig();
   return /* @__PURE__ */ jsxs(ScreenLayout, { children: [
@@ -13590,6 +14303,7 @@ function SelectDepositSourceScreen({
   tokenOptions,
   selectedTokenSymbol,
   selectedChainName,
+  balancesLoading,
   selectedWalletId,
   onPickToken,
   useDeeplink,
@@ -13606,8 +14320,9 @@ function SelectDepositSourceScreen({
   const [pendingMobileSelection, setPendingMobileSelection] = useState(null);
   const [preparedAuthorization, setPreparedAuthorization] = useState(null);
   const [preparingAuthorization, setPreparingAuthorization] = useState(false);
+  const isAuthorizedOption = (opt) => !opt.status || opt.status === "AUTHORIZED";
   const selectableOptions = tokenOptions.filter(
-    (opt) => opt.balance == null || isSelectableDepositSourceAmountUsd(opt.balance, minTransferAmountUsd)
+    (opt) => isAuthorizedOption(opt) || opt.balance == null || isSelectableDepositSourceAmountUsd(opt.balance, minTransferAmountUsd)
   );
   const authorized = selectableOptions.filter(
     (opt) => !opt.status || opt.status === "AUTHORIZED"
@@ -13761,6 +14476,30 @@ function SelectDepositSourceScreen({
             "data-testid": "select-deposit-source-scroll-content",
             style: contentStyle12,
             children: [
+              balancesLoading && tokenOptions.length === 0 && /* @__PURE__ */ jsx("div", { style: accountSectionStyle, "data-testid": "select-source-shimmer", children: /* @__PURE__ */ jsx("div", { style: groupCardStyle(tokens.bgRecessed), children: [0, 1, 2].map((i) => /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  style: { display: "flex", alignItems: "center", gap: 12, padding: 12 },
+                  children: [
+                    /* @__PURE__ */ jsx(
+                      Shimmer,
+                      {
+                        width: 36,
+                        height: 36,
+                        borderRadius: "50%",
+                        baseColor: tokens.bgInput,
+                        highlightColor: tokens.border
+                      }
+                    ),
+                    /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column", gap: 6, flex: 1 }, children: [
+                      /* @__PURE__ */ jsx(Shimmer, { width: 96, height: 12, baseColor: tokens.bgInput, highlightColor: tokens.border }),
+                      /* @__PURE__ */ jsx(Shimmer, { width: 56, height: 10, baseColor: tokens.bgInput, highlightColor: tokens.border })
+                    ] }),
+                    /* @__PURE__ */ jsx(Shimmer, { width: 48, height: 12, baseColor: tokens.bgInput, highlightColor: tokens.border })
+                  ]
+                },
+                `shimmer-row-${i}`
+              )) }) }),
               orderedAccounts.map((account) => {
                 const authRows = authorized.filter((opt) => rowMatchesSection(opt, account));
                 const reqRows = requiresAuth.filter((opt) => rowMatchesSection(opt, account)).sort((a, b) => Number(!!a.notSupported) - Number(!!b.notSupported));
@@ -13975,6 +14714,7 @@ function ShimmerBlock({
   );
 }
 function DepositScreen({
+  balancesLoading,
   availableBalance,
   remainingLimit,
   initialAmount,
@@ -14028,6 +14768,10 @@ function DepositScreen({
   const showMobileKeypad = isEntryMode && !isDesktop;
   const [keypadOpen, setKeypadOpen] = useState(showMobileKeypad);
   const [tokenPickerOpen, setTokenPickerOpen] = useState(false);
+  const hasLoadedQuoteRef = useRef(false);
+  if (!quoteLoading) {
+    hasLoadedQuoteRef.current = true;
+  }
   const selectableTokenOptions = tokenOptions?.filter(
     (opt) => opt.balance == null || isSelectableDepositSourceAmountUsd(opt.balance, minDepositFloor)
   ) ?? [];
@@ -14045,11 +14789,11 @@ function DepositScreen({
   }, []);
   const selectedAccount = accounts?.find((a) => a.id === selectedAccountId);
   const selectedProviderName = selectedAccount?.name ?? "Wallet";
-  const isLowBalance = availableBalance < minDepositFloor;
-  const insufficientFunds = availableBalance < validationAmount;
+  const isLowBalance = !balancesLoading && availableBalance < minDepositFloor;
+  const insufficientFunds = !balancesLoading && availableBalance < validationAmount;
   const needsAuthorization = selectedTokenStatus != null && selectedTokenStatus !== "AUTHORIZED" && !insufficientFunds && !isLowBalance;
   const exceedsLimit = remainingLimit != null && validationAmount > remainingLimit && !isLowBalance && !needsAuthorization;
-  const canDeposit = validationAmount >= minDepositFloor && !exceedsLimit && !isLowBalance && !insufficientFunds && !needsAuthorization && !processing;
+  const canDeposit = validationAmount >= minDepositFloor && !balancesLoading && !exceedsLimit && !isLowBalance && !insufficientFunds && !needsAuthorization && !processing;
   const hasAccountPill = !!accounts && accounts.length > 0;
   const pillClickable = canOpenInlineSheet || !!onSelectToken;
   const formattedBalance = selectedTokenSymbol != null ? `$${formatUsdTwoDecimals2(availableBalance)}` : void 0;
@@ -14072,6 +14816,7 @@ function DepositScreen({
         accounts: depositSourceAccounts,
         selectedAccountId: selectedAccountId ?? null,
         tokenOptions: selectableTokenOptions,
+        balancesLoading,
         selectedTokenSymbol,
         selectedChainName,
         selectedWalletId: selectedWalletId ?? null,
@@ -14093,7 +14838,7 @@ function DepositScreen({
   const mobileEntryWithKeypad = isEntryMode && !isDesktop && keypadOpen;
   const showLiveMobileHero = isEntryMode && !isDesktop && keypadOpen;
   const showDesktopInputHero = isEntryMode && isDesktop;
-  const showFormattedHero = !showLiveMobileHero && !showDesktopInputHero;
+  const showFeeRow = validationAmount > 0;
   let primaryButton;
   if (mobileEntryWithKeypad) {
     const canConfirmEntry = canContinue(amountEntryValue ?? "");
@@ -14223,7 +14968,32 @@ function DepositScreen({
           "aria-label": tokenAriaLabel,
           "aria-expanded": canOpenInlineSheet ? tokenPickerOpen : void 0,
           "aria-haspopup": canOpenInlineSheet ? "listbox" : void 0,
-          children: /* @__PURE__ */ jsx(
+          children: balancesLoading ? (
+            // Until balances merge in we don't know the selected token or its
+            // balance, so the whole pill (icon + name + balance) is a shimmer
+            // placeholder rather than showing the account name as a default.
+            // Render through SourcePill so the placeholder inherits the exact
+            // same container (fill, radius, padding, chevron) as the loaded
+            // pill and does not change size when balances arrive.
+            /* @__PURE__ */ jsx(
+              "span",
+              {
+                "data-testid": "deposit-pill-shimmer",
+                "aria-label": "Loading balance",
+                "aria-busy": "true",
+                style: { display: "inline-flex" },
+                children: /* @__PURE__ */ jsx(
+                  SourcePill,
+                  {
+                    icon: /* @__PURE__ */ jsx(Shimmer, { width: 28, height: 28, borderRadius: "50%", baseColor: tokens.bgInput, highlightColor: tokens.border }),
+                    nameSlot: /* @__PURE__ */ jsx(Shimmer, { width: 72, height: 12, baseColor: tokens.bgInput, highlightColor: tokens.border }),
+                    balanceSlot: /* @__PURE__ */ jsx(Shimmer, { width: 48, height: 12, baseColor: tokens.bgInput, highlightColor: tokens.border }),
+                    showChevron: pillClickable
+                  }
+                )
+              }
+            )
+          ) : /* @__PURE__ */ jsx(
             SourcePill,
             {
               icon: /* @__PURE__ */ jsx(
@@ -14243,7 +15013,7 @@ function DepositScreen({
           )
         }
       ),
-      showFormattedHero && /* @__PURE__ */ jsx("div", { style: redesignFeeRowStyle, children: quoteLoading ? /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx("div", { "data-testid": "deposit-fee-row", style: redesignFeeRowStyle, children: showFeeRow && (quoteLoading && !hasLoadedQuoteRef.current ? /* @__PURE__ */ jsx(
         "div",
         {
           "data-testid": "deposit-fee-shimmer",
@@ -14261,7 +15031,7 @@ function DepositScreen({
             }
           )
         }
-      ) : /* @__PURE__ */ jsx("span", { style: redesignNoFeesStyle(tokens.text), children: "No fees" }) })
+      ) : /* @__PURE__ */ jsx("span", { style: redesignNoFeesStyle(tokens.text), children: "No fees" })) })
     ] }),
     /* @__PURE__ */ jsx("div", { style: bannerSlotStyle2, children: mobileEntryWithKeypad ? null : showLowFunds ? /* @__PURE__ */ jsx(
       NotificationBanner,
@@ -15638,7 +16408,7 @@ function OpenWalletScreen({
     return /* @__PURE__ */ jsxs(
       ScreenLayout,
       {
-        footer: /* @__PURE__ */ jsxs("div", { style: footerStackStyle5, children: [
+        footer: /* @__PURE__ */ jsxs("div", { style: footerStackStyle4, children: [
           error && /* @__PURE__ */ jsx(InfoBanner, { children: error }),
           /* @__PURE__ */ jsxs(
             SecondaryButton,
@@ -15685,7 +16455,7 @@ function OpenWalletScreen({
   return /* @__PURE__ */ jsxs(
     ScreenLayout,
     {
-      footer: /* @__PURE__ */ jsxs("div", { style: footerStackStyle5, children: [
+      footer: /* @__PURE__ */ jsxs("div", { style: footerStackStyle4, children: [
         error && /* @__PURE__ */ jsx(InfoBanner, { children: error }),
         /* @__PURE__ */ jsxs(
           SecondaryButton,
@@ -15769,7 +16539,7 @@ var primaryClusterStyle = {
   textAlign: "center",
   gap: 12
 };
-var footerStackStyle5 = {
+var footerStackStyle4 = {
   display: "flex",
   flexDirection: "column",
   gap: 8
@@ -15897,6 +16667,12 @@ function ApprovingInWalletScreen({
   chainName,
   step,
   complete,
+  signing,
+  spendingLimitLabel,
+  destinationAddress,
+  tokenLogoUri,
+  awaitingApproval,
+  onApprove,
   error,
   onRetry,
   onBack,
@@ -15906,10 +16682,11 @@ function ApprovingInWalletScreen({
   onOpenWallet
 }) {
   const { tokens: t } = useBlinkConfig();
-  const showDelayedRetry = useDelayedRetry(error == null && onRetry != null);
+  const showDelayedRetry = useDelayedRetry(!awaitingApproval && error == null && onRetry != null);
   const retryVisible = onRetry != null && (error != null || showDelayedRetry);
   const token = tokenSymbol ?? "token";
-  const steps = buildSteps(step, tokenSymbol, chainName, complete);
+  const chain = chainName ?? "chain";
+  const steps = buildSteps(step, tokenSymbol, complete, signing);
   const foregroundNavigation = foregroundDeeplink ? classifyWalletDeeplinkNavigation(foregroundDeeplink) : null;
   const foregroundWithJs = foregroundNavigation ? shouldOpenWithJavaScript(foregroundNavigation) : false;
   const showOpenWalletButton = !!foregroundDeeplink && onOpenWallet != null;
@@ -15917,11 +16694,7 @@ function ApprovingInWalletScreen({
     ScreenLayout,
     {
       scrollableBody: false,
-      footer: /* @__PURE__ */ jsxs("div", { style: footerStackStyle6, children: [
-        /* @__PURE__ */ jsxs("div", { style: lockBannerStyle3, children: [
-          /* @__PURE__ */ jsx("span", { style: lockIconWrapStyle3(t.text), children: /* @__PURE__ */ jsx(LockIcon4, {}) }),
-          /* @__PURE__ */ jsx("p", { style: lockBannerTextStyle3(t.text), children: "Your passkey is required each time you deposit. Funds cannot move without your approval." })
-        ] }),
+      footer: /* @__PURE__ */ jsxs("div", { style: footerStackStyle5, children: [
         showOpenWalletButton && /* @__PURE__ */ jsxs(
           SecondaryButton,
           {
@@ -15938,7 +16711,7 @@ function ApprovingInWalletScreen({
         retryVisible ? /* @__PURE__ */ jsxs("div", { style: retryStackStyle, children: [
           error && /* @__PURE__ */ jsx(InfoBanner, { children: error }),
           /* @__PURE__ */ jsx(OutlineButton, { onClick: onRetry, children: "Retry" })
-        ] }) : /* @__PURE__ */ jsx(PrimaryButton, { spinnerOnly: true })
+        ] }) : awaitingApproval ? /* @__PURE__ */ jsx(PrimaryButton, { onClick: onApprove, children: "Approve" }) : /* @__PURE__ */ jsx(PrimaryButton, { spinnerOnly: true })
       ] }),
       children: [
         /* @__PURE__ */ jsx(
@@ -15950,7 +16723,39 @@ function ApprovingInWalletScreen({
           }
         ),
         /* @__PURE__ */ jsxs("div", { style: contentStyle16, children: [
-          /* @__PURE__ */ jsx("h2", { style: headingStyle13(t.text), children: `Authorizing ${token} for passkey deposits` }),
+          /* @__PURE__ */ jsx("h2", { style: headingStyle13(t.text, t.fontWeightBold), children: "Approve in wallet" }),
+          /* @__PURE__ */ jsxs("div", { style: transferCardStyle(t.bgCardTranslucent, t.radiusLg), children: [
+            /* @__PURE__ */ jsx(
+              AddressRow,
+              {
+                circle: /* @__PURE__ */ jsx(
+                  LogoCircle,
+                  {
+                    src: tokenLogoUri ?? TOKEN_LOGOS[token] ?? void 0,
+                    fallback: token.slice(0, 1).toUpperCase(),
+                    size: 40
+                  }
+                ),
+                title: `${token} on ${chain}`,
+                subtitle: spendingLimitLabel
+              }
+            ),
+            /* @__PURE__ */ jsx("div", { style: arrowRowStyle, children: /* @__PURE__ */ jsx(ArrowDownIcon, { color: t.textMuted }) }),
+            /* @__PURE__ */ jsx(
+              AddressRow,
+              {
+                circle: /* @__PURE__ */ jsx("span", { style: passkeyCircleStyle(t.accent, t.highlight), children: /* @__PURE__ */ jsx(KeyIcon, { size: 22 }) }),
+                title: "Your Blink Passkey",
+                address: destinationAddress,
+                addressLoading: destinationAddress == null
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxs("div", { style: dividerRowStyle3, children: [
+            /* @__PURE__ */ jsx("span", { style: dividerLineStyle(t.textMuted) }),
+            /* @__PURE__ */ jsx("span", { style: dividerLabelStyle3(t.textMuted, t.fontWeightSemibold), children: "Continue in wallet" }),
+            /* @__PURE__ */ jsx("span", { style: dividerLineStyle(t.textMuted) })
+          ] }),
           /* @__PURE__ */ jsxs("div", { style: cardStyle2(t.bgRecessed, t.radiusLg), children: [
             /* @__PURE__ */ jsx("style", { children: SPIN_KEYFRAMES_CSS2 }),
             steps.map((s, i) => /* @__PURE__ */ jsx(ChecklistRow, { step: s }, i))
@@ -15960,6 +16765,32 @@ function ApprovingInWalletScreen({
     }
   );
 }
+function AddressRow({
+  circle,
+  title,
+  address,
+  subtitle,
+  addressLoading
+}) {
+  const { tokens: t } = useBlinkConfig();
+  const sub = subtitle ?? (address ? truncateMiddle(address) : null);
+  return /* @__PURE__ */ jsxs("div", { style: addressRowStyle, children: [
+    circle,
+    /* @__PURE__ */ jsxs("div", { style: addressTextColStyle, children: [
+      /* @__PURE__ */ jsx("span", { style: addressTitleStyle(t.text, t.fontWeightSemibold), children: title }),
+      (sub || addressLoading) && /* @__PURE__ */ jsx("span", { style: addressSubSlotStyle, children: sub ? /* @__PURE__ */ jsx("span", { style: addressSubStyle(t.textMuted, t.fontWeightRegular), children: sub }) : /* @__PURE__ */ jsx(
+        Shimmer,
+        {
+          width: 132,
+          height: 12,
+          borderRadius: 4,
+          baseColor: t.bgInput,
+          highlightColor: t.border
+        }
+      ) })
+    ] })
+  ] });
+}
 function ChecklistRow({ step }) {
   const { tokens: t } = useBlinkConfig();
   const isComplete = step.status === "complete";
@@ -15972,7 +16803,7 @@ function ChecklistRow({ step }) {
         fill: t.accentText
       }
     ) }) }) : isActive ? /* @__PURE__ */ jsx(RowSpinner, { color: t.accent }) : /* @__PURE__ */ jsx("span", { style: pendingBadgeStyle(t.bgRecessed) }),
-    /* @__PURE__ */ jsx("span", { style: labelStyle7(isComplete || isActive ? t.text : t.textMuted), children: step.label })
+    /* @__PURE__ */ jsx("span", { style: labelStyle7(isComplete || isActive ? t.text : t.textMuted, t.fontWeightRegular), children: step.label })
   ] });
 }
 function RowSpinner({ color }) {
@@ -16007,22 +16838,28 @@ function RowSpinner({ color }) {
     }
   );
 }
-function buildSteps(step, tokenSymbol, chainName, complete) {
+function ArrowDownIcon({ color }) {
+  return /* @__PURE__ */ jsxs("svg", { width: "20", height: "20", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", style: { color }, children: [
+    /* @__PURE__ */ jsx("path", { d: "M12 5v14", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" }),
+    /* @__PURE__ */ jsx("path", { d: "M6 13l6 6 6-6", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" })
+  ] });
+}
+function buildSteps(step, tokenSymbol, complete, signing) {
   const token = tokenSymbol ?? "token";
-  const chain = chainName ?? "chain";
-  const passkeyLabel = `Approve ${token} for passkey`;
+  const passkeyLabel = "Assign spending right to your passkey";
+  const activeStatus = signing ? "active" : "pending";
   if (step === "spl") {
-    return [{ label: passkeyLabel, status: complete ? "complete" : "active" }];
+    return [{ label: passkeyLabel, status: complete ? "complete" : activeStatus }];
   }
-  const approveLabel = `Approve ${token} on ${chain}`;
+  const approveLabel = `Approve ${token} for spending via Permit2`;
   return [
     {
       label: approveLabel,
-      status: complete || step !== "approve" ? "complete" : "active"
+      status: complete || step !== "approve" ? "complete" : activeStatus
     },
     {
       label: passkeyLabel,
-      status: complete ? "complete" : step === "approve" ? "pending" : "active"
+      status: complete ? "complete" : step === "approve" ? "pending" : activeStatus
     }
   ];
 }
@@ -16038,18 +16875,6 @@ function useDelayedRetry(enabled) {
   }, [enabled]);
   return visible;
 }
-function LockIcon4() {
-  return /* @__PURE__ */ jsx("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx(
-    "path",
-    {
-      d: "M7 10V8a5 5 0 0 1 10 0v2m-12 0h14a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1v-8a1 1 0 0 1 1-1z",
-      stroke: "currentColor",
-      strokeWidth: "2",
-      strokeLinecap: "round",
-      strokeLinejoin: "round"
-    }
-  ) });
-}
 var wordmarkImgStyle5 = {
   height: 22,
   width: "auto",
@@ -16067,15 +16892,84 @@ var contentStyle16 = {
   minHeight: 0,
   width: "100%"
 };
-var headingStyle13 = (color) => ({
+var headingStyle13 = (color, fontWeight) => ({
   fontSize: 24,
-  fontWeight: 700,
+  fontWeight,
   lineHeight: "normal",
   letterSpacing: 0,
   color,
-  margin: 0,
+  margin: "8px 0 8px",
   textAlign: "center"
 });
+var transferCardStyle = (bg, radius) => ({
+  background: bg,
+  borderRadius: radius,
+  padding: "20px 16px",
+  width: "100%",
+  boxSizing: "border-box",
+  display: "flex",
+  flex: 1,
+  flexDirection: "column",
+  justifyContent: "space-between",
+  gap: 12
+});
+var dividerRowStyle3 = {
+  display: "flex",
+  alignItems: "center",
+  gap: 12,
+  width: "100%"
+};
+var dividerLineStyle = (color) => ({
+  flex: 1,
+  height: 1,
+  background: color
+});
+var dividerLabelStyle3 = (color, fontWeight) => ({
+  fontSize: 11,
+  fontWeight,
+  letterSpacing: "0.08em",
+  textTransform: "uppercase",
+  color,
+  whiteSpace: "nowrap"
+});
+var addressRowStyle = {
+  display: "flex",
+  alignItems: "center",
+  gap: 12,
+  width: "100%"
+};
+var addressTextColStyle = {
+  display: "flex",
+  flexDirection: "column",
+  gap: 2,
+  minWidth: 0
+};
+var addressTitleStyle = (color, fontWeight) => ({
+  fontSize: 16,
+  fontWeight,
+  lineHeight: 1.25,
+  color
+});
+var addressSubSlotStyle = {
+  display: "flex",
+  alignItems: "center",
+  minHeight: 18
+};
+var addressSubStyle = (color, fontWeight) => ({
+  fontSize: 14,
+  fontWeight,
+  lineHeight: 1.25,
+  color,
+  overflow: "hidden",
+  textOverflow: "ellipsis",
+  whiteSpace: "nowrap"
+});
+var arrowRowStyle = {
+  display: "flex",
+  alignItems: "center",
+  height: 20,
+  paddingLeft: 10
+};
 var cardStyle2 = (bg, radius) => ({
   background: bg,
   borderRadius: radius,
@@ -16083,7 +16977,9 @@ var cardStyle2 = (bg, radius) => ({
   width: "100%",
   boxSizing: "border-box",
   display: "flex",
+  flex: 1,
   flexDirection: "column",
+  justifyContent: "center",
   gap: 4
 });
 var rowStyle6 = {
@@ -16091,10 +16987,25 @@ var rowStyle6 = {
   alignItems: "center",
   gap: 16,
   padding: "12px 16px 12px 12px",
+  // Reserve a stable height (two label lines + vertical padding) so swapping the
+  // leading badge between the pending circle, the spinner, and the completion
+  // checkmark — and the muted→active label restyle — never reflows the card.
+  minHeight: 64,
   borderRadius: 16,
   width: "100%",
   boxSizing: "border-box"
 };
+var passkeyCircleStyle = (bg, iconColor) => ({
+  width: 40,
+  height: 40,
+  borderRadius: "50%",
+  background: bg,
+  color: iconColor,
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center",
+  flexShrink: 0
+});
 var completeBadgeStyle = (color) => ({
   width: 24,
   height: 24,
@@ -16112,13 +17023,13 @@ var pendingBadgeStyle = (color) => ({
   background: color,
   flexShrink: 0
 });
-var labelStyle7 = (color) => ({
+var labelStyle7 = (color, fontWeight) => ({
   fontSize: "1rem",
-  fontWeight: 400,
+  fontWeight,
   lineHeight: 1.25,
   color
 });
-var footerStackStyle6 = {
+var footerStackStyle5 = {
   display: "flex",
   flexDirection: "column",
   gap: 16,
@@ -16130,32 +17041,6 @@ var retryStackStyle = {
   gap: 8,
   width: "100%"
 };
-var lockBannerStyle3 = {
-  display: "flex",
-  alignItems: "flex-start",
-  gap: 16,
-  padding: "12px 16px 12px 12px",
-  borderRadius: 16,
-  width: "100%",
-  boxSizing: "border-box"
-};
-var lockIconWrapStyle3 = (color) => ({
-  flexShrink: 0,
-  width: 24,
-  height: 24,
-  display: "inline-flex",
-  alignItems: "center",
-  justifyContent: "center",
-  color
-});
-var lockBannerTextStyle3 = (color) => ({
-  margin: 0,
-  flex: 1,
-  fontSize: 12,
-  fontWeight: 500,
-  lineHeight: "normal",
-  color
-});
 function ConfirmSignScreen({
   walletName,
   chainFamily,
@@ -16281,7 +17166,7 @@ function TokenPickerScreen({
   }
   const entries2 = [];
   for (const wallet of account.wallets) {
-    for (const source of wallet.sources) {
+    for (const source of wallet.sources ?? []) {
       const visibleBalance = source.balance.available.amount;
       if (!isSelectableDepositSourceAmountUsd(visibleBalance, minDepositFloor)) continue;
       entries2.push({
@@ -17122,22 +18007,45 @@ function buildOpenWalletScreenProps({
 function isApprovingInWalletAction(actionType) {
   return actionType === "APPROVE_PERMIT2" || actionType === "SIGN_PERMIT2" || actionType === "APPROVE_SPL";
 }
+function formatUsdTwoDecimals3(value) {
+  return (Number.isFinite(value) ? value : 0).toLocaleString("en-US", {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2
+  });
+}
+function readMetadataString(metadata, key) {
+  const value = metadata?.[key];
+  return typeof value === "string" && value.trim() !== "" ? value : null;
+}
 function buildApprovingInWalletScreenProps({
   flow,
   remote,
+  derived,
   handlers
 }) {
   const { state } = flow;
   const setupToken = state.setupDepositToken;
-  const actionType = remote.authExecutorCurrentAction?.type ?? null;
+  const currentAction = remote.authExecutorCurrentAction;
+  const actionType = currentAction?.type ?? null;
+  const limit = state.setupSpendingLimit;
+  const spendingLimitLabel = limit == null ? null : "unlimited" in limit ? "Unlimited lifetime spending limit" : `$${formatUsdTwoDecimals3(limit.usd)} lifetime spending limit`;
+  const destinationAddress = remote.authApprovalSmartAccountAddress ?? remote.authExecutorApprovalDestinationAddress ?? readMetadataString(currentAction?.metadata, "smartAccountAddress") ?? readMetadataString(currentAction?.metadata, "ownerPubkey");
   const isSolana = setupToken != null && state.chains.find((c) => c.name === setupToken.chainName)?.chainFamily === "svm";
   const step = actionType === "SIGN_PERMIT2" ? "sign" : actionType === "APPROVE_SPL" ? "spl" : actionType == null && isSolana ? "spl" : "approve";
   const complete = remote.authExecutorCompleted && actionType == null && !remote.authExecutorExecuting;
+  const awaitingApproval = remote.authExecutorAwaitingApproval ?? false;
+  const signing = isApprovingInWalletAction(actionType) && !awaitingApproval && !complete;
   return {
     tokenSymbol: setupToken?.symbol ?? null,
     chainName: setupToken?.chainName ?? null,
     step,
     complete,
+    signing,
+    spendingLimitLabel,
+    destinationAddress,
+    tokenLogoUri: derived.selectedSource?.token.logoURI ?? null,
+    awaitingApproval,
+    onApprove: handlers.onApprove,
     error: flow.state.error || remote.authExecutorError,
     onRetry: handlers.onRetryAuthorization,
     onLogout: flow.isDesktop ? handlers.onLogout : void 0,
@@ -17156,7 +18064,7 @@ function buildLinkTokensScreenProps({
   handlers
 }) {
   const sourceOptions = remote.pendingSelectSource?.metadata?.options ?? [];
-  const rowContexts = derived.selectSourceChoices.flatMap(
+  const supportedRows = derived.selectSourceChoices.flatMap(
     (chain) => chain.tokens.map((t) => {
       const rawOption = sourceOptions.find(
         (option) => option.chainName === chain.chainName && option.tokenSymbol === t.tokenSymbol
@@ -17176,6 +18084,10 @@ function buildLinkTokensScreenProps({
       };
     })
   );
+  const rowContexts = [
+    ...supportedRows.filter((row) => isVisibleUsdAmountAtTwoDecimals(row.balanceUsd)),
+    ...supportedRows.filter((row) => !isVisibleUsdAmountAtTwoDecimals(row.balanceUsd))
+  ];
   rowContexts.push(
     ...derived.selectSourceUnsupportedChoices.flatMap(
       (chain) => chain.tokens.map((t) => ({
@@ -17197,6 +18109,17 @@ function buildLinkTokensScreenProps({
       balanceLabel: `${formatNativeAmount(native.amount)} ${native.tokenSymbol}`
     }))
   );
+  const selectedTokenSymbol = flow.state.setupDepositToken?.symbol ?? derived.selectSourceRecommended?.tokenSymbol;
+  const selectedChainName = flow.state.setupDepositToken?.chainName ?? derived.selectSourceRecommended?.chainName;
+  if (selectedTokenSymbol && selectedChainName) {
+    const match = rowContexts.findIndex(
+      (row) => row.symbol === selectedTokenSymbol && row.chainName === selectedChainName
+    );
+    if (match >= 0 && !rowContexts[match].notSupported) {
+      const [pinned] = rowContexts.splice(match, 1);
+      rowContexts.unshift(pinned);
+    }
+  }
   const entries2 = rowContexts.map(
     ({ symbol, chainName, balanceUsd, notSupported, tokenLogoUri, balanceLabel }) => ({
       tokenSymbol: symbol,
@@ -17209,8 +18132,6 @@ function buildLinkTokensScreenProps({
     })
   );
   const firstSupportedIndex = rowContexts.findIndex((row) => !row.notSupported);
-  const selectedTokenSymbol = flow.state.setupDepositToken?.symbol ?? derived.selectSourceRecommended?.tokenSymbol;
-  const selectedChainName = flow.state.setupDepositToken?.chainName ?? derived.selectSourceRecommended?.chainName;
   const selectedIndex = (() => {
     if (!selectedTokenSymbol || !selectedChainName) {
       return firstSupportedIndex;
@@ -17302,9 +18223,10 @@ function buildDepositScreenProps({
     const registryChainIds = derived.walletConnectChainIdsByAccount[account.id] ?? null;
     const approvedChainIds = account.walletConnect?.approvedChainIds ?? null;
     for (const wallet of account.wallets) {
-      for (const source of wallet.sources) {
+      for (const source of wallet.sources ?? []) {
         const balance = source.balance.available.amount;
-        if (!isSelectableDepositSourceAmountUsd(balance, minDepositFloor)) continue;
+        const isAuthorized = source.token.status === "AUTHORIZED";
+        if (!isAuthorized && !isSelectableDepositSourceAmountUsd(balance, minDepositFloor)) continue;
         const chain = flow.state.chains.find((c) => c.name === wallet.chain.name);
         const requiresAuth = source.token.status != null && source.token.status !== "AUTHORIZED";
         const notSupported = requiresAuth && chain?.commonId != null && registryChainIds != null && !registryChainIds.includes(chain.commonId) && !(approvedChainIds?.includes(chain.commonId) ?? false);
@@ -17326,7 +18248,10 @@ function buildDepositScreenProps({
   }
   return {
     merchantName,
-    availableBalance: selectedSource ? selectedSource.balance.available.amount : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + w.balance.available.amount, 0) : maxSourceBalance,
+    // Wallet balances arrive after the (balance-free) accounts load; while they
+    // do, the source pill / token rows shimmer instead of showing $0.00.
+    balancesLoading: state.balancesLoading,
+    availableBalance: selectedSource ? selectedSource.balance.available.amount : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + (w.balance?.available.amount ?? 0), 0) : maxSourceBalance,
     remainingLimit: selectedSource != null ? selectedSource.remainingAllowance ?? null : selectedAccount?.remainingAllowance ?? null,
     tokenCount,
     initialAmount: parsedAmt,
@@ -17517,6 +18442,28 @@ function StepRendererContent({
   screen
 }) {
   const input = { flow, remote, derived, forms, handlers };
+  const s = flow.state;
+  useEffect(() => {
+    if (screen !== "loading") return;
+    appendDebug("warn", "stuck on loading shimmer", {
+      phaseStep: s.phase.step,
+      privyReady: s.privyReady,
+      privyAuthenticated: s.privyAuthenticated,
+      activeCredentialId: s.activeCredentialId,
+      passkeyConfigLoaded: s.passkeyConfigLoaded,
+      loadingData: s.loadingData,
+      initialDataLoaded: s.initialDataLoaded,
+      loginRequested: s.loginRequested,
+      enableFullWidget: s.enableFullWidget,
+      authenticatedOnOpen: s.authenticatedOnOpen,
+      welcomeBackAcknowledged: s.welcomeBackAcknowledged,
+      mobileFlow: s.mobileFlow,
+      error: s.error,
+      accountsCount: s.accounts.length,
+      hasActiveWallet: s.accounts.some((a) => a.wallets.some((w) => w.status === "ACTIVE")),
+      providersCount: s.providers.length
+    });
+  }, [screen, s]);
   switch (screen) {
     case "loading":
       return /* @__PURE__ */ jsx(BlinkLoadingScreen, {});
@@ -17545,11 +18492,9 @@ function StepRendererContent({
     case "wallet-picker":
       return /* @__PURE__ */ jsx(WalletPickerScreen, { ...buildWalletPickerScreenProps(input) });
     case "open-wallet": {
-      const currentActionType = input.remote.authExecutorCurrentAction?.type;
-      const inSigningAction = isApprovingInWalletAction(currentActionType);
-      const pastPairingTransient = input.remote.authExecutorExecuting && input.remote.pendingSelectSource == null && currentActionType != null && (currentActionType !== "OPEN_PROVIDER" || input.remote.sourceSelectionResolved);
+      const pastSourceSelection = input.remote.authExecutorExecuting && input.remote.pendingSelectSource == null && input.remote.sourceSelectionResolved;
       const settlingPostSign = input.flow.state.linkSettling;
-      if (inSigningAction || pastPairingTransient || settlingPostSign) {
+      if (pastSourceSelection || settlingPostSign) {
         return /* @__PURE__ */ jsx(ApprovingInWalletScreen, { ...buildApprovingInWalletScreenProps(input) });
       }
       return /* @__PURE__ */ jsx(OpenWalletScreen, { ...buildOpenWalletScreenProps(input) });
@@ -17559,12 +18504,9 @@ function StepRendererContent({
       if (phase.step === "wallet-setup" && phase.pendingSourceWait) {
         return /* @__PURE__ */ jsx(LinkTokensScreen, { ...buildLinkTokensScreenProps(input) });
       }
-      const inSigningAction = isApprovingInWalletAction(
-        input.remote.authExecutorCurrentAction?.type
-      );
-      const justResolvedSelectSource = input.remote.authExecutorExecuting && input.remote.pendingSelectSource == null;
+      const pastSourceSelection = input.remote.authExecutorExecuting && input.remote.pendingSelectSource == null && input.remote.sourceSelectionResolved;
       const settlingPostSign = input.flow.state.linkSettling;
-      if (inSigningAction || justResolvedSelectSource || settlingPostSign) {
+      if (pastSourceSelection || settlingPostSign) {
         return /* @__PURE__ */ jsx(ApprovingInWalletScreen, { ...buildApprovingInWalletScreenProps(input) });
       }
       return /* @__PURE__ */ jsx(LinkTokensScreen, { ...buildLinkTokensScreenProps(input) });
@@ -17648,11 +18590,12 @@ var PaymentErrorBoundary = class extends Component {
 };
 function selectedSourceForWallet(selectedWallet, selectedTokenSymbol, depositAmount, priorityContext) {
   if (!selectedWallet) return null;
+  const walletSources = selectedWallet.sources ?? [];
   if (selectedTokenSymbol) {
-    return selectedWallet.sources.find((s) => s.token.symbol === selectedTokenSymbol) ?? null;
+    return walletSources.find((s) => s.token.symbol === selectedTokenSymbol) ?? null;
   }
   const walletChainName = selectedWallet.chain.name;
-  const ranked = selectedWallet.sources.map((source, index) => {
+  const ranked = walletSources.map((source, index) => {
     return { source, index };
   }).sort((a, b) => {
     const priority = compareDepositSourcePriority(
@@ -17700,7 +18643,7 @@ function computeDerivedState(state, depositAmount = 0, priorityContext) {
   let maxSourceBalance = 0;
   for (const acct of state.accounts) {
     for (const wallet of acct.wallets) {
-      for (const source of wallet.sources) {
+      for (const source of wallet.sources ?? []) {
         if (source.balance.available.amount > maxSourceBalance) {
           maxSourceBalance = source.balance.available.amount;
         }
@@ -17710,7 +18653,7 @@ function computeDerivedState(state, depositAmount = 0, priorityContext) {
   let tokenCount = 0;
   for (const acct of state.accounts) {
     for (const wallet of acct.wallets) {
-      tokenCount += wallet.sources.filter((s) => s.balance.available.amount > 0).length;
+      tokenCount += (wallet.sources ?? []).filter((s) => s.balance.available.amount > 0).length;
     }
   }
   return {
@@ -17803,6 +18746,7 @@ function useAuthHandlers(dispatch, apiBaseUrl, popupAuthRef) {
       dispatch({ type: "PASSKEY_ACTIVATED", credentialId: result.credentialId, publicKey: result.publicKey });
       dispatch({ type: "SYNC_PRIVY_SESSION", ready: true, authenticated: true });
       window.localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, result.credentialId);
+      track("login_succeeded", { method: "passkey", popup: true });
     } catch (err) {
       captureException(err);
       dispatch({
@@ -17815,6 +18759,7 @@ function useAuthHandlers(dispatch, apiBaseUrl, popupAuthRef) {
   }, [dispatch, popupAuthRef]);
   const { loginWithPasskey, state: loginState } = useLoginWithPasskey({
     onComplete: (params) => {
+      track("login_succeeded", { method: "passkey", popup: false });
       handleAuthComplete(params.user);
     },
     onError: (error) => {
@@ -17843,6 +18788,7 @@ function useAuthHandlers(dispatch, apiBaseUrl, popupAuthRef) {
       dispatch({ type: "PASSKEY_ACTIVATED", credentialId: result.credentialId, publicKey: result.publicKey });
       dispatch({ type: "SYNC_PRIVY_SESSION", ready: true, authenticated: true });
       window.localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, result.credentialId);
+      track("signup_succeeded", { method: "passkey", popup: true });
     } catch (err) {
       captureException(err);
       dispatch({
@@ -17855,6 +18801,7 @@ function useAuthHandlers(dispatch, apiBaseUrl, popupAuthRef) {
   }, [dispatch, popupAuthRef]);
   const { signupWithPasskey, state: signupState } = useSignupWithPasskey({
     onComplete: (params) => {
+      track("signup_succeeded", { method: "passkey", popup: false });
       handleAuthComplete(params.user);
     },
     onError: (error) => {
@@ -17926,6 +18873,31 @@ function usePasskeyHandlers(dispatch, apiBaseUrl) {
   };
 }
 
+// src/balancesLoad.ts
+async function fetchBalancesByAccountId(apiBaseUrl, token, credentialId, accounts) {
+  const entries2 = await Promise.all(
+    accounts.map(async (account) => {
+      try {
+        const balances = await fetchAccountBalances(
+          apiBaseUrl,
+          token,
+          account.id,
+          credentialId
+        );
+        return [account.id, balances];
+      } catch (err) {
+        captureException(err);
+        return null;
+      }
+    })
+  );
+  const result = {};
+  for (const entry of entries2) {
+    if (entry) result[entry[0]] = entry[1];
+  }
+  return result;
+}
+
 // src/transferSourceResolution.ts
 var STANDARD_TRANSFER_SOURCE_UNAVAILABLE_ERROR = "Selected payment source is no longer available. Choose or link an active wallet before depositing.";
 function resolveStandardTransferSource({
@@ -17977,14 +18949,14 @@ function useTransferHandlers(deps) {
   const processingStartedAtRef = useRef(null);
   const pollingTransferIdRef = useRef(null);
   const depositSelectionReloadCountRef = useRef(0);
-  const reloadAccounts = useCallback(async () => {
+  const reloadAccounts = useCallback(async (opts) => {
     depositSelectionReloadCountRef.current += 1;
     if (depositSelectionReloadCountRef.current === 1) {
       dispatch({ type: "SET_DEPOSIT_SELECTION_REFRESHING", value: true });
     }
     try {
       const token = await getAccessToken();
-      if (!token || !activeCredentialId) return;
+      if (!token || !activeCredentialId) return null;
       const [accts, prov] = await Promise.all([
         fetchAccounts(apiBaseUrl, token, activeCredentialId),
         fetchProviders(apiBaseUrl, token)
@@ -18008,6 +18980,20 @@ function useTransferHandlers(deps) {
         defaults,
         resetSelectedTokenSymbol
       });
+      const balancesPromise = fetchBalancesByAccountId(
+        apiBaseUrl,
+        token,
+        activeCredentialId,
+        accts
+      ).then((balancesByAccountId) => {
+        dispatch({ type: "BALANCES_LOADED", balancesByAccountId });
+        return balancesByAccountId;
+      }).catch(() => null);
+      if (opts?.awaitBalances) {
+        return await balancesPromise;
+      }
+      void balancesPromise;
+      return null;
     } finally {
       depositSelectionReloadCountRef.current = Math.max(
         0,
@@ -18203,7 +19189,7 @@ function useSourceSelectionHandlers(_dispatch, orchestrator, options) {
   const selectSourceChoices = useMemo(() => {
     if (!pendingSelectSourceAction) return [];
     const sourceOptions = pendingSelectSourceAction.metadata?.options ?? [];
-    return buildSelectSourceChoices(sourceOptions, minTransferAmountUsd);
+    return buildSelectSourceChoices(sourceOptions, minTransferAmountUsd, true);
   }, [pendingSelectSourceAction, minTransferAmountUsd]);
   const selectSourceUnsupportedChoices = useMemo(() => {
     if (!pendingSelectSourceAction) return [];
@@ -18389,13 +19375,6 @@ function buildReauthorizationSessionOptions(params) {
   return options;
 }
 
-// src/tokenAuthorizationRunOptions.ts
-function buildDesktopTokenAuthorizationOnlyRunOptions(chainName, tokenSymbol) {
-  return {
-    autoResolveSource: { chainName, tokenSymbol }
-  };
-}
-
 // src/oneTapDefaults.ts
 var DEFAULT_ONE_TAP_ALLOWANCE_USD = 1e4;
 async function ensureDefaultOneTapAllowance(apiBaseUrl, token) {
@@ -18416,7 +19395,7 @@ function resolveReauthorizationTarget(input) {
     };
   }
   const wallet = input.account?.wallets.find((candidate) => candidate.id === input.selectedWalletId);
-  const source = wallet?.sources.find(
+  const source = wallet?.sources?.find(
     (candidate) => input.selectedTokenSymbol ? candidate.token.symbol === input.selectedTokenSymbol : candidate.token.status === "AUTHORIZED"
   );
   return {
@@ -18427,6 +19406,28 @@ function resolveReauthorizationTarget(input) {
   };
 }
 
+// src/depositTokenSelection.ts
+function isSourceAuthorized(balancesByAccountId, target) {
+  const account = target.accountId != null ? balancesByAccountId?.[target.accountId] : void 0;
+  if (!account) return false;
+  const wallet = account.wallets.find((w) => w.id === target.walletId);
+  if (!wallet) return false;
+  const source = wallet.sources.find((s) => s.token.symbol === target.tokenSymbol);
+  return source?.token.status === "AUTHORIZED";
+}
+var defaultSettleDelay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+async function settleUntilTokenAuthorized(reloadAccounts, target, opts = {}) {
+  const maxAttempts = opts.maxAttempts ?? 4;
+  const backoffMs = opts.backoffMs ?? 400;
+  const delay = opts.delay ?? defaultSettleDelay;
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    const balances = await reloadAccounts({ awaitBalances: true });
+    if (isSourceAuthorized(balances, target)) return true;
+    if (attempt < maxAttempts - 1) await delay(backoffMs);
+  }
+  return false;
+}
+
 // src/walletConnectLinks.ts
 function buildWalletConnectDeeplink(links, walletConnectUri) {
   const baseLink = links?.native ?? links?.universal;
@@ -18558,6 +19559,8 @@ function useProviderHandlers(deps) {
     setupDepositToken,
     tryStartExtensionConnectForReownWallet
   } = deps;
+  const setupDepositTokenRef = useRef(setupDepositToken);
+  setupDepositTokenRef.current = setupDepositToken;
   const checkWalletConnectChainSupport = useMemo(
     () => deps.checkWalletConnectChainSupport ?? ((reownWalletId, chainId) => checkReownWalletChainSupport(BLINK_WC_PROJECT_ID, reownWalletId, chainId)),
     [deps.checkWalletConnectChainSupport]
@@ -18625,7 +19628,7 @@ function useProviderHandlers(deps) {
       return null;
     }
     const provider = providers.find((p) => p.id === providerId);
-    const providerName = provider?.name ?? "Wallet";
+    const providerName2 = provider?.name ?? "Wallet";
     try {
       const token = await getAccessToken();
       if (!token) throw new Error("Not authenticated");
@@ -18633,7 +19636,7 @@ function useProviderHandlers(deps) {
       const accountId = crypto.randomUUID();
       const account = await createAccount(apiBaseUrl, token, {
         id: accountId,
-        name: providerName,
+        name: providerName2,
         credentialId: activeCredentialId,
         providerId,
         ...merchantAuthorization ? {
@@ -18682,7 +19685,7 @@ function useProviderHandlers(deps) {
       return;
     }
     const provider = providers.find((p) => p.id === providerId);
-    const providerName = provider?.name ?? "Wallet";
+    const providerName2 = provider?.name ?? "Wallet";
     let shouldRestoreDesktopSelectionOnError = shouldSnapshotDesktopSelection;
     try {
       await resetWalletConnect();
@@ -18705,7 +19708,7 @@ function useProviderHandlers(deps) {
         const newAccountId = crypto.randomUUID();
         const account = await createAccount(apiBaseUrl, token, {
           id: newAccountId,
-          name: providerName,
+          name: providerName2,
           credentialId: activeCredentialId,
           providerId,
           ...merchantAuthorization ? {
@@ -18773,7 +19776,7 @@ function useProviderHandlers(deps) {
         }
         dispatch({ type: "BEGIN_LINK_SETTLING" });
         try {
-          await reloadAccounts();
+          await reloadAccounts({ awaitBalances: true });
         } finally {
           dispatch({ type: "END_LINK_SETTLING" });
         }
@@ -18900,7 +19903,7 @@ function useProviderHandlers(deps) {
       }
       dispatch({ type: "BEGIN_LINK_SETTLING" });
       try {
-        await reloadAccounts();
+        await reloadAccounts({ awaitBalances: true });
       } finally {
         dispatch({ type: "END_LINK_SETTLING" });
       }
@@ -19124,7 +20127,7 @@ function useProviderHandlers(deps) {
         dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: false });
         dispatch({ type: "BEGIN_LINK_SETTLING" });
         try {
-          await reloadAccounts();
+          await reloadAccounts({ awaitBalances: true });
         } finally {
           dispatch({ type: "END_LINK_SETTLING" });
         }
@@ -19226,7 +20229,9 @@ function useProviderHandlers(deps) {
       const result = await orchestrator.run(
         sessionId,
         {
-          ...buildDesktopTokenAuthorizationOnlyRunOptions(inlineChain.name, tokenSymbol),
+          // No autoResolveSource: pause at SELECT_SOURCE so LinkTokensScreen
+          // renders with the token preselected (SET_SETUP_DEPOSIT_TOKEN pin
+          // above) and the user can set a spending limit before approving.
           // Pin the existing account id so pairing and signing share one
           // runtime (see handleSelectWalletConnectWallet).
           walletConnectRuntimeKey: runtimeAccountId,
@@ -19234,10 +20239,11 @@ function useProviderHandlers(deps) {
           // Require the target token's chain at pairing. A reused session
           // that doesn't approve it re-pairs with the chain required; a
           // wallet that approves the connection without it fails
-          // OPEN_PROVIDER with a clear error instead of the auto-resolved
-          // SELECT_SOURCE 422 (INVALID_SELECT_SOURCE_SELECTION) — e.g.
-          // authorizing USDC on HyperEVM (999, a WC-optional chain) with a
-          // wallet that dropped or doesn't support that chain.
+          // OPEN_PROVIDER with a clear error up front instead of stranding the
+          // user on LinkTokensScreen whose only option (SELECT_SOURCE) would
+          // 422 (INVALID_SELECT_SOURCE_SELECTION) on Approve — e.g. authorizing
+          // USDC on HyperEVM (999, a WC-optional chain) with a wallet that
+          // dropped or doesn't support that chain.
           walletConnectRequiredChainId: chainId,
           walletConnectRequiredChainName: inlineChain.name,
           onWalletConnectDisplayUri: (uri) => {
@@ -19273,11 +20279,17 @@ function useProviderHandlers(deps) {
       dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: false });
       dispatch({ type: "BEGIN_LINK_SETTLING" });
       try {
-        await reloadAccounts();
+        await reloadAccounts({ awaitBalances: true });
       } finally {
         dispatch({ type: "END_LINK_SETTLING" });
       }
-      dispatch({ type: "SELECT_TOKEN", walletId, tokenSymbol, accountId: selectTokenAccountId });
+      const confirmed = setupDepositTokenRef.current;
+      dispatch({
+        type: "SELECT_TOKEN",
+        walletId: confirmed?.walletId ?? walletId,
+        tokenSymbol: confirmed?.symbol ?? tokenSymbol,
+        accountId: selectTokenAccountId
+      });
       dispatch({ type: "DISCARD_SAVED_SELECTION" });
     } catch (err) {
       captureException(err);
@@ -19592,10 +20604,7 @@ function useProviderHandlers(deps) {
         walletDeeplinks: walletDeeplinks ?? null,
         providerId: matchedProvider?.id ?? null
       });
-      const result = await orchestrator.run(
-        session.id,
-        buildDesktopTokenAuthorizationOnlyRunOptions(inlineChain.name, tokenSymbol)
-      );
+      const result = await orchestrator.run(session.id);
       if (result.status === "cancelled") {
         dispatch({ type: "DESKTOP_WAIT_CLEARED" });
         dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: false });
@@ -19607,14 +20616,25 @@ function useProviderHandlers(deps) {
       }
       dispatch({ type: "DESKTOP_WAIT_CLEARED" });
       dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: false });
+      const confirmed = setupDepositTokenRef.current;
+      const settleTarget = {
+        accountId: _accountId,
+        walletId: confirmed?.walletId ?? _walletId,
+        tokenSymbol: confirmed?.symbol ?? tokenSymbol
+      };
       dispatch({ type: "BEGIN_LINK_SETTLING" });
       try {
-        await reloadAccounts();
+        await settleUntilTokenAuthorized(reloadAccounts, settleTarget);
+        dispatch({
+          type: "SELECT_TOKEN",
+          walletId: settleTarget.walletId,
+          tokenSymbol: settleTarget.tokenSymbol,
+          accountId: _accountId
+        });
+        dispatch({ type: "DISCARD_SAVED_SELECTION" });
       } finally {
         dispatch({ type: "END_LINK_SETTLING" });
       }
-      dispatch({ type: "SELECT_TOKEN", walletId: _walletId, tokenSymbol, accountId: _accountId });
-      dispatch({ type: "DISCARD_SAVED_SELECTION" });
     } catch (err) {
       captureException(err);
       dispatch({ type: "DESKTOP_WAIT_CLEARED" });
@@ -20074,6 +21094,15 @@ function useDataLoadEffect(deps) {
       hasActiveCredential: !!state.activeCredentialId,
       loading: loadingDataRef.current
     });
+    appendDebug("warn", "dataLoadEffect run", {
+      loadAction,
+      authenticated,
+      accountsCount: state.accounts.length,
+      hasActiveCredential: !!state.activeCredentialId,
+      loadingRef: loadingDataRef.current,
+      privyAuthenticated: state.privyAuthenticated,
+      activeCredentialId: state.activeCredentialId ? `${state.activeCredentialId.slice(0, 8)}\u2026` : null
+    });
     if (loadAction === "reset") {
       loadingDataRef.current = false;
       dispatch({ type: "DATA_LOAD_END" });
@@ -20091,13 +21120,21 @@ function useDataLoadEffect(deps) {
     const load = async () => {
       dispatch({ type: "DATA_LOAD_START" });
       try {
+        appendDebug("warn", "dataLoad: requesting access token");
         const token = await getAccessTokenRef.current();
+        appendDebug("warn", "dataLoad: token result", { hasToken: !!token, cancelled });
         if (!token) throw new Error("Not authenticated");
         const [prov, accts, chn] = await Promise.all([
           fetchProviders(apiBaseUrl, token),
           fetchAccounts(apiBaseUrl, token, credentialId),
           fetchChains(apiBaseUrl, token)
         ]);
+        appendDebug("warn", "dataLoad: fetch resolved", {
+          cancelled,
+          providers: prov.length,
+          accounts: accts.length,
+          chains: chn.length
+        });
         if (cancelled) return;
         const parsedAmt = depositAmountRef.current != null ? depositAmountRef.current : 0;
         const priorityContext = resolveDepositPriorityContext(accts, chn, destination);
@@ -20123,7 +21160,16 @@ function useDataLoadEffect(deps) {
           resetSelectedTokenSymbol
         });
         if (clearMobile) clearMobileFlowState();
+        void fetchBalancesByAccountId(apiBaseUrl, token, credentialId, accts).then(
+          (balancesByAccountId) => {
+            dispatch({ type: "BALANCES_LOADED", balancesByAccountId });
+          }
+        );
       } catch (err) {
+        appendDebug("error", "dataLoad: threw", {
+          cancelled,
+          message: err instanceof Error ? err.message : String(err)
+        });
         if (!cancelled) {
           captureException(err);
           dispatch({
@@ -20140,6 +21186,7 @@ function useDataLoadEffect(deps) {
     };
     load();
     return () => {
+      appendDebug("warn", "dataLoadEffect cleanup (cancelling in-flight load)");
       cancelled = true;
       loadingDataRef.current = false;
       dispatch({ type: "DATA_LOAD_END" });
@@ -20883,7 +21930,7 @@ function BlinkPaymentInner({
     useWalletConnector: useWalletConnectorProp,
     userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
   });
-  const [state, dispatch] = useReducer(
+  const [state, rawDispatch] = useReducer(
     paymentReducer,
     {
       depositAmount,
@@ -20893,6 +21940,30 @@ function BlinkPaymentInner({
     },
     createInitialState
   );
+  const device = isDesktop ? "desktop" : "mobile";
+  const stateRef = useRef(state);
+  stateRef.current = state;
+  const dispatch = useCallback(
+    (action) => {
+      trackAction(action, stateRef.current, { device });
+      rawDispatch(action);
+    },
+    [device]
+  );
+  usePostHogIdentify();
+  useAnalyticsScreenView(state.phase, device);
+  const flowOpenedRef = useRef(false);
+  useEffect(() => {
+    if (flowOpenedRef.current) return;
+    flowOpenedRef.current = true;
+    registerSuperProps({ device });
+    track("flow_opened", {
+      device,
+      isMobileApp: isMobileApp ?? false,
+      fullWidget: enableFullWidget ?? false,
+      hasAmount: depositAmount != null
+    });
+  }, []);
   const polling = useTransferPolling(3e3, effectiveGetAccessToken);
   const transferSigning = useTransferSigning(2e3, { getAccessToken: effectiveGetAccessToken });
   const mobileFlowRefs = {
@@ -21251,7 +22322,7 @@ function BlinkPaymentInner({
   const handleSetDepositToken = useCallback((symbol, chainName, walletId, tokenAddress, chainId) => {
     dispatch({ type: "SET_SETUP_DEPOSIT_TOKEN", symbol, chainName, walletId, tokenAddress, chainId });
   }, []);
-  const handleConfirmSetupDeposit = useCallback(async () => {
+  const handleConfirmSetupDeposit = useCallback(async (limit) => {
     const plan = planConfirmSetupDeposit({
       setupDepositToken: state.setupDepositToken,
       setupSelectedSourceOption,
@@ -21261,6 +22332,19 @@ function BlinkPaymentInner({
       dispatch({ type: "SET_ERROR", error: plan.error });
       return;
     }
+    const token = await effectiveGetAccessToken();
+    if (!token) {
+      dispatch({ type: "SET_ERROR", error: "Your session expired. Please try again." });
+      return;
+    }
+    const config = "unlimited" in limit ? { unlimitedAllowance: true } : { defaultAllowance: limit.usd, unlimitedAllowance: false };
+    try {
+      await updateUserConfig(apiBaseUrl, token, config);
+    } catch {
+      dispatch({ type: "SET_ERROR", error: "Could not save your spending limit. Please try again." });
+      return;
+    }
+    dispatch({ type: "SET_SETUP_SPENDING_LIMIT", limit });
     for (const action of plan.actions) {
       dispatch(action);
     }
@@ -21269,6 +22353,8 @@ function BlinkPaymentInner({
     state.selectedAccountId,
     state.setupDepositToken,
     setupSelectedSourceOption,
+    effectiveGetAccessToken,
+    apiBaseUrl,
     dispatch,
     orchestrator
   ]);
@@ -21329,6 +22415,9 @@ function BlinkPaymentInner({
       }
     })();
   }, [orchestrator]);
+  const handleApprove = useCallback(() => {
+    authExecutor.approveAuthorization();
+  }, [authExecutor]);
   const handleSetPhase = useCallback((phase) => {
     clearScreenErrors();
     if (phase.step === "deposit") {
@@ -21350,6 +22439,7 @@ function BlinkPaymentInner({
     onConfirmSign: transfer.handleConfirmSign,
     onRetryMobileStatus: mobileFlow.handleRetryMobileStatus,
     onRetryAuthorization: handleAuthorizationRetry,
+    onApprove: handleApprove,
     onRetryTransferSigning: transfer.handleRetryTransferSigning,
     onBackFromOpenWallet: handleBackFromOpenWallet,
     onLogout: handleLogout,
@@ -21420,6 +22510,7 @@ function BlinkPaymentInner({
     handleConfirmSetupDeposit,
     handleBackFromSetupDeposit,
     handleAuthorizationRetry,
+    handleApprove,
     disconnectWallets,
     state.desktopWait?.walletForegroundLink
   ]);
@@ -21459,6 +22550,9 @@ function BlinkPaymentInner({
             authExecutorError: authExecutor.error,
             authExecutorExecuting: authExecutor.executing,
             authExecutorCurrentAction: authExecutor.currentAction,
+            authExecutorAwaitingApproval: authExecutor.awaitingApproval,
+            authExecutorApprovalDestinationAddress: authExecutor.approvalDestinationAddress,
+            authApprovalSmartAccountAddress: orchestrator.approvalSmartAccountAddress,
             authExecutorCompleted: orchestrator.orchestratorCompleted,
             transferSigningSigning: transferSigning.signing,
             transferSigningError: transferSigning.error,
@@ -21496,6 +22590,6 @@ function BlinkPaymentInner({
   ) });
 }
 
-export { ACCOUNT_SWITCH_CONFLICT_MESSAGE, AdvancedSourceScreen, ApprovingInWalletScreen, AuthorizationSessionCancelledError, BLINK_ERROR_ILLUSTRATION, BLINK_LOGO, BLINK_MASCOT, BLINK_PASSKEY_ILLUSTRATION, BLINK_SUCCESS_ILLUSTRATION, BlinkDepositButton, BlinkErrorScreen, BlinkInitialLoadingScreen, BlinkLoadingScreen, BlinkPayment, BlinkProvider, ConfirmSignScreen, DepositCompleteScreen, DepositOptionsScreen, DepositScreen, DepositTransferStatusScreen, GuestTokenPickerScreen, IconCircle, InfoBanner, LOGIN_KEY_ILLUSTRATION, LinkTokensScreen, LoginScreen, ManualTransferPasskeyScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyPopupWelcomeScreen, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SecondaryButton, SelectDepositSourceScreen, SelectSourceScreen, SettingsMenu, Spinner, StepList, StepRenderer, SuccessScreen, TokenPickerScreen, VerifyPasskeyScreen, WalletPickerScreen, WelcomeBackScreen, appendDebug, api_exports as blinkApi, buildNativeUnsupportedEntries, clearDebugEntries, createInitialState, credentialIdBase64ToBytes, darkTheme, darkThemeNew, darkTransparentTheme, darkTransparentThemeNew, deviceHasPasskey, encodePermit2ApproveCalldata, findDevicePasskey, findDevicePasskeyViaPopup, formatNativeAmount, getAtomicBatchSupportDebugInfo, getDebugEntries, getDeviceBiometricUnlockText, getTheme, getThemeBase, getWalletCapabilities, isAuthorizationSessionCancelled, isExpectedAuthorizationCancellation, isTerminalTransferStatus, isTransferAwaitingCompletion, isTransparentTheme, isUserDismissedAuthorizationError, isVisibleUsdAmountAtTwoDecimals, lightTheme, lightThemeNew, lightTransparentTheme, lightTransparentThemeNew, mapGuestPickerEntries, replaceOpenProviderForAccountSwitch, resolvePasskeyRpId, screenForPhase, subscribeDebug, supportsAtomicBatch, supportsPaymasterService, useAuthorizationExecutor, useAuthorizationOrchestrator, useBlinkConfig, useBlinkDebugLog, useBlinkDepositAmount, useSolanaAccountSwitchEffect, useTransferPolling, useTransferSigning };
+export { ACCOUNT_SWITCH_CONFLICT_MESSAGE, AdvancedSourceScreen, ApprovingInWalletScreen, AuthorizationSessionCancelledError, BLINK_ERROR_ILLUSTRATION, BLINK_LOGO, BLINK_MASCOT, BLINK_PASSKEY_ILLUSTRATION, BLINK_SUCCESS_ILLUSTRATION, BlinkDepositButton, BlinkErrorScreen, BlinkInitialLoadingScreen, BlinkLoadingScreen, BlinkPayment, BlinkProvider, ConfirmSignScreen, DepositCompleteScreen, DepositOptionsScreen, DepositScreen, DepositTransferStatusScreen, GuestTokenPickerScreen, IconCircle, InfoBanner, LOGIN_KEY_ILLUSTRATION, LinkTokensScreen, LoginScreen, ManualTransferPasskeyScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyPopupWelcomeScreen, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SecondaryButton, SelectDepositSourceScreen, SelectSourceScreen, SettingsMenu, Spinner, StepList, StepRenderer, SuccessScreen, TokenPickerScreen, VerifyPasskeyScreen, WalletPickerScreen, WelcomeBackScreen, appendDebug, api_exports as blinkApi, buildNativeUnsupportedEntries, clearDebugEntries, createInitialState, credentialIdBase64ToBytes, darkTheme, darkThemeNew, darkTransparentTheme, darkTransparentThemeNew, deviceHasPasskey, encodePermit2ApproveCalldata, findDevicePasskey, findDevicePasskeyViaPopup, formatNativeAmount, getAtomicBatchSupportDebugInfo, getDebugEntries, getDeviceBiometricUnlockText, getTheme, getThemeBase, getWalletCapabilities, identifyUser, isAuthorizationSessionCancelled, isExpectedAuthorizationCancellation, isTerminalTransferStatus, isTransferAwaitingCompletion, isTransparentTheme, isUserDismissedAuthorizationError, isVisibleUsdAmountAtTwoDecimals, lightTheme, lightThemeNew, lightTransparentTheme, lightTransparentThemeNew, mapGuestPickerEntries, replaceOpenProviderForAccountSwitch, resetUser, resolveAnalyticsEnvironment, resolvePasskeyRpId, sanitizeProps, screenForPhase, subscribeDebug, supportsAtomicBatch, supportsPaymasterService, track, useAuthorizationExecutor, useAuthorizationOrchestrator, useBlinkConfig, useBlinkDebugLog, useBlinkDepositAmount, useSolanaAccountSwitchEffect, useTransferPolling, useTransferSigning };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map