diff --git a/apps/trading/client-pages/market/trade-grid.tsx b/apps/trading/client-pages/market/trade-grid.tsx
index 41a8e5d9c..8112ffbc0 100644
--- a/apps/trading/client-pages/market/trade-grid.tsx
+++ b/apps/trading/client-pages/market/trade-grid.tsx
@@ -111,7 +111,7 @@ const MarketBottomPanel = memo(
onMarketClick={onMarketClick}
onOrderTypeClick={onOrderTypeClick}
enforceBottomPlaceholder
- id="bottomOrders"
+ id="marketOrders"
/>
@@ -120,6 +120,7 @@ const MarketBottomPanel = memo(
@@ -138,6 +139,7 @@ const MarketBottomPanel = memo(
@@ -147,6 +149,7 @@ const MarketBottomPanel = memo(
pinnedAsset={pinnedAsset}
noBottomPlaceholder
hideButtons
+ id="marketCollateral"
/>
@@ -159,7 +162,10 @@ const MarketBottomPanel = memo(
-
+
@@ -169,6 +175,7 @@ const MarketBottomPanel = memo(
onMarketClick={onMarketClick}
onOrderTypeClick={onOrderTypeClick}
enforceBottomPlaceholder
+ id="marketOrders"
/>
@@ -177,12 +184,17 @@ const MarketBottomPanel = memo(
-
+
diff --git a/apps/trading/client-pages/portfolio/portfolio.tsx b/apps/trading/client-pages/portfolio/portfolio.tsx
index 51a9820f4..6bdd2a8b9 100644
--- a/apps/trading/client-pages/portfolio/portfolio.tsx
+++ b/apps/trading/client-pages/portfolio/portfolio.tsx
@@ -53,6 +53,7 @@ export const Portfolio = () => {
@@ -67,7 +68,10 @@ export const Portfolio = () => {
-
+
@@ -87,7 +91,7 @@ export const Portfolio = () => {
-
+
diff --git a/apps/trading/components/accounts-container/accounts-container.tsx b/apps/trading/components/accounts-container/accounts-container.tsx
index 779741249..c97641f6c 100644
--- a/apps/trading/components/accounts-container/accounts-container.tsx
+++ b/apps/trading/components/accounts-container/accounts-container.tsx
@@ -13,10 +13,12 @@ export const AccountsContainer = ({
pinnedAsset,
hideButtons,
noBottomPlaceholder,
+ id,
}: {
pinnedAsset?: PinnedAsset;
hideButtons?: boolean;
noBottomPlaceholder?: boolean;
+ id?: string;
}) => {
const { pubKey, isReadOnly } = useVegaWallet();
const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -42,6 +44,7 @@ export const AccountsContainer = ({
return (
{
const gridRef = useRef(null);
const variables = useMemo(() => ({ partyId }), [partyId]);
@@ -52,6 +54,7 @@ export const AccountManager = ({
return (
void;
isReadOnly: boolean;
pinnedAsset?: PinnedAsset;
+ id?: string;
}
export const AccountTable = forwardRef(
@@ -149,7 +150,6 @@ export const AccountTable = forwardRef(
(data) => data.asset.id !== pinnedAssetId
)}
defaultColDef={{
- flex: 1,
resizable: true,
tooltipComponent: TooltipCellComponent,
sortable: true,
@@ -356,6 +356,7 @@ export const AccountTable = forwardRef(
);
}
}}
+ flex={1}
/>
}
diff --git a/libs/deposits/src/lib/deposits-table.tsx b/libs/deposits/src/lib/deposits-table.tsx
index 798b815ad..661ea2a69 100644
--- a/libs/deposits/src/lib/deposits-table.tsx
+++ b/libs/deposits/src/lib/deposits-table.tsx
@@ -24,6 +24,7 @@ export const DepositsTable = forwardRef<
>((props, ref) => {
return (
void;
+ id?: string;
}) => {
const { pubKey } = useVegaWallet();
@@ -25,6 +27,7 @@ export const FillsContainer = ({
partyId={pubKey}
marketId={marketId}
onMarketClick={onMarketClick}
+ id={id}
/>
);
};
diff --git a/libs/fills/src/lib/fills-manager.tsx b/libs/fills/src/lib/fills-manager.tsx
index 8ca9d30af..35db5b5bb 100644
--- a/libs/fills/src/lib/fills-manager.tsx
+++ b/libs/fills/src/lib/fills-manager.tsx
@@ -12,12 +12,14 @@ interface FillsManagerProps {
partyId: string;
marketId?: string;
onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+ id?: string;
}
export const FillsManager = ({
partyId,
marketId,
onMarketClick,
+ id,
}: FillsManagerProps) => {
const gridRef = useRef(null);
const scrolledToTop = useRef(true);
@@ -70,6 +72,7 @@ export const FillsManager = ({
return (
void;
+ id?: string;
};
export const FillsTable = forwardRef(
@@ -42,7 +43,7 @@ export const FillsTable = forwardRef(
data?.id}
tooltipShowDelay={0}
diff --git a/libs/ledger/src/lib/ledger-table.tsx b/libs/ledger/src/lib/ledger-table.tsx
index 57ceb5581..cde07c420 100644
--- a/libs/ledger/src/lib/ledger-table.tsx
+++ b/libs/ledger/src/lib/ledger-table.tsx
@@ -49,11 +49,11 @@ export const LedgerTable = forwardRef(
(props, ref) => {
return (
(
}
filterParams={dateRangeFilterParams}
filter={DateRangeFilter}
+ flex={1}
/>
);
diff --git a/libs/positions/src/lib/positions-container.tsx b/libs/positions/src/lib/positions-container.tsx
index f79d997bc..aa5f1f254 100644
--- a/libs/positions/src/lib/positions-container.tsx
+++ b/libs/positions/src/lib/positions-container.tsx
@@ -6,9 +6,11 @@ import { PositionsManager } from './positions-manager';
export const PositionsContainer = ({
onMarketClick,
noBottomPlaceholder,
+ id,
}: {
onMarketClick?: (marketId: string) => void;
noBottomPlaceholder?: boolean;
+ id?: string;
}) => {
const { pubKey, isReadOnly } = useVegaWallet();
@@ -25,6 +27,7 @@ export const PositionsContainer = ({
onMarketClick={onMarketClick}
isReadOnly={isReadOnly}
noBottomPlaceholder={noBottomPlaceholder}
+ id={id}
/>
);
};
diff --git a/libs/positions/src/lib/positions-manager.tsx b/libs/positions/src/lib/positions-manager.tsx
index 75d73da54..e5591bab9 100644
--- a/libs/positions/src/lib/positions-manager.tsx
+++ b/libs/positions/src/lib/positions-manager.tsx
@@ -13,6 +13,7 @@ interface PositionsManagerProps {
onMarketClick?: (marketId: string) => void;
isReadOnly: boolean;
noBottomPlaceholder?: boolean;
+ id?: string;
}
export const PositionsManager = ({
@@ -20,6 +21,7 @@ export const PositionsManager = ({
onMarketClick,
isReadOnly,
noBottomPlaceholder,
+ id,
}: PositionsManagerProps) => {
const gridRef = useRef(null);
const { data, error, loading, reload } = usePositionsData(partyId, gridRef);
@@ -82,6 +84,7 @@ export const PositionsManager = ({
onFilterChanged={updateRowCount}
onRowDataUpdated={updateRowCount}
{...bottomPlaceholderProps}
+ id={id}
/>
{
onMarketClick?: (id: string, metaKey?: boolean) => void;
style?: CSSProperties;
isReadOnly: boolean;
+ id?: string;
}
export interface AmountCellProps {
@@ -89,7 +90,6 @@ export const PositionsTable = forwardRef(
ref={ref}
tooltipShowDelay={500}
defaultColDef={{
- flex: 1,
resizable: true,
sortable: true,
filter: true,
@@ -368,6 +368,7 @@ export const PositionsTable = forwardRef(
return getDateTimeFormat().format(new Date(value));
}}
minWidth={150}
+ flex={1}
/>
{onClose && !props.isReadOnly ? (
(
) : null
}
minWidth={80}
+ flex={1}
/>
) : null}
diff --git a/libs/withdraws/src/lib/withdrawals-table.tsx b/libs/withdraws/src/lib/withdrawals-table.tsx
index 2d6ed18d7..a420e7a83 100644
--- a/libs/withdraws/src/lib/withdrawals-table.tsx
+++ b/libs/withdraws/src/lib/withdrawals-table.tsx
@@ -34,6 +34,7 @@ export const WithdrawalsTable = (
const bottomPlaceholderProps = useBottomPlaceholder({ gridRef });
return (