fix: positions and markets settlement asset column filter and sort

2023-05-22 17:09:50 +02:00
3 changed files with 15 additions and 10 deletions
@@ -84,15 +84,17 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
      <AgGridColumn
        colId="asset"
        headerName={t('Settlement asset')}
-        field="tradableInstrument.instrument.product.settlementAsset"
+        field="tradableInstrument.instrument.product.settlementAsset.symbol"
        hide={window.innerWidth <= BREAKPOINT_MD}
        cellRenderer={({
-          value,
+          data,
        }: VegaICellRendererParams<
          MarketFieldsFragment,
-          'tradableInstrument.instrument.product.settlementAsset'
-        >) =>
-          value ? (
+          'tradableInstrument.instrument.product.settlementAsset.symbol'
+        >) => {
+          const value =
+            data?.tradableInstrument.instrument.product.settlementAsset;
+          return value ? (
            <ButtonLink
              onClick={(e) => {
                openAssetDetailsDialog(value.id, e.target as HTMLElement);
@@ -102,8 +104,8 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
            </ButtonLink>
          ) : (
            ''
-          )
-        }
+          );
+        }}
      />
      <AgGridColumn
        flex={2}
@@ -203,13 +203,15 @@ export const MarketListTable = forwardRef<
      />
      <AgGridColumn
        headerName={t('Settlement asset')}
-        field="tradableInstrument.instrument.product.settlementAsset"
+        field="tradableInstrument.instrument.product.settlementAsset.symbol"
        cellRenderer={({
-          value,
+          data,
        }: VegaICellRendererParams<
          MarketMaybeWithData,
-          'tradableInstrument.instrument.product.settlementAsset'
+          'tradableInstrument.instrument.product.settlementAsset.symbol'
        >) => {
+          const value =
+            data?.tradableInstrument.instrument.product.settlementAsset;
          return value ? (
            <ButtonLink
              onClick={(e) => {
@@ -216,6 +216,7 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
        />
        <AgGridColumn
          headerName={t('Settlement asset')}
+          field="assetSymbol"
          colId="asset"
          minWidth={100}
          cellRenderer={({ data }: VegaICellRendererParams<Position>) => {