@swype-org/react-sdk 0.2.297 → 0.2.309

package/dist/index.js

@@ -41,6 +41,7 @@ var darkTheme = {
   accent: "#B2FF93",
   accentHover: "#8FD974",
   accentText: "#1B4332",
+  highlight: "#B2FF93",
   success: "#0f9d73",
   successBg: "#0f2f2a",
   error: "#d46a72",
@@ -72,6 +73,7 @@ var lightTheme = {
   accent: "#B2FF93",
   accentHover: "#8FD974",
   accentText: "#1B4332",
+  highlight: "#B2FF93",
   success: "#0f9d73",
   successBg: "#e6f7f1",
   error: "#ce6670",
@@ -113,6 +115,8 @@ var lightThemeNew = {
   accent: "#000000",
   accentHover: "#1a1a1a",
   accentText: "#fafafa",
+  // Figma `accent` token (#eaff03) — the lime "0% FEES" chip.
+  highlight: "#eaff03",
   success: "#0f9d73",
   successBg: "#e6f7f1",
   error: "#ce6670",
@@ -517,12 +521,16 @@ function buildSelectSourceChoices(options, minTransferAmountUsd = DEFAULT_MIN_SE
       } else if (!existing.walletName && option.walletName) {
         existing.walletName = option.walletName;
       }
+      if (!existing.logoURI && option.logoURI) {
+        existing.logoURI = option.logoURI;
+      }
     } else {
       chainChoice.tokens.push({
         tokenSymbol,
         balance,
         ...option.walletName ? { walletName: option.walletName } : {},
-        ...option.walletLogoUrl ? { walletLogoUrl: option.walletLogoUrl } : {}
+        ...option.walletLogoUrl ? { walletLogoUrl: option.walletLogoUrl } : {},
+        ...option.logoURI ? { logoURI: option.logoURI } : {}
       });
     }
   }
@@ -1383,6 +1391,263 @@ async function revokeAndDisconnectActiveWagmiConnector(wagmiConfig) {
   });
 }
 
+// src/solanaWalletRuntime.ts
+function asSigner(adapter) {
+  return adapter;
+}
+var PHANTOM_SOLANA_CONNECT_TIMEOUT_MESSAGE = "PHANTOM_SOLANA_CONNECT_TIMEOUT";
+var APPROVE_SPL_CONFIRMATION_TIMEOUT_MESSAGE = "APPROVE_SPL_CONFIRMATION_TIMEOUT";
+var APPROVE_SPL_ONCHAIN_FAILURE_PREFIX = "Solana transaction failed:";
+var DEFAULT_CONFIRM_TIMEOUT_MS = 45e3;
+var DEFAULT_POLL_INTERVAL_MS = 1e3;
+var DEFAULT_COMMITMENT = "confirmed";
+var cachedAdapter = null;
+var cachedProviderKey = null;
+function providerKey(selection) {
+  const providerName = selection.providerName?.trim();
+  if (!providerName) {
+    throw new Error("Solana wallet metadata is missing providerName.");
+  }
+  return `${selection.providerId ?? ""}:${providerName.toLowerCase()}`;
+}
+function assertSupportedProvider(selection) {
+  const name = selection.providerName?.trim().toLowerCase();
+  if (name !== "phantom") {
+    throw new Error(`Unsupported Solana wallet provider: ${selection.providerName ?? "unknown"}.`);
+  }
+}
+async function createAdapter(selection) {
+  assertSupportedProvider(selection);
+  const { PhantomWalletAdapter } = await import('@solana/wallet-adapter-phantom');
+  return new PhantomWalletAdapter();
+}
+function readPublicKey(adapter) {
+  const publicKey = adapter.publicKey?.toBase58();
+  if (!publicKey) {
+    throw new Error("Solana wallet did not return a public key.");
+  }
+  return publicKey;
+}
+async function connectSolanaWallet(selection, options) {
+  const key = providerKey(selection);
+  if (!cachedAdapter || cachedProviderKey !== key) {
+    cachedAdapter = await createAdapter(selection);
+    cachedProviderKey = key;
+  }
+  if (!cachedAdapter.connected) {
+    const adapter = cachedAdapter;
+    const connectPromise = adapter.connect();
+    const timeoutMs = options?.timeoutMs;
+    if (typeof timeoutMs === "number" && timeoutMs > 0) {
+      let timeoutHandle = null;
+      const timeoutPromise = new Promise((_, reject) => {
+        timeoutHandle = setTimeout(() => {
+          reject(new Error(PHANTOM_SOLANA_CONNECT_TIMEOUT_MESSAGE));
+        }, timeoutMs);
+      });
+      try {
+        await Promise.race([connectPromise, timeoutPromise]);
+      } finally {
+        if (timeoutHandle) clearTimeout(timeoutHandle);
+      }
+    } else {
+      await connectPromise;
+    }
+  }
+  return {
+    adapter: cachedAdapter,
+    publicKey: readPublicKey(cachedAdapter)
+  };
+}
+async function signSolanaTransaction(selection, unsignedTxBase64, expectedOwnerPubkey) {
+  const { adapter, publicKey } = await connectSolanaWallet(selection);
+  if (publicKey !== expectedOwnerPubkey) {
+    throw new Error(
+      `Connected Solana wallet ${publicKey} does not match the required source wallet ${expectedOwnerPubkey}. Please switch accounts in Phantom and retry.`
+    );
+  }
+  const signer = asSigner(adapter);
+  if (typeof signer.signTransaction !== "function") {
+    throw new Error("Selected Solana wallet does not support transaction signing.");
+  }
+  const transaction = await deserializeTransaction(unsignedTxBase64);
+  const signedTransaction = await signer.signTransaction(transaction);
+  return {
+    ownerPubkey: publicKey,
+    signedTxBase64: bytesToBase64(serializeTransaction(signedTransaction))
+  };
+}
+async function deserializeTransaction(unsignedTxBase64) {
+  const { Transaction, VersionedTransaction } = await import('@solana/web3.js');
+  const bytes = base64ToBytes(unsignedTxBase64);
+  try {
+    return Transaction.from(bytes);
+  } catch {
+    return VersionedTransaction.deserialize(bytes);
+  }
+}
+function serializeTransaction(transaction) {
+  if ("version" in transaction) {
+    return transaction.serialize();
+  }
+  return transaction.serialize({
+    requireAllSignatures: false,
+    verifySignatures: false
+  });
+}
+function base64ToBytes(value) {
+  if (typeof globalThis.atob === "function") {
+    const binary = globalThis.atob(value);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+      bytes[i] = binary.charCodeAt(i);
+    }
+    return bytes;
+  }
+  const bufferCtor = globalThis.Buffer;
+  if (bufferCtor) {
+    return bufferCtor.from(value, "base64");
+  }
+  throw new Error("Base64 decoding is not available in this environment.");
+}
+function bytesToBase64(bytes) {
+  if (typeof globalThis.btoa === "function") {
+    let binary = "";
+    for (const byte of bytes) {
+      binary += String.fromCharCode(byte);
+    }
+    return globalThis.btoa(binary);
+  }
+  const bufferCtor = globalThis.Buffer;
+  if (bufferCtor) {
+    return bufferCtor.from(bytes).toString("base64");
+  }
+  throw new Error("Base64 encoding is not available in this environment.");
+}
+async function signAndSendApproveSplViaWallet(params) {
+  const rpcUrl = params.rpcUrl?.trim();
+  if (!rpcUrl) {
+    throw new Error("signAndSendApproveSplViaWallet requires an rpcUrl.");
+  }
+  const unsignedTxBase64 = params.unsignedTxBase64?.trim();
+  if (!unsignedTxBase64) {
+    throw new Error("signAndSendApproveSplViaWallet requires unsignedTxBase64.");
+  }
+  const commitment = params.commitment ?? DEFAULT_COMMITMENT;
+  const { adapter, publicKey } = await connectSolanaWallet(params.selection);
+  if (publicKey !== params.expectedOwnerPubkey) {
+    throw new Error(
+      `Connected Solana wallet ${publicKey} does not match the required source wallet ${params.expectedOwnerPubkey}. Please switch accounts in Phantom and retry.`
+    );
+  }
+  if (!adapter.sendTransaction) {
+    throw new Error("Selected Solana wallet does not support sendTransaction.");
+  }
+  const transaction = await deserializeTransaction(unsignedTxBase64);
+  const connection = await defaultConnectionFactory(rpcUrl, commitment);
+  const signature = await adapter.sendTransaction(
+    transaction,
+    connection,
+    {
+      preflightCommitment: commitment,
+      maxRetries: 3
+    }
+  );
+  return { ownerPubkey: publicKey, signature };
+}
+async function confirmApproveSplViaPolling(params) {
+  const rpcUrl = params.rpcUrl?.trim();
+  if (!rpcUrl) {
+    throw new Error("confirmApproveSplViaPolling requires an rpcUrl.");
+  }
+  const signature = params.signature?.trim();
+  if (!signature) {
+    throw new Error("confirmApproveSplViaPolling requires a signature.");
+  }
+  const confirmTimeoutMs = params.confirmTimeoutMs ?? DEFAULT_CONFIRM_TIMEOUT_MS;
+  const pollIntervalMs = params.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+  const commitment = params.commitment ?? DEFAULT_COMMITMENT;
+  const connection = await defaultConnectionFactory(rpcUrl, commitment);
+  const slot = await pollForConfirmation({
+    connection,
+    signature,
+    confirmTimeoutMs,
+    pollIntervalMs
+  });
+  return { signature, slot };
+}
+async function defaultConnectionFactory(rpcUrl, commitment) {
+  const { Connection } = await import('@solana/web3.js');
+  return new Connection(rpcUrl, commitment);
+}
+async function pollForConfirmation(args) {
+  const { connection, signature, confirmTimeoutMs, pollIntervalMs } = args;
+  const expiresAt = Date.now() + confirmTimeoutMs;
+  while (Date.now() <= expiresAt) {
+    const result = await connection.getSignatureStatuses(
+      [signature],
+      { searchTransactionHistory: true }
+    );
+    const status = result.value[0];
+    if (status?.err) {
+      throw new Error(`${APPROVE_SPL_ONCHAIN_FAILURE_PREFIX} ${JSON.stringify(status.err)}`);
+    }
+    const confirmationStatus = status?.confirmationStatus;
+    if (confirmationStatus === "confirmed" || confirmationStatus === "finalized") {
+      return status?.slot;
+    }
+    await sleep(pollIntervalMs);
+  }
+  throw new Error(APPROVE_SPL_CONFIRMATION_TIMEOUT_MESSAGE);
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function getInjectedSolanaProvider(windowImpl) {
+  const win = (typeof window === "undefined" ? void 0 : window);
+  if (!win) return null;
+  return win.phantom?.solana ?? win.solana ?? null;
+}
+async function disconnectSolanaWallet(windowImpl) {
+  const adapter = cachedAdapter;
+  cachedAdapter = null;
+  cachedProviderKey = null;
+  if (adapter?.connected) {
+    try {
+      console.info("[blink-sdk][solana-disconnect] disconnecting cached adapter");
+      await adapter.disconnect();
+      console.info("[blink-sdk][solana-disconnect] ok (cached adapter)");
+      return;
+    } catch (err) {
+      console.warn("[blink-sdk][solana-disconnect] cached adapter disconnect failed", {
+        message: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  const provider = getInjectedSolanaProvider();
+  if (!provider) {
+    console.info("[blink-sdk][solana-disconnect] no cached adapter and no injected provider \u2014 nothing to disconnect");
+    return;
+  }
+  if (provider.isConnected === false) {
+    console.info("[blink-sdk][solana-disconnect] injected provider already disconnected");
+    return;
+  }
+  if (typeof provider.disconnect !== "function") {
+    console.warn("[blink-sdk][solana-disconnect] injected provider has no disconnect() method");
+    return;
+  }
+  try {
+    console.info("[blink-sdk][solana-disconnect] disconnecting injected provider");
+    await provider.disconnect();
+    console.info("[blink-sdk][solana-disconnect] ok (injected provider)");
+  } catch (err) {
+    console.warn("[blink-sdk][solana-disconnect] injected provider disconnect failed", {
+      message: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
+
 // src/otherWalletConnect.ts
 function findWalletConnectConnector(connectors) {
   return connectors.find((connector) => {
@@ -1812,6 +2077,7 @@ __export(api_exports, {
   setAuthorizationSessionPaymentIntentAmount: () => setAuthorizationSessionPaymentIntentAmount,
   setAuthorizationSessionProvider: () => setAuthorizationSessionProvider,
   signTransfer: () => signTransfer,
+  updateManualTransferDepositTargetChain: () => updateManualTransferDepositTargetChain,
   updateUserConfig: () => updateUserConfig,
   updateUserConfigBySession: () => updateUserConfigBySession,
   waitForActionTransactionReceipt: () => waitForActionTransactionReceipt
@@ -2210,6 +2476,15 @@ async function fetchManualTransferSession(apiBaseUrl, sessionId) {
   if (!res.ok) await throwApiError(res);
   return await res.json();
 }
+async function updateManualTransferDepositTargetChain(apiBaseUrl, sessionId, selectedChainId) {
+  const res = await fetch(`${apiBaseUrl}/v1/manual-transfers/${sessionId}`, {
+    method: "PATCH",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ selectedChainId })
+  });
+  if (!res.ok) await throwApiError(res);
+  return await res.json();
+}
 async function refreshManualTransferQuote(apiBaseUrl, sessionId) {
   const res = await fetch(
     `${apiBaseUrl}/v1/manual-transfers/${sessionId}/refresh-quote`,
@@ -2962,7 +3237,7 @@ async function waitForWalletNonceAgreement(params) {
 }
 
 // src/walletCallsStatus.ts
-var DEFAULT_POLL_INTERVAL_MS = 2e3;
+var DEFAULT_POLL_INTERVAL_MS2 = 2e3;
 var DEFAULT_MAX_ATTEMPTS = 60;
 var DEFAULT_REQUEST_TIMEOUT_MS = 8e3;
 var DEFAULT_MAX_CONSECUTIVE_ERRORS = 5;
@@ -2984,7 +3259,7 @@ function classifyCallsStatus(status) {
   return "pending";
 }
 async function pollWalletCallsStatus(walletClient, callsId, options = {}) {
-  const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+  const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS2;
   const maxAttempts = options.maxAttempts ?? DEFAULT_MAX_ATTEMPTS;
   const requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
   const maxConsecutiveErrors = options.maxConsecutiveErrors ?? DEFAULT_MAX_CONSECUTIVE_ERRORS;
@@ -3102,219 +3377,6 @@ async function withWatchdog(promise, label, options = {}) {
   }
 }
 
-// src/solanaWalletRuntime.ts
-function asSigner(adapter) {
-  return adapter;
-}
-var PHANTOM_SOLANA_CONNECT_TIMEOUT_MESSAGE = "PHANTOM_SOLANA_CONNECT_TIMEOUT";
-var APPROVE_SPL_CONFIRMATION_TIMEOUT_MESSAGE = "APPROVE_SPL_CONFIRMATION_TIMEOUT";
-var APPROVE_SPL_ONCHAIN_FAILURE_PREFIX = "Solana transaction failed:";
-var DEFAULT_CONFIRM_TIMEOUT_MS = 45e3;
-var DEFAULT_POLL_INTERVAL_MS2 = 1e3;
-var DEFAULT_COMMITMENT = "confirmed";
-var cachedAdapter = null;
-var cachedProviderKey = null;
-function providerKey(selection) {
-  const providerName = selection.providerName?.trim();
-  if (!providerName) {
-    throw new Error("Solana wallet metadata is missing providerName.");
-  }
-  return `${selection.providerId ?? ""}:${providerName.toLowerCase()}`;
-}
-function assertSupportedProvider(selection) {
-  const name = selection.providerName?.trim().toLowerCase();
-  if (name !== "phantom") {
-    throw new Error(`Unsupported Solana wallet provider: ${selection.providerName ?? "unknown"}.`);
-  }
-}
-async function createAdapter(selection) {
-  assertSupportedProvider(selection);
-  const { PhantomWalletAdapter } = await import('@solana/wallet-adapter-phantom');
-  return new PhantomWalletAdapter();
-}
-function readPublicKey(adapter) {
-  const publicKey = adapter.publicKey?.toBase58();
-  if (!publicKey) {
-    throw new Error("Solana wallet did not return a public key.");
-  }
-  return publicKey;
-}
-async function connectSolanaWallet(selection, options) {
-  const key = providerKey(selection);
-  if (!cachedAdapter || cachedProviderKey !== key) {
-    cachedAdapter = await createAdapter(selection);
-    cachedProviderKey = key;
-  }
-  if (!cachedAdapter.connected) {
-    const adapter = cachedAdapter;
-    const connectPromise = adapter.connect();
-    const timeoutMs = options?.timeoutMs;
-    if (typeof timeoutMs === "number" && timeoutMs > 0) {
-      let timeoutHandle = null;
-      const timeoutPromise = new Promise((_, reject) => {
-        timeoutHandle = setTimeout(() => {
-          reject(new Error(PHANTOM_SOLANA_CONNECT_TIMEOUT_MESSAGE));
-        }, timeoutMs);
-      });
-      try {
-        await Promise.race([connectPromise, timeoutPromise]);
-      } finally {
-        if (timeoutHandle) clearTimeout(timeoutHandle);
-      }
-    } else {
-      await connectPromise;
-    }
-  }
-  return {
-    adapter: cachedAdapter,
-    publicKey: readPublicKey(cachedAdapter)
-  };
-}
-async function signSolanaTransaction(selection, unsignedTxBase64, expectedOwnerPubkey) {
-  const { adapter, publicKey } = await connectSolanaWallet(selection);
-  if (publicKey !== expectedOwnerPubkey) {
-    throw new Error(
-      `Connected Solana wallet ${publicKey} does not match the required source wallet ${expectedOwnerPubkey}. Please switch accounts in Phantom and retry.`
-    );
-  }
-  const signer = asSigner(adapter);
-  if (typeof signer.signTransaction !== "function") {
-    throw new Error("Selected Solana wallet does not support transaction signing.");
-  }
-  const transaction = await deserializeTransaction(unsignedTxBase64);
-  const signedTransaction = await signer.signTransaction(transaction);
-  return {
-    ownerPubkey: publicKey,
-    signedTxBase64: bytesToBase64(serializeTransaction(signedTransaction))
-  };
-}
-async function deserializeTransaction(unsignedTxBase64) {
-  const { Transaction, VersionedTransaction } = await import('@solana/web3.js');
-  const bytes = base64ToBytes(unsignedTxBase64);
-  try {
-    return Transaction.from(bytes);
-  } catch {
-    return VersionedTransaction.deserialize(bytes);
-  }
-}
-function serializeTransaction(transaction) {
-  if ("version" in transaction) {
-    return transaction.serialize();
-  }
-  return transaction.serialize({
-    requireAllSignatures: false,
-    verifySignatures: false
-  });
-}
-function base64ToBytes(value) {
-  if (typeof globalThis.atob === "function") {
-    const binary = globalThis.atob(value);
-    const bytes = new Uint8Array(binary.length);
-    for (let i = 0; i < binary.length; i++) {
-      bytes[i] = binary.charCodeAt(i);
-    }
-    return bytes;
-  }
-  const bufferCtor = globalThis.Buffer;
-  if (bufferCtor) {
-    return bufferCtor.from(value, "base64");
-  }
-  throw new Error("Base64 decoding is not available in this environment.");
-}
-function bytesToBase64(bytes) {
-  if (typeof globalThis.btoa === "function") {
-    let binary = "";
-    for (const byte of bytes) {
-      binary += String.fromCharCode(byte);
-    }
-    return globalThis.btoa(binary);
-  }
-  const bufferCtor = globalThis.Buffer;
-  if (bufferCtor) {
-    return bufferCtor.from(bytes).toString("base64");
-  }
-  throw new Error("Base64 encoding is not available in this environment.");
-}
-async function signAndSendApproveSplViaWallet(params) {
-  const rpcUrl = params.rpcUrl?.trim();
-  if (!rpcUrl) {
-    throw new Error("signAndSendApproveSplViaWallet requires an rpcUrl.");
-  }
-  const unsignedTxBase64 = params.unsignedTxBase64?.trim();
-  if (!unsignedTxBase64) {
-    throw new Error("signAndSendApproveSplViaWallet requires unsignedTxBase64.");
-  }
-  const commitment = params.commitment ?? DEFAULT_COMMITMENT;
-  const { adapter, publicKey } = await connectSolanaWallet(params.selection);
-  if (publicKey !== params.expectedOwnerPubkey) {
-    throw new Error(
-      `Connected Solana wallet ${publicKey} does not match the required source wallet ${params.expectedOwnerPubkey}. Please switch accounts in Phantom and retry.`
-    );
-  }
-  if (!adapter.sendTransaction) {
-    throw new Error("Selected Solana wallet does not support sendTransaction.");
-  }
-  const transaction = await deserializeTransaction(unsignedTxBase64);
-  const connection = await defaultConnectionFactory(rpcUrl, commitment);
-  const signature = await adapter.sendTransaction(
-    transaction,
-    connection,
-    {
-      preflightCommitment: commitment,
-      maxRetries: 3
-    }
-  );
-  return { ownerPubkey: publicKey, signature };
-}
-async function confirmApproveSplViaPolling(params) {
-  const rpcUrl = params.rpcUrl?.trim();
-  if (!rpcUrl) {
-    throw new Error("confirmApproveSplViaPolling requires an rpcUrl.");
-  }
-  const signature = params.signature?.trim();
-  if (!signature) {
-    throw new Error("confirmApproveSplViaPolling requires a signature.");
-  }
-  const confirmTimeoutMs = params.confirmTimeoutMs ?? DEFAULT_CONFIRM_TIMEOUT_MS;
-  const pollIntervalMs = params.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS2;
-  const commitment = params.commitment ?? DEFAULT_COMMITMENT;
-  const connection = await defaultConnectionFactory(rpcUrl, commitment);
-  const slot = await pollForConfirmation({
-    connection,
-    signature,
-    confirmTimeoutMs,
-    pollIntervalMs
-  });
-  return { signature, slot };
-}
-async function defaultConnectionFactory(rpcUrl, commitment) {
-  const { Connection } = await import('@solana/web3.js');
-  return new Connection(rpcUrl, commitment);
-}
-async function pollForConfirmation(args) {
-  const { connection, signature, confirmTimeoutMs, pollIntervalMs } = args;
-  const expiresAt = Date.now() + confirmTimeoutMs;
-  while (Date.now() <= expiresAt) {
-    const result = await connection.getSignatureStatuses(
-      [signature],
-      { searchTransactionHistory: true }
-    );
-    const status = result.value[0];
-    if (status?.err) {
-      throw new Error(`${APPROVE_SPL_ONCHAIN_FAILURE_PREFIX} ${JSON.stringify(status.err)}`);
-    }
-    const confirmationStatus = status?.confirmationStatus;
-    if (confirmationStatus === "confirmed" || confirmationStatus === "finalized") {
-      return status?.slot;
-    }
-    await sleep(pollIntervalMs);
-  }
-  throw new Error(APPROVE_SPL_CONFIRMATION_TIMEOUT_MESSAGE);
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // src/walletConnectRuntime.ts
 var PRIMARY_CHAIN_ID = 8453;
 var OPTIONAL_CHAIN_IDS = [1, 42161, 137, 56, 6342, 10143, 999, 84532];
@@ -6966,6 +7028,7 @@ function useManualTransferSession({
   const completedRef = useRef(/* @__PURE__ */ new Set());
   const premintedFamiliesRef = useRef(/* @__PURE__ */ new Set());
   const inFlightPerTokenRef = useRef(/* @__PURE__ */ new Set());
+  const reportedTargetChainRef = useRef(/* @__PURE__ */ new Map());
   useEffect(() => {
     if (!merchantAuthorization) return;
     let cancelled = false;
@@ -7118,6 +7181,51 @@ function useManualTransferSession({
     }, 2e3);
     return () => window.clearInterval(timer);
   }, [apiBaseUrl, activeSessionId, activeSessionStatus, pollEnabled]);
+  const selectedSourceChainId = selectedOption?.chainId;
+  const sessionRegistrationChainId = session?.source.chainId;
+  useEffect(() => {
+    if (!activeSessionId) return;
+    if (selectedSourceChainId === void 0) return;
+    if (sessionRegistrationChainId === void 0) return;
+    if (!selectedOption) return;
+    if (selectedOption.chainFamily !== "evm") return;
+    if (isSameChainSameTokenSelection(selectedOption, destination)) return;
+    const lastReported = reportedTargetChainRef.current.get(activeSessionId) ?? sessionRegistrationChainId;
+    if (selectedSourceChainId === lastReported) return;
+    reportedTargetChainRef.current.set(activeSessionId, selectedSourceChainId);
+    let cancelled = false;
+    updateManualTransferDepositTargetChain(apiBaseUrl, activeSessionId, selectedSourceChainId).then((updated) => {
+      if (cancelled) return;
+      setSessionsByFamily((prev) => {
+        for (const family of Object.keys(prev)) {
+          if (prev[family]?.sessionId === updated.sessionId) {
+            return { ...prev, [family]: updated };
+          }
+        }
+        return prev;
+      });
+      setPerTokenSessions((prev) => {
+        for (const k of Object.keys(prev)) {
+          if (prev[k]?.sessionId === updated.sessionId) {
+            return { ...prev, [k]: updated };
+          }
+        }
+        return prev;
+      });
+    }).catch(() => {
+      reportedTargetChainRef.current.set(activeSessionId, lastReported);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    apiBaseUrl,
+    activeSessionId,
+    selectedSourceChainId,
+    sessionRegistrationChainId,
+    selectedOption,
+    destination
+  ]);
   const completionSignature = useMemo(() => {
     const entries2 = [];
     for (const family of Object.keys(sessionsByFamily)) {
@@ -8393,12 +8501,32 @@ function PrimaryButton({
   icon,
   progress,
   progressText,
-  progressPaused
+  progressPaused,
+  spinnerOnly
 }) {
   const { tokens } = useBlinkConfig();
   const inProgress = progress != null;
   const isDisabled = disabled || loading || inProgress;
   const done = inProgress && progress >= 1;
+  if (spinnerOnly) {
+    return /* @__PURE__ */ jsxs(
+      "button",
+      {
+        type: "button",
+        disabled: true,
+        "aria-label": "Please wait",
+        style: buttonStyle2(tokens, { disabled: false, loading: true }),
+        children: [
+          /* @__PURE__ */ jsx("span", { "aria-hidden": true, style: inlineSpinnerStyle(tokens.accentText) }),
+          /* @__PURE__ */ jsx("style", { children: `
+          @keyframes blink-spin {
+            to { transform: rotate(360deg); }
+          }
+        ` })
+        ]
+      }
+    );
+  }
   if (inProgress) {
     return /* @__PURE__ */ jsxs(
       "button",
@@ -8525,6 +8653,15 @@ var buttonStyle2 = (tokens, state) => {
     gap: 8
   };
 };
+var inlineSpinnerStyle = (color) => ({
+  width: 20,
+  height: 20,
+  border: `2px solid ${color}44`,
+  borderTopColor: color,
+  borderRadius: "50%",
+  animation: "blink-spin 0.9s linear infinite",
+  flexShrink: 0
+});
 var iconWrapStyle = {
   display: "flex",
   alignItems: "center"
@@ -10641,269 +10778,288 @@ var avatarStyle = (tokens) => ({
   color: tokens.textMuted,
   background: "transparent"
 });
-var LINK_ICON_DATA_URI = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAXCAYAAACS5bYWAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAK6ADAAQAAAABAAAAFwAAAAAKDRJ/AAADIUlEQVRIDaWXMWsVQRSFX9SABgQjRFAhRV4hPAsFLQKmVDsLhaTU0p/gb7CztfAPaJnSlBYWpgiooJIIEZMiRQoLhVh4vnXP8+6+ebsz8cB5M7t37p07996ZnTcz6MZQ4pG4JJ4XT4tt/NKLPXFHfCceijl4rEHYtT42PorbYhIzybeDAU7eFjFWik0pvBa7nMYuzqbAotdFnG/gZOPp78M9NffF+YQs59UlDboh/hZ3pygQzWvimYSceZdFAonjY7QjuyYJExkYJbUosdJUtCgNMnFVjLp6HGyIRLkL6LPAm2Jbnyy9FCvEyJL2lfo9DQ6+ELfEAxHHUyCCyD+IGMdpR8w1OS3CGlplgCBYn72xgEBgEXPiJx7sLKsi/QYRYUXTHPS4dst4HL4inq2Fi2pZcI4txjAWkC2A/lfx0M4+1IOjwWTr4nFBpJnQNTmrPhHCbi7I6mXREZ5Xf/OEfkgVD4B09NVYNbDn56fk41pTnzkcqR7VsThmttLHWUrAYEWpTWR5SYst6tBgwhKwYDa3McJZUmSUpMo6Xe2bIGTjlSIudoizF4OF76Gf2+UUeSreSSjsh3fnQj+329DH2YicHRvH07eTON0GqTS8gf2c0zb0cTY6mPr29xnt0/eG5TgsRWOBOBs3FMdFKfr0cfKJaKdL7McS3cfZeMsZlViqx74POqlSCOLibjyp9nA27ji+zaWlwBFlLKlTep5at91y9mPPqD4KTOYJqREuMyWI+uitiqULTs3Hxo0fq21/bqk7h/yC+hPXs5S18A6H0T8lsmDuBlsin97jgHJaCYqv1D+IzjLJYj2A8POx2BXjbq/FEw1jjkScBFxirouUWI6+hlUgko9EB46XbNC3dOws/c8i1zN/0Ygwq+Md+CF2RepbNepfzbJ49LGH3qyIjTZwcCguiw/EBdFoXKral28GkQIf9FaKLSXzTJwWsVuS3RX/t243ZKNx3MXISlaB+mNFRMQFXgnqHyL2RYzna5QTYeqVcc5SlPf1mZ8b18Q9JRXZaIzJOM5oIdHC2HMxByyWCwy0fluPDPGXCVLj2E/iD2Rfl2nM3a3EAAAAAElFTkSuQmCC";
+
+// src/deviceBiometricUnlockText.ts
+var FALLBACK = "Biometric verification";
+function getDeviceBiometricUnlockText() {
+  const ua = typeof navigator !== "undefined" && typeof navigator.userAgent === "string" ? navigator.userAgent : "";
+  if (/iPhone|iPad|iPod/i.test(ua)) {
+    return "Face ID";
+  }
+  if (/Android/i.test(ua)) {
+    return "Fingerprint or face unlock";
+  }
+  if (/Windows NT/i.test(ua)) {
+    return "Windows Hello";
+  }
+  if (/Macintosh|Mac OS X/i.test(ua)) {
+    return "Touch ID";
+  }
+  return FALLBACK;
+}
+var CLUSTER_LOGOS = [
+  METAMASK_LOGO,
+  PHANTOM_LOGO,
+  RABBY_LOGO,
+  OKX_WALLET_LOGO,
+  TRUST_WALLET_LOGO,
+  BASE_LOGO
+];
 function DepositOptionsScreen({
-  onFromWallet,
   onToAddress,
   onSignInWithBlink,
   onClose
 }) {
   const { tokens } = useBlinkConfig();
-  const headerRight = onClose ? /* @__PURE__ */ jsx(
-    "button",
-    {
-      type: "button",
-      onClick: onClose,
-      "aria-label": "Close",
-      style: closeButtonStyle2(tokens),
-      children: /* @__PURE__ */ jsx("svg", { width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx(
-        "path",
+  const depositLabel = `Deposit with ${getDeviceBiometricUnlockText()}`;
+  return /* @__PURE__ */ jsx(ScreenLayout, { children: /* @__PURE__ */ jsx("div", { style: sheetStyle, children: /* @__PURE__ */ jsxs("div", { style: contentStyle2, children: [
+    /* @__PURE__ */ jsxs("div", { style: headerRowStyle, children: [
+      /* @__PURE__ */ jsx("img", { src: BLINK_WORDMARK, alt: "Blink", style: wordmarkImgStyle }),
+      onClose ? /* @__PURE__ */ jsx(
+        "button",
         {
-          d: "M6 6l12 12M18 6L6 18",
-          stroke: "currentColor",
-          strokeWidth: "2",
-          strokeLinecap: "round",
-          strokeLinejoin: "round"
+          type: "button",
+          onClick: onClose,
+          "aria-label": "Close",
+          style: closeButtonStyle2(tokens.bgRecessed, tokens.text),
+          children: /* @__PURE__ */ jsx("svg", { width: "20", height: "20", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx(
+            "path",
+            {
+              d: "M6 6l12 12M18 6L6 18",
+              stroke: "currentColor",
+              strokeWidth: "2",
+              strokeLinecap: "round",
+              strokeLinejoin: "round"
+            }
+          ) })
         }
-      ) })
-    }
-  ) : void 0;
-  return /* @__PURE__ */ jsxs(
-    ScreenLayout,
-    {
-      footer: /* @__PURE__ */ jsx(PrimaryButton, { onClick: onSignInWithBlink, icon: /* @__PURE__ */ jsx(FaceIdIcon2, {}), children: "Sign in with Blink" }),
-      children: [
-        /* @__PURE__ */ jsx(
-          ScreenHeader,
+      ) : null
+    ] }),
+    /* @__PURE__ */ jsx("img", { src: BLINK_PASSKEY_ILLUSTRATION, alt: "", "aria-hidden": "true", style: heroStyle }),
+    /* @__PURE__ */ jsxs("div", { style: stackStyle, children: [
+      /* @__PURE__ */ jsxs("div", { style: depositPillWrapperStyle, children: [
+        /* @__PURE__ */ jsxs(
+          "button",
           {
-            title: "Deposit",
-            right: headerRight,
-            left: /* @__PURE__ */ jsx(
-              "img",
-              {
-                src: BLINK_WORDMARK,
-                alt: "Blink",
-                style: wordmarkStyle
-              }
-            )
+            type: "button",
+            onClick: onSignInWithBlink,
+            style: depositPillStyle(tokens.accent),
+            children: [
+              /* @__PURE__ */ jsx("span", { style: depositPillLabelStyle(tokens.accentText), children: depositLabel }),
+              /* @__PURE__ */ jsx("span", { style: clusterStyle, children: CLUSTER_LOGOS.map((logo, i) => /* @__PURE__ */ jsx(
+                "span",
+                {
+                  style: clusterChipStyle(tokens.bgInput, i === CLUSTER_LOGOS.length - 1),
+                  children: /* @__PURE__ */ jsx("img", { src: logo, alt: "", "aria-hidden": "true", style: clusterIconStyle })
+                },
+                logo
+              )) })
+            ]
           }
         ),
-        /* @__PURE__ */ jsxs("div", { style: contentStyle2, children: [
-          /* @__PURE__ */ jsx(DepositTypeToggle, { tokens }),
-          /* @__PURE__ */ jsxs("div", { style: cardStyle(tokens.bgCardTranslucent), children: [
-            /* @__PURE__ */ jsx(
-              SourceRow,
-              {
-                name: "Connect Wallet",
-                icon: /* @__PURE__ */ jsx(WalletIcon, { color: tokens.text }),
-                onClick: onFromWallet,
-                right: /* @__PURE__ */ jsx("span", { style: badgeWithArrowStyle, children: /* @__PURE__ */ jsx("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx("path", { d: "M9 6l6 6-6 6", stroke: tokens.textMuted, strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }) })
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              SourceRow,
-              {
-                name: "Address",
-                icon: /* @__PURE__ */ jsx(AddressIcon, { color: tokens.text }),
-                onClick: onToAddress
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              SourceRow,
-              {
-                name: "Exchange",
-                icon: /* @__PURE__ */ jsx(LinkIcon, { color: tokens.textTertiary }),
-                disabled: true,
-                disabledColor: tokens.textTertiary,
-                right: /* @__PURE__ */ jsx(ComingSoonBadge, { tokens })
-              }
-            )
-          ] })
-        ] })
-      ]
-    }
-  );
-}
-function DepositTypeToggle({ tokens }) {
-  return /* @__PURE__ */ jsx(Fragment, {});
-}
-function ComingSoonBadge({ tokens }) {
-  return /* @__PURE__ */ jsx("span", { style: comingSoonBadgeStyle(tokens.bgRecessed, tokens.textMuted), children: "Coming soon" });
-}
-function WalletIcon({ color }) {
-  return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M3 9.5a3 3 0 013-3h12a3 3 0 013 3v8a3 3 0 01-3 3H6a3 3 0 01-3-3v-8z",
-        stroke: color,
-        strokeWidth: "1.6"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M16 4.5l-9 2",
-        stroke: color,
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx("circle", { cx: "17.25", cy: "13.5", r: "1.1", fill: color })
-  ] });
-}
-function AddressIcon({ color }) {
-  return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
-    /* @__PURE__ */ jsx("rect", { x: "3.5", y: "3.5", width: "7", height: "7", rx: "1", stroke: color, strokeWidth: "1.4" }),
-    /* @__PURE__ */ jsx("rect", { x: "6", y: "6", width: "2", height: "2", fill: color }),
-    /* @__PURE__ */ jsx("rect", { x: "13.5", y: "3.5", width: "7", height: "7", rx: "1", stroke: color, strokeWidth: "1.4" }),
-    /* @__PURE__ */ jsx("rect", { x: "16", y: "6", width: "2", height: "2", fill: color }),
-    /* @__PURE__ */ jsx("rect", { x: "3.5", y: "13.5", width: "7", height: "7", rx: "1", stroke: color, strokeWidth: "1.4" }),
-    /* @__PURE__ */ jsx("rect", { x: "6", y: "16", width: "2", height: "2", fill: color }),
-    /* @__PURE__ */ jsx("rect", { x: "13.5", y: "13.5", width: "2.5", height: "2.5", fill: color }),
-    /* @__PURE__ */ jsx("rect", { x: "18", y: "13.5", width: "2.5", height: "2.5", fill: color }),
-    /* @__PURE__ */ jsx("rect", { x: "13.5", y: "18", width: "2.5", height: "2.5", fill: color }),
-    /* @__PURE__ */ jsx("rect", { x: "18", y: "18", width: "2.5", height: "2.5", fill: color })
-  ] });
+        /* @__PURE__ */ jsx("span", { style: feesBadgeStyle(tokens.highlight, tokens.text), children: "0% FEES" })
+      ] }),
+      /* @__PURE__ */ jsxs("div", { style: dividerRowStyle, children: [
+        /* @__PURE__ */ jsx("span", { style: dividerRuleStyle(tokens.textTertiary) }),
+        /* @__PURE__ */ jsx("span", { style: dividerLabelStyle(tokens.textTertiary), children: "OR" }),
+        /* @__PURE__ */ jsx("span", { style: dividerRuleStyle(tokens.textTertiary) })
+      ] }),
+      /* @__PURE__ */ jsxs(
+        "button",
+        {
+          type: "button",
+          onClick: onToAddress,
+          style: manualRowStyle(tokens.bgCardTranslucent),
+          children: [
+            /* @__PURE__ */ jsx("span", { style: manualLabelStyle(tokens.text), children: "Send Crypto Manually" }),
+            /* @__PURE__ */ jsx(QrIcon, { color: tokens.text })
+          ]
+        }
+      )
+    ] })
+  ] }) }) });
 }
-function LinkIcon({ color }) {
-  return /* @__PURE__ */ jsx(
-    "img",
+function QrIcon({ color }) {
+  return /* @__PURE__ */ jsxs(
+    "svg",
     {
-      src: LINK_ICON_DATA_URI,
-      alt: "",
+      width: "24",
+      height: "24",
+      viewBox: "0 0 24 24",
+      fill: "none",
       "aria-hidden": "true",
-      style: linkIconImageStyle(color)
+      style: { flexShrink: 0 },
+      children: [
+        /* @__PURE__ */ jsx("rect", { x: "3.5", y: "3.5", width: "7", height: "7", rx: "1", stroke: color, strokeWidth: "1.4" }),
+        /* @__PURE__ */ jsx("rect", { x: "6", y: "6", width: "2", height: "2", fill: color }),
+        /* @__PURE__ */ jsx("rect", { x: "13.5", y: "3.5", width: "7", height: "7", rx: "1", stroke: color, strokeWidth: "1.4" }),
+        /* @__PURE__ */ jsx("rect", { x: "16", y: "6", width: "2", height: "2", fill: color }),
+        /* @__PURE__ */ jsx("rect", { x: "3.5", y: "13.5", width: "7", height: "7", rx: "1", stroke: color, strokeWidth: "1.4" }),
+        /* @__PURE__ */ jsx("rect", { x: "6", y: "16", width: "2", height: "2", fill: color }),
+        /* @__PURE__ */ jsx("rect", { x: "13.5", y: "13.5", width: "2.5", height: "2.5", fill: color }),
+        /* @__PURE__ */ jsx("rect", { x: "18", y: "13.5", width: "2.5", height: "2.5", fill: color }),
+        /* @__PURE__ */ jsx("rect", { x: "13.5", y: "18", width: "2.5", height: "2.5", fill: color }),
+        /* @__PURE__ */ jsx("rect", { x: "18", y: "18", width: "2.5", height: "2.5", fill: color })
+      ]
     }
   );
 }
-function FaceIdIcon2() {
-  return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M3 8V6a3 3 0 013-3h2",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M16 3h2a3 3 0 013 3v2",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M21 16v2a3 3 0 01-3 3h-2",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M8 21H6a3 3 0 01-3-3v-2",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M9 10v1.5",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M15 10v1.5",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M12 10v3.5",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M9.5 16.25c.7.6 1.55.95 2.5.95s1.8-.35 2.5-.95",
-        stroke: "currentColor",
-        strokeWidth: "1.6",
-        strokeLinecap: "round"
-      }
-    )
-  ] });
-}
-var wordmarkStyle = {
-  height: 20,
+var sheetStyle = {
+  position: "relative",
+  minHeight: "100%",
+  display: "flex",
+  flexDirection: "column",
+  boxSizing: "border-box"
+};
+var contentStyle2 = {
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+  gap: 32,
+  padding: "32px 8px"
+};
+var headerRowStyle = {
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "space-between",
+  width: "100%",
+  minHeight: 44
+};
+var wordmarkImgStyle = {
+  height: 31,
   width: "auto",
+  display: "block"
+};
+var heroStyle = {
+  width: 253,
+  height: 253,
+  maxWidth: "100%",
   objectFit: "contain",
   display: "block"
 };
-var contentStyle2 = {
+var stackStyle = {
   display: "flex",
   flexDirection: "column",
-  gap: 24,
-  paddingTop: 24
+  gap: 16,
+  width: "100%"
 };
-var cardStyle = (bg) => ({
+var depositPillWrapperStyle = {
+  position: "relative",
+  width: "100%",
+  height: 71
+};
+var depositPillStyle = (bg) => ({
   display: "flex",
-  flexDirection: "column",
+  alignItems: "center",
+  justifyContent: "space-between",
+  width: "100%",
+  height: 56,
+  padding: "12px 12px 12px 24px",
   background: bg,
+  border: "none",
   borderRadius: 28,
-  padding: "8px 8px 8px 20px"
+  cursor: "pointer",
+  boxSizing: "border-box",
+  fontFamily: "inherit"
+});
+var depositPillLabelStyle = (color) => ({
+  color,
+  fontSize: 16,
+  fontWeight: 500,
+  whiteSpace: "nowrap"
+});
+var clusterStyle = {
+  display: "inline-flex",
+  alignItems: "center",
+  isolation: "isolate"
+};
+var clusterChipStyle = (bg, last) => ({
+  width: 32,
+  height: 32,
+  borderRadius: "50%",
+  background: bg,
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center",
+  marginRight: last ? 0 : -12,
+  filter: "drop-shadow(0 0 2px rgba(0, 0, 0, 0.24))",
+  flexShrink: 0
+});
+var clusterIconStyle = {
+  width: 24,
+  height: 24,
+  borderRadius: "50%",
+  objectFit: "cover",
+  display: "block"
+};
+var feesBadgeStyle = (bg, color) => ({
+  position: "absolute",
+  left: 131,
+  top: 45,
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center",
+  background: bg,
+  color,
+  fontSize: 12,
+  fontWeight: 500,
+  lineHeight: 1,
+  padding: "4px 8px",
+  borderRadius: 6,
+  whiteSpace: "nowrap",
+  transform: "rotate(-6.75deg)",
+  boxShadow: "0 2px 4px rgba(0, 0, 0, 0.16)",
+  pointerEvents: "none"
 });
-var comingSoonBadgeStyle = (bg, color) => ({
-  display: "inline-flex",
+var dividerRowStyle = {
+  display: "flex",
   alignItems: "center",
   justifyContent: "center",
-  background: bg,
+  gap: 10,
+  padding: "0 16px",
+  width: "100%",
+  boxSizing: "border-box"
+};
+var dividerRuleStyle = (color) => ({
+  flex: 1,
+  height: 1,
+  background: color
+});
+var dividerLabelStyle = (color) => ({
   color,
-  fontSize: 10,
+  fontSize: 12,
   fontWeight: 500,
-  lineHeight: 1,
-  padding: "4px 8px",
-  borderRadius: 8,
-  marginRight: 8,
   whiteSpace: "nowrap"
 });
-var badgeWithArrowStyle = {
+var manualRowStyle = (bg) => ({
   display: "flex",
-  alignItems: "center"
-};
-var linkIconImageStyle = (color) => ({
-  width: 24,
-  height: 24,
-  objectFit: "contain",
-  display: "block",
-  opacity: color.includes("rgba") ? 0.3 : 1
+  alignItems: "center",
+  gap: 8,
+  width: "100%",
+  height: 56,
+  padding: "12px 24px",
+  background: bg,
+  border: "none",
+  borderRadius: 28,
+  cursor: "pointer",
+  boxSizing: "border-box",
+  fontFamily: "inherit"
 });
-var closeButtonStyle2 = (tokens) => ({
-  width: 40,
-  height: 40,
+var manualLabelStyle = (color) => ({
+  flex: 1,
+  minWidth: 0,
+  color,
+  fontSize: 16,
+  fontWeight: 400
+});
+var closeButtonStyle2 = (bg, color) => ({
+  flexShrink: 0,
+  width: 44,
+  height: 44,
   borderRadius: "50%",
   border: "none",
-  background: tokens.bgRecessed,
-  color: tokens.text,
+  background: bg,
+  color,
   display: "flex",
   alignItems: "center",
   justifyContent: "center",
@@ -11259,7 +11415,7 @@ function PasskeyPopupWelcomeScreen({
         /* @__PURE__ */ jsxs("div", { style: contentStyle6, children: [
           /* @__PURE__ */ jsxs("div", { style: lockupStyle, children: [
             /* @__PURE__ */ jsx("img", { src: BLINK_LOGO, alt: "", "aria-hidden": true, style: lockupMarkStyle }),
-            /* @__PURE__ */ jsx("span", { style: wordmarkStyle2(tokens.text), children: "Blink" })
+            /* @__PURE__ */ jsx("span", { style: wordmarkStyle(tokens.text), children: "Blink" })
           ] }),
           /* @__PURE__ */ jsx("div", { style: illustrationFrameStyle, children: /* @__PURE__ */ jsx(
             "img",
@@ -11316,7 +11472,7 @@ var lockupMarkStyle = {
   height: 24,
   display: "block"
 };
-var wordmarkStyle2 = (color) => ({
+var wordmarkStyle = (color) => ({
   fontSize: "1.45rem",
   fontWeight: 500,
   letterSpacing: "-0.03em",
@@ -11765,7 +11921,7 @@ function WalletPickerScreen({
     ),
     /* @__PURE__ */ jsx("h1", { style: titleStyle3(tokens.text), children: "Link wallet" }),
     error && /* @__PURE__ */ jsx("div", { style: errorBannerStyle5(tokens), children: error }),
-    /* @__PURE__ */ jsx("div", { style: sheetStackStyle, children: /* @__PURE__ */ jsx("div", { style: cardStyle2(tokens.bgCardTranslucent), children: showOtherWallets ? /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx("div", { style: sheetStackStyle, children: /* @__PURE__ */ jsx("div", { style: cardStyle(tokens.bgCardTranslucent), children: showOtherWallets ? /* @__PURE__ */ jsx(
       OtherWalletsPanel,
       {
         wallets: filteredReownWallets,
@@ -11988,7 +12144,7 @@ var sheetStackStyle = {
   flexDirection: "column",
   gap: 16
 };
-var cardStyle2 = (bg) => ({
+var cardStyle = (bg) => ({
   display: "flex",
   flexDirection: "column",
   background: bg,
@@ -12141,7 +12297,7 @@ function LinkTokensScreen({
           {
             onBack,
             onLogout,
-            center: /* @__PURE__ */ jsx("img", { src: BLINK_WORDMARK, alt: "Blink", style: wordmarkImgStyle })
+            center: /* @__PURE__ */ jsx("img", { src: BLINK_WORDMARK, alt: "Blink", style: wordmarkImgStyle2 })
           }
         ),
         /* @__PURE__ */ jsxs("div", { style: contentStyle9, children: [
@@ -12207,7 +12363,7 @@ var contentStyle9 = {
   minHeight: 0,
   width: "100%"
 };
-var wordmarkImgStyle = {
+var wordmarkImgStyle2 = {
   height: 22,
   width: "auto",
   display: "block",
@@ -12503,6 +12659,7 @@ function SelectDepositSourceScreen({
                   {
                     symbol: opt.symbol,
                     chainName: opt.chainName,
+                    tokenLogoUri: opt.logoURI,
                     balance: opt.balance,
                     selected: !hasPendingMobileSelection && isSelected(opt),
                     onClick: () => handleAuthorizedPick(opt)
@@ -12514,6 +12671,7 @@ function SelectDepositSourceScreen({
                   {
                     symbol: opt.symbol,
                     chainName: opt.chainName,
+                    tokenLogoUri: opt.logoURI,
                     balance: opt.balance,
                     requiresAuth: true,
                     selected: hasPendingMobileSelection ? pendingMobileSelection?.key === tokenOptionKey(opt) : isSelected(opt),
@@ -12531,7 +12689,7 @@ function SelectDepositSourceScreen({
                 label: "Send manually",
                 color: tokens.text,
                 onClick: onSendManually,
-                icon: /* @__PURE__ */ jsx(QrIcon, { color: tokens.text })
+                icon: /* @__PURE__ */ jsx(QrIcon2, { color: tokens.text })
               }
             ),
             onAddProvider && /* @__PURE__ */ jsx(
@@ -12540,7 +12698,7 @@ function SelectDepositSourceScreen({
                 label: "Link Wallet",
                 color: tokens.text,
                 onClick: onAddProvider,
-                icon: /* @__PURE__ */ jsx(WalletIcon2, {})
+                icon: /* @__PURE__ */ jsx(WalletIcon, {})
               }
             )
           ] })
@@ -12625,12 +12783,23 @@ function ActionRow({
   onClick,
   icon
 }) {
-  return /* @__PURE__ */ jsxs("button", { type: "button", onClick, style: actionRowStyle(color), children: [
-    /* @__PURE__ */ jsx("span", { style: actionIconSlotStyle, children: icon }),
-    /* @__PURE__ */ jsx("span", { style: actionLabelStyle, children: label })
-  ] });
+  const [hovered, setHovered] = useState(false);
+  return /* @__PURE__ */ jsxs(
+    "button",
+    {
+      type: "button",
+      onClick,
+      onMouseEnter: () => setHovered(true),
+      onMouseLeave: () => setHovered(false),
+      style: actionRowStyle(color, hovered),
+      children: [
+        /* @__PURE__ */ jsx("span", { style: actionIconSlotStyle, children: icon }),
+        /* @__PURE__ */ jsx("span", { style: actionLabelStyle, children: label })
+      ]
+    }
+  );
 }
-function QrIcon({ color }) {
+function QrIcon2({ color }) {
   return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
     /* @__PURE__ */ jsx("rect", { x: "3.5", y: "3.5", width: "7", height: "7", rx: "1", stroke: color, strokeWidth: "1.4" }),
     /* @__PURE__ */ jsx("rect", { x: "6", y: "6", width: "2", height: "2", fill: color }),
@@ -12644,7 +12813,7 @@ function QrIcon({ color }) {
     /* @__PURE__ */ jsx("rect", { x: "18", y: "18", width: "2.5", height: "2.5", fill: color })
   ] });
 }
-function WalletIcon2() {
+function WalletIcon() {
   return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
     /* @__PURE__ */ jsx(
       "path",
@@ -12662,13 +12831,13 @@ function WalletIcon2() {
     )
   ] });
 }
-var actionRowStyle = (color) => ({
+var actionRowStyle = (color, hovered) => ({
   display: "flex",
   alignItems: "center",
   gap: 8,
   width: "100%",
   padding: 4,
-  background: "transparent",
+  background: hovered ? "rgba(255,255,255,0.24)" : "transparent",
   border: "none",
   borderRadius: 56,
   color,
@@ -12676,6 +12845,7 @@ var actionRowStyle = (color) => ({
   fontFamily: "inherit",
   textAlign: "left",
   outline: "none",
+  transition: "background 0.15s ease",
   boxSizing: "border-box"
 });
 var actionIconSlotStyle = {
@@ -12850,7 +13020,7 @@ function DepositScreen({
         onClick: () => onDeposit(amount),
         disabled: !canDeposit,
         loading: processing,
-        icon: /* @__PURE__ */ jsx(FaceIdIcon3, {}),
+        icon: /* @__PURE__ */ jsx(FaceIdIcon2, {}),
         children: "Deposit"
       }
     );
@@ -12998,7 +13168,7 @@ function DepositScreen({
       ) : /* @__PURE__ */ jsx("span", { style: redesignNoFeesStyle(tokens.text), children: "No fees" }) }),
       showHeroPresets && presetsRow
     ] }),
-    /* @__PURE__ */ jsx("div", { style: bannerSlotStyle2, children: showLowFunds ? /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx("div", { style: bannerSlotStyle2, children: mobileEntryWithKeypad ? null : showLowFunds ? /* @__PURE__ */ jsx(
       NotificationBanner,
       {
         variant: "negative",
@@ -13020,7 +13190,7 @@ function DepositScreen({
     ) : error ? /* @__PURE__ */ jsx(NotificationBanner, { title: "Something went wrong", description: error }) : null })
   ] });
 }
-function FaceIdIcon3() {
+function FaceIdIcon2() {
   return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
     /* @__PURE__ */ jsx("path", { d: "M3 8V6a3 3 0 013-3h2", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round" }),
     /* @__PURE__ */ jsx("path", { d: "M16 3h2a3 3 0 013 3v2", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round" }),
@@ -13539,7 +13709,7 @@ function SelectSourceScreen({
           /* @__PURE__ */ jsx("label", { style: labelStyle5(tokens.textSecondary), children: "Token" }),
           /* @__PURE__ */ jsx("div", { style: optionListStyle, children: tokenChoices.map((token) => {
             const isSelected = token.tokenSymbol === selectedTokenSymbol;
-            const logo = token.walletLogoUrl ?? TOKEN_LOGOS[token.tokenSymbol];
+            const logo = token.walletLogoUrl ?? token.logoURI ?? TOKEN_LOGOS[token.tokenSymbol];
             const logoAlt = token.walletLogoUrl ? token.walletName ?? token.tokenSymbol : token.tokenSymbol;
             return /* @__PURE__ */ jsxs(
               "button",
@@ -14760,30 +14930,102 @@ var closeButtonStyle5 = (bg, color) => ({
   padding: 0
 });
 var DELAYED_RETRY_VISIBLE_MS = 2e4;
+var SPIN_KEYFRAMES_CSS2 = `
+@keyframes blink-approving-spin {
+  to { transform: rotate(360deg); }
+}`;
 function ApprovingInWalletScreen({
   tokenSymbol,
   chainName,
   step,
   error,
-  onRetry
+  onRetry,
+  onBack,
+  onLogout
 }) {
-  const { tokens } = useBlinkConfig();
+  const { tokens: t } = useBlinkConfig();
   const showDelayedRetry = useDelayedRetry(error == null && onRetry != null);
   const retryVisible = onRetry != null && (error != null || showDelayedRetry);
-  return /* @__PURE__ */ jsx(
+  const token = tokenSymbol ?? "token";
+  const steps = buildSteps(step, tokenSymbol, chainName);
+  return /* @__PURE__ */ jsxs(
     ScreenLayout,
     {
-      footer: retryVisible ? /* @__PURE__ */ jsxs("div", { style: footerStackStyle4, children: [
-        error && /* @__PURE__ */ jsx(InfoBanner, { children: error }),
-        /* @__PURE__ */ jsx(OutlineButton, { onClick: onRetry, children: "Retry" })
-      ] }) : void 0,
-      children: /* @__PURE__ */ jsxs("div", { style: contentStyle15, children: [
-        /* @__PURE__ */ jsxs("div", { style: lockupStyle2, children: [
-          /* @__PURE__ */ jsx("img", { src: BLINK_LOGO, alt: "", "aria-hidden": true, style: lockupMarkStyle2 }),
-          /* @__PURE__ */ jsx("span", { style: wordmarkStyle3(tokens.text), children: "Blink" })
+      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("div", { style: stepsFrameStyle, children: /* @__PURE__ */ jsx(StepList, { steps: buildSteps(step, tokenSymbol, chainName), activeIndicator: "spinner", size: "lg" }) })
-      ] })
+        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 })
+      ] }),
+      children: [
+        /* @__PURE__ */ jsx(
+          ScreenHeader,
+          {
+            onBack,
+            onLogout,
+            center: /* @__PURE__ */ jsx("img", { src: BLINK_WORDMARK, alt: "Blink", style: wordmarkImgStyle3 })
+          }
+        ),
+        /* @__PURE__ */ jsxs("div", { style: contentStyle15, children: [
+          /* @__PURE__ */ jsx("h2", { style: headingStyle13(t.text), children: `Authorizing ${token} for passkey deposits` }),
+          /* @__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))
+          ] })
+        ] })
+      ]
+    }
+  );
+}
+function ChecklistRow({ step }) {
+  const { tokens: t } = useBlinkConfig();
+  const isComplete = step.status === "complete";
+  const isActive = step.status === "active";
+  return /* @__PURE__ */ jsxs("div", { style: rowStyle6, children: [
+    isComplete ? /* @__PURE__ */ jsx("span", { style: completeBadgeStyle(t.accent), children: /* @__PURE__ */ jsx("svg", { width: "14", height: "14", viewBox: "0 0 24 24", fill: "none", children: /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41L9 16.17z",
+        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 })
+  ] });
+}
+function RowSpinner({ color }) {
+  const size = 24;
+  const stroke = 2;
+  const r = (size - stroke) / 2;
+  const c = size / 2;
+  const circumference = 2 * Math.PI * r;
+  return /* @__PURE__ */ jsx(
+    "div",
+    {
+      role: "status",
+      "aria-label": "Loading",
+      style: {
+        width: size,
+        height: size,
+        flexShrink: 0,
+        animation: "blink-approving-spin 0.9s linear infinite"
+      },
+      children: /* @__PURE__ */ jsx("svg", { width: size, height: size, viewBox: `0 0 ${size} ${size}`, fill: "none", children: /* @__PURE__ */ jsx(
+        "circle",
+        {
+          cx: c,
+          cy: c,
+          r,
+          stroke: color,
+          strokeWidth: stroke,
+          strokeLinecap: "round",
+          strokeDasharray: `${circumference * 0.25} ${circumference}`
+        }
+      ) })
     }
   );
 }
@@ -14812,50 +15054,124 @@ function useDelayedRetry(enabled) {
   }, [enabled]);
   return visible;
 }
+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"
+    }
+  ) });
+}
+var wordmarkImgStyle3 = {
+  height: 22,
+  width: "auto",
+  display: "block",
+  pointerEvents: "none",
+  userSelect: "none"
+};
 var contentStyle15 = {
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+  gap: 16,
+  paddingTop: 8,
   flex: 1,
   minHeight: 0,
+  width: "100%"
+};
+var headingStyle13 = (color) => ({
+  fontSize: 24,
+  fontWeight: 700,
+  lineHeight: "normal",
+  letterSpacing: 0,
+  color,
+  margin: 0,
+  textAlign: "center"
+});
+var cardStyle2 = (bg, radius) => ({
+  background: bg,
+  borderRadius: radius,
+  padding: 8,
+  width: "100%",
+  boxSizing: "border-box",
   display: "flex",
   flexDirection: "column",
+  gap: 4
+});
+var rowStyle6 = {
+  display: "flex",
   alignItems: "center",
+  gap: 16,
+  padding: "12px 16px 12px 12px",
+  borderRadius: 16,
   width: "100%",
-  // ScreenLayout body already applies 24px side padding; +8px here reaches the
-  // 32px Figma gutter, with 32px above the logo and a 32px gap to the checklist.
-  padding: "32px 8px 0",
-  gap: 32
+  boxSizing: "border-box"
 };
-var lockupStyle2 = {
-  display: "flex",
+var completeBadgeStyle = (color) => ({
+  width: 24,
+  height: 24,
+  borderRadius: "50%",
+  background: color,
+  display: "inline-flex",
   alignItems: "center",
-  gap: 6,
+  justifyContent: "center",
   flexShrink: 0
-};
-var lockupMarkStyle2 = {
+});
+var pendingBadgeStyle = (color) => ({
   width: 24,
   height: 24,
-  display: "block"
-};
-var wordmarkStyle3 = (color) => ({
-  fontSize: "1.45rem",
-  fontWeight: 500,
-  letterSpacing: "-0.03em",
-  lineHeight: 1,
+  borderRadius: "50%",
+  background: color,
+  flexShrink: 0
+});
+var labelStyle7 = (color) => ({
+  fontSize: "1rem",
+  fontWeight: 400,
+  lineHeight: 1.25,
   color
 });
-var stepsFrameStyle = {
-  flex: 1,
-  minHeight: 0,
+var footerStackStyle4 = {
   display: "flex",
   flexDirection: "column",
-  alignItems: "center",
-  justifyContent: "center",
+  gap: 16,
   width: "100%"
 };
-var footerStackStyle4 = {
+var retryStackStyle = {
   display: "flex",
   flexDirection: "column",
-  gap: 8
+  gap: 8,
+  width: "100%"
+};
+var lockBannerStyle2 = {
+  display: "flex",
+  alignItems: "flex-start",
+  gap: 16,
+  padding: "12px 16px 12px 12px",
+  borderRadius: 16,
+  width: "100%",
+  boxSizing: "border-box"
 };
+var lockIconWrapStyle2 = (color) => ({
+  flexShrink: 0,
+  width: 24,
+  height: 24,
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center",
+  color
+});
+var lockBannerTextStyle2 = (color) => ({
+  margin: 0,
+  flex: 1,
+  fontSize: 12,
+  fontWeight: 500,
+  lineHeight: "normal",
+  color
+});
 function ConfirmSignScreen({
   walletName,
   chainFamily,
@@ -14884,7 +15200,7 @@ function ConfirmSignScreen({
         /* @__PURE__ */ jsx(ScreenHeader, { onLogout }),
         /* @__PURE__ */ jsxs("div", { style: contentStyle16, children: [
           logoSrc ? /* @__PURE__ */ jsx("img", { src: logoSrc, alt: displayName, style: logoStyle3 }) : /* @__PURE__ */ jsx(Spinner, { size: 48 }),
-          /* @__PURE__ */ jsx("h2", { style: headingStyle13(tokens.text), children: heading }),
+          /* @__PURE__ */ jsx("h2", { style: headingStyle14(tokens.text), children: heading }),
           /* @__PURE__ */ jsx("p", { style: subtitleStyle10(tokens.textSecondary), children: subtitle }),
           /* @__PURE__ */ jsxs("div", { style: successBadgeStyle(tokens), children: [
             /* @__PURE__ */ jsx("span", { style: checkmarkStyle, children: "\u2713" }),
@@ -14910,7 +15226,7 @@ var logoStyle3 = {
   borderRadius: 14,
   objectFit: "contain"
 };
-var headingStyle13 = (color) => ({
+var headingStyle14 = (color) => ({
   fontSize: "1.45rem",
   fontWeight: 700,
   letterSpacing: "-0.02em",
@@ -14990,10 +15306,12 @@ function TokenPickerScreen({
         tokenSymbol: source.token.symbol,
         tokenAddress: source.address,
         balance: visibleBalance,
-        status: source.token.status
+        status: source.token.status,
+        logoURI: source.token.logoURI
       });
     }
   }
+  const selectedEntryLogo = selectedTokenSymbol ? entries2.find((e) => e.tokenSymbol === selectedTokenSymbol)?.logoURI ?? TOKEN_LOGOS[selectedTokenSymbol] : void 0;
   const handleSelect = (entry) => {
     if (entry.status === "AUTHORIZED") {
       onSelectAuthorized(entry.walletId, entry.tokenSymbol);
@@ -15020,7 +15338,7 @@ function TokenPickerScreen({
             onClick: onBack,
             style: tokenIconButtonStyle,
             children: [
-              /* @__PURE__ */ jsx("div", { style: tokenIconWrapStyle, children: selectedTokenSymbol && TOKEN_LOGOS[selectedTokenSymbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[selectedTokenSymbol], alt: selectedTokenSymbol, width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
+              /* @__PURE__ */ jsx("div", { style: tokenIconWrapStyle, children: selectedEntryLogo ? /* @__PURE__ */ jsx("img", { src: selectedEntryLogo, alt: selectedTokenSymbol, width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
                 /* @__PURE__ */ jsx("circle", { cx: "18", cy: "18", r: "18", fill: "#2DB84B" }),
                 /* @__PURE__ */ jsx("text", { x: "18", y: "23", textAnchor: "middle", fontSize: "18", fill: "#fff", fontWeight: "700", children: "$" })
               ] }) }),
@@ -15034,6 +15352,7 @@ function TokenPickerScreen({
     /* @__PURE__ */ jsx("div", { style: tokenListStyle2, children: entries2.map((entry) => {
       const authorized = entry.status === "AUTHORIZED";
       const isSelected = entry.walletId === selectedWalletId && entry.tokenSymbol === selectedTokenSymbol;
+      const entryLogo = entry.logoURI ?? TOKEN_LOGOS[entry.tokenSymbol];
       return /* @__PURE__ */ jsxs(
         "button",
         {
@@ -15041,7 +15360,7 @@ function TokenPickerScreen({
           onClick: () => handleSelect(entry),
           style: tokenRowStyle2(t),
           children: [
-            /* @__PURE__ */ jsx("div", { style: tokenIconCircleStyle2(t, !!TOKEN_LOGOS[entry.tokenSymbol]), children: TOKEN_LOGOS[entry.tokenSymbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[entry.tokenSymbol], alt: entry.tokenSymbol, style: tokenLogoImgStyle2 }) : /* @__PURE__ */ jsx("span", { style: tokenIconTextStyle2(t.textMuted), children: "$" }) }),
+            /* @__PURE__ */ jsx("div", { style: tokenIconCircleStyle2(t, !!entryLogo), children: entryLogo ? /* @__PURE__ */ jsx("img", { src: entryLogo, alt: entry.tokenSymbol, style: tokenLogoImgStyle2 }) : /* @__PURE__ */ jsx("span", { style: tokenIconTextStyle2(t.textMuted), children: "$" }) }),
             /* @__PURE__ */ jsxs("div", { style: tokenInfoStyle2, children: [
               /* @__PURE__ */ jsxs("div", { style: tokenNameRowStyle, children: [
                 /* @__PURE__ */ jsx("span", { style: tokenSymbolTextStyle(t.text), children: entry.tokenSymbol }),
@@ -15272,10 +15591,10 @@ function GuestTokenPickerScreen({
       children: [
         /* @__PURE__ */ jsx(ScreenHeader, { onBack }),
         /* @__PURE__ */ jsxs("div", { style: contentStyle17, children: [
-          /* @__PURE__ */ jsx("h2", { style: headingStyle14(tokens.text), children: title }),
+          /* @__PURE__ */ jsx("h2", { style: headingStyle15(tokens.text), children: title }),
           error && /* @__PURE__ */ jsx("div", { style: errorBannerStyle8(tokens), children: error }),
           entries2.length === 0 ? /* @__PURE__ */ jsx("p", { style: subtitleStyle11(tokens.textMuted), children: emptyMessage ?? "No tokens available." }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-            /* @__PURE__ */ jsx("label", { style: labelStyle7(tokens.textSecondary), children: "Token" }),
+            /* @__PURE__ */ jsx("label", { style: labelStyle8(tokens.textSecondary), children: "Token" }),
             /* @__PURE__ */ jsx(
               "button",
               {
@@ -15355,7 +15674,7 @@ var contentStyle17 = {
   padding: "0 20px 16px",
   gap: 12
 };
-var headingStyle14 = (color) => ({
+var headingStyle15 = (color) => ({
   fontSize: "1.25rem",
   fontWeight: 700,
   color,
@@ -15367,7 +15686,7 @@ var subtitleStyle11 = (color) => ({
   color,
   textAlign: "center"
 });
-var labelStyle7 = (color) => ({
+var labelStyle8 = (color) => ({
   fontSize: "0.75rem",
   fontWeight: 600,
   color,
@@ -15500,7 +15819,7 @@ function ManualTransferFlow({
     screenContent = /* @__PURE__ */ jsxs(ScreenLayout, { footer: /* @__PURE__ */ jsx(PrimaryButton, { onClick: onBack, children: "Back" }), children: [
       /* @__PURE__ */ jsx(ScreenHeader, { onBack }),
       /* @__PURE__ */ jsxs("div", { style: contentStyle18, children: [
-        /* @__PURE__ */ jsx("h2", { style: headingStyle15(tokens.text), children: "Manual transfer unavailable" }),
+        /* @__PURE__ */ jsx("h2", { style: headingStyle16(tokens.text), children: "Manual transfer unavailable" }),
         /* @__PURE__ */ jsx("p", { style: bodyStyle5(tokens.textMuted), children: "merchantAuthorization is required." })
       ] })
     ] });
@@ -15579,7 +15898,7 @@ var contentStyle18 = {
   paddingBottom: 24,
   width: "100%"
 };
-var headingStyle15 = (color) => ({
+var headingStyle16 = (color) => ({
   color,
   fontSize: "2rem",
   lineHeight: 1.05,
@@ -15604,7 +15923,7 @@ function GenericLoadingShimmer() {
       role: "status",
       "aria-label": "Loading payment flow",
       "aria-busy": "true",
-      style: sheetStyle(tokens),
+      style: sheetStyle2(tokens),
       children: [
         /* @__PURE__ */ jsx("style", { children: `
         @keyframes blink-loading-shimmer {
@@ -15650,7 +15969,7 @@ function ShimmerBlock2({
     }
   );
 }
-var sheetStyle = (tokens) => ({
+var sheetStyle2 = (tokens) => ({
   display: "flex",
   flexDirection: "column",
   height: "100%",
@@ -15697,12 +16016,12 @@ function buildLoginScreenProps({ flow, handlers }) {
 }
 function buildDepositOptionsScreenProps({ flow, handlers }) {
   return {
-    // "From Wallet" routes through REQUEST_LOGIN (handlers.onLogin) so the
-    // existing login path runs unchanged.
-    onFromWallet: handlers.onLogin,
-    // "To Address" navigates to the manual-transfer flow.
+    // "Send Crypto Manually" navigates to the manual-transfer flow.
     onToAddress: () => handlers.onSetPhase({ step: "manual-transfer" }),
-    onSignInWithBlink: handlers.onLoginWithPasskey,
+    // The primary CTA routes to the login screen (credential selection) rather
+    // than prompting for a passkey directly, matching the connect-wallet entry
+    // point. onLogin dispatches REQUEST_LOGIN → step 'login' → LoginScreen.
+    onSignInWithBlink: handlers.onLogin,
     // Deposit-options is the root screen for the full-widget flow, so the
     // top-right (X) closes the widget through the same `onBack` the host
     // provides. Falling back to `undefined` hides the close button when the
@@ -15794,7 +16113,8 @@ function buildApprovingInWalletScreenProps({
     chainName: setupToken?.chainName ?? null,
     step,
     error: flow.state.error || remote.authExecutorError,
-    onRetry: handlers.onRetryAuthorization
+    onRetry: handlers.onRetryAuthorization,
+    onLogout: flow.isDesktop ? handlers.onLogout : void 0
   };
 }
 function buildLinkTokensScreenProps({
@@ -15927,7 +16247,8 @@ function buildDepositScreenProps({
           status: source.token.status,
           tokenAddress: source.address,
           chainId: chain?.commonId ?? void 0,
-          accountId: account.id
+          accountId: account.id,
+          logoURI: source.token.logoURI
         });
       }
     }
@@ -15980,6 +16301,7 @@ function buildDepositScreenProps({
     },
     selectedTokenSymbol: selectedSource?.token.symbol,
     selectedChainName: selectedWallet?.chain.name,
+    selectedTokenLogoUri: selectedSource?.token.logoURI,
     selectedWalletId: selectedWallet?.id ?? null,
     selectedTokenStatus,
     onAuthorizeSelectedToken,
@@ -19377,12 +19699,20 @@ function BlinkPaymentInner({
     dispatch,
     orchestrator
   ]);
+  const disconnectWallets = useCallback(async () => {
+    await Promise.allSettled([
+      revokeAndDisconnectActiveWagmiConnector(wagmiConfig),
+      authExecutor.resetWalletConnect().catch(() => {
+      }),
+      disconnectSolanaWallet()
+    ]);
+  }, [authExecutor, wagmiConfig]);
   const handleBackFromSetupDeposit = useCallback(async () => {
     orchestrator.cancelPendingFlow();
     authExecutor.cancelPendingExecution();
     clearScreenErrors();
     if (isDesktop) {
-      await revokeAndDisconnectActiveWagmiConnector(wagmiConfig);
+      await disconnectWallets();
     }
     dispatch({ type: "RESTORE_SELECTION" });
     dispatch({ type: "CLEAR_SETUP_DEPOSIT_TOKEN" });
@@ -19390,7 +19720,7 @@ function BlinkPaymentInner({
     dispatch({ type: "DESKTOP_WAIT_CLEARED" });
     dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: false });
     dispatch({ type: "SET_USER_INTENT", intent: { step: "wallet-picker", reason: "switch" } });
-  }, [authExecutor, clearScreenErrors, orchestrator, dispatch, isDesktop, wagmiConfig]);
+  }, [authExecutor, clearScreenErrors, orchestrator, dispatch, isDesktop, disconnectWallets]);
   const handleAuthorizationRetry = useCallback(() => {
     void (async () => {
       try {
@@ -19435,11 +19765,7 @@ function BlinkPaymentInner({
       dispatch({ type: "DESKTOP_WAIT_CLEARED" });
       dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: false });
       dispatch({ type: "SET_USER_INTENT", intent: { step: "wallet-picker", reason: "switch" } });
-      void (async () => {
-        await revokeAndDisconnectActiveWagmiConnector(wagmiConfig);
-        await authExecutor.resetWalletConnect().catch(() => {
-        });
-      })();
+      void disconnectWallets();
     },
     onSendManually: () => handleSetPhase({ step: "manual-transfer" }),
     onBackFromSetupDeposit: handleBackFromSetupDeposit,
@@ -19486,7 +19812,7 @@ function BlinkPaymentInner({
     handleConfirmSetupDeposit,
     handleBackFromSetupDeposit,
     handleAuthorizationRetry,
-    wagmiConfig
+    disconnectWallets
   ]);
   return /* @__PURE__ */ jsx(EffectiveDepositAmountProvider, { value: effectiveDepositAmount, children: /* @__PURE__ */ jsx(
     ManualTransferSessionProvider,
@@ -19556,25 +19882,6 @@ function BlinkPaymentInner({
   ) });
 }
 
-// src/deviceBiometricUnlockText.ts
-var FALLBACK = "Biometric verification";
-function getDeviceBiometricUnlockText() {
-  const ua = typeof navigator !== "undefined" && typeof navigator.userAgent === "string" ? navigator.userAgent : "";
-  if (/iPhone|iPad|iPod/i.test(ua)) {
-    return "Face ID";
-  }
-  if (/Android/i.test(ua)) {
-    return "Fingerprint or face unlock";
-  }
-  if (/Windows NT/i.test(ua)) {
-    return "Windows Hello";
-  }
-  if (/Macintosh|Mac OS X/i.test(ua)) {
-    return "Touch ID";
-  }
-  return FALLBACK;
-}
-
-export { ACCOUNT_SWITCH_CONFLICT_MESSAGE, AdvancedSourceScreen, ApprovingInWalletScreen, AuthorizationSessionCancelledError, BLINK_ERROR_ILLUSTRATION, BLINK_LOGO, BLINK_MASCOT, BLINK_PASSKEY_ILLUSTRATION, BLINK_SUCCESS_ILLUSTRATION, BlinkErrorScreen, BlinkInitialLoadingScreen, BlinkLoadingScreen, BlinkPayment, BlinkProvider, ConfirmSignScreen, DepositCompleteScreen, DepositScreen, DepositTransferStatusScreen, GuestTokenPickerScreen, IconCircle, InfoBanner, LOGIN_KEY_ILLUSTRATION, LinkTokensScreen, LoginScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyPopupWelcomeScreen, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SecondaryButton, SelectDepositSourceScreen, SelectSourceScreen, SettingsMenu, Spinner, StepList, StepRenderer, SuccessScreen, TokenPickerScreen, VerifyPasskeyScreen, WalletPickerScreen, appendDebug, api_exports as blinkApi, clearDebugEntries, createInitialState, credentialIdBase64ToBytes, darkTheme, darkThemeNew, darkTransparentTheme, darkTransparentThemeNew, deviceHasPasskey, encodePermit2ApproveCalldata, findDevicePasskey, findDevicePasskeyViaPopup, 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, useTransferPolling, useTransferSigning };
+export { ACCOUNT_SWITCH_CONFLICT_MESSAGE, AdvancedSourceScreen, ApprovingInWalletScreen, AuthorizationSessionCancelledError, BLINK_ERROR_ILLUSTRATION, BLINK_LOGO, BLINK_MASCOT, BLINK_PASSKEY_ILLUSTRATION, BLINK_SUCCESS_ILLUSTRATION, BlinkErrorScreen, BlinkInitialLoadingScreen, BlinkLoadingScreen, BlinkPayment, BlinkProvider, ConfirmSignScreen, DepositCompleteScreen, DepositOptionsScreen, DepositScreen, DepositTransferStatusScreen, GuestTokenPickerScreen, IconCircle, InfoBanner, LOGIN_KEY_ILLUSTRATION, LinkTokensScreen, LoginScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyPopupWelcomeScreen, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SecondaryButton, SelectDepositSourceScreen, SelectSourceScreen, SettingsMenu, Spinner, StepList, StepRenderer, SuccessScreen, TokenPickerScreen, VerifyPasskeyScreen, WalletPickerScreen, appendDebug, api_exports as blinkApi, clearDebugEntries, createInitialState, credentialIdBase64ToBytes, darkTheme, darkThemeNew, darkTransparentTheme, darkTransparentThemeNew, deviceHasPasskey, encodePermit2ApproveCalldata, findDevicePasskey, findDevicePasskeyViaPopup, 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, useTransferPolling, useTransferSigning };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map