chore: tweaking catching no market data error

apps/explorer/.env.validator-testnet

@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
-NX_VEGA_URL=https://api.validators-testnet.vega.xyz/query
+NX_VEGA_URL=https://api.validators-testnet.vega.xyz/graphql
 NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8

apps/explorer/tsconfig.json

@@ -11,7 +11,7 @@
     "noPropertyAccessFromIndexSignature": false,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "lib": ["es5", "es6", "dom", "dom.iterable"]
+    "lib": ["es2021", "dom", "dom.iterable"]
   },
   "exclude": ["./src/types/explorer.d.ts"],
   "include": [],

apps/governance/.env.validator-testnet

@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
-NX_VEGA_URL=https://api.validators-testnet.vega.xyz/query
+NX_VEGA_URL=https://api.validators-testnet.vega.xyz/graphql
 NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8

apps/multisig-signer/tsconfig.json

@@ -10,8 +10,7 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": false,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "lib": ["es5", "es6", "dom", "dom.iterable"]
+    "noFallthroughCasesInSwitch": true
   },
   "include": [],
   "references": [

apps/trading-e2e/src/integration/trading-positions.cy.ts

@@ -20,46 +20,78 @@ describe('positions', { tags: '@smoke' }, () => {
     cy.getByTestId('Positions').click();
     validatePositionsDisplayed();
   });
-
-  it('renders position among some graphql errors', () => {
-    const errors = [
-      {
-        message: 'no market data for market: market-2',
-        path: ['market', 'data'],
-        extensions: {
-          code: 13,
-          type: 'Internal',
+  describe('renders position among some graphql errors', () => {
+    it('rows should be displayed despite errors', () => {
+      const errors = [
+        {
+          message:
+            'no market data for market: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
+          path: ['marketsConnection', 'edges'],
+          extensions: {
+            code: 13,
+            type: 'Internal',
+          },
         },
-      },
-    ];
-    const marketData = marketsDataQuery();
-    const edges = marketData.marketsConnection?.edges.map((market) => {
-      const replace =
-        market.node.data?.market.id === 'market-2' ? null : market.node.data;
-      return { ...market, node: { ...market.node, data: replace } };
-    });
-    const overrides = {
-      ...marketData,
-      marketsConnection: { ...marketData.marketsConnection, edges },
-    };
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'MarketsData', overrides, errors);
-    });
-    cy.visit('/#/markets/market-0');
-    const emptyCells = [
-      'notional',
-      'markPrice',
-      'liquidationPrice',
-      'currentLeverage',
-      'averageEntryPrice',
-    ];
-    cy.getByTestId('tab-positions').within(() => {
-      cy.get('[row-id="market-2"]').within(() => {
-        emptyCells.forEach((cell) => {
-          cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
+      ];
+      const marketData = marketsDataQuery();
+      const edges = marketData.marketsConnection?.edges.map((market) => {
+        const replace =
+          market.node.data?.market.id === 'market-2' ? null : market.node.data;
+        return { ...market, node: { ...market.node, data: replace } };
+      });
+      const overrides = {
+        ...marketData,
+        marketsConnection: { ...marketData.marketsConnection, edges },
+      };
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'MarketsData', overrides, errors);
+      });
+      cy.visit('/#/markets/market-0');
+      const emptyCells = [
+        'notional',
+        'markPrice',
+        'liquidationPrice',
+        'currentLeverage',
+        'averageEntryPrice',
+      ];
+      cy.getByTestId('tab-positions').within(() => {
+        cy.get('[row-id="market-2"]').within(() => {
+          emptyCells.forEach((cell) => {
+            cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
+          });
         });
       });
     });
+    it('error message should be displayed', () => {
+      const errors = [
+        {
+          message:
+            'no market data for asset: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
+          path: ['assets', 'edges'],
+          extensions: {
+            code: 13,
+            type: 'Internal',
+          },
+        },
+      ];
+      const marketData = marketsDataQuery();
+      const edges = marketData.marketsConnection?.edges.map((market) => {
+        const replace =
+          market.node.data?.market.id === 'market-2' ? null : market.node.data;
+        return { ...market, node: { ...market.node, data: replace } };
+      });
+      const overrides = {
+        ...marketData,
+        marketsConnection: { ...marketData.marketsConnection, edges },
+      };
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'MarketsData', overrides, errors);
+      });
+      cy.visit('/#/markets/market-0');
+      cy.get('.pointer-events-none.absolute.inset-0').contains(
+        'Something went wrong:'
+      );
+    });
   });
 
   describe('sorting by ag-grid columns should work well', () => {

libs/environment/src/hooks/use-environment.spec.ts

@@ -1,14 +1,20 @@
 import { renderHook, waitFor } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
+import type { ClientOptions } from '@vegaprotocol/apollo-client';
+import { createClient } from '@vegaprotocol/apollo-client';
 import { Networks } from '../types';
-import { useEnvironment } from './use-environment';
+import { STORAGE_KEY, useEnvironment } from './use-environment';
 
 const noop = () => {
   /* no op*/
 };
 
-jest.mock('@vegaprotocol/apollo-client', () => ({
-  createClient: () => ({
+jest.mock('@vegaprotocol/apollo-client');
+jest.mock('zustand');
+
+const mockCreateClient = createClient as jest.Mock;
+const createDefaultMockClient = () => {
+  return () => ({
     query: () =>
       Promise.resolve({
         data: {
@@ -25,12 +31,10 @@ jest.mock('@vegaprotocol/apollo-client', () => ({
         obj.next();
       },
     }),
-  }),
-}));
-jest.mock('zustand');
+  });
+};
 
 global.fetch = jest.fn();
-
 // eslint-disable-next-line
 const setupFetch = (result: any) => {
   return () => {
@@ -56,6 +60,17 @@ const mockEnvVars = {
 
 describe('useEnvironment', () => {
   const env = process.env;
+  // eslint-disable-next-line
+  let warn: any;
+
+  beforeAll(() => {
+    warn = console.warn;
+    console.warn = noop;
+  });
+
+  afterAll(() => {
+    console.warn = warn;
+  });
 
   beforeEach(() => {
     jest.resetModules();
@@ -73,6 +88,9 @@ describe('useEnvironment', () => {
 
     // @ts-ignore clear mocked node config fetch
     fetch.mockClear();
+
+    // reset default apollo client behaviour
+    mockCreateClient.mockImplementation(createDefaultMockClient());
   });
 
   afterEach(() => {
@@ -92,6 +110,7 @@ describe('useEnvironment', () => {
     ];
     // @ts-ignore: typscript doesn't recognise the mock implementation
     global.fetch.mockImplementation(setupFetch({ hosts: nodes }));
+
     const { result } = setup();
 
     expect(result.current.status).toBe('default');
@@ -107,10 +126,169 @@ describe('useEnvironment', () => {
     });
 
     // resulting VEGA_URL should be one of the nodes from the config
-    expect(
-      result.current.VEGA_URL === nodes[0] ||
-        result.current.VEGA_URL === nodes[1]
-    ).toBe(true);
+    expect(nodes.includes(result.current.VEGA_URL as string)).toBe(true);
+    expect(result.current).toMatchObject({
+      ...mockEnvVars,
+      nodes,
+    });
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(configUrl);
+  });
+
+  it('uses the first successfully responding node', async () => {
+    jest.useFakeTimers();
+    const configUrl = 'https://vega.xyz/testnet-config.json';
+    process.env['NX_VEGA_CONFIG_URL'] = configUrl;
+
+    const slowNode = 'https://api.n00.foo.vega.xyz';
+    const slowWait = 2000;
+    const fastNode = 'https://api.n01.foo.vega.xyz';
+    const fastWait = 1000;
+    const nodes = [slowNode, fastNode];
+    // @ts-ignore: typscript doesn't recognise the mock implementation
+    global.fetch.mockImplementation(setupFetch({ hosts: nodes }));
+
+    mockCreateClient.mockImplementation((obj: ClientOptions) => ({
+      query: () =>
+        new Promise((resolve) => {
+          const wait = obj.url === fastNode ? fastWait : slowWait;
+          setTimeout(() => {
+            resolve({
+              data: {
+                statistics: {
+                  chainId: 'chain-id',
+                  blockHeight: '100',
+                  vegaTime: new Date().toISOString(),
+                },
+              },
+            });
+          }, wait);
+        }),
+      subscribe: () => ({
+        // eslint-disable-next-line
+        subscribe: (obj: any) => {
+          obj.next();
+        },
+      }),
+    }));
+    const { result } = setup();
+
+    expect(result.current.status).toBe('default');
+
+    act(() => {
+      result.current.initialize();
+    });
+
+    expect(result.current.status).toBe('pending');
+
+    // wait for nodes request to finish before running timer
+    await waitFor(() => {
+      expect(result.current.nodes).toEqual(nodes);
+    });
+
+    jest.runAllTimers();
+
+    await waitFor(() => {
+      expect(result.current.status).toEqual('success');
+    });
+
+    expect(result.current.VEGA_URL).toBe(fastNode);
+    expect(localStorage.getItem(STORAGE_KEY)).toBe(fastNode);
+    expect(result.current).toMatchObject({
+      ...mockEnvVars,
+      nodes,
+    });
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(configUrl);
+    jest.useRealTimers();
+  });
+
+  it('passes a node if both queries and subscriptions working', async () => {
+    const configUrl = 'https://vega.xyz/testnet-config.json';
+    process.env['NX_VEGA_CONFIG_URL'] = configUrl;
+    const successNode = 'https://api.n01.foo.vega.xyz';
+    const failNode = 'https://api.n00.foo.vega.xyz';
+    const nodes = [failNode, successNode];
+    // @ts-ignore: typscript doesn't recognise the mock implementation
+    global.fetch.mockImplementation(setupFetch({ hosts: nodes }));
+    mockCreateClient.mockImplementation((clientOptions: ClientOptions) => ({
+      query: () =>
+        Promise.resolve({
+          data: {
+            statistics: {
+              chainId: 'chain-id',
+              blockHeight: '100',
+              vegaTime: new Date().toISOString(),
+            },
+          },
+        }),
+      subscribe: () => ({
+        // eslint-disable-next-line
+        subscribe: (obj: any) => {
+          if (clientOptions.url === failNode) {
+            // make n00 fail the subscription
+            obj.error();
+          } else {
+            obj.next();
+          }
+        },
+      }),
+    }));
+
+    const { result } = setup();
+
+    expect(result.current.status).toBe('default');
+
+    act(() => {
+      result.current.initialize();
+    });
+
+    expect(result.current.status).toBe('pending');
+
+    await waitFor(() => {
+      expect(result.current.status).toBe('success');
+    });
+
+    expect(result.current.VEGA_URL).toBe(successNode);
+    expect(localStorage.getItem(STORAGE_KEY)).toBe(successNode);
+  });
+
+  it('fails initialization if no suitable node is found', async () => {
+    const configUrl = 'https://vega.xyz/testnet-config.json';
+    process.env['NX_VEGA_CONFIG_URL'] = configUrl;
+    const nodes = [
+      'https://api.n00.foo.vega.xyz',
+      'https://api.n01.foo.vega.xyz',
+    ];
+    // @ts-ignore: typscript doesn't recognise the mock implementation
+    global.fetch.mockImplementation(setupFetch({ hosts: nodes }));
+
+    // set all clients to fail both query and subscription
+    mockCreateClient.mockImplementation(() => ({
+      query: () => Promise.reject(),
+      subscribe: () => ({
+        // eslint-disable-next-line
+        subscribe: (obj: any) => {
+          obj.error();
+        },
+      }),
+    }));
+
+    const { result } = setup();
+
+    expect(result.current.status).toBe('default');
+
+    act(() => {
+      result.current.initialize();
+    });
+
+    expect(result.current.status).toBe('pending');
+
+    await waitFor(() => {
+      expect(result.current.status).toBe('failed');
+    });
+
+    expect(result.current.VEGA_URL).toBe(undefined); // VEGA_URL is unset, app should handle some UI
     expect(result.current).toMatchObject({
       ...mockEnvVars,
       nodes,
@@ -154,9 +332,12 @@ describe('useEnvironment', () => {
     process.env['NX_VEGA_URL'] = url;
     process.env['NX_VEGA_CONFIG_URL'] = undefined;
     const { result } = setup();
-    await act(async () => {
+    act(() => {
       result.current.initialize();
     });
+    await waitFor(() => {
+      expect(result.current.status).toBe('success');
+    });
     expect(result.current).toMatchObject({
       VEGA_URL: url,
       VEGA_CONFIG_URL: undefined,
@@ -174,16 +355,16 @@ describe('useEnvironment', () => {
     // @ts-ignore setup mock fetch for config url
     global.fetch.mockImplementation(setupFetch({ hosts: nodes }));
     const { result } = setup();
-    await act(async () => {
+    act(() => {
       result.current.initialize();
     });
-    expect(typeof result.current.VEGA_URL).toEqual('string');
-    expect(result.current.VEGA_URL).not.toBeFalsy();
+    await waitFor(() => {
+      expect(result.current.status).toBe('success');
+    });
+    expect(nodes.includes(result.current.VEGA_URL as string)).toBe(true);
   });
 
   it('handles error if node config cannot be fetched', async () => {
-    const warn = console.warn;
-    console.warn = noop;
     const configUrl = 'https://vega.xyz/testnet-config.json';
     process.env['NX_VEGA_CONFIG_URL'] = configUrl;
     process.env['NX_VEGA_URL'] = undefined;
@@ -196,16 +377,14 @@ describe('useEnvironment', () => {
       result.current.initialize();
     });
     expect(result.current.status).toEqual('failed');
-    expect(typeof result.current.error).toBe('string');
-    expect(result.current.error).toBeTruthy();
+    expect(result.current.error).toBe(
+      `Failed to fetch node config from ${configUrl}`
+    );
     expect(fetch).toHaveBeenCalledTimes(1);
     expect(fetch).toHaveBeenCalledWith(configUrl);
-    console.warn = warn;
   });
 
   it('handles an invalid node config', async () => {
-    const warn = console.warn;
-    console.warn = noop;
     const configUrl = 'https://vega.xyz/testnet-config.json';
     process.env['NX_VEGA_CONFIG_URL'] = configUrl;
     process.env['NX_VEGA_URL'] = undefined;
@@ -216,11 +395,11 @@ describe('useEnvironment', () => {
       result.current.initialize();
     });
     expect(result.current.status).toEqual('failed');
-    expect(typeof result.current.error).toBe('string');
-    expect(result.current.error).toBeTruthy();
+    expect(result.current.error).toBe(
+      `Failed to fetch node config from ${configUrl}`
+    );
     expect(fetch).toHaveBeenCalledTimes(1);
     expect(fetch).toHaveBeenCalledWith(configUrl);
-    console.warn = warn;
   });
 
   it('uses stored url', async () => {
@@ -231,7 +410,7 @@ describe('useEnvironment', () => {
       setupFetch({ hosts: ['http://foo.bar.com'] })
     );
     const url = 'https://api.n00.foo.com';
-    localStorage.setItem('vega_url', url);
+    localStorage.setItem(STORAGE_KEY, url);
     const { result } = setup();
     await act(async () => {
       result.current.initialize();
@@ -254,6 +433,6 @@ describe('useEnvironment', () => {
       result.current.setUrl(newUrl);
     });
     expect(result.current.VEGA_URL).toBe(newUrl);
-    expect(localStorage.getItem('vega_url')).toBe(newUrl);
+    expect(localStorage.getItem(STORAGE_KEY)).toBe(newUrl);
   });
 });

libs/environment/src/hooks/use-environment.ts

@@ -31,7 +31,7 @@ type Actions = {
 export type Env = Environment & EnvState;
 export type EnvStore = Env & Actions;
 
-const STORAGE_KEY = 'vega_url';
+export const STORAGE_KEY = 'vega_url';
 const SUBSCRIPTION_TIMEOUT = 3000;
 
 export const useEnvironment = create<EnvStore>((set, get) => ({
@@ -168,9 +168,15 @@ const fetchConfig = async (url?: string) => {
  * Find a suitable node by running a test query and test
  * subscription, against a list of clients, first to resolve wins
  */
-const findNode = (clients: ClientCollection): Promise<string | null> => {
+const findNode = async (clients: ClientCollection): Promise<string | null> => {
   const tests = Object.entries(clients).map((args) => testNode(...args));
-  return Promise.race(tests);
+  try {
+    const url = await Promise.any(tests);
+    return url;
+  } catch {
+    // All tests rejected, no suitable node found
+    return null;
+  }
 };
 
 /**
@@ -180,19 +186,21 @@ const testNode = async (
   url: string,
   client: Client
 ): Promise<string | null> => {
-  try {
-    const results = await Promise.all([
-      testQuery(client),
-      testSubscription(client),
-    ]);
-    if (results[0] && results[1]) {
-      return url;
-    }
-    return null;
-  } catch (err) {
-    console.warn(`Tests failed for ${url}`);
-    return null;
+  const results = await Promise.all([
+    // these promises will only resolve with true/false
+    testQuery(client),
+    testSubscription(client),
+  ]);
+  if (results[0] && results[1]) {
+    return url;
   }
+
+  const message = `Tests failed for node: ${url}`;
+  console.warn(message);
+
+  // throwing here will mean this tests is ignored and a different
+  // node that hopefully does resolve will fulfill the Promise.any
+  throw new Error(message);
 };
 
 /**

libs/fills/src/lib/fills-table.spec.tsx

@@ -1,4 +1,4 @@
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
@@ -8,19 +8,6 @@ import type { Trade } from './fills-data-provider';
 import { FillsTable } from './fills-table';
 import { generateFill } from './test-helpers';
 
-const waitForGridToBeInTheDOM = () => {
-  return waitFor(() => {
-    expect(document.querySelector('.ag-root-wrapper')).toBeInTheDocument();
-  });
-};
-
-// since our grid starts with no data, when the overlay has gone, data has loaded
-const waitForDataToHaveLoaded = () => {
-  return waitFor(() => {
-    expect(document.querySelector('.ag-overlay-no-rows-center')).toBeNull();
-  });
-};
-
 describe('FillsTable', () => {
   let defaultFill: PartialDeep<Trade>;
 
@@ -51,8 +38,6 @@ describe('FillsTable', () => {
     await act(async () => {
       render(<FillsTable partyId="party-id" rowData={[generateFill()]} />);
     });
-    await waitForGridToBeInTheDOM();
-    await waitForDataToHaveLoaded();
 
     const headers = screen.getAllByRole('columnheader');
     const expectedHeaders = [
@@ -82,12 +67,7 @@ describe('FillsTable', () => {
         liquidityFee: '2',
       },
     });
-    await act(async () => {
-      render(<FillsTable partyId={partyId} rowData={[{ ...buyerFill }]} />);
-    });
-    await waitForGridToBeInTheDOM();
-    await waitForDataToHaveLoaded();
-
+    render(<FillsTable partyId={partyId} rowData={[{ ...buyerFill }]} />);
     const cells = screen.getAllByRole('gridcell');
     const expectedValues = [
       buyerFill.market?.tradableInstrument.instrument.name || '',
@@ -120,11 +100,7 @@ describe('FillsTable', () => {
         liquidityFee: '1',
       },
     });
-    await act(async () => {
-      render(<FillsTable partyId={partyId} rowData={[buyerFill]} />);
-    });
-    await waitForGridToBeInTheDOM();
-    await waitForDataToHaveLoaded();
+    render(<FillsTable partyId={partyId} rowData={[buyerFill]} />);
 
     const cells = screen.getAllByRole('gridcell');
     const expectedValues = [
@@ -152,16 +128,9 @@ describe('FillsTable', () => {
       },
       aggressor: Schema.Side.SIDE_SELL,
     });
-    let rerenderer: (ui: React.ReactElement) => void;
-    await act(async () => {
-      const { rerender } = render(
-        <FillsTable partyId={partyId} rowData={[takerFill]} />
-      );
-      rerenderer = rerender;
-    });
-    await waitForGridToBeInTheDOM();
-    await waitForDataToHaveLoaded();
-
+    const { rerender } = render(
+      <FillsTable partyId={partyId} rowData={[takerFill]} />
+    );
     expect(
       screen
         .getAllByRole('gridcell')
@@ -174,11 +143,7 @@ describe('FillsTable', () => {
       },
       aggressor: Schema.Side.SIDE_BUY,
     });
-    await act(async () => {
-      rerenderer(<FillsTable partyId={partyId} rowData={[makerFill]} />);
-    });
-    await waitForGridToBeInTheDOM();
-    await waitForDataToHaveLoaded();
+    rerender(<FillsTable partyId={partyId} rowData={[makerFill]} />);
 
     expect(
       screen
@@ -195,11 +160,7 @@ describe('FillsTable', () => {
       },
       aggressor: Schema.Side.SIDE_SELL,
     });
-    await act(async () => {
-      render(<FillsTable partyId={partyId} rowData={[takerFill]} />);
-    });
-    await waitForGridToBeInTheDOM();
-    await waitForDataToHaveLoaded();
+    render(<FillsTable partyId={partyId} rowData={[takerFill]} />);
 
     const feeCell = screen
       .getAllByRole('gridcell')
@@ -209,16 +170,10 @@ describe('FillsTable', () => {
           'market.tradableInstrument.instrument.product'
       );
 
-    await waitFor(() => {
-      expect(feeCell).toBeInTheDocument();
-    });
-    await act(async () => {
-      userEvent.hover(feeCell as HTMLElement);
-      await new Promise((res) => setTimeout(() => res(true), 1000));
-    });
-
-    await act(async () => {
-      expect(screen.getByTestId('fee-breakdown-tooltip')).toBeInTheDocument();
-    });
+    expect(feeCell).toBeInTheDocument();
+    await userEvent.hover(feeCell as HTMLElement);
+    expect(
+      await screen.findByTestId('fee-breakdown-tooltip')
+    ).toBeInTheDocument();
   });
 });

libs/utils/src/lib/apollo-client.ts

@@ -2,7 +2,6 @@ import type { ApolloError } from '@apollo/client';
 import type { GraphQLErrors } from '@apollo/client/errors';
 
 const NOT_FOUND = 'NotFound';
-const INTERNAL = 'Internal';
 
 const isApolloGraphQLError = (
   error: ApolloError | Error | undefined
@@ -29,12 +28,5 @@ export const isNotFoundGraphQLError = (
   );
 };
 
-export const marketDataErrorPolicyGuard = (errors: GraphQLErrors) => {
-  const path = ['market', 'data'];
-  return errors.every(
-    (e) =>
-      e.extensions &&
-      e.extensions['type'] === INTERNAL &&
-      (!path || path.every((item, i) => item === e?.path?.[i]))
-  );
-};
+export const marketDataErrorPolicyGuard = (errors: GraphQLErrors) =>
+  errors.every((e) => e.message.match(/no market data for market:/i));

libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx

@@ -21,9 +21,11 @@ import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 
 const mockWeb3Provider = jest.fn();
 
+let mockChainId = 111111;
 jest.mock('@web3-react/core', () => ({
   useWeb3React: () => ({
     provider: mockWeb3Provider(),
+    chainId: mockChainId,
   }),
 }));
 
@@ -63,15 +65,16 @@ jest.mock('./use-get-withdraw-delay', () => ({
   useGetWithdrawDelay: () => mockUseGetWithdrawDelay(),
 }));
 
-const mockUseEthereumConfig = jest.fn(() => ({
+const mockUseEthereumConfig = {
   collateral_bridge_contract: {
     address: 'address',
   },
-}));
+  chain_id: '111111',
+};
 
 jest.mock('./use-ethereum-config', () => ({
   useEthereumConfig: () => ({
-    config: mockUseEthereumConfig(),
+    config: mockUseEthereumConfig,
   }),
 }));
 
@@ -301,4 +304,19 @@ describe('useEthWithdrawApprovalsManager', () => {
       erc20WithdrawalApproval.signatures,
     ]);
   });
+
+  it('detect wrong chainId', () => {
+    mockChainId = 1;
+    const transaction = createWithdrawTransaction();
+    mockEthTransactionStoreState.mockReturnValue({ create });
+    mockEthWithdrawApprovalsStoreState.mockReturnValue({
+      transactions: [transaction],
+      update,
+    });
+    render();
+    expect(update.mock.calls[0][1].status).toEqual(ApprovalStatus.Error);
+    expect(update.mock.calls[0][1].message).toEqual(
+      'You are on the wrong network'
+    );
+  });
 });

libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx

@@ -28,7 +28,7 @@ export const useEthWithdrawApprovalsManager = () => {
   const getThreshold = useGetWithdrawThreshold();
   const getDelay = useGetWithdrawDelay();
   const { query } = useApolloClient();
-  const { provider } = useWeb3React();
+  const { provider, chainId } = useWeb3React();
   const { config } = useEthereumConfig();
   const createEthTransaction = useEthTransactionStore((state) => state.create);
   const update = useEthWithdrawApprovalsStore((state) => state.update);
@@ -57,6 +57,13 @@ export const useEthWithdrawApprovalsManager = () => {
       });
       return;
     }
+    if (chainId?.toString() !== config?.chain_id) {
+      update(transaction.id, {
+        status: ApprovalStatus.Error,
+        message: t(`You are on the wrong network`),
+      });
+      return;
+    }
     update(transaction.id, {
       status: ApprovalStatus.Pending,
       message: t('Verifying withdrawal approval'),
@@ -131,5 +138,6 @@ export const useEthWithdrawApprovalsManager = () => {
     query,
     transaction,
     update,
+    chainId,
   ]);
 };

libs/withdraws/src/lib/withdrawals-table.tsx

@@ -216,7 +216,7 @@ export const getVerifyDialogProps = (status: ApprovalStatus) => {
 
 export const VerificationStatus = ({ state }: { state: VerifyState }) => {
   if (state.status === ApprovalStatus.Error) {
-    return <p>{t('Something went wrong')}</p>;
+    return <p>{state.message || t('Something went wrong')}</p>;
   }
 
   if (state.status === ApprovalStatus.Pending) {

package.json

@@ -20,8 +20,6 @@
   "dependencies": {
     "@apollo/client": "^3.5.8",
     "@blueprintjs/icons": "^3.32.0",
-    "@emotion/react": "11.10.0",
-    "@emotion/styled": "11.10.0",
     "@radix-ui/react-accordion": "^1.1.0",
     "@radix-ui/react-checkbox": "^1.0.1",
     "@radix-ui/react-dialog": "^1.0.2",
@@ -48,12 +46,10 @@
     "apollo": "^2.33.9",
     "apollo-link-timeout": "^4.0.0",
     "bignumber.js": "^9.0.2",
-    "buffer": "^6.0.3",
     "classnames": "^2.3.1",
     "core-js": "^3.6.5",
     "date-fns": "^2.28.0",
     "duration-js": "^4.0.0",
-    "env-cmd": "^10.1.0",
     "ethers": "^5.6.0",
     "graphql": "^15.7.2",
     "graphql-request": "^5.0.0",

tsconfig.base.json

@@ -10,7 +10,7 @@
     "importHelpers": true,
     "target": "es2015",
     "module": "esnext",
-    "lib": ["es2017", "dom"],
+    "lib": ["es2021", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",

yarn.lock

@@ -355,7 +355,7 @@
   dependencies:
     "@babel/types" "^7.18.9"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
+"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
@@ -802,7 +802,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.17.12", "@babel/plugin-syntax-jsx@^7.18.6":
+"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
   integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
@@ -1491,7 +1491,7 @@
   dependencies:
     regenerator-runtime "^0.13.10"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.19.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.18.9", "@babel/runtime@^7.19.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.9.2":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78"
   integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==
@@ -1831,107 +1831,6 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@emotion/babel-plugin@^11.10.0":
-  version "11.10.2"
-  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz#879db80ba622b3f6076917a1e6f648b1c7d008c7"
-  integrity sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/plugin-syntax-jsx" "^7.17.12"
-    "@babel/runtime" "^7.18.3"
-    "@emotion/hash" "^0.9.0"
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/serialize" "^1.1.0"
-    babel-plugin-macros "^3.1.0"
-    convert-source-map "^1.5.0"
-    escape-string-regexp "^4.0.0"
-    find-root "^1.1.0"
-    source-map "^0.5.7"
-    stylis "4.0.13"
-
-"@emotion/cache@^11.10.0":
-  version "11.10.3"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.3.tgz#c4f67904fad10c945fea5165c3a5a0583c164b87"
-  integrity sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==
-  dependencies:
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/sheet" "^1.2.0"
-    "@emotion/utils" "^1.2.0"
-    "@emotion/weak-memoize" "^0.3.0"
-    stylis "4.0.13"
-
-"@emotion/hash@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7"
-  integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==
-
-"@emotion/is-prop-valid@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz#7f2d35c97891669f7e276eb71c83376a5dc44c83"
-  integrity sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==
-  dependencies:
-    "@emotion/memoize" "^0.8.0"
-
-"@emotion/memoize@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f"
-  integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==
-
-"@emotion/react@11.10.0":
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.0.tgz#53c577f063f26493f68a05188fb87528d912ff2e"
-  integrity sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ==
-  dependencies:
-    "@babel/runtime" "^7.18.3"
-    "@emotion/babel-plugin" "^11.10.0"
-    "@emotion/cache" "^11.10.0"
-    "@emotion/serialize" "^1.1.0"
-    "@emotion/utils" "^1.2.0"
-    "@emotion/weak-memoize" "^0.3.0"
-    hoist-non-react-statics "^3.3.1"
-
-"@emotion/serialize@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.0.tgz#b1f97b1011b09346a40e9796c37a3397b4ea8ea8"
-  integrity sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==
-  dependencies:
-    "@emotion/hash" "^0.9.0"
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/unitless" "^0.8.0"
-    "@emotion/utils" "^1.2.0"
-    csstype "^3.0.2"
-
-"@emotion/sheet@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.0.tgz#771b1987855839e214fc1741bde43089397f7be5"
-  integrity sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w==
-
-"@emotion/styled@11.10.0":
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.0.tgz#c19484dab4206ae46727c07efb4316423dd21312"
-  integrity sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA==
-  dependencies:
-    "@babel/runtime" "^7.18.3"
-    "@emotion/babel-plugin" "^11.10.0"
-    "@emotion/is-prop-valid" "^1.2.0"
-    "@emotion/serialize" "^1.1.0"
-    "@emotion/utils" "^1.2.0"
-
-"@emotion/unitless@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db"
-  integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==
-
-"@emotion/utils@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561"
-  integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==
-
-"@emotion/weak-memoize@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
-  integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
-
 "@endemolshinegroup/cosmiconfig-typescript-loader@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz#eea4635828dde372838b0909693ebd9aafeec22d"
@@ -8973,7 +8872,7 @@ babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-macros@^3.0.1, babel-plugin-macros@^3.1.0:
+babel-plugin-macros@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
   integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
@@ -9491,14 +9390,6 @@ buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 builtin-modules@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
@@ -10251,7 +10142,7 @@ commander@^2.19.0, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.0.0, commander@^4.1.1:
+commander@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
@@ -10438,7 +10329,7 @@ conventional-commits-parser@^3.2.2:
     split2 "^3.0.0"
     through2 "^4.0.0"
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
@@ -11876,14 +11767,6 @@ env-ci@7.1.0:
     fromentries "^1.3.2"
     java-properties "^1.0.0"
 
-env-cmd@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-10.1.0.tgz#c7f5d3b550c9519f137fdac4dd8fb6866a8c8c4b"
-  integrity sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==
-  dependencies:
-    commander "^4.0.0"
-    cross-spawn "^7.0.0"
-
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -12936,11 +12819,6 @@ find-cache-dir@^3.3.1, find-cache-dir@^3.3.2:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-root@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
 find-test-names@^1.19.0:
   version "1.21.0"
   resolved "https://registry.yarnpkg.com/find-test-names/-/find-test-names-1.21.0.tgz#fe0d0bdd7e8ad9df6b5e0f08986e982654fc4417"
@@ -13975,7 +13853,7 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -14306,7 +14184,7 @@ identity-obj-proxy@3.0.0:
   dependencies:
     harmony-reflect "^1.4.6"
 
-ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1:
+ieee754@^1.1.13, ieee754@^1.1.4:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -20600,7 +20478,7 @@ source-map@0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
@@ -21110,11 +20988,6 @@ stylehacks@^5.1.0:
     browserslist "^4.16.6"
     postcss-selector-parser "^6.0.4"
 
-stylis@4.0.13:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
-  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
-
 stylus-loader@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-6.2.0.tgz#0ba499e744e7fb9d9b3977784c8639728a7ced8c"