diff --git a/apps/trading-e2e/src/integration/trading-orders.cy.ts b/apps/trading-e2e/src/integration/trading-orders.cy.ts index 211f01ad1..834510ea0 100644 --- a/apps/trading-e2e/src/integration/trading-orders.cy.ts +++ b/apps/trading-e2e/src/integration/trading-orders.cy.ts @@ -192,7 +192,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => { 'PartiallyFilled' ); cy.getByTestId(`order-status-${orderId}`) - .parent() + .parentsUntil(`.ag-row`) .siblings(`[col-id=${orderRemaining}]`) .should('have.text', '4/5'); }); diff --git a/apps/trading/client-pages/portfolio/account-history-container.tsx b/apps/trading/client-pages/portfolio/account-history-container.tsx index 9a30a4735..a414bb8bc 100644 --- a/apps/trading/client-pages/portfolio/account-history-container.tsx +++ b/apps/trading/client-pages/portfolio/account-history-container.tsx @@ -96,23 +96,23 @@ const AccountHistoryManager = ({ [pubKey] ); - const { data: assetsWithBalanceHistory } = useDataProvider({ + const { data: accounts } = useDataProvider({ dataProvider: accountsOnlyDataProvider, variables: variablesForOneTimeQuery, skip: !pubKey, }); - const assetsWithBalance = useMemo( - () => assetsWithBalanceHistory?.map((e) => e?.asset?.id) || [], - [assetsWithBalanceHistory] + const assetIds = useMemo( + () => accounts?.map((e) => e?.asset?.id) || [], + [accounts] ); const assets = useMemo( () => assetData - .filter((a) => assetsWithBalance.includes(a.id)) + .filter((a) => assetIds.includes(a.id)) .sort((a, b) => a.name.localeCompare(b.name)), - [assetData, assetsWithBalance] + [assetData, assetIds] ); const [asset, setAsset] = useState(assets[0]); const [range, setRange] = useState( diff --git a/libs/liquidity/src/lib/liquidity-table.tsx b/libs/liquidity/src/lib/liquidity-table.tsx index 36cd93c34..3b9439e17 100644 --- a/libs/liquidity/src/lib/liquidity-table.tsx +++ b/libs/liquidity/src/lib/liquidity-table.tsx @@ -66,7 +66,6 @@ export const LiquidityTable = forwardRef( tooltipComponent: TooltipCellComponent, sortable: true, }} - enableCellTextSelection={true} rowData={data} > + - + ); }); diff --git a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx index e3fdcfece..621d596a7 100644 --- a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx +++ b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx @@ -33,7 +33,11 @@ export const AgGridThemed = ({ customThemeParams?: string; }) => { const { theme } = useThemeSwitcher(); - const defaultProps = { rowHeight: 22, headerHeight: 22 }; + const defaultProps = { + rowHeight: 22, + headerHeight: 22, + enableCellTextSelection: true, + }; return (
{theme === 'dark' ? ( - + ) : ( - + )}