@embarkai/ui-kit 0.4.93 → 0.4.95

package/dist/index.js

@@ -5010,10 +5010,11 @@ var init_cn = __esm({
 
 // src/internal/constants.ts
 import { Key, Mail, Wallet2 } from "lucide-react";
-var LOCAL_COLOR_MODE_KEY, LOOCAL_BACKUP_STATUS_KEY, DEFAULT_AUTH_MENU_HEIGHT, DEFAULT_MAIN_MENU_HEIGHT, MAX_CONTENT_HEIGHT, MAIN_DIALOG_ANIMATION_SPEED, Y_ANIMATION_SETUP, BLOCKSCOUT_QUERY_STALE_TIME, BLOCKSCOUT_QUERY_GC_TIME, BLOCKSCOUT_REFRESH_DEBOUNCE, IPFS_GATEWAY, PROVIDERS_META;
+var EMBARKAI_DIALOG_ONBOARDING_ID, LOCAL_COLOR_MODE_KEY, LOOCAL_BACKUP_STATUS_KEY, DEFAULT_AUTH_MENU_HEIGHT, DEFAULT_MAIN_MENU_HEIGHT, MAX_CONTENT_HEIGHT, MAIN_DIALOG_ANIMATION_SPEED, Y_ANIMATION_SETUP, BLOCKSCOUT_QUERY_STALE_TIME, BLOCKSCOUT_QUERY_GC_TIME, BLOCKSCOUT_REFRESH_DEBOUNCE, IPFS_GATEWAY, PROVIDERS_META;
 var init_constants = __esm({
   "src/internal/constants.ts"() {
     init_assets();
+    EMBARKAI_DIALOG_ONBOARDING_ID = "embark-main-dialog-content";
     LOCAL_COLOR_MODE_KEY = "passport-theme-mode";
     LOOCAL_BACKUP_STATUS_KEY = "passport-backup-status";
     DEFAULT_AUTH_MENU_HEIGHT = 253;
@@ -5049,25 +5050,16 @@ var init_useLayoutStore = __esm({
       colorMode: "light",
       isMobileView: false,
       maxScrollHeight: MAX_CONTENT_HEIGHT,
-      isDialogClosing: false,
       isDialogOpen: false,
+      isDialogAnimating: false,
       isDialogForced: false,
-      dialogTitle: null,
-      dialogDescription: null,
       dialogContent: null,
       isSettings: false,
       setColorMode: (colorMode) => set({ colorMode }),
-      // setLayoutView: (layoutView) => set(() => ({ layoutView })),
-      // setDeviceType: (deviceType) => set(() => ({ deviceType })),
       setIsMobileView: (isMobileView) => set({ isMobileView }),
       setMaxScrollHeight: (maxScrollHeight) => set({ maxScrollHeight }),
-      setIsDialogClosing: (isDialogClosing) => set({ isDialogClosing }),
-      setIsDialogOpen: (isDialogOpen) => set({ isDialogOpen }),
-      setIsDialogForced: (isDialogForced) => set({ isDialogForced }),
-      setDialogTitle: (dialogTitle) => set({ dialogTitle }),
-      setDialogDescription: (dialogDescription) => set({ dialogDescription }),
-      setDialogContent: (dialogContent) => set({ dialogContent }),
-      setIsSettings: (isSettings) => set({ isSettings })
+      /** dedicated setter for dialog forced state */
+      setIsDialogForced: (isDialogForced) => set({ isDialogForced })
     }));
   }
 });
@@ -11081,7 +11073,6 @@ var init_AuthMenu = __esm({
     init_auth();
     init_constants();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
     init_highlight();
@@ -11095,16 +11086,14 @@ var init_AuthMenu = __esm({
     AuthMenu = () => {
       const { t } = useT();
       const isIframeReady = useSession((st) => st.isIframeReady);
-      const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
-      const setTransitionPageHeight = useLayoutDataStore((st) => st.setTransitionPageHeight);
       const pendingWalletLogin = useLayoutDataStore((st) => st.pendingWalletLogin);
-      const setPendingWalletLogin = useLayoutDataStore((st) => st.setPendingWalletLogin);
-      const { step, alert: alert2, setStep, setPasskeyStatus, setEmail, setEmailChallenge, setAlert } = useAuthStore();
+      const step = useAuthStore((st) => st.step);
+      const alert2 = useAuthStore((st) => st.alert);
       const { pendingLoginResponseRef, onAuthSuccess, goBackToSignIn } = useAuthMenuHandlers();
       useEffect12(() => {
         if (!pendingWalletLogin) return;
         const loginResponse = pendingWalletLogin;
-        setPendingWalletLogin(null);
+        useLayoutDataStore.getState().setPendingWalletLogin(null);
         console.log("[AuthMenu] Processing wallet login response:", loginResponse);
         jwtTokenManager2.clearTokens().then(() => {
           pendingLoginResponseRef.current = loginResponse;
@@ -11112,8 +11101,9 @@ var init_AuthMenu = __esm({
         });
       }, [pendingWalletLogin]);
       useEffect12(() => {
-        setTransitionPageHeight(DEFAULT_AUTH_MENU_HEIGHT);
+        useLayoutDataStore.getState().setTransitionPageHeight(DEFAULT_AUTH_MENU_HEIGHT);
         return () => {
+          const { setStep, setPasskeyStatus, setEmail, setEmailChallenge, setAlert } = useAuthStore.getState();
           setStep("signin");
           setEmail("");
           setEmailChallenge(null);
@@ -11122,7 +11112,7 @@ var init_AuthMenu = __esm({
         };
       }, []);
       if (!isIframeReady) {
-        return /* @__PURE__ */ jsxs18("div", { className: "w-full p-8 flex flex-col justify-center items-center gap-[var(--ui-kit-gap)]", children: [
+        return /* @__PURE__ */ jsxs18(Expandable, { isExpanded: true, className: "w-full p-8 flex flex-col justify-center items-center gap-[var(--ui-kit-gap)]", children: [
           /* @__PURE__ */ jsx23(Loader4, { className: "w-4 h-4 animate-spin" }),
           /* @__PURE__ */ jsx23("span", { className: "text-sm text-[var(--ui-kit-fg-muted)]", children: "Initializing wallet..." })
         ] });
@@ -11144,26 +11134,25 @@ var init_AuthMenu = __esm({
         }),
         [onAuthSuccess, goBackToSignIn]
       );
-      return /* @__PURE__ */ jsx23(
-        "div",
-        {
-          style: {
-            "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-            "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-          },
-          className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-          children: /* @__PURE__ */ jsxs18(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-            stepContent[step],
-            alert2 && /* @__PURE__ */ jsxs18(Highlight, { type: "error", children: [
-              /* @__PURE__ */ jsxs18("span", { className: "block w-full flex flex-col gap-1 flex-1 mb-2", children: [
-                /* @__PURE__ */ jsx23("span", { className: "block font-bold leading-5", children: alert2.title }),
-                /* @__PURE__ */ jsx23("span", { className: "block whitespace-pre-line", children: alert2.message || "Unknown error" })
-              ] }),
-              /* @__PURE__ */ jsx23(Button, { variant: "default", size: "medium", className: "w-full", onClick: () => setAlert(null), children: t("passport:common.hide") })
-            ] })
-          ] })
-        }
-      );
+      return /* @__PURE__ */ jsxs18(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+        stepContent[step],
+        alert2 && /* @__PURE__ */ jsxs18(Highlight, { type: "error", children: [
+          /* @__PURE__ */ jsxs18("span", { className: "block w-full flex flex-col gap-1 flex-1 mb-2", children: [
+            /* @__PURE__ */ jsx23("span", { className: "block font-bold leading-5", children: alert2.title }),
+            /* @__PURE__ */ jsx23("span", { className: "block whitespace-pre-line", children: alert2.message || "Unknown error" })
+          ] }),
+          /* @__PURE__ */ jsx23(
+            Button,
+            {
+              variant: "default",
+              size: "medium",
+              className: "w-full",
+              onClick: () => useAuthStore.getState().setAlert(null),
+              children: t("passport:common.hide")
+            }
+          )
+        ] })
+      ] });
     };
   }
 });
@@ -12649,11 +12638,12 @@ var init_components = __esm({
 var BUY_MENU_BINANCE_TOUR;
 var init_onboarding_setup = __esm({
   "src/internal/components/BuyMenu/onboarding.setup.ts"() {
+    init_constants();
     init_useBinanceStore();
     init_useBuyMenuStore();
     BUY_MENU_BINANCE_TOUR = [
       {
-        elId: "buymenu-page" /* buymenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"buy" /* BUY */}`,
         title: "passport:buyMenu.onboarding.buyMenu.title",
         description: "passport:buyMenu.onboarding.buyMenu.description",
         waitSecs: 6,
@@ -14456,7 +14446,6 @@ import { Fragment as Fragment14, jsx as jsx50, jsxs as jsxs43 } from "react/jsx-
 function BuyMenu() {
   const { t } = useT();
   const walletAddress = useSession((st) => st.address);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   useBuyMenuParams();
   useHandleInputAmount();
   const rampProvider = useBuyMenuStore((st) => st.rampProvider);
@@ -14472,103 +14461,92 @@ function BuyMenu() {
   const showExtras = !isCryptoSelector && !isFiatSelector && !isProviderSummary && !isProviderSelector && !isPaymentModeSelector;
   const showProviderTrigger = showExtras && !isTransactionHistory;
   useOnboardingTourAvailable(showProviderTrigger);
-  return /* @__PURE__ */ jsx50(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("buymenu-page" /* buymenu */, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs43(Expandable, { isExpanded: true, contentClassName: "relative w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs43("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx50(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              className: "flex-none",
-              onClick: () => {
-                const {
-                  setIsProviderSummary,
-                  setIsTransactionHistory,
-                  setIsProviderSelector,
-                  setIsCryptoSelector,
-                  setIsFiatSelector,
-                  setIsPaymentModeSelector,
-                  setError
-                } = useBuyMenuStore.getState();
-                setError(null);
-                if (isProviderSummary) {
-                  setIsProviderSummary(false);
-                  return;
-                }
-                if (isTransactionHistory) {
-                  setIsTransactionHistory(false);
-                  return;
-                }
-                if (isProviderSelector) {
-                  setIsProviderSelector(false);
-                  return;
-                }
-                if (isCryptoSelector) {
-                  setIsCryptoSelector(false);
-                  return;
-                }
-                if (isFiatSelector) {
-                  setIsFiatSelector(false);
-                  return;
-                }
-                if (isPaymentModeSelector) {
-                  setIsPaymentModeSelector(false);
-                  return;
-                }
-                useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */);
-              },
-              children: /* @__PURE__ */ jsx50(ArrowLeft3, { className: "h-4 w-4" })
+  return /* @__PURE__ */ jsxs43(Expandable, { isExpanded: true, contentClassName: "relative w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs43("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx50(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          className: "flex-none",
+          onClick: () => {
+            const {
+              setIsProviderSummary,
+              setIsTransactionHistory,
+              setIsProviderSelector,
+              setIsCryptoSelector,
+              setIsFiatSelector,
+              setIsPaymentModeSelector,
+              setError
+            } = useBuyMenuStore.getState();
+            setError(null);
+            if (isProviderSummary) {
+              setIsProviderSummary(false);
+              return;
             }
-          ),
-          /* @__PURE__ */ jsx50("span", { className: "block flex-none text-xl font-semibold", children: t("passport:buyMenu.title") }),
-          showExtras && /* @__PURE__ */ jsx50("div", { className: "flex-1 h-8 flex items-center justify-end gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ jsx50(
-            Switch,
-            {
-              labels: { checked: "PURCHASE", unchecked: "HISTORY" },
-              checked: isTransactionHistory,
-              onChange: () => {
-                useBuyMenuStore.getState().setError(null);
-                useBuyMenuStore.getState().setIsTransactionHistory();
-              }
+            if (isTransactionHistory) {
+              setIsTransactionHistory(false);
+              return;
             }
-          ) })
-        ] }),
-        showProviderTrigger && /* @__PURE__ */ jsxs43(Fragment14, { children: [
-          /* @__PURE__ */ jsx50("span", { className: "block text-[10px] text-[var(--ui-kit-fg-muted)]", children: t("passport:buyMenu.selectProvider") }),
-          /* @__PURE__ */ jsxs43(
-            Button,
-            {
-              ref: (inst) => onboarder.registerElement("buymenu-provider-selector" /* providerSelector */, inst),
-              variant: !!selectedProvider?.id ? "default" : "secondary",
-              onClick: () => {
-                useBuyMenuStore.getState().setError(null);
-                useBuyMenuStore.getState().setIsProviderSelector(true);
-              },
-              className: cn2("w-full justify-center", {
-                [ACTIVE_PROVIDER_CNS[selectedProvider?.id]]: rampProvider === selectedProvider?.id,
-                [IDLE_PROVIDERS_CNS[selectedProvider?.id]]: rampProvider !== selectedProvider?.id
-              }),
-              children: [
-                /* @__PURE__ */ jsx50(selectedProvider.icon, {}),
-                !selectedProvider.icon && t("passport:buyMenu.selectProvider")
-              ]
+            if (isProviderSelector) {
+              setIsProviderSelector(false);
+              return;
             }
-          )
-        ] }),
-        isProviderSelector ? /* @__PURE__ */ jsx50(ProviderSelector, { providers: AVAILABLE_RAMP_PROVIDERS.map((el) => ({ ...el, Icon: el.icon })) }) : /* @__PURE__ */ jsx50(ProviderComponent, { walletAddress }),
-        error && /* @__PURE__ */ jsx50(Highlight, { type: "error", children: error })
-      ] })
-    }
-  );
+            if (isCryptoSelector) {
+              setIsCryptoSelector(false);
+              return;
+            }
+            if (isFiatSelector) {
+              setIsFiatSelector(false);
+              return;
+            }
+            if (isPaymentModeSelector) {
+              setIsPaymentModeSelector(false);
+              return;
+            }
+            useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */);
+          },
+          children: /* @__PURE__ */ jsx50(ArrowLeft3, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx50("span", { className: "block flex-none text-xl font-semibold", children: t("passport:buyMenu.title") }),
+      showExtras && /* @__PURE__ */ jsx50("div", { className: "flex-1 h-8 flex items-center justify-end gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ jsx50(
+        Switch,
+        {
+          labels: { checked: "PURCHASE", unchecked: "HISTORY" },
+          checked: isTransactionHistory,
+          onChange: () => {
+            useBuyMenuStore.getState().setError(null);
+            useBuyMenuStore.getState().setIsTransactionHistory();
+          }
+        }
+      ) })
+    ] }),
+    showProviderTrigger && /* @__PURE__ */ jsxs43(Fragment14, { children: [
+      /* @__PURE__ */ jsx50("span", { className: "block text-[10px] text-[var(--ui-kit-fg-muted)]", children: t("passport:buyMenu.selectProvider") }),
+      /* @__PURE__ */ jsxs43(
+        Button,
+        {
+          ref: (inst) => onboarder.registerElement("buymenu-provider-selector" /* providerSelector */, inst),
+          variant: !!selectedProvider?.id ? "default" : "secondary",
+          onClick: () => {
+            useBuyMenuStore.getState().setError(null);
+            useBuyMenuStore.getState().setIsProviderSelector(true);
+          },
+          className: cn2("w-full justify-center", {
+            [ACTIVE_PROVIDER_CNS[selectedProvider?.id]]: rampProvider === selectedProvider?.id,
+            [IDLE_PROVIDERS_CNS[selectedProvider?.id]]: rampProvider !== selectedProvider?.id
+          }),
+          children: [
+            /* @__PURE__ */ jsx50(selectedProvider.icon, {}),
+            !selectedProvider.icon && t("passport:buyMenu.selectProvider")
+          ]
+        }
+      )
+    ] }),
+    isProviderSelector ? /* @__PURE__ */ jsx50(ProviderSelector, { providers: AVAILABLE_RAMP_PROVIDERS.map((el) => ({ ...el, Icon: el.icon })) }) : /* @__PURE__ */ jsx50(ProviderComponent, { walletAddress }),
+    error && /* @__PURE__ */ jsx50(Highlight, { type: "error", children: error })
+  ] });
 }
 var init_BuyMenu = __esm({
   "src/internal/components/BuyMenu/BuyMenu.tsx"() {
@@ -14576,7 +14554,6 @@ var init_BuyMenu = __esm({
     init_SessionContext();
     init_i18n();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -14937,20 +14914,6 @@ var init_ChainItem = __esm({
   }
 });
 
-// src/internal/components/ChainsMenu/onboarding.setup.ts
-var CHAIN_MENU_TOUR;
-var init_onboarding_setup2 = __esm({
-  "src/internal/components/ChainsMenu/onboarding.setup.ts"() {
-    CHAIN_MENU_TOUR = [
-      {
-        elId: "embarkai-chain-menu-onboarding" /* chainMenu */,
-        title: "passport:chainMenu.onboarding.chainMenu.title",
-        description: "passport:chainMenu.onboarding.chainMenu.description"
-      }
-    ];
-  }
-});
-
 // src/internal/components/ChainsMenu/ChainsMenu.tsx
 import { PAYMASTER_CACHE_TTL_MS } from "@embarkai/core";
 import { getChainConfig as getChainConfig8, SUPPORTED_MAINNETS as SUPPORTED_MAINNETS2 } from "@embarkai/core/read";
@@ -14962,7 +14925,6 @@ function ChainsMenu() {
   const { t } = useT();
   const config = useProviderConfig().config;
   const activeChainId = useSession((st) => st.activeChainId);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const [isTestnets, setIsTestnets] = useState11(false);
   const [nextChainId, setNextChainId] = useState11(null);
   useOnboardingTourAvailable(true);
@@ -14993,56 +14955,45 @@ function ChainsMenu() {
       chainId: activeChainId
     } : void 0
   });
-  return /* @__PURE__ */ jsx58(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("embarkai-chain-menu-onboarding" /* chainMenu */, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs51(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs51("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsxs51("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ jsx58(
-              Button,
-              {
-                size: "icon",
-                variant: "ghost",
-                title: t("passport:common.back"),
-                onClick: () => {
-                  const chainMenuOpenedFrom = useLayoutDataStore.getState().chainMenuOpenedFrom;
-                  useLayoutDataStore.getState().setPage(chainMenuOpenedFrom || "settings" /* SETTINGS */);
-                },
-                children: /* @__PURE__ */ jsx58(ArrowLeft4, { className: "h-4 w-4" })
-              }
-            ),
-            /* @__PURE__ */ jsx58("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.title") })
-          ] }),
-          /* @__PURE__ */ jsx58(
-            Switch,
-            {
-              labels: { checked: "MAINNETS", unchecked: "ALL" },
-              checked: isTestnets,
-              onChange: () => setIsTestnets(!isTestnets)
-            }
-          )
-        ] }),
-        /* @__PURE__ */ jsx58("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: visibleNetworks.map((network, networkIdx) => /* @__PURE__ */ jsx58(
-          ChainItem,
+  return /* @__PURE__ */ jsxs51(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs51("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsxs51("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ jsx58(
+          Button,
           {
-            ...network,
-            nextChainId,
-            setNextChainId,
-            isActivePaymasterDataLoading,
-            activePaymasterData
-          },
-          `chain-${network.chainId}-${networkIdx}`
-        )) })
-      ] })
-    }
-  );
+            size: "icon",
+            variant: "ghost",
+            title: t("passport:common.back"),
+            onClick: () => {
+              const chainMenuOpenedFrom = useLayoutDataStore.getState().chainMenuOpenedFrom;
+              useLayoutDataStore.getState().setPage(chainMenuOpenedFrom || "settings" /* SETTINGS */);
+            },
+            children: /* @__PURE__ */ jsx58(ArrowLeft4, { className: "h-4 w-4" })
+          }
+        ),
+        /* @__PURE__ */ jsx58("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.title") })
+      ] }),
+      /* @__PURE__ */ jsx58(
+        Switch,
+        {
+          labels: { checked: "MAINNETS", unchecked: "ALL" },
+          checked: isTestnets,
+          onChange: () => setIsTestnets(!isTestnets)
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx58("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: visibleNetworks.map((network, networkIdx) => /* @__PURE__ */ jsx58(
+      ChainItem,
+      {
+        ...network,
+        nextChainId,
+        setNextChainId,
+        isActivePaymasterDataLoading,
+        activePaymasterData
+      },
+      `chain-${network.chainId}-${networkIdx}`
+    )) })
+  ] });
 }
 var init_ChainsMenu = __esm({
   "src/internal/components/ChainsMenu/ChainsMenu.tsx"() {
@@ -15052,7 +15003,6 @@ var init_ChainsMenu = __esm({
     init_useT();
     init_resolve_paymaster();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -15070,71 +15020,60 @@ function ChainSwitchRequest() {
   const config = useProviderConfig().config;
   const isLoading = useSession((st) => st.isLoading);
   const chainConfig = useSession((st) => st.chainConfig);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const prefferedChain = NETWORK_OPTIONS.find((ch) => ch.chainId === config.current?.network?.chainId) || null;
   const PrefferedChainIcon = prefferedChain?.Icon || (() => null);
-  return /* @__PURE__ */ jsx59(
-    "div",
-    {
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs52(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs52("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx59(
-            Button,
-            {
-              size: "icon",
-              variant: "ghost",
-              title: t("passport:common.back"),
-              onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
-              children: /* @__PURE__ */ jsx59(ArrowLeft5, { className: "h-4 w-4" })
-            }
-          ),
-          /* @__PURE__ */ jsx59("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.chainSwitchRequest.title") })
-        ] }),
-        /* @__PURE__ */ jsxs52(Highlight, { type: "info", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx59(Info2, { className: "w-4 h-4 flex-none" }),
-          /* @__PURE__ */ jsx59("span", { className: "block", children: /* @__PURE__ */ jsx59(
-            Trans,
-            {
-              i18nKey: "passport:chainMenu.chainSwitchRequest.description",
-              values: {
-                preferredChain: `${prefferedChain?.name || "N/A"}`,
-                currentChain: `${chainConfig?.name || "N/A"}`
-              },
-              components: {
-                br: /* @__PURE__ */ jsx59("br", {}),
-                b: /* @__PURE__ */ jsx59("span", { className: "font-bold" })
-              }
-            }
-          ) })
-        ] }),
-        /* @__PURE__ */ jsxs52(
-          Button,
-          {
-            size: "large",
-            variant: "default",
-            className: "w-full",
-            disabled: isLoading,
-            onClick: () => {
-              if (!config.current?.network?.chainId) return;
-              useSession.getState().setActiveChainId(config.current.network.chainId);
-              useLayoutDataStore.getState().setPage("chain" /* CHAIN */);
-            },
-            children: [
-              isLoading ? /* @__PURE__ */ jsx59(Loader7, { className: "w-6 h-6 animate-spin" }) : /* @__PURE__ */ jsx59(PrefferedChainIcon, { className: "w-6 h-6" }),
-              t("passport:chainMenu.chainSwitchRequest.confirmButton", {
-                chain: `${prefferedChain?.name || "N/A"}`
-              })
-            ]
+  return /* @__PURE__ */ jsxs52(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs52("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx59(
+        Button,
+        {
+          size: "icon",
+          variant: "ghost",
+          title: t("passport:common.back"),
+          onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
+          children: /* @__PURE__ */ jsx59(ArrowLeft5, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx59("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.chainSwitchRequest.title") })
+    ] }),
+    /* @__PURE__ */ jsxs52(Highlight, { type: "info", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx59(Info2, { className: "w-4 h-4 flex-none" }),
+      /* @__PURE__ */ jsx59("span", { className: "block", children: /* @__PURE__ */ jsx59(
+        Trans,
+        {
+          i18nKey: "passport:chainMenu.chainSwitchRequest.description",
+          values: {
+            preferredChain: `${prefferedChain?.name || "N/A"}`,
+            currentChain: `${chainConfig?.name || "N/A"}`
+          },
+          components: {
+            br: /* @__PURE__ */ jsx59("br", {}),
+            b: /* @__PURE__ */ jsx59("span", { className: "font-bold" })
           }
-        )
-      ] })
-    }
-  );
+        }
+      ) })
+    ] }),
+    /* @__PURE__ */ jsxs52(
+      Button,
+      {
+        size: "large",
+        variant: "default",
+        className: "w-full",
+        disabled: isLoading,
+        onClick: () => {
+          if (!config.current?.network?.chainId) return;
+          useSession.getState().setActiveChainId(config.current.network.chainId);
+          useLayoutDataStore.getState().setPage("chain" /* CHAIN */);
+        },
+        children: [
+          isLoading ? /* @__PURE__ */ jsx59(Loader7, { className: "w-6 h-6 animate-spin" }) : /* @__PURE__ */ jsx59(PrefferedChainIcon, { className: "w-6 h-6" }),
+          t("passport:chainMenu.chainSwitchRequest.confirmButton", {
+            chain: `${prefferedChain?.name || "N/A"}`
+          })
+        ]
+      }
+    )
+  ] });
 }
 var init_ChainSwitchRequest = __esm({
   "src/internal/components/ChainsMenu/ChainSwitchRequest.tsx"() {
@@ -15143,13 +15082,27 @@ var init_ChainSwitchRequest = __esm({
     init_SessionContext();
     init_useT();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
     init_highlight();
   }
 });
 
+// src/internal/components/ChainsMenu/onboarding.setup.ts
+var CHAIN_MENU_TOUR;
+var init_onboarding_setup2 = __esm({
+  "src/internal/components/ChainsMenu/onboarding.setup.ts"() {
+    init_constants();
+    CHAIN_MENU_TOUR = [
+      {
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"chain" /* CHAIN */}`,
+        title: "passport:chainMenu.onboarding.chainMenu.title",
+        description: "passport:chainMenu.onboarding.chainMenu.description"
+      }
+    ];
+  }
+});
+
 // src/internal/components/ChainsMenu/index.ts
 var init_ChainsMenu2 = __esm({
   "src/internal/components/ChainsMenu/index.ts"() {
@@ -16359,20 +16312,6 @@ var init_useLinkTelegram = __esm({
   }
 });
 
-// src/internal/components/ManageWalletMenu/onboarding.setup.ts
-var MANAGE_WALLET_MENU_TOUR;
-var init_onboarding_setup3 = __esm({
-  "src/internal/components/ManageWalletMenu/onboarding.setup.ts"() {
-    MANAGE_WALLET_MENU_TOUR = [
-      {
-        elId: "embarkai-profiles-menu-onboarding" /* profilesMenu */,
-        title: "passport:profilesMenu.onboarding.profilesMenu.title",
-        description: "passport:profilesMenu.onboarding.profilesMenu.description"
-      }
-    ];
-  }
-});
-
 // src/internal/components/ManageWalletMenu/ProviderCard.tsx
 import { Clock, Link2Icon, LoaderIcon as LoaderIcon7, Trash2Icon, UnplugIcon } from "lucide-react";
 import { Fragment as Fragment16, jsx as jsx68, jsxs as jsxs60 } from "react/jsx-runtime";
@@ -16550,7 +16489,6 @@ function ManageWalletMenu() {
   const config = useProviderConfig().config;
   const { t } = useT();
   const { open: openEmbarkAI } = useOpenPage();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const {
     alert: alert2,
     providerType,
@@ -16645,66 +16583,54 @@ function ManageWalletMenu() {
   const showExtraProvidersUi = !isProvidersLoading && !providersError && (providerType === "email" || providerType === "passkey");
   useOnboardingTourAvailable(!showExtraProvidersUi && providerType === null);
   const combinedAlertMessage = alert2?.message || providersError?.message || null;
-  return /* @__PURE__ */ jsx69(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("embarkai-profiles-menu-onboarding" /* profilesMenu */, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs61(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs61("div", { className: "flex items-center gap-[var(--ui-kit-gap)] w-full justify-between", children: [
-          /* @__PURE__ */ jsxs61("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ jsx69(
-              Button,
-              {
-                variant: "ghost",
-                size: "icon",
-                title: t("passport:common.back"),
-                disabled: linkIsLoading,
-                onClick: () => {
-                  setAlert(null);
-                  if (providerType === "email") {
-                    setEmail("");
-                    setEmailCode("");
-                    setEmailStep("input");
-                    setEmailCodeExpiresAt(0);
-                  }
-                  if (!providerType) useLayoutDataStore.getState().setPage("settings" /* SETTINGS */);
-                  setProviderType(null);
-                },
-                children: /* @__PURE__ */ jsx69(ArrowLeft6, { className: "h-4 w-4" })
+  return /* @__PURE__ */ jsxs61(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs61("div", { className: "flex items-center gap-[var(--ui-kit-gap)] w-full justify-between", children: [
+      /* @__PURE__ */ jsxs61("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ jsx69(
+          Button,
+          {
+            variant: "ghost",
+            size: "icon",
+            title: t("passport:common.back"),
+            disabled: linkIsLoading,
+            onClick: () => {
+              setAlert(null);
+              if (providerType === "email") {
+                setEmail("");
+                setEmailCode("");
+                setEmailStep("input");
+                setEmailCodeExpiresAt(0);
               }
-            ),
-            /* @__PURE__ */ jsx69("span", { className: "text-xl font-semibold", children: t("passport:profilesMenu.title") })
-          ] }),
-          linkIsLoading && /* @__PURE__ */ jsx69(LoaderIcon8, { className: "w-4 h-4 animate-spin text-[var(--ui-kit-fg-muted)]" })
-        ] }),
-        isProvidersLoading && /* @__PURE__ */ jsx69("div", { className: "flex items-center justify-center p-4 text-[var(--ui-kit-fg-muted)]", children: /* @__PURE__ */ jsx69(Loader9, { className: "w-4 h-4 animate-spin" }) }),
-        /* @__PURE__ */ jsx69(EmailNotConnectedWarning, {}),
-        showCurrentProviders && renderProviders.map((node) => node),
-        showExtraProvidersUi && /* @__PURE__ */ jsx69(AddProvider, {}),
-        combinedAlertMessage && /* @__PURE__ */ jsxs61(Highlight, { type: "error", children: [
-          /* @__PURE__ */ jsxs61("div", { className: "break-words whitespace-pre-wrap mb-4", children: [
-            alert2?.title && /* @__PURE__ */ jsxs61(Fragment17, { children: [
-              /* @__PURE__ */ jsx69("strong", { children: alert2.title }),
-              /* @__PURE__ */ jsx69("br", {})
-            ] }),
-            combinedAlertMessage
-          ] }),
-          /* @__PURE__ */ jsx69(Button, { variant: "default", size: "medium", className: "w-full", onClick: () => setAlert(null), children: t("passport:common.hide") })
-        ] })
-      ] })
-    }
-  );
+              if (!providerType) useLayoutDataStore.getState().setPage("settings" /* SETTINGS */);
+              setProviderType(null);
+            },
+            children: /* @__PURE__ */ jsx69(ArrowLeft6, { className: "h-4 w-4" })
+          }
+        ),
+        /* @__PURE__ */ jsx69("span", { className: "text-xl font-semibold", children: t("passport:profilesMenu.title") })
+      ] }),
+      linkIsLoading && /* @__PURE__ */ jsx69(LoaderIcon8, { className: "w-4 h-4 animate-spin text-[var(--ui-kit-fg-muted)]" })
+    ] }),
+    isProvidersLoading && /* @__PURE__ */ jsx69("div", { className: "flex items-center justify-center p-4 text-[var(--ui-kit-fg-muted)]", children: /* @__PURE__ */ jsx69(Loader9, { className: "w-4 h-4 animate-spin" }) }),
+    /* @__PURE__ */ jsx69(EmailNotConnectedWarning, {}),
+    showCurrentProviders && renderProviders.map((node) => node),
+    showExtraProvidersUi && /* @__PURE__ */ jsx69(AddProvider, {}),
+    combinedAlertMessage && /* @__PURE__ */ jsxs61(Highlight, { type: "error", children: [
+      /* @__PURE__ */ jsxs61("div", { className: "break-words whitespace-pre-wrap mb-4", children: [
+        alert2?.title && /* @__PURE__ */ jsxs61(Fragment17, { children: [
+          /* @__PURE__ */ jsx69("strong", { children: alert2.title }),
+          /* @__PURE__ */ jsx69("br", {})
+        ] }),
+        combinedAlertMessage
+      ] }),
+      /* @__PURE__ */ jsx69(Button, { variant: "default", size: "medium", className: "w-full", onClick: () => setAlert(null), children: t("passport:common.hide") })
+    ] })
+  ] });
 }
 var POSSIBLE_PROVIDERS, MULTI_PROVIDERS;
 var init_ManageWallet = __esm({
   "src/internal/components/ManageWalletMenu/ManageWallet.tsx"() {
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_ProviderContext();
     init_useOpenPage();
     init_i18n();
@@ -16847,6 +16773,21 @@ var init_UnlinkProviderMenu = __esm({
   }
 });
 
+// src/internal/components/ManageWalletMenu/onboarding.setup.ts
+var MANAGE_WALLET_MENU_TOUR;
+var init_onboarding_setup3 = __esm({
+  "src/internal/components/ManageWalletMenu/onboarding.setup.ts"() {
+    init_constants();
+    MANAGE_WALLET_MENU_TOUR = [
+      {
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"manage-wallet" /* MANAGE_WALLET */}`,
+        title: "passport:profilesMenu.onboarding.profilesMenu.title",
+        description: "passport:profilesMenu.onboarding.profilesMenu.description"
+      }
+    ];
+  }
+});
+
 // src/internal/components/ManageWalletMenu/index.ts
 var init_ManageWalletMenu = __esm({
   "src/internal/components/ManageWalletMenu/index.ts"() {
@@ -16901,7 +16842,6 @@ function ConnectExternalWalletMenu() {
   const { isConnected: isExternalWalletConnected } = useConnection();
   const { mutate: disconnect } = useDisconnect2();
   const { mutateAsync: signMessageAsync } = useSignMessage();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const walletMenuOpenedFrom = useLayoutDataStore((st) => st.walletMenuOpenedFrom);
   const { data: providers = [] } = useQuery8({
     retry: false,
@@ -17117,69 +17057,59 @@ function ConnectExternalWalletMenu() {
         return t("passport:connectMenu.instructions.confirm");
     }
   }, [embarkAiAddress, t]);
-  return /* @__PURE__ */ jsx71(
-    "div",
-    {
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs63(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs63("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx71(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: t("passport:common.back"),
-              disabled: isConnectingExternalWallet || isLoginOrLinkOrConnectWallet,
-              onClick: () => useLayoutDataStore.getState().setPage(walletMenuOpenedFrom ?? "main-menu" /* MAIN_MENU */),
-              children: /* @__PURE__ */ jsx71(ArrowLeft7, { className: "h-4 w-4" })
+  return /* @__PURE__ */ jsxs63(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs63("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx71(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: t("passport:common.back"),
+          disabled: isConnectingExternalWallet || isLoginOrLinkOrConnectWallet,
+          onClick: () => useLayoutDataStore.getState().setPage(walletMenuOpenedFrom ?? "main-menu" /* MAIN_MENU */),
+          children: /* @__PURE__ */ jsx71(ArrowLeft7, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx71("span", { className: "text-xl font-semibold", children: t("passport:connectMenu.connectWallet") })
+    ] }),
+    visibleConnectors.map((connector) => {
+      const isConnectingThis = isConnectingExternalWallet && //@ts-expect-error uid exists
+      pendingConnectVariables?.connector?.uid === connector.uid;
+      const WalletIcon = WALLET_ICONS[connector.id] || Wallet2Icon2;
+      return /* @__PURE__ */ jsxs63(
+        Button,
+        {
+          variant: "secondary",
+          size: "large",
+          className: "w-full justify-center",
+          disabled: isConnectingExternalWallet,
+          onClick: async () => {
+            if (isExternalWalletConnected) {
+              disconnect();
+              await new Promise((resolve) => setTimeout(resolve, 500));
             }
-          ),
-          /* @__PURE__ */ jsx71("span", { className: "text-xl font-semibold", children: t("passport:connectMenu.connectWallet") })
-        ] }),
-        visibleConnectors.map((connector) => {
-          const isConnectingThis = isConnectingExternalWallet && //@ts-expect-error uid exists
-          pendingConnectVariables?.connector?.uid === connector.uid;
-          const WalletIcon = WALLET_ICONS[connector.id] || Wallet2Icon2;
-          return /* @__PURE__ */ jsxs63(
-            Button,
-            {
-              variant: "secondary",
-              size: "large",
-              className: "w-full justify-center",
-              disabled: isConnectingExternalWallet,
-              onClick: async () => {
-                if (isExternalWalletConnected) {
-                  disconnect();
-                  await new Promise((resolve) => setTimeout(resolve, 500));
-                }
-                useLayoutStore.getState().setIsDialogForced(true);
-                connect({ connector });
-              },
-              children: [
-                isConnectingThis ? /* @__PURE__ */ jsx71("div", { className: "w-6 h-6 flex-none flex items-center justify-center", children: /* @__PURE__ */ jsx71(Loader11, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ jsx71(WalletIcon, { className: "w-6 h-6 flex-none" }),
-                /* @__PURE__ */ jsx71("span", { children: connector.name })
-              ]
-            },
-            connector.uid
-          );
-        }),
-        isConnectingExternalWallet && !!pendingConnectVariables?.connector && /* @__PURE__ */ jsx71(Highlight, {
-          type: "warning",
-          // @ts-expect-error i18n typing
-          children: t("passport:connectMenu.instructions.follow", {
-            wallet: pendingConnectVariables.connector.name,
-            steps: getInstructionSteps()
-          })
-        }),
-        visibleConnectors.length === 0 && /* @__PURE__ */ jsx71(Highlight, { type: "info", children: t("passport:connectMenu.noWallets") }),
-        error && /* @__PURE__ */ jsx71(Highlight, { type: "error", children: error.message })
-      ] })
-    }
-  );
+            useLayoutStore.getState().setIsDialogForced(true);
+            connect({ connector });
+          },
+          children: [
+            isConnectingThis ? /* @__PURE__ */ jsx71("div", { className: "w-6 h-6 flex-none flex items-center justify-center", children: /* @__PURE__ */ jsx71(Loader11, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ jsx71(WalletIcon, { className: "w-6 h-6 flex-none" }),
+            /* @__PURE__ */ jsx71("span", { children: connector.name })
+          ]
+        },
+        connector.uid
+      );
+    }),
+    isConnectingExternalWallet && !!pendingConnectVariables?.connector && /* @__PURE__ */ jsx71(Highlight, {
+      type: "warning",
+      // @ts-expect-error i18n typing
+      children: t("passport:connectMenu.instructions.follow", {
+        wallet: pendingConnectVariables.connector.name,
+        steps: getInstructionSteps()
+      })
+    }),
+    visibleConnectors.length === 0 && /* @__PURE__ */ jsx71(Highlight, { type: "info", children: t("passport:connectMenu.noWallets") }),
+    error && /* @__PURE__ */ jsx71(Highlight, { type: "error", children: error.message })
+  ] });
 }
 var init_ConnectExternalWalletMenu = __esm({
   "src/internal/components/ConnectExternalWalletMenu/ConnectExternalWalletMenu.tsx"() {
@@ -17335,8 +17265,8 @@ var init_devices = __esm({
 });
 
 // src/internal/components/DevicesMenu/DeviceLinkScreen.tsx
-import { useState as useState14 } from "react";
 import { ArrowLeft as ArrowLeft8, Loader2 as Loader22 } from "lucide-react";
+import { useState as useState14 } from "react";
 import { jsx as jsx72, jsxs as jsxs64 } from "react/jsx-runtime";
 function getErrorMessage(err) {
   const code = err?.code;
@@ -17355,7 +17285,6 @@ function getErrorMessage(err) {
 }
 function DeviceLinkScreen() {
   const setPage = useLayoutDataStore((s) => s.setPage);
-  const maxScrollHeight = useLayoutStore((s) => s.maxScrollHeight);
   const { mutate: link, isPending } = useLinkDevice();
   const [code, setCode] = useState14("");
   const [error, setError] = useState14(null);
@@ -17377,54 +17306,36 @@ function DeviceLinkScreen() {
       }
     });
   }
-  return /* @__PURE__ */ jsx72(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ jsxs64(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ jsxs64("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx72(Button, { variant: "ghost", size: "icon", onClick: () => setPage("devices" /* DEVICES */), children: /* @__PURE__ */ jsx72(ArrowLeft8, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ jsx72("span", { className: "text-xl font-semibold", children: "Link Device" })
-        ] }),
-        /* @__PURE__ */ jsx72("p", { className: "text-sm text-[var(--ui-kit-fg-muted)]", children: "On your device: Long press to link smart wallet. Then enter the 6-character code shown on screen." }),
-        /* @__PURE__ */ jsx72(
-          "input",
-          {
-            type: "text",
-            value: code,
-            onChange: (e) => handleCodeChange(e.target.value),
-            onKeyDown: (e) => e.key === "Enter" && handleLink(),
-            placeholder: "XXXXXX",
-            autoFocus: true,
-            maxLength: 6,
-            className: "w-full text-center text-2xl tracking-[0.3em] font-mono px-4 py-3 rounded-lg\n            bg-[var(--ui-kit-bg)] text-[var(--ui-kit-fg)]\n            border border-[var(--ui-kit-bd)] focus:outline-none focus:border-[var(--ui-kit-primary)]\n            uppercase"
-          }
-        ),
-        error && /* @__PURE__ */ jsx72("p", { className: "text-sm text-[var(--ui-kit-bg-error)]", children: error }),
-        /* @__PURE__ */ jsx72(
-          Button,
-          {
-            variant: "default",
-            size: "large",
-            className: "w-full",
-            disabled: !isValid || isPending,
-            onClick: handleLink,
-            children: isPending ? /* @__PURE__ */ jsx72(Loader22, { className: "w-4 h-4 animate-spin" }) : "Link"
-          }
-        )
-      ] })
-    }
-  );
+  return /* @__PURE__ */ jsxs64(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs64("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx72(Button, { variant: "ghost", size: "icon", onClick: () => setPage("devices" /* DEVICES */), children: /* @__PURE__ */ jsx72(ArrowLeft8, { className: "h-4 w-4 flex-none" }) }),
+      /* @__PURE__ */ jsx72("span", { className: "text-xl font-semibold", children: "Link Device" })
+    ] }),
+    /* @__PURE__ */ jsx72("p", { className: "text-sm text-[var(--ui-kit-fg-muted)]", children: "On your device: Long press to link smart wallet. Then enter the 6-character code shown on screen." }),
+    /* @__PURE__ */ jsx72(
+      "input",
+      {
+        type: "text",
+        value: code,
+        onChange: (e) => handleCodeChange(e.target.value),
+        onKeyDown: (e) => e.key === "Enter" && handleLink(),
+        placeholder: "XXXXXX",
+        autoFocus: true,
+        maxLength: 6,
+        className: "w-full text-center text-2xl tracking-[0.3em] font-mono px-4 py-3 rounded-lg\n            bg-[var(--ui-kit-bg)] text-[var(--ui-kit-fg)]\n            border border-[var(--ui-kit-bd)] focus:outline-none focus:border-[var(--ui-kit-primary)]\n            uppercase"
+      }
+    ),
+    error && /* @__PURE__ */ jsx72("p", { className: "text-sm text-[var(--ui-kit-bg-error)]", children: error }),
+    /* @__PURE__ */ jsx72(Button, { variant: "default", size: "large", className: "w-full", disabled: !isValid || isPending, onClick: handleLink, children: isPending ? /* @__PURE__ */ jsx72(Loader22, { className: "w-4 h-4 animate-spin" }) : "Link" })
+  ] });
 }
 var VALID_CHARS;
 var init_DeviceLinkScreen = __esm({
   "src/internal/components/DevicesMenu/DeviceLinkScreen.tsx"() {
+    init_devices();
+    init_useLayoutDataStore();
     init_Expandable2();
     init_button();
-    init_useLayoutDataStore();
-    init_useLayoutStore();
-    init_devices();
     VALID_CHARS = /^[A-HJ-NP-Z2-9]*$/;
   }
 });
@@ -17947,8 +17858,8 @@ var init_guardian_backup = __esm({
 });
 
 // src/internal/components/DevicesMenu/DeviceManageScreen.tsx
-import { useCallback as useCallback19, useEffect as useEffect25, useRef as useRef14, useState as useState15 } from "react";
 import { ArrowLeft as ArrowLeft9, Cpu, Download, HardDrive, Loader2 as Loader23, Trash2, Upload } from "lucide-react";
+import { useCallback as useCallback19, useEffect as useEffect25, useRef as useRef14, useState as useState15 } from "react";
 import { Fragment as Fragment18, jsx as jsx73, jsxs as jsxs65 } from "react/jsx-runtime";
 function formatSize(bytes) {
   if (bytes < 1024) return `${bytes} B`;
@@ -17957,7 +17868,6 @@ function formatSize(bytes) {
 function DeviceManageScreen() {
   const setPage = useLayoutDataStore((s) => s.setPage);
   const pageParams = useLayoutDataStore((s) => s.pageParams);
-  const maxScrollHeight = useLayoutStore((s) => s.maxScrollHeight);
   const session = useSession((st) => st.session);
   const userId = session?.mpcUserId || "";
   const deviceId = pageParams?.deviceId;
@@ -18059,193 +17969,211 @@ function DeviceManageScreen() {
       setActionState(null);
     }
   }, [password, userId, refreshList]);
-  const handleDelete = useCallback19(async (keyshareId) => {
-    const guardian = guardianRef.current;
-    if (!guardian) return;
-    setActionState({ action: "delete", keyshareId, substep: "confirm-device" });
-    setErrorMessage(null);
-    setWaitingConfirm(true);
-    try {
-      await deleteFromGuardian(guardian, keyshareId);
-      setWaitingConfirm(false);
-      setStatusMessage("Keyshare deleted.");
-      setActionState(null);
-      await refreshList();
-    } catch (err) {
-      setWaitingConfirm(false);
-      setErrorMessage(err.message);
-      setActionState(null);
-    }
-  }, [refreshList]);
+  const handleDelete = useCallback19(
+    async (keyshareId) => {
+      const guardian = guardianRef.current;
+      if (!guardian) return;
+      setActionState({ action: "delete", keyshareId, substep: "confirm-device" });
+      setErrorMessage(null);
+      setWaitingConfirm(true);
+      try {
+        await deleteFromGuardian(guardian, keyshareId);
+        setWaitingConfirm(false);
+        setStatusMessage("Keyshare deleted.");
+        setActionState(null);
+        await refreshList();
+      } catch (err) {
+        setWaitingConfirm(false);
+        setErrorMessage(err.message);
+        setActionState(null);
+      }
+    },
+    [refreshList]
+  );
   const isWorking = actionState?.substep === "working" || actionState?.substep === "confirm-device";
-  return /* @__PURE__ */ jsx73(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ jsxs65(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ jsxs65("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx73(Button, { variant: "ghost", size: "icon", onClick: () => {
+  return /* @__PURE__ */ jsxs65(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+    /* @__PURE__ */ jsxs65("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx73(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          onClick: () => {
             guardianRef.current?.close();
             setPage("devices" /* DEVICES */);
-          }, children: /* @__PURE__ */ jsx73(ArrowLeft9, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ jsx73(HardDrive, { className: "h-5 w-5 flex-none" }),
-          /* @__PURE__ */ jsx73("span", { className: "text-xl font-semibold", children: deviceName || "Guardian" }),
-          screen.step === "connected" && /* @__PURE__ */ jsxs65("span", { className: "text-xs text-[var(--ui-kit-fg-muted)] ml-auto", children: [
-            "v",
-            screen.info.fwVer
-          ] })
-        ] }),
-        waitingConfirm && /* @__PURE__ */ jsxs65("div", { className: "flex items-center gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)] text-sm animate-pulse", children: [
-          /* @__PURE__ */ jsx73(Loader23, { className: "w-4 h-4 animate-spin" }),
-          /* @__PURE__ */ jsx73("span", { children: "Confirm on your device..." })
+          },
+          children: /* @__PURE__ */ jsx73(ArrowLeft9, { className: "h-4 w-4 flex-none" })
+        }
+      ),
+      /* @__PURE__ */ jsx73(HardDrive, { className: "h-5 w-5 flex-none" }),
+      /* @__PURE__ */ jsx73("span", { className: "text-xl font-semibold", children: deviceName || "Guardian" }),
+      screen.step === "connected" && /* @__PURE__ */ jsxs65("span", { className: "text-xs text-[var(--ui-kit-fg-muted)] ml-auto", children: [
+        "v",
+        screen.info.fwVer
+      ] })
+    ] }),
+    waitingConfirm && /* @__PURE__ */ jsxs65("div", { className: "flex items-center gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)] text-sm animate-pulse", children: [
+      /* @__PURE__ */ jsx73(Loader23, { className: "w-4 h-4 animate-spin" }),
+      /* @__PURE__ */ jsx73("span", { children: "Confirm on your device..." })
+    ] }),
+    statusMessage && /* @__PURE__ */ jsx73("div", { className: "text-sm text-green-500 p-2", children: statusMessage }),
+    errorMessage && /* @__PURE__ */ jsx73("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2", children: errorMessage }),
+    screen.step === "connecting" && /* @__PURE__ */ jsx73("div", { className: "flex justify-center py-8", children: /* @__PURE__ */ jsx73(Loader23, { className: "w-6 h-6 animate-spin text-[var(--ui-kit-fg-muted)]" }) }),
+    screen.step === "error" && /* @__PURE__ */ jsx73("div", { className: "text-sm text-[var(--ui-kit-bg-error)] text-center py-8", children: screen.message }),
+    screen.step === "new-device" && /* @__PURE__ */ jsxs65("div", { className: "flex flex-col items-center gap-4 py-8", children: [
+      /* @__PURE__ */ jsx73(Cpu, { className: "w-10 h-10 text-[var(--ui-kit-fg-muted)]" }),
+      /* @__PURE__ */ jsxs65("div", { className: "text-center", children: [
+        /* @__PURE__ */ jsx73("p", { className: "text-sm font-semibold", children: "New device detected" }),
+        /* @__PURE__ */ jsxs65("p", { className: "text-xs text-[var(--ui-kit-fg-muted)] mt-1", children: [
+          screen.info.deviceId,
+          " \xB7 v",
+          screen.info.fwVer
+        ] })
+      ] }),
+      /* @__PURE__ */ jsx73(
+        Button,
+        {
+          variant: "default",
+          size: "large",
+          className: "w-full",
+          onClick: () => {
+            setPage("device-link" /* DEVICE_LINK */);
+          },
+          children: "Link Device"
+        }
+      )
+    ] }),
+    screen.step === "connected" && /* @__PURE__ */ jsxs65(Fragment18, { children: [
+      screen.keyshares.length === 0 && /* @__PURE__ */ jsx73("div", { className: "text-sm text-[var(--ui-kit-fg-muted)] text-center py-4", children: "No keyshares stored on this device" }),
+      screen.keyshares.length > 0 && /* @__PURE__ */ jsxs65("div", { className: "text-xs text-[var(--ui-kit-fg-muted)] text-right", children: [
+        screen.keyshares.length,
+        " keyshare",
+        screen.keyshares.length > 1 ? "s" : "",
+        " \xB7",
+        " ",
+        formatSize(screen.keyshares.reduce((s, e) => s + e.size, 0))
+      ] }),
+      screen.keyshares.map(({ id, size }) => /* @__PURE__ */ jsxs65("div", { className: "flex items-center gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
+        /* @__PURE__ */ jsx73(Cpu, { className: "w-5 h-5 text-[var(--ui-kit-fg-muted)] shrink-0" }),
+        /* @__PURE__ */ jsxs65("div", { className: "flex-1 min-w-0", children: [
+          /* @__PURE__ */ jsx73("span", { className: "text-sm font-mono truncate block text-[var(--ui-kit-fg)]", children: id }),
+          /* @__PURE__ */ jsx73("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: formatSize(size) })
         ] }),
-        statusMessage && /* @__PURE__ */ jsx73("div", { className: "text-sm text-green-500 p-2", children: statusMessage }),
-        errorMessage && /* @__PURE__ */ jsx73("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2", children: errorMessage }),
-        screen.step === "connecting" && /* @__PURE__ */ jsx73("div", { className: "flex justify-center py-8", children: /* @__PURE__ */ jsx73(Loader23, { className: "w-6 h-6 animate-spin text-[var(--ui-kit-fg-muted)]" }) }),
-        screen.step === "error" && /* @__PURE__ */ jsx73("div", { className: "text-sm text-[var(--ui-kit-bg-error)] text-center py-8", children: screen.message }),
-        screen.step === "new-device" && /* @__PURE__ */ jsxs65("div", { className: "flex flex-col items-center gap-4 py-8", children: [
-          /* @__PURE__ */ jsx73(Cpu, { className: "w-10 h-10 text-[var(--ui-kit-fg-muted)]" }),
-          /* @__PURE__ */ jsxs65("div", { className: "text-center", children: [
-            /* @__PURE__ */ jsx73("p", { className: "text-sm font-semibold", children: "New device detected" }),
-            /* @__PURE__ */ jsxs65("p", { className: "text-xs text-[var(--ui-kit-fg-muted)] mt-1", children: [
-              screen.info.deviceId,
-              " \xB7 v",
-              screen.info.fwVer
-            ] })
-          ] }),
+        /* @__PURE__ */ jsx73(
+          Button,
+          {
+            variant: "ghost",
+            size: "icon",
+            disabled: isWorking,
+            onClick: () => {
+              guardianRef.current?.close();
+              const store = useLayoutDataStore.getState();
+              store.setPageParams({ key: "device-restore" /* DEVICE_RESTORE */, keyshareId: id, deviceId, deviceName });
+              store.setPage("device-restore" /* DEVICE_RESTORE */);
+            },
+            title: "Restore",
+            children: /* @__PURE__ */ jsx73(Download, { className: "w-4 h-4" })
+          }
+        ),
+        /* @__PURE__ */ jsx73(
+          Button,
+          {
+            variant: "ghost",
+            size: "icon",
+            disabled: isWorking,
+            onClick: () => handleDelete(id),
+            title: "Delete",
+            className: "text-[var(--ui-kit-bg-error)]",
+            children: /* @__PURE__ */ jsx73(Trash2, { className: "w-4 h-4" })
+          }
+        )
+      ] }, id)),
+      actionState?.action === "overwrite" && actionState.substep === "confirm" && /* @__PURE__ */ jsxs65("div", { className: "flex items-center justify-between gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
+        /* @__PURE__ */ jsx73("span", { className: "text-sm", children: "Keyshare exists. Overwrite? (requires button press on device)" }),
+        /* @__PURE__ */ jsxs65("div", { className: "flex gap-2", children: [
           /* @__PURE__ */ jsx73(
             Button,
             {
-              variant: "default",
-              size: "large",
-              className: "w-full",
+              variant: "ghost",
+              size: "small",
               onClick: () => {
-                setPage("device-link" /* DEVICE_LINK */);
-              },
-              children: "Link Device"
-            }
-          )
-        ] }),
-        screen.step === "connected" && /* @__PURE__ */ jsxs65(Fragment18, { children: [
-          screen.keyshares.length === 0 && /* @__PURE__ */ jsx73("div", { className: "text-sm text-[var(--ui-kit-fg-muted)] text-center py-4", children: "No keyshares stored on this device" }),
-          screen.keyshares.length > 0 && /* @__PURE__ */ jsxs65("div", { className: "text-xs text-[var(--ui-kit-fg-muted)] text-right", children: [
-            screen.keyshares.length,
-            " keyshare",
-            screen.keyshares.length > 1 ? "s" : "",
-            " \xB7 ",
-            formatSize(screen.keyshares.reduce((s, e) => s + e.size, 0))
-          ] }),
-          screen.keyshares.map(({ id, size }) => /* @__PURE__ */ jsxs65("div", { className: "flex items-center gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
-            /* @__PURE__ */ jsx73(Cpu, { className: "w-5 h-5 text-[var(--ui-kit-fg-muted)] shrink-0" }),
-            /* @__PURE__ */ jsxs65("div", { className: "flex-1 min-w-0", children: [
-              /* @__PURE__ */ jsx73("span", { className: "text-sm font-mono truncate block text-[var(--ui-kit-fg)]", children: id }),
-              /* @__PURE__ */ jsx73("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: formatSize(size) })
-            ] }),
-            /* @__PURE__ */ jsx73(
-              Button,
-              {
-                variant: "ghost",
-                size: "icon",
-                disabled: isWorking,
-                onClick: () => {
-                  guardianRef.current?.close();
-                  const store = useLayoutDataStore.getState();
-                  store.setPageParams({ key: "device-restore" /* DEVICE_RESTORE */, keyshareId: id, deviceId, deviceName });
-                  store.setPage("device-restore" /* DEVICE_RESTORE */);
-                },
-                title: "Restore",
-                children: /* @__PURE__ */ jsx73(Download, { className: "w-4 h-4" })
-              }
-            ),
-            /* @__PURE__ */ jsx73(
-              Button,
-              {
-                variant: "ghost",
-                size: "icon",
-                disabled: isWorking,
-                onClick: () => handleDelete(id),
-                title: "Delete",
-                className: "text-[var(--ui-kit-bg-error)]",
-                children: /* @__PURE__ */ jsx73(Trash2, { className: "w-4 h-4" })
-              }
-            )
-          ] }, id)),
-          actionState?.action === "overwrite" && actionState.substep === "confirm" && /* @__PURE__ */ jsxs65("div", { className: "flex items-center justify-between gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
-            /* @__PURE__ */ jsx73("span", { className: "text-sm", children: "Keyshare exists. Overwrite? (requires button press on device)" }),
-            /* @__PURE__ */ jsxs65("div", { className: "flex gap-2", children: [
-              /* @__PURE__ */ jsx73(Button, { variant: "ghost", size: "small", onClick: () => {
                 setActionState(null);
                 setPassword("");
-              }, children: "Cancel" }),
-              /* @__PURE__ */ jsx73(Button, { variant: "outline", size: "small", onClick: handleOverwrite, children: "Overwrite" })
-            ] })
-          ] }),
-          actionState?.action === "backup" && actionState.substep === "password" ? /* @__PURE__ */ jsxs65("div", { className: "flex gap-2", children: [
-            /* @__PURE__ */ jsx73(
-              "input",
-              {
-                type: "password",
-                autoComplete: "one-time-code",
-                "data-1p-ignore": true,
-                "data-lpignore": "true",
-                value: password,
-                onChange: (e) => setPassword(e.target.value),
-                onKeyDown: (e) => e.key === "Enter" && password && handleBackup(),
-                placeholder: "Encryption password",
-                className: "flex-1 text-sm px-3 py-2 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bd)] text-[var(--ui-kit-fg)] focus:outline-none focus:border-[var(--ui-kit-primary)]",
-                autoFocus: true
-              }
-            ),
-            /* @__PURE__ */ jsx73(Button, { variant: "default", disabled: !password, onClick: handleBackup, children: "Backup" }),
-            /* @__PURE__ */ jsx73(Button, { variant: "ghost", onClick: () => {
-              setActionState(null);
-              setPassword("");
-            }, children: "Cancel" })
-          ] }) : /* @__PURE__ */ jsxs65(
-            Button,
-            {
-              variant: "default",
-              size: "large",
-              className: "w-full",
-              disabled: isWorking,
-              onClick: () => {
-                setStatusMessage(null);
-                setErrorMessage(null);
-                setActionState({ action: "backup", substep: "password" });
               },
-              children: [
-                /* @__PURE__ */ jsx73(Upload, { className: "w-4 h-4" }),
-                /* @__PURE__ */ jsx73("span", { children: "Backup Current Keyshare" })
-              ]
+              children: "Cancel"
             }
           ),
-          actionState?.substep === "working" && /* @__PURE__ */ jsx73("div", { className: "flex justify-center py-2", children: /* @__PURE__ */ jsx73(Loader23, { className: "w-5 h-5 animate-spin" }) })
+          /* @__PURE__ */ jsx73(Button, { variant: "outline", size: "small", onClick: handleOverwrite, children: "Overwrite" })
         ] })
-      ] })
-    }
-  );
+      ] }),
+      actionState?.action === "backup" && actionState.substep === "password" ? /* @__PURE__ */ jsxs65("div", { className: "flex gap-2", children: [
+        /* @__PURE__ */ jsx73(
+          "input",
+          {
+            type: "password",
+            autoComplete: "one-time-code",
+            "data-1p-ignore": true,
+            "data-lpignore": "true",
+            value: password,
+            onChange: (e) => setPassword(e.target.value),
+            onKeyDown: (e) => e.key === "Enter" && password && handleBackup(),
+            placeholder: "Encryption password",
+            className: "flex-1 text-sm px-3 py-2 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bd)] text-[var(--ui-kit-fg)] focus:outline-none focus:border-[var(--ui-kit-primary)]",
+            autoFocus: true
+          }
+        ),
+        /* @__PURE__ */ jsx73(Button, { variant: "default", disabled: !password, onClick: handleBackup, children: "Backup" }),
+        /* @__PURE__ */ jsx73(
+          Button,
+          {
+            variant: "ghost",
+            onClick: () => {
+              setActionState(null);
+              setPassword("");
+            },
+            children: "Cancel"
+          }
+        )
+      ] }) : /* @__PURE__ */ jsxs65(
+        Button,
+        {
+          variant: "default",
+          size: "large",
+          className: "w-full",
+          disabled: isWorking,
+          onClick: () => {
+            setStatusMessage(null);
+            setErrorMessage(null);
+            setActionState({ action: "backup", substep: "password" });
+          },
+          children: [
+            /* @__PURE__ */ jsx73(Upload, { className: "w-4 h-4" }),
+            /* @__PURE__ */ jsx73("span", { children: "Backup Current Keyshare" })
+          ]
+        }
+      ),
+      actionState?.substep === "working" && /* @__PURE__ */ jsx73("div", { className: "flex justify-center py-2", children: /* @__PURE__ */ jsx73(Loader23, { className: "w-5 h-5 animate-spin" }) })
+    ] })
+  ] });
 }
 var init_DeviceManageScreen = __esm({
   "src/internal/components/DevicesMenu/DeviceManageScreen.tsx"() {
-    init_Expandable2();
-    init_button();
-    init_useLayoutDataStore();
-    init_useLayoutStore();
     init_SessionContext();
-    init_iframe_manager();
     init_guardian_backup();
+    init_useLayoutDataStore();
+    init_iframe_manager();
+    init_Expandable2();
+    init_button();
   }
 });
 
 // src/internal/components/DevicesMenu/DeviceRestoreScreen.tsx
-import { useCallback as useCallback20, useState as useState16 } from "react";
 import { AlertTriangle as AlertTriangle2, ArrowLeft as ArrowLeft10, Download as Download2, Loader2 as Loader24 } from "lucide-react";
+import { useCallback as useCallback20, useState as useState16 } from "react";
 import { Fragment as Fragment19, jsx as jsx74, jsxs as jsxs66 } from "react/jsx-runtime";
 function DeviceRestoreScreen() {
   const setPage = useLayoutDataStore((s) => s.setPage);
   const pageParams = useLayoutDataStore((s) => s.pageParams);
-  const maxScrollHeight = useLayoutStore((s) => s.maxScrollHeight);
   const session = useSession((st) => st.session);
   const userId = session?.mpcUserId || "";
   const keyshareId = pageParams?.keyshareId;
@@ -18281,82 +18209,74 @@ function DeviceRestoreScreen() {
       setIsWorking(false);
     }
   }, [password, keyshareId, userId, deviceId]);
-  return /* @__PURE__ */ jsx74(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ jsxs66(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ jsxs66("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx74(Button, { variant: "ghost", size: "icon", onClick: () => setPage("device-manage" /* DEVICE_MANAGE */), children: /* @__PURE__ */ jsx74(ArrowLeft10, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ jsx74("span", { className: "text-xl font-semibold", children: "Restore Keyshare" })
-        ] }),
-        /* @__PURE__ */ jsxs66("div", { className: "flex gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bg-error)]", children: [
-          /* @__PURE__ */ jsx74(AlertTriangle2, { className: "w-5 h-5 text-[var(--ui-kit-bg-error)] shrink-0 mt-0.5" }),
-          /* @__PURE__ */ jsxs66("div", { className: "text-sm", children: [
-            /* @__PURE__ */ jsx74("p", { className: "font-semibold text-[var(--ui-kit-bg-error)]", children: "This will replace your current keyshare" }),
-            /* @__PURE__ */ jsxs66("p", { className: "text-[var(--ui-kit-fg-muted)] mt-1", children: [
-              "Your existing keyshare will be overwritten with the backup from ",
-              deviceName || "Guardian",
-              " device. Make sure you have a backup of your current keyshare before proceeding."
-            ] })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsx74("div", { className: "text-xs text-[var(--ui-kit-fg-muted)] font-mono truncate px-1", children: keyshareId }),
-        /* @__PURE__ */ jsx74(
-          "input",
-          {
-            type: "password",
-            autoComplete: "one-time-code",
-            "data-1p-ignore": true,
-            "data-lpignore": "true",
-            value: password,
-            onChange: (e) => setPassword(e.target.value),
-            onKeyDown: (e) => e.key === "Enter" && password && !isWorking && handleRestore(),
-            placeholder: "Encryption password",
-            className: "w-full text-sm px-3 py-2 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bd)] text-[var(--ui-kit-fg)] focus:outline-none focus:border-[var(--ui-kit-primary)]",
-            autoFocus: true,
-            disabled: isWorking
-          }
-        ),
-        /* @__PURE__ */ jsx74(
-          Button,
-          {
-            variant: "default",
-            size: "large",
-            className: "w-full",
-            disabled: !password || isWorking,
-            onClick: handleRestore,
-            children: isWorking ? /* @__PURE__ */ jsxs66(Fragment19, { children: [
-              /* @__PURE__ */ jsx74(Loader24, { className: "w-4 h-4 animate-spin" }),
-              /* @__PURE__ */ jsx74("span", { children: "Restoring \u2014 confirm on your device..." })
-            ] }) : /* @__PURE__ */ jsxs66(Fragment19, { children: [
-              /* @__PURE__ */ jsx74(Download2, { className: "w-4 h-4" }),
-              /* @__PURE__ */ jsx74("span", { children: "Restore from Guardian" })
-            ] })
-          }
-        ),
-        statusMessage && /* @__PURE__ */ jsx74("div", { className: "text-sm text-green-500 p-2 text-center", children: statusMessage }),
-        errorMessage && /* @__PURE__ */ jsx74("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2 text-center", children: errorMessage })
+  return /* @__PURE__ */ jsxs66(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+    /* @__PURE__ */ jsxs66("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx74(Button, { variant: "ghost", size: "icon", onClick: () => setPage("device-manage" /* DEVICE_MANAGE */), children: /* @__PURE__ */ jsx74(ArrowLeft10, { className: "h-4 w-4 flex-none" }) }),
+      /* @__PURE__ */ jsx74("span", { className: "text-xl font-semibold", children: "Restore Keyshare" })
+    ] }),
+    /* @__PURE__ */ jsxs66("div", { className: "flex gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bg-error)]", children: [
+      /* @__PURE__ */ jsx74(AlertTriangle2, { className: "w-5 h-5 text-[var(--ui-kit-bg-error)] shrink-0 mt-0.5" }),
+      /* @__PURE__ */ jsxs66("div", { className: "text-sm", children: [
+        /* @__PURE__ */ jsx74("p", { className: "font-semibold text-[var(--ui-kit-bg-error)]", children: "This will replace your current keyshare" }),
+        /* @__PURE__ */ jsxs66("p", { className: "text-[var(--ui-kit-fg-muted)] mt-1", children: [
+          "Your existing keyshare will be overwritten with the backup from ",
+          deviceName || "Guardian",
+          " device. Make sure you have a backup of your current keyshare before proceeding."
+        ] })
       ] })
-    }
-  );
+    ] }),
+    /* @__PURE__ */ jsx74("div", { className: "text-xs text-[var(--ui-kit-fg-muted)] font-mono truncate px-1", children: keyshareId }),
+    /* @__PURE__ */ jsx74(
+      "input",
+      {
+        type: "password",
+        autoComplete: "one-time-code",
+        "data-1p-ignore": true,
+        "data-lpignore": "true",
+        value: password,
+        onChange: (e) => setPassword(e.target.value),
+        onKeyDown: (e) => e.key === "Enter" && password && !isWorking && handleRestore(),
+        placeholder: "Encryption password",
+        className: "w-full text-sm px-3 py-2 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bd)] text-[var(--ui-kit-fg)] focus:outline-none focus:border-[var(--ui-kit-primary)]",
+        autoFocus: true,
+        disabled: isWorking
+      }
+    ),
+    /* @__PURE__ */ jsx74(
+      Button,
+      {
+        variant: "default",
+        size: "large",
+        className: "w-full",
+        disabled: !password || isWorking,
+        onClick: handleRestore,
+        children: isWorking ? /* @__PURE__ */ jsxs66(Fragment19, { children: [
+          /* @__PURE__ */ jsx74(Loader24, { className: "w-4 h-4 animate-spin" }),
+          /* @__PURE__ */ jsx74("span", { children: "Restoring \u2014 confirm on your device..." })
+        ] }) : /* @__PURE__ */ jsxs66(Fragment19, { children: [
+          /* @__PURE__ */ jsx74(Download2, { className: "w-4 h-4" }),
+          /* @__PURE__ */ jsx74("span", { children: "Restore from Guardian" })
+        ] })
+      }
+    ),
+    statusMessage && /* @__PURE__ */ jsx74("div", { className: "text-sm text-green-500 p-2 text-center", children: statusMessage }),
+    errorMessage && /* @__PURE__ */ jsx74("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2 text-center", children: errorMessage })
+  ] });
 }
 var init_DeviceRestoreScreen = __esm({
   "src/internal/components/DevicesMenu/DeviceRestoreScreen.tsx"() {
-    init_Expandable2();
-    init_button();
-    init_useLayoutDataStore();
-    init_useLayoutStore();
     init_SessionContext();
-    init_iframe_manager();
     init_guardian_backup();
+    init_useLayoutDataStore();
+    init_iframe_manager();
+    init_Expandable2();
+    init_button();
   }
 });
 
 // src/internal/components/DevicesMenu/DevicesMenu.tsx
+import { ArrowLeft as ArrowLeft11, CheckCircle, Cpu as Cpu2, HardDrive as HardDrive2, Loader2 as Loader25, Monitor, RefreshCw, Trash2 as Trash22 } from "lucide-react";
 import { useState as useState17 } from "react";
-import { ArrowLeft as ArrowLeft11, Cpu as Cpu2, Monitor, CheckCircle, Trash2 as Trash22, Loader2 as Loader25, RefreshCw, HardDrive as HardDrive2 } from "lucide-react";
 import { jsx as jsx75, jsxs as jsxs67 } from "react/jsx-runtime";
 function DeviceIcon({ deviceType }) {
   const Icon2 = deviceType === "iot" ? Cpu2 : Monitor;
@@ -18426,7 +18346,11 @@ function DeviceRow({ device }) {
       {
         onClick: () => {
           const store = useLayoutDataStore.getState();
-          store.setPageParams({ key: "device-manage" /* DEVICE_MANAGE */, deviceId: device.deviceId, deviceName: device.deviceName });
+          store.setPageParams({
+            key: "device-manage" /* DEVICE_MANAGE */,
+            deviceId: device.deviceId,
+            deviceName: device.deviceName
+          });
           store.setPage("device-manage" /* DEVICE_MANAGE */);
         },
         className: "text-[var(--ui-kit-fg-muted)] hover:text-[var(--ui-kit-fg)] transition-colors shrink-0",
@@ -18446,50 +18370,32 @@ function DeviceRow({ device }) {
 }
 function DevicesMenu() {
   const setPage = useLayoutDataStore((s) => s.setPage);
-  const maxScrollHeight = useLayoutStore((s) => s.maxScrollHeight);
   const { data, isLoading, error, refetch, isFetching } = useDevices();
   const devices = data?.devices ?? [];
-  return /* @__PURE__ */ jsx75(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ jsxs67(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ jsxs67("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx75(Button, { variant: "ghost", size: "icon", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ jsx75(ArrowLeft11, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ jsx75("span", { className: "text-xl font-semibold", children: "Devices" }),
-          isLoading && /* @__PURE__ */ jsx75(Loader25, { className: "w-4 h-4 animate-spin" }),
-          /* @__PURE__ */ jsx75("div", { className: "flex-1" }),
-          /* @__PURE__ */ jsx75(Button, { variant: "ghost", size: "icon", onClick: () => refetch(), disabled: isFetching, children: /* @__PURE__ */ jsx75(RefreshCw, { className: `h-4 w-4 flex-none ${isFetching ? "animate-spin" : ""}` }) })
-        ] }),
-        error && /* @__PURE__ */ jsx75("div", { className: "text-sm text-[var(--ui-kit-bg-error)] text-center py-4", children: "Failed to load devices" }),
-        !isLoading && !error && devices.length === 0 && /* @__PURE__ */ jsx75("div", { className: "text-sm text-[var(--ui-kit-fg-muted)] text-center py-8", children: "No linked devices" }),
-        devices.map((device) => /* @__PURE__ */ jsx75(DeviceRow, { device }, device.deviceId)),
-        /* @__PURE__ */ jsxs67(
-          Button,
-          {
-            variant: "default",
-            size: "large",
-            className: "w-full",
-            onClick: () => setPage("device-link" /* DEVICE_LINK */),
-            children: [
-              /* @__PURE__ */ jsx75(Cpu2, { className: "w-4 h-4" }),
-              /* @__PURE__ */ jsx75("span", { children: "Add Device" })
-            ]
-          }
-        )
-      ] })
-    }
-  );
+  return /* @__PURE__ */ jsxs67(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+    /* @__PURE__ */ jsxs67("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx75(Button, { variant: "ghost", size: "icon", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ jsx75(ArrowLeft11, { className: "h-4 w-4 flex-none" }) }),
+      /* @__PURE__ */ jsx75("span", { className: "text-xl font-semibold", children: "Devices" }),
+      isLoading && /* @__PURE__ */ jsx75(Loader25, { className: "w-4 h-4 animate-spin" }),
+      /* @__PURE__ */ jsx75("div", { className: "flex-1" }),
+      /* @__PURE__ */ jsx75(Button, { variant: "ghost", size: "icon", onClick: () => refetch(), disabled: isFetching, children: /* @__PURE__ */ jsx75(RefreshCw, { className: `h-4 w-4 flex-none ${isFetching ? "animate-spin" : ""}` }) })
+    ] }),
+    error && /* @__PURE__ */ jsx75("div", { className: "text-sm text-[var(--ui-kit-bg-error)] text-center py-4", children: "Failed to load devices" }),
+    !isLoading && !error && devices.length === 0 && /* @__PURE__ */ jsx75("div", { className: "text-sm text-[var(--ui-kit-fg-muted)] text-center py-8", children: "No linked devices" }),
+    devices.map((device) => /* @__PURE__ */ jsx75(DeviceRow, { device }, device.deviceId)),
+    /* @__PURE__ */ jsxs67(Button, { variant: "default", size: "large", className: "w-full", onClick: () => setPage("device-link" /* DEVICE_LINK */), children: [
+      /* @__PURE__ */ jsx75(Cpu2, { className: "w-4 h-4" }),
+      /* @__PURE__ */ jsx75("span", { children: "Add Device" })
+    ] })
+  ] });
 }
 var init_DevicesMenu = __esm({
   "src/internal/components/DevicesMenu/DevicesMenu.tsx"() {
-    init_Expandable2();
-    init_button();
-    init_useLayoutDataStore();
-    init_useLayoutStore();
     init_devices();
     init_guardian_backup();
+    init_useLayoutDataStore();
+    init_Expandable2();
+    init_button();
   }
 });
 
@@ -19367,10 +19273,11 @@ var init_MethodSelector = __esm({
 var KEYSHARE_BACKUP_MENU_TOUR, KEYSHARE_BACKUP_MENU_TOUR_NO_PASSKEY;
 var init_onboarding_setup4 = __esm({
   "src/internal/components/KeyshareRestoreMenu/onboarding.setup.ts"() {
+    init_constants();
     init_hooks();
     KEYSHARE_BACKUP_MENU_TOUR = [
       {
-        elId: "embarkai-keyshare-backup-menu-onboarding" /* backupMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"keysare-backup" /* KEYSARE_BACKUP */}`,
         title: "passport:backupMenu.onboarding.backupMenu.title",
         description: "passport:backupMenu.onboarding.backupMenu.description",
         onNext: () => {
@@ -19395,7 +19302,7 @@ var init_onboarding_setup4 = __esm({
         }
       },
       {
-        elId: "embarkai-keyshare-backup-menu-onboarding" /* backupMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"keysare-backup" /* KEYSARE_BACKUP */}`,
         title: "passport:backupMenu.onboarding.backupEncryptionPassword.title",
         description: "passport:backupMenu.onboarding.backupEncryptionPassword.description",
         onNext: () => {
@@ -19406,7 +19313,7 @@ var init_onboarding_setup4 = __esm({
         }
       },
       {
-        elId: "embarkai-keyshare-backup-menu-onboarding" /* backupMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"keysare-backup" /* KEYSARE_BACKUP */}`,
         title: "passport:backupMenu.onboarding.backupEncryptionPasskey.title",
         description: "passport:backupMenu.onboarding.backupEncryptionPasskey.description",
         onNext: () => {
@@ -19426,7 +19333,7 @@ var init_onboarding_setup4 = __esm({
     ];
     KEYSHARE_BACKUP_MENU_TOUR_NO_PASSKEY = [
       {
-        elId: "embarkai-keyshare-backup-menu-onboarding" /* backupMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"keysare-backup" /* KEYSARE_BACKUP */}`,
         title: "passport:backupMenu.onboarding.backupMenu.title",
         description: "passport:backupMenu.onboarding.backupMenu.description",
         onNext: () => {
@@ -19441,7 +19348,7 @@ var init_onboarding_setup4 = __esm({
         }
       },
       {
-        elId: "embarkai-keyshare-backup-menu-onboarding" /* backupMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"keysare-backup" /* KEYSARE_BACKUP */}`,
         title: "passport:backupMenu.onboarding.backupEncryptionPassword.title",
         description: "passport:backupMenu.onboarding.backupEncryptionPassword.description",
         onNext: () => {
@@ -20329,7 +20236,6 @@ var init_KeyshareRestoreMenu = __esm({
       const { callbacksRef } = useProviderConfig();
       const { t } = useT();
       const address = useSession((st) => st.address);
-      const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
       const error = useRestoreStore((st) => st.error);
       const success = useRestoreStore((st) => st.success);
       const currentRestoreMethod = useRestoreStore((st) => st.method);
@@ -20412,106 +20318,99 @@ var init_KeyshareRestoreMenu = __esm({
         }
       });
       const RestoreComponent = currentRestoreMethod ? RESTORE_COMPONENTS[currentRestoreMethod] : null;
-      return /* @__PURE__ */ jsx84(
-        "div",
-        {
-          style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-          className: "list-scrollbar-y w-full",
-          children: /* @__PURE__ */ jsxs76(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-            isBackupStatusLoading && /* @__PURE__ */ jsxs76("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] text-center justify-center items-center", children: [
-              /* @__PURE__ */ jsx84(Loader14, { className: "w-4 h-4 animate-spin" }),
-              /* @__PURE__ */ jsx84("span", { className: "block w-full text-xs leading-4", children: t("passport:restoreMenu.check") })
+      return /* @__PURE__ */ jsxs76(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+        isBackupStatusLoading && /* @__PURE__ */ jsxs76("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] text-center justify-center items-center", children: [
+          /* @__PURE__ */ jsx84(Loader14, { className: "w-4 h-4 animate-spin" }),
+          /* @__PURE__ */ jsx84("span", { className: "block w-full text-xs leading-4", children: t("passport:restoreMenu.check") })
+        ] }),
+        !success && !isBackupStatusLoading && !isDisconnecting && !hasServerBackup && /* @__PURE__ */ jsx84(
+          NoBackupFound,
+          {
+            isLoading: isRestoringFromServer || isRestoringFromCloud || isRestoringFromFile || isDisconnecting,
+            restoreFromFile
+          }
+        ),
+        !success && !isBackupStatusLoading && !isDisconnecting && hasServerBackup && /* @__PURE__ */ jsxs76(Fragment27, { children: [
+          /* @__PURE__ */ jsxs76("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+            /* @__PURE__ */ jsxs76("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+              /* @__PURE__ */ jsx84(CloudDownload2, { className: "w-6 h-6" }),
+              /* @__PURE__ */ jsx84("span", { className: "font-bold text-xl leading-6", children: t("passport:restoreMenu.title") })
             ] }),
-            !success && !isBackupStatusLoading && !isDisconnecting && !hasServerBackup && /* @__PURE__ */ jsx84(
-              NoBackupFound,
+            /* @__PURE__ */ jsx84(
+              Switch,
               {
-                isLoading: isRestoringFromServer || isRestoringFromCloud || isRestoringFromFile || isDisconnecting,
-                restoreFromFile
-              }
-            ),
-            !success && !isBackupStatusLoading && !isDisconnecting && hasServerBackup && /* @__PURE__ */ jsxs76(Fragment27, { children: [
-              /* @__PURE__ */ jsxs76("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-                /* @__PURE__ */ jsxs76("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-                  /* @__PURE__ */ jsx84(CloudDownload2, { className: "w-6 h-6" }),
-                  /* @__PURE__ */ jsx84("span", { className: "font-bold text-xl leading-6", children: t("passport:restoreMenu.title") })
-                ] }),
-                /* @__PURE__ */ jsx84(
-                  Switch,
-                  {
-                    name: "advanced-restore-flow-toggle",
-                    labels: { checked: t("passport:common.standard"), unchecked: t("passport:common.advanced") },
-                    checked: currentRestoreMethod !== "server",
-                    onChange: () => {
-                      const { setError, setRestorePassword, setRestoreFile, setMethod } = useRestoreStore.getState();
-                      if (!!error) setError(null);
-                      if (currentRestoreMethod === "server") {
-                        setRestorePassword("");
-                        setMethod(null);
-                      } else {
-                        setRestoreFile(null);
-                        setMethod("server");
-                      }
-                    }
+                name: "advanced-restore-flow-toggle",
+                labels: { checked: t("passport:common.standard"), unchecked: t("passport:common.advanced") },
+                checked: currentRestoreMethod !== "server",
+                onChange: () => {
+                  const { setError, setRestorePassword, setRestoreFile, setMethod } = useRestoreStore.getState();
+                  if (!!error) setError(null);
+                  if (currentRestoreMethod === "server") {
+                    setRestorePassword("");
+                    setMethod(null);
+                  } else {
+                    setRestoreFile(null);
+                    setMethod("server");
                   }
-                )
-              ] }),
-              /* @__PURE__ */ jsx84(MethodSelector, { mode: "restore", serverRecoveryStatus }),
-              !!currentRestoreMethod && /* @__PURE__ */ jsx84(
-                RestoreComponent,
-                {
-                  isLoading: isRestoringFromFile || isRestoringFromServer || isRestoringFromCloud || isDisconnecting,
-                  fileHandler: restoreFromFile,
-                  serverHandler: restoreFromServer2,
-                  cloudHandler: restoreFromCloud
                 }
-              )
-            ] }),
-            !success && !isBackupStatusLoading && /* @__PURE__ */ jsxs76(
-              Button,
-              {
-                size: "large",
-                variant: "ghost",
-                onClick: () => {
-                  const {
-                    setError,
-                    setShowPassword,
-                    setUsePasskey,
-                    setRestoreFile,
-                    setRestorePassword,
-                    setSuccess,
-                    setMethod
-                  } = useRestoreStore.getState();
-                  setError(null);
-                  setShowPassword(false);
-                  setUsePasskey(false);
-                  setRestoreFile(null);
-                  setRestorePassword("");
-                  setSuccess(null);
-                  setMethod(null);
-                  disconnect();
-                },
-                disabled: isDisconnecting || isRestoringFromFile || isRestoringFromServer,
-                className: "w-fit mx-auto",
-                children: [
-                  isDisconnecting ? /* @__PURE__ */ jsx84(Loader14, { className: "w-4 h-4 animate-spin" }) : /* @__PURE__ */ jsx84(UserCircle2, { className: "w-4 h-4" }),
-                  /* @__PURE__ */ jsx84("span", { children: t("passport:restoreMenu.tryAnotherAccount") })
-                ]
               }
-            ),
-            error && /* @__PURE__ */ jsxs76(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
-              /* @__PURE__ */ jsx84(AlertCircle2, { className: "h-4 w-4 flex-shrink-0" }),
-              /* @__PURE__ */ jsx84("span", { className: "w-full flex-1 block", children: error })
-            ] }),
-            success && /* @__PURE__ */ jsxs76(Fragment27, { children: [
-              /* @__PURE__ */ jsxs76(Highlight, { type: "success", className: "flex gap-[var(--ui-kit-gap)]", children: [
-                /* @__PURE__ */ jsx84(CheckCircle2, { className: "h-4 w-4 flex-shrink-0" }),
-                /* @__PURE__ */ jsx84("span", { className: "w-full flex-1 block", children: success })
-              ] }),
-              /* @__PURE__ */ jsx84(Button, { variant: "default", size: "large", className: "w-full", onClick: () => onRestoreSuccess(), children: "Done" })
-            ] })
-          ] })
-        }
-      );
+            )
+          ] }),
+          /* @__PURE__ */ jsx84(MethodSelector, { mode: "restore", serverRecoveryStatus }),
+          !!currentRestoreMethod && /* @__PURE__ */ jsx84(
+            RestoreComponent,
+            {
+              isLoading: isRestoringFromFile || isRestoringFromServer || isRestoringFromCloud || isDisconnecting,
+              fileHandler: restoreFromFile,
+              serverHandler: restoreFromServer2,
+              cloudHandler: restoreFromCloud
+            }
+          )
+        ] }),
+        !success && !isBackupStatusLoading && /* @__PURE__ */ jsxs76(
+          Button,
+          {
+            size: "large",
+            variant: "ghost",
+            onClick: () => {
+              const {
+                setError,
+                setShowPassword,
+                setUsePasskey,
+                setRestoreFile,
+                setRestorePassword,
+                setSuccess,
+                setMethod
+              } = useRestoreStore.getState();
+              setError(null);
+              setShowPassword(false);
+              setUsePasskey(false);
+              setRestoreFile(null);
+              setRestorePassword("");
+              setSuccess(null);
+              setMethod(null);
+              disconnect();
+            },
+            disabled: isDisconnecting || isRestoringFromFile || isRestoringFromServer,
+            className: "w-fit mx-auto",
+            children: [
+              isDisconnecting ? /* @__PURE__ */ jsx84(Loader14, { className: "w-4 h-4 animate-spin" }) : /* @__PURE__ */ jsx84(UserCircle2, { className: "w-4 h-4" }),
+              /* @__PURE__ */ jsx84("span", { children: t("passport:restoreMenu.tryAnotherAccount") })
+            ]
+          }
+        ),
+        error && /* @__PURE__ */ jsxs76(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
+          /* @__PURE__ */ jsx84(AlertCircle2, { className: "h-4 w-4 flex-shrink-0" }),
+          /* @__PURE__ */ jsx84("span", { className: "w-full flex-1 block", children: error })
+        ] }),
+        success && /* @__PURE__ */ jsxs76(Fragment27, { children: [
+          /* @__PURE__ */ jsxs76(Highlight, { type: "success", className: "flex gap-[var(--ui-kit-gap)]", children: [
+            /* @__PURE__ */ jsx84(CheckCircle2, { className: "h-4 w-4 flex-shrink-0" }),
+            /* @__PURE__ */ jsx84("span", { className: "w-full flex-1 block", children: success })
+          ] }),
+          /* @__PURE__ */ jsx84(Button, { variant: "default", size: "large", className: "w-full", onClick: () => onRestoreSuccess(), children: "Done" })
+        ] })
+      ] });
     };
   }
 });
@@ -20526,7 +20425,6 @@ function KeyshareBackupMenu() {
   const hasServerVault = useSession((st) => st.hasServerVault);
   const { t } = useT();
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const currentBackupMethod = useRestoreStore((st) => st.method);
   const usePasskey = useRestoreStore((st) => st.usePasskey);
   const error = useRestoreStore((st) => st.error);
@@ -20565,118 +20463,110 @@ function KeyshareBackupMenu() {
     createPasskey
   } = useCreateBackup();
   const BackupComponent = !!currentBackupMethod ? COMPONENTS[currentBackupMethod] : null;
-  return /* @__PURE__ */ jsx85(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("embarkai-keyshare-backup-menu-onboarding" /* backupMenu */, inst),
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ jsxs77(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        !!isRecoveryLoading && (hasServerVault || !currentBackupMethod) && /* @__PURE__ */ jsx85("div", { className: "w-full flex items-center justify-center p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ jsx85(Loader15, { className: "w-4 h-4 animate-spin" }) }),
-        (!isRecoveryLoading || !hasServerVault) && !hasRecoveryData2 && /* @__PURE__ */ jsxs77("div", { className: "flex items-center justify-center gap-2 px-5 py-[var(--ui-kit-pd)]", children: [
-          /* @__PURE__ */ jsx85(LockIcon, { className: "w-6 h-6" }),
-          /* @__PURE__ */ jsx85("span", { className: "font-bold text-xl leading-6", children: t("passport:backupMenu.title") })
-        ] }),
-        !isRecoveryLoading && !!hasRecoveryData2 && /* @__PURE__ */ jsxs77(
-          "div",
-          {
-            ref: (inst) => onboarder.registerElement("embarkai-keyshare-backup-advanced-onboarding" /* backupAdvanced */, inst),
-            className: "flex items-center justify-between gap-[var(--ui-kit-gap)]",
-            children: [
-              /* @__PURE__ */ jsxs77("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-                /* @__PURE__ */ jsx85(
-                  Button,
-                  {
-                    variant: "ghost",
-                    size: "icon",
-                    title: "Back",
-                    onClick: () => {
-                      const {
-                        setSuccess,
-                        setError,
-                        setRestorePassword,
-                        setRestoreFile,
-                        setShowPassword,
-                        setUsePasskey,
-                        setMethod,
-                        setSelectedCloudProvider
-                      } = useRestoreStore.getState();
-                      setRestorePassword("");
-                      setRestoreFile(null);
-                      setShowPassword(false);
-                      setSelectedCloudProvider(null);
-                      setUsePasskey(false);
-                      setError(null);
-                      setSuccess(null);
-                      setMethod(null);
-                      setPage("settings" /* SETTINGS */);
-                    },
-                    children: /* @__PURE__ */ jsx85(ArrowLeft13, { className: "h-4 w-4" })
-                  }
-                ),
-                /* @__PURE__ */ jsx85("span", { className: "text-xl font-semibold leading-8", children: t("passport:backupMenu.title") })
-              ] }),
-              /* @__PURE__ */ jsx85(
-                Switch,
-                {
-                  name: "advanced-restore-flow-toggle",
-                  labels: { checked: t("passport:common.standard"), unchecked: t("passport:common.advanced") },
-                  checked: currentBackupMethod !== "server",
-                  onChange: () => {
-                    const { setError, setRestorePassword, setRestoreFile, setMethod } = useRestoreStore.getState();
-                    if (!!error) setError(null);
-                    if (currentBackupMethod === "server") {
-                      setRestorePassword("");
-                      setMethod(null);
-                    } else {
-                      setRestoreFile(null);
-                      setMethod("server");
-                    }
-                  }
-                }
-              )
-            ]
-          }
-        ),
-        !isRecoveryLoading && !!hasRecoveryData2 && !currentBackupMethod && /* @__PURE__ */ jsx85(MethodSelector, { mode: "backup", serverRecoveryStatus }),
-        (!isRecoveryLoading || !hasServerVault) && !!currentBackupMethod && /* @__PURE__ */ jsx85(Fragment28, { children: /* @__PURE__ */ jsx85(
-          BackupComponent,
-          {
-            mode: "backup",
-            isLoading: isPasswordBackupCreating || isCloudBackupCreating || isLocalBackupCreating || isPasskeyCreating,
-            fileHandler: createLocalBackup,
-            serverHandler: createPasswordBackup,
-            cloudHandler: createCloudBackup,
-            createPasskeyHandler: createPasskey
-          }
-        ) }),
-        !isRecoveryLoading && !currentBackupMethod && !hasRecoveryData2 && /* @__PURE__ */ jsxs77(Highlight, { type: "warning", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx85(AlertCircle3, { className: "h-4 w-4 flex-shrink-0" }),
-          /* @__PURE__ */ jsx85("span", { className: "block flex-1 font-semibold", children: "No Backup Found" })
-        ] }),
-        error && /* @__PURE__ */ jsxs77(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx85(AlertCircle3, { className: "h-4 w-4 flex-shrink-0" }),
-          /* @__PURE__ */ jsx85("span", { className: "block w-full flex-1", children: error })
-        ] }),
-        success && /* @__PURE__ */ jsxs77(Highlight, { type: "success", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsxs77("div", { className: "w-full flex gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ jsx85(CheckCircle22, { className: "h-4 w-4 flex-shrink-0" }),
-            /* @__PURE__ */ jsx85("span", { className: "block w-full flex-1", children: success })
+  return /* @__PURE__ */ jsxs77(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    !!isRecoveryLoading && (hasServerVault || !currentBackupMethod) && /* @__PURE__ */ jsx85("div", { className: "w-full flex items-center justify-center p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ jsx85(Loader15, { className: "w-4 h-4 animate-spin" }) }),
+    (!isRecoveryLoading || !hasServerVault) && !hasRecoveryData2 && /* @__PURE__ */ jsxs77("div", { className: "flex items-center justify-center gap-2 px-5 py-[var(--ui-kit-pd)]", children: [
+      /* @__PURE__ */ jsx85(LockIcon, { className: "w-6 h-6" }),
+      /* @__PURE__ */ jsx85("span", { className: "font-bold text-xl leading-6", children: t("passport:backupMenu.title") })
+    ] }),
+    !isRecoveryLoading && !!hasRecoveryData2 && /* @__PURE__ */ jsxs77(
+      "div",
+      {
+        ref: (inst) => onboarder.registerElement("embarkai-keyshare-backup-advanced-onboarding" /* backupAdvanced */, inst),
+        className: "flex items-center justify-between gap-[var(--ui-kit-gap)]",
+        children: [
+          /* @__PURE__ */ jsxs77("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+            /* @__PURE__ */ jsx85(
+              Button,
+              {
+                variant: "ghost",
+                size: "icon",
+                title: "Back",
+                onClick: () => {
+                  const {
+                    setSuccess,
+                    setError,
+                    setRestorePassword,
+                    setRestoreFile,
+                    setShowPassword,
+                    setUsePasskey,
+                    setMethod,
+                    setSelectedCloudProvider
+                  } = useRestoreStore.getState();
+                  setRestorePassword("");
+                  setRestoreFile(null);
+                  setShowPassword(false);
+                  setSelectedCloudProvider(null);
+                  setUsePasskey(false);
+                  setError(null);
+                  setSuccess(null);
+                  setMethod(null);
+                  setPage("settings" /* SETTINGS */);
+                },
+                children: /* @__PURE__ */ jsx85(ArrowLeft13, { className: "h-4 w-4" })
+              }
+            ),
+            /* @__PURE__ */ jsx85("span", { className: "text-xl font-semibold leading-8", children: t("passport:backupMenu.title") })
           ] }),
           /* @__PURE__ */ jsx85(
-            Button,
+            Switch,
             {
-              variant: "default",
-              size: "large",
-              className: "w-full",
-              onClick: () => useRestoreStore.getState().setSuccess(null),
-              children: t("passport:common.continue")
+              name: "advanced-restore-flow-toggle",
+              labels: { checked: t("passport:common.standard"), unchecked: t("passport:common.advanced") },
+              checked: currentBackupMethod !== "server",
+              onChange: () => {
+                const { setError, setRestorePassword, setRestoreFile, setMethod } = useRestoreStore.getState();
+                if (!!error) setError(null);
+                if (currentBackupMethod === "server") {
+                  setRestorePassword("");
+                  setMethod(null);
+                } else {
+                  setRestoreFile(null);
+                  setMethod("server");
+                }
+              }
             }
           )
-        ] })
-      ] })
-    }
-  );
+        ]
+      }
+    ),
+    !isRecoveryLoading && !!hasRecoveryData2 && !currentBackupMethod && /* @__PURE__ */ jsx85(MethodSelector, { mode: "backup", serverRecoveryStatus }),
+    (!isRecoveryLoading || !hasServerVault) && !!currentBackupMethod && /* @__PURE__ */ jsx85(Fragment28, { children: /* @__PURE__ */ jsx85(
+      BackupComponent,
+      {
+        mode: "backup",
+        isLoading: isPasswordBackupCreating || isCloudBackupCreating || isLocalBackupCreating || isPasskeyCreating,
+        fileHandler: createLocalBackup,
+        serverHandler: createPasswordBackup,
+        cloudHandler: createCloudBackup,
+        createPasskeyHandler: createPasskey
+      }
+    ) }),
+    !isRecoveryLoading && !currentBackupMethod && !hasRecoveryData2 && /* @__PURE__ */ jsxs77(Highlight, { type: "warning", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx85(AlertCircle3, { className: "h-4 w-4 flex-shrink-0" }),
+      /* @__PURE__ */ jsx85("span", { className: "block flex-1 font-semibold", children: "No Backup Found" })
+    ] }),
+    error && /* @__PURE__ */ jsxs77(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx85(AlertCircle3, { className: "h-4 w-4 flex-shrink-0" }),
+      /* @__PURE__ */ jsx85("span", { className: "block w-full flex-1", children: error })
+    ] }),
+    success && /* @__PURE__ */ jsxs77(Highlight, { type: "success", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsxs77("div", { className: "w-full flex gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ jsx85(CheckCircle22, { className: "h-4 w-4 flex-shrink-0" }),
+        /* @__PURE__ */ jsx85("span", { className: "block w-full flex-1", children: success })
+      ] }),
+      /* @__PURE__ */ jsx85(
+        Button,
+        {
+          variant: "default",
+          size: "large",
+          className: "w-full",
+          onClick: () => useRestoreStore.getState().setSuccess(null),
+          children: t("passport:common.continue")
+        }
+      )
+    ] })
+  ] });
 }
 var COMPONENTS;
 var init_KeyshareBackupMenu = __esm({
@@ -20684,7 +20574,6 @@ var init_KeyshareBackupMenu = __esm({
     init_SessionContext();
     init_i18n();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_vaultClient();
     init_Expandable2();
     init_Onboarding();
@@ -20907,34 +20796,20 @@ import { ArrowLeft as ArrowLeft14 } from "lucide-react";
 import { jsx as jsx87, jsxs as jsxs79 } from "react/jsx-runtime";
 function KycMenu() {
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
-  return /* @__PURE__ */ jsxs79(
-    "div",
-    {
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "4px",
-        "paddingTop": "var(--ui-kit-pd)",
-        "paddingBottom": "var(--ui-kit-pd)",
-        "paddingLeft": "4px"
-      },
-      className: "list-scrollbar-y w-full flex flex-col gap-[var(--ui-kit-gap)]",
-      children: [
-        /* @__PURE__ */ jsxs79("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx87(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ jsx87(ArrowLeft14, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ jsx87("span", { className: "text-xl font-semibold", children: "KYC" })
-        ] }),
-        /* @__PURE__ */ jsx87(KycContent, {})
-      ]
-    }
-  );
+  return /* @__PURE__ */ jsxs79(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs79("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx87(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ jsx87(ArrowLeft14, { className: "h-4 w-4" }) }),
+      /* @__PURE__ */ jsx87("span", { className: "text-xl font-semibold", children: "KYC" })
+    ] }),
+    /* @__PURE__ */ jsx87(KycContent, {})
+  ] });
 }
 var KycContent;
 var init_KycMenu = __esm({
   "src/internal/components/KYC/KycMenu.tsx"() {
     init_ProviderContext();
     init_useLayoutDataStore();
-    init_useLayoutStore();
+    init_Expandable2();
     init_button();
     init_SumsubIframe();
     KycContent = () => {
@@ -21013,51 +20888,47 @@ import { jsx as jsx89, jsxs as jsxs81 } from "react/jsx-runtime";
 function LanguagesMenu() {
   const config = useProviderConfig().config;
   const { t, i18n } = useT();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const langOpenedFromMenu = useLayoutDataStore((st) => st.langOpenedFromMenu);
-  const setPage = useLayoutDataStore((st) => st.setPage);
   const languageList = getAvailableLanguages(config.current.translations);
-  return /* @__PURE__ */ jsx89(
-    "div",
-    {
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
+  return /* @__PURE__ */ jsxs81(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs81("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx89(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: "Back",
+          onClick: () => useLayoutDataStore.getState().setPage(langOpenedFromMenu),
+          children: /* @__PURE__ */ jsx89(ArrowLeft15, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx89("span", { className: "text-xl font-semibold", children: t("passport:common.language") })
+    ] }),
+    /* @__PURE__ */ jsx89("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] py-[var(--ui-kit-pd)]", children: languageList.map((langKey) => /* @__PURE__ */ jsxs81(
+      Button,
+      {
+        size: "large",
+        variant: i18n.resolvedLanguage === langKey ? "default" : "ghost",
+        className: "justify-between",
+        onClick: () => {
+          i18n.changeLanguage(langKey);
+          localStorage.setItem(LOCAL_STORAGE_I18N_KEY, langKey);
+          useLayoutDataStore.getState().setPage(langOpenedFromMenu);
+        },
+        children: [
+          /* @__PURE__ */ jsx89("span", { children: LANGUAGES[langKey]?.name }),
+          /* @__PURE__ */ jsx89("span", { className: "text-2xl leading-6", children: LANGUAGES[langKey]?.flags })
+        ]
       },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs81(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs81("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx89(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage(langOpenedFromMenu), children: /* @__PURE__ */ jsx89(ArrowLeft15, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ jsx89("span", { className: "text-xl font-semibold", children: t("passport:common.language") })
-        ] }),
-        /* @__PURE__ */ jsx89("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] py-[var(--ui-kit-pd)]", children: languageList.map((langKey) => /* @__PURE__ */ jsxs81(
-          Button,
-          {
-            size: "large",
-            variant: i18n.resolvedLanguage === langKey ? "default" : "ghost",
-            className: "justify-between",
-            onClick: () => {
-              i18n.changeLanguage(langKey);
-              localStorage.setItem(LOCAL_STORAGE_I18N_KEY, langKey);
-              setPage(langOpenedFromMenu);
-            },
-            children: [
-              /* @__PURE__ */ jsx89("span", { children: LANGUAGES[langKey]?.name }),
-              /* @__PURE__ */ jsx89("span", { className: "text-2xl leading-6", children: LANGUAGES[langKey]?.flags })
-            ]
-          },
-          langKey
-        )) })
-      ] })
-    }
-  );
+      langKey
+    )) })
+  ] });
 }
 var init_LanguagesMenu = __esm({
   "src/internal/components/LanguagesMenu/LanguagesMenu.tsx"() {
     init_ProviderContext();
     init_i18n();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
   }
@@ -21106,12 +20977,16 @@ import { jsx as jsx90, jsxs as jsxs82 } from "react/jsx-runtime";
 function MainMenu() {
   const address = useSession((st) => st.address);
   const { t } = useT();
-  const setPage = useLayoutDataStore((st) => st.setPage);
-  const setTransitionPageHeight = useLayoutDataStore((st) => st.setTransitionPageHeight);
-  useEffect34(() => setTransitionPageHeight(DEFAULT_MAIN_MENU_HEIGHT), []);
+  useEffect34(
+    () => (
+      // actual height measurement of the main menu on mount. prevents layout animations jumps
+      useLayoutDataStore.getState().setTransitionPageHeight(DEFAULT_MAIN_MENU_HEIGHT)
+    ),
+    []
+  );
   useOnboardingTourAvailable(true);
   useProvidersList();
-  return /* @__PURE__ */ jsx90("div", { className: "w-full p-[var(--ui-kit-pd)] flex flex-col gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ jsx90("div", { className: "w-full grid grid-cols-4 gap-0 md:gap-[var(--ui-kit-gap)] py-[10px] md:py-1", children: MAIN_MENU_BUTTONS.map(({ id, onboardingId, label, icon: Icon2 }) => /* @__PURE__ */ jsxs82(
+  return /* @__PURE__ */ jsx90(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ jsx90("div", { className: "w-full grid grid-cols-4 gap-0 md:gap-[var(--ui-kit-gap)] py-[10px] md:py-1", children: MAIN_MENU_BUTTONS.map(({ id, onboardingId, label, icon: Icon2 }) => /* @__PURE__ */ jsxs82(
     Button,
     {
       ref: (inst) => onboarder.registerElement(onboardingId, inst),
@@ -21119,7 +20994,7 @@ function MainMenu() {
       variant: "ghost",
       disabled: !address,
       className: "flex-col w-full h-fit p-0",
-      onClick: () => setPage(id),
+      onClick: () => useLayoutDataStore.getState().setPage(id),
       children: [
         /* @__PURE__ */ jsx90(Icon2, { className: "w-5 h-5 md:w-8 md:h-8" }),
         /* @__PURE__ */ jsx90("span", { className: "text-xs font-semibold", children: t(label) })
@@ -21135,6 +21010,7 @@ var init_MainMenu = __esm({
     init_useT();
     init_constants();
     init_useLayoutDataStore();
+    init_Expandable2();
     init_useProvidersList();
     init_Onboarding();
     init_button();
@@ -21504,20 +21380,6 @@ var init_NicknameEditForm = __esm({
   }
 });
 
-// src/internal/components/NicknameMenu/onboarding.setup.ts
-var NICKNAME_MENU_TOUR;
-var init_onboarding_setup6 = __esm({
-  "src/internal/components/NicknameMenu/onboarding.setup.ts"() {
-    NICKNAME_MENU_TOUR = [
-      {
-        elId: "embarkai-nickname-menu-onboarding" /* nicknameMenu */,
-        title: "passport:nicknameMenu.onboarding.nicknameMenu.title",
-        description: "passport:nicknameMenu.onboarding.nicknameMenu.description"
-      }
-    ];
-  }
-});
-
 // src/internal/components/NicknameMenu/NicknameMenu.tsx
 import { useQuery as useQuery14 } from "@tanstack/react-query";
 import dayjs4 from "dayjs";
@@ -21544,79 +21406,71 @@ function NicknameMenu() {
   });
   const resolvedError = nicknameError || nicknameInfoError?.message || null;
   useEffect37(() => () => useNicknameStore.getState().reset(), []);
-  return /* @__PURE__ */ jsx92(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("embarkai-nickname-menu-onboarding" /* nicknameMenu */, inst),
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ jsxs84(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ jsxs84("div", { className: "flex items-center gap-[var(--ui-kit-gap)] ", children: [
-          /* @__PURE__ */ jsx92(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: t("passport:common.back"),
-              onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
-              children: /* @__PURE__ */ jsx92(ArrowLeft16, { className: "h-4 w-4 flex-none" })
-            }
-          ),
-          /* @__PURE__ */ jsxs84("div", { className: "flex gap-[var(--ui-kit-gap)] items-center w-fit", children: [
-            /* @__PURE__ */ jsx92("span", { className: "text-xl font-semibold", children: t("passport:nicknameMenu.title") }),
-            isNicknameInfoLoading && /* @__PURE__ */ jsx92(Loader16, { className: "w-4 h-4 animate-spin" })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsx92(NicknameEditForm, { nicknameInfo, isInitialUser }),
-        !nicknameInfo?.canChange && nicknameInfo?.cooldownEndsAt && /* @__PURE__ */ jsx92(Highlight, { type: "info", children: t("passport:nicknameMenu.cooldownMessage", {
-          canChangeAt: dayjs4(nicknameInfo.cooldownEndsAt).format("MMM D, YYYY"),
-          days: String(getDaysRemaining(nicknameInfo.cooldownEndsAt))
-        }) }),
-        !nicknameSuccess && !!nicknameInfo && /* @__PURE__ */ jsxs84("div", { className: "flex items-center gap-[var(--ui-kit-gap)] justify-between text-[10px]", children: [
-          /* @__PURE__ */ jsxs84("span", { children: [
-            /* @__PURE__ */ jsx92("span", { className: "text-[var(--ui-kit-fg-muted)]", children: nicknameInfo.changedAt ? t("passport:nicknameMenu.lastChanged") : t("passport:common.created") }),
-            /* @__PURE__ */ jsx92("span", { children: ": " }),
-            /* @__PURE__ */ jsx92("strong", { className: "text-[var(--ui-kit-fg)]", children: dayjs4(nicknameInfo.changedAt || nicknameInfo.createdAt).format("MMM D, YYYY") })
-          ] }),
-          /* @__PURE__ */ jsxs84("span", { children: [
-            /* @__PURE__ */ jsx92("span", { className: "text-[var(--ui-kit-fg-muted)]", children: t("passport:nicknameMenu.timesChanged") }),
-            /* @__PURE__ */ jsx92("span", { children: ": " }),
-            /* @__PURE__ */ jsx92("strong", { className: "text-[var(--ui-kit-fg)]", children: nicknameInfo.changeCount })
-          ] })
-        ] }),
-        !!nicknameSuccess && /* @__PURE__ */ jsx92(Highlight, { type: "success", children: nicknameSuccess }),
-        isInitialUser && /* @__PURE__ */ jsxs84(Highlight, { type: "success", children: [
-          /* @__PURE__ */ jsx92("p", {
-            //@ts-expect-error i18n typings
-            children: t("passport:nicknameMenu.initialUser.welcome", {
-              nickname: nicknameInfo?.handle || "N/A"
-            })
-          }),
-          /* @__PURE__ */ jsx92("p", { children: t("passport:nicknameMenu.initialUser.message") }),
-          /* @__PURE__ */ jsxs84(
-            Button,
-            {
-              variant: "default",
-              size: "large",
-              title: t("passport:common.continue"),
-              onClick: () => {
-                const { openPostAuthNavigation, setPage } = useLayoutDataStore.getState();
-                if (!openPostAuthNavigation()) setPage(null);
-              },
-              className: "w-full",
-              children: [
-                t("passport:common.continue"),
-                " (",
-                nicknameInfo?.handle,
-                ")"
-              ]
-            }
-          )
-        ] }),
-        !!resolvedError?.length && /* @__PURE__ */ jsx92(Highlight, { type: "error", children: resolvedError })
+  return /* @__PURE__ */ jsxs84(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs84("div", { className: "flex items-center gap-[var(--ui-kit-gap)] ", children: [
+      /* @__PURE__ */ jsx92(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: t("passport:common.back"),
+          onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
+          children: /* @__PURE__ */ jsx92(ArrowLeft16, { className: "h-4 w-4 flex-none" })
+        }
+      ),
+      /* @__PURE__ */ jsxs84("div", { className: "flex gap-[var(--ui-kit-gap)] items-center w-fit", children: [
+        /* @__PURE__ */ jsx92("span", { className: "text-xl font-semibold", children: t("passport:nicknameMenu.title") }),
+        isNicknameInfoLoading && /* @__PURE__ */ jsx92(Loader16, { className: "w-4 h-4 animate-spin" })
       ] })
-    }
-  );
+    ] }),
+    /* @__PURE__ */ jsx92(NicknameEditForm, { nicknameInfo, isInitialUser }),
+    !nicknameInfo?.canChange && nicknameInfo?.cooldownEndsAt && /* @__PURE__ */ jsx92(Highlight, { type: "info", children: t("passport:nicknameMenu.cooldownMessage", {
+      canChangeAt: dayjs4(nicknameInfo.cooldownEndsAt).format("MMM D, YYYY"),
+      days: String(getDaysRemaining(nicknameInfo.cooldownEndsAt))
+    }) }),
+    !nicknameSuccess && !!nicknameInfo && /* @__PURE__ */ jsxs84("div", { className: "flex items-center gap-[var(--ui-kit-gap)] justify-between text-[10px]", children: [
+      /* @__PURE__ */ jsxs84("span", { children: [
+        /* @__PURE__ */ jsx92("span", { className: "text-[var(--ui-kit-fg-muted)]", children: nicknameInfo.changedAt ? t("passport:nicknameMenu.lastChanged") : t("passport:common.created") }),
+        /* @__PURE__ */ jsx92("span", { children: ": " }),
+        /* @__PURE__ */ jsx92("strong", { className: "text-[var(--ui-kit-fg)]", children: dayjs4(nicknameInfo.changedAt || nicknameInfo.createdAt).format("MMM D, YYYY") })
+      ] }),
+      /* @__PURE__ */ jsxs84("span", { children: [
+        /* @__PURE__ */ jsx92("span", { className: "text-[var(--ui-kit-fg-muted)]", children: t("passport:nicknameMenu.timesChanged") }),
+        /* @__PURE__ */ jsx92("span", { children: ": " }),
+        /* @__PURE__ */ jsx92("strong", { className: "text-[var(--ui-kit-fg)]", children: nicknameInfo.changeCount })
+      ] })
+    ] }),
+    !!nicknameSuccess && /* @__PURE__ */ jsx92(Highlight, { type: "success", children: nicknameSuccess }),
+    isInitialUser && /* @__PURE__ */ jsxs84(Highlight, { type: "success", children: [
+      /* @__PURE__ */ jsx92("p", {
+        //@ts-expect-error i18n typings
+        children: t("passport:nicknameMenu.initialUser.welcome", {
+          nickname: nicknameInfo?.handle || "N/A"
+        })
+      }),
+      /* @__PURE__ */ jsx92("p", { children: t("passport:nicknameMenu.initialUser.message") }),
+      /* @__PURE__ */ jsxs84(
+        Button,
+        {
+          variant: "default",
+          size: "large",
+          title: t("passport:common.continue"),
+          onClick: () => {
+            const { openPostAuthNavigation, setPage } = useLayoutDataStore.getState();
+            if (!openPostAuthNavigation()) setPage(null);
+          },
+          className: "w-full",
+          children: [
+            t("passport:common.continue"),
+            " (",
+            nicknameInfo?.handle,
+            ")"
+          ]
+        }
+      )
+    ] }),
+    !!resolvedError?.length && /* @__PURE__ */ jsx92(Highlight, { type: "error", children: resolvedError })
+  ] });
 }
 var init_NicknameMenu = __esm({
   "src/internal/components/NicknameMenu/NicknameMenu.tsx"() {
@@ -21637,6 +21491,21 @@ var init_NicknameMenu = __esm({
   }
 });
 
+// src/internal/components/NicknameMenu/onboarding.setup.ts
+var NICKNAME_MENU_TOUR;
+var init_onboarding_setup6 = __esm({
+  "src/internal/components/NicknameMenu/onboarding.setup.ts"() {
+    init_constants();
+    NICKNAME_MENU_TOUR = [
+      {
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"nickname-settings" /* NICKNAME_SETTINGS */}`,
+        title: "passport:nicknameMenu.onboarding.nicknameMenu.title",
+        description: "passport:nicknameMenu.onboarding.nicknameMenu.description"
+      }
+    ];
+  }
+});
+
 // src/internal/components/NicknameMenu/index.ts
 var init_NicknameMenu2 = __esm({
   "src/internal/components/NicknameMenu/index.ts"() {
@@ -22542,7 +22411,6 @@ function PortfolioMenu() {
   const { t } = useT();
   const qc = useQueryClient21();
   const address = useSession((st) => st.address);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const {
     assets: blockscoutAssets,
     refreshBalances: refreshBlockscoutBalances,
@@ -22559,57 +22427,47 @@ function PortfolioMenu() {
     Promise.all(shownProjectAssets.map((asset) => qc.invalidateQueries({ queryKey: asset.balanceQueryKey })));
     refreshBlockscoutBalances();
   }, [qc, shownProjectAssets, refreshBlockscoutBalances]);
-  return /* @__PURE__ */ jsx95(
-    "div",
-    {
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
+  return /* @__PURE__ */ jsxs87(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs87("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx95(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: "Back",
+          onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
+          children: /* @__PURE__ */ jsx95(ArrowLeft17, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx95("span", { className: "text-xl font-semibold", children: t("passport:portfolioMenu.title") }),
+      /* @__PURE__ */ jsx95(
+        Button,
+        {
+          title: "Refresh balances",
+          variant: "ghost",
+          size: "icon",
+          onClick: refreshAllAssetsBalances,
+          disabled: isBlockscoutLoading || isBlockscoutFetching,
+          children: isBlockscoutLoading || isBlockscoutFetching ? /* @__PURE__ */ jsx95(Loader17, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ jsx95(RefreshCw2, { className: "h-4 w-4" })
+        }
+      )
+    ] }),
+    isBlockscoutLoading && /* @__PURE__ */ jsx95("div", { className: "w-full flex items-center justify-center gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ jsx95(Loader17, { className: "w-4 h-4 animate-spin" }) }),
+    !isBlockscoutLoading && blockscoutAssets?.length === 0 && /* @__PURE__ */ jsxs87(Highlight, { type: "info", className: "flex flex-col items-center justify-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx95(Gem, { className: "w-8 h-8" }),
+      /* @__PURE__ */ jsx95("span", { className: "block", children: t("passport:portfolioMenu.noAssets") })
+    ] }),
+    !isBlockscoutLoading && shownProjectAssets?.map((asset, index) => /* @__PURE__ */ jsx95(PortfolioItem, { isProjectAsset: true, address, asset }, `project-${asset.symbol}-${index}`)),
+    !isBlockscoutLoading && blockscoutAssets?.length > 0 && blockscoutAssets.map((asset, index) => /* @__PURE__ */ jsx95(
+      PortfolioItem,
+      {
+        address,
+        asset
       },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs87(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs87("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx95(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: "Back",
-              onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
-              children: /* @__PURE__ */ jsx95(ArrowLeft17, { className: "h-4 w-4" })
-            }
-          ),
-          /* @__PURE__ */ jsx95("span", { className: "text-xl font-semibold", children: t("passport:portfolioMenu.title") }),
-          /* @__PURE__ */ jsx95(
-            Button,
-            {
-              title: "Refresh balances",
-              variant: "ghost",
-              size: "icon",
-              onClick: refreshAllAssetsBalances,
-              disabled: isBlockscoutLoading || isBlockscoutFetching,
-              children: isBlockscoutLoading || isBlockscoutFetching ? /* @__PURE__ */ jsx95(Loader17, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ jsx95(RefreshCw2, { className: "h-4 w-4" })
-            }
-          )
-        ] }),
-        isBlockscoutLoading && /* @__PURE__ */ jsx95("div", { className: "w-full flex items-center justify-center gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ jsx95(Loader17, { className: "w-4 h-4 animate-spin" }) }),
-        !isBlockscoutLoading && blockscoutAssets?.length === 0 && /* @__PURE__ */ jsxs87(Highlight, { type: "info", className: "flex flex-col items-center justify-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx95(Gem, { className: "w-8 h-8" }),
-          /* @__PURE__ */ jsx95("span", { className: "block", children: t("passport:portfolioMenu.noAssets") })
-        ] }),
-        !isBlockscoutLoading && shownProjectAssets?.map((asset, index) => /* @__PURE__ */ jsx95(PortfolioItem, { isProjectAsset: true, address, asset }, `project-${asset.symbol}-${index}`)),
-        !isBlockscoutLoading && blockscoutAssets?.length > 0 && blockscoutAssets.map((asset, index) => /* @__PURE__ */ jsx95(
-          PortfolioItem,
-          {
-            address,
-            asset
-          },
-          `${asset.type}-${asset.address || "native"}-${asset.tokenId || index}`
-        )),
-        blockscoutError && /* @__PURE__ */ jsx95(Highlight, { type: "error", children: blockscoutError?.message })
-      ] })
-    }
-  );
+      `${asset.type}-${asset.address || "native"}-${asset.tokenId || index}`
+    )),
+    blockscoutError && /* @__PURE__ */ jsx95(Highlight, { type: "error", children: blockscoutError?.message })
+  ] });
 }
 var init_PortfolioMenu = __esm({
   "src/internal/components/PortfolioMenu/PortfolioMenu.tsx"() {
@@ -22618,7 +22476,6 @@ var init_PortfolioMenu = __esm({
     init_i18n();
     init_useBlockscoutAssets2();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
     init_highlight();
@@ -22713,21 +22570,6 @@ var init_nickname_fingerprint = __esm({
   }
 });
 
-// src/internal/components/ReceiveMenu/onboarding.setup.ts
-var RECEIVE_MENU_ONBOARDING_ID, RECEIVE_MENU_TOUR;
-var init_onboarding_setup7 = __esm({
-  "src/internal/components/ReceiveMenu/onboarding.setup.ts"() {
-    RECEIVE_MENU_ONBOARDING_ID = "embarkai-receive-menu-onboarding";
-    RECEIVE_MENU_TOUR = [
-      {
-        elId: RECEIVE_MENU_ONBOARDING_ID,
-        title: "passport:receiveMenu.onboarding.receiveMenu.title",
-        description: "passport:receiveMenu.onboarding.receiveMenu.description"
-      }
-    ];
-  }
-});
-
 // src/internal/components/ReceiveMenu/ReceiveMenu.tsx
 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";
@@ -22745,7 +22587,6 @@ function ReceiveMenu() {
     queryKey: [QUERY_KEYS.nicknameInfo, address],
     queryFn: async () => await getNicknameInfo()
   });
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const [qrCodeUrl, setQrCodeUrl] = useState23("");
   const [isAddressCopied, setAddressCopied] = useState23(false);
   const [isNicknameCopied, setNicknameCopied] = useState23(false);
@@ -22767,107 +22608,96 @@ function ReceiveMenu() {
       color: { dark: "#000000", light: "#ffffff" }
     }).then((url) => setQrCodeUrl(url)).catch((err) => console.error("Failed to generate QR code:", err));
   }, [address]);
-  return /* @__PURE__ */ jsxs88(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement(RECEIVE_MENU_ONBOARDING_ID, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)] flex flex-col gap-[var(--ui-kit-gap)]",
-      children: [
-        /* @__PURE__ */ jsxs88("div", { className: "w-full flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx96(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: "Back",
-              onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
-              children: /* @__PURE__ */ jsx96(ArrowLeft18, { className: "h-4 w-4" })
-            }
-          ),
-          /* @__PURE__ */ jsx96("span", { className: "text-xl font-semibold", children: t("passport:receiveMenu.title") })
-        ] }),
-        /* @__PURE__ */ jsx96("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.scanQR") }),
-        /* @__PURE__ */ jsxs88(Highlight, { className: "text-center", type: "warning", children: [
-          /* @__PURE__ */ jsx96("strong", { className: "block w-full", children: `${t("passport:common.network")}: ${chainConfig.name}` }),
-          /* @__PURE__ */ jsx96("span", { className: "block w-full", children: t("passport:receiveMenu.warning") })
-        ] }),
-        /* @__PURE__ */ jsx96("div", { className: "flex items-center justify-center p-[var(--ui-kit-pd)]", style: { minHeight: "216px" }, children: qrCodeUrl && /* @__PURE__ */ jsx96("img", { src: qrCodeUrl, alt: "Wallet QR Code", className: "w-48 h-48" }) }),
-        /* @__PURE__ */ jsx96("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.address") }),
-        /* @__PURE__ */ jsxs88(
-          Button,
-          {
-            title: "Copy address",
-            variant: "secondary",
-            size: "medium",
-            className: "w-full",
-            onClick: () => {
-              if (!address) return;
-              navigator.clipboard.writeText(address);
-              setAddressCopied(true);
-              setTimeout(() => setAddressCopied(false), 2e3);
-            },
-            children: [
-              /* @__PURE__ */ jsx96(Wallet2Icon3, { className: "h-4 w-4 flex-none" }),
-              /* @__PURE__ */ jsxs88("span", { className: cn2("text-[10px] flex-1 block", { "text-[var(--ui-kit-bg-success)]": isAddressCopied }), children: [
-                address.slice(0, 10),
-                "...",
-                address.slice(-6)
-              ] }),
-              isAddressCopied ? /* @__PURE__ */ jsx96(CheckCircle23, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ jsx96(Copy2, { className: "h-4 w-4 flex-none" })
-            ]
-          }
-        ),
-        /* @__PURE__ */ jsx96("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.nickname") }),
-        /* @__PURE__ */ jsx96(
-          Button,
-          {
-            title: "Copy nickname",
-            variant: "secondary",
-            size: "medium",
-            className: "w-full",
-            onClick: () => {
-              const nickname = nicknameInfo.handle;
-              navigator.clipboard.writeText(nickname);
-              setNicknameCopied(true);
-              setTimeout(() => setNicknameCopied(false), 2e3);
-            },
-            children: isNicknameInfoLoading ? /* @__PURE__ */ jsx96("div", { className: "flex-1", children: /* @__PURE__ */ jsx96(LoaderIcon12, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ jsxs88(Fragment32, { children: [
-              /* @__PURE__ */ jsx96(AtSignIcon2, { className: "h-4 w-4 flex-none" }),
-              /* @__PURE__ */ jsx96("span", { className: cn2("text-xs flex-1", { "text-[var(--ui-kit-bg-success)]": isNicknameCopied }), children: nicknameInfo.handle }),
-              isNicknameCopied ? /* @__PURE__ */ jsx96(CheckCircle23, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ jsx96(Copy2, { className: "h-4 w-4 flex-none" })
-            ] })
-          }
-        ),
-        fingerprint && /* @__PURE__ */ jsxs88(Fragment32, { children: [
-          /* @__PURE__ */ jsx96("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.identity") }),
-          /* @__PURE__ */ jsxs88(
-            Button,
-            {
-              title: "Copy fingerprint",
-              variant: "secondary",
-              size: "medium",
-              className: "w-full justify-between",
-              onClick: () => {
-                if (!fingerprint) return;
-                navigator.clipboard.writeText(fingerprint);
-                setFingerprintCopied(true);
-                setTimeout(() => setFingerprintCopied(false), 2e3);
-              },
-              children: [
-                /* @__PURE__ */ jsx96(FingerprintIcon, { className: "w-4 h-4 flex-none" }),
-                /* @__PURE__ */ jsx96("span", { className: cn2("text-xs font-bold flex-1", { "text-[var(--ui-kit-bg-success)]": fingerprintCopied }), children: fingerprint }),
-                fingerprintCopied ? /* @__PURE__ */ jsx96(CheckCircle23, { className: "w-4 h-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ jsx96(Copy2, { className: "w-4 h-4 flex-none" })
-              ]
-            }
-          )
+  return /* @__PURE__ */ jsxs88(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs88("div", { className: "w-full flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx96(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: "Back",
+          onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
+          children: /* @__PURE__ */ jsx96(ArrowLeft18, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx96("span", { className: "text-xl font-semibold", children: t("passport:receiveMenu.title") })
+    ] }),
+    /* @__PURE__ */ jsx96("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.scanQR") }),
+    /* @__PURE__ */ jsxs88(Highlight, { className: "text-center", type: "warning", children: [
+      /* @__PURE__ */ jsx96("strong", { className: "block w-full", children: `${t("passport:common.network")}: ${chainConfig.name}` }),
+      /* @__PURE__ */ jsx96("span", { className: "block w-full", children: t("passport:receiveMenu.warning") })
+    ] }),
+    /* @__PURE__ */ jsx96("div", { className: "flex items-center justify-center p-[var(--ui-kit-pd)]", style: { minHeight: "216px" }, children: qrCodeUrl && /* @__PURE__ */ jsx96("img", { src: qrCodeUrl, alt: "Wallet QR Code", className: "w-48 h-48" }) }),
+    /* @__PURE__ */ jsx96("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.address") }),
+    /* @__PURE__ */ jsxs88(
+      Button,
+      {
+        title: "Copy address",
+        variant: "secondary",
+        size: "medium",
+        className: "w-full",
+        onClick: () => {
+          if (!address) return;
+          navigator.clipboard.writeText(address);
+          setAddressCopied(true);
+          setTimeout(() => setAddressCopied(false), 2e3);
+        },
+        children: [
+          /* @__PURE__ */ jsx96(Wallet2Icon3, { className: "h-4 w-4 flex-none" }),
+          /* @__PURE__ */ jsxs88("span", { className: cn2("text-[10px] flex-1 block", { "text-[var(--ui-kit-bg-success)]": isAddressCopied }), children: [
+            address.slice(0, 10),
+            "...",
+            address.slice(-6)
+          ] }),
+          isAddressCopied ? /* @__PURE__ */ jsx96(CheckCircle23, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ jsx96(Copy2, { className: "h-4 w-4 flex-none" })
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsx96("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.nickname") }),
+    /* @__PURE__ */ jsx96(
+      Button,
+      {
+        title: "Copy nickname",
+        variant: "secondary",
+        size: "medium",
+        className: "w-full",
+        onClick: () => {
+          const nickname = nicknameInfo.handle;
+          navigator.clipboard.writeText(nickname);
+          setNicknameCopied(true);
+          setTimeout(() => setNicknameCopied(false), 2e3);
+        },
+        children: isNicknameInfoLoading ? /* @__PURE__ */ jsx96("div", { className: "flex-1", children: /* @__PURE__ */ jsx96(LoaderIcon12, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ jsxs88(Fragment32, { children: [
+          /* @__PURE__ */ jsx96(AtSignIcon2, { className: "h-4 w-4 flex-none" }),
+          /* @__PURE__ */ jsx96("span", { className: cn2("text-xs flex-1", { "text-[var(--ui-kit-bg-success)]": isNicknameCopied }), children: nicknameInfo.handle }),
+          isNicknameCopied ? /* @__PURE__ */ jsx96(CheckCircle23, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ jsx96(Copy2, { className: "h-4 w-4 flex-none" })
         ] })
-      ]
-    }
-  );
+      }
+    ),
+    fingerprint && /* @__PURE__ */ jsxs88(Fragment32, { children: [
+      /* @__PURE__ */ jsx96("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.identity") }),
+      /* @__PURE__ */ jsxs88(
+        Button,
+        {
+          title: "Copy fingerprint",
+          variant: "secondary",
+          size: "medium",
+          className: "w-full justify-between",
+          onClick: () => {
+            if (!fingerprint) return;
+            navigator.clipboard.writeText(fingerprint);
+            setFingerprintCopied(true);
+            setTimeout(() => setFingerprintCopied(false), 2e3);
+          },
+          children: [
+            /* @__PURE__ */ jsx96(FingerprintIcon, { className: "w-4 h-4 flex-none" }),
+            /* @__PURE__ */ jsx96("span", { className: cn2("text-xs font-bold flex-1", { "text-[var(--ui-kit-bg-success)]": fingerprintCopied }), children: fingerprint }),
+            fingerprintCopied ? /* @__PURE__ */ jsx96(CheckCircle23, { className: "w-4 h-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ jsx96(Copy2, { className: "w-4 h-4 flex-none" })
+          ]
+        }
+      )
+    ] })
+  ] });
 }
 var init_ReceiveMenu = __esm({
   "src/internal/components/ReceiveMenu/ReceiveMenu.tsx"() {
@@ -22876,13 +22706,27 @@ var init_ReceiveMenu = __esm({
     init_nickname();
     init_profile();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_nickname_fingerprint();
     init_utils();
+    init_Expandable2();
     init_Onboarding();
     init_button();
     init_highlight();
-    init_onboarding_setup7();
+  }
+});
+
+// src/internal/components/ReceiveMenu/onboarding.setup.ts
+var RECEIVE_MENU_TOUR;
+var init_onboarding_setup7 = __esm({
+  "src/internal/components/ReceiveMenu/onboarding.setup.ts"() {
+    init_constants();
+    RECEIVE_MENU_TOUR = [
+      {
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"receive" /* RECEIVE */}`,
+        title: "passport:receiveMenu.onboarding.receiveMenu.title",
+        description: "passport:receiveMenu.onboarding.receiveMenu.description"
+      }
+    ];
   }
 });
 
@@ -22898,9 +22742,10 @@ var init_ReceiveMenu2 = __esm({
 var SECURITY_MENU_TOUR;
 var init_onboarding_setup8 = __esm({
   "src/internal/components/SecurityMenu/onboarding.setup.ts"() {
+    init_constants();
     SECURITY_MENU_TOUR = [
       {
-        elId: "embarkai-security-menu-onboarding" /* securityMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"security" /* SECURITY */}`,
         title: "passport:securityMenu.onboarding.securityMenu.title",
         description: "passport:securityMenu.onboarding.securityMenu.description"
       },
@@ -23513,53 +23358,40 @@ import { ArrowLeft as ArrowLeft19 } from "lucide-react";
 import { Fragment as Fragment36, jsx as jsx102, jsxs as jsxs94 } from "react/jsx-runtime";
 function SecurityMenu() {
   const { t } = useT();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const appToUntrust = useSecurityStore((st) => st.appToUntrust);
   useOnboardingTourAvailable(!appToUntrust);
-  return /* @__PURE__ */ jsx102(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("embarkai-security-menu-onboarding" /* securityMenu */, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs94(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs94("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx102(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: t("passport:common.back"),
-              onClick: () => {
-                const { appToUntrust: appToUntrust2, untrustApp } = useSecurityStore.getState();
-                if (!!appToUntrust2) {
-                  untrustApp(null);
-                } else {
-                  useLayoutDataStore.getState().setPage("settings" /* SETTINGS */);
-                }
-              },
-              children: /* @__PURE__ */ jsx102(ArrowLeft19, { className: "h-4 w-4" })
+  return /* @__PURE__ */ jsxs94(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs94("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx102(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: t("passport:common.back"),
+          onClick: () => {
+            const { appToUntrust: appToUntrust2, untrustApp } = useSecurityStore.getState();
+            if (!!appToUntrust2) {
+              untrustApp(null);
+            } else {
+              useLayoutDataStore.getState().setPage("settings" /* SETTINGS */);
             }
-          ),
-          /* @__PURE__ */ jsx102("span", { className: "text-xl font-semibold", children: t("passport:securityMenu.title") })
-        ] }),
-        appToUntrust && /* @__PURE__ */ jsx102(UntrustApplication, {}),
-        !appToUntrust && /* @__PURE__ */ jsxs94(Fragment36, { children: [
-          /* @__PURE__ */ jsx102(Keyshare, {}),
-          /* @__PURE__ */ jsx102(ConnectedApps, {})
-        ] })
-      ] })
-    }
-  );
+          },
+          children: /* @__PURE__ */ jsx102(ArrowLeft19, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx102("span", { className: "text-xl font-semibold", children: t("passport:securityMenu.title") })
+    ] }),
+    appToUntrust && /* @__PURE__ */ jsx102(UntrustApplication, {}),
+    !appToUntrust && /* @__PURE__ */ jsxs94(Fragment36, { children: [
+      /* @__PURE__ */ jsx102(Keyshare, {}),
+      /* @__PURE__ */ jsx102(ConnectedApps, {})
+    ] })
+  ] });
 }
 var init_SecurityMenu = __esm({
   "src/internal/components/SecurityMenu/SecurityMenu.tsx"() {
     init_i18n();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -24609,6 +24441,7 @@ var init_useSendStore = __esm({
 var TOUR_SEND_ASSET, TOUR_BRIDGE_QUOTE, SEND_MENU_TOUR, BRIDGE_MENU_TOUR;
 var init_onboarding_setup9 = __esm({
   "src/internal/components/SendMenu/onboarding.setup.ts"() {
+    init_constants();
     init_useBridgeStore();
     init_useSendStore();
     TOUR_SEND_ASSET = {
@@ -24628,7 +24461,7 @@ var init_onboarding_setup9 = __esm({
     };
     SEND_MENU_TOUR = [
       {
-        elId: "sendmenu-page" /* sendMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"send" /* SEND */}`,
         title: "passport:sendMenu.onboarding.sendMenu.title",
         description: "passport:sendMenu.onboarding.sendMenu.description",
         waitSecs: 4,
@@ -24657,7 +24490,7 @@ var init_onboarding_setup9 = __esm({
     ];
     BRIDGE_MENU_TOUR = [
       {
-        elId: "sendmenu-page" /* sendMenu */,
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"send" /* SEND */}`,
         title: "passport:bridgeMenu.onboarding.bridgeMenu.title",
         description: "passport:bridgeMenu.onboarding.bridgeMenu.description",
         waitSecs: 5
@@ -27306,7 +27139,6 @@ function SendFlowSelector() {
   const { t } = useT();
   const { config } = useProviderConfig();
   useSendMenuParams();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const selectorFlow = useFlowSelectorStore((st) => st.flow);
   const menuTitle = useFlowSelectorStore((st) => st.menuTitle);
   const isUiLocked = useFlowSelectorStore((st) => st.isUiLocked);
@@ -27331,81 +27163,69 @@ function SendFlowSelector() {
   }, []);
   const isSendFlowInitialState = selectorFlow === "send" && sendStep === "input" || selectorFlow === "bridge" && bridgeStep === "select";
   const isFlowSelectorButtonsShown = !!config?.current?.features?.showAssetBridge && isSendFlowInitialState;
-  return /* @__PURE__ */ jsx120(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("sendmenu-page" /* sendMenu */, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
-      },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs109(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs109("div", { className: "flex items-center justify-between", children: [
-          /* @__PURE__ */ jsxs109("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ jsx120(
-              Button,
-              {
-                variant: "ghost",
-                size: "icon",
-                disabled: isUiLocked,
-                onClick: () => {
-                  useFlowSelectorStore.getState().setError(null);
-                  const { setPage } = useLayoutDataStore.getState();
-                  if (selectorFlow === "bridge") {
-                    const { bridgeStep: bridgeStep2, setBridgeStep } = useBridgeStore.getState();
-                    switch (bridgeStep2) {
-                      case "select":
-                        return setPage("main-menu" /* MAIN_MENU */);
-                      // case ''
-                      case "tx-history-details":
-                        return setBridgeStep("tx-history");
-                      default:
-                        return setBridgeStep("select");
-                    }
-                  }
-                  if (selectorFlow === "send") {
-                    const { txStep, setTxStep } = useSendStore.getState();
-                    switch (txStep) {
-                      case "input":
-                        return setPage("main-menu" /* MAIN_MENU */);
-                      default:
-                        return setTxStep("input");
-                    }
-                  }
-                },
-                children: /* @__PURE__ */ jsx120(ArrowLeft20, { className: "h-4 w-4" })
+  return /* @__PURE__ */ jsxs109(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs109("div", { className: "flex items-center justify-between", children: [
+      /* @__PURE__ */ jsxs109("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ jsx120(
+          Button,
+          {
+            variant: "ghost",
+            size: "icon",
+            disabled: isUiLocked,
+            onClick: () => {
+              useFlowSelectorStore.getState().setError(null);
+              const { setPage } = useLayoutDataStore.getState();
+              if (selectorFlow === "bridge") {
+                const { bridgeStep: bridgeStep2, setBridgeStep } = useBridgeStore.getState();
+                switch (bridgeStep2) {
+                  case "select":
+                    return setPage("main-menu" /* MAIN_MENU */);
+                  // case ''
+                  case "tx-history-details":
+                    return setBridgeStep("tx-history");
+                  default:
+                    return setBridgeStep("select");
+                }
               }
-            ),
-            /* @__PURE__ */ jsx120("span", { className: "text-xl font-semibold", children: menuTitle })
-          ] }),
-          /* @__PURE__ */ jsx120("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ jsx120(BridgeHistorySwitch, {}) })
-        ] }),
-        isFlowSelectorButtonsShown && /* @__PURE__ */ jsx120(SelectorFlowButtons, {}),
-        availableFlows[selectorFlow],
-        sendOrBridgeError && /* @__PURE__ */ jsxs109(Highlight, { type: "error", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx120("span", { children: sendOrBridgeError }),
-          /* @__PURE__ */ jsx120(
-            Button,
-            {
-              variant: "default",
-              size: "medium",
-              className: "w-full",
-              onClick: () => useFlowSelectorStore.getState().setError(null),
-              children: t("passport:common.hide")
-            }
-          )
-        ] })
-      ] })
-    }
-  );
+              if (selectorFlow === "send") {
+                const { txStep, setTxStep } = useSendStore.getState();
+                switch (txStep) {
+                  case "input":
+                    return setPage("main-menu" /* MAIN_MENU */);
+                  default:
+                    return setTxStep("input");
+                }
+              }
+            },
+            children: /* @__PURE__ */ jsx120(ArrowLeft20, { className: "h-4 w-4" })
+          }
+        ),
+        /* @__PURE__ */ jsx120("span", { className: "text-xl font-semibold", children: menuTitle })
+      ] }),
+      /* @__PURE__ */ jsx120("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ jsx120(BridgeHistorySwitch, {}) })
+    ] }),
+    isFlowSelectorButtonsShown && /* @__PURE__ */ jsx120(SelectorFlowButtons, {}),
+    availableFlows[selectorFlow],
+    sendOrBridgeError && /* @__PURE__ */ jsxs109(Highlight, { type: "error", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx120("span", { children: sendOrBridgeError }),
+      /* @__PURE__ */ jsx120(
+        Button,
+        {
+          variant: "default",
+          size: "medium",
+          className: "w-full",
+          onClick: () => useFlowSelectorStore.getState().setError(null),
+          children: t("passport:common.hide")
+        }
+      )
+    ] })
+  ] });
 }
 var init_SendFlowSelector = __esm({
   "src/internal/components/SendMenu/SendFlowSelector.tsx"() {
     init_ProviderContext();
     init_i18n();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_utils();
     init_Expandable2();
     init_Onboarding();
@@ -28085,20 +27905,6 @@ var init_api4 = __esm({
   }
 });
 
-// src/internal/components/TransactionsMenu/onboarding.setup.ts
-var TRANSACTIONS_MENU_TOUR;
-var init_onboarding_setup10 = __esm({
-  "src/internal/components/TransactionsMenu/onboarding.setup.ts"() {
-    TRANSACTIONS_MENU_TOUR = [
-      {
-        elId: "embarkai-transactions-menu-onboarding" /* transactionsMenu */,
-        title: "passport:transactionsMenu.onboarding.transactionsMenu.title",
-        description: "passport:transactionsMenu.onboarding.transactionsMenu.description"
-      }
-    ];
-  }
-});
-
 // src/internal/components/TransactionsMenu/utils.ts
 function formatIntl(price, fractionDigits) {
   const formatter = Intl.NumberFormat("en-US", {
@@ -28300,7 +28106,6 @@ function TransactionsMenu() {
   const { t } = useT();
   useOnboardingTourAvailable(true);
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const [expandedGroups, setExpandedGroups] = useState28({});
   const historySupported = isTransactionHistorySupported(chainConfig?.id);
   const {
@@ -28319,57 +28124,45 @@ function TransactionsMenu() {
     [qc, chainConfig.id, address]
   );
   const txHistoryResolvedError = txHistoryError ? txHistoryError instanceof Error ? txHistoryError.message : "Failed to load transactions" : null;
-  return /* @__PURE__ */ jsx122(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement("embarkai-transactions-menu-onboarding" /* transactionsMenu */, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
+  return /* @__PURE__ */ jsxs111(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs111("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx122(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ jsx122(ArrowLeft21, { className: "h-4 w-4" }) }),
+      /* @__PURE__ */ jsx122("span", { className: "text-xl font-semibold", children: t("passport:transactionsMenu.title") }),
+      historySupported && /* @__PURE__ */ jsx122(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          onClick: refreshTxHistory,
+          disabled: isTxHistoryFetching,
+          title: "Refresh transactions",
+          children: isTxHistoryFetching ? /* @__PURE__ */ jsx122(Loader28, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ jsx122(RefreshCw3, { className: "h-4 w-4" })
+        }
+      )
+    ] }),
+    !historySupported && /* @__PURE__ */ jsx122(Highlight, { type: "warning", children: /* @__PURE__ */ jsx122("span", { children: t("passport:transactionsMenu.comingSoon") }) }),
+    historySupported && isTxHistoryLoading && /* @__PURE__ */ jsx122("div", { className: "flex items-center justify-center p-8", children: /* @__PURE__ */ jsx122(Loader28, { className: "w-4 h-4 animate-spin" }) }),
+    historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length === 0 && /* @__PURE__ */ jsx122(Highlight, { type: "info", children: /* @__PURE__ */ jsx122("span", { children: t("passport:transactionsMenu.noTransactions") }) }),
+    historySupported && !isTxHistoryLoading && txHistoryResolvedError && /* @__PURE__ */ jsxs111(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx122(XCircle, { className: "w-4 h-4 flex-none" }),
+      /* @__PURE__ */ jsx122("span", { className: "block w-full flex-1 text-center text-xs", children: txHistoryResolvedError })
+    ] }),
+    historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length > 0 && /* @__PURE__ */ jsx122("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: txHistoryGroups.map((group) => /* @__PURE__ */ jsx122(
+      TransactionsGroup,
+      {
+        group,
+        expanded: expandedGroups[group.id] ?? false,
+        onToggleExpanded: (groupId) => setExpandedGroups((prev) => ({ ...prev, [groupId]: !prev[groupId] }))
       },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ jsxs111(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ jsxs111("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx122(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ jsx122(ArrowLeft21, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ jsx122("span", { className: "text-xl font-semibold", children: t("passport:transactionsMenu.title") }),
-          historySupported && /* @__PURE__ */ jsx122(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              onClick: refreshTxHistory,
-              disabled: isTxHistoryFetching,
-              title: "Refresh transactions",
-              children: isTxHistoryFetching ? /* @__PURE__ */ jsx122(Loader28, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ jsx122(RefreshCw3, { className: "h-4 w-4" })
-            }
-          )
-        ] }),
-        !historySupported && /* @__PURE__ */ jsx122(Highlight, { type: "warning", children: /* @__PURE__ */ jsx122("span", { children: t("passport:transactionsMenu.comingSoon") }) }),
-        historySupported && isTxHistoryLoading && /* @__PURE__ */ jsx122("div", { className: "flex items-center justify-center p-8", children: /* @__PURE__ */ jsx122(Loader28, { className: "w-4 h-4 animate-spin" }) }),
-        historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length === 0 && /* @__PURE__ */ jsx122(Highlight, { type: "info", children: /* @__PURE__ */ jsx122("span", { children: t("passport:transactionsMenu.noTransactions") }) }),
-        historySupported && !isTxHistoryLoading && txHistoryResolvedError && /* @__PURE__ */ jsxs111(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx122(XCircle, { className: "w-4 h-4 flex-none" }),
-          /* @__PURE__ */ jsx122("span", { className: "block w-full flex-1 text-center text-xs", children: txHistoryResolvedError })
-        ] }),
-        historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length > 0 && /* @__PURE__ */ jsx122("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: txHistoryGroups.map((group) => /* @__PURE__ */ jsx122(
-          TransactionsGroup,
-          {
-            group,
-            expanded: expandedGroups[group.id] ?? false,
-            onToggleExpanded: (groupId) => setExpandedGroups((prev) => ({ ...prev, [groupId]: !prev[groupId] }))
-          },
-          group.id
-        )) })
-      ] })
-    }
-  );
+      group.id
+    )) })
+  ] });
 }
 var init_TransactionsMenu = __esm({
   "src/internal/components/TransactionsMenu/TransactionsMenu.tsx"() {
     init_SessionContext();
     init_i18n();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -28380,6 +28173,21 @@ var init_TransactionsMenu = __esm({
   }
 });
 
+// src/internal/components/TransactionsMenu/onboarding.setup.ts
+var TRANSACTIONS_MENU_TOUR;
+var init_onboarding_setup10 = __esm({
+  "src/internal/components/TransactionsMenu/onboarding.setup.ts"() {
+    init_constants();
+    TRANSACTIONS_MENU_TOUR = [
+      {
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"transactions" /* TRANSACTIONS */}`,
+        title: "passport:transactionsMenu.onboarding.transactionsMenu.title",
+        description: "passport:transactionsMenu.onboarding.transactionsMenu.description"
+      }
+    ];
+  }
+});
+
 // src/internal/components/TransactionsMenu/index.ts
 var init_TransactionsMenu2 = __esm({
   "src/internal/components/TransactionsMenu/index.ts"() {
@@ -28407,21 +28215,6 @@ var init_constants8 = __esm({
   }
 });
 
-// src/internal/components/SettingsMenu/onboarding.setup.ts
-var SETTINGS_MENU_ONBOARDING_ID, SETTINGS_MENU_TOUR;
-var init_onboarding_setup11 = __esm({
-  "src/internal/components/SettingsMenu/onboarding.setup.ts"() {
-    SETTINGS_MENU_ONBOARDING_ID = "embarkai-settings-menu-onboarding";
-    SETTINGS_MENU_TOUR = [
-      {
-        elId: SETTINGS_MENU_ONBOARDING_ID,
-        title: "passport:common.onboarding.settingsMenu.title",
-        description: "passport:common.onboarding.settingsMenu.description"
-      }
-    ];
-  }
-});
-
 // src/internal/components/SettingsMenu/SettingsMenu.tsx
 import { useQuery as useQuery27 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft22, HardDrive as HardDrive3 } from "lucide-react";
@@ -28478,41 +28271,30 @@ function SettingsMenu() {
     queryFn: getNicknameInfo
   });
   const highlightedKeys = settingsNotifications.map((n) => n.target);
-  return /* @__PURE__ */ jsxs112(
-    "div",
-    {
-      ref: (inst) => onboarder.registerElement(SETTINGS_MENU_ONBOARDING_ID, inst),
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
+  return /* @__PURE__ */ jsxs112(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ jsxs112("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ jsx123(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ jsx123(ArrowLeft22, { className: "h-4 w-4" }) }),
+      /* @__PURE__ */ jsx123("span", { className: "text-xl font-semibold", children: t("passport:common.settings") })
+    ] }),
+    /* @__PURE__ */ jsx123("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: settingsButtons.map((el) => ({ ...el, onClick: () => setPage(el.id) })).map(({ id, name, Icon: Icon2, onClick }) => /* @__PURE__ */ jsxs112(
+      Button,
+      {
+        variant: "secondary",
+        size: "large",
+        onClick,
+        disabled: !address,
+        className: cn2(
+          "w-full items-center justify-start",
+          highlightedKeys.includes(id) && "animate-glow-warning"
+        ),
+        children: [
+          /* @__PURE__ */ jsx123(Icon2, { className: "w-4 h-4" }),
+          /* @__PURE__ */ jsx123("span", { children: t(name) })
+        ]
       },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)] flex flex-col gap-[var(--ui-kit-gap)]",
-      children: [
-        /* @__PURE__ */ jsxs112("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx123(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ jsx123(ArrowLeft22, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ jsx123("span", { className: "text-xl font-semibold", children: t("passport:common.settings") })
-        ] }),
-        /* @__PURE__ */ jsx123("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: settingsButtons.map((el) => ({ ...el, onClick: () => setPage(el.id) })).map(({ id, name, Icon: Icon2, onClick }) => /* @__PURE__ */ jsxs112(
-          Button,
-          {
-            variant: "secondary",
-            size: "large",
-            onClick,
-            disabled: !address,
-            className: cn2(
-              "w-full items-center justify-start",
-              highlightedKeys.includes(id) && "animate-glow-warning"
-            ),
-            children: [
-              /* @__PURE__ */ jsx123(Icon2, { className: "w-4 h-4" }),
-              /* @__PURE__ */ jsx123("span", { children: t(name) })
-            ]
-          },
-          id
-        )) })
-      ]
-    }
-  );
+      id
+    )) })
+  ] });
 }
 var init_SettingsMenu = __esm({
   "src/internal/components/SettingsMenu/SettingsMenu.tsx"() {
@@ -28525,12 +28307,27 @@ var init_SettingsMenu = __esm({
     init_useLayoutStore();
     init_pro_mode();
     init_utils();
+    init_Expandable2();
     init_useProvidersList();
     init_Onboarding();
     init_TransactionsMenu2();
     init_button();
     init_constants8();
-    init_onboarding_setup11();
+  }
+});
+
+// src/internal/components/SettingsMenu/onboarding.setup.ts
+var SETTINGS_MENU_TOUR;
+var init_onboarding_setup11 = __esm({
+  "src/internal/components/SettingsMenu/onboarding.setup.ts"() {
+    init_constants();
+    SETTINGS_MENU_TOUR = [
+      {
+        elId: `${EMBARKAI_DIALOG_ONBOARDING_ID}-${"settings" /* SETTINGS */}`,
+        title: "passport:common.onboarding.settingsMenu.title",
+        description: "passport:common.onboarding.settingsMenu.description"
+      }
+    ];
   }
 });
 
@@ -28756,35 +28553,25 @@ import { useCallback as useCallback31, useEffect as useEffect50 } from "react";
 import { jsx as jsx125 } from "react/jsx-runtime";
 function usePageMapper() {
   const page = useLayoutDataStore((st) => st.page);
-  const {
-    setDialogTitle,
-    setDialogDescription,
-    setIsDialogForced,
-    setDialogContent,
-    setIsDialogOpen,
-    setIsDialogClosing
-  } = useLayoutStore();
   const closeDialog = useCallback31(() => {
-    setIsDialogClosing(true);
+    useLayoutStore.setState({ isDialogAnimating: true });
     setTimeout(() => {
-      setDialogContent(null);
-      setDialogDescription(null);
-      setDialogTitle(null);
-      setIsDialogForced(false);
-      setIsDialogClosing(false);
-      setIsDialogOpen(false);
+      useLayoutStore.setState({
+        dialogContent: null,
+        isDialogAnimating: false,
+        isDialogOpen: false,
+        isDialogForced: false
+        // closing via page === null should reset forced state
+      });
     }, CLEAR_DIALOG_TIMEOUT);
-  }, [setDialogContent, setDialogDescription, setDialogTitle, setIsDialogForced, setIsDialogOpen, setIsDialogClosing]);
-  const openDialog = useCallback31(
-    (pageItem) => {
-      const PageContentComponent = pageItem.component;
-      setDialogTitle(pageItem.title);
-      setDialogDescription(pageItem.description);
-      setDialogContent(/* @__PURE__ */ jsx125(PageContentComponent, {}));
-      setIsDialogOpen(true);
-    },
-    [setDialogContent, setDialogDescription, setDialogTitle, setIsDialogOpen]
-  );
+  }, []);
+  const openDialog = useCallback31((pageItem) => {
+    useLayoutStore.setState({
+      dialogContent: /* @__PURE__ */ jsx125(pageItem.component, {}),
+      isDialogOpen: true
+      // isDialogAnimating: true
+    });
+  }, []);
   useEffect50(() => {
     if (page === null) return closeDialog();
     const pageItem = PAGE_MAP[page];
@@ -28853,7 +28640,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.93",
+      version: "0.4.95",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -28942,9 +28729,12 @@ var init_package = __esm({
       },
       repository: {
         type: "git",
-        url: "https://github.com/lumiachain/lumia-passport-sdk",
-        directory: "packages/ui-kit"
+        url: "https://github.com/embark-ai/ui-kit.git"
+      },
+      bugs: {
+        url: "https://github.com/embark-ai/ui-kit/issues"
       },
+      homepage: "https://github.com/embark-ai/ui-kit#readme",
       publishConfig: {
         access: "public"
       }
@@ -29116,9 +28906,9 @@ var init_Footer2 = __esm({
 var EMBARKAI_HEADER_ONBOARDING_ID, EMBARKAI_HEADER_TOUR_BUTTON_ID, ONBOARDING_TOURS;
 var init_onborading_setup = __esm({
   "src/internal/components/Header/onborading.setup.ts"() {
+    init_constants();
     init_BuyMenu2();
     init_ChainsMenu2();
-    init_Dialog2();
     init_Footer2();
     init_KeyshareRestoreMenu2();
     init_MainMenu2();
@@ -29333,7 +29123,7 @@ import { forwardRef as forwardRef6 } from "react";
 import { jsx as jsx128, jsxs as jsxs116 } from "react/jsx-runtime";
 function useDecideContentStyles() {
   const isMobileView = useLayoutStore((st) => st.isMobileView);
-  const isClosing = useLayoutStore((st) => !!st.isDialogOpen && !!st.isDialogClosing);
+  const isClosing = useLayoutStore((st) => !!st.isDialogOpen && !!st.isDialogAnimating);
   const mobileStyles = isMobileView ? { "--ui-kit-bdrs": "20px 20px 0px 0px" } : {};
   return {
     isClosing,
@@ -29517,12 +29307,10 @@ function Dialog2() {
   const className = config.current?.ui?.dialogClassName;
   const session = useSession((st) => st.session);
   const hasServerVault = useSession((st) => st.hasServerVault);
+  const { colorMode, maxScrollHeight, isDialogOpen, dialogContent, isDialogForced } = useLayoutStore();
   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();
-  useEffect52(() => setIsSettings(!!session), [session, setIsSettings]);
+  useEffect52(() => useLayoutStore.setState({ isSettings: !!session }), [session]);
   usePageMapper();
   useAutoConnect();
   useBackupStatusChanges();
@@ -29537,6 +29325,7 @@ function Dialog2() {
       onOpenChange: (open) => {
         if (isDialogForced) return;
         if (!open) {
+          const { setPostAuthNavigation, setPage } = useLayoutDataStore.getState();
           setPostAuthNavigation(null);
           setPage(null);
         }
@@ -29548,18 +29337,29 @@ function Dialog2() {
           colorMode,
           className,
           children: [
-            /* @__PURE__ */ jsx130(VisuallyHidden, { children: /* @__PURE__ */ jsx130(DialogTitle, { children: dialogTitle }) }),
-            /* @__PURE__ */ jsx130(DialogDescription, { className: "sr-only", children: dialogDescription }),
+            /* @__PURE__ */ jsx130(VisuallyHidden, { children: /* @__PURE__ */ jsx130(DialogTitle, { children: "embarkAI" }) }),
+            /* @__PURE__ */ jsx130(DialogDescription, { className: "sr-only", children: "embarkAI wallet" }),
             !isHeaderHidden && /* @__PURE__ */ jsx130(Header, {}),
             /* @__PURE__ */ jsx130(AnimatePresence, { mode: "wait", initial: false, children: /* @__PURE__ */ jsx130(
               motion.div,
               {
+                style: { overflow: "hidden" },
                 initial: { opacity: 0, height: transitionPageHeight },
                 animate: { opacity: 1, height: "auto" },
                 exit: { opacity: 0, height: transitionPageHeight },
-                style: { overflow: "hidden" },
                 transition: Y_ANIMATION_SETUP,
-                children: dialogContent
+                children: /* @__PURE__ */ jsx130(
+                  "div",
+                  {
+                    ref: (inst) => onboarder.registerElement(`${EMBARKAI_DIALOG_ONBOARDING_ID}-${page}`, inst),
+                    style: {
+                      "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
+                      "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
+                    },
+                    className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
+                    children: dialogContent
+                  }
+                )
               },
               page || "empty"
             ) }),
@@ -29570,7 +29370,6 @@ function Dialog2() {
     }
   );
 }
-var EMBARKAI_DIALOG_ONBOARDING_ID;
 var init_Dialog = __esm({
   "src/internal/components/Dialog/Dialog.tsx"() {
     init_ProviderContext();
@@ -29589,7 +29388,6 @@ var init_Dialog = __esm({
     init_Onboarding();
     init_dialog();
     init_visually_hidden();
-    EMBARKAI_DIALOG_ONBOARDING_ID = "embark-main-dialog-content";
   }
 });