@swype-org/react-sdk 0.2.315 → 0.2.323

package/dist/index.js

@@ -1418,6 +1418,53 @@ var DEFAULT_POLL_INTERVAL_MS = 1e3;
 var DEFAULT_COMMITMENT = "confirmed";
 var cachedAdapter = null;
 var cachedProviderKey = null;
+var solanaAccountChangeListeners = /* @__PURE__ */ new Set();
+var accountChangeBinding = null;
+function subscribeSolanaAccountChange(listener) {
+  solanaAccountChangeListeners.add(listener);
+  return () => {
+    solanaAccountChangeListeners.delete(listener);
+  };
+}
+function notifySolanaAccountChange(pubkey) {
+  for (const listener of solanaAccountChangeListeners) {
+    listener(pubkey);
+  }
+}
+function bindAccountChangeListeners(adapter) {
+  if (accountChangeBinding?.adapter === adapter) {
+    return;
+  }
+  detachAccountChangeListeners();
+  const binding = {
+    adapter,
+    lastNotifiedPubkey: adapter.publicKey?.toBase58() ?? null,
+    onConnect: (publicKey) => {
+      const next = publicKey?.toBase58();
+      if (!next || next === binding.lastNotifiedPubkey) {
+        return;
+      }
+      binding.lastNotifiedPubkey = next;
+      console.info("[blink-sdk][solana-account-switch] adapter reported new account");
+      notifySolanaAccountChange(next);
+    },
+    onDisconnect: () => {
+      binding.lastNotifiedPubkey = null;
+    }
+  };
+  adapter.on("connect", binding.onConnect);
+  adapter.on("disconnect", binding.onDisconnect);
+  accountChangeBinding = binding;
+}
+function detachAccountChangeListeners() {
+  if (!accountChangeBinding) {
+    return;
+  }
+  const { adapter, onConnect, onDisconnect } = accountChangeBinding;
+  adapter.off("connect", onConnect);
+  adapter.off("disconnect", onDisconnect);
+  accountChangeBinding = null;
+}
 function providerKey(selection) {
   const providerName = selection.providerName?.trim();
   if (!providerName) {
@@ -1469,6 +1516,7 @@ async function connectSolanaWallet(selection, options) {
       await connectPromise;
     }
   }
+  bindAccountChangeListeners(cachedAdapter);
   return {
     adapter: cachedAdapter,
     publicKey: readPublicKey(cachedAdapter)
@@ -1627,6 +1675,7 @@ async function disconnectSolanaWallet(windowImpl) {
   const adapter = cachedAdapter;
   cachedAdapter = null;
   cachedProviderKey = null;
+  detachAccountChangeListeners();
   if (adapter?.connected) {
     try {
       console.info("[blink-sdk][solana-disconnect] disconnecting cached adapter");
@@ -2088,6 +2137,7 @@ __export(api_exports, {
   postTransferQuote: () => postTransferQuote,
   probeActionCompletion: () => probeActionCompletion,
   refreshManualTransferQuote: () => refreshManualTransferQuote,
+  regenerateTransferSignPayload: () => regenerateTransferSignPayload,
   registerPasskey: () => registerPasskey,
   reportActionCompletion: () => reportActionCompletion,
   reportPasskeyActivity: () => reportPasskeyActivity,
@@ -2185,13 +2235,33 @@ async function fetchWithRetry(input, init, options) {
   throw lastError;
 }
 
+// src/apiError.ts
+var ApiError = class extends Error {
+  status;
+  code;
+  constructor(status, code, message) {
+    super(message);
+    this.name = "ApiError";
+    this.status = status;
+    this.code = code;
+  }
+};
+function isApiError(err) {
+  if (err instanceof ApiError) return true;
+  return typeof err === "object" && err !== null && "name" in err && err.name === "ApiError";
+}
+var SVM_SIGN_PAYLOAD_EXPIRED_CODE = "SVM_SIGN_PAYLOAD_EXPIRED";
+function isSvmSignExpiredError(err) {
+  return isApiError(err) && err.code === SVM_SIGN_PAYLOAD_EXPIRED_CODE;
+}
+
 // src/api.ts
 async function throwApiError(res) {
   const body = await res.json().catch(() => null);
   const detail = body?.error ?? body;
   const msg = detail?.message ?? res.statusText;
   const code = detail?.code ?? String(res.status);
-  throw new Error(`${res.status} \u2014 ${code}: ${msg}`);
+  throw new ApiError(res.status, code, `${res.status} \u2014 ${code}: ${msg}`);
 }
 async function fetchProviders(apiBaseUrl, token) {
   const headers = {};
@@ -2380,6 +2450,21 @@ async function signTransfer(apiBaseUrl, token, transferId, signedTransfer, autho
   if (!res.ok) await throwApiError(res);
   return await res.json();
 }
+async function regenerateTransferSignPayload(apiBaseUrl, token, transferId, authorizationSessionToken) {
+  if (!token && !authorizationSessionToken) {
+    throw new Error("Missing auth credentials for sign payload regeneration.");
+  }
+  const res = await fetch(`${apiBaseUrl}/v1/transfers/${transferId}/sign-payload`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      ...token ? { Authorization: `Bearer ${token}` } : {},
+      ...authorizationSessionToken ? { "x-authorization-session-token": authorizationSessionToken } : {}
+    }
+  });
+  if (!res.ok) await throwApiError(res);
+  return await res.json();
+}
 async function fetchAuthorizationSession(apiBaseUrl, sessionId) {
   const res = await fetchWithRetry(
     `${apiBaseUrl}/v1/authorization-sessions/${sessionId}`
@@ -6138,7 +6223,28 @@ function useTransferSigning(pollIntervalMs = 2e3, options) {
     },
     [apiBaseUrl, getAccessToken, pollIntervalMs, authorizationSessionToken]
   );
-  return { signing, signPayload, error, passkeyDismissed, signTransfer: signTransfer2 };
+  const regenerateSignPayload = useCallback(
+    async (transferId) => {
+      if (!apiBaseUrl) {
+        throw new Error("Missing apiBaseUrl. Provide useTransferSigning(_, { apiBaseUrl }) or wrap in <BlinkProvider>.");
+      }
+      if (!getAccessToken && !authorizationSessionToken) {
+        throw new Error("Missing getAccessToken provider. Provide useTransferSigning(_, { getAccessToken }).");
+      }
+      const token = getAccessToken ? await getAccessToken() : null;
+      if (!token && !authorizationSessionToken) {
+        throw new Error("Could not get access token");
+      }
+      return regenerateTransferSignPayload(
+        apiBaseUrl,
+        token ?? "",
+        transferId,
+        authorizationSessionToken
+      );
+    },
+    [apiBaseUrl, getAccessToken, authorizationSessionToken]
+  );
+  return { signing, signPayload, error, passkeyDismissed, signTransfer: signTransfer2, regenerateSignPayload };
 }
 
 // src/authorizationOrchestratorOrdering.ts
@@ -7514,6 +7620,9 @@ function resolveStickyPhase(state) {
       accountId: null
     };
   }
+  if (currentPhase.step === "welcome-back" && state.enableFullWidget && !state.welcomeBackAcknowledged && state.privyAuthenticated && state.activeCredentialId != null && !hasActiveWallet(state.accounts) && !state.mobileFlow && !state.loginRequested) {
+    return currentPhase;
+  }
   if (currentPhase.step === "wallet-picker" && currentPhase.reason === "switch" && !state.creatingTransfer && !(state.mobileFlow && state.deeplinkUri)) {
     return currentPhase;
   }
@@ -7538,6 +7647,9 @@ function deriveFreshPhase(state) {
   if (state.loadingData && state.activeCredentialId != null) {
     return { step: "data-loading" };
   }
+  if (state.activeCredentialId != null && !state.initialDataLoaded && state.error == null) {
+    return { step: "data-loading" };
+  }
   if (state.enableFullWidget && state.authenticatedOnOpen && !state.welcomeBackAcknowledged && state.activeCredentialId != null && !hasActiveWallet(state.accounts) && !state.mobileFlow) {
     return { step: "welcome-back" };
   }
@@ -7597,6 +7709,7 @@ function createInitialState(config) {
     amount: config.depositAmount != null ? config.depositAmount.toString() : "",
     transfer: null,
     creatingTransfer: false,
+    signPayloadExpired: false,
     passkeyConfigLoaded: false,
     activeCredentialId: config.activeCredentialId,
     knownCredentialIds: [],
@@ -7622,7 +7735,8 @@ function createInitialState(config) {
     enableFullWidget: config.enableFullWidget ?? false,
     requireAmountEntry: config.depositAmount == null,
     authenticatedOnOpen: false,
-    welcomeBackAcknowledged: false
+    welcomeBackAcknowledged: false,
+    initialDataLoaded: false
   };
 }
 function clearAuthenticatedSessionState(state) {
@@ -7642,6 +7756,7 @@ function clearAuthenticatedSessionState(state) {
     savedSelection: null,
     transfer: null,
     creatingTransfer: false,
+    signPayloadExpired: false,
     passkeyConfigLoaded: false,
     activeCredentialId: null,
     knownCredentialIds: [],
@@ -7662,7 +7777,8 @@ function clearAuthenticatedSessionState(state) {
     guestWalletDeeplinksPreparing: false,
     amountTooLow: null,
     authenticatedOnOpen: false,
-    welcomeBackAcknowledged: false
+    welcomeBackAcknowledged: false,
+    initialDataLoaded: false
   };
 }
 function paymentReducer(state, action) {
@@ -7725,7 +7841,8 @@ function applyAction(state, action) {
         providers: action.providers,
         accounts: action.accounts,
         chains: action.chains,
-        depositSelectionRefreshing: false
+        depositSelectionRefreshing: false,
+        initialDataLoaded: true
       };
       if (action.defaults) {
         next.selectedAccountId = action.defaults.accountId;
@@ -7750,7 +7867,8 @@ function applyAction(state, action) {
       const next = {
         ...state,
         accounts: action.accounts,
-        providers: action.providers
+        providers: action.providers,
+        initialDataLoaded: true
       };
       if (action.defaults) {
         next.selectedAccountId = action.defaults.accountId;
@@ -7825,6 +7943,7 @@ function applyAction(state, action) {
       return {
         ...state,
         error: null,
+        signPayloadExpired: false,
         creatingTransfer: true,
         depositSelectionRefreshing: false,
         deeplinkUri: null,
@@ -7841,14 +7960,27 @@ function applyAction(state, action) {
         error: action.error,
         creatingTransfer: false
       };
+    case "SIGN_PAYLOAD_EXPIRED":
+      return {
+        ...state,
+        error: action.error,
+        signPayloadExpired: true,
+        creatingTransfer: false
+      };
     case "TRANSFER_CREATED":
       return { ...state, transfer: action.transfer };
     case "TRANSFER_SIGNED":
-      return { ...state, transfer: action.transfer, setupAuthorizationSessionId: null };
+      return {
+        ...state,
+        transfer: action.transfer,
+        signPayloadExpired: false,
+        setupAuthorizationSessionId: null
+      };
     case "TRANSFER_COMPLETED":
       return {
         ...state,
         transfer: action.transfer,
+        signPayloadExpired: false,
         mobileFlow: false,
         deeplinkUri: null,
         setupAuthorizationSessionId: null
@@ -7993,6 +8125,11 @@ function applyAction(state, action) {
       return { ...state, loginRequested: false, error: null };
     case "ACKNOWLEDGE_WELCOME_BACK":
       return { ...state, welcomeBackAcknowledged: true };
+    // Back from WalletPickerScreen. Pin the welcome screen (preserved by the
+    // welcome-back sticky branch in resolvePhase) and clear the acknowledged
+    // flag so the sticky gate treats the user as un-acknowledged again.
+    case "RETURN_TO_WELCOME_BACK":
+      return { ...state, welcomeBackAcknowledged: false, phase: { step: "welcome-back" } };
     case "SET_ERROR":
       return { ...state, error: action.error };
     case "AMOUNT_TOO_LOW":
@@ -10581,14 +10718,14 @@ var textStyle2 = (color, fontWeight) => ({
 });
 
 // src/deviceBiometricUnlockText.ts
-var FALLBACK = "Biometric verification";
+var FALLBACK = "Passkey";
 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";
+    return "Fingerprint or Face";
   }
   if (/Windows NT/i.test(ua)) {
     return "Windows Hello";
@@ -13127,14 +13264,34 @@ function SelectDepositSourceScreen({
   const requiresAuth = selectableOptions.filter(
     (opt) => opt.status && opt.status !== "AUTHORIZED"
   );
-  const orderedAccounts = (() => {
-    if (!selectedAccountId) return accounts;
-    const selected = accounts.find((a) => a.id === selectedAccountId);
-    if (!selected) return accounts;
-    return [selected, ...accounts.filter((a) => a.id !== selectedAccountId)];
-  })();
+  const sectionsPerAccount = /* @__PURE__ */ new Map();
+  for (const section of accounts) {
+    sectionsPerAccount.set(section.id, (sectionsPerAccount.get(section.id) ?? 0) + 1);
+  }
   const fallbackAccountId = selectedAccountId ?? accounts[0]?.id ?? null;
   const rowAccountId = (opt) => opt.accountId ?? fallbackAccountId;
+  const rowMatchesSection = (opt, section) => {
+    if (rowAccountId(opt) !== section.id) return false;
+    if (opt.walletAddress != null) return opt.walletAddress === section.address;
+    return (sectionsPerAccount.get(section.id) ?? 0) <= 1;
+  };
+  const orderedAccounts = (() => {
+    const selectedOption = selectedWalletId ? tokenOptions.find((opt) => opt.walletId === selectedWalletId) : void 0;
+    const selectedAddress = selectedOption?.walletAddress ?? null;
+    const selectedSectionId = selectedOption?.accountId ?? selectedAccountId ?? null;
+    if (!selectedSectionId) return accounts;
+    const matchesSelected = (section) => {
+      if (section.id !== selectedSectionId) return false;
+      if (selectedAddress != null) return section.address === selectedAddress;
+      return true;
+    };
+    const selectedIndex = accounts.findIndex(matchesSelected);
+    if (selectedIndex < 0) return accounts;
+    return [
+      accounts[selectedIndex],
+      ...accounts.filter((_, index) => index !== selectedIndex)
+    ];
+  })();
   const isSelected = (opt) => !!selectedTokenSymbol && !!selectedChainName && !!selectedWalletId && opt.symbol === selectedTokenSymbol && opt.chainName === selectedChainName && opt.walletId === selectedWalletId;
   const tokenOptionKey = (opt) => `${opt.accountId ?? ""}-${opt.chainName}-${opt.symbol}-${opt.walletId ?? ""}`;
   const hasPendingMobileSelection = pendingMobileSelection != null;
@@ -13219,8 +13376,8 @@ function SelectDepositSourceScreen({
         /* @__PURE__ */ jsx(ScreenHeader, { title: "Select source", onBack: onBack ?? onDone, onLogout }),
         /* @__PURE__ */ jsxs("div", { "data-testid": "select-deposit-source-scroll-content", style: contentStyle12, children: [
           orderedAccounts.map((account) => {
-            const authRows = authorized.filter((opt) => rowAccountId(opt) === account.id);
-            const reqRows = requiresAuth.filter((opt) => rowAccountId(opt) === account.id);
+            const authRows = authorized.filter((opt) => rowMatchesSection(opt, account));
+            const reqRows = requiresAuth.filter((opt) => rowMatchesSection(opt, account));
             if (authRows.length === 0 && reqRows.length === 0) return null;
             return /* @__PURE__ */ jsxs("div", { style: accountSectionStyle, children: [
               renderAccountHeader(account),
@@ -13235,7 +13392,7 @@ function SelectDepositSourceScreen({
                     selected: !hasPendingMobileSelection && isSelected(opt),
                     onClick: () => handleAuthorizedPick(opt)
                   },
-                  `auth-${opt.accountId ?? ""}-${opt.chainName}-${opt.symbol}-${opt.walletId ?? ""}`
+                  `auth-${opt.accountId ?? ""}-${opt.walletAddress ?? ""}-${opt.chainName}-${opt.symbol}-${opt.walletId ?? ""}`
                 )),
                 reqRows.map((opt) => /* @__PURE__ */ jsx(
                   TokenSourceRow,
@@ -13248,12 +13405,12 @@ function SelectDepositSourceScreen({
                     selected: hasPendingMobileSelection ? pendingMobileSelection?.key === tokenOptionKey(opt) : isSelected(opt),
                     onClick: () => handleRequiresAuthPick(account, opt)
                   },
-                  `req-${opt.accountId ?? ""}-${opt.chainName}-${opt.symbol}-${opt.walletId ?? ""}`
+                  `req-${opt.accountId ?? ""}-${opt.walletAddress ?? ""}-${opt.chainName}-${opt.symbol}-${opt.walletId ?? ""}`
                 ))
               ] })
-            ] }, `account-${account.id}`);
+            ] }, `account-${account.id}-${account.address ?? ""}`);
           }),
-          (onSendManually || onAddProvider) && /* @__PURE__ */ jsxs("div", { style: groupCardStyle(tokens.bgRecessed), children: [
+          (onSendManually || onAddProvider) && /* @__PURE__ */ jsxs("div", { style: { ...groupCardStyle(tokens.bgRecessed), marginTop: 8 }, children: [
             onSendManually && /* @__PURE__ */ jsx(
               ActionRow,
               {
@@ -13537,14 +13694,16 @@ function DepositScreen({
   const formattedBalance = selectedTokenSymbol != null ? `$${formatUsdTwoDecimals2(availableBalance)}` : void 0;
   const tokenAriaLabel = selectedTokenSymbol && selectedChainName ? `Selected token: ${selectedTokenSymbol} on ${selectedChainName}${formattedBalance ? `, ${formattedBalance}` : ""}` : selectedTokenSymbol ? `Selected token: ${selectedTokenSymbol}${formattedBalance ? `, ${formattedBalance}` : ""}` : "Select token";
   if (tokenPickerOpen && canOpenInlineSheet) {
-    const depositSourceAccounts = (accounts ?? []).map((a) => {
-      const preferred = getPreferredDepositWallet(a, amount);
-      return {
-        id: a.id,
-        name: a.name,
-        logoURI: a.logoURI,
-        address: preferred ? getWalletAddress(preferred) : null
-      };
+    const depositSourceAccounts = (accounts ?? []).flatMap((a) => {
+      const seen = /* @__PURE__ */ new Set();
+      const sections = [];
+      for (const wallet of getAddressableWallets(a)) {
+        const address = getWalletAddress(wallet);
+        if (!address || seen.has(address)) continue;
+        seen.add(address);
+        sections.push({ id: a.id, name: a.name, logoURI: a.logoURI, address });
+      }
+      return sections;
     });
     return /* @__PURE__ */ jsx(
       SelectDepositSourceScreen,
@@ -13608,7 +13767,6 @@ function DepositScreen({
     }
   };
   const presetsInFooter = mobileEntryWithKeypad;
-  const showHeroPresets = isEntryMode && isDesktop;
   const showFooterPresets = presetsInFooter;
   const presetsRow = onPreset ? /* @__PURE__ */ jsx("div", { style: entryPresetsRowStyle, role: "group", "aria-label": "Preset amounts", children: presets.map((preset) => /* @__PURE__ */ jsx(
     "button",
@@ -13736,8 +13894,7 @@ function DepositScreen({
             }
           )
         }
-      ) : /* @__PURE__ */ jsx("span", { style: redesignNoFeesStyle(tokens.text), children: "No fees" }) }),
-      showHeroPresets && presetsRow
+      ) : /* @__PURE__ */ jsx("span", { style: redesignNoFeesStyle(tokens.text), children: "No fees" }) })
     ] }),
     /* @__PURE__ */ jsx("div", { style: bannerSlotStyle2, children: mobileEntryWithKeypad ? null : showLowFunds ? /* @__PURE__ */ jsx(
       NotificationBanner,
@@ -14084,7 +14241,7 @@ function SuccessScreen({
   return /* @__PURE__ */ jsxs(
     ScreenLayout,
     {
-      footer: /* @__PURE__ */ jsx(Fragment, { children: onDone ? /* @__PURE__ */ jsx(PrimaryButton, { onClick: onDone, children: succeeded ? "Done" : "Try again" }) : returnMessage ? /* @__PURE__ */ jsx("p", { style: returnMessageStyle(tokens.textSecondary), children: returnMessage }) : null }),
+      footer: /* @__PURE__ */ jsx(Fragment, { children: onDone ? /* @__PURE__ */ jsx(PrimaryButton, { onClick: onDone, children: succeeded ? "Close" : "Try again" }) : returnMessage ? /* @__PURE__ */ jsx("p", { style: returnMessageStyle(tokens.textSecondary), children: returnMessage }) : null }),
       children: [
         /* @__PURE__ */ jsx(
           ScreenHeader,
@@ -14103,7 +14260,7 @@ function SuccessScreen({
               style: illustrationStyle5
             }
           ),
-          /* @__PURE__ */ jsx("h2", { style: headingStyle8(tokens.text), children: "You\u2019re all set" })
+          /* @__PURE__ */ jsx("h2", { style: headingStyle8(tokens.text), children: "Deposit complete" })
         ] }) : /* @__PURE__ */ jsxs("div", { style: screenContentStyle, children: [
           /* @__PURE__ */ jsx(IconCircle, { variant: "error", size: 64, children: /* @__PURE__ */ jsx("svg", { width: "32", height: "32", viewBox: "0 0 24 24", fill: "none", children: /* @__PURE__ */ jsx("path", { d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z", fill: tokens.error }) }) }),
           /* @__PURE__ */ jsx("h2", { style: failureHeadingStyle(tokens.text), children: "Transfer failed" }),
@@ -14639,6 +14796,7 @@ function TransferStatusLayout({
   retryLabel = "Retry wallet prompt",
   retryAfterDelay = true,
   showRetryOnError = false,
+  errorVariant = "error",
   heading,
   visibleError = error,
   children
@@ -14659,7 +14817,7 @@ function TransferStatusLayout({
         onLogout && /* @__PURE__ */ jsx("div", { style: menuOverlayStyle, children: /* @__PURE__ */ jsx(SettingsMenu, { onLogout }) }),
         /* @__PURE__ */ jsxs("div", { style: contentStyle13, children: [
           /* @__PURE__ */ jsx("h2", { style: headingStyle10(tokens.text), children: heading }),
-          visibleError && /* @__PURE__ */ jsx("div", { style: errorBannerStyle7(tokens), children: visibleError }),
+          visibleError && (errorVariant === "info" ? /* @__PURE__ */ jsx(NotificationBanner, { title: "Signing window expired", description: visibleError }) : /* @__PURE__ */ jsx("div", { style: errorBannerStyle7(tokens), children: visibleError })),
           children
         ] })
       ] })
@@ -14768,6 +14926,7 @@ function DepositTransferStatusScreen({
   phase,
   error,
   visibleError = error,
+  errorVariant,
   onLogout,
   onRetry
 }) {
@@ -14778,6 +14937,7 @@ function DepositTransferStatusScreen({
       phase,
       error,
       visibleError,
+      errorVariant,
       onLogout,
       onRetry,
       retryLabel: "Retry",
@@ -16642,7 +16802,12 @@ function buildWalletPickerScreenProps({
     onPrepareProvider: handlers.onPrepareProvider,
     onSelectProvider: handlers.onSelectProvider,
     onSelectWalletConnectWallet: handlers.onSelectWalletConnectWallet,
-    onBack: !flow.authenticated ? flow.onBack : () => handlers.onSetPhase({ step: "deposit" }),
+    // Back target depends on the user's state:
+    //  • guest → host close (flow.onBack)
+    //  • authenticated with a linked (ACTIVE) wallet → DepositScreen
+    //  • authenticated, no linked wallet, full-widget → WelcomeBackScreen
+    //  • authenticated, no linked wallet, non-full-widget → host close
+    onBack: !flow.authenticated ? flow.onBack : hasActiveWallet(flow.state.accounts) ? () => handlers.onSetPhase({ step: "deposit" }) : flow.state.enableFullWidget ? handlers.onReturnToWelcomeBack : flow.onBack,
     onLogout: flow.authenticated ? handlers.onLogout : void 0,
     isDesktop: flow.isDesktop,
     directLinkCards: isMobile,
@@ -16845,6 +17010,7 @@ function buildDepositScreenProps({
           tokenAddress: source.address,
           chainId: chain?.commonId ?? void 0,
           accountId: account.id,
+          walletAddress: getWalletAddress(wallet) ?? void 0,
           logoURI: source.token.logoURI
         });
       }
@@ -16962,14 +17128,18 @@ function buildProcessingScreenProps({
 }) {
   const bestKnownTransfer = remote.pollingTransfer ?? flow.state.transfer;
   const transferStatus = bestKnownTransfer?.status;
-  const canRetryDepositSigning = remote.transferSigningError != null && isTransferSignable(bestKnownTransfer);
-  const error = flow.state.error || remote.authExecutorError || remote.transferSigningError || remote.pollingError;
-  const visibleError = remote.transferSigningPasskeyDismissed === true && !flow.state.error && !remote.authExecutorError ? remote.pollingError : error;
+  const signExpired = flow.state.signPayloadExpired === true;
+  const canRetryDepositSigning = (remote.transferSigningError != null || signExpired) && isTransferSignable(bestKnownTransfer);
+  const error = signExpired ? flow.state.error : flow.state.error || remote.authExecutorError || remote.transferSigningError || remote.pollingError;
+  const visibleError = signExpired ? flow.state.error : remote.transferSigningPasskeyDismissed === true && !flow.state.error && !remote.authExecutorError ? remote.pollingError : error;
   const transferPhase = flow.state.creatingTransfer ? "creating" : transferStatus === "SENDING" || transferStatus === "SENT" || transferStatus === "COMPLETED" ? "sent" : transferStatus === "AUTHORIZED" ? "submitting" : "signing";
   return {
     phase: transferPhase,
     error,
     visibleError,
+    // An expired SVM signing window is a benign, retryable condition — present it
+    // as an informational banner rather than the alarming red error banner.
+    errorVariant: signExpired ? "info" : "error",
     onRetry: canRetryDepositSigning ? handlers.onRetryTransferSigning : void 0,
     onLogout: handlers.onLogout
   };
@@ -17106,6 +17276,7 @@ function StepRendererContent({
           phase: processingProps.phase,
           error: processingProps.error,
           visibleError: processingProps.visibleError,
+          errorVariant: processingProps.errorVariant,
           onRetry: processingProps.onRetry,
           onLogout: processingProps.onLogout
         }
@@ -17462,6 +17633,7 @@ function resolveStandardTransferSource({
 }
 
 // src/hooks/useTransferHandlers.ts
+var SIGN_PAYLOAD_EXPIRED_MESSAGE = "This transfer must be signed within 20 seconds. Tap Retry to try again.";
 function useTransferHandlers(deps) {
   const {
     dispatch,
@@ -17485,6 +17657,7 @@ function useTransferHandlers(deps) {
     selectedTokenSymbol,
     quoteId,
     transfer,
+    signPayloadExpired,
     accounts,
     chains
   } = deps;
@@ -17615,6 +17788,10 @@ function useTransferHandlers(deps) {
       if (isTransferSigningPasskeyDismissedError(err)) {
         return;
       }
+      if (isSvmSignExpiredError(err)) {
+        dispatch({ type: "SIGN_PAYLOAD_EXPIRED", error: SIGN_PAYLOAD_EXPIRED_MESSAGE });
+        return;
+      }
       captureException(err);
       const msg = err instanceof Error ? err.message : "Transfer failed";
       dispatch({ type: "PAY_ERROR", error: msg });
@@ -17652,6 +17829,10 @@ function useTransferHandlers(deps) {
       dispatch({ type: "CONFIRM_SIGN_SUCCESS", transfer: signedTransfer });
       polling.startPolling(t.id);
     } catch (err) {
+      if (isSvmSignExpiredError(err)) {
+        dispatch({ type: "SIGN_PAYLOAD_EXPIRED", error: SIGN_PAYLOAD_EXPIRED_MESSAGE });
+        return;
+      }
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to sign transfer";
       dispatch({ type: "SET_ERROR", error: msg });
@@ -17661,9 +17842,19 @@ function useTransferHandlers(deps) {
   const handleRetryTransferSigning = useCallback(async () => {
     const t = polling.transfer ?? transfer;
     if (!isTransferSignable(t)) return;
+    const wasExpired = signPayloadExpired;
     try {
       dispatch({ type: "SET_ERROR", error: null });
       processingStartedAtRef.current = Date.now();
+      if (wasExpired) {
+        const refreshed = await transferSigning.regenerateSignPayload(t.id);
+        const signedTransfer2 = await transferSigning.signTransfer(t.id, {
+          knownSignPayload: refreshed.signPayload
+        });
+        dispatch({ type: "TRANSFER_SIGNED", transfer: signedTransfer2 });
+        polling.startPolling(t.id);
+        return;
+      }
       const signedTransfer = await transferSigning.signTransfer(t.id);
       dispatch({ type: "TRANSFER_SIGNED", transfer: signedTransfer });
       polling.startPolling(t.id);
@@ -17671,12 +17862,16 @@ function useTransferHandlers(deps) {
       if (isTransferSigningPasskeyDismissedError(err)) {
         return;
       }
+      if (isSvmSignExpiredError(err)) {
+        dispatch({ type: "SIGN_PAYLOAD_EXPIRED", error: SIGN_PAYLOAD_EXPIRED_MESSAGE });
+        return;
+      }
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to sign transfer";
       dispatch({ type: "PAY_ERROR", error: msg });
       onError?.(msg);
     }
-  }, [transfer, polling.transfer, polling.startPolling, transferSigning, onError, dispatch]);
+  }, [transfer, polling.transfer, polling.startPolling, transferSigning, onError, dispatch, signPayloadExpired]);
   return {
     reloadAccounts,
     handlePay,
@@ -17830,6 +18025,9 @@ async function replaceOpenProviderForAccountSwitch(input) {
     if (input.chainId != null) {
       result.chainId = `0x${input.chainId.toString(16)}`;
     }
+    if (input.userSolanaWalletPubkey) {
+      result.userSolanaWalletPubkey = input.userSolanaWalletPubkey;
+    }
     const updated = await reportActionCompletion(
       input.apiBaseUrl,
       openProvider.id,
@@ -18825,7 +19023,8 @@ function useProviderHandlers(deps) {
       apiBaseUrl,
       sessionId,
       accounts: change.accounts,
-      chainId: change.chainId
+      chainId: change.chainId,
+      ...change.chainId == null ? { userSolanaWalletPubkey: change.accounts[0] } : {}
     });
     if (outcome.status === "success") {
       dispatch({ type: "CLEAR_SETUP_DEPOSIT_TOKEN" });
@@ -19834,6 +20033,31 @@ function useWalletAccountSwitchEffect(deps) {
     });
   }, [enabled, isDesktop, address, chainId, connectorId, addresses, onAccountChanged]);
 }
+function useSolanaAccountSwitchEffect(deps) {
+  const { enabled = true, onAccountChanged } = deps;
+  const baselineRef = useRef(null);
+  useEffect(() => {
+    if (!enabled) {
+      baselineRef.current = null;
+      return;
+    }
+    const unsubscribe = subscribeSolanaAccountChange((pubkey) => {
+      if (baselineRef.current === pubkey) {
+        return;
+      }
+      const previous = baselineRef.current;
+      baselineRef.current = pubkey;
+      void onAccountChanged({
+        previousAddress: previous,
+        nextAddress: pubkey,
+        connectorId: "phantom",
+        chainId: null,
+        accounts: [pubkey]
+      });
+    });
+    return unsubscribe;
+  }, [enabled, onAccountChanged]);
+}
 function usePersistAmountToActiveSession({
   apiBaseUrl,
   accounts,
@@ -20017,6 +20241,7 @@ function BlinkPaymentInner({
     selectedTokenSymbol: state.selectedTokenSymbol,
     quoteId: depositFee.quoteId,
     transfer: state.transfer,
+    signPayloadExpired: state.signPayloadExpired,
     accounts: state.accounts,
     chains: state.chains
   });
@@ -20086,6 +20311,10 @@ function BlinkPaymentInner({
     isDesktop,
     onAccountChanged: onWalletAccountChanged
   });
+  useSolanaAccountSwitchEffect({
+    enabled: accountSwitchListenerArmed && isDesktop,
+    onAccountChanged: onWalletAccountChanged
+  });
   const clearLocalSessionArtifacts = useCallback(() => {
     popupAuthRef.current = null;
     clearPopupAuth();
@@ -20391,6 +20620,7 @@ function BlinkPaymentInner({
     onLogin: () => dispatch({ type: "REQUEST_LOGIN" }),
     onCancelLogin: () => dispatch({ type: "CANCEL_LOGIN_REQUEST" }),
     onAcknowledgeWelcomeBack: () => dispatch({ type: "ACKNOWLEDGE_WELCOME_BACK" }),
+    onReturnToWelcomeBack: () => dispatch({ type: "RETURN_TO_WELCOME_BACK" }),
     onSetDepositToken: handleSetDepositToken,
     onConfirmSetupDeposit: handleConfirmSetupDeposit,
     onAmountInput: (value) => dispatch({ type: "SET_AMOUNT_INPUT", value }),
@@ -20483,6 +20713,6 @@ function BlinkPaymentInner({
   ) });
 }
 
-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, ManualTransferPasskeyScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyPopupWelcomeScreen, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SecondaryButton, SelectDepositSourceScreen, SelectSourceScreen, SettingsMenu, Spinner, StepList, StepRenderer, SuccessScreen, TokenPickerScreen, VerifyPasskeyScreen, WalletPickerScreen, WelcomeBackScreen, appendDebug, api_exports as blinkApi, 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, ManualTransferPasskeyScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyPopupWelcomeScreen, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SecondaryButton, SelectDepositSourceScreen, SelectSourceScreen, SettingsMenu, Spinner, StepList, StepRenderer, SuccessScreen, TokenPickerScreen, VerifyPasskeyScreen, WalletPickerScreen, WelcomeBackScreen, appendDebug, api_exports as blinkApi, 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, useSolanaAccountSwitchEffect, useTransferPolling, useTransferSigning };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map