@bigbinary/neeto-molecules 4.1.68 → 4.1.70

package/dist/cjs/v2/FloatingActionMenu.js

@@ -24,11 +24,10 @@ var reactQuery = require('@tanstack/react-query');
 var axios = require('axios');
 var search = require('../search-BBuFYdmG.js');
 var useBreakpoints = require('@bigbinary/neeto-commons-frontend/react-utils/useBreakpoints');
+var i18next = require('i18next');
+var createLucideIcon = require('../createLucideIcon-DBDhE7kE.js');
 var circleQuestionMark = require('../circle-question-mark-kxBMPyWQ.js');
 var chevronRight = require('../chevron-right-DpleLIQp.js');
-var createLucideIcon = require('../createLucideIcon-DBDhE7kE.js');
-var _objectDestructuringEmpty = require('@babel/runtime/helpers/objectDestructuringEmpty');
-var i18next = require('i18next');
 var user = require('../user-Ku5LVfLy.js');
 var useLocalStorage = require('@bigbinary/neeto-commons-frontend/react-utils/useLocalStorage');
 var utils = require('@bigbinary/neeto-commons-frontend/utils');
@@ -253,8 +252,8 @@ var SPECIAL_APP_NAMES = {
 };
 
 var _excluded$3 = ["name", "description", "url", "isHighlighted"];
-function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ProductLink$1 = function ProductLink(_ref) {
   var _globalProps, _globalProps2;
   var name = _ref.name,
@@ -268,7 +267,7 @@ var ProductLink$1 = function ProductLink(_ref) {
   var safeName = name || "";
   var appName = "Neeto".concat(safeName.charAt(0)).concat(safeName.slice(1).toLowerCase());
   var AppIcon = specialCase ? AppIcons__namespace["Neeto".concat(specialCase)] : AppIcons__namespace[appName];
-  return /*#__PURE__*/jsxRuntime.jsxs("a", _objectSpread$b(_objectSpread$b({
+  return /*#__PURE__*/jsxRuntime.jsxs("a", _objectSpread$7(_objectSpread$7({
     "data-testid": "".concat(normalizedName, "-app-link"),
     href: url,
     rel: "noreferrer",
@@ -296,8 +295,8 @@ var ProductLink$1 = function ProductLink(_ref) {
 };
 var ProductLink = /*#__PURE__*/React.memo(ProductLink$1);
 
-function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Content = function Content(_ref) {
   var highlightedIndex = _ref.highlightedIndex,
     filteredApps = _ref.filteredApps,
@@ -315,7 +314,7 @@ var Content = function Content(_ref) {
   return (filteredApps === null || filteredApps === void 0 ? void 0 : filteredApps.length) > 0 ? /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "grid grid-cols-[repeat(auto-fill,minmax(288px,1fr))] gap-3 max-lg:grid-cols-[repeat(auto-fill,minmax(248px,1fr))] max-sm:grid-cols-1",
     children: filteredApps.map(function (app, index) {
-      return /*#__PURE__*/jsxRuntime.jsx(ProductLink, _objectSpread$a(_objectSpread$a({}, app), {}, {
+      return /*#__PURE__*/jsxRuntime.jsx(ProductLink, _objectSpread$6(_objectSpread$6({}, app), {}, {
         "data-highlighted-index": index,
         isHighlighted: index === highlightedIndex
       }), app.name);
@@ -338,10 +337,10 @@ var neetoAppsApi = {
   fetch: fetch$1
 };
 
-function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useFetchNeetoApps = function useFetchNeetoApps(options) {
-  return reactQuery.useQuery(_objectSpread$9({
+  return reactQuery.useQuery(_objectSpread$5({
     queryKey: [QUERY_KEYS$1.NEETO_APPS_LIST],
     queryFn: neetoAppsApi.fetch,
     staleTime: 5 * 60 * 1000
@@ -533,141 +532,161 @@ var Modal = reactUtils.withT(function (_ref) {
   });
 });
 
-var MENU_ITEM_CLASS$1 = "flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium hover:bg-accent";
+var MY_ORGANIZATION_URL = "/auth/organization/edit";
+var DELETE_WORKSPACE_URL = "/auth/organization/delete";
+var ENGAGE_WIDGET_TRIGGER_ID = "neetoengage-trigger";
+var DEFAULT_MENU_LINK_PROPS = {
+  engageProps: {
+    id: ENGAGE_WIDGET_TRIGGER_ID,
+    label: i18next.t("neetoMolecules.sidebar.helpLinks.whatsNew"),
+    "data-testid": "help-link-engage-button"
+  },
+  keyboardShortcutProps: {
+    label: i18next.t("neetoMolecules.sidebar.helpLinks.keyboardShortcuts"),
+    "data-testid": "help-link-keyboard-shortcut-button"
+  }
+};
+
+// Theme switcher
+var APP_THEME_LOCALSTORAGE_KEY = "appTheme";
+var THEMES = {
+  LIGHT: "light",
+  DARK: "dark"
+};
 
-function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var MenuButton$4 = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _useTranslation = reactI18next.useTranslation(),
-    t = _useTranslation.t;
-  return /*#__PURE__*/jsxRuntime.jsxs("button", _objectSpread$8(_objectSpread$8({
-    ref: ref,
-    className: "group hover:bg-accent flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium",
-    "data-testid": "help-menu-button",
-    type: "button"
-  }, props), {}, {
-    children: [/*#__PURE__*/jsxRuntime.jsx(circleQuestionMark.CircleQuestionMark, {
-      size: 18
-    }), /*#__PURE__*/jsxRuntime.jsx("span", {
-      className: "flex-grow text-start",
-      children: t("neetoMolecules.sidebar.help")
-    }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
-      className: "transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
-      size: 18
-    })]
-  }));
+// Legacy neetoUI theme classes — kept until full migration is complete.
+var LEGACY_THEMES = {
+  LIGHT: "neeto-ui-theme--light",
+  DARK: "neeto-ui-theme--dark"
+};
+var NEETO_AUTH_BILLING_INFO_URL = "/neeto_sso/api/v1/subscription/billing";
+var MENU_ITEM_CLASSES = "gap-2.5 px-2.5 py-2 font-medium [&>[data-slot=menu-item-prefix]>svg]:!size-[18px] [&>[data-slot=menu-item-suffix]>svg]:!size-[18px]";
+var THEME_BUTTON_BASE = "relative z-10 flex items-center justify-center gap-1 rounded-md px-2.5 py-1.5 text-xs font-medium transition-colors focus-visible:outline-none";
+var THEME_ICON_BASE = "transition-transform duration-300 ease-out";
+
+var _excluded$2 = ["className"];
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var MenuItem = /*#__PURE__*/React.forwardRef(function (_ref, forwardedRef) {
+  var className = _ref.className,
+    props = _objectWithoutProperties(_ref, _excluded$2);
+  return /*#__PURE__*/jsxRuntime.jsx(neetoAtoms.DropdownMenu.MenuItem, _objectSpread$4({
+    className: classnames(MENU_ITEM_CLASSES, className),
+    ref: forwardedRef
+  }, props));
 });
-MenuButton$4.displayName = "HelpMenuButton";
+MenuItem.displayName = "FloatingActionMenu.MenuItem";
 
 var HelpItems = reactUtils.withT(function (_ref) {
   var _globalProps;
   var t = _ref.t;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/jsxRuntime.jsxs("a", {
-      className: MENU_ITEM_CLASS$1,
+    children: [/*#__PURE__*/jsxRuntime.jsx(MenuItem, {
       "data-testid": "help-link-help-articles-button",
       href: "https://help.".concat(ramda.toLower(((_globalProps = globalProps) === null || _globalProps === void 0 ? void 0 : _globalProps.appName) || ""), ".com/"),
+      prefix: /*#__PURE__*/jsxRuntime.jsx(BookOpen, {
+        size: 18
+      }),
       rel: "noreferrer",
       target: "_blank",
-      children: [/*#__PURE__*/jsxRuntime.jsx(BookOpen, {
-        size: 18
-      }), t("neetoMolecules.sidebar.helpLinks.helpArticles")]
-    }), /*#__PURE__*/jsxRuntime.jsxs("button", {
-      className: MENU_ITEM_CLASS$1,
+      children: t("neetoMolecules.sidebar.helpLinks.helpArticles")
+    }), /*#__PURE__*/jsxRuntime.jsx(MenuItem, {
       "data-testid": "help-link-live-chat-button",
-      type: "button",
+      prefix: /*#__PURE__*/jsxRuntime.jsx(MessageCircleQuestionMark, {
+        size: 18
+      }),
       onClick: function onClick() {
         var _window$NeetoChat, _window$NeetoChat2;
         (_window$NeetoChat = window.NeetoChat) === null || _window$NeetoChat === void 0 || (_window$NeetoChat = _window$NeetoChat.contextualHelp) === null || _window$NeetoChat === void 0 || _window$NeetoChat.maximizeWidget();
         (_window$NeetoChat2 = window.NeetoChat) === null || _window$NeetoChat2 === void 0 || (_window$NeetoChat2 = _window$NeetoChat2.contextualHelp) === null || _window$NeetoChat2 === void 0 || _window$NeetoChat2.openWidget();
       },
-      children: [/*#__PURE__*/jsxRuntime.jsx(MessageCircleQuestionMark, {
-        size: 18
-      }), t("neetoMolecules.sidebar.helpLinks.liveChat")]
-    }), /*#__PURE__*/jsxRuntime.jsxs("a", {
-      className: MENU_ITEM_CLASS$1,
+      children: t("neetoMolecules.sidebar.helpLinks.liveChat")
+    }), /*#__PURE__*/jsxRuntime.jsx(MenuItem, {
       "data-testid": "help-link-community-button",
       href: "https://www.launchpass.com/neetohq",
+      prefix: /*#__PURE__*/jsxRuntime.jsx(Users, {
+        size: 18
+      }),
       rel: "noreferrer",
       target: "_blank",
-      children: [/*#__PURE__*/jsxRuntime.jsx(Users, {
-        size: 18
-      }), t("neetoMolecules.sidebar.helpLinks.askTheCommunity")]
-    }), /*#__PURE__*/jsxRuntime.jsxs("a", {
-      className: MENU_ITEM_CLASS$1,
+      children: t("neetoMolecules.sidebar.helpLinks.askTheCommunity")
+    }), /*#__PURE__*/jsxRuntime.jsx(MenuItem, {
       "data-testid": "help-link-status-button",
       href: "https://neetostatus.com/",
+      prefix: /*#__PURE__*/jsxRuntime.jsx(Activity, {
+        size: 18
+      }),
       rel: "noreferrer",
       target: "_blank",
-      children: [/*#__PURE__*/jsxRuntime.jsx(Activity, {
-        size: 18
-      }), t("neetoMolecules.sidebar.helpLinks.systemStatus")]
+      children: t("neetoMolecules.sidebar.helpLinks.systemStatus")
     })]
   });
 });
-var HelpMenu = function HelpMenu() {
+
+var MobileHelpMenu = function MobileHelpMenu() {
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var timeoutRef = React.useRef(null);
-  var _useBreakpoints = useBreakpoints(),
-    isSize = _useBreakpoints.isSize;
-  var isMobile = isSize("mobile");
-  var handleMouseEnter = React.useCallback(function () {
-    clearTimeout(timeoutRef.current);
-    setOpen(true);
-  }, []);
-  var handleMouseLeave = React.useCallback(function () {
-    timeoutRef.current = setTimeout(function () {
-      return setOpen(false);
-    }, 150);
-  }, []);
-  if (isMobile) {
-    return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
-      open: open,
-      onOpenChange: setOpen,
-      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
-        asChild: true,
-        children: /*#__PURE__*/jsxRuntime.jsx(MenuButton$4, {})
-      }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
-        className: "flex flex-col gap-0.5 ps-6 pt-1",
-        children: /*#__PURE__*/jsxRuntime.jsx(HelpItems, {})
-      })]
-    });
-  }
-  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Popover, {
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
     open: open,
     onOpenChange: setOpen,
-    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.PopoverAnchor, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
       asChild: true,
-      children: /*#__PURE__*/jsxRuntime.jsx(MenuButton$4, {
-        onClick: function onClick() {
-          return setOpen(function (prev) {
-            return !prev;
-          });
+      children: /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuItem, {
+        className: classnames("group", MENU_ITEM_CLASSES),
+        "data-testid": "help-menu-button",
+        onSelect: function onSelect(e) {
+          return e.preventDefault();
         },
-        onMouseEnter: handleMouseEnter,
-        onMouseLeave: handleMouseLeave
+        children: [/*#__PURE__*/jsxRuntime.jsx(circleQuestionMark.CircleQuestionMark, {
+          className: "size-[18px] shrink-0"
+        }), /*#__PURE__*/jsxRuntime.jsx("span", {
+          className: "flex-1 truncate",
+          children: t("neetoMolecules.sidebar.help")
+        }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
+          className: "ms-auto shrink-0 transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
+          size: 18
+        })]
       })
-    }), /*#__PURE__*/jsxRuntime.jsx(primitives.PopoverContent, {
-      align: "center",
-      className: "z-[99999] w-56 gap-0.5 p-1",
-      side: "right",
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
+      className: "flex flex-col gap-0.5 ps-6 pt-1",
+      children: /*#__PURE__*/jsxRuntime.jsx(HelpItems, {})
+    })]
+  });
+};
+
+var HelpMenu = function HelpMenu() {
+  var _useBreakpoints = useBreakpoints(),
+    isSize = _useBreakpoints.isSize;
+  var isMobile = isSize("mobile");
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  if (isMobile) return /*#__PURE__*/jsxRuntime.jsx(MobileHelpMenu, {});
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuSub, {
+    children: [/*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuSubTrigger, {
+      className: MENU_ITEM_CLASSES,
+      "data-testid": "help-menu-button",
+      children: [/*#__PURE__*/jsxRuntime.jsx(circleQuestionMark.CircleQuestionMark, {
+        className: "size-[18px]"
+      }), /*#__PURE__*/jsxRuntime.jsx("span", {
+        className: "flex-1",
+        children: t("neetoMolecules.sidebar.help")
+      })]
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubContent, {
+      className: "z-[99999]",
+      collisionPadding: 16,
       sideOffset: 8,
-      onMouseEnter: handleMouseEnter,
-      onMouseLeave: handleMouseLeave,
-      onOpenAutoFocus: function onOpenAutoFocus(e) {
-        return e.preventDefault();
-      },
       children: /*#__PURE__*/jsxRuntime.jsx(HelpItems, {})
     })]
   });
 };
 
-var _excluded$2 = ["label", "icon", "changesCount", "href"];
-function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$1 = ["label", "icon", "changesCount", "href"];
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LinkSection = function LinkSection(_ref) {
   var links = _ref.links;
   if (neetoCist.isNotPresent(links)) return null;
@@ -677,25 +696,21 @@ var LinkSection = function LinkSection(_ref) {
         Icon = _ref2.icon,
         changesCount = _ref2.changesCount,
         href = _ref2.href,
-        otherProps = _objectWithoutProperties(_ref2, _excluded$2);
-      var Tag = href ? "a" : "button";
-      return /*#__PURE__*/jsxRuntime.jsxs(Tag, _objectSpread$7(_objectSpread$7(_objectSpread$7({
-        className: "hover:bg-accent flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium",
+        otherProps = _objectWithoutProperties(_ref2, _excluded$1);
+      return /*#__PURE__*/jsxRuntime.jsx(MenuItem, _objectSpread$3(_objectSpread$3(_objectSpread$3({
         "data-testid": "floating-action-menu-link-section",
-        type: href ? undefined : "button"
+        prefix: Icon && /*#__PURE__*/jsxRuntime.jsx(Icon, {
+          size: 18
+        }),
+        suffix: neetoCist.isPresent(changesCount) && /*#__PURE__*/jsxRuntime.jsx("span", {
+          className: "bg-foreground text-background flex h-[1.125rem] min-w-[1.125rem] items-center justify-center rounded-full px-1 text-[10px] select-none [--accent-foreground:var(--background)]",
+          "data-testid": "help-section-menu-changes-count",
+          children: changesCount
+        })
       }, href ? {
         href: href
       } : {}), otherProps), {}, {
-        children: [Icon && /*#__PURE__*/jsxRuntime.jsx(Icon, {
-          size: 18
-        }), /*#__PURE__*/jsxRuntime.jsxs("span", {
-          className: "flex flex-grow items-center gap-2",
-          children: [label, neetoCist.isPresent(changesCount) && /*#__PURE__*/jsxRuntime.jsx("span", {
-            className: "bg-foreground text-background flex h-[1.125rem] min-w-[1.125rem] shrink-0 items-center justify-center rounded-full px-1 text-[10px] select-none",
-            "data-testid": "help-section-menu-changes-count",
-            children: changesCount
-          })]
-        })]
+        children: label
       }), idx);
     })
   });
@@ -726,28 +741,6 @@ var useFetchLoggedInOrganizations = function useFetchLoggedInOrganizations(email
   });
 };
 
-function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var MenuButton$3 = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _useTranslation = reactI18next.useTranslation(),
-    t = _useTranslation.t;
-  return /*#__PURE__*/jsxRuntime.jsxs("button", _objectSpread$6(_objectSpread$6({
-    ref: ref,
-    className: "group hover:bg-accent flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium",
-    "data-testid": "organization-switcher-button",
-    type: "button"
-  }, props), {}, {
-    children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-      className: "flex-grow text-start",
-      children: t("neetoMolecules.sidebar.organizationSwitcher.label")
-    }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
-      className: "transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
-      size: 18
-    })]
-  }));
-});
-MenuButton$3.displayName = "OrganizationSwitcherMenuButton";
-
 var isCurrentSubdomain = function isCurrentSubdomain(link) {
   try {
     var currentSubdomain = window.location.hostname.split(".")[0];
@@ -757,28 +750,30 @@ var isCurrentSubdomain = function isCurrentSubdomain(link) {
     return false;
   }
 };
+
 var OrganizationItems = reactUtils.withT(function (_ref) {
   var t = _ref.t,
     organizations = _ref.organizations,
     authAppUrl = _ref.authAppUrl;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [organizations === null || organizations === void 0 ? void 0 : organizations.map(function (organization) {
-      return /*#__PURE__*/jsxRuntime.jsxs("a", {
+      var isCurrent = isCurrentSubdomain(organization.organizationUrl);
+      return /*#__PURE__*/jsxRuntime.jsx(MenuItem, {
+        className: classnames({
+          "text-green-600": isCurrent
+        }),
         href: organization.organizationUrl,
         rel: "noreferrer",
         target: "_blank",
-        className: classnames("hover:bg-accent flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium", {
-          "text-green-600": isCurrentSubdomain(organization.organizationUrl)
-        }),
-        children: [organization.orgName, isCurrentSubdomain(organization.organizationUrl) && /*#__PURE__*/jsxRuntime.jsxs(neetoAtoms.Badge, {
+        suffix: isCurrent && /*#__PURE__*/jsxRuntime.jsxs(neetoAtoms.Badge, {
           variant: "default",
           children: [/*#__PURE__*/jsxRuntime.jsx(CircleCheck, {
             size: 12
           }), t("neetoMolecules.sidebar.organizationSwitcher.signedin")]
-        })]
+        }),
+        children: organization.orgName
       }, organization.userId);
-    }), /*#__PURE__*/jsxRuntime.jsx("a", {
-      className: "hover:bg-accent flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium",
+    }), /*#__PURE__*/jsxRuntime.jsx(MenuItem, {
       href: authAppUrl,
       rel: "noreferrer",
       target: "_blank",
@@ -786,70 +781,75 @@ var OrganizationItems = reactUtils.withT(function (_ref) {
     })]
   });
 });
-var OrganizationSwitcher = function OrganizationSwitcher() {
-  var _globalProps$user;
+
+var MobileOrganizationSwitcher = function MobileOrganizationSwitcher(_ref) {
+  var organizations = _ref.organizations,
+    authAppUrl = _ref.authAppUrl;
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var timeoutRef = React.useRef(null);
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
+    open: open,
+    onOpenChange: setOpen,
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
+      asChild: true,
+      children: /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuItem, {
+        className: classnames("group", MENU_ITEM_CLASSES),
+        "data-testid": "organization-switcher-button",
+        onSelect: function onSelect(e) {
+          return e.preventDefault();
+        },
+        children: [/*#__PURE__*/jsxRuntime.jsx("span", {
+          className: "flex-1 truncate",
+          children: t("neetoMolecules.sidebar.organizationSwitcher.label")
+        }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
+          className: "ms-auto shrink-0 transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
+          size: 18
+        })]
+      })
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
+      className: "flex flex-col gap-0.5 ps-6 pt-1",
+      children: /*#__PURE__*/jsxRuntime.jsx(OrganizationItems, {
+        authAppUrl: authAppUrl,
+        organizations: organizations
+      })
+    })]
+  });
+};
+
+var OrganizationSwitcher = function OrganizationSwitcher() {
+  var _globalProps$user;
   var _useBreakpoints = useBreakpoints(),
     isSize = _useBreakpoints.isSize;
   var isMobile = isSize("mobile");
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
   var _useFetchLoggedInOrga = useFetchLoggedInOrganizations(initializers.globalProps === null || initializers.globalProps === void 0 || (_globalProps$user = initializers.globalProps.user) === null || _globalProps$user === void 0 ? void 0 : _globalProps$user.email),
     _useFetchLoggedInOrga2 = _useFetchLoggedInOrga.data,
     _useFetchLoggedInOrga3 = _useFetchLoggedInOrga2 === void 0 ? {} : _useFetchLoggedInOrga2,
     organizations = _useFetchLoggedInOrga3.organizations,
     authAppUrl = _useFetchLoggedInOrga3.authAppUrl;
-  var handleMouseEnter = React.useCallback(function () {
-    clearTimeout(timeoutRef.current);
-    setOpen(true);
-  }, []);
-  var handleMouseLeave = React.useCallback(function () {
-    timeoutRef.current = setTimeout(function () {
-      return setOpen(false);
-    }, 150);
-  }, []);
   if (isMobile) {
-    return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
-      open: open,
-      onOpenChange: setOpen,
-      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
-        asChild: true,
-        children: /*#__PURE__*/jsxRuntime.jsx(MenuButton$3, {})
-      }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
-        className: "flex flex-col gap-0.5 ps-6 pt-1",
-        children: /*#__PURE__*/jsxRuntime.jsx(OrganizationItems, {
-          authAppUrl: authAppUrl,
-          organizations: organizations
-        })
-      })]
+    return /*#__PURE__*/jsxRuntime.jsx(MobileOrganizationSwitcher, {
+      authAppUrl: authAppUrl,
+      organizations: organizations
     });
   }
-  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Popover, {
-    open: open,
-    onOpenChange: setOpen,
-    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.PopoverAnchor, {
-      asChild: true,
-      children: /*#__PURE__*/jsxRuntime.jsx(MenuButton$3, {
-        onClick: function onClick() {
-          return setOpen(function (prev) {
-            return !prev;
-          });
-        },
-        onMouseEnter: handleMouseEnter,
-        onMouseLeave: handleMouseLeave
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuSub, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubTrigger, {
+      className: MENU_ITEM_CLASSES,
+      "data-testid": "organization-switcher-button",
+      children: /*#__PURE__*/jsxRuntime.jsx("span", {
+        className: "flex-1",
+        children: t("neetoMolecules.sidebar.organizationSwitcher.label")
       })
-    }), /*#__PURE__*/jsxRuntime.jsx(primitives.PopoverContent, {
-      align: "center",
-      className: "z-[99999] w-56 gap-0.5 p-1",
-      side: "right",
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubContent, {
+      className: "z-[99999]",
+      collisionPadding: 16,
       sideOffset: 8,
-      onMouseEnter: handleMouseEnter,
-      onMouseLeave: handleMouseLeave,
-      onOpenAutoFocus: function onOpenAutoFocus(e) {
-        return e.preventDefault();
-      },
       children: /*#__PURE__*/jsxRuntime.jsx(OrganizationItems, {
         authAppUrl: authAppUrl,
         organizations: organizations
@@ -858,87 +858,69 @@ var OrganizationSwitcher = function OrganizationSwitcher() {
   });
 };
 
-function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var MenuButton$2 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var otherProps = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
-  var _useTranslation = reactI18next.useTranslation(),
-    t = _useTranslation.t;
-  return /*#__PURE__*/jsxRuntime.jsxs("button", _objectSpread$5(_objectSpread$5({
-    ref: ref,
-    className: "hover:bg-accent flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium",
-    "data-testid": "product-switcher-button",
-    type: "button"
-  }, otherProps), {}, {
-    children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-      className: "flex-grow text-start",
+var Dropdown = reactUtils.withT(function (_ref) {
+  var t = _ref.t;
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuSub, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubTrigger, {
+      className: MENU_ITEM_CLASSES,
+      "data-testid": "product-switcher-button",
       children: t("neetoMolecules.sidebar.productSwitcher")
-    }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
-      className: "rtl:scale-x-[-1]",
-      size: 18
-    })]
-  }));
-});
-MenuButton$2.displayName = "ProductSwitcherMenuButton";
-
-var Dropdown = function Dropdown() {
-  var _useState = React.useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  var timeoutRef = React.useRef(null);
-  var handleMouseEnter = React.useCallback(function () {
-    clearTimeout(timeoutRef.current);
-    setOpen(true);
-  }, []);
-  var handleMouseLeave = React.useCallback(function () {
-    timeoutRef.current = setTimeout(function () {
-      return setOpen(false);
-    }, 150);
-  }, []);
-  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Popover, {
-    open: open,
-    onOpenChange: setOpen,
-    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.PopoverAnchor, {
-      asChild: true,
-      children: /*#__PURE__*/jsxRuntime.jsx(MenuButton$2, {
-        onClick: function onClick() {
-          return setOpen(function (prev) {
-            return !prev;
-          });
-        },
-        onMouseEnter: handleMouseEnter,
-        onMouseLeave: handleMouseLeave
-      })
-    }), /*#__PURE__*/jsxRuntime.jsx(primitives.PopoverContent, {
-      align: "start",
-      className: "z-[99999] flex h-[max(36rem,min(80vh,48rem))] max-h-[var(--radix-popover-content-available-height)] w-[calc(100vw-25rem)] max-w-7xl flex-col overflow-hidden rounded-xl p-0",
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubContent, {
+      className: "z-[99999] flex h-[max(36rem,min(80vh,48rem))] w-[calc(100vw-25rem)] max-w-7xl flex-col overflow-hidden rounded-xl p-0",
       collisionPadding: 16,
-      side: "right",
       sideOffset: 8,
-      onMouseEnter: handleMouseEnter,
-      onMouseLeave: handleMouseLeave,
-      onOpenAutoFocus: function onOpenAutoFocus(e) {
-        return e.preventDefault();
-      },
       children: /*#__PURE__*/jsxRuntime.jsx(Menu, {})
     })]
   });
-};
+});
 
 var ProductSwitcher = function ProductSwitcher(_ref) {
   var toggleModal = _ref.toggleModal;
   var _useBreakpoints = useBreakpoints(),
     isSize = _useBreakpoints.isSize;
   var isMobile = isSize("mobile");
-  return isMobile ? /*#__PURE__*/jsxRuntime.jsx(MenuButton$2, {
-    onClick: function onClick() {
-      return toggleModal(true);
-    }
-  }) : /*#__PURE__*/jsxRuntime.jsx(Dropdown, {});
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  if (isMobile) {
+    return /*#__PURE__*/jsxRuntime.jsx(MenuItem, {
+      "data-testid": "product-switcher-button",
+      suffix: /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
+        className: "rtl:scale-x-[-1]",
+        size: 18
+      }),
+      onClick: function onClick() {
+        return toggleModal(true);
+      },
+      children: t("neetoMolecules.sidebar.productSwitcher")
+    });
+  }
+  return /*#__PURE__*/jsxRuntime.jsx(Dropdown, {});
 };
 
-var MENU_ITEM_CLASS = "flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium hover:bg-accent";
+var ProfileItems = reactUtils.withT(function (_ref) {
+  var _window$globalProps;
+  var t = _ref.t,
+    onProfileClick = _ref.onProfileClick;
+  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(MenuItem, {
+      "data-testid": "profile-my-profile-button",
+      prefix: /*#__PURE__*/jsxRuntime.jsx(user.User, {
+        size: 18
+      }),
+      onClick: onProfileClick,
+      children: t("neetoMolecules.sidebar.myProfile")
+    }), ((_window$globalProps = window.globalProps) === null || _window$globalProps === void 0 || (_window$globalProps = _window$globalProps.user) === null || _window$globalProps === void 0 ? void 0 : _window$globalProps.isOwner) && /*#__PURE__*/jsxRuntime.jsx(MenuItem, {
+      "data-testid": "profile-cancel-account-button",
+      href: DELETE_WORKSPACE_URL,
+      prefix: /*#__PURE__*/jsxRuntime.jsx(CircleX, {
+        size: 18
+      }),
+      rel: "noreferrer",
+      target: "_blank",
+      children: t("neetoMolecules.sidebar.cancelAccount")
+    })]
+  });
+});
 
 var ProfileHeader = function ProfileHeader(_ref) {
   var profileInfo = _ref.profileInfo;
@@ -976,149 +958,68 @@ var ProfileHeader = function ProfileHeader(_ref) {
   });
 };
 
-var _excluded$1 = ["profileInfo"];
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var MenuButton$1 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+var MobileProfileExpandMenu = function MobileProfileExpandMenu(_ref) {
   var profileInfo = _ref.profileInfo,
-    otherProps = _objectWithoutProperties(_ref, _excluded$1);
-  return /*#__PURE__*/jsxRuntime.jsxs("button", _objectSpread$4(_objectSpread$4({
-    ref: ref,
-    className: "group hover:bg-accent flex w-full items-center gap-2 rounded-md px-2.5 py-2 transition-colors",
-    "data-testid": "profile-expand-menu-button",
-    type: "button"
-  }, otherProps), {}, {
-    children: [/*#__PURE__*/jsxRuntime.jsx(ProfileHeader, {
-      profileInfo: profileInfo
-    }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
-      className: "shrink-0 transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
-      size: 18
-    })]
-  }));
-});
-MenuButton$1.displayName = "ProfileExpandMenuButton";
-
-var MY_ORGANIZATION_URL = "/auth/organization/edit";
-var DELETE_WORKSPACE_URL = "/auth/organization/delete";
-var ENGAGE_WIDGET_TRIGGER_ID = "neetoengage-trigger";
-var DEFAULT_MENU_LINK_PROPS = {
-  engageProps: {
-    id: ENGAGE_WIDGET_TRIGGER_ID,
-    label: i18next.t("neetoMolecules.sidebar.helpLinks.whatsNew"),
-    "data-testid": "help-link-engage-button"
-  },
-  keyboardShortcutProps: {
-    label: i18next.t("neetoMolecules.sidebar.helpLinks.keyboardShortcuts"),
-    "data-testid": "help-link-keyboard-shortcut-button"
-  }
-};
-
-// Theme switcher
-var APP_THEME_LOCALSTORAGE_KEY = "appTheme";
-var THEMES = {
-  LIGHT: "light",
-  DARK: "dark"
-};
-
-// Legacy neetoUI theme classes — kept until full migration is complete.
-var LEGACY_THEMES = {
-  LIGHT: "neeto-ui-theme--light",
-  DARK: "neeto-ui-theme--dark"
-};
-var NEETO_AUTH_BILLING_INFO_URL = "/neeto_sso/api/v1/subscription/billing";
-
-var ProfileItems = reactUtils.withT(function (_ref) {
-  var _window$globalProps;
-  var t = _ref.t,
     onProfileClick = _ref.onProfileClick;
-  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/jsxRuntime.jsxs("button", {
-      className: MENU_ITEM_CLASS,
-      "data-testid": "profile-my-profile-button",
-      type: "button",
-      onClick: onProfileClick,
-      children: [/*#__PURE__*/jsxRuntime.jsx(user.User, {
-        size: 18
-      }), t("neetoMolecules.sidebar.myProfile")]
-    }), ((_window$globalProps = window.globalProps) === null || _window$globalProps === void 0 || (_window$globalProps = _window$globalProps.user) === null || _window$globalProps === void 0 ? void 0 : _window$globalProps.isOwner) && /*#__PURE__*/jsxRuntime.jsxs("a", {
-      className: MENU_ITEM_CLASS,
-      "data-testid": "profile-cancel-account-button",
-      href: DELETE_WORKSPACE_URL,
-      rel: "noreferrer",
-      target: "_blank",
-      children: [/*#__PURE__*/jsxRuntime.jsx(CircleX, {
-        size: 18
-      }), t("neetoMolecules.sidebar.cancelAccount")]
-    })]
-  });
-});
-var ProfileExpandMenu = function ProfileExpandMenu(_ref2) {
-  var profileInfo = _ref2.profileInfo;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
+    open: open,
+    onOpenChange: setOpen,
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
+      asChild: true,
+      children: /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuItem, {
+        className: classnames("group", MENU_ITEM_CLASSES),
+        "data-testid": "profile-expand-menu-button",
+        onSelect: function onSelect(e) {
+          return e.preventDefault();
+        },
+        children: [/*#__PURE__*/jsxRuntime.jsx(ProfileHeader, {
+          profileInfo: profileInfo
+        }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
+          className: "ms-auto shrink-0 transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
+          size: 18
+        })]
+      })
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
+      className: "flex flex-col gap-0.5 ps-6 pt-1",
+      children: /*#__PURE__*/jsxRuntime.jsx(ProfileItems, {
+        onProfileClick: onProfileClick
+      })
+    })]
+  });
+};
+
+var ProfileExpandMenu = function ProfileExpandMenu(_ref) {
+  var profileInfo = _ref.profileInfo;
   var _Profile$usePaneState = v2.Profile.usePaneState(),
     _Profile$usePaneState2 = _slicedToArray(_Profile$usePaneState, 2),
     setIsProfilePaneOpen = _Profile$usePaneState2[1];
-  var timeoutRef = React.useRef(null);
   var _useBreakpoints = useBreakpoints(),
     isSize = _useBreakpoints.isSize;
   var isMobile = isSize("mobile");
-  var handleMouseEnter = React.useCallback(function () {
-    clearTimeout(timeoutRef.current);
-    setOpen(true);
-  }, []);
-  var handleMouseLeave = React.useCallback(function () {
-    timeoutRef.current = setTimeout(function () {
-      return setOpen(false);
-    }, 150);
-  }, []);
   var onProfileClick = function onProfileClick() {
     return setIsProfilePaneOpen(true);
   };
   if (isMobile) {
-    return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
-      open: open,
-      onOpenChange: setOpen,
-      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
-        asChild: true,
-        children: /*#__PURE__*/jsxRuntime.jsx(MenuButton$1, {
-          profileInfo: profileInfo
-        })
-      }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
-        className: "flex flex-col gap-0.5 ps-6 pt-1",
-        children: /*#__PURE__*/jsxRuntime.jsx(ProfileItems, {
-          onProfileClick: onProfileClick
-        })
-      })]
+    return /*#__PURE__*/jsxRuntime.jsx(MobileProfileExpandMenu, {
+      onProfileClick: onProfileClick,
+      profileInfo: profileInfo
     });
   }
-  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Popover, {
-    open: open,
-    onOpenChange: setOpen,
-    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.PopoverAnchor, {
-      asChild: true,
-      children: /*#__PURE__*/jsxRuntime.jsx(MenuButton$1, {
-        profileInfo: profileInfo,
-        onClick: function onClick() {
-          return setOpen(function (prev) {
-            return !prev;
-          });
-        },
-        onMouseEnter: handleMouseEnter,
-        onMouseLeave: handleMouseLeave
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuSub, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubTrigger, {
+      className: classnames("group items-center", MENU_ITEM_CLASSES),
+      "data-testid": "profile-expand-menu-button",
+      children: /*#__PURE__*/jsxRuntime.jsx(ProfileHeader, {
+        profileInfo: profileInfo
       })
-    }), /*#__PURE__*/jsxRuntime.jsx(primitives.PopoverContent, {
-      align: "center",
-      className: "z-[99999] w-56 gap-0.5 p-1",
-      side: "right",
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubContent, {
+      className: "z-[99999]",
+      collisionPadding: 16,
       sideOffset: 8,
-      onMouseEnter: handleMouseEnter,
-      onMouseLeave: handleMouseLeave,
-      onOpenAutoFocus: function onOpenAutoFocus(e) {
-        return e.preventDefault();
-      },
       children: /*#__PURE__*/jsxRuntime.jsx(ProfileItems, {
         onProfileClick: onProfileClick
       })
@@ -1208,72 +1109,83 @@ var ThemeSwitcher = function ThemeSwitcher() {
       weight: "medium",
       children: t("neetoMolecules.sidebar.themeSwitcher.label")
     }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "bg-muted flex rounded-lg p-0.5",
+      "aria-label": t("neetoMolecules.sidebar.themeSwitcher.label"),
+      className: "bg-muted relative grid grid-cols-2 rounded-lg p-0.5",
       "data-testid": "theme-switcher-button",
-      children: [/*#__PURE__*/jsxRuntime.jsxs("button", {
-        "data-testid": "theme-switcher-light-button",
-        type: "button",
-        className: classnames("flex items-center gap-1 rounded-md px-2.5 py-1.5 text-xs font-medium transition-all", isDarkThemeSelected ? "text-muted-foreground hover:text-foreground" : "bg-background text-foreground ring-border shadow-sm ring-1"),
-        onClick: function onClick() {
-          return switchTheme(THEMES.LIGHT);
+      role: "group",
+      children: [/*#__PURE__*/jsxRuntime.jsx("span", {
+        "aria-hidden": true,
+        className: "bg-background ring-border absolute inset-y-0.5 left-0.5 w-[calc(50%-2px)] rounded-md shadow-md ring-1 transition-transform duration-300 ease-out ring-inset",
+        style: {
+          transform: "translateX(".concat(isDarkThemeSelected ? "100%" : "0", ")")
+        }
+      }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuItem, {
+        asChild: true,
+        onSelect: function onSelect(e) {
+          e.preventDefault();
+          switchTheme(THEMES.LIGHT);
         },
-        children: [/*#__PURE__*/jsxRuntime.jsx(Sun, {
-          size: 13
-        }), t("neetoMolecules.sidebar.themeSwitcher.light")]
-      }), /*#__PURE__*/jsxRuntime.jsxs("button", {
-        "data-testid": "theme-switcher-dark-button",
-        type: "button",
-        className: classnames("flex items-center gap-1 rounded-md px-2.5 py-1.5 text-xs font-medium transition-all", isDarkThemeSelected ? "bg-background text-foreground ring-border shadow-sm ring-1" : "text-muted-foreground hover:text-foreground"),
-        onClick: function onClick() {
-          return switchTheme(THEMES.DARK);
+        children: /*#__PURE__*/jsxRuntime.jsxs("button", {
+          "aria-checked": !isDarkThemeSelected,
+          "data-testid": "theme-switcher-light-button",
+          role: "menuitemradio",
+          type: "button",
+          className: classnames(THEME_BUTTON_BASE, isDarkThemeSelected ? "text-muted-foreground hover:text-foreground" : "text-foreground"),
+          children: [/*#__PURE__*/jsxRuntime.jsx(Sun, {
+            size: 13,
+            className: classnames(THEME_ICON_BASE, isDarkThemeSelected ? "scale-90 -rotate-45" : "rotate-0")
+          }), t("neetoMolecules.sidebar.themeSwitcher.light")]
+        })
+      }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuItem, {
+        asChild: true,
+        onSelect: function onSelect(e) {
+          e.preventDefault();
+          switchTheme(THEMES.DARK);
         },
-        children: [/*#__PURE__*/jsxRuntime.jsx(Moon, {
-          size: 13
-        }), t("neetoMolecules.sidebar.themeSwitcher.dark")]
+        children: /*#__PURE__*/jsxRuntime.jsxs("button", {
+          "aria-checked": isDarkThemeSelected,
+          "data-testid": "theme-switcher-dark-button",
+          role: "menuitemradio",
+          type: "button",
+          className: classnames(THEME_BUTTON_BASE, isDarkThemeSelected ? "text-foreground" : "text-muted-foreground hover:text-foreground"),
+          children: [/*#__PURE__*/jsxRuntime.jsx(Moon, {
+            size: 13,
+            className: classnames(THEME_ICON_BASE, isDarkThemeSelected ? "rotate-0" : "scale-90 rotate-45")
+          }), t("neetoMolecules.sidebar.themeSwitcher.dark")]
+        })
       })]
     })]
   });
 };
 
-function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var MenuButton = /*#__PURE__*/React.forwardRef(function (props, ref) {
+var TriggerContent = reactUtils.withT(function (_ref) {
   var _globalProps$organiza;
-  var _useTranslation = reactI18next.useTranslation(),
-    t = _useTranslation.t;
-  return /*#__PURE__*/jsxRuntime.jsxs("button", _objectSpread$3(_objectSpread$3({
-    ref: ref,
-    className: "group hover:bg-accent flex w-full items-center gap-2 rounded-md px-2.5 py-2 text-start",
-    "data-testid": "workspace-display",
-    type: "button"
-  }, props), {}, {
-    children: [/*#__PURE__*/jsxRuntime.jsxs("span", {
-      className: "flex flex-grow flex-col gap-1.5",
-      children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-        className: "text-sm font-medium",
+  var t = _ref.t;
+  return /*#__PURE__*/jsxRuntime.jsxs("span", {
+    className: "flex flex-grow flex-col gap-1.5",
+    children: [/*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Typography, {
+      asChild: true,
+      variant: "body3",
+      weight: "medium",
+      children: /*#__PURE__*/jsxRuntime.jsx("span", {
         children: t("neetoMolecules.sidebar.workspace")
-      }), ((_globalProps$organiza = initializers.globalProps.organization) === null || _globalProps$organiza === void 0 ? void 0 : _globalProps$organiza.name) && /*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Typography, {
-        asChild: true,
-        color: "muted",
-        variant: "caption",
-        children: /*#__PURE__*/jsxRuntime.jsx("span", {
-          children: initializers.globalProps.organization.name
-        })
-      })]
-    }), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
-      className: "shrink-0 transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
-      size: 18
+      })
+    }), ((_globalProps$organiza = initializers.globalProps.organization) === null || _globalProps$organiza === void 0 ? void 0 : _globalProps$organiza.name) && /*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Typography, {
+      asChild: true,
+      color: "muted",
+      variant: "caption",
+      children: /*#__PURE__*/jsxRuntime.jsx("span", {
+        children: initializers.globalProps.organization.name
+      })
     })]
-  }));
+  });
 });
-MenuButton.displayName = "WorkspaceMenuButton";
 
 var WorkspaceItems = reactUtils.withT(function (_ref) {
   var _globalProps$organiza;
   var t = _ref.t;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/jsxRuntime.jsx("a", {
-      className: "hover:bg-accent flex h-9 w-full items-center gap-2 rounded-md px-2.5 text-sm font-medium",
+    children: [/*#__PURE__*/jsxRuntime.jsx(MenuItem, {
       "data-testid": "profile-organization-settings-button",
       href: MY_ORGANIZATION_URL,
       rel: "noreferrer",
@@ -1283,14 +1195,23 @@ var WorkspaceItems = reactUtils.withT(function (_ref) {
       className: "px-2.5 py-2",
       children: /*#__PURE__*/jsxRuntime.jsxs("span", {
         className: "flex flex-col gap-0.5 text-start",
-        children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-          className: "text-sm font-medium",
-          children: t("neetoMolecules.sidebar.workspaceMenu.subdomain")
+        children: [/*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Typography, {
+          asChild: true,
+          variant: "body3",
+          weight: "medium",
+          children: /*#__PURE__*/jsxRuntime.jsx("span", {
+            children: t("neetoMolecules.sidebar.workspaceMenu.subdomain")
+          })
         }), /*#__PURE__*/jsxRuntime.jsxs("span", {
-          className: "text-muted-foreground flex items-center gap-1 text-xs",
-          children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-            className: "min-w-0 truncate",
-            children: initializers.globalProps.organization.subdomain
+          className: "flex items-center gap-1",
+          children: [/*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Typography, {
+            asChild: true,
+            color: "muted",
+            variant: "caption",
+            children: /*#__PURE__*/jsxRuntime.jsx("span", {
+              className: "min-w-0 truncate",
+              children: initializers.globalProps.organization.subdomain
+            })
           }), /*#__PURE__*/jsxRuntime.jsx(v2_CopyToClipboardButton, {
             className: "flex-shrink-0",
             value: initializers.globalProps.organization.subdomain,
@@ -1301,61 +1222,49 @@ var WorkspaceItems = reactUtils.withT(function (_ref) {
     })]
   });
 });
-var WorkspaceMenu = function WorkspaceMenu() {
+
+var MobileWorkspaceMenu = function MobileWorkspaceMenu() {
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var timeoutRef = React.useRef(null);
-  var _useBreakpoints = useBreakpoints(),
-    isSize = _useBreakpoints.isSize;
-  var isMobile = isSize("mobile");
-  var handleMouseEnter = React.useCallback(function () {
-    clearTimeout(timeoutRef.current);
-    setOpen(true);
-  }, []);
-  var handleMouseLeave = React.useCallback(function () {
-    timeoutRef.current = setTimeout(function () {
-      return setOpen(false);
-    }, 150);
-  }, []);
-  if (isMobile) {
-    return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
-      open: open,
-      onOpenChange: setOpen,
-      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
-        asChild: true,
-        children: /*#__PURE__*/jsxRuntime.jsx(MenuButton, {})
-      }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
-        className: "flex flex-col gap-0.5 ps-6 pt-1",
-        children: /*#__PURE__*/jsxRuntime.jsx(WorkspaceItems, {})
-      })]
-    });
-  }
-  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Popover, {
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.Collapsible, {
     open: open,
     onOpenChange: setOpen,
-    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.PopoverAnchor, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleTrigger, {
       asChild: true,
-      children: /*#__PURE__*/jsxRuntime.jsx(MenuButton, {
-        onClick: function onClick() {
-          return setOpen(function (prev) {
-            return !prev;
-          });
+      children: /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuItem, {
+        className: classnames("group items-center", MENU_ITEM_CLASSES),
+        "data-testid": "workspace-display",
+        onSelect: function onSelect(e) {
+          return e.preventDefault();
         },
-        onMouseEnter: handleMouseEnter,
-        onMouseLeave: handleMouseLeave
+        children: [/*#__PURE__*/jsxRuntime.jsx(TriggerContent, {}), /*#__PURE__*/jsxRuntime.jsx(chevronRight.ChevronRight, {
+          className: "ms-auto shrink-0 transition-transform group-data-[state=open]:rotate-90 rtl:scale-x-[-1]",
+          size: 18
+        })]
       })
-    }), /*#__PURE__*/jsxRuntime.jsx(primitives.PopoverContent, {
-      align: "center",
-      className: "z-[99999] w-56 gap-0.5 p-1",
-      side: "right",
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.CollapsibleContent, {
+      className: "flex flex-col gap-0.5 ps-6 pt-1",
+      children: /*#__PURE__*/jsxRuntime.jsx(WorkspaceItems, {})
+    })]
+  });
+};
+
+var WorkspaceMenu = function WorkspaceMenu() {
+  var _useBreakpoints = useBreakpoints(),
+    isSize = _useBreakpoints.isSize;
+  var isMobile = isSize("mobile");
+  if (isMobile) return /*#__PURE__*/jsxRuntime.jsx(MobileWorkspaceMenu, {});
+  return /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenuSub, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubTrigger, {
+      className: classnames("group items-center", MENU_ITEM_CLASSES),
+      "data-testid": "workspace-display",
+      children: /*#__PURE__*/jsxRuntime.jsx(TriggerContent, {})
+    }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSubContent, {
+      className: "z-[99999]",
+      collisionPadding: 16,
       sideOffset: 8,
-      onMouseEnter: handleMouseEnter,
-      onMouseLeave: handleMouseLeave,
-      onOpenAutoFocus: function onOpenAutoFocus(e) {
-        return e.preventDefault();
-      },
       children: /*#__PURE__*/jsxRuntime.jsx(WorkspaceItems, {})
     })]
   });
@@ -1398,18 +1307,24 @@ var ProfileMenu = function ProfileMenu(_ref) {
       href: NEETO_AUTH_BILLING_INFO_URL
     };
   };
+  var isProPlan = normalizedPlan === "pro";
   var subscriptionPlanLink = _objectSpread$2({
-    label: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [globalProps.appName, " ", /*#__PURE__*/jsxRuntime.jsx("span", {
-        className: classnames("inline-flex items-center gap-1 rounded-full px-2.5 py-1 text-[10px] leading-tight font-semibold", {
-          "bg-[#FFE44A] text-black": normalizedPlan === "pro",
-          "bg-primary text-primary-foreground": isFreePlan
+    label: /*#__PURE__*/jsxRuntime.jsxs("span", {
+      className: "flex items-center gap-2",
+      children: [globalProps.appName, isProPlan ? /*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Badge, {
+        label: neetoCist.humanize((_globalProps$user3 = globalProps.user) === null || _globalProps$user3 === void 0 ? void 0 : _globalProps$user3.subscriptionPlan),
+        style: {
+          "--accent-foreground": "var(--color-amber-950)"
+        },
+        variant: "amber"
+      }) : /*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Badge, {
+        icon: /*#__PURE__*/jsxRuntime.jsx(Crown, {
+          className: "size-3"
         }),
-        children: normalizedPlan === "pro" ? neetoCist.humanize((_globalProps$user3 = globalProps.user) === null || _globalProps$user3 === void 0 ? void 0 : _globalProps$user3.subscriptionPlan) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-          children: [/*#__PURE__*/jsxRuntime.jsx(Crown, {
-            size: 12
-          }), t("neetoMolecules.sidebar.upgradePlan")]
-        })
+        label: t("neetoMolecules.sidebar.upgradePlan"),
+        style: {
+          "--accent-foreground": "var(--primary-foreground)"
+        }
       })]
     }),
     "data-testid": "subscription-plan"
@@ -1420,27 +1335,27 @@ var ProfileMenu = function ProfileMenu(_ref) {
       children: [/*#__PURE__*/jsxRuntime.jsx(LinkSection, {
         links: defaultLinks
       }), neetoCist.isNotEmpty(topLinks) && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [/*#__PURE__*/jsxRuntime.jsx(primitives.Separator, {
+        children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSeparator, {
           className: "my-2"
         }), /*#__PURE__*/jsxRuntime.jsx(LinkSection, {
           links: topLinks
         })]
       }), neetoCist.isPresent(customContent) && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [/*#__PURE__*/jsxRuntime.jsx(primitives.Separator, {
+        children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSeparator, {
           className: "my-2"
         }), /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "px-3 py-1",
           children: customContent
         })]
-      }), /*#__PURE__*/jsxRuntime.jsx(primitives.Separator, {
+      }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSeparator, {
         className: "my-2"
-      }), ((_globalProps$user4 = globalProps.user) === null || _globalProps$user4 === void 0 ? void 0 : _globalProps$user4.isOwner) && /*#__PURE__*/jsxRuntime.jsx(WorkspaceMenu, {}), isOrganizationSwitcherEnabled && /*#__PURE__*/jsxRuntime.jsx(OrganizationSwitcher, {}), /*#__PURE__*/jsxRuntime.jsx(primitives.Separator, {
+      }), ((_globalProps$user4 = globalProps.user) === null || _globalProps$user4 === void 0 ? void 0 : _globalProps$user4.isOwner) && /*#__PURE__*/jsxRuntime.jsx(WorkspaceMenu, {}), isOrganizationSwitcherEnabled && /*#__PURE__*/jsxRuntime.jsx(OrganizationSwitcher, {}), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSeparator, {
         className: "my-2"
       }), neetoCist.isPresent((_globalProps$user5 = globalProps.user) === null || _globalProps$user5 === void 0 ? void 0 : _globalProps$user5.subscriptionPlan) && /*#__PURE__*/jsxRuntime.jsx(LinkSection, {
         links: [subscriptionPlanLink]
       }), showProductSwitcher && /*#__PURE__*/jsxRuntime.jsx(ProductSwitcher, {
         toggleModal: toggleModal
-      }), /*#__PURE__*/jsxRuntime.jsx(HelpMenu, {}), /*#__PURE__*/jsxRuntime.jsx(primitives.Separator, {
+      }), /*#__PURE__*/jsxRuntime.jsx(HelpMenu, {}), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSeparator, {
         className: "my-2"
       })]
     }), isAuthenticated && !isConsumer && /*#__PURE__*/jsxRuntime.jsx(ProfileExpandMenu, {
@@ -1448,7 +1363,7 @@ var ProfileMenu = function ProfileMenu(_ref) {
     }), /*#__PURE__*/jsxRuntime.jsx(LinkSection, {
       links: bottomLinks
     }), isThemeSwitcherEnabled && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.Separator, {
+      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuSeparator, {
         className: "my-2"
       }), /*#__PURE__*/jsxRuntime.jsx(ThemeSwitcher, {})]
     })]
@@ -1458,6 +1373,7 @@ var ProfileMenu = function ProfileMenu(_ref) {
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ProfileButton = function ProfileButton(_ref) {
+  var _globalProps$user;
   var profileInfoOverrides = _ref.profileInfoOverrides,
     showProductSwitcher = _ref.showProductSwitcher,
     bottomLinks = _ref.bottomLinks,
@@ -1478,13 +1394,12 @@ var ProfileButton = function ProfileButton(_ref) {
     setIsUpgradeModalOpen = _useState4[1];
   var _useState5 = React.useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    isPopoverOpen = _useState6[0],
-    setIsPopoverOpen = _useState6[1];
+    isMenuOpen = _useState6[0],
+    setIsMenuOpen = _useState6[1];
   var _useState7 = React.useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
     changesCount = _useState8[0],
     setChangesCount = _useState8[1];
-  var timeoutRef = React.useRef(null);
   var _KeyboardShortcuts$us = v2_KeyboardShortcuts.usePaneState(),
     _KeyboardShortcuts$us2 = _slicedToArray(_KeyboardShortcuts$us, 2),
     setIsOpen = _KeyboardShortcuts$us2[1];
@@ -1506,20 +1421,6 @@ var ProfileButton = function ProfileButton(_ref) {
     };
     window.Nv = window.Nv ? Object.assign(window.Nv, Nv) : Nv;
   }, []);
-  React.useEffect(function () {
-    return function () {
-      return clearTimeout(timeoutRef.current);
-    };
-  }, []);
-  var handleMouseEnter = React.useCallback(function () {
-    clearTimeout(timeoutRef.current);
-    setIsPopoverOpen(true);
-  }, []);
-  var handleMouseLeave = React.useCallback(function () {
-    timeoutRef.current = setTimeout(function () {
-      return setIsPopoverOpen(false);
-    }, 150);
-  }, []);
   var newBottomLinks = [].concat(_toConsumableArray(getDefaultBottomLinks(profileInfo.isAuthenticated, isConsumer)), _toConsumableArray(bottomLinks));
   var defaultLinks = Object.keys(DEFAULT_MENU_LINK_PROPS).map(function (key) {
     return _objectSpread$1(_objectSpread$1(_objectSpread$1({}, DEFAULT_MENU_LINK_PROPS[key]), key === "keyboardShortcutProps" && {
@@ -1538,41 +1439,37 @@ var ProfileButton = function ProfileButton(_ref) {
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsx(v2.Profile.Pane, {
       popoverProps: profilePopoverProps
-    }), isPopoverOpen && /*#__PURE__*/jsxRuntime.jsx("div", {
+    }), isMenuOpen && /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "pointer-events-none fixed inset-0 z-[99998] bg-black/[0.27]"
-    }), /*#__PURE__*/jsxRuntime.jsxs(primitives.Popover, {
-      open: isPopoverOpen,
-      onOpenChange: setIsPopoverOpen,
-      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.PopoverAnchor, {
+    }), /*#__PURE__*/jsxRuntime.jsxs(primitives.DropdownMenu, {
+      open: isMenuOpen,
+      onOpenChange: setIsMenuOpen,
+      children: [/*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuTrigger, {
         asChild: true,
         children: /*#__PURE__*/jsxRuntime.jsxs("button", {
           className: "bg-primary flex flex-col items-center justify-center gap-1.5 rounded-e-2xl p-1",
           type: "button",
-          onMouseEnter: handleMouseEnter,
-          onMouseLeave: handleMouseLeave,
           children: [/*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Avatar, {
-            className: "size-[1.625rem] shrink-0 rounded-full border-2 border-white",
+            className: "border-background size-[1.625rem] shrink-0 rounded-full border-2",
             "data-testid": "profile-avatar",
             user: {
               name: profileInfo.name,
               imageUrl: profileInfo.imageUrl
             }
           }), /*#__PURE__*/jsxRuntime.jsx("span", {
-            className: "flex size-[1.625rem] items-center justify-center rounded-full bg-white",
+            className: "bg-background text-foreground flex size-[1.625rem] items-center justify-center rounded-full",
             children: /*#__PURE__*/jsxRuntime.jsx(circleQuestionMark.CircleQuestionMark, {
               size: 20
             })
           })]
         })
-      }), /*#__PURE__*/jsxRuntime.jsx(primitives.PopoverContent, {
+      }), /*#__PURE__*/jsxRuntime.jsx(primitives.DropdownMenuContent, {
         align: "end",
-        className: "z-[99999] max-h-[var(--radix-popover-content-available-height)] w-64 overflow-y-auto rounded-xl p-0",
+        className: "z-[99999] max-h-[var(--radix-dropdown-menu-content-available-height)] w-64 overflow-y-auto rounded-xl p-0",
         collisionPadding: 16,
         side: "right",
         sideOffset: 8,
-        onMouseEnter: handleMouseEnter,
-        onMouseLeave: handleMouseLeave,
-        onOpenAutoFocus: function onOpenAutoFocus(e) {
+        onCloseAutoFocus: function onCloseAutoFocus(e) {
           return e.preventDefault();
         },
         children: /*#__PURE__*/jsxRuntime.jsx(ProfileMenu, {
@@ -1601,7 +1498,7 @@ var ProfileButton = function ProfileButton(_ref) {
       onClose: function onClose() {
         return setIsModalOpen(false);
       }
-    }), enableSubscriptionUpgradeRequest && /*#__PURE__*/jsxRuntime.jsx(SubscriptionUpgradeRequestModal, {
+    }), enableSubscriptionUpgradeRequest && !((_globalProps$user = globalProps.user) !== null && _globalProps$user !== void 0 && _globalProps$user.isOwner) && /*#__PURE__*/jsxRuntime.jsx(SubscriptionUpgradeRequestModal, {
       isOpen: isUpgradeModalOpen,
       onClose: function onClose() {
         return setIsUpgradeModalOpen(false);
@@ -1641,7 +1538,7 @@ var FloatingActionMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var isBigBinaryEmail = initializers.globalProps === null || initializers.globalProps === void 0 || (_globalProps$user = initializers.globalProps.user) === null || _globalProps$user === void 0 || (_globalProps$user = _globalProps$user.email) === null || _globalProps$user === void 0 ? void 0 : _globalProps$user.endsWith("@bigbinary.com");
   return /*#__PURE__*/jsxRuntime.jsx("div", _objectSpread(_objectSpread({
     ref: ref,
-    className: "fixed start-0 bottom-4 z-[99999] rounded-e-[1.0625rem] border border-s-0 border-white bg-white",
+    className: "bg-popover border-border fixed start-0 bottom-4 z-[99999] rounded-e-[1.0625rem] border border-s-0",
     "data-testid": "floating-action-menu-container"
   }, otherProps), {}, {
     children: /*#__PURE__*/jsxRuntime.jsx(ProfileButton, _defineProperty({