@rhinestone/deposit-modal 0.5.0 → 0.6.0

package/dist/{chunk-PS7HJ62M.mjs → chunk-GQDVHMOT.mjs}

@@ -414,15 +414,12 @@ function depositRowToEvent(row) {
   const time = row.completedAt ?? row.createdAt ?? void 0;
   if (status === "completed") {
     return {
-      type: "post-bridge-swap-complete",
+      type: "bridge-complete",
       time: time ?? void 0,
       data: {
         deposit,
         source,
-        ...destination && { destination },
-        ...destination && {
-          swap: { transactionHash: destination.transactionHash }
-        }
+        ...destination && { destination }
       }
     };
   }
@@ -541,15 +538,18 @@ function createDepositService(baseUrl, options) {
   }
   const PORTFOLIO_CACHE_TTL_MS = 3e4;
   const portfolioCache = /* @__PURE__ */ new Map();
-  function cachedPortfolio(key, fetcher) {
+  function cachedPortfolio(key, fetcher, forceRefresh = false) {
     const now = Date.now();
     const entry = portfolioCache.get(key);
-    if (entry && entry.expiresAt > now) {
+    if (!forceRefresh && entry && entry.expiresAt > now) {
       debugLog(debug, scope, "portfolio:cache-hit", { key });
       return entry.promise;
     }
-    const promise = fetcher().catch((err) => {
-      portfolioCache.delete(key);
+    let promise;
+    promise = fetcher().catch((err) => {
+      if (portfolioCache.get(key)?.promise === promise) {
+        portfolioCache.delete(key);
+      }
       throw err;
     });
     portfolioCache.set(key, {
@@ -567,7 +567,6 @@ function createDepositService(baseUrl, options) {
         targetChain: params.targetChain,
         targetToken: params.targetToken,
         recipient: params.recipient ? shortRef(params.recipient) : void 0,
-        postBridgeActionCount: params.postBridgeActions?.length ?? 0,
         forceRegister: params.forceRegister
       });
       const response = await fetch(url, {
@@ -641,7 +640,7 @@ function createDepositService(baseUrl, options) {
       });
       return result;
     },
-    async fetchPortfolio(address) {
+    async fetchPortfolio(address, options2) {
       return cachedPortfolio(`evm:${address.toLowerCase()}`, async () => {
         const url = apiUrl(`/portfolio/${address}`);
         debugLog(debug, scope, "fetchPortfolio:request", { url, address });
@@ -686,9 +685,9 @@ function createDepositService(baseUrl, options) {
         }
         debugLog(debug, scope, "fetchPortfolio:empty", { address });
         return { tokens: [], totalUsd: 0 };
-      });
+      }, options2?.forceRefresh);
     },
-    async fetchSolanaPortfolio(address) {
+    async fetchSolanaPortfolio(address, options2) {
       return cachedPortfolio(`sol:${address}`, async () => {
         const url = apiUrl(`/portfolio/solana/${address}`);
         debugLog(debug, scope, "fetchSolanaPortfolio:request", { url, address });
@@ -717,7 +716,7 @@ function createDepositService(baseUrl, options) {
           totalUsd: normalized.totalUsd
         });
         return normalized;
-      });
+      }, options2?.forceRefresh);
     },
     async checkAccount(address) {
       const url = apiUrl(`/check/${address}`);
@@ -1396,7 +1395,7 @@ function formatUserError(raw) {
 }
 
 // src/core/rpc.ts
-import { createContext, useContext } from "react";
+import { createContext, useContext, useMemo } from "react";
 function rpcUrlFor(rpcUrls, chain) {
   const url = rpcUrls?.[chain]?.trim();
   return url ? url : void 0;
@@ -1406,6 +1405,14 @@ var RpcUrlsProvider = RpcUrlsContext.Provider;
 function useRpcUrls() {
   return useContext(RpcUrlsContext);
 }
+function rpcUrlsKey(rpcUrls) {
+  if (!rpcUrls) return "";
+  return Object.entries(rpcUrls).map(([chain, url]) => [chain, url?.trim() ?? ""]).filter(([, url]) => url !== "").map(([chain, url]) => `${chain}=${url}`).sort().join("|");
+}
+function useStableRpcUrls(rpcUrls) {
+  const key = rpcUrlsKey(rpcUrls);
+  return useMemo(() => rpcUrls, [key]);
+}
 
 // src/core/public-client.ts
 import { createPublicClient, http } from "viem";
@@ -1728,7 +1735,7 @@ function Spinner({ className }) {
 }
 
 // src/components/steps/ConnectStep.tsx
-import { useState } from "react";
+import { useEffect as useEffect3, useState } from "react";
 
 // src/components/ui/ListRow.tsx
 import { Fragment, jsx as jsx7, jsxs as jsxs6 } from "react/jsx-runtime";
@@ -2332,6 +2339,24 @@ function formatBalanceUsd(value) {
   if (!Number.isFinite(value) || value <= 0) return "$0.00";
   return `$${value.toFixed(2)}`;
 }
+function rankUsd(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
+}
+function rankCryptoRows(descriptors) {
+  return descriptors.map((descriptor, index) => ({ descriptor, index })).sort((a, b) => {
+    const first = a.descriptor;
+    const second = b.descriptor;
+    if (first.isBalanceSource !== second.isBalanceSource) {
+      return first.isBalanceSource ? -1 : 1;
+    }
+    if (!first.isBalanceSource) return a.index - b.index;
+    if (first.resolved !== second.resolved) return first.resolved ? -1 : 1;
+    if (first.resolved && first.balanceUsd !== second.balanceUsd) {
+      return second.balanceUsd - first.balanceUsd;
+    }
+    return a.index - b.index;
+  }).map(({ descriptor }) => descriptor.node);
+}
 function fiatIcon(name) {
   if (name === "apple") return /* @__PURE__ */ jsx18(AppleIcon, {});
   if (name === "bank") return /* @__PURE__ */ jsx18(BankIcon, {});
@@ -2389,6 +2414,7 @@ function ConnectStep({
   onSelectPayWithCard,
   fiatPaymentMethods,
   onSelectFiatMethod,
+  onPrefetchFiatMethod,
   onSelectFundFromExchange,
   onRequestConnect,
   onConnect,
@@ -2406,9 +2432,21 @@ function ConnectStep({
   );
   const showDappImports = (dappImports?.length ?? 0) > 0;
   const defaultSubtitle = onSelectTransferCrypto ? "Add money to your balance" : "Choose a wallet to continue";
-  const cryptoRows = [];
+  const cryptoDescriptors = [];
+  const pushAction = (node) => cryptoDescriptors.push({
+    node,
+    isBalanceSource: false,
+    resolved: false,
+    balanceUsd: 0
+  });
+  const pushBalanceSource = (node, resolved, balanceUsd) => cryptoDescriptors.push({
+    node,
+    isBalanceSource: true,
+    resolved,
+    balanceUsd: rankUsd(balanceUsd)
+  });
   if (onSelectTransferCrypto) {
-    cryptoRows.push(
+    pushAction(
       /* @__PURE__ */ jsx18(
         ListRow,
         {
@@ -2424,8 +2462,8 @@ function ConnectStep({
   }
   for (const row of rows) {
     const collapseToExternal = Boolean(onSelectTransferCrypto) && row.kind !== "solana";
-    const subtitleText = row.state === "loading" ? "Preparing\u2026" : row.state === "error" ? row.errorReason ?? "Couldn't prepare wallet \u2014 tap to retry" : shorten(row.address);
-    cryptoRows.push(
+    const subtitleText = row.state === "loading" ? "Preparing\u2026" : row.state === "error" ? row.errorReason ?? "Couldn't prepare wallet \u2014 tap to retry" : row.balanceStatus === "ready" && row.balanceUsd != null ? formatBalanceUsd(row.balanceUsd) : row.balanceStatus === "loading" ? "Checking balance\u2026" : shorten(row.address);
+    pushBalanceSource(
       /* @__PURE__ */ jsx18(
         ListRow,
         {
@@ -2437,11 +2475,13 @@ function ConnectStep({
           trailing: renderRowTrailing(row.state)
         },
         row.id
-      )
+      ),
+      row.balanceStatus === "ready",
+      row.balanceUsd ?? 0
     );
   }
   if (!hasReownWallet && handleConnect) {
-    cryptoRows.push(
+    pushAction(
       /* @__PURE__ */ jsx18(
         ListRow,
         {
@@ -2456,7 +2496,7 @@ function ConnectStep({
     );
   }
   if (onSelectFundFromExchange) {
-    cryptoRows.push(
+    pushAction(
       /* @__PURE__ */ jsx18(
         ListRow,
         {
@@ -2473,7 +2513,7 @@ function ConnectStep({
   if (showDappImports) {
     for (const row of dappImports ?? []) {
       if (!hasReownWallet) {
-        cryptoRows.push(
+        pushBalanceSource(
           /* @__PURE__ */ jsx18(
             ListRow,
             {
@@ -2484,12 +2524,14 @@ function ConnectStep({
               disabled: !handleConnect
             },
             row.id
-          )
+          ),
+          false,
+          0
         );
         continue;
       }
       if (row.status === "loading" || row.status === "needs-connect") {
-        cryptoRows.push(
+        pushBalanceSource(
           /* @__PURE__ */ jsx18(
             ListRow,
             {
@@ -2500,12 +2542,14 @@ function ConnectStep({
               trailing: SMALL_SPINNER
             },
             row.id
-          )
+          ),
+          false,
+          0
         );
         continue;
       }
       if (row.status.enabled) {
-        cryptoRows.push(
+        pushBalanceSource(
           /* @__PURE__ */ jsx18(
             ListRow,
             {
@@ -2515,12 +2559,14 @@ function ConnectStep({
               onClick: () => onSelectDappImport?.(row.id)
             },
             row.id
-          )
+          ),
+          true,
+          row.status.balanceUsd
         );
         continue;
       }
       if (row.status.retryable) {
-        cryptoRows.push(
+        pushBalanceSource(
           /* @__PURE__ */ jsx18(
             ListRow,
             {
@@ -2530,11 +2576,13 @@ function ConnectStep({
               onClick: () => onSelectDappImport?.(row.id)
             },
             row.id
-          )
+          ),
+          false,
+          0
         );
         continue;
       }
-      cryptoRows.push(
+      pushBalanceSource(
         /* @__PURE__ */ jsx18(
           ListRow,
           {
@@ -2544,10 +2592,13 @@ function ConnectStep({
             disabled: true
           },
           row.id
-        )
+        ),
+        false,
+        0
       );
     }
   }
+  const cryptoRows = rankCryptoRows(cryptoDescriptors);
   const cashRows = [];
   if (fiatPaymentMethods && fiatPaymentMethods.length > 0 && onSelectFiatMethod) {
     for (const opt of fiatPaymentMethods) {
@@ -2586,6 +2637,14 @@ function ConnectStep({
   const [tab, setTab] = useState(defaultMethodTab);
   const activeTab = showToggle ? tab : hasCash && !hasCrypto ? "cash" : "crypto";
   const activeRows = activeTab === "cash" ? cashRows : cryptoRows;
+  useEffect3(() => {
+    if (activeTab !== "cash" || !onPrefetchFiatMethod || !fiatPaymentMethods) {
+      return;
+    }
+    for (const opt of fiatPaymentMethods) {
+      onPrefetchFiatMethod(opt.method);
+    }
+  }, [activeTab, onPrefetchFiatMethod, fiatPaymentMethods]);
   return /* @__PURE__ */ jsxs16("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs16("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
       /* @__PURE__ */ jsx18(
@@ -2625,7 +2684,7 @@ function ConnectStep({
 ConnectStep.displayName = "ConnectStep";
 
 // src/components/steps/ProcessingStep.tsx
-import { useCallback as useCallback3, useEffect as useEffect5, useRef as useRef4, useState as useState5 } from "react";
+import { useCallback as useCallback3, useEffect as useEffect6, useRef as useRef4, useState as useState5 } from "react";
 
 // src/components/ui/Button.tsx
 import { Fragment as Fragment3, jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
@@ -2671,7 +2730,7 @@ Button.displayName = "Button";
 import {
   useState as useState2,
   useRef as useRef3,
-  useEffect as useEffect3,
+  useEffect as useEffect4,
   useCallback as useCallback2
 } from "react";
 import { createPortal as createPortal2 } from "react-dom";
@@ -2690,7 +2749,7 @@ function Tooltip({ content, children, className }) {
       left: rect.left + rect.width / 2
     });
   }, []);
-  useEffect3(() => {
+  useEffect4(() => {
     if (!open) return;
     updatePosition();
     function handleOutside(event) {
@@ -2897,10 +2956,6 @@ function getEventTxHash(event) {
     const source = isRecord(event.data?.source) ? event.data.source : void 0;
     return asString(deposit?.transactionHash) ?? asString(source?.transactionHash);
   }
-  if (event.type === "post-bridge-swap-complete" || event.type === "post-bridge-swap-failed") {
-    const deposit = isRecord(event.data?.deposit) ? event.data.deposit : void 0;
-    return asString(deposit?.transactionHash);
-  }
   return void 0;
 }
 function getEventSourceDetails(event) {
@@ -2914,7 +2969,7 @@ function getEventSourceDetails(event) {
   }
   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" || event.type === "post-bridge-swap-complete" || event.type === "post-bridge-swap-failed") {
+  if (event.type === "bridge-started" || event.type === "bridge-complete" || event.type === "bridge-failed" || event.type === "error") {
     return {
       chainId: asNumber(source?.chain) ?? asNumber(deposit?.chain),
       amount: asAmount(source?.amount) ?? asAmount(deposit?.amount),
@@ -2931,7 +2986,7 @@ function asChain(value) {
 }
 function getEventDestinationDetails(event) {
   if (!event?.type || !isRecord(event.data)) return {};
-  if (event.type !== "bridge-started" && event.type !== "bridge-complete" && event.type !== "post-bridge-swap-complete") {
+  if (event.type !== "bridge-started" && event.type !== "bridge-complete") {
     return {};
   }
   const destination = isRecord(event.data.destination) ? event.data.destination : void 0;
@@ -2944,10 +2999,10 @@ function getEventDestinationDetails(event) {
   };
 }
 function isDepositEvent(event) {
-  return event?.type === "deposit-received" || event?.type === "bridge-started" || event?.type === "bridge-complete" || event?.type === "bridge-failed" || event?.type === "post-bridge-swap-complete" || event?.type === "post-bridge-swap-failed" || event?.type === "error";
+  return event?.type === "deposit-received" || event?.type === "bridge-started" || event?.type === "bridge-complete" || event?.type === "bridge-failed" || event?.type === "error";
 }
 function isFailedEvent(event) {
-  return event?.type === "bridge-failed" || event?.type === "post-bridge-swap-failed" || event?.type === "error";
+  return event?.type === "bridge-failed" || event?.type === "error";
 }
 function isHexString(value) {
   return value.startsWith("0x") || value.startsWith("0X");
@@ -3108,7 +3163,7 @@ function formatReceiveEstimate(params) {
 }
 
 // src/core/useTokenPrices.ts
-import { useEffect as useEffect4, useState as useState4 } from "react";
+import { useEffect as useEffect5, useState as useState4 } from "react";
 function useTokenPrices(service, symbols) {
   const [prices, setPrices] = useState4({});
   const symbolsKey = [
@@ -3116,7 +3171,7 @@ function useTokenPrices(service, symbols) {
       symbols.filter((symbol) => Boolean(symbol)).map((symbol) => symbol.toUpperCase())
     )
   ].sort().join(",");
-  useEffect4(() => {
+  useEffect5(() => {
     if (!symbolsKey) return;
     let cancelled = false;
     service.fetchPrices(symbolsKey.split(",")).then((result) => {
@@ -3262,9 +3317,9 @@ function parseWebhookTimestamp(event) {
 function syncPhaseTimings(previous, event) {
   if (!event?.type) return previous;
   const timestamp = parseWebhookTimestamp(event) ?? Date.now();
-  const setReceived = (event.type === "deposit-received" || event.type === "bridge-started" || event.type === "bridge-complete" || event.type === "bridge-failed" || event.type === "post-bridge-swap-complete" || event.type === "post-bridge-swap-failed" || event.type === "error") && previous.receivedAt === void 0;
-  const setBridging = (event.type === "bridge-started" || event.type === "bridge-complete" || event.type === "post-bridge-swap-complete") && previous.bridgingAt === void 0;
-  const setCompleted = (event.type === "bridge-complete" || event.type === "post-bridge-swap-complete") && previous.completedAt === void 0;
+  const setReceived = (event.type === "deposit-received" || event.type === "bridge-started" || event.type === "bridge-complete" || event.type === "bridge-failed" || event.type === "error") && previous.receivedAt === void 0;
+  const setBridging = (event.type === "bridge-started" || event.type === "bridge-complete") && previous.bridgingAt === void 0;
+  const setCompleted = event.type === "bridge-complete" && previous.completedAt === void 0;
   if (!setReceived && !setBridging && !setCompleted) return previous;
   return {
     ...previous,
@@ -3283,7 +3338,7 @@ function TickerChar({ value }) {
   const [current, setCurrent] = useState5(value);
   const [previous, setPrevious] = useState5(null);
   const [animKey, setAnimKey] = useState5(0);
-  useEffect5(() => {
+  useEffect6(() => {
     if (value === current) return;
     setPrevious(current);
     setCurrent(value);
@@ -3338,7 +3393,6 @@ function ProcessingStep({
   sourceSymbol: providedSourceSymbol,
   sourceDecimals: providedSourceDecimals,
   amountUsd,
-  hasPostBridgeActions,
   service,
   directTransfer,
   flowLabel = "deposit",
@@ -3368,8 +3422,7 @@ function ProcessingStep({
     sourceDecimals: providedSourceDecimals,
     amountUsd,
     targetChain,
-    targetToken,
-    hasPostBridgeActions
+    targetToken
   });
   const onDepositCompleteRef = useLatestRef(onDepositComplete);
   const onDepositFailedRef = useLatestRef(onDepositFailed);
@@ -3397,7 +3450,7 @@ function ProcessingStep({
     },
     [txHash]
   );
-  useEffect5(() => {
+  useEffect6(() => {
     if (!directTransfer) return;
     const completedAt = Date.now();
     updatePhaseTimings(() => ({
@@ -3428,7 +3481,7 @@ function ProcessingStep({
     txHash,
     updatePhaseTimings
   ]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (directTransfer || state.type !== "processing") return;
     const updateElapsed = () => {
       setElapsedSeconds(
@@ -3439,7 +3492,7 @@ function ProcessingStep({
     const intervalId = setInterval(updateElapsed, 1e3);
     return () => clearInterval(intervalId);
   }, [directTransfer, state.type]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (state.type === "processing") return;
     const endedAt = state.type === "complete" ? phaseTimings.completedAt ?? Date.now() : Date.now();
     setElapsedSeconds(Math.floor((endedAt - startTimeRef.current) / 1e3));
@@ -3447,14 +3500,14 @@ function ProcessingStep({
       (previous) => previous.endedAt !== void 0 ? previous : { ...previous, endedAt }
     );
   }, [phaseTimings.completedAt, state.type, updatePhaseTimings]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (!state.lastEvent) return;
     updatePhaseTimings(
       (previous) => syncPhaseTimings(previous, state.lastEvent)
     );
   }, [state.lastEvent?.time, state.lastEvent?.type, updatePhaseTimings]);
   const [swappedFiatContext, setSwappedFiatContext] = useState5(null);
-  useEffect5(() => {
+  useEffect6(() => {
     let cancelled = false;
     service.fetchSwappedOrderStatus(smartAccount).then((res) => {
       if (cancelled || !res) return;
@@ -3477,7 +3530,7 @@ function ProcessingStep({
       cancelled = true;
     };
   }, [service, smartAccount, txHash, isSwappedOrder, swappedContext?.variant]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (directTransfer) return;
     if (state.type !== "processing") {
       pollIntervalRef.current = INITIAL_POLL_INTERVAL;
@@ -3505,43 +3558,7 @@ function ProcessingStep({
           });
         }
         if (!isMounted) return;
-        const awaitingPostBridgeSwap = processingContextRef.current.hasPostBridgeActions;
-        if (eventForCurrentTx?.type === "post-bridge-swap-complete") {
-          setState({ type: "complete", lastEvent: eventForCurrentTx });
-          const swapTxHash = eventForCurrentTx.data?.swap?.transactionHash;
-          debugLog(debug, "processing", "state:complete", {
-            txHash,
-            destinationTxHash: swapTxHash,
-            event: eventForCurrentTx.type
-          });
-          const context = processingContextRef.current;
-          onDepositCompleteRef.current?.(txHash, swapTxHash, {
-            amount: context.amount,
-            sourceChain: context.sourceChain,
-            sourceToken: context.sourceToken,
-            sourceDecimals: context.sourceDecimals,
-            amountUsd: context.amountUsd,
-            targetChain: context.targetChain,
-            targetToken: context.targetToken
-          });
-          return;
-        }
-        if (eventForCurrentTx?.type === "post-bridge-swap-failed") {
-          const formatted = formatBridgeFailedMessage(eventForCurrentTx);
-          setState({
-            type: "failed",
-            message: formatted.message,
-            lastEvent: eventForCurrentTx
-          });
-          debugLog(debug, "processing", "state:failed", {
-            txHash,
-            message: formatted.message,
-            code: formatted.code
-          });
-          onDepositFailedRef.current?.(txHash, formatted.message);
-          return;
-        }
-        if (eventForCurrentTx?.type === "bridge-complete" && !awaitingPostBridgeSwap) {
+        if (eventForCurrentTx?.type === "bridge-complete") {
           setState({ type: "complete", lastEvent: eventForCurrentTx });
           const destinationTxHash2 = eventForCurrentTx.data?.destination?.transactionHash;
           debugLog(debug, "processing", "state:complete", {
@@ -3637,7 +3654,7 @@ function ProcessingStep({
     state.type,
     txHash
   ]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (directTransfer || state.type !== "processing") return;
     const timeoutId = setTimeout(() => {
       if (escalatedDelayRef.current) return;
@@ -3660,8 +3677,7 @@ function ProcessingStep({
   const timelineNowMs = phaseTimings.endedAt ?? Date.now();
   const flowNoun = flowLabel === "withdraw" ? "withdrawal" : "deposit";
   const flowCapitalized = flowLabel === "withdraw" ? "Withdrawal" : "Deposit";
-  const isPostBridgeSwapEvent = lastEvent?.type === "post-bridge-swap-complete" || lastEvent?.type === "post-bridge-swap-failed";
-  const destinationTxHash = isPostBridgeSwapEvent ? lastEvent?.data?.swap?.transactionHash || null : lastEvent?.data?.destination?.transactionHash || null;
+  const destinationTxHash = lastEvent?.data?.destination?.transactionHash || null;
   const sourceDetails = getEventSourceDetails(lastEvent);
   const displaySourceChain = sourceDetails.chainId ?? sourceChain;
   const displaySourceToken = sourceDetails.token ?? sourceToken;
@@ -3681,8 +3697,7 @@ function ProcessingStep({
   const sourceSymbol = sourceDisplay.symbol;
   const formattedSentAmount = formatRawTokenAmount(displayAmount, sourceDisplay) ?? // Not raw base units (e.g. a decimal string) — render the number as-is.
   formatTokenAmount(Number(displayAmount), sourceDisplay.symbol) ?? displayAmount;
-  const isBridgeHopDestination = hasPostBridgeActions && (lastEvent?.type === "bridge-started" || lastEvent?.type === "bridge-complete");
-  const eventDestination = isBridgeHopDestination ? {} : getEventDestinationDetails(lastEvent);
+  const eventDestination = getEventDestinationDetails(lastEvent);
   const targetDisplay = resolveTokenDisplay(
     eventDestination.token ?? targetToken,
     eventDestination.chainId ?? targetChain,
@@ -4076,6 +4091,7 @@ export {
   rpcUrlFor,
   RpcUrlsProvider,
   useRpcUrls,
+  useStableRpcUrls,
   getPublicClient,
   getHyperEvmReadClient,
   loadSessionOwnerFromStorage,