@rhinestone/deposit-modal 0.1.38 → 0.1.40

package/dist/{chunk-NULE6WII.cjs → chunk-AHOFT42H.cjs}

@@ -7,7 +7,7 @@
 
 
 
-var _chunkHYUITBRVcjs = require('./chunk-HYUITBRV.cjs');
+var _chunkFLXTBFMZcjs = require('./chunk-FLXTBFMZ.cjs');
 
 // src/components/ui/Modal.tsx
 
@@ -360,14 +360,14 @@ function normalizeOrchestratorPortfolio(data) {
       const unlocked = _nullishCoalesce(_optionalChain([chainBalance, 'access', _4 => _4.balance, 'optionalAccess', _5 => _5.unlocked]), () => ( "0"));
       const normalizedName = tokenData.tokenName.trim();
       const isNativeSymbol = normalizedName.toUpperCase() === "ETH" || normalizedName.toUpperCase() === "ETHER";
-      const tokenAddress = _nullishCoalesce(_nullishCoalesce(chainBalance.tokenAddress, () => ( extractTokenAddress(tokenData, chainBalance.chainId))), () => ( _chunkHYUITBRVcjs.getTokenAddress.call(void 0, tokenData.tokenName, chainBalance.chainId)));
-      const resolvedTokenAddress = isNativeSymbol ? _chunkHYUITBRVcjs.NATIVE_TOKEN_ADDRESS : tokenAddress;
+      const tokenAddress = _nullishCoalesce(_nullishCoalesce(chainBalance.tokenAddress, () => ( extractTokenAddress(tokenData, chainBalance.chainId))), () => ( _chunkFLXTBFMZcjs.getTokenAddress.call(void 0, tokenData.tokenName, chainBalance.chainId)));
+      const resolvedTokenAddress = isNativeSymbol ? _chunkFLXTBFMZcjs.NATIVE_TOKEN_ADDRESS : tokenAddress;
       if (!resolvedTokenAddress) {
         continue;
       }
-      const registrySymbol = _chunkHYUITBRVcjs.getTokenSymbol.call(void 0, resolvedTokenAddress, chainBalance.chainId);
+      const registrySymbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, resolvedTokenAddress, chainBalance.chainId);
       const symbol = registrySymbol !== "Token" ? registrySymbol : normalizedName || "Token";
-      const decimals = registrySymbol !== "Token" ? _chunkHYUITBRVcjs.getTokenDecimalsByAddress.call(void 0, resolvedTokenAddress, chainBalance.chainId) : _nullishCoalesce(tokenData.tokenDecimals, () => ( 18));
+      const decimals = registrySymbol !== "Token" ? _chunkFLXTBFMZcjs.getTokenDecimalsByAddress.call(void 0, resolvedTokenAddress, chainBalance.chainId) : _nullishCoalesce(tokenData.tokenDecimals, () => ( 18));
       tokens.push({
         chainId: chainBalance.chainId,
         address: resolvedTokenAddress,
@@ -394,14 +394,14 @@ function normalizeDirectToken(token) {
   const address = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(extractString(token, "address"), () => ( extractString(token, "tokenAddress"))), () => ( extractString(
     token.token,
     "address"
-  ))), () => ( _chunkHYUITBRVcjs.getTokenAddress.call(void 0, symbol, chainId)));
+  ))), () => ( _chunkFLXTBFMZcjs.getTokenAddress.call(void 0, symbol, chainId)));
   if (!address) return null;
   const addressAsToken = address;
   const balanceUsd = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(extractNumber(token, "balanceUsd"), () => ( extractNumber(token, "usdValue"))), () => ( extractNumber(token, "valueUsd"))), () => ( extractNumericString(token, "balanceUsd"))), () => ( extractNumericString(token, "usdValue"))), () => ( extractNumericString(token, "valueUsd"))), () => ( 0));
-  const registrySymbol = _chunkHYUITBRVcjs.getTokenSymbol.call(void 0, addressAsToken, chainId);
+  const registrySymbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, addressAsToken, chainId);
   const resolvedSymbol = registrySymbol !== "Token" ? registrySymbol : symbol;
   const backendDecimals = _nullishCoalesce(extractNumber(token, "decimals"), () => ( extractNumber(token, "tokenDecimals")));
-  const resolvedDecimals = registrySymbol !== "Token" ? _chunkHYUITBRVcjs.getTokenDecimalsByAddress.call(void 0, addressAsToken, chainId) : _nullishCoalesce(backendDecimals, () => ( 18));
+  const resolvedDecimals = registrySymbol !== "Token" ? _chunkFLXTBFMZcjs.getTokenDecimalsByAddress.call(void 0, addressAsToken, chainId) : _nullishCoalesce(backendDecimals, () => ( 18));
   return {
     chainId,
     address: addressAsToken,
@@ -995,25 +995,69 @@ function isRecord(value) {
 function asString(value) {
   return typeof value === "string" ? value : void 0;
 }
+function asNumber(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  if (!trimmed) return void 0;
+  const caipMatch = trimmed.match(/^eip155:(\d+)$/);
+  if (_optionalChain([caipMatch, 'optionalAccess', _41 => _41[1]])) {
+    const parsed2 = Number(caipMatch[1]);
+    return Number.isFinite(parsed2) ? parsed2 : void 0;
+  }
+  const parsed = Number(trimmed);
+  return Number.isFinite(parsed) ? parsed : void 0;
+}
+function asAmount(value) {
+  if (typeof value === "string") return value;
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value.toString();
+  }
+  return void 0;
+}
+function asAddress(value) {
+  if (typeof value !== "string") return void 0;
+  return /^0x[a-fA-F0-9]{40}$/.test(value) ? value : void 0;
+}
 function getEventTxHash(event) {
-  if (!_optionalChain([event, 'optionalAccess', _41 => _41.type])) return void 0;
+  if (!_optionalChain([event, 'optionalAccess', _42 => _42.type])) return void 0;
   if (event.type === "deposit-received") {
-    return asString(_optionalChain([event, 'access', _42 => _42.data, 'optionalAccess', _43 => _43.transactionHash]));
+    return asString(_optionalChain([event, 'access', _43 => _43.data, 'optionalAccess', _44 => _44.transactionHash]));
   }
   if (event.type === "bridge-started" || event.type === "bridge-complete") {
-    const deposit = isRecord(_optionalChain([event, 'access', _44 => _44.data, 'optionalAccess', _45 => _45.deposit])) ? event.data.deposit : void 0;
-    const source = isRecord(_optionalChain([event, 'access', _46 => _46.data, 'optionalAccess', _47 => _47.source])) ? event.data.source : void 0;
-    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _48 => _48.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _49 => _49.transactionHash]))));
+    const deposit = isRecord(_optionalChain([event, 'access', _45 => _45.data, 'optionalAccess', _46 => _46.deposit])) ? event.data.deposit : void 0;
+    const source = isRecord(_optionalChain([event, 'access', _47 => _47.data, 'optionalAccess', _48 => _48.source])) ? event.data.source : void 0;
+    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _49 => _49.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _50 => _50.transactionHash]))));
   }
   if (event.type === "bridge-failed" || event.type === "error") {
-    const deposit = isRecord(_optionalChain([event, 'access', _50 => _50.data, 'optionalAccess', _51 => _51.deposit])) ? event.data.deposit : void 0;
-    const source = isRecord(_optionalChain([event, 'access', _52 => _52.data, 'optionalAccess', _53 => _53.source])) ? event.data.source : void 0;
-    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _54 => _54.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _55 => _55.transactionHash]))));
+    const deposit = isRecord(_optionalChain([event, 'access', _51 => _51.data, 'optionalAccess', _52 => _52.deposit])) ? event.data.deposit : void 0;
+    const source = isRecord(_optionalChain([event, 'access', _53 => _53.data, 'optionalAccess', _54 => _54.source])) ? event.data.source : void 0;
+    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _55 => _55.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _56 => _56.transactionHash]))));
   }
   return void 0;
 }
+function getEventSourceDetails(event) {
+  if (!_optionalChain([event, 'optionalAccess', _57 => _57.type]) || !isRecord(event.data)) return {};
+  if (event.type === "deposit-received") {
+    return {
+      chainId: asNumber(event.data.chain),
+      amount: asAmount(event.data.amount),
+      token: asAddress(event.data.token)
+    };
+  }
+  const source = isRecord(event.data.source) ? event.data.source : void 0;
+  const deposit = isRecord(event.data.deposit) ? event.data.deposit : void 0;
+  if (event.type === "bridge-started" || event.type === "bridge-complete" || event.type === "bridge-failed" || event.type === "error") {
+    return {
+      chainId: _nullishCoalesce(asNumber(_optionalChain([source, 'optionalAccess', _58 => _58.chain])), () => ( asNumber(_optionalChain([deposit, 'optionalAccess', _59 => _59.chain])))),
+      amount: _nullishCoalesce(asAmount(_optionalChain([source, 'optionalAccess', _60 => _60.amount])), () => ( asAmount(_optionalChain([deposit, 'optionalAccess', _61 => _61.amount])))),
+      token: _nullishCoalesce(_nullishCoalesce(asAddress(_optionalChain([source, 'optionalAccess', _62 => _62.asset])), () => ( asAddress(_optionalChain([deposit, 'optionalAccess', _63 => _63.asset])))), () => ( asAddress(_optionalChain([deposit, 'optionalAccess', _64 => _64.token]))))
+    };
+  }
+  return {};
+}
 function isDepositEvent(event) {
-  return _optionalChain([event, 'optionalAccess', _56 => _56.type]) === "deposit-received" || _optionalChain([event, 'optionalAccess', _57 => _57.type]) === "bridge-started";
+  return _optionalChain([event, 'optionalAccess', _65 => _65.type]) === "deposit-received" || _optionalChain([event, 'optionalAccess', _66 => _66.type]) === "bridge-started" || _optionalChain([event, 'optionalAccess', _67 => _67.type]) === "bridge-complete" || _optionalChain([event, 'optionalAccess', _68 => _68.type]) === "bridge-failed" || _optionalChain([event, 'optionalAccess', _69 => _69.type]) === "error";
 }
 
 // src/components/steps/ProcessingStep.tsx
@@ -1028,7 +1072,7 @@ function isEventForTx(event, txHash) {
   return eventTxHash.toLowerCase() === txHash.toLowerCase();
 }
 function formatBridgeFailedMessage(event) {
-  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _58 => _58.data]), () => ( {}));
+  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _70 => _70.data]), () => ( {}));
   const code = typeof eventData.errorCode === "string" ? eventData.errorCode : void 0;
   const backendMessage = typeof eventData.message === "string" ? eventData.message.trim() : "";
   if (backendMessage.length > 0) {
@@ -1068,7 +1112,7 @@ function ProcessingStep({
   const intervalRef = _react.useRef.call(void 0, null);
   _react.useEffect.call(void 0, () => {
     if (directTransfer) {
-      _optionalChain([onDepositComplete, 'optionalCall', _59 => _59(txHash)]);
+      _optionalChain([onDepositComplete, 'optionalCall', _71 => _71(txHash)]);
       return;
     }
   }, [directTransfer, txHash, onDepositComplete]);
@@ -1111,40 +1155,40 @@ function ProcessingStep({
           console.log("[deposit-modal] status poll", {
             type: lastEvent2.type,
             matchesTx: eventMatchesTx,
-            intentId: _optionalChain([eventData, 'optionalAccess', _60 => _60.intentId]),
+            intentId: _optionalChain([eventData, 'optionalAccess', _72 => _72.intentId]),
             data: eventData
           });
         }
         if (!isMounted) return;
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _61 => _61.type]) === "bridge-complete") {
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _73 => _73.type]) === "bridge-complete") {
           setState({ type: "complete", lastEvent: eventForCurrentTx });
-          const destinationTxHash2 = _optionalChain([eventForCurrentTx, 'access', _62 => _62.data, 'optionalAccess', _63 => _63.destination, 'optionalAccess', _64 => _64.transactionHash]);
-          _optionalChain([onDepositComplete, 'optionalCall', _65 => _65(txHash, destinationTxHash2)]);
+          const destinationTxHash2 = _optionalChain([eventForCurrentTx, 'access', _74 => _74.data, 'optionalAccess', _75 => _75.destination, 'optionalAccess', _76 => _76.transactionHash]);
+          _optionalChain([onDepositComplete, 'optionalCall', _77 => _77(txHash, destinationTxHash2)]);
           return;
         }
-        if (!waitForFinalTx && _optionalChain([eventForCurrentTx, 'optionalAccess', _66 => _66.type]) === "bridge-started") {
+        if (!waitForFinalTx && _optionalChain([eventForCurrentTx, 'optionalAccess', _78 => _78.type]) === "bridge-started") {
           setState({ type: "complete", lastEvent: eventForCurrentTx });
-          _optionalChain([onDepositComplete, 'optionalCall', _67 => _67(txHash)]);
+          _optionalChain([onDepositComplete, 'optionalCall', _79 => _79(txHash)]);
           return;
         }
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _68 => _68.type]) === "bridge-failed") {
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _80 => _80.type]) === "bridge-failed") {
           const formatted = formatBridgeFailedMessage(eventForCurrentTx);
           setState({
             type: "failed",
             message: formatted.message,
             lastEvent: eventForCurrentTx
           });
-          _optionalChain([onDepositFailed, 'optionalCall', _69 => _69(txHash, formatted.message)]);
+          _optionalChain([onDepositFailed, 'optionalCall', _81 => _81(txHash, formatted.message)]);
           return;
         }
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _70 => _70.type]) === "error") {
-          const errorMessage = _nullishCoalesce(_optionalChain([eventForCurrentTx, 'access', _71 => _71.data, 'optionalAccess', _72 => _72.message]), () => ( "Unknown error"));
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _82 => _82.type]) === "error") {
+          const errorMessage = _nullishCoalesce(_optionalChain([eventForCurrentTx, 'access', _83 => _83.data, 'optionalAccess', _84 => _84.message]), () => ( "Unknown error"));
           setState({
             type: "failed",
             message: errorMessage,
             lastEvent: eventForCurrentTx
           });
-          _optionalChain([onDepositFailed, 'optionalCall', _73 => _73(txHash, errorMessage)]);
+          _optionalChain([onDepositFailed, 'optionalCall', _85 => _85(txHash, errorMessage)]);
           return;
         }
         setState({ type: "processing", lastEvent: eventForCurrentTx });
@@ -1192,7 +1236,7 @@ function ProcessingStep({
     processTimeoutRef.current = setTimeout(() => {
       const message = "We couldn't confirm your transfer. Please contact support if funds do not arrive.";
       setState({ type: "error", message });
-      _optionalChain([onError, 'optionalCall', _74 => _74(message, "PROCESS_TIMEOUT")]);
+      _optionalChain([onError, 'optionalCall', _86 => _86(message, "PROCESS_TIMEOUT")]);
     }, PROCESS_TIMEOUT_MS);
     return () => {
       if (processTimeoutRef.current) {
@@ -1205,12 +1249,16 @@ function ProcessingStep({
   const isComplete = state.type === "complete";
   const isProcessing = state.type === "processing";
   const lastEvent = state.type === "processing" || state.type === "complete" || state.type === "failed" ? state.lastEvent : void 0;
-  const isEarlyComplete = !waitForFinalTx && _optionalChain([lastEvent, 'optionalAccess', _75 => _75.type]) === "bridge-started";
+  const isEarlyComplete = !waitForFinalTx && _optionalChain([lastEvent, 'optionalAccess', _87 => _87.type]) === "bridge-started";
   const flowNoun = flowLabel === "withdraw" ? "withdrawal" : "deposit";
   const flowCapitalized = flowLabel === "withdraw" ? "Withdrawal" : "Deposit";
-  const destinationTxHash = _optionalChain([lastEvent, 'optionalAccess', _76 => _76.data, 'optionalAccess', _77 => _77.destination, 'optionalAccess', _78 => _78.transactionHash]) || null;
-  const sourceExplorerUrl = _chunkHYUITBRVcjs.getExplorerTxUrl.call(void 0, sourceChain, txHash);
-  const destExplorerUrl = destinationTxHash ? _chunkHYUITBRVcjs.getExplorerTxUrl.call(void 0, targetChain, destinationTxHash) : null;
+  const destinationTxHash = _optionalChain([lastEvent, 'optionalAccess', _88 => _88.data, 'optionalAccess', _89 => _89.destination, 'optionalAccess', _90 => _90.transactionHash]) || null;
+  const sourceDetails = getEventSourceDetails(lastEvent);
+  const displaySourceChain = _nullishCoalesce(sourceDetails.chainId, () => ( sourceChain));
+  const displaySourceToken = _nullishCoalesce(sourceDetails.token, () => ( sourceToken));
+  const displayAmount = _nullishCoalesce(sourceDetails.amount, () => ( amount));
+  const sourceExplorerUrl = _chunkFLXTBFMZcjs.getExplorerTxUrl.call(void 0, displaySourceChain, txHash);
+  const destExplorerUrl = destinationTxHash ? _chunkFLXTBFMZcjs.getExplorerTxUrl.call(void 0, targetChain, destinationTxHash) : null;
   const truncateHash = (hash) => `${hash.slice(0, 10)}...${hash.slice(-8)}`;
   const formatElapsedTime = (seconds) => {
     if (seconds < 60) return `${seconds} second${seconds !== 1 ? "s" : ""}`;
@@ -1218,16 +1266,19 @@ function ProcessingStep({
     const secs = seconds % 60;
     return `${mins}m ${secs}s`;
   };
-  const sourceSymbol = _chunkHYUITBRVcjs.getTokenSymbol.call(void 0, sourceToken, sourceChain);
-  const sourceDecimals = _chunkHYUITBRVcjs.getTokenDecimalsByAddress.call(void 0, sourceToken, sourceChain);
+  const sourceSymbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, displaySourceToken, displaySourceChain);
+  const sourceDecimals = _chunkFLXTBFMZcjs.getTokenDecimalsByAddress.call(void 0, 
+    displaySourceToken,
+    displaySourceChain
+  );
   const formattedReceivedAmount = (() => {
     try {
-      const raw = _viem.formatUnits.call(void 0, BigInt(amount), sourceDecimals);
+      const raw = _viem.formatUnits.call(void 0, BigInt(displayAmount), sourceDecimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return numeric.toLocaleString("en-US", { maximumFractionDigits: 6 });
     } catch (e4) {
-      return Number(amount).toLocaleString("en-US", {
+      return Number(displayAmount).toLocaleString("en-US", {
         maximumFractionDigits: 6
       });
     }
@@ -1290,15 +1341,15 @@ function ProcessingStep({
                 className: "rs-card-value",
                 style: { display: "flex", alignItems: "center", gap: 6 },
                 children: [
-                  _chunkHYUITBRVcjs.getChainIcon.call(void 0, sourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                  _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                     "img",
                     {
-                      src: _chunkHYUITBRVcjs.getChainIcon.call(void 0, sourceChain),
+                      src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain),
                       alt: "",
                       style: { width: 14, height: 14, borderRadius: "50%" }
                     }
                   ),
-                  _chunkHYUITBRVcjs.getChainName.call(void 0, sourceChain)
+                  _chunkFLXTBFMZcjs.getChainName.call(void 0, displaySourceChain)
                 ]
               }
             )
@@ -1311,15 +1362,15 @@ function ProcessingStep({
                 className: "rs-card-value",
                 style: { display: "flex", alignItems: "center", gap: 6 },
                 children: [
-                  _chunkHYUITBRVcjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                  _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                     "img",
                     {
-                      src: _chunkHYUITBRVcjs.getChainIcon.call(void 0, targetChain),
+                      src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain),
                       alt: "",
                       style: { width: 14, height: 14, borderRadius: "50%" }
                     }
                   ),
-                  _chunkHYUITBRVcjs.getChainName.call(void 0, targetChain)
+                  _chunkFLXTBFMZcjs.getChainName.call(void 0, targetChain)
                 ]
               }
             )
@@ -1441,7 +1492,7 @@ function ProcessingStep({
         {
           className: `rs-step-description ${isError ? "rs-text-error" : "rs-text-secondary"}`,
           children: [
-            state.type === "processing" && (_optionalChain([lastEvent, 'optionalAccess', _79 => _79.type]) === "deposit-received" ? "Transfer received. Preparing bridge..." : _optionalChain([lastEvent, 'optionalAccess', _80 => _80.type]) === "bridge-started" ? "Transfer confirmed. Funds arriving shortly..." : `Bridging your ${flowNoun} to ${_chunkHYUITBRVcjs.getChainName.call(void 0, targetChain)}.`),
+            state.type === "processing" && (_optionalChain([lastEvent, 'optionalAccess', _91 => _91.type]) === "deposit-received" ? "Transfer received. Preparing bridge..." : _optionalChain([lastEvent, 'optionalAccess', _92 => _92.type]) === "bridge-started" ? "Transfer confirmed. Funds arriving shortly..." : `Bridging your ${flowNoun} to ${_chunkFLXTBFMZcjs.getChainName.call(void 0, targetChain)}.`),
             state.type === "failed" && state.message,
             state.type === "error" && state.message
           ]
@@ -1497,15 +1548,15 @@ function ProcessingStep({
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                _chunkHYUITBRVcjs.getChainIcon.call(void 0, sourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                   "img",
                   {
-                    src: _chunkHYUITBRVcjs.getChainIcon.call(void 0, sourceChain),
+                    src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain),
                     alt: "",
                     style: { width: 16, height: 16, borderRadius: "50%" }
                   }
                 ),
-                _chunkHYUITBRVcjs.getChainName.call(void 0, sourceChain)
+                _chunkFLXTBFMZcjs.getChainName.call(void 0, displaySourceChain)
               ]
             }
           )
@@ -1518,15 +1569,15 @@ function ProcessingStep({
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                _chunkHYUITBRVcjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                   "img",
                   {
-                    src: _chunkHYUITBRVcjs.getChainIcon.call(void 0, targetChain),
+                    src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain),
                     alt: "",
                     style: { width: 16, height: 16, borderRadius: "50%" }
                   }
                 ),
-                _chunkHYUITBRVcjs.getChainName.call(void 0, targetChain)
+                _chunkFLXTBFMZcjs.getChainName.call(void 0, targetChain)
               ]
             }
           )
@@ -1579,7 +1630,7 @@ var clientCache = /* @__PURE__ */ new Map();
 function getPublicClient(chainId) {
   let client = clientCache.get(chainId);
   if (!client) {
-    const chain = _chunkHYUITBRVcjs.CHAIN_BY_ID[chainId];
+    const chain = _chunkFLXTBFMZcjs.CHAIN_BY_ID[chainId];
     client = _viem.createPublicClient.call(void 0, {
       chain,
       transport: _viem.http.call(void 0, )
@@ -1612,4 +1663,5 @@ function getPublicClient(chainId) {
 
 
 
-exports.Modal = Modal; exports.Spinner = Spinner; exports.Button = Button; exports.ConnectStep = ConnectStep; exports.buildSessionDetails = buildSessionDetails; exports.createDepositService = createDepositService; exports.getAssetId = getAssetId; exports.portfolioToAssets = portfolioToAssets; exports.isNativeAsset = isNativeAsset; exports.loadSessionOwnerFromStorage = loadSessionOwnerFromStorage; exports.saveSessionOwnerToStorage = saveSessionOwnerToStorage; exports.createSessionOwnerKey = createSessionOwnerKey; exports.accountFromPrivateKey = accountFromPrivateKey; exports.PoweredBy = PoweredBy; exports.currencyFormatter = currencyFormatter; exports.tokenFormatter = tokenFormatter; exports.formatUserError = formatUserError; exports.getEventTxHash = getEventTxHash; exports.isDepositEvent = isDepositEvent; exports.ProcessingStep = ProcessingStep; exports.getPublicClient = getPublicClient; exports.applyTheme = applyTheme;
+
+exports.Modal = Modal; exports.Spinner = Spinner; exports.Button = Button; exports.ConnectStep = ConnectStep; exports.buildSessionDetails = buildSessionDetails; exports.createDepositService = createDepositService; exports.getAssetId = getAssetId; exports.portfolioToAssets = portfolioToAssets; exports.isNativeAsset = isNativeAsset; exports.loadSessionOwnerFromStorage = loadSessionOwnerFromStorage; exports.saveSessionOwnerToStorage = saveSessionOwnerToStorage; exports.createSessionOwnerKey = createSessionOwnerKey; exports.accountFromPrivateKey = accountFromPrivateKey; exports.PoweredBy = PoweredBy; exports.currencyFormatter = currencyFormatter; exports.tokenFormatter = tokenFormatter; exports.formatUserError = formatUserError; exports.getEventTxHash = getEventTxHash; exports.getEventSourceDetails = getEventSourceDetails; exports.isDepositEvent = isDepositEvent; exports.ProcessingStep = ProcessingStep; exports.getPublicClient = getPublicClient; exports.applyTheme = applyTheme;

package/dist/{chunk-P7B7B6LU.mjs → chunk-CFLZYWX7.mjs}

@@ -17,7 +17,7 @@ import {
   isNativeAsset,
   loadSessionOwnerFromStorage,
   saveSessionOwnerToStorage
-} from "./chunk-UBPIPY3L.mjs";
+} from "./chunk-IC2M2DZ7.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -30,7 +30,7 @@ import {
   getTokenDecimalsByAddress,
   getTokenIcon,
   getTokenSymbol
-} from "./chunk-ZL4KPLWE.mjs";
+} from "./chunk-I7RYTI4G.mjs";
 
 // src/WithdrawModal.tsx
 import {
@@ -1340,7 +1340,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-OIG2DANP.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-XXCOZYVU.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );

package/dist/{chunk-7HJ7TUHX.mjs → chunk-F5S6RHUI.mjs}

@@ -13,6 +13,7 @@ import {
   currencyFormatter,
   formatUserError,
   getAssetId,
+  getEventSourceDetails,
   getEventTxHash,
   getPublicClient,
   isDepositEvent,
@@ -21,7 +22,7 @@ import {
   portfolioToAssets,
   saveSessionOwnerToStorage,
   tokenFormatter
-} from "./chunk-UBPIPY3L.mjs";
+} from "./chunk-IC2M2DZ7.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -37,7 +38,7 @@ import {
   getTokenIcon,
   getTokenSymbol,
   isStablecoinSymbol
-} from "./chunk-ZL4KPLWE.mjs";
+} from "./chunk-I7RYTI4G.mjs";
 
 // src/DepositModal.tsx
 import {
@@ -1236,46 +1237,6 @@ QRCode.displayName = "QRCode";
 // src/components/steps/DepositAddressStep.tsx
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 var POLL_INTERVAL_MS = 4e3;
-function isRecord(value) {
-  return typeof value === "object" && value !== null;
-}
-function asNumber(value) {
-  if (typeof value === "number" && Number.isFinite(value)) return value;
-  if (typeof value === "string" && value.trim() !== "") {
-    const parsed = Number(value);
-    return Number.isFinite(parsed) ? parsed : void 0;
-  }
-  return void 0;
-}
-function asAmount(value) {
-  if (typeof value === "string") return value;
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return value.toString();
-  }
-  return void 0;
-}
-function asAddress(value) {
-  if (typeof value !== "string") return void 0;
-  return /^0x[a-fA-F0-9]{40}$/.test(value) ? value : void 0;
-}
-function getDepositEventDetails(event) {
-  if (!event?.type || !isRecord(event.data)) return {};
-  if (event.type === "deposit-received") {
-    return {
-      chainId: asNumber(event.data.chain),
-      amount: asAmount(event.data.amount),
-      token: asAddress(event.data.token)
-    };
-  }
-  if (event.type === "bridge-started") {
-    const source = isRecord(event.data.source) ? event.data.source : void 0;
-    return {
-      chainId: asNumber(source?.chain),
-      token: asAddress(source?.asset)
-    };
-  }
-  return {};
-}
 function DepositAddressStep({
   smartAccount,
   service,
@@ -1366,7 +1327,7 @@ function DepositAddressStep({
         if (baselineTxHash === void 0) {
           baselineTxHash = eventTxHash;
         } else if (eventTxHash && eventTxHash !== baselineTxHash) {
-          const details = getDepositEventDetails(event);
+          const details = getEventSourceDetails(event);
           const fallback = sourceSelectionRef.current;
           const chainId = details.chainId ?? fallback.chainId;
           const amount = details.amount ?? "0";
@@ -1585,6 +1546,9 @@ import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 function isSameRoute(sourceChain, sourceToken, targetChain, targetToken) {
   return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
 }
+function getAddressKey(address) {
+  return address ? address.toLowerCase() : null;
+}
 function DepositFlow({
   dappWalletClient,
   dappPublicClient,
@@ -1622,6 +1586,9 @@ function DepositFlow({
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState7(false);
   const [selectedConnectAddress, setSelectedConnectAddress] = useState7(null);
   const portfolioAssetsRef = useRef5([]);
+  const stableWalletSignerRef = useRef5(null);
+  const stableWalletSelectionKeyRef = useRef5(null);
+  const hasNavigatedBackRef = useRef5(false);
   const handleAssetsLoaded = useCallback3((assets) => {
     portfolioAssetsRef.current = assets;
   }, []);
@@ -1644,16 +1611,17 @@ function DepositFlow({
       await dappWalletClient.switchChain?.({ id: chainId });
     };
   }, [dappWalletClient]);
+  const connectedWalletAddress = dappWalletClient?.account?.address ?? null;
   const walletOptions = useMemo5(() => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
-    if (dappWalletClient?.account && dappAddress) {
+    if (connectedWalletAddress && dappAddress) {
       options.push({
-        address: dappWalletClient.account.address,
+        address: connectedWalletAddress,
         label: "Connected Wallet",
         kind: "connected"
       });
-      seen.add(dappWalletClient.account.address.toLowerCase());
+      seen.add(connectedWalletAddress.toLowerCase());
     }
     if (reownWallet?.address && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(reownWallet.address.toLowerCase())) {
       options.push({
@@ -1665,7 +1633,7 @@ function DepositFlow({
     }
     return options;
   }, [
-    dappWalletClient,
+    connectedWalletAddress,
     dappAddress,
     reownWallet?.address,
     reownWallet?.isConnected,
@@ -1675,17 +1643,27 @@ function DepositFlow({
   ]);
   const canAutoLock = dappWalletClient?.account && dappAddress && !reownWallet;
   const hasWalletOptions = walletOptions.length > 0;
-  const hasReownSession = Boolean(reownWallet?.isConnected || reownWallet?.address);
-  const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
-  const signerContext = useMemo5(() => {
+  const hasReownSession = Boolean(
+    reownWallet?.isConnected || reownWallet?.address
+  );
+  const showConnectStep = flowMode === null && !canAutoLock && !isConnectSelectionConfirmed;
+  const walletSelectionKey = useMemo5(() => {
+    if (flowMode !== "wallet") return null;
+    if (canAutoLock) {
+      return getAddressKey(connectedWalletAddress);
+    }
+    if (!isConnectSelectionConfirmed) return null;
+    return getAddressKey(selectedConnectAddress);
+  }, [
+    flowMode,
+    canAutoLock,
+    connectedWalletAddress,
+    isConnectSelectionConfirmed,
+    selectedConnectAddress
+  ]);
+  const walletSignerContext = useMemo5(() => {
     if (flowMode === "deposit-address") {
-      if (!dappAddress) return null;
-      return {
-        ownerAddress: dappAddress,
-        walletClient: void 0,
-        publicClient: dappPublicClient ?? getPublicClient(targetChain),
-        switchChain: void 0
-      };
+      return null;
     }
     if (canAutoLock) {
       const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
@@ -1716,7 +1694,6 @@ function DepositFlow({
     }
     return null;
   }, [
-    flowMode,
     canAutoLock,
     isConnectSelectionConfirmed,
     selectedConnectAddress,
@@ -1727,6 +1704,49 @@ function DepositFlow({
     reownWallet,
     targetChain
   ]);
+  useEffect7(() => {
+    if (flowMode !== "wallet") {
+      stableWalletSelectionKeyRef.current = null;
+      stableWalletSignerRef.current = null;
+      return;
+    }
+    if (walletSelectionKey !== stableWalletSelectionKeyRef.current) {
+      stableWalletSelectionKeyRef.current = walletSelectionKey;
+      stableWalletSignerRef.current = null;
+    }
+    if (walletSignerContext && walletSelectionKey) {
+      stableWalletSelectionKeyRef.current = walletSelectionKey;
+      stableWalletSignerRef.current = walletSignerContext;
+    }
+  }, [flowMode, walletSelectionKey, walletSignerContext]);
+  const signerContext = useMemo5(() => {
+    if (flowMode === "deposit-address") {
+      if (!dappAddress) return null;
+      return {
+        ownerAddress: dappAddress,
+        walletClient: void 0,
+        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        switchChain: void 0
+      };
+    }
+    if (flowMode !== "wallet") {
+      return null;
+    }
+    if (walletSignerContext) {
+      return walletSignerContext;
+    }
+    if (walletSelectionKey && stableWalletSelectionKeyRef.current === walletSelectionKey) {
+      return stableWalletSignerRef.current;
+    }
+    return null;
+  }, [
+    flowMode,
+    dappAddress,
+    dappPublicClient,
+    targetChain,
+    walletSignerContext,
+    walletSelectionKey
+  ]);
   const sessionKeyAddress = dappAddress ?? signerContext?.ownerAddress ?? null;
   const lastTargetRef = useRef5(null);
   useEffect7(() => {
@@ -1747,6 +1767,7 @@ function DepositFlow({
   const handleBackFromSelectAsset = useCallback3(() => {
     if (hasWalletOptions || reownWallet) {
       hasNavigatedBackRef.current = true;
+      setFlowMode(null);
       setIsConnectSelectionConfirmed(false);
     }
   }, [hasWalletOptions, reownWallet]);
@@ -1784,10 +1805,20 @@ function DepositFlow({
     setFlowMode("deposit-address");
     setStep({ type: "setup" });
   }, []);
-  const handleNewDeposit = useCallback3(() => {
+  const handleResetFlow = useCallback3(() => {
+    portfolioAssetsRef.current = [];
+    stableWalletSignerRef.current = null;
+    stableWalletSelectionKeyRef.current = null;
+    hasNavigatedBackRef.current = false;
+    setTotalBalanceUsd(0);
+    setSelectedConnectAddress(null);
+    setIsConnectSelectionConfirmed(false);
     setFlowMode(null);
     setStep({ type: "setup" });
   }, []);
+  const handleNewDeposit = useCallback3(() => {
+    handleResetFlow();
+  }, [handleResetFlow]);
   const handleSetupComplete = useCallback3(
     (smartAccount) => {
       if (isDepositAddressMode) {
@@ -1907,7 +1938,6 @@ function DepositFlow({
     }
     return null;
   }, [selectedConnectAddress, walletOptions]);
-  const hasNavigatedBackRef = useRef5(false);
   useEffect7(() => {
     if (!showConnectStep && isConnectSelectionConfirmed && flowMode === "wallet" && !signerContext) {
       setSelectedConnectAddress(null);
@@ -2119,7 +2149,7 @@ function DepositFlow({
 // src/DepositModal.tsx
 import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 var ReownDepositInner = lazy(
-  () => import("./DepositModalReown-BJWM3JMC.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-3HNOCOOO.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function DepositModal(props) {
   const needsReown = !!props.reownAppId;
@@ -2186,6 +2216,9 @@ function DepositModalInner({
   useEffect8(() => {
     if (!isOpen) {
       setCurrentStepIndex(0);
+      setTotalBalanceUsd(null);
+      backHandlerRef.current = void 0;
+      hasCalledReady.current = false;
     }
   }, [isOpen]);
   const handleStepChange = useCallback4(