@embarkai/ui-kit 0.4.93 → 0.4.94

package/dist/index.cjs

@@ -5021,11 +5021,12 @@ var init_cn = __esm({
 });
 
 // src/internal/constants.ts
-var import_lucide_react, 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 import_lucide_react, 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"() {
     import_lucide_react = require("lucide-react");
     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;
@@ -5061,25 +5062,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 })
     }));
   }
 });
@@ -11113,7 +11105,6 @@ var init_AuthMenu = __esm({
     init_auth();
     init_constants();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
     init_highlight();
@@ -11128,16 +11119,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();
       (0, import_react23.useEffect)(() => {
         if (!pendingWalletLogin) return;
         const loginResponse = pendingWalletLogin;
-        setPendingWalletLogin(null);
+        useLayoutDataStore.getState().setPendingWalletLogin(null);
         console.log("[AuthMenu] Processing wallet login response:", loginResponse);
         import_auth23.jwtTokenManager.clearTokens().then(() => {
           pendingLoginResponseRef.current = loginResponse;
@@ -11145,8 +11134,9 @@ var init_AuthMenu = __esm({
         });
       }, [pendingWalletLogin]);
       (0, import_react23.useEffect)(() => {
-        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);
@@ -11155,7 +11145,7 @@ var init_AuthMenu = __esm({
         };
       }, []);
       if (!isIframeReady) {
-        return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "w-full p-8 flex flex-col justify-center items-center gap-[var(--ui-kit-gap)]", children: [
+        return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Expandable, { isExpanded: true, className: "w-full p-8 flex flex-col justify-center items-center gap-[var(--ui-kit-gap)]", children: [
           /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_lucide_react9.Loader, { className: "w-4 h-4 animate-spin" }),
           /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "text-sm text-[var(--ui-kit-fg-muted)]", children: "Initializing wallet..." })
         ] });
@@ -11177,26 +11167,25 @@ var init_AuthMenu = __esm({
         }),
         [onAuthSuccess, goBackToSignIn]
       );
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-        "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__ */ (0, import_jsx_runtime23.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-            stepContent[step],
-            alert2 && /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Highlight, { type: "error", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("span", { className: "block w-full flex flex-col gap-1 flex-1 mb-2", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "block font-bold leading-5", children: alert2.title }),
-                /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "block whitespace-pre-line", children: alert2.message || "Unknown error" })
-              ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Button, { variant: "default", size: "medium", className: "w-full", onClick: () => setAlert(null), children: t("passport:common.hide") })
-            ] })
-          ] })
-        }
-      );
+      return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+        stepContent[step],
+        alert2 && /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Highlight, { type: "error", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("span", { className: "block w-full flex flex-col gap-1 flex-1 mb-2", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "block font-bold leading-5", children: alert2.title }),
+            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "block whitespace-pre-line", children: alert2.message || "Unknown error" })
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+            Button,
+            {
+              variant: "default",
+              size: "medium",
+              className: "w-full",
+              onClick: () => useAuthStore.getState().setAlert(null),
+              children: t("passport:common.hide")
+            }
+          )
+        ] })
+      ] });
     };
   }
 });
@@ -12688,11 +12677,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,
@@ -14499,7 +14489,6 @@ var init_useHandleInputAmount = __esm({
 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);
@@ -14515,103 +14504,92 @@ function BuyMenu() {
   const showExtras = !isCryptoSelector && !isFiatSelector && !isProviderSummary && !isProviderSelector && !isPaymentModeSelector;
   const showProviderTrigger = showExtras && !isTransactionHistory;
   useOnboardingTourAvailable(showProviderTrigger);
-  return /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-    "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__ */ (0, import_jsx_runtime50.jsxs)(Expandable, { isExpanded: true, contentClassName: "relative w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-            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__ */ (0, import_jsx_runtime50.jsx)(import_lucide_react20.ArrowLeft, { className: "h-4 w-4" })
+  return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(Expandable, { isExpanded: true, contentClassName: "relative w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+        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__ */ (0, import_jsx_runtime50.jsx)("span", { className: "block flex-none text-xl font-semibold", children: t("passport:buyMenu.title") }),
-          showExtras && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("div", { className: "flex-1 h-8 flex items-center justify-end gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-            Switch,
-            {
-              labels: { checked: "PURCHASE", unchecked: "HISTORY" },
-              checked: isTransactionHistory,
-              onChange: () => {
-                useBuyMenuStore.getState().setError(null);
-                useBuyMenuStore.getState().setIsTransactionHistory();
-              }
+            if (isTransactionHistory) {
+              setIsTransactionHistory(false);
+              return;
             }
-          ) })
-        ] }),
-        showProviderTrigger && /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(import_jsx_runtime50.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("span", { className: "block text-[10px] text-[var(--ui-kit-fg-muted)]", children: t("passport:buyMenu.selectProvider") }),
-          /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
-            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__ */ (0, import_jsx_runtime50.jsx)(selectedProvider.icon, {}),
-                !selectedProvider.icon && t("passport:buyMenu.selectProvider")
-              ]
+            if (isProviderSelector) {
+              setIsProviderSelector(false);
+              return;
             }
-          )
-        ] }),
-        isProviderSelector ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ProviderSelector, { providers: AVAILABLE_RAMP_PROVIDERS.map((el) => ({ ...el, Icon: el.icon })) }) : /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ProviderComponent, { walletAddress }),
-        error && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(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__ */ (0, import_jsx_runtime50.jsx)(import_lucide_react20.ArrowLeft, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("span", { className: "block flex-none text-xl font-semibold", children: t("passport:buyMenu.title") }),
+      showExtras && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("div", { className: "flex-1 h-8 flex items-center justify-end gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+        Switch,
+        {
+          labels: { checked: "PURCHASE", unchecked: "HISTORY" },
+          checked: isTransactionHistory,
+          onChange: () => {
+            useBuyMenuStore.getState().setError(null);
+            useBuyMenuStore.getState().setIsTransactionHistory();
+          }
+        }
+      ) })
+    ] }),
+    showProviderTrigger && /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(import_jsx_runtime50.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("span", { className: "block text-[10px] text-[var(--ui-kit-fg-muted)]", children: t("passport:buyMenu.selectProvider") }),
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
+        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__ */ (0, import_jsx_runtime50.jsx)(selectedProvider.icon, {}),
+            !selectedProvider.icon && t("passport:buyMenu.selectProvider")
+          ]
+        }
+      )
+    ] }),
+    isProviderSelector ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ProviderSelector, { providers: AVAILABLE_RAMP_PROVIDERS.map((el) => ({ ...el, Icon: el.icon })) }) : /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ProviderComponent, { walletAddress }),
+    error && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Highlight, { type: "error", children: error })
+  ] });
 }
 var import_lucide_react20, import_jsx_runtime50;
 var init_BuyMenu = __esm({
@@ -14621,7 +14599,6 @@ var init_BuyMenu = __esm({
     init_i18n();
     import_lucide_react20 = require("lucide-react");
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -14975,26 +14952,11 @@ 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
 function ChainsMenu() {
   const { t } = useT();
   const config = useProviderConfig().config;
   const activeChainId = useSession((st) => st.activeChainId);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const [isTestnets, setIsTestnets] = (0, import_react37.useState)(false);
   const [nextChainId, setNextChainId] = (0, import_react37.useState)(null);
   useOnboardingTourAvailable(true);
@@ -15025,56 +14987,45 @@ function ChainsMenu() {
       chainId: activeChainId
     } : void 0
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
-    "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__ */ (0, import_jsx_runtime58.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
-              Button,
-              {
-                size: "icon",
-                variant: "ghost",
-                title: t("passport:common.back"),
-                onClick: () => {
-                  const chainMenuOpenedFrom = useLayoutDataStore.getState().chainMenuOpenedFrom;
-                  useLayoutDataStore.getState().setPage(chainMenuOpenedFrom || "settings" /* SETTINGS */);
-                },
-                children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_lucide_react22.ArrowLeft, { className: "h-4 w-4" })
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.title") })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
-            Switch,
-            {
-              labels: { checked: "MAINNETS", unchecked: "ALL" },
-              checked: isTestnets,
-              onChange: () => setIsTestnets(!isTestnets)
-            }
-          )
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: visibleNetworks.map((network, networkIdx) => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
-          ChainItem,
+  return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+          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__ */ (0, import_jsx_runtime58.jsx)(import_lucide_react22.ArrowLeft, { className: "h-4 w-4" })
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.title") })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+        Switch,
+        {
+          labels: { checked: "MAINNETS", unchecked: "ALL" },
+          checked: isTestnets,
+          onChange: () => setIsTestnets(!isTestnets)
+        }
+      )
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: visibleNetworks.map((network, networkIdx) => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+      ChainItem,
+      {
+        ...network,
+        nextChainId,
+        setNextChainId,
+        isActivePaymasterDataLoading,
+        activePaymasterData
+      },
+      `chain-${network.chainId}-${networkIdx}`
+    )) })
+  ] });
 }
 var import_core3, import_read15, import_react_query15, import_lucide_react22, import_react37, import_jsx_runtime58;
 var init_ChainsMenu = __esm({
@@ -15090,7 +15041,6 @@ var init_ChainsMenu = __esm({
     import_react37 = require("react");
     init_resolve_paymaster();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -15106,71 +15056,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__ */ (0, import_jsx_runtime59.jsx)(
-    "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__ */ (0, import_jsx_runtime59.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-            Button,
-            {
-              size: "icon",
-              variant: "ghost",
-              title: t("passport:common.back"),
-              onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
-              children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_lucide_react23.ArrowLeft, { className: "h-4 w-4" })
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.chainSwitchRequest.title") })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(Highlight, { type: "info", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_lucide_react23.Info, { className: "w-4 h-4 flex-none" }),
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "block", children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-            import_react_i18next2.Trans,
-            {
-              i18nKey: "passport:chainMenu.chainSwitchRequest.description",
-              values: {
-                preferredChain: `${prefferedChain?.name || "N/A"}`,
-                currentChain: `${chainConfig?.name || "N/A"}`
-              },
-              components: {
-                br: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("br", {}),
-                b: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "font-bold" })
-              }
-            }
-          ) })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-          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__ */ (0, import_jsx_runtime59.jsx)(import_lucide_react23.Loader, { className: "w-6 h-6 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(PrefferedChainIcon, { className: "w-6 h-6" }),
-              t("passport:chainMenu.chainSwitchRequest.confirmButton", {
-                chain: `${prefferedChain?.name || "N/A"}`
-              })
-            ]
+  return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
+        Button,
+        {
+          size: "icon",
+          variant: "ghost",
+          title: t("passport:common.back"),
+          onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
+          children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_lucide_react23.ArrowLeft, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "text-xl font-semibold", children: t("passport:chainMenu.chainSwitchRequest.title") })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(Highlight, { type: "info", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_lucide_react23.Info, { className: "w-4 h-4 flex-none" }),
+      /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "block", children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
+        import_react_i18next2.Trans,
+        {
+          i18nKey: "passport:chainMenu.chainSwitchRequest.description",
+          values: {
+            preferredChain: `${prefferedChain?.name || "N/A"}`,
+            currentChain: `${chainConfig?.name || "N/A"}`
+          },
+          components: {
+            br: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("br", {}),
+            b: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "font-bold" })
           }
-        )
-      ] })
-    }
-  );
+        }
+      ) })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
+      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__ */ (0, import_jsx_runtime59.jsx)(import_lucide_react23.Loader, { className: "w-6 h-6 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(PrefferedChainIcon, { className: "w-6 h-6" }),
+          t("passport:chainMenu.chainSwitchRequest.confirmButton", {
+            chain: `${prefferedChain?.name || "N/A"}`
+          })
+        ]
+      }
+    )
+  ] });
 }
 var import_lucide_react23, import_react_i18next2, import_jsx_runtime59;
 var init_ChainSwitchRequest = __esm({
@@ -15182,7 +15121,6 @@ var init_ChainSwitchRequest = __esm({
     import_lucide_react23 = require("lucide-react");
     import_react_i18next2 = require("react-i18next");
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
     init_highlight();
@@ -15190,6 +15128,21 @@ var init_ChainSwitchRequest = __esm({
   }
 });
 
+// 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"() {
@@ -16406,20 +16359,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
 function getProviderCaption(provider) {
   const providerName = provider.provider;
@@ -16594,7 +16533,6 @@ function ManageWalletMenu() {
   const config = useProviderConfig().config;
   const { t } = useT();
   const { open: openEmbarkAI } = useOpenPage();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const {
     alert: alert2,
     providerType,
@@ -16689,66 +16627,54 @@ function ManageWalletMenu() {
   const showExtraProvidersUi = !isProvidersLoading && !providersError && (providerType === "email" || providerType === "passkey");
   useOnboardingTourAvailable(!showExtraProvidersUi && providerType === null);
   const combinedAlertMessage = alert2?.message || providersError?.message || null;
-  return /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
-    "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__ */ (0, import_jsx_runtime69.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)] w-full justify-between", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
-              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__ */ (0, import_jsx_runtime69.jsx)(import_lucide_react29.ArrowLeft, { className: "h-4 w-4" })
+  return /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)] w-full justify-between", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
+          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__ */ (0, import_jsx_runtime69.jsx)("span", { className: "text-xl font-semibold", children: t("passport:profilesMenu.title") })
-          ] }),
-          linkIsLoading && /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(import_lucide_react29.LoaderIcon, { className: "w-4 h-4 animate-spin text-[var(--ui-kit-fg-muted)]" })
-        ] }),
-        isProvidersLoading && /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("div", { className: "flex items-center justify-center p-4 text-[var(--ui-kit-fg-muted)]", children: /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(import_lucide_react29.Loader, { className: "w-4 h-4 animate-spin" }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(EmailNotConnectedWarning, {}),
-        showCurrentProviders && renderProviders.map((node) => node),
-        showExtraProvidersUi && /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(AddProvider, {}),
-        combinedAlertMessage && /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(Highlight, { type: "error", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)("div", { className: "break-words whitespace-pre-wrap mb-4", children: [
-            alert2?.title && /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(import_jsx_runtime69.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("strong", { children: alert2.title }),
-              /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("br", {})
-            ] }),
-            combinedAlertMessage
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(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__ */ (0, import_jsx_runtime69.jsx)(import_lucide_react29.ArrowLeft, { className: "h-4 w-4" })
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("span", { className: "text-xl font-semibold", children: t("passport:profilesMenu.title") })
+      ] }),
+      linkIsLoading && /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(import_lucide_react29.LoaderIcon, { className: "w-4 h-4 animate-spin text-[var(--ui-kit-fg-muted)]" })
+    ] }),
+    isProvidersLoading && /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("div", { className: "flex items-center justify-center p-4 text-[var(--ui-kit-fg-muted)]", children: /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(import_lucide_react29.Loader, { className: "w-4 h-4 animate-spin" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(EmailNotConnectedWarning, {}),
+    showCurrentProviders && renderProviders.map((node) => node),
+    showExtraProvidersUi && /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(AddProvider, {}),
+    combinedAlertMessage && /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(Highlight, { type: "error", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)("div", { className: "break-words whitespace-pre-wrap mb-4", children: [
+        alert2?.title && /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(import_jsx_runtime69.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("strong", { children: alert2.title }),
+          /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("br", {})
+        ] }),
+        combinedAlertMessage
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(Button, { variant: "default", size: "medium", className: "w-full", onClick: () => setAlert(null), children: t("passport:common.hide") })
+    ] })
+  ] });
 }
 var import_lodash_es8, import_lucide_react29, import_react41, import_jsx_runtime69, POSSIBLE_PROVIDERS, MULTI_PROVIDERS;
 var init_ManageWallet = __esm({
   "src/internal/components/ManageWalletMenu/ManageWallet.tsx"() {
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_ProviderContext();
     init_useOpenPage();
     init_i18n();
@@ -16896,6 +16822,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"() {
@@ -16946,7 +16887,6 @@ function ConnectExternalWalletMenu() {
   const { isConnected: isExternalWalletConnected } = (0, import_wagmi2.useConnection)();
   const { mutate: disconnect } = (0, import_wagmi2.useDisconnect)();
   const { mutateAsync: signMessageAsync } = (0, import_wagmi2.useSignMessage)();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const walletMenuOpenedFrom = useLayoutDataStore((st) => st.walletMenuOpenedFrom);
   const { data: providers = [] } = (0, import_react_query24.useQuery)({
     retry: false,
@@ -17162,69 +17102,59 @@ function ConnectExternalWalletMenu() {
         return t("passport:connectMenu.instructions.confirm");
     }
   }, [embarkAiAddress, t]);
-  return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
-    "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__ */ (0, import_jsx_runtime71.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: t("passport:common.back"),
-              disabled: isConnectingExternalWallet || isLoginOrLinkOrConnectWallet,
-              onClick: () => useLayoutDataStore.getState().setPage(walletMenuOpenedFrom ?? "main-menu" /* MAIN_MENU */),
-              children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_lucide_react31.ArrowLeft, { className: "h-4 w-4" })
+  return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: t("passport:common.back"),
+          disabled: isConnectingExternalWallet || isLoginOrLinkOrConnectWallet,
+          onClick: () => useLayoutDataStore.getState().setPage(walletMenuOpenedFrom ?? "main-menu" /* MAIN_MENU */),
+          children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_lucide_react31.ArrowLeft, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("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] || import_lucide_react31.Wallet2Icon;
+      return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
+        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__ */ (0, import_jsx_runtime71.jsx)("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] || import_lucide_react31.Wallet2Icon;
-          return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
-            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__ */ (0, import_jsx_runtime71.jsx)("div", { className: "w-6 h-6 flex-none flex items-center justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_lucide_react31.Loader, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(WalletIcon, { className: "w-6 h-6 flex-none" }),
-                /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("span", { children: connector.name })
-              ]
-            },
-            connector.uid
-          );
-        }),
-        isConnectingExternalWallet && !!pendingConnectVariables?.connector && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Highlight, {
-          type: "warning",
-          // @ts-expect-error i18n typing
-          children: t("passport:connectMenu.instructions.follow", {
-            wallet: pendingConnectVariables.connector.name,
-            steps: getInstructionSteps()
-          })
-        }),
-        visibleConnectors.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Highlight, { type: "info", children: t("passport:connectMenu.noWallets") }),
-        error && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Highlight, { type: "error", children: error.message })
-      ] })
-    }
-  );
+            useLayoutStore.getState().setIsDialogForced(true);
+            connect({ connector });
+          },
+          children: [
+            isConnectingThis ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { className: "w-6 h-6 flex-none flex items-center justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_lucide_react31.Loader, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(WalletIcon, { className: "w-6 h-6 flex-none" }),
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("span", { children: connector.name })
+          ]
+        },
+        connector.uid
+      );
+    }),
+    isConnectingExternalWallet && !!pendingConnectVariables?.connector && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Highlight, {
+      type: "warning",
+      // @ts-expect-error i18n typing
+      children: t("passport:connectMenu.instructions.follow", {
+        wallet: pendingConnectVariables.connector.name,
+        steps: getInstructionSteps()
+      })
+    }),
+    visibleConnectors.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Highlight, { type: "info", children: t("passport:connectMenu.noWallets") }),
+    error && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Highlight, { type: "error", children: error.message })
+  ] });
 }
 var import_react_query24, import_lucide_react31, import_react44, import_wagmi2, import_jsx_runtime71;
 var init_ConnectExternalWalletMenu = __esm({
@@ -17404,7 +17334,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] = (0, import_react46.useState)("");
   const [error, setError] = (0, import_react46.useState)(null);
@@ -17426,56 +17355,38 @@ function DeviceLinkScreen() {
       }
     });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => setPage("devices" /* DEVICES */), children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(import_lucide_react32.ArrowLeft, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)("span", { className: "text-xl font-semibold", children: "Link Device" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)("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__ */ (0, import_jsx_runtime72.jsx)(
-          "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__ */ (0, import_jsx_runtime72.jsx)("p", { className: "text-sm text-[var(--ui-kit-bg-error)]", children: error }),
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
-          Button,
-          {
-            variant: "default",
-            size: "large",
-            className: "w-full",
-            disabled: !isValid || isPending,
-            onClick: handleLink,
-            children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(import_lucide_react32.Loader2, { className: "w-4 h-4 animate-spin" }) : "Link"
-          }
-        )
-      ] })
-    }
-  );
+  return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => setPage("devices" /* DEVICES */), children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(import_lucide_react32.ArrowLeft, { className: "h-4 w-4 flex-none" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime72.jsx)("span", { className: "text-xl font-semibold", children: "Link Device" })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime72.jsx)("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__ */ (0, import_jsx_runtime72.jsx)(
+      "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__ */ (0, import_jsx_runtime72.jsx)("p", { className: "text-sm text-[var(--ui-kit-bg-error)]", children: error }),
+    /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Button, { variant: "default", size: "large", className: "w-full", disabled: !isValid || isPending, onClick: handleLink, children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(import_lucide_react32.Loader2, { className: "w-4 h-4 animate-spin" }) : "Link" })
+  ] });
 }
-var import_react46, import_lucide_react32, import_jsx_runtime72, VALID_CHARS;
+var import_lucide_react32, import_react46, import_jsx_runtime72, VALID_CHARS;
 var init_DeviceLinkScreen = __esm({
   "src/internal/components/DevicesMenu/DeviceLinkScreen.tsx"() {
-    import_react46 = require("react");
     import_lucide_react32 = require("lucide-react");
+    import_react46 = require("react");
+    init_devices();
+    init_useLayoutDataStore();
     init_Expandable2();
     init_button();
-    init_useLayoutDataStore();
-    init_useLayoutStore();
-    init_devices();
     import_jsx_runtime72 = require("react/jsx-runtime");
     VALID_CHARS = /^[A-HJ-NP-Z2-9]*$/;
   }
@@ -18006,7 +17917,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;
@@ -18108,185 +18018,204 @@ function DeviceManageScreen() {
       setActionState(null);
     }
   }, [password, userId, refreshList]);
-  const handleDelete = (0, import_react47.useCallback)(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 = (0, import_react47.useCallback)(
+    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__ */ (0, import_jsx_runtime73.jsx)(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => {
+  return /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          onClick: () => {
             guardianRef.current?.close();
             setPage("devices" /* DEVICES */);
-          }, children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.ArrowLeft, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.HardDrive, { className: "h-5 w-5 flex-none" }),
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-xl font-semibold", children: deviceName || "Guardian" }),
-          screen.step === "connected" && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("span", { className: "text-xs text-[var(--ui-kit-fg-muted)] ml-auto", children: [
-            "v",
-            screen.info.fwVer
-          ] })
-        ] }),
-        waitingConfirm && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)] text-sm animate-pulse", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Loader2, { className: "w-4 h-4 animate-spin" }),
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { children: "Confirm on your device..." })
+          },
+          children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.ArrowLeft, { className: "h-4 w-4 flex-none" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.HardDrive, { className: "h-5 w-5 flex-none" }),
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-xl font-semibold", children: deviceName || "Guardian" }),
+      screen.step === "connected" && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("span", { className: "text-xs text-[var(--ui-kit-fg-muted)] ml-auto", children: [
+        "v",
+        screen.info.fwVer
+      ] })
+    ] }),
+    waitingConfirm && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)] text-sm animate-pulse", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Loader2, { className: "w-4 h-4 animate-spin" }),
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { children: "Confirm on your device..." })
+    ] }),
+    statusMessage && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "text-sm text-green-500 p-2", children: statusMessage }),
+    errorMessage && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2", children: errorMessage }),
+    screen.step === "connecting" && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "flex justify-center py-8", children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Loader2, { className: "w-6 h-6 animate-spin text-[var(--ui-kit-fg-muted)]" }) }),
+    screen.step === "error" && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "text-sm text-[var(--ui-kit-bg-error)] text-center py-8", children: screen.message }),
+    screen.step === "new-device" && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex flex-col items-center gap-4 py-8", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Cpu, { className: "w-10 h-10 text-[var(--ui-kit-fg-muted)]" }),
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "text-center", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("p", { className: "text-sm font-semibold", children: "New device detected" }),
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("p", { className: "text-xs text-[var(--ui-kit-fg-muted)] mt-1", children: [
+          screen.info.deviceId,
+          " \xB7 v",
+          screen.info.fwVer
+        ] })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+        Button,
+        {
+          variant: "default",
+          size: "large",
+          className: "w-full",
+          onClick: () => {
+            setPage("device-link" /* DEVICE_LINK */);
+          },
+          children: "Link Device"
+        }
+      )
+    ] }),
+    screen.step === "connected" && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(import_jsx_runtime73.Fragment, { children: [
+      screen.keyshares.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("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__ */ (0, import_jsx_runtime73.jsxs)("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__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Cpu, { className: "w-5 h-5 text-[var(--ui-kit-fg-muted)] shrink-0" }),
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex-1 min-w-0", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-sm font-mono truncate block text-[var(--ui-kit-fg)]", children: id }),
+          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: formatSize(size) })
         ] }),
-        statusMessage && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "text-sm text-green-500 p-2", children: statusMessage }),
-        errorMessage && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2", children: errorMessage }),
-        screen.step === "connecting" && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "flex justify-center py-8", children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Loader2, { className: "w-6 h-6 animate-spin text-[var(--ui-kit-fg-muted)]" }) }),
-        screen.step === "error" && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "text-sm text-[var(--ui-kit-bg-error)] text-center py-8", children: screen.message }),
-        screen.step === "new-device" && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex flex-col items-center gap-4 py-8", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Cpu, { className: "w-10 h-10 text-[var(--ui-kit-fg-muted)]" }),
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "text-center", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("p", { className: "text-sm font-semibold", children: "New device detected" }),
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("p", { className: "text-xs text-[var(--ui-kit-fg-muted)] mt-1", children: [
-              screen.info.deviceId,
-              " \xB7 v",
-              screen.info.fwVer
-            ] })
-          ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+          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__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Download, { className: "w-4 h-4" })
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+          Button,
+          {
+            variant: "ghost",
+            size: "icon",
+            disabled: isWorking,
+            onClick: () => handleDelete(id),
+            title: "Delete",
+            className: "text-[var(--ui-kit-bg-error)]",
+            children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Trash2, { className: "w-4 h-4" })
+          }
+        )
+      ] }, id)),
+      actionState?.action === "overwrite" && actionState.substep === "confirm" && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center justify-between gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-sm", children: "Keyshare exists. Overwrite? (requires button press on device)" }),
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex gap-2", children: [
           /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
             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__ */ (0, import_jsx_runtime73.jsxs)(import_jsx_runtime73.Fragment, { children: [
-          screen.keyshares.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("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__ */ (0, import_jsx_runtime73.jsxs)("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__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Cpu, { className: "w-5 h-5 text-[var(--ui-kit-fg-muted)] shrink-0" }),
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex-1 min-w-0", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-sm font-mono truncate block text-[var(--ui-kit-fg)]", children: id }),
-              /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: formatSize(size) })
-            ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
-              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__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Download, { className: "w-4 h-4" })
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
-              Button,
-              {
-                variant: "ghost",
-                size: "icon",
-                disabled: isWorking,
-                onClick: () => handleDelete(id),
-                title: "Delete",
-                className: "text-[var(--ui-kit-bg-error)]",
-                children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Trash2, { className: "w-4 h-4" })
-              }
-            )
-          ] }, id)),
-          actionState?.action === "overwrite" && actionState.substep === "confirm" && /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex items-center justify-between gap-2 p-3 rounded-lg bg-[var(--ui-kit-bg)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { className: "text-sm", children: "Keyshare exists. Overwrite? (requires button press on device)" }),
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex gap-2", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Button, { variant: "ghost", size: "small", onClick: () => {
                 setActionState(null);
                 setPassword("");
-              }, children: "Cancel" }),
-              /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Button, { variant: "outline", size: "small", onClick: handleOverwrite, children: "Overwrite" })
-            ] })
-          ] }),
-          actionState?.action === "backup" && actionState.substep === "password" ? /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex gap-2", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
-              "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__ */ (0, import_jsx_runtime73.jsx)(Button, { variant: "default", disabled: !password, onClick: handleBackup, children: "Backup" }),
-            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Button, { variant: "ghost", onClick: () => {
-              setActionState(null);
-              setPassword("");
-            }, children: "Cancel" })
-          ] }) : /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(
-            Button,
-            {
-              variant: "default",
-              size: "large",
-              className: "w-full",
-              disabled: isWorking,
-              onClick: () => {
-                setStatusMessage(null);
-                setErrorMessage(null);
-                setActionState({ action: "backup", substep: "password" });
               },
-              children: [
-                /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Upload, { className: "w-4 h-4" }),
-                /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { children: "Backup Current Keyshare" })
-              ]
+              children: "Cancel"
             }
           ),
-          actionState?.substep === "working" && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "flex justify-center py-2", children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Loader2, { className: "w-5 h-5 animate-spin" }) })
+          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Button, { variant: "outline", size: "small", onClick: handleOverwrite, children: "Overwrite" })
         ] })
-      ] })
-    }
-  );
+      ] }),
+      actionState?.action === "backup" && actionState.substep === "password" ? /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { className: "flex gap-2", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+          "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__ */ (0, import_jsx_runtime73.jsx)(Button, { variant: "default", disabled: !password, onClick: handleBackup, children: "Backup" }),
+        /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+          Button,
+          {
+            variant: "ghost",
+            onClick: () => {
+              setActionState(null);
+              setPassword("");
+            },
+            children: "Cancel"
+          }
+        )
+      ] }) : /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(
+        Button,
+        {
+          variant: "default",
+          size: "large",
+          className: "w-full",
+          disabled: isWorking,
+          onClick: () => {
+            setStatusMessage(null);
+            setErrorMessage(null);
+            setActionState({ action: "backup", substep: "password" });
+          },
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Upload, { className: "w-4 h-4" }),
+            /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { children: "Backup Current Keyshare" })
+          ]
+        }
+      ),
+      actionState?.substep === "working" && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "flex justify-center py-2", children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_lucide_react33.Loader2, { className: "w-5 h-5 animate-spin" }) })
+    ] })
+  ] });
 }
-var import_react47, import_lucide_react33, import_jsx_runtime73;
+var import_lucide_react33, import_react47, import_jsx_runtime73;
 var init_DeviceManageScreen = __esm({
   "src/internal/components/DevicesMenu/DeviceManageScreen.tsx"() {
-    import_react47 = require("react");
+    init_SessionContext();
     import_lucide_react33 = require("lucide-react");
-    init_Expandable2();
-    init_button();
+    import_react47 = require("react");
+    init_guardian_backup();
     init_useLayoutDataStore();
-    init_useLayoutStore();
-    init_SessionContext();
     init_iframe_manager();
-    init_guardian_backup();
+    init_Expandable2();
+    init_button();
     import_jsx_runtime73 = require("react/jsx-runtime");
   }
 });
@@ -18295,7 +18224,6 @@ var init_DeviceManageScreen = __esm({
 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;
@@ -18331,79 +18259,71 @@ function DeviceRestoreScreen() {
       setIsWorking(false);
     }
   }, [password, keyshareId, userId, deviceId]);
-  return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => setPage("device-manage" /* DEVICE_MANAGE */), children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.ArrowLeft, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("span", { className: "text-xl font-semibold", children: "Restore Keyshare" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { className: "flex gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bg-error)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.AlertTriangle, { className: "w-5 h-5 text-[var(--ui-kit-bg-error)] shrink-0 mt-0.5" }),
-          /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { className: "text-sm", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("p", { className: "font-semibold text-[var(--ui-kit-bg-error)]", children: "This will replace your current keyshare" }),
-            /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("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__ */ (0, import_jsx_runtime74.jsx)("div", { className: "text-xs text-[var(--ui-kit-fg-muted)] font-mono truncate px-1", children: keyshareId }),
-        /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
-          "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__ */ (0, import_jsx_runtime74.jsx)(
-          Button,
-          {
-            variant: "default",
-            size: "large",
-            className: "w-full",
-            disabled: !password || isWorking,
-            onClick: handleRestore,
-            children: isWorking ? /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(import_jsx_runtime74.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.Loader2, { className: "w-4 h-4 animate-spin" }),
-              /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("span", { children: "Restoring \u2014 confirm on your device..." })
-            ] }) : /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(import_jsx_runtime74.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.Download, { className: "w-4 h-4" }),
-              /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("span", { children: "Restore from Guardian" })
-            ] })
-          }
-        ),
-        statusMessage && /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("div", { className: "text-sm text-green-500 p-2 text-center", children: statusMessage }),
-        errorMessage && /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2 text-center", children: errorMessage })
+  return /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => setPage("device-manage" /* DEVICE_MANAGE */), children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.ArrowLeft, { className: "h-4 w-4 flex-none" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("span", { className: "text-xl font-semibold", children: "Restore Keyshare" })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { className: "flex gap-3 p-3 rounded-lg bg-[var(--ui-kit-bg)] border border-[var(--ui-kit-bg-error)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.AlertTriangle, { className: "w-5 h-5 text-[var(--ui-kit-bg-error)] shrink-0 mt-0.5" }),
+      /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { className: "text-sm", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("p", { className: "font-semibold text-[var(--ui-kit-bg-error)]", children: "This will replace your current keyshare" }),
+        /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("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__ */ (0, import_jsx_runtime74.jsx)("div", { className: "text-xs text-[var(--ui-kit-fg-muted)] font-mono truncate px-1", children: keyshareId }),
+    /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
+      "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__ */ (0, import_jsx_runtime74.jsx)(
+      Button,
+      {
+        variant: "default",
+        size: "large",
+        className: "w-full",
+        disabled: !password || isWorking,
+        onClick: handleRestore,
+        children: isWorking ? /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(import_jsx_runtime74.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.Loader2, { className: "w-4 h-4 animate-spin" }),
+          /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("span", { children: "Restoring \u2014 confirm on your device..." })
+        ] }) : /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(import_jsx_runtime74.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react34.Download, { className: "w-4 h-4" }),
+          /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("span", { children: "Restore from Guardian" })
+        ] })
+      }
+    ),
+    statusMessage && /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("div", { className: "text-sm text-green-500 p-2 text-center", children: statusMessage }),
+    errorMessage && /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("div", { className: "text-sm text-[var(--ui-kit-bg-error)] p-2 text-center", children: errorMessage })
+  ] });
 }
-var import_react48, import_lucide_react34, import_jsx_runtime74;
+var import_lucide_react34, import_react48, import_jsx_runtime74;
 var init_DeviceRestoreScreen = __esm({
   "src/internal/components/DevicesMenu/DeviceRestoreScreen.tsx"() {
-    import_react48 = require("react");
+    init_SessionContext();
     import_lucide_react34 = require("lucide-react");
-    init_Expandable2();
-    init_button();
+    import_react48 = require("react");
+    init_guardian_backup();
     init_useLayoutDataStore();
-    init_useLayoutStore();
-    init_SessionContext();
     init_iframe_manager();
-    init_guardian_backup();
+    init_Expandable2();
+    init_button();
     import_jsx_runtime74 = require("react/jsx-runtime");
   }
 });
@@ -18477,7 +18397,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",
@@ -18497,53 +18421,35 @@ 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__ */ (0, import_jsx_runtime75.jsx)(
-    "div",
-    {
-      style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-      className: "list-scrollbar-y w-full",
-      children: /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.ArrowLeft, { className: "h-4 w-4 flex-none" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("span", { className: "text-xl font-semibold", children: "Devices" }),
-          isLoading && /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.Loader2, { className: "w-4 h-4 animate-spin" }),
-          /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("div", { className: "flex-1" }),
-          /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => refetch(), disabled: isFetching, children: /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.RefreshCw, { className: `h-4 w-4 flex-none ${isFetching ? "animate-spin" : ""}` }) })
-        ] }),
-        error && /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("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__ */ (0, import_jsx_runtime75.jsx)("div", { className: "text-sm text-[var(--ui-kit-fg-muted)] text-center py-8", children: "No linked devices" }),
-        devices.map((device) => /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(DeviceRow, { device }, device.deviceId)),
-        /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(
-          Button,
-          {
-            variant: "default",
-            size: "large",
-            className: "w-full",
-            onClick: () => setPage("device-link" /* DEVICE_LINK */),
-            children: [
-              /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.Cpu, { className: "w-4 h-4" }),
-              /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("span", { children: "Add Device" })
-            ]
-          }
-        )
-      ] })
-    }
-  );
+  return /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.ArrowLeft, { className: "h-4 w-4 flex-none" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("span", { className: "text-xl font-semibold", children: "Devices" }),
+      isLoading && /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.Loader2, { className: "w-4 h-4 animate-spin" }),
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("div", { className: "flex-1" }),
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Button, { variant: "ghost", size: "icon", onClick: () => refetch(), disabled: isFetching, children: /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.RefreshCw, { className: `h-4 w-4 flex-none ${isFetching ? "animate-spin" : ""}` }) })
+    ] }),
+    error && /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("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__ */ (0, import_jsx_runtime75.jsx)("div", { className: "text-sm text-[var(--ui-kit-fg-muted)] text-center py-8", children: "No linked devices" }),
+    devices.map((device) => /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(DeviceRow, { device }, device.deviceId)),
+    /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(Button, { variant: "default", size: "large", className: "w-full", onClick: () => setPage("device-link" /* DEVICE_LINK */), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_lucide_react35.Cpu, { className: "w-4 h-4" }),
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("span", { children: "Add Device" })
+    ] })
+  ] });
 }
-var import_react49, import_lucide_react35, import_jsx_runtime75;
+var import_lucide_react35, import_react49, import_jsx_runtime75;
 var init_DevicesMenu = __esm({
   "src/internal/components/DevicesMenu/DevicesMenu.tsx"() {
-    import_react49 = require("react");
     import_lucide_react35 = require("lucide-react");
-    init_Expandable2();
-    init_button();
-    init_useLayoutDataStore();
-    init_useLayoutStore();
+    import_react49 = require("react");
     init_devices();
     init_guardian_backup();
+    init_useLayoutDataStore();
+    init_Expandable2();
+    init_button();
     import_jsx_runtime75 = require("react/jsx-runtime");
   }
 });
@@ -19426,10 +19332,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: () => {
@@ -19454,7 +19361,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: () => {
@@ -19465,7 +19372,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: () => {
@@ -19485,7 +19392,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: () => {
@@ -19500,7 +19407,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: () => {
@@ -20395,7 +20302,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);
@@ -20478,106 +20384,99 @@ var init_KeyshareRestoreMenu = __esm({
         }
       });
       const RestoreComponent = currentRestoreMethod ? RESTORE_COMPONENTS[currentRestoreMethod] : null;
-      return /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
-        "div",
-        {
-          style: { "--ui-kit-scrollbar-mah": `${maxScrollHeight}px` },
-          className: "list-scrollbar-y w-full",
-          children: /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-            isBackupStatusLoading && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] text-center justify-center items-center", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.Loader, { className: "w-4 h-4 animate-spin" }),
-              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "block w-full text-xs leading-4", children: t("passport:restoreMenu.check") })
+      return /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+        isBackupStatusLoading && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] text-center justify-center items-center", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.Loader, { className: "w-4 h-4 animate-spin" }),
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "block w-full text-xs leading-4", children: t("passport:restoreMenu.check") })
+        ] }),
+        !success && !isBackupStatusLoading && !isDisconnecting && !hasServerBackup && /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
+          NoBackupFound,
+          {
+            isLoading: isRestoringFromServer || isRestoringFromCloud || isRestoringFromFile || isDisconnecting,
+            restoreFromFile
+          }
+        ),
+        !success && !isBackupStatusLoading && !isDisconnecting && hasServerBackup && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(import_jsx_runtime84.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.CloudDownload, { className: "w-6 h-6" }),
+              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "font-bold text-xl leading-6", children: t("passport:restoreMenu.title") })
             ] }),
-            !success && !isBackupStatusLoading && !isDisconnecting && !hasServerBackup && /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
-              NoBackupFound,
+            /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
+              Switch,
               {
-                isLoading: isRestoringFromServer || isRestoringFromCloud || isRestoringFromFile || isDisconnecting,
-                restoreFromFile
-              }
-            ),
-            !success && !isBackupStatusLoading && !isDisconnecting && hasServerBackup && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(import_jsx_runtime84.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)("div", { className: "flex items-center justify-between gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.CloudDownload, { className: "w-6 h-6" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "font-bold text-xl leading-6", children: t("passport:restoreMenu.title") })
-                ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
-                  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__ */ (0, import_jsx_runtime84.jsx)(MethodSelector, { mode: "restore", serverRecoveryStatus }),
-              !!currentRestoreMethod && /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
-                RestoreComponent,
-                {
-                  isLoading: isRestoringFromFile || isRestoringFromServer || isRestoringFromCloud || isDisconnecting,
-                  fileHandler: restoreFromFile,
-                  serverHandler: restoreFromServer2,
-                  cloudHandler: restoreFromCloud
                 }
-              )
-            ] }),
-            !success && !isBackupStatusLoading && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(
-              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__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.Loader, { className: "w-4 h-4 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.UserCircle, { className: "w-4 h-4" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { children: t("passport:restoreMenu.tryAnotherAccount") })
-                ]
               }
-            ),
-            error && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.AlertCircle, { className: "h-4 w-4 flex-shrink-0" }),
-              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "w-full flex-1 block", children: error })
-            ] }),
-            success && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(import_jsx_runtime84.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Highlight, { type: "success", className: "flex gap-[var(--ui-kit-gap)]", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.CheckCircle2, { className: "h-4 w-4 flex-shrink-0" }),
-                /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "w-full flex-1 block", children: success })
-              ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Button, { variant: "default", size: "large", className: "w-full", onClick: () => onRestoreSuccess(), children: "Done" })
-            ] })
-          ] })
-        }
-      );
+            )
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(MethodSelector, { mode: "restore", serverRecoveryStatus }),
+          !!currentRestoreMethod && /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
+            RestoreComponent,
+            {
+              isLoading: isRestoringFromFile || isRestoringFromServer || isRestoringFromCloud || isDisconnecting,
+              fileHandler: restoreFromFile,
+              serverHandler: restoreFromServer2,
+              cloudHandler: restoreFromCloud
+            }
+          )
+        ] }),
+        !success && !isBackupStatusLoading && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(
+          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__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.Loader, { className: "w-4 h-4 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.UserCircle, { className: "w-4 h-4" }),
+              /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { children: t("passport:restoreMenu.tryAnotherAccount") })
+            ]
+          }
+        ),
+        error && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.AlertCircle, { className: "h-4 w-4 flex-shrink-0" }),
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "w-full flex-1 block", children: error })
+        ] }),
+        success && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(import_jsx_runtime84.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Highlight, { type: "success", className: "flex gap-[var(--ui-kit-gap)]", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_lucide_react44.CheckCircle2, { className: "h-4 w-4 flex-shrink-0" }),
+            /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { className: "w-full flex-1 block", children: success })
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Button, { variant: "default", size: "large", className: "w-full", onClick: () => onRestoreSuccess(), children: "Done" })
+        ] })
+      ] });
     };
   }
 });
@@ -20588,7 +20487,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);
@@ -20627,118 +20525,110 @@ function KeyshareBackupMenu() {
     createPasskey
   } = useCreateBackup();
   const BackupComponent = !!currentBackupMethod ? COMPONENTS[currentBackupMethod] : null;
-  return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
-    "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__ */ (0, import_jsx_runtime85.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        !!isRecoveryLoading && (hasServerVault || !currentBackupMethod) && /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("div", { className: "w-full flex items-center justify-center p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.Loader, { className: "w-4 h-4 animate-spin" }) }),
-        (!isRecoveryLoading || !hasServerVault) && !hasRecoveryData2 && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { className: "flex items-center justify-center gap-2 px-5 py-[var(--ui-kit-pd)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.LockIcon, { className: "w-6 h-6" }),
-          /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "font-bold text-xl leading-6", children: t("passport:backupMenu.title") })
-        ] }),
-        !isRecoveryLoading && !!hasRecoveryData2 && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(
-          "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__ */ (0, import_jsx_runtime85.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
-                  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__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.ArrowLeft, { className: "h-4 w-4" })
-                  }
-                ),
-                /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "text-xl font-semibold leading-8", children: t("passport:backupMenu.title") })
-              ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
-                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__ */ (0, import_jsx_runtime85.jsx)(MethodSelector, { mode: "backup", serverRecoveryStatus }),
-        (!isRecoveryLoading || !hasServerVault) && !!currentBackupMethod && /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_jsx_runtime85.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
-          BackupComponent,
-          {
-            mode: "backup",
-            isLoading: isPasswordBackupCreating || isCloudBackupCreating || isLocalBackupCreating || isPasskeyCreating,
-            fileHandler: createLocalBackup,
-            serverHandler: createPasswordBackup,
-            cloudHandler: createCloudBackup,
-            createPasskeyHandler: createPasskey
-          }
-        ) }),
-        !isRecoveryLoading && !currentBackupMethod && !hasRecoveryData2 && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Highlight, { type: "warning", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.AlertCircle, { className: "h-4 w-4 flex-shrink-0" }),
-          /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "block flex-1 font-semibold", children: "No Backup Found" })
-        ] }),
-        error && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.AlertCircle, { className: "h-4 w-4 flex-shrink-0" }),
-          /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "block w-full flex-1", children: error })
-        ] }),
-        success && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Highlight, { type: "success", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { className: "w-full flex gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.CheckCircle2, { className: "h-4 w-4 flex-shrink-0" }),
-            /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "block w-full flex-1", children: success })
+  return /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    !!isRecoveryLoading && (hasServerVault || !currentBackupMethod) && /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("div", { className: "w-full flex items-center justify-center p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.Loader, { className: "w-4 h-4 animate-spin" }) }),
+    (!isRecoveryLoading || !hasServerVault) && !hasRecoveryData2 && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { className: "flex items-center justify-center gap-2 px-5 py-[var(--ui-kit-pd)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.LockIcon, { className: "w-6 h-6" }),
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "font-bold text-xl leading-6", children: t("passport:backupMenu.title") })
+    ] }),
+    !isRecoveryLoading && !!hasRecoveryData2 && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(
+      "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__ */ (0, import_jsx_runtime85.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+              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__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.ArrowLeft, { className: "h-4 w-4" })
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "text-xl font-semibold leading-8", children: t("passport:backupMenu.title") })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
-            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__ */ (0, import_jsx_runtime85.jsx)(MethodSelector, { mode: "backup", serverRecoveryStatus }),
+    (!isRecoveryLoading || !hasServerVault) && !!currentBackupMethod && /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_jsx_runtime85.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+      BackupComponent,
+      {
+        mode: "backup",
+        isLoading: isPasswordBackupCreating || isCloudBackupCreating || isLocalBackupCreating || isPasskeyCreating,
+        fileHandler: createLocalBackup,
+        serverHandler: createPasswordBackup,
+        cloudHandler: createCloudBackup,
+        createPasskeyHandler: createPasskey
+      }
+    ) }),
+    !isRecoveryLoading && !currentBackupMethod && !hasRecoveryData2 && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Highlight, { type: "warning", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.AlertCircle, { className: "h-4 w-4 flex-shrink-0" }),
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "block flex-1 font-semibold", children: "No Backup Found" })
+    ] }),
+    error && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.AlertCircle, { className: "h-4 w-4 flex-shrink-0" }),
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "block w-full flex-1", children: error })
+    ] }),
+    success && /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Highlight, { type: "success", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { className: "w-full flex gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_lucide_react45.CheckCircle2, { className: "h-4 w-4 flex-shrink-0" }),
+        /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { className: "block w-full flex-1", children: success })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        Button,
+        {
+          variant: "default",
+          size: "large",
+          className: "w-full",
+          onClick: () => useRestoreStore.getState().setSuccess(null),
+          children: t("passport:common.continue")
+        }
+      )
+    ] })
+  ] });
 }
 var import_react_query31, import_lucide_react45, import_react59, import_jsx_runtime85, COMPONENTS;
 var init_KeyshareBackupMenu = __esm({
@@ -20749,7 +20639,6 @@ var init_KeyshareBackupMenu = __esm({
     import_lucide_react45 = require("lucide-react");
     import_react59 = require("react");
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_vaultClient();
     init_Expandable2();
     init_Onboarding();
@@ -20972,27 +20861,13 @@ var init_SumsubIframe = __esm({
 // src/internal/components/KYC/KycMenu.tsx
 function KycMenu() {
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
-  return /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(
-    "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__ */ (0, import_jsx_runtime87.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(import_lucide_react47.ArrowLeft, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime87.jsx)("span", { className: "text-xl font-semibold", children: "KYC" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(KycContent, {})
-      ]
-    }
-  );
+  return /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(import_lucide_react47.ArrowLeft, { className: "h-4 w-4" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)("span", { className: "text-xl font-semibold", children: "KYC" })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(KycContent, {})
+  ] });
 }
 var import_lucide_react47, import_jsx_runtime87, KycContent;
 var init_KycMenu = __esm({
@@ -21000,7 +20875,7 @@ var init_KycMenu = __esm({
     init_ProviderContext();
     import_lucide_react47 = require("lucide-react");
     init_useLayoutDataStore();
-    init_useLayoutStore();
+    init_Expandable2();
     init_button();
     init_SumsubIframe();
     import_jsx_runtime87 = require("react/jsx-runtime");
@@ -21080,44 +20955,41 @@ var init_KYC = __esm({
 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__ */ (0, import_jsx_runtime89.jsx)(
-    "div",
-    {
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
+  return /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: "Back",
+          onClick: () => useLayoutDataStore.getState().setPage(langOpenedFromMenu),
+          children: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(import_lucide_react48.ArrowLeft, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("span", { className: "text-xl font-semibold", children: t("passport:common.language") })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] py-[var(--ui-kit-pd)]", children: languageList.map((langKey) => /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(
+      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__ */ (0, import_jsx_runtime89.jsx)("span", { children: LANGUAGES[langKey]?.name }),
+          /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("span", { className: "text-2xl leading-6", children: LANGUAGES[langKey]?.flags })
+        ]
       },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage(langOpenedFromMenu), children: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(import_lucide_react48.ArrowLeft, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("span", { className: "text-xl font-semibold", children: t("passport:common.language") })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)] py-[var(--ui-kit-pd)]", children: languageList.map((langKey) => /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(
-          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__ */ (0, import_jsx_runtime89.jsx)("span", { children: LANGUAGES[langKey]?.name }),
-              /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("span", { className: "text-2xl leading-6", children: LANGUAGES[langKey]?.flags })
-            ]
-          },
-          langKey
-        )) })
-      ] })
-    }
-  );
+      langKey
+    )) })
+  ] });
 }
 var import_lucide_react48, import_jsx_runtime89;
 var init_LanguagesMenu = __esm({
@@ -21126,7 +20998,6 @@ var init_LanguagesMenu = __esm({
     init_i18n();
     import_lucide_react48 = require("lucide-react");
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
     import_jsx_runtime89 = require("react/jsx-runtime");
@@ -21173,12 +21044,16 @@ var init_onboarding_setup5 = __esm({
 function MainMenu() {
   const address = useSession((st) => st.address);
   const { t } = useT();
-  const setPage = useLayoutDataStore((st) => st.setPage);
-  const setTransitionPageHeight = useLayoutDataStore((st) => st.setTransitionPageHeight);
-  (0, import_react61.useEffect)(() => setTransitionPageHeight(DEFAULT_MAIN_MENU_HEIGHT), []);
+  (0, import_react61.useEffect)(
+    () => (
+      // 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__ */ (0, import_jsx_runtime90.jsx)("div", { className: "w-full p-[var(--ui-kit-pd)] flex flex-col gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("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__ */ (0, import_jsx_runtime90.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("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__ */ (0, import_jsx_runtime90.jsxs)(
     Button,
     {
       ref: (inst) => onboarder.registerElement(onboardingId, inst),
@@ -21186,7 +21061,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__ */ (0, import_jsx_runtime90.jsx)(Icon2, { className: "w-5 h-5 md:w-8 md:h-8" }),
         /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("span", { className: "text-xs font-semibold", children: t(label) })
@@ -21204,6 +21079,7 @@ var init_MainMenu = __esm({
     import_react61 = require("react");
     init_constants();
     init_useLayoutDataStore();
+    init_Expandable2();
     init_useProvidersList();
     init_Onboarding();
     init_button();
@@ -21575,20 +21451,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
 function NicknameMenu() {
   const { isInitialUser } = usePageParams().current;
@@ -21610,79 +21472,71 @@ function NicknameMenu() {
   });
   const resolvedError = nicknameError || nicknameInfoError?.message || null;
   (0, import_react64.useEffect)(() => () => useNicknameStore.getState().reset(), []);
-  return /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
-    "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__ */ (0, import_jsx_runtime92.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)] ", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: t("passport:common.back"),
-              onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
-              children: /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(import_lucide_react51.ArrowLeft, { className: "h-4 w-4 flex-none" })
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("div", { className: "flex gap-[var(--ui-kit-gap)] items-center w-fit", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { className: "text-xl font-semibold", children: t("passport:nicknameMenu.title") }),
-            isNicknameInfoLoading && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(import_lucide_react51.Loader, { className: "w-4 h-4 animate-spin" })
-          ] })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(NicknameEditForm, { nicknameInfo, isInitialUser }),
-        !nicknameInfo?.canChange && nicknameInfo?.cooldownEndsAt && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Highlight, { type: "info", children: t("passport:nicknameMenu.cooldownMessage", {
-          canChangeAt: (0, import_dayjs4.default)(nicknameInfo.cooldownEndsAt).format("MMM D, YYYY"),
-          days: String(getDaysRemaining(nicknameInfo.cooldownEndsAt))
-        }) }),
-        !nicknameSuccess && !!nicknameInfo && /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)] justify-between text-[10px]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("span", { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { className: "text-[var(--ui-kit-fg-muted)]", children: nicknameInfo.changedAt ? t("passport:nicknameMenu.lastChanged") : t("passport:common.created") }),
-            /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { children: ": " }),
-            /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("strong", { className: "text-[var(--ui-kit-fg)]", children: (0, import_dayjs4.default)(nicknameInfo.changedAt || nicknameInfo.createdAt).format("MMM D, YYYY") })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("span", { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { className: "text-[var(--ui-kit-fg-muted)]", children: t("passport:nicknameMenu.timesChanged") }),
-            /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { children: ": " }),
-            /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("strong", { className: "text-[var(--ui-kit-fg)]", children: nicknameInfo.changeCount })
-          ] })
-        ] }),
-        !!nicknameSuccess && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Highlight, { type: "success", children: nicknameSuccess }),
-        isInitialUser && /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Highlight, { type: "success", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("p", {
-            //@ts-expect-error i18n typings
-            children: t("passport:nicknameMenu.initialUser.welcome", {
-              nickname: nicknameInfo?.handle || "N/A"
-            })
-          }),
-          /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("p", { children: t("passport:nicknameMenu.initialUser.message") }),
-          /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(
-            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__ */ (0, import_jsx_runtime92.jsx)(Highlight, { type: "error", children: resolvedError })
+  return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)] ", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: t("passport:common.back"),
+          onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
+          children: /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(import_lucide_react51.ArrowLeft, { className: "h-4 w-4 flex-none" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("div", { className: "flex gap-[var(--ui-kit-gap)] items-center w-fit", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { className: "text-xl font-semibold", children: t("passport:nicknameMenu.title") }),
+        isNicknameInfoLoading && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(import_lucide_react51.Loader, { className: "w-4 h-4 animate-spin" })
       ] })
-    }
-  );
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(NicknameEditForm, { nicknameInfo, isInitialUser }),
+    !nicknameInfo?.canChange && nicknameInfo?.cooldownEndsAt && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Highlight, { type: "info", children: t("passport:nicknameMenu.cooldownMessage", {
+      canChangeAt: (0, import_dayjs4.default)(nicknameInfo.cooldownEndsAt).format("MMM D, YYYY"),
+      days: String(getDaysRemaining(nicknameInfo.cooldownEndsAt))
+    }) }),
+    !nicknameSuccess && !!nicknameInfo && /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)] justify-between text-[10px]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("span", { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { className: "text-[var(--ui-kit-fg-muted)]", children: nicknameInfo.changedAt ? t("passport:nicknameMenu.lastChanged") : t("passport:common.created") }),
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { children: ": " }),
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("strong", { className: "text-[var(--ui-kit-fg)]", children: (0, import_dayjs4.default)(nicknameInfo.changedAt || nicknameInfo.createdAt).format("MMM D, YYYY") })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)("span", { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { className: "text-[var(--ui-kit-fg-muted)]", children: t("passport:nicknameMenu.timesChanged") }),
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("span", { children: ": " }),
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("strong", { className: "text-[var(--ui-kit-fg)]", children: nicknameInfo.changeCount })
+      ] })
+    ] }),
+    !!nicknameSuccess && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Highlight, { type: "success", children: nicknameSuccess }),
+    isInitialUser && /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Highlight, { type: "success", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("p", {
+        //@ts-expect-error i18n typings
+        children: t("passport:nicknameMenu.initialUser.welcome", {
+          nickname: nicknameInfo?.handle || "N/A"
+        })
+      }),
+      /* @__PURE__ */ (0, import_jsx_runtime92.jsx)("p", { children: t("passport:nicknameMenu.initialUser.message") }),
+      /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(
+        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__ */ (0, import_jsx_runtime92.jsx)(Highlight, { type: "error", children: resolvedError })
+  ] });
 }
 var import_react_query35, import_dayjs4, import_lucide_react51, import_react64, import_jsx_runtime92;
 var init_NicknameMenu = __esm({
@@ -21709,6 +21563,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"() {
@@ -22614,7 +22483,6 @@ function PortfolioMenu() {
   const { t } = useT();
   const qc = (0, import_react_query40.useQueryClient)();
   const address = useSession((st) => st.address);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const {
     assets: blockscoutAssets,
     refreshBalances: refreshBlockscoutBalances,
@@ -22631,57 +22499,47 @@ function PortfolioMenu() {
     Promise.all(shownProjectAssets.map((asset) => qc.invalidateQueries({ queryKey: asset.balanceQueryKey })));
     refreshBlockscoutBalances();
   }, [qc, shownProjectAssets, refreshBlockscoutBalances]);
-  return /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
-    "div",
-    {
-      style: {
-        "--ui-kit-scrollbar-mah": `${maxScrollHeight}px`,
-        "--ui-kit-list-scrollbar-pd-r": "var(--ui-kit-pd)"
+  return /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: "Back",
+          onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
+          children: /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.ArrowLeft, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)("span", { className: "text-xl font-semibold", children: t("passport:portfolioMenu.title") }),
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
+        Button,
+        {
+          title: "Refresh balances",
+          variant: "ghost",
+          size: "icon",
+          onClick: refreshAllAssetsBalances,
+          disabled: isBlockscoutLoading || isBlockscoutFetching,
+          children: isBlockscoutLoading || isBlockscoutFetching ? /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.Loader, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.RefreshCw, { className: "h-4 w-4" })
+        }
+      )
+    ] }),
+    isBlockscoutLoading && /* @__PURE__ */ (0, import_jsx_runtime95.jsx)("div", { className: "w-full flex items-center justify-center gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.Loader, { className: "w-4 h-4 animate-spin" }) }),
+    !isBlockscoutLoading && blockscoutAssets?.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Highlight, { type: "info", className: "flex flex-col items-center justify-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.Gem, { className: "w-8 h-8" }),
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)("span", { className: "block", children: t("passport:portfolioMenu.noAssets") })
+    ] }),
+    !isBlockscoutLoading && shownProjectAssets?.map((asset, index) => /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(PortfolioItem, { isProjectAsset: true, address, asset }, `project-${asset.symbol}-${index}`)),
+    !isBlockscoutLoading && blockscoutAssets?.length > 0 && blockscoutAssets.map((asset, index) => /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
+      PortfolioItem,
+      {
+        address,
+        asset
       },
-      className: "list-scrollbar-y w-full p-[var(--ui-kit-pd)]",
-      children: /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: "Back",
-              onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
-              children: /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.ArrowLeft, { className: "h-4 w-4" })
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime95.jsx)("span", { className: "text-xl font-semibold", children: t("passport:portfolioMenu.title") }),
-          /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
-            Button,
-            {
-              title: "Refresh balances",
-              variant: "ghost",
-              size: "icon",
-              onClick: refreshAllAssetsBalances,
-              disabled: isBlockscoutLoading || isBlockscoutFetching,
-              children: isBlockscoutLoading || isBlockscoutFetching ? /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.Loader, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.RefreshCw, { className: "h-4 w-4" })
-            }
-          )
-        ] }),
-        isBlockscoutLoading && /* @__PURE__ */ (0, import_jsx_runtime95.jsx)("div", { className: "w-full flex items-center justify-center gap-[var(--ui-kit-gap)] p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.Loader, { className: "w-4 h-4 animate-spin" }) }),
-        !isBlockscoutLoading && blockscoutAssets?.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Highlight, { type: "info", className: "flex flex-col items-center justify-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_lucide_react53.Gem, { className: "w-8 h-8" }),
-          /* @__PURE__ */ (0, import_jsx_runtime95.jsx)("span", { className: "block", children: t("passport:portfolioMenu.noAssets") })
-        ] }),
-        !isBlockscoutLoading && shownProjectAssets?.map((asset, index) => /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(PortfolioItem, { isProjectAsset: true, address, asset }, `project-${asset.symbol}-${index}`)),
-        !isBlockscoutLoading && blockscoutAssets?.length > 0 && blockscoutAssets.map((asset, index) => /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(
-          PortfolioItem,
-          {
-            address,
-            asset
-          },
-          `${asset.type}-${asset.address || "native"}-${asset.tokenId || index}`
-        )),
-        blockscoutError && /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Highlight, { type: "error", children: blockscoutError?.message })
-      ] })
-    }
-  );
+      `${asset.type}-${asset.address || "native"}-${asset.tokenId || index}`
+    )),
+    blockscoutError && /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Highlight, { type: "error", children: blockscoutError?.message })
+  ] });
 }
 var import_react_query40, import_lucide_react53, import_react69, import_jsx_runtime95;
 var init_PortfolioMenu = __esm({
@@ -22694,7 +22552,6 @@ var init_PortfolioMenu = __esm({
     import_react69 = require("react");
     init_useBlockscoutAssets2();
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_button();
     init_highlight();
@@ -22790,21 +22647,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
 function ReceiveMenu() {
   const { t } = useT();
@@ -22817,7 +22659,6 @@ function ReceiveMenu() {
     queryKey: [QUERY_KEYS.nicknameInfo, address],
     queryFn: async () => await getNicknameInfo()
   });
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const [qrCodeUrl, setQrCodeUrl] = (0, import_react70.useState)("");
   const [isAddressCopied, setAddressCopied] = (0, import_react70.useState)(false);
   const [isNicknameCopied, setNicknameCopied] = (0, import_react70.useState)(false);
@@ -22839,107 +22680,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__ */ (0, import_jsx_runtime96.jsxs)(
-    "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__ */ (0, import_jsx_runtime96.jsxs)("div", { className: "w-full flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              title: "Back",
-              onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
-              children: /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.ArrowLeft, { className: "h-4 w-4" })
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "text-xl font-semibold", children: t("passport:receiveMenu.title") })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.scanQR") }),
-        /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(Highlight, { className: "text-center", type: "warning", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("strong", { className: "block w-full", children: `${t("passport:common.network")}: ${chainConfig.name}` }),
-          /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block w-full", children: t("passport:receiveMenu.warning") })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("div", { className: "flex items-center justify-center p-[var(--ui-kit-pd)]", style: { minHeight: "216px" }, children: qrCodeUrl && /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("img", { src: qrCodeUrl, alt: "Wallet QR Code", className: "w-48 h-48" }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.address") }),
-        /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(
-          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__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Wallet2Icon, { className: "h-4 w-4 flex-none" }),
-              /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)("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__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.CheckCircle2, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Copy, { className: "h-4 w-4 flex-none" })
-            ]
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.nickname") }),
-        /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(
-          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__ */ (0, import_jsx_runtime96.jsx)("div", { className: "flex-1", children: /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.LoaderIcon, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(import_jsx_runtime96.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.AtSignIcon, { className: "h-4 w-4 flex-none" }),
-              /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: cn2("text-xs flex-1", { "text-[var(--ui-kit-bg-success)]": isNicknameCopied }), children: nicknameInfo.handle }),
-              isNicknameCopied ? /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.CheckCircle2, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Copy, { className: "h-4 w-4 flex-none" })
-            ] })
-          }
-        ),
-        fingerprint && /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(import_jsx_runtime96.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.identity") }),
-          /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(
-            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__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.FingerprintIcon, { className: "w-4 h-4 flex-none" }),
-                /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: cn2("text-xs font-bold flex-1", { "text-[var(--ui-kit-bg-success)]": fingerprintCopied }), children: fingerprint }),
-                fingerprintCopied ? /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.CheckCircle2, { className: "w-4 h-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Copy, { className: "w-4 h-4 flex-none" })
-              ]
-            }
-          )
+  return /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)("div", { className: "w-full flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          title: "Back",
+          onClick: () => useLayoutDataStore.getState().setPage("main-menu" /* MAIN_MENU */),
+          children: /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.ArrowLeft, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "text-xl font-semibold", children: t("passport:receiveMenu.title") })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "text-xs text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.scanQR") }),
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(Highlight, { className: "text-center", type: "warning", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("strong", { className: "block w-full", children: `${t("passport:common.network")}: ${chainConfig.name}` }),
+      /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block w-full", children: t("passport:receiveMenu.warning") })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("div", { className: "flex items-center justify-center p-[var(--ui-kit-pd)]", style: { minHeight: "216px" }, children: qrCodeUrl && /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("img", { src: qrCodeUrl, alt: "Wallet QR Code", className: "w-48 h-48" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.address") }),
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(
+      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__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Wallet2Icon, { className: "h-4 w-4 flex-none" }),
+          /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)("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__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.CheckCircle2, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Copy, { className: "h-4 w-4 flex-none" })
+        ]
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.nickname") }),
+    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(
+      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__ */ (0, import_jsx_runtime96.jsx)("div", { className: "flex-1", children: /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.LoaderIcon, { className: "w-4 h-4 animate-spin" }) }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(import_jsx_runtime96.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.AtSignIcon, { className: "h-4 w-4 flex-none" }),
+          /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: cn2("text-xs flex-1", { "text-[var(--ui-kit-bg-success)]": isNicknameCopied }), children: nicknameInfo.handle }),
+          isNicknameCopied ? /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.CheckCircle2, { className: "h-4 w-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Copy, { className: "h-4 w-4 flex-none" })
         ] })
-      ]
-    }
-  );
+      }
+    ),
+    fingerprint && /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(import_jsx_runtime96.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: "block text-xs leading-4 text-[var(--ui-kit-fg-muted)]", children: t("passport:receiveMenu.share.identity") }),
+      /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(
+        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__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.FingerprintIcon, { className: "w-4 h-4 flex-none" }),
+            /* @__PURE__ */ (0, import_jsx_runtime96.jsx)("span", { className: cn2("text-xs font-bold flex-1", { "text-[var(--ui-kit-bg-success)]": fingerprintCopied }), children: fingerprint }),
+            fingerprintCopied ? /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.CheckCircle2, { className: "w-4 h-4 text-[var(--ui-kit-bg-success)] flex-none" }) : /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(import_lucide_react54.Copy, { className: "w-4 h-4 flex-none" })
+          ]
+        }
+      )
+    ] })
+  ] });
 }
 var import_react_query41, import_lucide_react54, import_qrcode, import_react70, import_jsx_runtime96;
 var init_ReceiveMenu = __esm({
@@ -22953,17 +22783,31 @@ 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();
     import_jsx_runtime96 = require("react/jsx-runtime");
   }
 });
 
+// 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"
+      }
+    ];
+  }
+});
+
 // src/internal/components/ReceiveMenu/index.ts
 var init_ReceiveMenu2 = __esm({
   "src/internal/components/ReceiveMenu/index.ts"() {
@@ -22976,9 +22820,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"
       },
@@ -23595,47 +23440,35 @@ var init_Keyshare2 = __esm({
 // src/internal/components/SecurityMenu/SecurityMenu.tsx
 function SecurityMenu() {
   const { t } = useT();
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const appToUntrust = useSecurityStore((st) => st.appToUntrust);
   useOnboardingTourAvailable(!appToUntrust);
-  return /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
-    "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__ */ (0, import_jsx_runtime102.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
-            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__ */ (0, import_jsx_runtime102.jsx)(import_lucide_react60.ArrowLeft, { className: "h-4 w-4" })
+  return /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+        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__ */ (0, import_jsx_runtime102.jsx)("span", { className: "text-xl font-semibold", children: t("passport:securityMenu.title") })
-        ] }),
-        appToUntrust && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(UntrustApplication, {}),
-        !appToUntrust && /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(import_jsx_runtime102.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Keyshare, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ConnectedApps, {})
-        ] })
-      ] })
-    }
-  );
+          },
+          children: /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(import_lucide_react60.ArrowLeft, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)("span", { className: "text-xl font-semibold", children: t("passport:securityMenu.title") })
+    ] }),
+    appToUntrust && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(UntrustApplication, {}),
+    !appToUntrust && /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(import_jsx_runtime102.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Keyshare, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ConnectedApps, {})
+    ] })
+  ] });
 }
 var import_lucide_react60, import_jsx_runtime102;
 var init_SecurityMenu = __esm({
@@ -23643,7 +23476,6 @@ var init_SecurityMenu = __esm({
     init_i18n();
     import_lucide_react60 = require("lucide-react");
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -24699,6 +24531,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 = {
@@ -24718,7 +24551,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,
@@ -24747,7 +24580,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
@@ -27408,7 +27241,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);
@@ -27433,74 +27265,63 @@ function SendFlowSelector() {
   }, []);
   const isSendFlowInitialState = selectorFlow === "send" && sendStep === "input" || selectorFlow === "bridge" && bridgeStep === "select";
   const isFlowSelectorButtonsShown = !!config?.current?.features?.showAssetBridge && isSendFlowInitialState;
-  return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-    "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__ */ (0, import_jsx_runtime120.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)("div", { className: "flex items-center justify-between", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-              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__ */ (0, import_jsx_runtime120.jsx)(import_lucide_react73.ArrowLeft, { className: "h-4 w-4" })
+  return /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)("div", { className: "flex items-center justify-between", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+          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__ */ (0, import_jsx_runtime120.jsx)("span", { className: "text-xl font-semibold", children: menuTitle })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsx)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(BridgeHistorySwitch, {}) })
-        ] }),
-        isFlowSelectorButtonsShown && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(SelectorFlowButtons, {}),
-        availableFlows[selectorFlow],
-        sendOrBridgeError && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Highlight, { type: "error", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsx)("span", { children: sendOrBridgeError }),
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-            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__ */ (0, import_jsx_runtime120.jsx)(import_lucide_react73.ArrowLeft, { className: "h-4 w-4" })
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime120.jsx)("span", { className: "text-xl font-semibold", children: menuTitle })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime120.jsx)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(BridgeHistorySwitch, {}) })
+    ] }),
+    isFlowSelectorButtonsShown && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(SelectorFlowButtons, {}),
+    availableFlows[selectorFlow],
+    sendOrBridgeError && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Highlight, { type: "error", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime120.jsx)("span", { children: sendOrBridgeError }),
+      /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+        Button,
+        {
+          variant: "default",
+          size: "medium",
+          className: "w-full",
+          onClick: () => useFlowSelectorStore.getState().setError(null),
+          children: t("passport:common.hide")
+        }
+      )
+    ] })
+  ] });
 }
 var import_lucide_react73, import_react89, import_jsx_runtime120;
 var init_SendFlowSelector = __esm({
@@ -27510,7 +27331,6 @@ var init_SendFlowSelector = __esm({
     import_lucide_react73 = require("lucide-react");
     import_react89 = require("react");
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_utils();
     init_Expandable2();
     init_Onboarding();
@@ -28185,20 +28005,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", {
@@ -28397,7 +28203,6 @@ function TransactionsMenu() {
   const { t } = useT();
   useOnboardingTourAvailable(true);
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const [expandedGroups, setExpandedGroups] = (0, import_react91.useState)({});
   const historySupported = isTransactionHistorySupported(chainConfig?.id);
   const {
@@ -28416,50 +28221,39 @@ function TransactionsMenu() {
     [qc, chainConfig.id, address]
   );
   const txHistoryResolvedError = txHistoryError ? txHistoryError instanceof Error ? txHistoryError.message : "Failed to load transactions" : null;
-  return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
-    "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__ */ (0, import_jsx_runtime122.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.ArrowLeft, { className: "h-4 w-4" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { className: "text-xl font-semibold", children: t("passport:transactionsMenu.title") }),
+      historySupported && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
+        Button,
+        {
+          variant: "ghost",
+          size: "icon",
+          onClick: refreshTxHistory,
+          disabled: isTxHistoryFetching,
+          title: "Refresh transactions",
+          children: isTxHistoryFetching ? /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.Loader, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.RefreshCw, { className: "h-4 w-4" })
+        }
+      )
+    ] }),
+    !historySupported && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Highlight, { type: "warning", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { children: t("passport:transactionsMenu.comingSoon") }) }),
+    historySupported && isTxHistoryLoading && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("div", { className: "flex items-center justify-center p-8", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.Loader, { className: "w-4 h-4 animate-spin" }) }),
+    historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Highlight, { type: "info", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { children: t("passport:transactionsMenu.noTransactions") }) }),
+    historySupported && !isTxHistoryLoading && txHistoryResolvedError && /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.XCircle, { className: "w-4 h-4 flex-none" }),
+      /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { className: "block w-full flex-1 text-center text-xs", children: txHistoryResolvedError })
+    ] }),
+    historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: txHistoryGroups.map((group) => /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
+      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__ */ (0, import_jsx_runtime122.jsxs)(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("settings" /* SETTINGS */), children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.ArrowLeft, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { className: "text-xl font-semibold", children: t("passport:transactionsMenu.title") }),
-          historySupported && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
-            Button,
-            {
-              variant: "ghost",
-              size: "icon",
-              onClick: refreshTxHistory,
-              disabled: isTxHistoryFetching,
-              title: "Refresh transactions",
-              children: isTxHistoryFetching ? /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.Loader, { className: "h-4 w-4 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.RefreshCw, { className: "h-4 w-4" })
-            }
-          )
-        ] }),
-        !historySupported && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Highlight, { type: "warning", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { children: t("passport:transactionsMenu.comingSoon") }) }),
-        historySupported && isTxHistoryLoading && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("div", { className: "flex items-center justify-center p-8", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.Loader, { className: "w-4 h-4 animate-spin" }) }),
-        historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Highlight, { type: "info", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { children: t("passport:transactionsMenu.noTransactions") }) }),
-        historySupported && !isTxHistoryLoading && txHistoryResolvedError && /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Highlight, { type: "error", className: "flex gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_lucide_react75.XCircle, { className: "w-4 h-4 flex-none" }),
-          /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("span", { className: "block w-full flex-1 text-center text-xs", children: txHistoryResolvedError })
-        ] }),
-        historySupported && !isTxHistoryLoading && !txHistoryResolvedError && txHistoryGroups.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)("div", { className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: txHistoryGroups.map((group) => /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
-          TransactionsGroup,
-          {
-            group,
-            expanded: expandedGroups[group.id] ?? false,
-            onToggleExpanded: (groupId) => setExpandedGroups((prev) => ({ ...prev, [groupId]: !prev[groupId] }))
-          },
-          group.id
-        )) })
-      ] })
-    }
-  );
+      group.id
+    )) })
+  ] });
 }
 var import_react_query53, import_lucide_react75, import_react91, import_jsx_runtime122;
 var init_TransactionsMenu = __esm({
@@ -28470,7 +28264,6 @@ var init_TransactionsMenu = __esm({
     import_lucide_react75 = require("lucide-react");
     import_react91 = require("react");
     init_useLayoutDataStore();
-    init_useLayoutStore();
     init_Expandable2();
     init_Onboarding();
     init_button();
@@ -28482,6 +28275,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"() {
@@ -28509,21 +28317,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
 function useSettingsButtons(chainId) {
   const config = useProviderConfig().config;
@@ -28576,41 +28369,30 @@ function SettingsMenu() {
     queryFn: getNicknameInfo
   });
   const highlightedKeys = settingsNotifications.map((n) => n.target);
-  return /* @__PURE__ */ (0, import_jsx_runtime123.jsxs)(
-    "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__ */ (0, import_jsx_runtime123.jsxs)(Expandable, { isExpanded: true, contentClassName: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime123.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(import_lucide_react77.ArrowLeft, { className: "h-4 w-4" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime123.jsx)("span", { className: "text-xl font-semibold", children: t("passport:common.settings") })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime123.jsx)("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__ */ (0, import_jsx_runtime123.jsxs)(
+      Button,
+      {
+        variant: "secondary",
+        size: "large",
+        onClick,
+        disabled: !address,
+        className: cn2(
+          "w-full items-center justify-start",
+          highlightedKeys.includes(id) && "animate-glow-warning"
+        ),
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Icon2, { className: "w-4 h-4" }),
+          /* @__PURE__ */ (0, import_jsx_runtime123.jsx)("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__ */ (0, import_jsx_runtime123.jsxs)("div", { className: "flex items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Button, { variant: "ghost", size: "icon", title: "Back", onClick: () => setPage("main-menu" /* MAIN_MENU */), children: /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(import_lucide_react77.ArrowLeft, { className: "h-4 w-4" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime123.jsx)("span", { className: "text-xl font-semibold", children: t("passport:common.settings") })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime123.jsx)("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__ */ (0, import_jsx_runtime123.jsxs)(
-          Button,
-          {
-            variant: "secondary",
-            size: "large",
-            onClick,
-            disabled: !address,
-            className: cn2(
-              "w-full items-center justify-start",
-              highlightedKeys.includes(id) && "animate-glow-warning"
-            ),
-            children: [
-              /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Icon2, { className: "w-4 h-4" }),
-              /* @__PURE__ */ (0, import_jsx_runtime123.jsx)("span", { children: t(name) })
-            ]
-          },
-          id
-        )) })
-      ]
-    }
-  );
+      id
+    )) })
+  ] });
 }
 var import_react_query54, import_lucide_react77, import_react92, import_jsx_runtime123;
 var init_SettingsMenu = __esm({
@@ -28627,16 +28409,31 @@ 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();
     import_jsx_runtime123 = require("react/jsx-runtime");
   }
 });
 
+// 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"
+      }
+    ];
+  }
+});
+
 // src/internal/components/SettingsMenu/index.ts
 var init_SettingsMenu2 = __esm({
   "src/internal/components/SettingsMenu/index.ts"() {
@@ -28858,35 +28655,25 @@ var init_PageMap = __esm({
 // src/internal/hooks/usePageMapper.tsx
 function usePageMapper() {
   const page = useLayoutDataStore((st) => st.page);
-  const {
-    setDialogTitle,
-    setDialogDescription,
-    setIsDialogForced,
-    setDialogContent,
-    setIsDialogOpen,
-    setIsDialogClosing
-  } = useLayoutStore();
   const closeDialog = (0, import_react93.useCallback)(() => {
-    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 = (0, import_react93.useCallback)(
-    (pageItem) => {
-      const PageContentComponent = pageItem.component;
-      setDialogTitle(pageItem.title);
-      setDialogDescription(pageItem.description);
-      setDialogContent(/* @__PURE__ */ (0, import_jsx_runtime125.jsx)(PageContentComponent, {}));
-      setIsDialogOpen(true);
-    },
-    [setDialogContent, setDialogDescription, setDialogTitle, setIsDialogOpen]
-  );
+  }, []);
+  const openDialog = (0, import_react93.useCallback)((pageItem) => {
+    useLayoutStore.setState({
+      dialogContent: /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(pageItem.component, {}),
+      isDialogOpen: true
+      // isDialogAnimating: true
+    });
+  }, []);
   (0, import_react93.useEffect)(() => {
     if (page === null) return closeDialog();
     const pageItem = PAGE_MAP[page];
@@ -28957,7 +28744,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.93",
+      version: "0.4.94",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -29220,9 +29007,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();
@@ -29433,7 +29220,7 @@ var init_Header2 = __esm({
 // src/internal/components/ui/dialog.tsx
 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,
@@ -29619,12 +29406,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();
-  (0, import_react98.useEffect)(() => setIsSettings(!!session), [session, setIsSettings]);
+  (0, import_react98.useEffect)(() => useLayoutStore.setState({ isSettings: !!session }), [session]);
   usePageMapper();
   useAutoConnect();
   useBackupStatusChanges();
@@ -29639,6 +29424,7 @@ function Dialog2() {
       onOpenChange: (open) => {
         if (isDialogForced) return;
         if (!open) {
+          const { setPostAuthNavigation, setPage } = useLayoutDataStore.getState();
           setPostAuthNavigation(null);
           setPage(null);
         }
@@ -29650,18 +29436,29 @@ function Dialog2() {
           colorMode,
           className,
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(VisuallyHidden, { children: /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(DialogTitle, { children: dialogTitle }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(DialogDescription, { className: "sr-only", children: dialogDescription }),
+            /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(VisuallyHidden, { children: /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(DialogTitle, { children: "embarkAI" }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(DialogDescription, { className: "sr-only", children: "embarkAI wallet" }),
             !isHeaderHidden && /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(Header, {}),
             /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(import_react97.AnimatePresence, { mode: "wait", initial: false, children: /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(
               import_react97.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__ */ (0, import_jsx_runtime130.jsx)(
+                  "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"
             ) }),
@@ -29672,7 +29469,7 @@ function Dialog2() {
     }
   );
 }
-var import_react97, import_react98, import_jsx_runtime130, EMBARKAI_DIALOG_ONBOARDING_ID;
+var import_react97, import_react98, import_jsx_runtime130;
 var init_Dialog = __esm({
   "src/internal/components/Dialog/Dialog.tsx"() {
     init_ProviderContext();
@@ -29694,7 +29491,6 @@ var init_Dialog = __esm({
     init_dialog();
     init_visually_hidden();
     import_jsx_runtime130 = require("react/jsx-runtime");
-    EMBARKAI_DIALOG_ONBOARDING_ID = "embark-main-dialog-content";
   }
 });