@embarkai/ui-kit 0.4.87 → 0.4.89

package/dist/iframe/index.html

@@ -15,7 +15,7 @@
     <meta http-equiv="X-Content-Type-Options" content="nosniff" />
     <meta http-equiv="Referrer-Policy" content="strict-origin-when-cross-origin" />
 
-    <title>EmbarkAI Secure Wallet - iframe version 0.4.87</title>
+    <title>EmbarkAI Secure Wallet - iframe version 0.4.89</title>
 
     <!-- Styles will be injected by build process -->
     <style>

package/dist/iframe/main.js

@@ -6414,7 +6414,7 @@ var SigningManager = class extends TokenRefreshApiClient {
 };
 
 // src/iframe/main.ts
-var IFRAME_VERSION = "0.4.87";
+var IFRAME_VERSION = "0.4.89";
 var IframeWallet = class {
   constructor() {
     __publicField(this, "messenger");

package/dist/index.cjs

@@ -5453,6 +5453,7 @@ var init_useLayoutDataStore = __esm({
     useLayoutDataStore = (0, import_zustand3.create)((set) => ({
       page: null,
       pageParams: null,
+      postAuthNavigation: null,
       langOpenedFromMenu: null,
       walletMenuOpenedFrom: null,
       chainMenuOpenedFrom: null,
@@ -5466,6 +5467,20 @@ var init_useLayoutDataStore = __esm({
       pendingWalletLogin: null,
       isOnboarding: false,
       setPageParams: (pageOptions) => set({ pageParams: pageOptions }),
+      setPostAuthNavigation: (postAuthNavigation) => set({ postAuthNavigation }),
+      openPostAuthNavigation: () => {
+        let navigation = null;
+        set((state) => {
+          navigation = state.postAuthNavigation;
+          if (!navigation) return state;
+          return {
+            page: navigation.page,
+            pageParams: navigation.params ?? null,
+            postAuthNavigation: null
+          };
+        });
+        return !!navigation;
+      },
       setPage: (page) => set((prev) => ({
         page,
         // Save the page from which specific menus were opened
@@ -5496,11 +5511,12 @@ var init_useLayoutDataStore = __esm({
 });
 
 // src/internal/components/BalanceFeedProvider/constants.ts
-var BALANCE_POLLING_INTERVAL, NATIVE_BALANCE_QUERY_KEY, CUSTOM_BALANCE_QUERY_KEY, ASSET_RATE_QUERY_KEY, SKIP_SYMBOLS, WRAPPED_TOKENS;
+var BALANCE_POLLING_INTERVAL, NATIVE_BALANCE_QUERY_KEY, BLOCKSCOUTS_BALANCE_QUERY_KEY, CUSTOM_BALANCE_QUERY_KEY, ASSET_RATE_QUERY_KEY, SKIP_SYMBOLS, WRAPPED_TOKENS;
 var init_constants2 = __esm({
   "src/internal/components/BalanceFeedProvider/constants.ts"() {
     BALANCE_POLLING_INTERVAL = 3e4;
     NATIVE_BALANCE_QUERY_KEY = "embarkai-native-balance-query-key";
+    BLOCKSCOUTS_BALANCE_QUERY_KEY = "embarkai-blockscouts-balance-query-key";
     CUSTOM_BALANCE_QUERY_KEY = "embarkai-custom-balance-query-key";
     ASSET_RATE_QUERY_KEY = "embarkai-asset-rate-query-key";
     SKIP_SYMBOLS = ["TEST", "USDT", "P", "$P USDT"];
@@ -5547,27 +5563,69 @@ var init_useAssetRate = __esm({
 });
 
 // src/internal/components/BalanceFeedProvider/BalanceFeedProvider.tsx
+function isAddress(value) {
+  if (!value) return false;
+  return /^0x[a-fA-F0-9]*/.test(value);
+}
+async function getBlockscoutsAssets(embarkaiAddress, blockscoutApiUrl) {
+  const blockscoutClient = (0, import_core.createBlockscoutClient)({ baseUrl: blockscoutApiUrl });
+  const blockscoutTokens = await blockscoutClient.getTokenBalances(embarkaiAddress);
+  return blockscoutTokens.map((el) => ({
+    address: el.token.address_hash,
+    decimals: Number(el.token.decimals),
+    symbol: el.token.symbol
+  }));
+}
+function getShowBalanceAsValue(showBalanceAs, chainId) {
+  if (!showBalanceAs || !chainId) return null;
+  if (typeof showBalanceAs === "string") return showBalanceAs;
+  return showBalanceAs[chainId] || null;
+}
 function BalanceFeedProvider() {
   const config = useProviderConfig().config;
   const embarkaiAddress = useSession((st) => st.address);
   const chainConfig = useSession((st) => st.chainConfig);
   const publicClient = useSession((st) => st.publicClient);
   const [balanceSymbol, setBalanceSymbol] = (0, import_react5.useState)(null);
-  (0, import_react5.useEffect)(
-    () => setBalanceSymbol(config?.current?.showBalanceAs || chainConfig.nativeCurrency.symbol),
-    [config, embarkaiAddress, chainConfig]
-  );
-  (0, import_react5.useEffect)(
-    () => useLayoutDataStore.getState().setCryptoSymbol(chainConfig?.nativeCurrency?.symbol || "LUMIA"),
-    [embarkaiAddress, chainConfig]
-  );
-  const { data: cryptoRate } = useAssetUsdtRate(balanceSymbol);
+  const blockscoutApiUrl = (0, import_react5.useMemo)(() => getBlockscoutApiUrl(chainConfig), [chainConfig]);
+  (0, import_react5.useEffect)(() => {
+    useLayoutDataStore.getState().setCryptoSymbol(chainConfig?.nativeCurrency?.symbol || "LUMIA");
+    const showBalanceAsSymbol = getShowBalanceAsValue(config?.current?.showBalanceAs || null, chainConfig?.id || 0);
+    setBalanceSymbol(showBalanceAsSymbol || chainConfig.nativeCurrency.symbol);
+  }, [config, embarkaiAddress, chainConfig]);
+  const {
+    data: assets,
+    refetch: getBlockscoutsAndWatchAssetList
+    // hack to get updated data inside another useQuery & revalidate the query
+  } = (0, import_react_query2.useQuery)({
+    retry: false,
+    enabled: !!embarkaiAddress && !!blockscoutApiUrl,
+    queryKey: [BLOCKSCOUTS_BALANCE_QUERY_KEY, embarkaiAddress, blockscoutApiUrl],
+    queryFn: async () => {
+      if (!embarkaiAddress || !blockscoutApiUrl) return;
+      const watchTokensList = (config?.current?.watchTokens?.[chainConfig?.id] || []).map((el) => ({
+        address: el.address,
+        decimals: el.decimals,
+        symbol: el.symbol
+      }));
+      const blockscoutAssets = await getBlockscoutsAssets(embarkaiAddress, blockscoutApiUrl);
+      return [...watchTokensList, ...blockscoutAssets];
+    }
+  });
+  const assetUsdtRateSymbol = (0, import_react5.useMemo)(() => {
+    if (!balanceSymbol) return null;
+    if (isAddress(balanceSymbol)) {
+      return assets?.find((el) => el.address === balanceSymbol)?.symbol || null;
+    }
+    return balanceSymbol;
+  }, [assets, balanceSymbol]);
+  const { data: cryptoRate } = useAssetUsdtRate(assetUsdtRateSymbol);
   const isNativeBalanceFeedEnabled = !!balanceSymbol && !!chainConfig?.nativeCurrency.symbol && balanceSymbol === chainConfig?.nativeCurrency.symbol;
   const { data: nativeBalance } = (0, import_react_query2.useQuery)({
     enabled: !!isNativeBalanceFeedEnabled && !!embarkaiAddress && !!publicClient,
     retry: false,
     refetchInterval: BALANCE_POLLING_INTERVAL,
-    queryKey: [NATIVE_BALANCE_QUERY_KEY, embarkaiAddress, chainConfig?.nativeCurrency?.symbol],
+    queryKey: [NATIVE_BALANCE_QUERY_KEY, embarkaiAddress, balanceSymbol],
     // Include chainId in query key to refetch when chain changes
     queryFn: async () => {
       const balanceValue = await publicClient.getBalance({ address: embarkaiAddress });
@@ -5621,38 +5679,42 @@ function BalanceFeedProvider() {
     });
   }, [isProjectAssetBalanceEnabled, projectAssetBalance]);
   const isCustomAssetBalanceEnabled = !isNativeBalanceFeedEnabled && !isProjectAssetBalanceEnabled;
-  const { data: customBalance } = (0, import_react_query2.useQuery)({
+  const {
+    data: customBalance,
+    isLoading: isCustomBalanceLoading,
+    isError: isCustomBalanceError
+  } = (0, import_react_query2.useQuery)({
     enabled: !!isCustomAssetBalanceEnabled && !!balanceSymbol && !!chainConfig?.id && !!embarkaiAddress && !!publicClient,
     retry: false,
     refetchInterval: BALANCE_POLLING_INTERVAL,
-    // staleTime: 0,
     queryKey: [CUSTOM_BALANCE_QUERY_KEY, chainConfig?.id, embarkaiAddress, balanceSymbol],
     // Include chainId in query key to refetch when chain changes
     queryFn: async () => {
-      const blockscoutApiUrl = getBlockscoutApiUrl(chainConfig);
-      const watchTokensList = (config?.current?.watchTokens?.[chainConfig?.id] || []).map((el) => ({
-        address: el.address,
-        decimals: el.decimals,
-        symbol: el.symbol
-      }));
       const customAssetList = [];
       if (blockscoutApiUrl) {
-        const blockscoutClient = (0, import_core.createBlockscoutClient)({ baseUrl: blockscoutApiUrl });
-        const blockscoutTokens = await blockscoutClient.getTokenBalances(embarkaiAddress);
-        const blockscoutAssets = blockscoutTokens.map((el) => ({
-          address: el.token.address_hash,
-          decimals: Number(el.token.decimals),
-          symbol: el.token.symbol
-        }));
-        customAssetList.push(...watchTokensList, ...blockscoutAssets);
+        const blockscoutAssets = await getBlockscoutsAndWatchAssetList().then((res) => res.data || []);
+        customAssetList.push(...blockscoutAssets);
       } else {
+        const watchTokensList = (config?.current?.watchTokens?.[chainConfig?.id] || []).map((el) => ({
+          address: el.address,
+          decimals: el.decimals,
+          symbol: el.symbol
+        }));
         const coreTokenList = import_read2.NON_BLOCKSCOUT_CORE_TOKENS[chainConfig?.id] || [];
         customAssetList.push(...watchTokensList, ...coreTokenList);
       }
-      const { address: customAssetAddress, decimals: customAssetADecimals } = customAssetList.find((el) => el.symbol === balanceSymbol) || {};
+      const {
+        address: customAssetAddress,
+        decimals: customAssetDecimals,
+        symbol: customAssetSymbol
+      } = customAssetList.find((el) => {
+        return (isAddress(balanceSymbol) ? el.address : el.symbol) === balanceSymbol;
+      }) || {};
       if (!customAssetAddress) {
         console.warn(`[BALANCE FEED] No token address found for symbol ${balanceSymbol} on chain ${chainConfig?.name}`);
-        return { decimals: 18, formatted: "0", symbol: balanceSymbol, value: BigInt(0) };
+        throw new Error(
+          `[BALANCE FEED] No token address found for symbol ${balanceSymbol} on chain ${chainConfig?.name}`
+        );
       }
       const balanceValue = await await publicClient.readContract({
         address: customAssetAddress,
@@ -5662,15 +5724,24 @@ function BalanceFeedProvider() {
         authorizationList: void 0
       });
       return {
-        decimals: customAssetADecimals || 18,
-        formatted: (0, import_viem2.formatUnits)(balanceValue, customAssetADecimals || 18),
-        symbol: balanceSymbol,
+        decimals: customAssetDecimals || 18,
+        formatted: (0, import_viem2.formatUnits)(balanceValue, customAssetDecimals || 18),
+        symbol: customAssetSymbol,
         value: balanceValue
       };
     }
   });
+  (0, import_react5.useEffect)(() => {
+    if (!isCustomAssetBalanceEnabled || !!isCustomBalanceLoading) return;
+    if (!!isCustomAssetBalanceEnabled && !isCustomBalanceLoading && !!isCustomBalanceError && !!chainConfig?.id) {
+      setTimeout(() => {
+        setBalanceSymbol(chainConfig.nativeCurrency.symbol);
+      }, 0);
+    }
+  }, [isCustomAssetBalanceEnabled, isCustomBalanceLoading, isCustomBalanceError, chainConfig]);
   (0, import_react5.useEffect)(() => {
     if (!isCustomAssetBalanceEnabled || !customBalance) return;
+    if (!!isCustomAssetBalanceEnabled && isCustomBalanceLoading) return;
     const rate = Number(cryptoRate?.price || "1");
     const formattedBalance = Number((0, import_viem2.formatUnits)(BigInt(customBalance?.value || "0"), customBalance?.decimals || 18));
     const { setCryptoRate, setFiatBalance, setBalance, setCryptoSymbol, setFiatSymbol } = useLayoutDataStore.getState();
@@ -5679,7 +5750,14 @@ function BalanceFeedProvider() {
     setFiatSymbol("USD");
     setFiatBalance(formattedBalance * rate);
     setBalance(customBalance);
-  }, [isCustomAssetBalanceEnabled, customBalance, cryptoRate]);
+  }, [
+    isCustomAssetBalanceEnabled,
+    customBalance,
+    cryptoRate,
+    chainConfig,
+    isCustomBalanceError,
+    isCustomBalanceLoading
+  ]);
   return null;
 }
 var import_core, import_read2, import_react_query2, import_react5, import_viem2;
@@ -7062,6 +7140,7 @@ function useAutoConnect() {
           const stats = await getShareRecoveryStats2();
           const hasRecoveryData = stats && (stats.created || stats.devices && stats.devices.length > 0);
           setHasServerVault(!!hasRecoveryData);
+          useLayoutDataStore.getState().openPostAuthNavigation();
         } catch (e) {
           console.warn("[UI-KIT][AutoConnect] Vault status check failed:", e);
         }
@@ -7102,20 +7181,27 @@ function useOpenPage() {
   const page = useLayoutDataStore((st) => st.page);
   const setPage = useLayoutDataStore((st) => st.setPage);
   const setPageParams = useLayoutDataStore((st) => st.setPageParams);
+  const setPostAuthNavigation = useLayoutDataStore((st) => st.setPostAuthNavigation);
   const address = useSession((st) => st.address);
   const open = (0, import_react8.useCallback)(
     (passportPage, params) => {
-      if (!address) return setPage("auth" /* AUTH */);
+      if (!address) {
+        if (passportPage !== "auth" /* AUTH */) {
+          setPostAuthNavigation({ page: passportPage, params });
+        }
+        return setPage("auth" /* AUTH */);
+      }
       if (!!address && passportPage === "auth" /* AUTH */) return setPage("manage-wallet" /* MANAGE_WALLET */);
       setPage(passportPage);
       if (!!params) setPageParams(params);
     },
-    [setPage, setPageParams, address]
+    [setPage, setPageParams, setPostAuthNavigation, address]
   );
   const close = (0, import_react8.useCallback)(() => {
     setPageParams(null);
+    setPostAuthNavigation(null);
     setPage(null);
-  }, [setPage, setPageParams]);
+  }, [setPage, setPageParams, setPostAuthNavigation]);
   return { open, close, isOpen: page !== null };
 }
 function usePageParams() {
@@ -10599,7 +10685,8 @@ function useAuthMenuHandlers() {
           useLayoutDataStore.getState().setPage("keysare-backup" /* KEYSARE_BACKUP */);
         } else {
           useLayoutStore.getState().setIsDialogForced(false);
-          useLayoutDataStore.getState().setPage(null);
+          const didOpenPostAuthNavigation = useLayoutDataStore.getState().openPostAuthNavigation();
+          if (!didOpenPostAuthNavigation) useLayoutDataStore.getState().setPage(null);
         }
       }, 100);
     } catch (error) {
@@ -11920,6 +12007,7 @@ var init_tokens = __esm({
       //
       "$P USDT": parlayToken_default,
       "P": parlayToken_default,
+      "$P": parlayToken_default,
       //
       "EMBARKAI": embarkAI_default
     };
@@ -18519,7 +18607,8 @@ function useOnRestoreSuccess() {
         } catch (error) {
           console.warn("[UI-KIT][Restore] Error due onAccount callback:", error);
         }
-        setPage(null);
+        const didOpenPostAuthNavigation = useLayoutDataStore.getState().openPostAuthNavigation();
+        if (!didOpenPostAuthNavigation) setPage(null);
         setTimeout(() => {
           setIsDialogForced(false);
         }, 375);
@@ -18817,6 +18906,7 @@ function useCreateBackup() {
         setError(response.error || "Server backup failed");
       }
       useLayoutStore.getState().setIsDialogForced(false);
+      useLayoutDataStore.getState().openPostAuthNavigation();
     },
     onError: async (error) => {
       const { setError, setSuccess } = useRestoreStore.getState();
@@ -18948,6 +19038,7 @@ var init_useCreateBackup = __esm({
     import_react_query27 = require("@tanstack/react-query");
     import_react51 = require("react");
     init_auth();
+    init_useLayoutDataStore();
     init_useLayoutStore();
     init_iframe_manager();
     init_constants5();
@@ -22123,7 +22214,7 @@ function BalanceView(props) {
   const cryptoBalance = Number((0, import_viem9.formatUnits)(balance?.value || BigInt(0), balance?.decimals || 18));
   const fiatBalance = useLayoutDataStore((st) => st.fiatBalance);
   const fiatSymbol = useLayoutDataStore((st) => st.fiatSymbol);
-  const BalanceIcon = showFiatBalance && !!fiatBalance ? TOKENS_ICONS[cryptoSymbol] : null;
+  const BalanceIcon = showFiatBalance ? TOKENS_ICONS[cryptoSymbol] : null;
   return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(
     "p",
     {
@@ -28707,7 +28798,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.87",
+      version: "0.4.89",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -29372,6 +29463,7 @@ function Dialog2() {
   const page = useLayoutDataStore((st) => st.page);
   const transitionPageHeight = useLayoutDataStore((st) => st.transitionPageHeight);
   const setPage = useLayoutDataStore((st) => st.setPage);
+  const setPostAuthNavigation = useLayoutDataStore((st) => st.setPostAuthNavigation);
   const { colorMode, isDialogOpen, dialogTitle, dialogDescription, dialogContent, isDialogForced, setIsSettings } = useLayoutStore();
   (0, import_react96.useEffect)(() => setIsSettings(!!session), [session, setIsSettings]);
   usePageMapper();
@@ -29387,7 +29479,10 @@ function Dialog2() {
       open: isDialogOpen,
       onOpenChange: (open) => {
         if (isDialogForced) return;
-        if (!open) setPage(null);
+        if (!open) {
+          setPostAuthNavigation(null);
+          setPage(null);
+        }
       },
       children: /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(
         DialogContent,

package/dist/index.d.cts

@@ -238,7 +238,7 @@ interface ProviderConfig {
      * Display header balance as asset supposed to be used by projects' dApp.
      * Unprovided means 'native' for selected chain.
      */
-    showBalanceAs?: Asset['symbol'];
+    showBalanceAs?: Asset['symbol'] | Record<number, Asset['symbol']>;
     projectAssets?: {
         assets: ProjectAsset[];
     };

package/dist/index.d.ts

@@ -238,7 +238,7 @@ interface ProviderConfig {
      * Display header balance as asset supposed to be used by projects' dApp.
      * Unprovided means 'native' for selected chain.
      */
-    showBalanceAs?: Asset['symbol'];
+    showBalanceAs?: Asset['symbol'] | Record<number, Asset['symbol']>;
     projectAssets?: {
         assets: ProjectAsset[];
     };

package/dist/index.js

@@ -5438,6 +5438,7 @@ var init_useLayoutDataStore = __esm({
     useLayoutDataStore = create3((set) => ({
       page: null,
       pageParams: null,
+      postAuthNavigation: null,
       langOpenedFromMenu: null,
       walletMenuOpenedFrom: null,
       chainMenuOpenedFrom: null,
@@ -5451,6 +5452,20 @@ var init_useLayoutDataStore = __esm({
       pendingWalletLogin: null,
       isOnboarding: false,
       setPageParams: (pageOptions) => set({ pageParams: pageOptions }),
+      setPostAuthNavigation: (postAuthNavigation) => set({ postAuthNavigation }),
+      openPostAuthNavigation: () => {
+        let navigation = null;
+        set((state) => {
+          navigation = state.postAuthNavigation;
+          if (!navigation) return state;
+          return {
+            page: navigation.page,
+            pageParams: navigation.params ?? null,
+            postAuthNavigation: null
+          };
+        });
+        return !!navigation;
+      },
       setPage: (page) => set((prev) => ({
         page,
         // Save the page from which specific menus were opened
@@ -5481,11 +5496,12 @@ var init_useLayoutDataStore = __esm({
 });
 
 // src/internal/components/BalanceFeedProvider/constants.ts
-var BALANCE_POLLING_INTERVAL, NATIVE_BALANCE_QUERY_KEY, CUSTOM_BALANCE_QUERY_KEY, ASSET_RATE_QUERY_KEY, SKIP_SYMBOLS, WRAPPED_TOKENS;
+var BALANCE_POLLING_INTERVAL, NATIVE_BALANCE_QUERY_KEY, BLOCKSCOUTS_BALANCE_QUERY_KEY, CUSTOM_BALANCE_QUERY_KEY, ASSET_RATE_QUERY_KEY, SKIP_SYMBOLS, WRAPPED_TOKENS;
 var init_constants2 = __esm({
   "src/internal/components/BalanceFeedProvider/constants.ts"() {
     BALANCE_POLLING_INTERVAL = 3e4;
     NATIVE_BALANCE_QUERY_KEY = "embarkai-native-balance-query-key";
+    BLOCKSCOUTS_BALANCE_QUERY_KEY = "embarkai-blockscouts-balance-query-key";
     CUSTOM_BALANCE_QUERY_KEY = "embarkai-custom-balance-query-key";
     ASSET_RATE_QUERY_KEY = "embarkai-asset-rate-query-key";
     SKIP_SYMBOLS = ["TEST", "USDT", "P", "$P USDT"];
@@ -5537,29 +5553,71 @@ import {
 } from "@embarkai/core";
 import { NON_BLOCKSCOUT_CORE_TOKENS } from "@embarkai/core/read";
 import { useQuery as useQuery2 } from "@tanstack/react-query";
-import { useEffect as useEffect2, useState as useState2 } from "react";
+import { useEffect as useEffect2, useMemo, useState as useState2 } from "react";
 import { erc20Abi, formatUnits } from "viem";
+function isAddress(value) {
+  if (!value) return false;
+  return /^0x[a-fA-F0-9]*/.test(value);
+}
+async function getBlockscoutsAssets(embarkaiAddress, blockscoutApiUrl) {
+  const blockscoutClient = createBlockscoutClient({ baseUrl: blockscoutApiUrl });
+  const blockscoutTokens = await blockscoutClient.getTokenBalances(embarkaiAddress);
+  return blockscoutTokens.map((el) => ({
+    address: el.token.address_hash,
+    decimals: Number(el.token.decimals),
+    symbol: el.token.symbol
+  }));
+}
+function getShowBalanceAsValue(showBalanceAs, chainId) {
+  if (!showBalanceAs || !chainId) return null;
+  if (typeof showBalanceAs === "string") return showBalanceAs;
+  return showBalanceAs[chainId] || null;
+}
 function BalanceFeedProvider() {
   const config = useProviderConfig().config;
   const embarkaiAddress = useSession((st) => st.address);
   const chainConfig = useSession((st) => st.chainConfig);
   const publicClient = useSession((st) => st.publicClient);
   const [balanceSymbol, setBalanceSymbol] = useState2(null);
-  useEffect2(
-    () => setBalanceSymbol(config?.current?.showBalanceAs || chainConfig.nativeCurrency.symbol),
-    [config, embarkaiAddress, chainConfig]
-  );
-  useEffect2(
-    () => useLayoutDataStore.getState().setCryptoSymbol(chainConfig?.nativeCurrency?.symbol || "LUMIA"),
-    [embarkaiAddress, chainConfig]
-  );
-  const { data: cryptoRate } = useAssetUsdtRate(balanceSymbol);
+  const blockscoutApiUrl = useMemo(() => getBlockscoutApiUrl(chainConfig), [chainConfig]);
+  useEffect2(() => {
+    useLayoutDataStore.getState().setCryptoSymbol(chainConfig?.nativeCurrency?.symbol || "LUMIA");
+    const showBalanceAsSymbol = getShowBalanceAsValue(config?.current?.showBalanceAs || null, chainConfig?.id || 0);
+    setBalanceSymbol(showBalanceAsSymbol || chainConfig.nativeCurrency.symbol);
+  }, [config, embarkaiAddress, chainConfig]);
+  const {
+    data: assets,
+    refetch: getBlockscoutsAndWatchAssetList
+    // hack to get updated data inside another useQuery & revalidate the query
+  } = useQuery2({
+    retry: false,
+    enabled: !!embarkaiAddress && !!blockscoutApiUrl,
+    queryKey: [BLOCKSCOUTS_BALANCE_QUERY_KEY, embarkaiAddress, blockscoutApiUrl],
+    queryFn: async () => {
+      if (!embarkaiAddress || !blockscoutApiUrl) return;
+      const watchTokensList = (config?.current?.watchTokens?.[chainConfig?.id] || []).map((el) => ({
+        address: el.address,
+        decimals: el.decimals,
+        symbol: el.symbol
+      }));
+      const blockscoutAssets = await getBlockscoutsAssets(embarkaiAddress, blockscoutApiUrl);
+      return [...watchTokensList, ...blockscoutAssets];
+    }
+  });
+  const assetUsdtRateSymbol = useMemo(() => {
+    if (!balanceSymbol) return null;
+    if (isAddress(balanceSymbol)) {
+      return assets?.find((el) => el.address === balanceSymbol)?.symbol || null;
+    }
+    return balanceSymbol;
+  }, [assets, balanceSymbol]);
+  const { data: cryptoRate } = useAssetUsdtRate(assetUsdtRateSymbol);
   const isNativeBalanceFeedEnabled = !!balanceSymbol && !!chainConfig?.nativeCurrency.symbol && balanceSymbol === chainConfig?.nativeCurrency.symbol;
   const { data: nativeBalance } = useQuery2({
     enabled: !!isNativeBalanceFeedEnabled && !!embarkaiAddress && !!publicClient,
     retry: false,
     refetchInterval: BALANCE_POLLING_INTERVAL,
-    queryKey: [NATIVE_BALANCE_QUERY_KEY, embarkaiAddress, chainConfig?.nativeCurrency?.symbol],
+    queryKey: [NATIVE_BALANCE_QUERY_KEY, embarkaiAddress, balanceSymbol],
     // Include chainId in query key to refetch when chain changes
     queryFn: async () => {
       const balanceValue = await publicClient.getBalance({ address: embarkaiAddress });
@@ -5613,38 +5671,42 @@ function BalanceFeedProvider() {
     });
   }, [isProjectAssetBalanceEnabled, projectAssetBalance]);
   const isCustomAssetBalanceEnabled = !isNativeBalanceFeedEnabled && !isProjectAssetBalanceEnabled;
-  const { data: customBalance } = useQuery2({
+  const {
+    data: customBalance,
+    isLoading: isCustomBalanceLoading,
+    isError: isCustomBalanceError
+  } = useQuery2({
     enabled: !!isCustomAssetBalanceEnabled && !!balanceSymbol && !!chainConfig?.id && !!embarkaiAddress && !!publicClient,
     retry: false,
     refetchInterval: BALANCE_POLLING_INTERVAL,
-    // staleTime: 0,
     queryKey: [CUSTOM_BALANCE_QUERY_KEY, chainConfig?.id, embarkaiAddress, balanceSymbol],
     // Include chainId in query key to refetch when chain changes
     queryFn: async () => {
-      const blockscoutApiUrl = getBlockscoutApiUrl(chainConfig);
-      const watchTokensList = (config?.current?.watchTokens?.[chainConfig?.id] || []).map((el) => ({
-        address: el.address,
-        decimals: el.decimals,
-        symbol: el.symbol
-      }));
       const customAssetList = [];
       if (blockscoutApiUrl) {
-        const blockscoutClient = createBlockscoutClient({ baseUrl: blockscoutApiUrl });
-        const blockscoutTokens = await blockscoutClient.getTokenBalances(embarkaiAddress);
-        const blockscoutAssets = blockscoutTokens.map((el) => ({
-          address: el.token.address_hash,
-          decimals: Number(el.token.decimals),
-          symbol: el.token.symbol
-        }));
-        customAssetList.push(...watchTokensList, ...blockscoutAssets);
+        const blockscoutAssets = await getBlockscoutsAndWatchAssetList().then((res) => res.data || []);
+        customAssetList.push(...blockscoutAssets);
       } else {
+        const watchTokensList = (config?.current?.watchTokens?.[chainConfig?.id] || []).map((el) => ({
+          address: el.address,
+          decimals: el.decimals,
+          symbol: el.symbol
+        }));
         const coreTokenList = NON_BLOCKSCOUT_CORE_TOKENS[chainConfig?.id] || [];
         customAssetList.push(...watchTokensList, ...coreTokenList);
       }
-      const { address: customAssetAddress, decimals: customAssetADecimals } = customAssetList.find((el) => el.symbol === balanceSymbol) || {};
+      const {
+        address: customAssetAddress,
+        decimals: customAssetDecimals,
+        symbol: customAssetSymbol
+      } = customAssetList.find((el) => {
+        return (isAddress(balanceSymbol) ? el.address : el.symbol) === balanceSymbol;
+      }) || {};
       if (!customAssetAddress) {
         console.warn(`[BALANCE FEED] No token address found for symbol ${balanceSymbol} on chain ${chainConfig?.name}`);
-        return { decimals: 18, formatted: "0", symbol: balanceSymbol, value: BigInt(0) };
+        throw new Error(
+          `[BALANCE FEED] No token address found for symbol ${balanceSymbol} on chain ${chainConfig?.name}`
+        );
       }
       const balanceValue = await await publicClient.readContract({
         address: customAssetAddress,
@@ -5654,15 +5716,24 @@ function BalanceFeedProvider() {
         authorizationList: void 0
       });
       return {
-        decimals: customAssetADecimals || 18,
-        formatted: formatUnits(balanceValue, customAssetADecimals || 18),
-        symbol: balanceSymbol,
+        decimals: customAssetDecimals || 18,
+        formatted: formatUnits(balanceValue, customAssetDecimals || 18),
+        symbol: customAssetSymbol,
         value: balanceValue
       };
     }
   });
+  useEffect2(() => {
+    if (!isCustomAssetBalanceEnabled || !!isCustomBalanceLoading) return;
+    if (!!isCustomAssetBalanceEnabled && !isCustomBalanceLoading && !!isCustomBalanceError && !!chainConfig?.id) {
+      setTimeout(() => {
+        setBalanceSymbol(chainConfig.nativeCurrency.symbol);
+      }, 0);
+    }
+  }, [isCustomAssetBalanceEnabled, isCustomBalanceLoading, isCustomBalanceError, chainConfig]);
   useEffect2(() => {
     if (!isCustomAssetBalanceEnabled || !customBalance) return;
+    if (!!isCustomAssetBalanceEnabled && isCustomBalanceLoading) return;
     const rate = Number(cryptoRate?.price || "1");
     const formattedBalance = Number(formatUnits(BigInt(customBalance?.value || "0"), customBalance?.decimals || 18));
     const { setCryptoRate, setFiatBalance, setBalance, setCryptoSymbol, setFiatSymbol } = useLayoutDataStore.getState();
@@ -5671,7 +5742,14 @@ function BalanceFeedProvider() {
     setFiatSymbol("USD");
     setFiatBalance(formattedBalance * rate);
     setBalance(customBalance);
-  }, [isCustomAssetBalanceEnabled, customBalance, cryptoRate]);
+  }, [
+    isCustomAssetBalanceEnabled,
+    customBalance,
+    cryptoRate,
+    chainConfig,
+    isCustomBalanceError,
+    isCustomBalanceLoading
+  ]);
   return null;
 }
 var init_BalanceFeedProvider = __esm({
@@ -7046,6 +7124,7 @@ function useAutoConnect() {
           const stats = await getShareRecoveryStats2();
           const hasRecoveryData = stats && (stats.created || stats.devices && stats.devices.length > 0);
           setHasServerVault(!!hasRecoveryData);
+          useLayoutDataStore.getState().openPostAuthNavigation();
         } catch (e) {
           console.warn("[UI-KIT][AutoConnect] Vault status check failed:", e);
         }
@@ -7085,20 +7164,27 @@ function useOpenPage() {
   const page = useLayoutDataStore((st) => st.page);
   const setPage = useLayoutDataStore((st) => st.setPage);
   const setPageParams = useLayoutDataStore((st) => st.setPageParams);
+  const setPostAuthNavigation = useLayoutDataStore((st) => st.setPostAuthNavigation);
   const address = useSession((st) => st.address);
   const open = useCallback4(
     (passportPage, params) => {
-      if (!address) return setPage("auth" /* AUTH */);
+      if (!address) {
+        if (passportPage !== "auth" /* AUTH */) {
+          setPostAuthNavigation({ page: passportPage, params });
+        }
+        return setPage("auth" /* AUTH */);
+      }
       if (!!address && passportPage === "auth" /* AUTH */) return setPage("manage-wallet" /* MANAGE_WALLET */);
       setPage(passportPage);
       if (!!params) setPageParams(params);
     },
-    [setPage, setPageParams, address]
+    [setPage, setPageParams, setPostAuthNavigation, address]
   );
   const close = useCallback4(() => {
     setPageParams(null);
+    setPostAuthNavigation(null);
     setPage(null);
-  }, [setPage, setPageParams]);
+  }, [setPage, setPageParams, setPostAuthNavigation]);
   return { open, close, isOpen: page !== null };
 }
 function usePageParams() {
@@ -10571,7 +10657,8 @@ function useAuthMenuHandlers() {
           useLayoutDataStore.getState().setPage("keysare-backup" /* KEYSARE_BACKUP */);
         } else {
           useLayoutStore.getState().setIsDialogForced(false);
-          useLayoutDataStore.getState().setPage(null);
+          const didOpenPostAuthNavigation = useLayoutDataStore.getState().openPostAuthNavigation();
+          if (!didOpenPostAuthNavigation) useLayoutDataStore.getState().setPage(null);
         }
       }, 100);
     } catch (error) {
@@ -10978,7 +11065,7 @@ var init_VerifyStep2 = __esm({
 
 // src/internal/components/AuthMenu/AuthMenu.tsx
 import { Loader as Loader4 } from "lucide-react";
-import { useEffect as useEffect12, useMemo } from "react";
+import { useEffect as useEffect12, useMemo as useMemo2 } from "react";
 import { jsx as jsx23, jsxs as jsxs18 } from "react/jsx-runtime";
 var AuthMenu;
 var init_AuthMenu = __esm({
@@ -11034,7 +11121,7 @@ var init_AuthMenu = __esm({
           /* @__PURE__ */ jsx23("span", { className: "text-sm text-[var(--ui-kit-fg-muted)]", children: "Initializing wallet..." })
         ] });
       }
-      const stepContent = useMemo(
+      const stepContent = useMemo2(
         () => ({
           "loading": /* @__PURE__ */ jsx23(LoadingStep, {}),
           "failed": /* @__PURE__ */ jsx23(AuthFailedStep, {}),
@@ -11211,7 +11298,7 @@ var init_onboarder = __esm({
 
 // src/internal/components/Onboarding/OnboardingOverlay.tsx
 import { ChevronRightIcon, LoaderIcon, XIcon } from "lucide-react";
-import { useEffect as useEffect13, useMemo as useMemo2, useState as useState6 } from "react";
+import { useEffect as useEffect13, useMemo as useMemo3, useState as useState6 } from "react";
 import { createPortal as createPortal2 } from "react-dom";
 import { jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
 function getTooltipXPos(params) {
@@ -11263,7 +11350,7 @@ function OnboardingOverlay() {
     description,
     forced = false
   } = onboarder.getCurrentStep() || {};
-  const position = useMemo2(() => {
+  const position = useMemo3(() => {
     const posParams = {
       x: elRect.x,
       y: elRect.y,
@@ -11885,6 +11972,7 @@ var init_tokens = __esm({
       //
       "$P USDT": parlayToken_default,
       "P": parlayToken_default,
+      "$P": parlayToken_default,
       //
       "EMBARKAI": embarkAI_default
     };
@@ -12040,7 +12128,7 @@ var init_useBuyMenuStore = __esm({
 // src/internal/components/BuyMenu/components/CryptoSelector.tsx
 import { debounce as debounce2, toPairs } from "lodash-es";
 import { InfoIcon, PointerIcon, SearchIcon } from "lucide-react";
-import { useCallback as useCallback11, useMemo as useMemo3, useState as useState8 } from "react";
+import { useCallback as useCallback11, useMemo as useMemo4, useState as useState8 } from "react";
 import { jsx as jsx37, jsxs as jsxs32 } from "react/jsx-runtime";
 function CryptoItem(props) {
   const { symbol, network } = props;
@@ -12084,7 +12172,7 @@ function CryptoSelector(props) {
     debounce2((value) => setTarget(value), 1e3),
     []
   );
-  const filteredCoins = useMemo3(() => {
+  const filteredCoins = useMemo4(() => {
     const sorted = [...coins].sort((a, b) => {
       const aIdx = POPULAR_CRYPTOS.indexOf(a.symbol.toUpperCase());
       const bIdx = POPULAR_CRYPTOS.indexOf(b.symbol.toUpperCase());
@@ -12262,7 +12350,7 @@ var init_ResolvedFiatIcon = __esm({
 // src/internal/components/BuyMenu/components/FiatSelector.tsx
 import { debounce as debounce3 } from "lodash-es";
 import { PointerIcon as PointerIcon2, SearchIcon as SearchIcon2 } from "lucide-react";
-import { useCallback as useCallback12, useMemo as useMemo4, useState as useState9 } from "react";
+import { useCallback as useCallback12, useMemo as useMemo5, useState as useState9 } from "react";
 import { Fragment as Fragment9, jsx as jsx39, jsxs as jsxs33 } from "react/jsx-runtime";
 function getCurrencyName(ticker, locale = "en") {
   try {
@@ -12306,7 +12394,7 @@ function FiatSelector(props) {
     debounce3((value) => setTarget(value), 1e3),
     []
   );
-  const filteredFiats = useMemo4(() => {
+  const filteredFiats = useMemo5(() => {
     const sorted = [...fiats].sort((a, b) => {
       const aIdx = POPULAR_FIATS.indexOf(a.ticker.toUpperCase());
       const bIdx = POPULAR_FIATS.indexOf(b.ticker.toUpperCase());
@@ -12980,7 +13068,7 @@ var init_statuses = __esm({
 import { useInfiniteQuery } from "@tanstack/react-query";
 import dayjs from "dayjs";
 import { DownloadIcon, ExternalLinkIcon, LoaderIcon as LoaderIcon3 } from "lucide-react";
-import { useMemo as useMemo5 } from "react";
+import { useMemo as useMemo6 } from "react";
 import { jsx as jsx43, jsxs as jsxs36 } from "react/jsx-runtime";
 function getStatusVariant(status) {
   switch (status) {
@@ -13111,7 +13199,7 @@ function BinanceTxHistory() {
       txStatuses: SHOW_STATUSES
     })
   });
-  const txList = useMemo5(
+  const txList = useMemo6(
     () => historyData?.pages?.map((p) => p.data).flat(Infinity) || [],
     [historyData]
   );
@@ -14794,7 +14882,7 @@ import { PAYMASTER_CACHE_TTL_MS } from "@embarkai/core";
 import { getChainConfig as getChainConfig8, SUPPORTED_MAINNETS as SUPPORTED_MAINNETS2 } from "@embarkai/core/read";
 import { useQuery as useQuery5 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft4 } from "lucide-react";
-import { useMemo as useMemo6, useState as useState11 } from "react";
+import { useMemo as useMemo7, useState as useState11 } from "react";
 import { jsx as jsx57, jsxs as jsxs50 } from "react/jsx-runtime";
 function ChainsMenu() {
   const { t } = useT();
@@ -14804,7 +14892,7 @@ function ChainsMenu() {
   const [isTestnets, setIsTestnets] = useState11(false);
   const [nextChainId, setNextChainId] = useState11(null);
   useOnboardingTourAvailable(true);
-  const visibleNetworks = useMemo6(() => {
+  const visibleNetworks = useMemo7(() => {
     return NETWORK_OPTIONS.filter(
       (option) => option.isActive && (isTestnets ? true : SUPPORTED_MAINNETS2.includes(option.chainId))
     );
@@ -16361,7 +16449,7 @@ var init_ProviderCard = __esm({
 // src/internal/components/ManageWalletMenu/ManageWallet.tsx
 import { fromPairs } from "lodash-es";
 import { ArrowLeft as ArrowLeft6, Loader as Loader9, LoaderIcon as LoaderIcon8 } from "lucide-react";
-import { useMemo as useMemo7 } from "react";
+import { useMemo as useMemo8 } from "react";
 import { Fragment as Fragment17, jsx as jsx68, jsxs as jsxs60 } from "react/jsx-runtime";
 function getProviderName(provider) {
   return PROVIDERS_META[provider].name || provider;
@@ -16402,7 +16490,7 @@ function ManageWalletMenu() {
   } = useManageWalletStore();
   const configuredProviders = getConfiguredProviders(config.current);
   const { data: providers = [], isLoading: isProvidersLoading, error: providersError } = useProvidersList();
-  const renderProviders = useMemo7(() => {
+  const renderProviders = useMemo8(() => {
     const normalizeProviderName = (name) => {
       if (name === "x") return "twitter";
       return name;
@@ -16718,7 +16806,7 @@ var init_useConnectExternalWalletMenuParams = __esm({
 // src/internal/components/ConnectExternalWalletMenu/ConnectExternalWalletMenu.tsx
 import { useMutation as useMutation11, useQuery as useQuery8, useQueryClient as useQueryClient14 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft7, Loader as Loader11, Wallet2Icon as Wallet2Icon2 } from "lucide-react";
-import { useCallback as useCallback17, useMemo as useMemo8 } from "react";
+import { useCallback as useCallback17, useMemo as useMemo9 } from "react";
 import { useConnect, useConnection, useConnectors, useDisconnect as useDisconnect2, useSignMessage } from "wagmi";
 import { jsx as jsx70, jsxs as jsxs62 } from "react/jsx-runtime";
 function getConnectFlowType(params) {
@@ -16928,7 +17016,7 @@ function ConnectExternalWalletMenu() {
       }
     }
   });
-  const visibleConnectors = useMemo8(() => {
+  const visibleConnectors = useMemo9(() => {
     const seen = /* @__PURE__ */ new Set();
     const unique = connectors.filter((connector) => {
       const skipConnector = seen.has(connector.uid);
@@ -18466,7 +18554,8 @@ function useOnRestoreSuccess() {
         } catch (error) {
           console.warn("[UI-KIT][Restore] Error due onAccount callback:", error);
         }
-        setPage(null);
+        const didOpenPostAuthNavigation = useLayoutDataStore.getState().openPostAuthNavigation();
+        if (!didOpenPostAuthNavigation) setPage(null);
         setTimeout(() => {
           setIsDialogForced(false);
         }, 375);
@@ -18764,6 +18853,7 @@ function useCreateBackup() {
         setError(response.error || "Server backup failed");
       }
       useLayoutStore.getState().setIsDialogForced(false);
+      useLayoutDataStore.getState().openPostAuthNavigation();
     },
     onError: async (error) => {
       const { setError, setSuccess } = useRestoreStore.getState();
@@ -18892,6 +18982,7 @@ var init_useCreateBackup = __esm({
   "src/internal/components/KeyshareRestoreMenu/hooks/useCreateBackup.ts"() {
     init_SessionContext();
     init_auth();
+    init_useLayoutDataStore();
     init_useLayoutStore();
     init_iframe_manager();
     init_constants5();
@@ -19064,7 +19155,7 @@ var init_hooks = __esm({
 
 // src/internal/components/KeyshareRestoreMenu/components/MethodSelector.tsx
 import { Cloud, Cpu as Cpu3, FileDown, FileUp } from "lucide-react";
-import { Fragment as Fragment20, useMemo as useMemo9 } from "react";
+import { Fragment as Fragment20, useMemo as useMemo10 } from "react";
 import { jsx as jsx75, jsxs as jsxs67 } from "react/jsx-runtime";
 function MethodSelector(props) {
   const { mode = "restore", serverRecoveryStatus } = props;
@@ -19078,7 +19169,7 @@ function MethodSelector(props) {
     setError,
     setSuccess
   } = useRestoreStore();
-  const recoveryRenderMethods = useMemo9(() => {
+  const recoveryRenderMethods = useMemo10(() => {
     const methodsWithBackupData = getRecoveryRenderMethods(mode).map((mt) => {
       let data = null;
       switch (true) {
@@ -21422,7 +21513,7 @@ var init_NicknameMenu2 = __esm({
 
 // src/internal/hooks/useResolvedPublicClient.ts
 import { createPublicClientForChain as createPublicClientForChain5, getChainConfig as getChainConfig9 } from "@embarkai/core/read";
-import { useMemo as useMemo10 } from "react";
+import { useMemo as useMemo11 } from "react";
 function getCachedPublicClient(chainId) {
   const cachedClient = publicClientByChainId.get(chainId);
   if (cachedClient) return cachedClient;
@@ -21436,11 +21527,11 @@ function useResolvedPublicClient(chainId, logScope = "useResolvedPublicClient")
   const activeChainConfig = useSession((st) => st.chainConfig);
   const resolvedChainId = chainId ?? activeChainId;
   const shouldUseActiveClient = !chainId || chainId === activeChainId;
-  const chainConfig = useMemo10(() => {
+  const chainConfig = useMemo11(() => {
     if (shouldUseActiveClient) return activeChainConfig;
     return getChainConfig9(chainId);
   }, [activeChainConfig, chainId, shouldUseActiveClient]);
-  const publicClient = useMemo10(() => {
+  const publicClient = useMemo11(() => {
     if (shouldUseActiveClient) return activePublicClient;
     if (!chainId) return activePublicClient;
     try {
@@ -21521,12 +21612,12 @@ var init_useNativeBalance = __esm({
 
 // src/internal/hooks/useBlockscoutAssets/useWatchTokens.ts
 import { useQuery as useQuery16 } from "@tanstack/react-query";
-import { useMemo as useMemo11 } from "react";
+import { useMemo as useMemo12 } from "react";
 import { erc20Abi as erc20Abi2, formatUnits as formatUnits3 } from "viem";
 function useWatchTokens(options) {
   const { address, chainId, enabled, publicClient } = options;
   const { config } = useProviderConfig();
-  const watchTokens = useMemo11(() => {
+  const watchTokens = useMemo12(() => {
     const allWatchTokens = config.current.watchTokens;
     const tokensForChain = chainId ? allWatchTokens?.[chainId] || [] : [];
     return tokensForChain;
@@ -21735,7 +21826,7 @@ var init_utils8 = __esm({
 // src/internal/hooks/useBlockscoutAssets/useBlockscoutAssets.ts
 import { createBlockscoutClient as createBlockscoutClient2, nonBlockscoutClient } from "@embarkai/core";
 import { useQuery as useQuery17, useQueryClient as useQueryClient20 } from "@tanstack/react-query";
-import { useCallback as useCallback25, useMemo as useMemo12, useRef as useRef16 } from "react";
+import { useCallback as useCallback25, useMemo as useMemo13, useRef as useRef16 } from "react";
 function useBlockscoutAssets(options) {
   const { address, chainId, enabled = true, detectSecurityTokens = true } = options;
   const qc = useQueryClient20();
@@ -21746,7 +21837,7 @@ function useBlockscoutAssets(options) {
     tokenBalancesQueryKey: customTokenBalancesQueryKey
   } = useProviderConfig().config?.current?.portfolio || {};
   const blockscoutApiUrl = getBlockscoutApiUrl(chainConfig);
-  const blockscoutClient = useMemo12(
+  const blockscoutClient = useMemo13(
     () => blockscoutApiUrl ? createBlockscoutClient2({ baseUrl: blockscoutApiUrl }) : null,
     [blockscoutApiUrl]
   );
@@ -21822,7 +21913,7 @@ function useBlockscoutAssets(options) {
     queryKey: [BLOCKSCOUT_QUERY_KEY, "nfts", resolvedChainId, blockscoutApiUrl, address],
     queryFn: () => blockscoutClient.getNfts(address)
   });
-  const erc20TokenAddresses = useMemo12(() => {
+  const erc20TokenAddresses = useMemo13(() => {
     if (!blockscoutItems) return [];
     return blockscoutItems.filter((tb) => tb.token.type === "ERC-20").map((tb) => tb.token.address_hash);
   }, [blockscoutItems]);
@@ -21867,7 +21958,7 @@ function useBlockscoutAssets(options) {
     // 1 minute
     // gcTime: BLOCKSCOUT_QUERY_GC_TIME,
   });
-  const assets = useMemo12(() => {
+  const assets = useMemo13(() => {
     const result = [];
     const addedAddresses = /* @__PURE__ */ new Set();
     if (nativeBalanceData) {
@@ -21961,7 +22052,7 @@ function useBlockscoutAssets(options) {
     watchTokenAssets,
     chainConfig
   ]);
-  const nativeBalance = useMemo12(() => {
+  const nativeBalance = useMemo13(() => {
     if (!nativeBalanceData) return null;
     return {
       value: nativeBalanceData.value,
@@ -21969,7 +22060,7 @@ function useBlockscoutAssets(options) {
       symbol: nativeBalanceData.symbol
     };
   }, [nativeBalanceData]);
-  const error = useMemo12(() => {
+  const error = useMemo13(() => {
     if (!blockscoutError) return null;
     return createError(blockscoutError);
   }, [blockscoutError]);
@@ -22050,7 +22141,7 @@ function BalanceView(props) {
   const cryptoBalance = Number(formatUnits5(balance?.value || BigInt(0), balance?.decimals || 18));
   const fiatBalance = useLayoutDataStore((st) => st.fiatBalance);
   const fiatSymbol = useLayoutDataStore((st) => st.fiatSymbol);
-  const BalanceIcon = showFiatBalance && !!fiatBalance ? TOKENS_ICONS[cryptoSymbol] : null;
+  const BalanceIcon = showFiatBalance ? TOKENS_ICONS[cryptoSymbol] : null;
   return /* @__PURE__ */ jsxs84(
     "p",
     {
@@ -22482,7 +22573,7 @@ var init_onboarding_setup7 = __esm({
 import { useQuery as useQuery19 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft18, AtSignIcon as AtSignIcon2, CheckCircle2 as CheckCircle23, Copy as Copy2, FingerprintIcon, LoaderIcon as LoaderIcon12, Wallet2Icon as Wallet2Icon3 } from "lucide-react";
 import QRCode from "qrcode";
-import { useEffect as useEffect37, useMemo as useMemo13, useState as useState22 } from "react";
+import { useEffect as useEffect37, useMemo as useMemo14, useState as useState22 } from "react";
 import { Fragment as Fragment32, jsx as jsx95, jsxs as jsxs87 } from "react/jsx-runtime";
 function ReceiveMenu() {
   const { t } = useT();
@@ -22501,7 +22592,7 @@ function ReceiveMenu() {
   const [isNicknameCopied, setNicknameCopied] = useState22(false);
   const [fingerprintCopied, setFingerprintCopied] = useState22(false);
   useOnboardingTourAvailable(true);
-  const fingerprint = useMemo13(() => {
+  const fingerprint = useMemo14(() => {
     if (!session?.ownerAddress) return null;
     try {
       return generateFingerprint(session.ownerAddress);
@@ -23946,7 +24037,7 @@ var init_utils9 = __esm({
 // src/internal/components/SendMenu/hyperbridge/hooks/useHyperlaneHistory.ts
 import { useInfiniteQuery as useInfiniteQuery3 } from "@tanstack/react-query";
 import {
-  useMemo as useMemo14
+  useMemo as useMemo15
 } from "react";
 function useHyperlaneHistory() {
   const address = useSession((st) => st.address);
@@ -23962,7 +24053,7 @@ function useHyperlaneHistory() {
     getNextPageParam: (lastPage) => lastPage.page < lastPage.pageCount ? lastPage.page + 1 : void 0,
     queryFn: async ({ pageParam }) => await getHyperlaneBridgeHistory({ page: pageParam, pageSize: TX_HISTORY_PAGE_SIZE })
   });
-  const txList = useMemo14(
+  const txList = useMemo15(
     () => query?.data?.pages?.map((p) => p.data).flat(Infinity) || [],
     [query?.data]
   );
@@ -25437,13 +25528,13 @@ var init_HistoryStep = __esm({
 
 // src/internal/components/SendMenu/hyperbridge/steps/SelectAssetRoute.tsx
 import { ArrowLeftRightIcon as ArrowLeftRightIcon2 } from "lucide-react";
-import { useMemo as useMemo15 } from "react";
+import { useMemo as useMemo16 } from "react";
 import { jsx as jsx109, jsxs as jsxs99 } from "react/jsx-runtime";
 function SelectAssetRoute(props) {
   const { hyperlaneWarpRoutes } = props;
   const { t } = useT();
   const selectedAssetSymbol = useBridgeStore((st) => st.bridgeAssetSymbol);
-  const tokenList = useMemo15(() => {
+  const tokenList = useMemo16(() => {
     const tokens = hyperlaneWarpRoutes.map((route) => route.symbol);
     const uniqueTokens = Array.from(new Set(tokens));
     return uniqueTokens.map((symbol) => ({
@@ -25706,7 +25797,7 @@ var init_useErc3643Compliance = __esm({
 
 // src/hooks/useNicknameResolve.ts
 import { useQuery as useQuery24 } from "@tanstack/react-query";
-import { useEffect as useEffect43, useMemo as useMemo16, useState as useState24 } from "react";
+import { useEffect as useEffect43, useMemo as useMemo17, useState as useState24 } from "react";
 function looksLikeNickname(input) {
   if (!input) return false;
   if (input.startsWith("0x")) return false;
@@ -25746,7 +25837,7 @@ function useNicknameResolve(input, options) {
   const isNotFound = query.isError && query.error?.code === "NICKNAME_NOT_FOUND";
   const isWalletNotSetup = !!query.data && query.data.resolvedTarget === null;
   const isFrozen = query.data?.isFrozen ?? false;
-  const fingerprintVerification = useMemo16(() => {
+  const fingerprintVerification = useMemo17(() => {
     if (!query.data?.owner || !query.data?.fingerprint) {
       return null;
     }
@@ -25781,7 +25872,7 @@ var init_useNicknameResolve = __esm({
 
 // src/hooks/useSendTransaction.ts
 import { useCallback as useCallback29, useState as useState25 } from "react";
-import { encodeFunctionData as encodeFunctionData2, isAddress, parseEther as parseEther2, parseUnits } from "viem";
+import { encodeFunctionData as encodeFunctionData2, isAddress as isAddress2, parseEther as parseEther2, parseUnits } from "viem";
 function useSendTransaction() {
   const session = useSession((st) => st.session);
   const address = useSession((st) => st.address);
@@ -25794,7 +25885,7 @@ function useSendTransaction() {
         setError("No active session");
         return null;
       }
-      if (!isAddress(params.to)) {
+      if (!isAddress2(params.to)) {
         setError("Invalid recipient address");
         return null;
       }
@@ -26350,7 +26441,7 @@ var init_useTokenBalance = __esm({
 
 // src/internal/components/SendMenu/send/sendSteps/InputSendStep.tsx
 import { AlertCircle as AlertCircle4, AtSign as AtSign2, CheckCircle2 as CheckCircle25, Loader as Loader20, Wallet2 as Wallet24 } from "lucide-react";
-import { formatUnits as formatUnits12, isAddress as isAddress2 } from "viem";
+import { formatUnits as formatUnits12, isAddress as isAddress3 } from "viem";
 import { Fragment as Fragment40, jsx as jsx116, jsxs as jsxs105 } from "react/jsx-runtime";
 function InputSendStep(props) {
   const { erc3643Compliance, isNicknameInput, resolvedNicknameData, isAssetsLoading } = props;
@@ -26414,7 +26505,7 @@ function InputSendStep(props) {
       setError(isNicknameInput ? "Could not resolve nickname" : "Please enter a recipient address");
       return false;
     }
-    if (!isAddress2(addressToValidate)) {
+    if (!isAddress3(addressToValidate)) {
       setError("Invalid recipient address");
       return false;
     }
@@ -26762,7 +26853,7 @@ var init_sendSteps = __esm({
 
 // src/internal/components/SendMenu/send/SendMenu.tsx
 import { CheckCircle2 as CheckCircle26, Loader as Loader27 } from "lucide-react";
-import { useEffect as useEffect45, useMemo as useMemo17 } from "react";
+import { useEffect as useEffect45, useMemo as useMemo18 } from "react";
 import { parseUnits as parseUnits2 } from "viem";
 import { Fragment as Fragment42, jsx as jsx118, jsxs as jsxs107 } from "react/jsx-runtime";
 function SendMenu() {
@@ -26812,7 +26903,7 @@ function SendMenu() {
   const isNicknameInput = looksLikeNickname(recipient);
   const resolvedNicknameData = useNicknameResolve(recipient, { enabled: isNicknameInput, chainId: activeChainId });
   const effectiveAddress = isNicknameInput ? resolvedNicknameData?.resolvedAddress : recipient;
-  const complianceAmount = useMemo17(() => {
+  const complianceAmount = useMemo18(() => {
     if (!isSecurity || !amount || !selectedAsset) return void 0;
     try {
       return parseUnits2(amount, selectedAsset.decimals || 18);
@@ -26994,7 +27085,7 @@ var init_useSendMenuParams = __esm({
 
 // src/internal/components/SendMenu/SendFlowSelector.tsx
 import { ArrowLeft as ArrowLeft20, ArrowRightIcon as ArrowRightIcon2, ArrowRightLeftIcon as ArrowRightLeftIcon2 } from "lucide-react";
-import { useEffect as useEffect47, useMemo as useMemo18 } from "react";
+import { useEffect as useEffect47, useMemo as useMemo19 } from "react";
 import { jsx as jsx119, jsxs as jsxs108 } from "react/jsx-runtime";
 function SelectorFlowButtons() {
   const { t } = useT();
@@ -27066,7 +27157,7 @@ function SendFlowSelector() {
     if (!!config?.current?.features?.showAssetBridge) return;
     if (selectorFlow === "bridge") useFlowSelectorStore.getState().setFlow("send");
   }, [selectorFlow]);
-  const availableFlows = useMemo18(() => {
+  const availableFlows = useMemo19(() => {
     const selectorFlows = { send: /* @__PURE__ */ jsx119(SendMenu, {}) };
     if (!!config?.current?.features?.showAssetBridge) selectorFlows.bridge = /* @__PURE__ */ jsx119(HyperlaneBridge, {});
     return selectorFlows;
@@ -28605,7 +28696,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.87",
+      version: "0.4.89",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -29272,6 +29363,7 @@ function Dialog2() {
   const page = useLayoutDataStore((st) => st.page);
   const transitionPageHeight = useLayoutDataStore((st) => st.transitionPageHeight);
   const setPage = useLayoutDataStore((st) => st.setPage);
+  const setPostAuthNavigation = useLayoutDataStore((st) => st.setPostAuthNavigation);
   const { colorMode, isDialogOpen, dialogTitle, dialogDescription, dialogContent, isDialogForced, setIsSettings } = useLayoutStore();
   useEffect51(() => setIsSettings(!!session), [session, setIsSettings]);
   usePageMapper();
@@ -29287,7 +29379,10 @@ function Dialog2() {
       open: isDialogOpen,
       onOpenChange: (open) => {
         if (isDialogForced) return;
-        if (!open) setPage(null);
+        if (!open) {
+          setPostAuthNavigation(null);
+          setPage(null);
+        }
       },
       children: /* @__PURE__ */ jsxs116(
         DialogContent,
@@ -31946,7 +32041,7 @@ import {
   useCallback as useCallback34,
   useContext,
   useEffect as useEffect53,
-  useMemo as useMemo19,
+  useMemo as useMemo20,
   useRef as useRef20
 } from "react";
 import { WagmiProvider as NativeWagmiProvider } from "wagmi";
@@ -32059,7 +32154,7 @@ function Provider(props) {
       console.error("[PROVIDER] Error setting up iframe manager:", error);
     }
   }, [projectId]);
-  const contextValue = useMemo19(
+  const contextValue = useMemo20(
     () => ({
       config,
       updateConfig,
@@ -32113,7 +32208,7 @@ init_useUserProfile();
 init_pro_mode();
 init_utils();
 import { Cloud as Cloud4, Laptop as Laptop2, Loader as Loader31, Shield as Shield2 } from "lucide-react";
-import { useEffect as useEffect54, useMemo as useMemo20 } from "react";
+import { useEffect as useEffect54, useMemo as useMemo21 } from "react";
 import { Fragment as Fragment46, jsx as jsx132, jsxs as jsxs118 } from "react/jsx-runtime";
 function getFormattedStatus(label, status, showStatus) {
   const isStatus = showStatus && status && status !== "idle" && status !== "ready";
@@ -32136,7 +32231,7 @@ function ConnectWalletButton(props) {
   useEffect54(() => setUsePaymaster(usePaymaster), [setUsePaymaster, usePaymaster]);
   const { data: profile, isLoading: isProfileLoading } = useUserProfile();
   const displayName = profile?.nicknameDisplay || profile?.displayName || jwtTokenManager2.getDisplayName();
-  const indicators = useMemo20(() => {
+  const indicators = useMemo21(() => {
     const userId = session?.mpcUserId;
     if (!userId) return { server: false, local: false, backup: false };
     const server = jwtTokenManager2.getHasKeyshare() ?? false;
@@ -33130,7 +33225,7 @@ function useDirectWallet() {
 // src/hooks/useSendDirectTransaction.ts
 init_useExternalWalletStore();
 import { useCallback as useCallback39, useState as useState34 } from "react";
-import { isAddress as isAddress3, parseEther as parseEther3 } from "viem";
+import { isAddress as isAddress4, parseEther as parseEther3 } from "viem";
 import { useSendTransaction as useWagmiSendTransaction, useSwitchChain as useSwitchChain3 } from "wagmi";
 function useSendDirectTransaction() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
@@ -33146,7 +33241,7 @@ function useSendDirectTransaction() {
         setError("No external wallet connected");
         return null;
       }
-      if (!isAddress3(params.to)) {
+      if (!isAddress4(params.to)) {
         setError("Invalid recipient address");
         return null;
       }
@@ -33186,8 +33281,8 @@ function useSendDirectTransaction() {
 init_SessionContext();
 init_account2();
 init_linkedProfiles();
-import { useCallback as useCallback40, useMemo as useMemo21, useState as useState35 } from "react";
-import { encodeFunctionData as encodeFunctionData3, isAddress as isAddress4, parseEther as parseEther4, parseUnits as parseUnits3 } from "viem";
+import { useCallback as useCallback40, useMemo as useMemo22, useState as useState35 } from "react";
+import { encodeFunctionData as encodeFunctionData3, isAddress as isAddress5, parseEther as parseEther4, parseUnits as parseUnits3 } from "viem";
 var ERC20_TRANSFER_ABI2 = [
   {
     type: "function",
@@ -33205,7 +33300,7 @@ function useTransferToLinkedWallet() {
   const [isPending, setIsPending] = useState35(false);
   const [error, setError] = useState35(null);
   const [userOpHash, setUserOpHash] = useState35(null);
-  const linkedWallets = useMemo21(
+  const linkedWallets = useMemo22(
     () => (profiles || []).filter((p) => p.provider === "wallet" && p.externalId).map((p) => p.externalId),
     [profiles]
   );
@@ -33216,7 +33311,7 @@ function useTransferToLinkedWallet() {
         return null;
       }
       const toAddress = params.toAddress || linkedWallets[0];
-      if (!toAddress || !isAddress4(toAddress)) {
+      if (!toAddress || !isAddress5(toAddress)) {
         setError("No linked wallet address available");
         return null;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embarkai/ui-kit",
-  "version": "0.4.87",
+  "version": "0.4.89",
   "description": "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
   "type": "module",
   "main": "./dist/index.cjs",