diff --git a/apps/trading/client-pages/portfolio/account-history-container.tsx b/apps/trading/client-pages/portfolio/account-history-container.tsx
index a414bb8bc..04a44fb7a 100644
--- a/apps/trading/client-pages/portfolio/account-history-container.tsx
+++ b/apps/trading/client-pages/portfolio/account-history-container.tsx
@@ -139,16 +139,19 @@ const AccountHistoryManager = ({
-
-
- {accountType
- ? `${
- AccountTypeMapping[
- accountType as keyof typeof Schema.AccountType
- ]
- } Account`
- : t('Select account type')}
-
+
+ {accountType
+ ? `${
+ AccountTypeMapping[
+ accountType as keyof typeof Schema.AccountType
+ ]
+ } Account`
+ : t('Select account type')}
+
+ }
+ >
{[
Schema.AccountType.ACCOUNT_TYPE_GENERAL,
@@ -164,10 +167,13 @@ const AccountHistoryManager = ({
))}
-
-
- {asset ? asset.symbol : t('Select asset')}
-
+
+ {asset ? asset.symbol : t('Select asset')}
+
+ }
+ >
{assets.map((a) => (
setAsset(a)}>
diff --git a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx
index 7833ca1b3..1109b61be 100644
--- a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx
+++ b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx
@@ -142,15 +142,21 @@ export const VegaWalletConnectButton = () => {
return (
<>
-
- setDropdownOpen((curr) => !curr)}
- >
- {activeKey && {activeKey.name}}
- {': '}
- {truncateByChars(pubKey)}
-
+ setDropdownOpen((curr) => !curr)}
+ >
+ {activeKey && (
+ {activeKey.name}
+ )}
+ {': '}
+ {truncateByChars(pubKey)}
+
+ }
+ >
setDropdownOpen(false)}
>
diff --git a/libs/candles-chart/src/lib/candles-chart.tsx b/libs/candles-chart/src/lib/candles-chart.tsx
index 04ad908ab..abd873c9c 100644
--- a/libs/candles-chart/src/lib/candles-chart.tsx
+++ b/libs/candles-chart/src/lib/candles-chart.tsx
@@ -60,10 +60,13 @@ export const CandlesChartContainer = ({
return (
-
-
- {t(`Interval: ${intervalLabels[interval]}`)}
-
+
+ {t(`Interval: ${intervalLabels[interval]}`)}
+
+ }
+ >
-
-
-
-
+
+
+
+ }
+ >
-
- {t('Overlays')}
+ {t('Overlays')}}
+ >
{Object.values(Overlay).map((overlay) => (
-
- {t('Studies')}
+ {t('Studies')}}
+ >
{Object.values(Study).map((study) => (
{
const menuRef = useRef(null);
return (
-
-
- {envTriggerMapping[VEGA_ENV]}
-
+
+ {envTriggerMapping[VEGA_ENV]}
+
+ }
+ >
{
console.log(checkboxItems);
return (
-
-
- Select many things
-
+
+ Select many things
+
+ }
+ >
{checkboxItems.map(({ label, state: [checked, setChecked] }) => (
+ setChecked(typeof checked === 'boolean' ? checked : false)
+ }
>
{label}
@@ -55,10 +60,13 @@ export const RadioItems = () => {
return (
-
-
- Open
-
+
+ Open
+
+ }
+ >
console.log('minimize')}>
Minimize window
@@ -92,10 +100,13 @@ export const IconMenu = () => {
return (
-
-
-
-
+
+
+
+ }
+ >
{iconMenuItems.map(({ label }) => (
{label}
diff --git a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
index 906efc934..8c000a171 100644
--- a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
@@ -1,5 +1,6 @@
import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
import classNames from 'classnames';
+import type { ReactNode } from 'react';
import { forwardRef } from 'react';
import { Icon } from '../icon';
@@ -12,11 +13,24 @@ const itemClass = classNames(
'whitespace-nowrap'
);
+type DropdownMenuProps = DropdownMenuPrimitive.DropdownMenuProps & {
+ trigger: ReactNode;
+};
/**
* Contains all the parts of a dropdown menu.
*/
-export const DropdownMenu = DropdownMenuPrimitive.Root;
-
+export const DropdownMenu = ({
+ children,
+ trigger,
+ ...props
+}: DropdownMenuProps) => {
+ return (
+
+ {trigger}
+ {children}
+
+ );
+};
/**
* The button that toggles the dropdown menu.
* By default, the {@link DropdownMenuContent} will position itself against the trigger.