@swype-org/react-sdk 0.2.303 → 0.2.309

package/dist/index.cjs

@@ -545,12 +545,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 } : {}
       });
     }
   }
@@ -1411,6 +1415,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) => {
@@ -1840,6 +2101,7 @@ __export(api_exports, {
   setAuthorizationSessionPaymentIntentAmount: () => setAuthorizationSessionPaymentIntentAmount,
   setAuthorizationSessionProvider: () => setAuthorizationSessionProvider,
   signTransfer: () => signTransfer,
+  updateManualTransferDepositTargetChain: () => updateManualTransferDepositTargetChain,
   updateUserConfig: () => updateUserConfig,
   updateUserConfigBySession: () => updateUserConfigBySession,
   waitForActionTransactionReceipt: () => waitForActionTransactionReceipt
@@ -2238,6 +2500,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`,
@@ -2990,7 +3261,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;
@@ -3012,7 +3283,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;
@@ -3130,219 +3401,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];
@@ -6994,6 +7052,7 @@ function useManualTransferSession({
   const completedRef = react.useRef(/* @__PURE__ */ new Set());
   const premintedFamiliesRef = react.useRef(/* @__PURE__ */ new Set());
   const inFlightPerTokenRef = react.useRef(/* @__PURE__ */ new Set());
+  const reportedTargetChainRef = react.useRef(/* @__PURE__ */ new Map());
   react.useEffect(() => {
     if (!merchantAuthorization) return;
     let cancelled = false;
@@ -7146,6 +7205,51 @@ function useManualTransferSession({
     }, 2e3);
     return () => window.clearInterval(timer);
   }, [apiBaseUrl, activeSessionId, activeSessionStatus, pollEnabled]);
+  const selectedSourceChainId = selectedOption?.chainId;
+  const sessionRegistrationChainId = session?.source.chainId;
+  react.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 = react.useMemo(() => {
     const entries2 = [];
     for (const family of Object.keys(sessionsByFamily)) {
@@ -12579,6 +12683,7 @@ function SelectDepositSourceScreen({
                   {
                     symbol: opt.symbol,
                     chainName: opt.chainName,
+                    tokenLogoUri: opt.logoURI,
                     balance: opt.balance,
                     selected: !hasPendingMobileSelection && isSelected(opt),
                     onClick: () => handleAuthorizedPick(opt)
@@ -12590,6 +12695,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),
@@ -13627,7 +13733,7 @@ function SelectSourceScreen({
           /* @__PURE__ */ jsxRuntime.jsx("label", { style: labelStyle5(tokens.textSecondary), children: "Token" }),
           /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsxs(
               "button",
@@ -15224,10 +15330,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);
@@ -15254,7 +15362,7 @@ function TokenPickerScreen({
             onClick: onBack,
             style: tokenIconButtonStyle,
             children: [
-              /* @__PURE__ */ jsxRuntime.jsx("div", { style: tokenIconWrapStyle, children: selectedTokenSymbol && TOKEN_LOGOS[selectedTokenSymbol] ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: TOKEN_LOGOS[selectedTokenSymbol], alt: selectedTokenSymbol, width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxRuntime.jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
+              /* @__PURE__ */ jsxRuntime.jsx("div", { style: tokenIconWrapStyle, children: selectedEntryLogo ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: selectedEntryLogo, alt: selectedTokenSymbol, width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxRuntime.jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
                 /* @__PURE__ */ jsxRuntime.jsx("circle", { cx: "18", cy: "18", r: "18", fill: "#2DB84B" }),
                 /* @__PURE__ */ jsxRuntime.jsx("text", { x: "18", y: "23", textAnchor: "middle", fontSize: "18", fill: "#fff", fontWeight: "700", children: "$" })
               ] }) }),
@@ -15268,6 +15376,7 @@ function TokenPickerScreen({
     /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsxs(
         "button",
         {
@@ -15275,7 +15384,7 @@ function TokenPickerScreen({
           onClick: () => handleSelect(entry),
           style: tokenRowStyle2(t),
           children: [
-            /* @__PURE__ */ jsxRuntime.jsx("div", { style: tokenIconCircleStyle2(t, !!TOKEN_LOGOS[entry.tokenSymbol]), children: TOKEN_LOGOS[entry.tokenSymbol] ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: TOKEN_LOGOS[entry.tokenSymbol], alt: entry.tokenSymbol, style: tokenLogoImgStyle2 }) : /* @__PURE__ */ jsxRuntime.jsx("span", { style: tokenIconTextStyle2(t.textMuted), children: "$" }) }),
+            /* @__PURE__ */ jsxRuntime.jsx("div", { style: tokenIconCircleStyle2(t, !!entryLogo), children: entryLogo ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: entryLogo, alt: entry.tokenSymbol, style: tokenLogoImgStyle2 }) : /* @__PURE__ */ jsxRuntime.jsx("span", { style: tokenIconTextStyle2(t.textMuted), children: "$" }) }),
             /* @__PURE__ */ jsxRuntime.jsxs("div", { style: tokenInfoStyle2, children: [
               /* @__PURE__ */ jsxRuntime.jsxs("div", { style: tokenNameRowStyle, children: [
                 /* @__PURE__ */ jsxRuntime.jsx("span", { style: tokenSymbolTextStyle(t.text), children: entry.tokenSymbol }),
@@ -16162,7 +16271,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
         });
       }
     }
@@ -16215,6 +16325,7 @@ function buildDepositScreenProps({
     },
     selectedTokenSymbol: selectedSource?.token.symbol,
     selectedChainName: selectedWallet?.chain.name,
+    selectedTokenLogoUri: selectedSource?.token.logoURI,
     selectedWalletId: selectedWallet?.id ?? null,
     selectedTokenStatus,
     onAuthorizeSelectedToken,
@@ -19612,12 +19723,20 @@ function BlinkPaymentInner({
     dispatch,
     orchestrator
   ]);
+  const disconnectWallets = react.useCallback(async () => {
+    await Promise.allSettled([
+      revokeAndDisconnectActiveWagmiConnector(wagmiConfig),
+      authExecutor.resetWalletConnect().catch(() => {
+      }),
+      disconnectSolanaWallet()
+    ]);
+  }, [authExecutor, wagmiConfig]);
   const handleBackFromSetupDeposit = react.useCallback(async () => {
     orchestrator.cancelPendingFlow();
     authExecutor.cancelPendingExecution();
     clearScreenErrors();
     if (isDesktop) {
-      await revokeAndDisconnectActiveWagmiConnector(wagmiConfig);
+      await disconnectWallets();
     }
     dispatch({ type: "RESTORE_SELECTION" });
     dispatch({ type: "CLEAR_SETUP_DEPOSIT_TOKEN" });
@@ -19625,7 +19744,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 = react.useCallback(() => {
     void (async () => {
       try {
@@ -19670,11 +19789,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,
@@ -19721,7 +19836,7 @@ function BlinkPaymentInner({
     handleConfirmSetupDeposit,
     handleBackFromSetupDeposit,
     handleAuthorizationRetry,
-    wagmiConfig
+    disconnectWallets
   ]);
   return /* @__PURE__ */ jsxRuntime.jsx(EffectiveDepositAmountProvider, { value: effectiveDepositAmount, children: /* @__PURE__ */ jsxRuntime.jsx(
     ManualTransferSessionProvider,