feat(explorer): add numberdecimalplaces to oracle query

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/cypress-run.yml

@@ -91,7 +91,11 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: ${{ failure() }}
         with:
-          name: test-report-and-logs-${{ matrix.project }}
-          path: |
-            /home/runner/.vegacapsule/testnet/logs
-            frontend-monorepo/apps/trading-e2e/cypress/reports
+          name: logs-${{ matrix.project }}
+          path: /home/runner/.vegacapsule/testnet/logs
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        with:
+          name: test-report-${{ matrix.project }}
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports

apps/explorer/src/app/routes/oracles/Oracles.graphql

@@ -34,6 +34,7 @@ fragment ExplorerOracleDataSource on OracleSpec {
                   key {
                     name
                     type
+                    numberDecimalPlaces
                   }
                   conditions {
                     value

apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts

@@ -3,21 +3,21 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } };
 
 export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
 
 export type ExplorerOracleSpecsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } } } | null> | null } | null };
 
 export type ExplorerOracleSpecByIdQueryVariables = Types.Exact<{
   id: Types.Scalars['ID'];
 }>;
 
 
-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
 
 export const ExplorerOracleDataSourceFragmentDoc = gql`
     fragment ExplorerOracleDataSource on OracleSpec {
@@ -56,6 +56,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                   key {
                     name
                     type
+                    numberDecimalPlaces
                   }
                   conditions {
                     value

apps/governance-e2e/src/support/staking.functions.ts

@@ -54,6 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
     .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
     .and('be.visible')
     .click();
+  cy.contains('been removed from validator').should('be.visible');
   closeDialog();
 }
 

apps/governance/src/app.tsx

@@ -3,7 +3,7 @@ import './i18n';
 import React, { useEffect } from 'react';
 import * as Sentry from '@sentry/react';
 import { Integrations } from '@sentry/tracing';
-import { BrowserRouter as Router } from 'react-router-dom';
+import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
@@ -149,6 +149,20 @@ const Web3Container = ({
   );
 };
 
+const ScrollToTop = () => {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    // "document.documentElement.scrollTo" is the magic for React Router Dom v6
+    document.documentElement.scrollTo({
+      top: 0,
+      left: 0,
+    });
+  }, [pathname]);
+
+  return null;
+};
+
 const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
   const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
@@ -183,6 +197,7 @@ const AppContainer = () => {
 
   return (
     <Router>
+      <ScrollToTop />
       <AppStateProvider>
         <div className="grid min-h-full text-white">
           <AsyncRenderer<EthereumConfig | null>

apps/static/src/assets/mainnet-tranches.json

@@ -36,9 +36,9 @@
     "tranche_id": 56,
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
-    "total_added": "15999.125",
-    "total_removed": "0",
-    "locked_amount": "13596.4045541087969481125",
+    "total_added": "17896.625",
+    "total_removed": "202.093666077975",
+    "locked_amount": "14612.07647034143492005",
     "deposits": [
       {
         "amount": "188",
@@ -50,6 +50,16 @@
         "user": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
         "tx": "0xc1ede6de1653f205e0a743f609835648a67287a271a994cd141911ce13d5cac7"
       },
+      {
+        "amount": "1207.5",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x9092eaf46d5cdba3b2219aa7187da4e1623004434c33a915956aa45d04d561f2"
+      },
+      {
+        "amount": "690",
+        "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+        "tx": "0xa717d720df95537c07c8f24591d49fb35d2b2d935ec25da4b23a0819a78b499d"
+      },
       {
         "amount": "241.5",
         "user": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -191,7 +201,13 @@
         "tx": "0x679fcc1c3a29bdc259b6a4c044579a89c5357f42ed1963221669ebf43cc545b0"
       }
     ],
-    "withdrawals": [],
+    "withdrawals": [
+      {
+        "amount": "202.093666077975",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x300c18b4220d3bc357f054792cb65f05d4005912bf8e5d9580b5b830cc3c0845"
+      }
+    ],
     "users": [
       {
         "address": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
@@ -223,6 +239,43 @@
         "withdrawn_tokens": "0",
         "remaining_tokens": "50"
       },
+      {
+        "address": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "deposits": [
+          {
+            "amount": "1207.5",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x9092eaf46d5cdba3b2219aa7187da4e1623004434c33a915956aa45d04d561f2"
+          }
+        ],
+        "withdrawals": [
+          {
+            "amount": "202.093666077975",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x300c18b4220d3bc357f054792cb65f05d4005912bf8e5d9580b5b830cc3c0845"
+          }
+        ],
+        "total_tokens": "1207.5",
+        "withdrawn_tokens": "202.093666077975",
+        "remaining_tokens": "1005.406333922025"
+      },
+      {
+        "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+        "deposits": [
+          {
+            "amount": "690",
+            "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+            "tranche_id": 56,
+            "tx": "0xa717d720df95537c07c8f24591d49fb35d2b2d935ec25da4b23a0819a78b499d"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "690",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "690"
+      },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
         "deposits": [
@@ -705,8 +758,8 @@
     "tranche_start": "2023-04-06T00:00:00.000Z",
     "tranche_end": "2023-05-06T00:00:00.000Z",
     "total_added": "8976",
-    "total_removed": "490.11243517665",
-    "locked_amount": "3439.2001111111111776",
+    "total_removed": "596.64743517951",
+    "locked_amount": "3139.8442777777773456",
     "deposits": [
       {
         "amount": "111",
@@ -850,6 +903,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "106.53500000286",
+        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+        "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
+      },
       {
         "amount": "5.46866782407",
         "user": "0x92A1e98C6f09970e45645Cbe57c6DcaF4547c8FE",
@@ -1103,6 +1161,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "106.53500000286",
+            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+            "tranche_id": 54,
+            "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
+          },
           {
             "amount": "155.03186111556",
             "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1129,8 +1193,8 @@
           }
         ],
         "total_tokens": "858",
-        "withdrawn_tokens": "424.47530786232",
-        "remaining_tokens": "433.52469213768"
+        "withdrawn_tokens": "531.01030786518",
+        "remaining_tokens": "326.98969213482"
       },
       {
         "address": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1",
@@ -4478,7 +4542,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "53304.4390480842904971845",
+    "locked_amount": "53066.8734708339990147143",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4544,7 +4608,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "515.03643925518925",
+    "locked_amount": "501.2930212148961",
     "deposits": [
       {
         "amount": "2500",
@@ -4665,7 +4729,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "12316.06751962560225",
+    "locked_amount": "12220.90928819444425",
     "deposits": [
       {
         "amount": "12500",
@@ -4932,7 +4996,7 @@
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
     "total_removed": "12539.2989369",
-    "locked_amount": "20406.35071362799125",
+    "locked_amount": "20199.06048572743875",
     "deposits": [
       {
         "amount": "7500",
@@ -5307,7 +5371,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "53255.8054544746044383625",
+    "locked_amount": "53018.4566259219192597465",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5340,7 +5404,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "50667.46703183722144592557",
+    "locked_amount": "50519.45346162106264456493",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5373,7 +5437,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "22552.23359969558432",
+    "locked_amount": "22380.637423896501924",
     "deposits": [
       {
         "amount": "10000",
@@ -5566,7 +5630,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "1993.0774353120245",
+    "locked_amount": "1979.3716704718417",
     "deposits": [
       {
         "amount": "5000",
@@ -6107,7 +6171,7 @@
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
     "total_removed": "7115.9985996",
-    "locked_amount": "807.34633977900456",
+    "locked_amount": "682.972203038672835",
     "deposits": [
       {
         "amount": "7500",
@@ -6602,7 +6666,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "204594.1627448135826823752",
+    "locked_amount": "199276.5223081982076615186",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -40418,7 +40482,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "338891.320746260923506948901",
+    "locked_amount": "330719.958800943600983564197",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -41811,7 +41875,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
     "total_removed": "860379.54790441442685852",
-    "locked_amount": "6501374.45010461734405894576483270014193025",
+    "locked_amount": "6472399.32529810601035147463373859619789137",
     "deposits": [
       {
         "amount": "16249.93",
@@ -48312,7 +48376,7 @@
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
     "total_removed": "5847991.884210280507681376",
-    "locked_amount": "280582.1543784642464604600874073187",
+    "locked_amount": "253832.5041650111536580818580164905",
     "deposits": [
       {
         "amount": "129284.449",
@@ -56106,7 +56170,7 @@
     "tranche_start": "2021-10-05T00:00:00.000Z",
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
-    "total_removed": "3421810.610823310514313769",
+    "total_removed": "3480709.486904665102263769",
     "locked_amount": "0",
     "deposits": [
       {
@@ -56251,6 +56315,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "58898.87608135458795",
+        "user": "0x83b1a48376E045D26420200345414e6b93066396",
+        "tx": "0xeb193da202cd833a574a524eff7f1dd13a0ee8669e51a7db36984ef4d6735fd6"
+      },
       {
         "amount": "219.945520329711288",
         "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -57768,6 +57837,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "58898.87608135458795",
+            "user": "0x83b1a48376E045D26420200345414e6b93066396",
+            "tranche_id": 4,
+            "tx": "0xeb193da202cd833a574a524eff7f1dd13a0ee8669e51a7db36984ef4d6735fd6"
+          },
           {
             "amount": "66753.39849271259062",
             "user": "0x83b1a48376E045D26420200345414e6b93066396",
@@ -57836,8 +57911,8 @@
           }
         ],
         "total_tokens": "1104995.291",
-        "withdrawn_tokens": "1046096.41491864541205",
-        "remaining_tokens": "58898.87608135458795"
+        "withdrawn_tokens": "1104995.291",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x5565d64f29Ea17355106DF3bA5903Eb793B3e139",
@@ -58289,8 +58364,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "43302.7476142891849",
-    "locked_amount": "53699.266957621714397527714764084",
+    "total_removed": "43365.4083448891849",
+    "locked_amount": "52404.467947889961288965501978712",
     "deposits": [
       {
         "amount": "3000",
@@ -64914,6 +64989,11 @@
         "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
         "tx": "0xc182a183d124ab4faa413e71faa8c764fc265b4c568a5025ead367fbb86da331"
       },
+      {
+        "amount": "62.6607306",
+        "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
+        "tx": "0xb13444d5ef684a442be6c285a6c38dcbc9959ff2eacc31474531826efe28c20a"
+      },
       {
         "amount": "168.502276762",
         "user": "0x38A292CB98Dc602ECAFF94E8E5fADD9800e4bA13",
@@ -83464,6 +83544,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "62.6607306",
+            "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
+            "tranche_id": 5,
+            "tx": "0xb13444d5ef684a442be6c285a6c38dcbc9959ff2eacc31474531826efe28c20a"
+          },
           {
             "amount": "152.077625568",
             "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
@@ -83520,8 +83606,8 @@
           }
         ],
         "total_tokens": "1200",
-        "withdrawn_tokens": "1002.094025868",
-        "remaining_tokens": "197.905974132"
+        "withdrawn_tokens": "1064.754756468",
+        "remaining_tokens": "135.245243532"
       },
       {
         "address": "0x47181cf36aDFb0b5dB7EfDB123f403D890607841",

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

@@ -25,12 +25,17 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="accounts-actions"]')
-      .should('have.text', '');
+      .should('have.text', 'DepositWithdraw');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
-      .find('[col-id="accounts-actions"]')
-      .should('have.text', '');
+      .find('[data-testid="deposit"]')
+      .should('have.text', 'Deposit');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="accounts-actions"] [data-testid="withdraw"]')
+      .should('have.text', 'Withdraw');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)

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

@@ -1,7 +1,18 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { fillsQuery } from '@vegaprotocol/mock';
 
+const tabFills = 'tab-fills';
+
 describe('fills', { tags: '@regression' }, () => {
+  // 7005-FILL-001
+  // 7005-FILL-002
+  // 7005-FILL-003
+  // 7005-FILL-004
+  // 7005-FILL-005
+  // 7005-FILL-006
+  // 7005-FILL-007
+  // 7005-FILL-008
+
   beforeEach(() => {
     // Ensure page loads with correct key
     cy.window().then((window) => {
@@ -38,31 +49,37 @@ describe('fills', { tags: '@regression' }, () => {
   });
 
   function validateFillsDisplayed() {
-    cy.getByTestId('tab-fills').should('be.visible');
-
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).should('be.visible');
+    cy.getByTestId(tabFills).contains('Market');
+    cy.getByTestId(tabFills)
       .get(
         '[role="gridcell"][col-id="market.tradableInstrument.instrument.name"]'
       )
       .each(($marketSymbol) => {
         cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Size');
+    cy.get(`[col-id='size']`).eq(1).should('contain.text', '+');
+    cy.get(`[col-id='size']`).eq(2).should('contain.text', '-');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="size"]')
       .each(($amount) => {
         cy.wrap($amount).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Price');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="price"]')
       .each(($prices) => {
         cy.wrap($prices).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Notional');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="price_1"]')
       .each(($total) => {
         cy.wrap($total).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Role');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="aggressor"]')
       .each(($role) => {
         cy.wrap($role)
@@ -72,13 +89,15 @@ describe('fills', { tags: '@regression' }, () => {
             expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
           });
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Fee');
+    cy.getByTestId(tabFills)
       .get(
         '[role="gridcell"][col-id="market.tradableInstrument.instrument.product"]'
       )
       .each(($fees) => {
         cy.wrap($fees).invoke('text').should('not.be.empty');
       });
+    cy.getByTestId(tabFills).contains('Date');
     const dateTimeRegex =
       /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
     cy.get('[col-id="createdAt"]').each(($tradeDateTime, index) => {

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

@@ -61,7 +61,14 @@ describe('AccountsTable', () => {
       );
     });
     const cells = await screen.findAllByRole('gridcell');
-    const expectedValues = ['tBTC', '1,256.00', '1,256.00', '2,512.00', ''];
+    const expectedValues = [
+      'tBTC',
+      '1,256.00',
+      '1,256.00',
+      '2,512.00',
+      'Deposit',
+      'Withdraw',
+    ];
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);
     });

libs/accounts/src/lib/accounts-table.tsx

@@ -9,17 +9,7 @@ import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import {
-  Button,
-  ButtonLink,
-  Dialog,
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuGridTrigger,
-  DropdownMenuItem,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { Button, ButtonLink, Dialog } from '@vegaprotocol/ui-toolkit';
 import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
 import {
   AgGridDynamic as AgGrid,
@@ -132,7 +122,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
         params.data.asset.id === pinnedAssetId &&
         new BigNumber(params.data.total).isLessThanOrEqualTo(0)
           ? 32
-          : 24,
+          : 22,
       [pinnedAssetId]
     );
 
@@ -266,7 +256,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
               colId="accounts-actions"
               headerName=""
               sortable={false}
-              maxWidth={200}
+              minWidth={200}
               type="rightAligned"
               cellRenderer={({
                 data,
@@ -293,62 +283,30 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
                     );
                   }
                   return (
-                    !props.isReadOnly && (
-                      <DropdownMenu
-                        trigger={
-                          <DropdownMenuGridTrigger className="mr-2"></DropdownMenuGridTrigger>
-                        }
-                      >
-                        <DropdownMenuContent>
-                          <DropdownMenuItem
-                            key={'deposit'}
-                            data-testid="deposit"
-                            onClick={() => {
-                              onClickDeposit && onClickDeposit(data.asset.id);
-                            }}
-                          >
-                            <span>
-                              <VegaIcon
-                                name={VegaIconNames.DEPOSIT}
-                                size={16}
-                              />
-                              {t('Deposit')}
-                            </span>
-                          </DropdownMenuItem>
-                          <DropdownMenuItem
-                            key={'withdraw'}
-                            data-testid="withdraw"
-                            onClick={() =>
-                              onClickWithdraw && onClickWithdraw(data.asset.id)
-                            }
-                          >
-                            <span>
-                              <VegaIcon
-                                name={VegaIconNames.WITHDRAW}
-                                size={16}
-                              />
-                              {t('Withdraw')}
-                            </span>
-                          </DropdownMenuItem>
-                          <DropdownMenuItem
-                            key={'breakdown'}
-                            data-testid="breakdown"
-                            onClick={() => {
-                              setOpenBreakdown(!openBreakdown);
-                              setRow(data);
-                            }}
-                          >
-                            <span>
-                              <VegaIcon
-                                name={VegaIconNames.BREAKDOWN}
-                                size={16}
-                              />
-                              {t('Breakdown')}
-                            </span>
-                          </DropdownMenuItem>
-                        </DropdownMenuContent>
-                      </DropdownMenu>
-                    )
+                    <>
+                      <span className="mx-1" />
+                      {!props.isReadOnly && (
+                        <ButtonLink
+                          data-testid="deposit"
+                          onClick={() => {
+                            onClickDeposit && onClickDeposit(data.asset.id);
+                          }}
+                        >
+                          {t('Deposit')}
+                        </ButtonLink>
+                      )}
+                      <span className="mx-1" />
+                      {!props.isReadOnly && (
+                        <ButtonLink
+                          data-testid="withdraw"
+                          onClick={() =>
+                            onClickWithdraw && onClickWithdraw(data.asset.id)
+                          }
+                        >
+                          {t('Withdraw')}
+                        </ButtonLink>
+                      )}
+                    </>
                   );
                 }
               }}

libs/i18n/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@vegaprotocol/i18n",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "commonjs"
 }

libs/i18n/project.json

@@ -6,6 +6,7 @@
     "build": {
       "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
+      "format": ["esm", "cjs"],
       "options": {
         "outputPath": "dist/libs/i18n",
         "main": "libs/i18n/src/index.ts",

libs/react-helpers/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/react-helpers",
-  "version": "0.2.1"
+  "version": "0.2.2"
 }

libs/types/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/types",
-  "version": "0.0.1"
+  "version": "0.0.2"
 }

libs/types/project.json

@@ -15,6 +15,7 @@
         "external": ["react/jsx-runtime"],
         "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
         "compiler": "babel",
+        "format": ["esm", "cjs"],
         "assets": [
           {
             "glob": "libs/types/README.md",

libs/ui-toolkit/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/ui-toolkit",
-  "version": "0.11.1"
+  "version": "0.12.1"
 }

libs/ui-toolkit/src/components/dialog/dialog.tsx

@@ -62,7 +62,7 @@ export function Dialog({
     <DialogPrimitives.Root open={open} onOpenChange={(x) => onChange?.(x)}>
       <DialogPrimitives.Portal>
         <DialogPrimitives.Overlay
-          className="fixed inset-0 dark:bg-black/80 bg-black/50 z-20"
+          className="fixed inset-0 bg-black/50 z-20"
           data-testid="dialog-overlay"
         />
         <DialogPrimitives.Content

libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu-grid.tsx

@@ -1,31 +0,0 @@
-import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
-import classNames from 'classnames';
-import { forwardRef } from 'react';
-import { Icon } from '../icon';
-
-/**
- * The button that toggles the dropdown menu inside grids.
- * By default, the {@link DropdownMenuContent} will position itself against the trigger.
- */
-export const DropdownMenuGridTrigger = forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
-  React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>
->(({ className, children, ...props }, forwardedRef) => {
-  const triggerClasses = classNames(
-    className,
-    'hover:bg-neutral-500/20 dark:hover:bg-neutral-500/40',
-    'p-0.5 mr-2 focus:rounded-full hover:rounded-full'
-  );
-  return (
-    <DropdownMenuPrimitive.Trigger
-      asChild={true}
-      ref={forwardedRef}
-      className={triggerClasses}
-      {...props}
-    >
-      <button>
-        <Icon name="more" size={4} />
-      </button>
-    </DropdownMenuPrimitive.Trigger>
-  );
-});

libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx

@@ -7,8 +7,8 @@ import { Icon } from '../icon';
 const itemClass = classNames(
   'relative flex items-center justify-between rounded-sm p-2 text-sm',
   'cursor-default hover:cursor-pointer',
-  'hover:bg-white dark:hover:bg-neutral-500',
-  'focus:bg-white dark:focus:bg-neutral-500',
+  'hover:bg-white dark:hover:bg-neutral-200',
+  'focus:bg-white dark:focus:bg-neutral-200',
   'select-none',
   'whitespace-nowrap'
 );
@@ -42,7 +42,7 @@ export const DropdownMenuTrigger = forwardRef<
   const triggerClasses = classNames(
     className,
     'text-sm py-1 px-2 rounded bg-transparent border border-neutral-500 whitespace-nowrap',
-    'dark:hover:bg-neutral-500/20 hover:bg-neutral-500/40'
+    'hover:bg-neutral-500/20 dark:hover:bg-neutral-500/40'
   );
   return (
     <DropdownMenuPrimitive.Trigger
@@ -73,7 +73,7 @@ export const DropdownMenuContent = forwardRef<
   <DropdownMenuPrimitive.Content
     {...contentProps}
     ref={forwardedRef}
-    className="min-w-[290px] bg-neutral-100 dark:bg-neutral-900 p-2 rounded z-20 text-black dark:text-white dark:border-neutral-700 border border-neutral-300"
+    className="min-w-[290px] bg-neutral-200 dark:bg-white p-2 rounded z-20 dark:text-black"
     align="start"
     sideOffset={10}
   />
@@ -115,9 +115,9 @@ export const DropdownMenuRadioItem = forwardRef<
   React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem> & {
     inset?: boolean;
   }
->(({ className, inset = false, ...radioItemProps }, forwardedRef) => (
+>(({ className, inset = false, ...radioItemprops }, forwardedRef) => (
   <DropdownMenuPrimitive.RadioItem
-    {...radioItemProps}
+    {...radioItemprops}
     ref={forwardedRef}
     className={classNames(itemClass, className)}
   />

libs/ui-toolkit/src/components/dropdown-menu/index.ts

@@ -1,2 +1 @@
 export * from './dropdown-menu';
-export * from './dropdown-menu-grid';

libs/ui-toolkit/src/components/icon/blueprint-icons/index.ts

@@ -1 +0,0 @@
-export * from './icon';

libs/ui-toolkit/src/components/icon/index.ts

@@ -1,2 +1 @@
-export * from './blueprint-icons';
-export * from './vega-icons';
+export * from './icon';

libs/ui-toolkit/src/components/icon/vega-icons/index.ts

@@ -1,3 +0,0 @@
-export * from './vega-icon';
-export * from './vega-icon.stories';
-export * from './vega-icon-record';

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-breakdown.tsx

@@ -1,29 +0,0 @@
-export const IconBreakdown = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <circle cx="8" cy="8" r="6.5" stroke="white" />
-      <rect
-        x="8.5"
-        y="11"
-        width="1"
-        height="4"
-        transform="rotate(-180 8.5 11)"
-        fill="white"
-      />
-      <rect
-        x="8.5"
-        y="6"
-        width="1"
-        height="1"
-        transform="rotate(-180 8.5 6)"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-copy.tsx

@@ -1,18 +0,0 @@
-export const IconCopy = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M4.47021 1.46997H14.5302V11.53H12.5002V10.47H13.4702V2.52997H5.53021V3.49997H4.47021V1.46997ZM1.47021 4.46997H11.5302V14.53H1.47021V4.46997ZM2.53021 5.52997V13.47H10.4702V5.52997H2.53021Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-deposit.tsx

@@ -1,17 +0,0 @@
-export const IconDeposit = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <rect x="4" y="13" width="8" height="1" fill="white" />
-      <path
-        d="M8.52977 8.72048L11.625 5.62524L12.3745 6.37478L7.99977 10.7495L3.625 6.37478L4.37453 5.62524L7.46977 8.72048V2H8.52977V8.72048Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-edit.tsx

@@ -1,18 +0,0 @@
-export const IconEdit = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M2.31 10.44L1.5 14.5L5.56 13.69L14.5 4.75L11.25 1.5V1.51L9.97784 2.78074L9.97356 2.77646L9.26645 3.48357L9.27033 3.48745L2.31 10.44ZM11.25 2.92L13.08 4.75L12.5135 5.31645L10.6835 3.48645L11.25 2.92ZM9.97644 4.19356L11.8064 6.02356L6.02355 11.8064L4.19355 9.97645L9.97644 4.19356ZM5.31644 12.5136L5.07 12.76L2.78 13.22L3.24 10.93L3.48644 10.6836L5.31644 12.5136Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-forum.tsx

@@ -1,18 +0,0 @@
-export const IconForum = ({ size = 24 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M8.20755 15.7736H6V4H8.20755V15.7736ZM10.4151 17.8585V15.7736H8.20755V17.9811H10.4151V20.066H12.6226V17.9811H14.8302V15.7736H12.6226V17.8585H10.4151ZM16.7925 13.566H14.5849V4H16.7925V13.566ZM16.7925 13.566H19V15.7736H16.7925V13.566Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-globe.tsx

@@ -1,18 +0,0 @@
-export const IconGlobe = ({ size = 24 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M11.9946 3C10.2165 3.00106 8.47842 3.52883 6.99987 4.51677C5.51983 5.5057 4.36628 6.91131 3.68509 8.55585C3.0039 10.2004 2.82567 12.01 3.17294 13.7558C3.5202 15.5016 4.37737 17.1053 5.63604 18.364C6.89471 19.6226 8.49836 20.4798 10.2442 20.8271C11.99 21.1743 13.7996 20.9961 15.4442 20.3149C17.0887 19.6337 18.4943 18.4802 19.4832 17.0001C20.4722 15.5201 21 13.78 21 12C21 9.61305 20.0518 7.32386 18.364 5.63604C16.6761 3.94821 14.3869 3 12 3C12.0001 3 11.9999 3 12 3M11.9959 3.936C11.9972 3.936 11.9985 3.936 11.9999 3.936C13.2976 3.93617 14.3772 5.83592 14.9515 8.22998H9.04712C9.62068 5.83664 10.6991 3.93971 11.9959 3.936ZM9.8073 4.24157C9.05208 5.16925 8.44481 6.56185 8.07534 8.22998H4.87438C5.24741 7.52551 5.72602 6.87397 6.3 6.3C7.28288 5.31711 8.49319 4.61388 9.8073 4.24157ZM4.42885 9.22998C4.10667 10.1091 3.93685 11.0458 3.936 12C3.936 12.9499 4.10378 13.8872 4.42669 14.77H7.88922C7.75324 13.8973 7.67969 12.9663 7.67969 12C7.67969 11.0336 7.7527 10.1027 7.8879 9.22998H4.42885ZM4.87153 15.77C5.00006 16.013 5.14133 16.2501 5.29503 16.4801C6.18112 17.8062 7.44054 18.8398 8.91404 19.4502C9.20977 19.5727 9.51146 19.677 9.81744 19.763C9.06048 18.8354 8.44956 17.4409 8.07765 15.77H4.87153ZM14.1834 19.7628C15.5101 19.3896 16.7227 18.6815 17.7021 17.7021C18.2744 17.1298 18.7541 16.4778 19.1285 15.77H15.9224C15.5508 17.4416 14.9402 18.8355 14.1834 19.7628ZM19.5733 14.77C19.7153 14.3819 19.8278 13.9819 19.9091 13.5732C20.1981 12.12 20.0808 10.6174 19.5733 9.22998H16.1106C16.2463 10.1024 16.3197 11.0333 16.3197 12C16.3197 12.9667 16.2463 13.8976 16.1106 14.77H19.5733ZM19.1285 8.22998C18.5047 7.05058 17.596 6.04063 16.4801 5.29503C15.7711 4.82129 14.9955 4.46564 14.1834 4.23723C14.9402 5.16453 15.5508 6.55844 15.9224 8.22998H19.1285ZM8.60129 12C8.60129 11.0806 8.68603 10.1352 8.84194 9.22998H15.1569C15.3132 10.1358 15.3981 11.0814 15.3981 12C15.3981 12.9186 15.314 13.8642 15.1588 14.77H8.84003C8.68519 13.8648 8.60129 12.9194 8.60129 12ZM11.9997 20.064C10.6916 20.064 9.61486 18.1657 9.04394 15.77H14.9547C14.3836 18.1642 13.3072 20.064 11.9997 20.064Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-linkedin.tsx

@@ -1,16 +0,0 @@
-export const IconLinkedIn = ({ size = 24 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M21 4.32353V19.6765C21 20.0275 20.8606 20.3641 20.6123 20.6123C20.3641 20.8606 20.0275 21 19.6765 21H4.32353C3.97251 21 3.63586 20.8606 3.38765 20.6123C3.13944 20.3641 3 20.0275 3 19.6765V4.32353C3 3.97251 3.13944 3.63586 3.38765 3.38765C3.63586 3.13944 3.97251 3 4.32353 3H19.6765C20.0275 3 20.3641 3.13944 20.6123 3.38765C20.8606 3.63586 21 3.97251 21 4.32353V4.32353ZM8.29412 9.88235H5.64706V18.3529H8.29412V9.88235ZM8.53235 6.97059C8.53375 6.77036 8.49569 6.57182 8.42035 6.3863C8.34502 6.20078 8.23387 6.03191 8.09328 5.88935C7.95268 5.74678 7.78537 5.6333 7.60091 5.5554C7.41646 5.47749 7.21846 5.43668 7.01824 5.43529H6.97059C6.5634 5.43529 6.1729 5.59705 5.88497 5.88497C5.59705 6.1729 5.43529 6.5634 5.43529 6.97059C5.43529 7.37777 5.59705 7.76828 5.88497 8.05621C6.1729 8.34413 6.5634 8.50588 6.97059 8.50588V8.50588C7.17083 8.51081 7.37008 8.47623 7.55696 8.40413C7.74383 8.33202 7.91467 8.2238 8.0597 8.08565C8.20474 7.94749 8.32113 7.78212 8.40223 7.59897C8.48333 7.41582 8.52755 7.21848 8.53235 7.01824V6.97059ZM18.3529 13.2071C18.3529 10.6606 16.7329 9.67059 15.1235 9.67059C14.5966 9.6442 14.0719 9.75644 13.6019 9.9961C13.1318 10.2358 12.7328 10.5945 12.4447 11.0365H12.3706V9.88235H9.88235V18.3529H12.5294V13.8476C12.4911 13.3862 12.6365 12.9283 12.9339 12.5735C13.2313 12.2186 13.6567 11.9954 14.1176 11.9524H14.2182C15.06 11.9524 15.6847 12.4818 15.6847 13.8159V18.3529H18.3318L18.3529 13.2071Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-moon.tsx

@@ -1,23 +0,0 @@
-export const IconMoon = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M8 1C4.13 1 1 4.13 1 8C1 11.87 4.13 15 8 15C11.87 15 15 11.87 15 8C15 4.13 11.87 1 8 1ZM8.66 12.44H7.32V11.1H8.66V12.44ZM10.38 6.78C10.29 7.01 10.18 7.2 10.05 7.36C9.92 7.52 9.75 7.7 9.53 7.91C9.3 8.14 9.11 8.34 8.98 8.51C8.85 8.68 8.73 8.89 8.64 9.14C8.55 9.37 8.51 9.65 8.51 9.96V10.04V10.13H7.3V10.04C7.3 9.61 7.36 9.24 7.47 8.92C7.58 8.61 7.71 8.34 7.87 8.13C8.03 7.92 8.22 7.69 8.47 7.43C8.75 7.13 8.96 6.87 9.09 6.66C9.22 6.46 9.28 6.2 9.28 5.88C9.28 5.47 9.16 5.16 8.93 4.93C8.7 4.7 8.38 4.58 7.96 4.58C7.6 4.58 7.28 4.68 7.01 4.89C6.75 5.09 6.56 5.44 6.45 5.96C6.34 6.48 6.43 6.06 6.43 6.06L5.26 5.62L5.28 5.54C5.47 4.87 5.81 4.35 6.29 4.02C6.77 3.69 7.34 3.53 8 3.53C8.75 3.53 9.37 3.75 9.82 4.18C10.28 4.62 10.5 5.22 10.5 5.97C10.5 6.27 10.46 6.53 10.37 6.76L10.38 6.78Z"
-        fill="white"
-      />
-      <circle cx="8" cy="8" r="7" fill="white" />
-      <path
-        d="M6.15393 5.69232C6.15393 5.10304 6.24054 4.5075 6.46161 4C4.99179 4.63982 4 6.14089 4 7.84607C4 10.1402 5.85982 12 8.15393 12C9.85911 12 11.3602 11.0082 12 9.53839C11.4925 9.75946 10.8964 9.84607 10.3077 9.84607C8.01357 9.84607 6.15393 7.98643 6.15393 5.69232Z"
-        fill="black"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-open-external.tsx

@@ -1,16 +0,0 @@
-export const IconOpenExternal = ({ size = 24 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M10.9605 4.28998H3.76002V3.22998H12.77V12.24H11.71V5.03952L4.13479 12.6148L3.38525 11.8652L10.9605 4.28998Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-question-mark.tsx

@@ -1,18 +0,0 @@
-export const IconQuestionMark = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M8 1C4.13 1 1 4.13 1 8C1 11.87 4.13 15 8 15C11.87 15 15 11.87 15 8C15 4.13 11.87 1 8 1ZM8.66 12.44H7.32V11.1H8.66V12.44ZM10.38 6.78C10.29 7.01 10.18 7.2 10.05 7.36C9.92 7.52 9.75 7.7 9.53 7.91C9.3 8.14 9.11 8.34 8.98 8.51C8.85 8.68 8.73 8.89 8.64 9.14C8.55 9.37 8.51 9.65 8.51 9.96V10.04V10.13H7.3V10.04C7.3 9.61 7.36 9.24 7.47 8.92C7.58 8.61 7.71 8.34 7.87 8.13C8.03 7.92 8.22 7.69 8.47 7.43C8.75 7.13 8.96 6.87 9.09 6.66C9.22 6.46 9.28 6.2 9.28 5.88C9.28 5.47 9.16 5.16 8.93 4.93C8.7 4.7 8.38 4.58 7.96 4.58C7.6 4.58 7.28 4.68 7.01 4.89C6.75 5.09 6.56 5.44 6.45 5.96L6.43 6.06L5.26 5.62L5.28 5.54C5.47 4.87 5.81 4.35 6.29 4.02C6.77 3.69 7.34 3.53 8 3.53C8.75 3.53 9.37 3.75 9.82 4.18C10.28 4.62 10.5 5.22 10.5 5.97C10.5 6.27 10.46 6.53 10.37 6.76L10.38 6.78Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-transfer.tsx

@@ -1,20 +0,0 @@
-export const IconTransfer = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M3.27952 5.90477L5.37476 8L4.62522 8.74953L1.25046 5.37477L4.62522 2L5.37476 2.74953L3.27952 4.84477L9 4.84477L9 5.90477L3.27952 5.90477Z"
-        fill="white"
-      />
-      <path
-        d="M12.7205 10.0952L10.6252 8L11.3748 7.25047L14.7495 10.6252L11.3748 14L10.6252 13.2505L12.7205 11.1552L7 11.1552L7 10.0952L12.7205 10.0952Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-twitter.tsx

@@ -1,16 +0,0 @@
-export const IconTwitter = ({ size = 24 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M8.28743 20.2575C15.8423 20.2575 19.9641 14 19.9641 8.58084C19.9641 8.4012 19.9641 8.22156 19.9541 8.0519C20.7525 7.47305 21.4511 6.74451 22 5.92615C21.2615 6.25549 20.4731 6.47505 19.6447 6.57485C20.493 6.06587 21.1417 5.26747 21.4511 4.2994C20.6627 4.76846 19.7844 5.10778 18.8463 5.29741C18.0978 4.499 17.0299 4 15.8523 4C13.5868 4 11.7505 5.83633 11.7505 8.1018C11.7505 8.42116 11.7904 8.74052 11.8603 9.03992C8.43713 8.86028 5.40319 7.22355 3.38723 4.7485C3.02794 5.34731 2.82834 6.05589 2.82834 6.80439C2.82834 8.23154 3.55689 9.48902 4.65469 10.2176C3.97605 10.2076 3.34731 10.018 2.7984 9.70858C2.7984 9.72854 2.7984 9.73852 2.7984 9.75848C2.7984 11.7445 4.21557 13.4112 6.09182 13.7804C5.74251 13.8703 5.38323 13.9202 5.01397 13.9202C4.75449 13.9202 4.49501 13.8902 4.24551 13.8503C4.76447 15.477 6.28144 16.6647 8.07784 16.7046C6.67066 17.8024 4.90419 18.4611 2.97804 18.4611C2.6487 18.4611 2.31936 18.4411 2 18.4012C3.80639 19.5788 5.96208 20.2575 8.28743 20.2575Z"
-        fill="white"
-      />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-withdraw.tsx

@@ -1,17 +0,0 @@
-export const IconWithdraw = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M7.47023 4.0291L4.375 7.12433L3.62547 6.37479L8.00023 2.00003L12.375 6.3748L11.6255 7.12433L8.53023 4.0291L8.53023 10.7496L7.47023 10.7496L7.47023 4.0291Z"
-        fill="white"
-      />
-      <rect x="4" y="13" width="8" height="1" fill="white" />
-    </svg>
-  );
-};

libs/ui-toolkit/src/components/icon/vega-icons/vega-icon-record.ts

@@ -1,48 +0,0 @@
-import { IconBreakdown } from './svg-icons/icon-breakdown';
-import { IconCopy } from './svg-icons/icon-copy';
-import { IconDeposit } from './svg-icons/icon-deposit';
-import { IconWithdraw } from './svg-icons/icon-withdraw';
-import { IconTransfer } from './svg-icons/icon-transfer';
-import { IconEdit } from './svg-icons/icon-edit';
-import { IconMoon } from './svg-icons/icon-moon';
-import { IconGlobe } from './svg-icons/icon-globe';
-import { IconLinkedIn } from './svg-icons/icon-linkedin';
-import { IconTwitter } from './svg-icons/icon-twitter';
-import { IconQuestionMark } from './svg-icons/icon-question-mark';
-import { IconForum } from './svg-icons/icon-forum';
-import { IconOpenExternal } from './svg-icons/icon-open-external';
-
-export enum VegaIconNames {
-  BREAKDOWN = 'breakdown',
-  COPY = 'copy',
-  DEPOSIT = 'deposit',
-  WITHDRAW = 'withdraw',
-  EDIT = 'edit',
-  TRANSFER = 'transfer',
-  FORUM = 'forum',
-  GLOBE = 'globe',
-  LINKEDIN = 'linkedin',
-  TWITTER = 'twitter',
-  MOON = 'moon',
-  OPEN_EXTERNAL = 'open-external',
-  QUESTION_MARK = 'question-mark',
-}
-
-export const VegaIconNameMap: Record<
-  VegaIconNames,
-  ({ size }: { size: number }) => JSX.Element
-> = {
-  breakdown: IconBreakdown,
-  copy: IconCopy,
-  deposit: IconDeposit,
-  withdraw: IconWithdraw,
-  transfer: IconTransfer,
-  edit: IconEdit,
-  moon: IconMoon,
-  globe: IconGlobe,
-  linkedin: IconLinkedIn,
-  twitter: IconTwitter,
-  'question-mark': IconQuestionMark,
-  forum: IconForum,
-  'open-external': IconOpenExternal,
-};

libs/ui-toolkit/src/components/icon/vega-icons/vega-icon.spec.tsx

@@ -1,11 +0,0 @@
-import { render } from '@testing-library/react';
-
-import { VegaIcon } from './vega-icon';
-import { VegaIconNames } from './vega-icon-record';
-
-describe('VegaIcon', () => {
-  it('should render successfully', () => {
-    const { baseElement } = render(<VegaIcon name={VegaIconNames.TWITTER} />);
-    expect(baseElement).toBeTruthy();
-  });
-});

libs/ui-toolkit/src/components/icon/vega-icons/vega-icon.stories.tsx

@@ -1,28 +0,0 @@
-import type { Story, Meta } from '@storybook/react';
-import type { VegaIconProps } from './vega-icon';
-import { VegaIcon } from './vega-icon';
-import { VegaIconNames } from './vega-icon-record';
-
-export default {
-  component: VegaIcon,
-  title: 'VegaIcon',
-} as Meta;
-
-const Template: Story<VegaIconProps> = (args) => <VegaIcon {...args} />;
-
-export const Small = Template.bind({});
-Small.args = {
-  name: VegaIconNames.BREAKDOWN,
-};
-
-export const Bigger = Template.bind({});
-Bigger.args = {
-  name: VegaIconNames.DEPOSIT,
-  size: 24,
-};
-
-export const EvenBigger = Template.bind({});
-EvenBigger.args = {
-  name: VegaIconNames.GLOBE,
-  size: 32,
-};

libs/ui-toolkit/src/components/icon/vega-icons/vega-icon.tsx

@@ -1,26 +0,0 @@
-import classNames from 'classnames';
-
-import type { VegaIconNames } from './vega-icon-record';
-import { VegaIconNameMap } from './vega-icon-record';
-
-export interface VegaIconProps {
-  name: VegaIconNames;
-  size?: 16 | 24 | 32;
-}
-
-export const VegaIcon = ({ size = 16, name }: VegaIconProps) => {
-  const effectiveClassName = classNames(
-    'inline-block',
-    'fill-current',
-    'align-text-bottom',
-    'fill-current',
-    'shrink-0',
-    'pr-1'
-  );
-  const Element = VegaIconNameMap[name];
-  return (
-    <span className={effectiveClassName}>
-      <Element size={size} />
-    </span>
-  );
-};