fix: revert sortable setup

Co-authored-by: Madalina Raicu <madalina@raygroup.uk>

.github/workflows/console-test-run.yml

@@ -10,7 +10,7 @@ on:
     inputs:
       console-test-branch:
         type: choice
-        description: 'main: v0.72.14, develop: v0.73.4'
+        description: 'main: v0.73.5, develop: v0.73.5'
         options:
           - main
           - develop
@@ -215,7 +215,7 @@ jobs:
         if: always()
         with:
           name: playwright-trace
-          path: ./traces/
+          path: apps/trading/e2e/traces/
           retention-days: 15
       #----------------------------------------------
       #  -----  upload logs  -----

.gitignore

@@ -48,16 +48,15 @@ cypress.env.json
 # Next.js
 .next
 
-#cypress
+# cypress
 /apps/**/cypress/reports/
 /apps/**/cypress/downloads/
 /apps/**/fixtures/wallet/node**
 
-#console-test
+# apps/trading/e2e
 __pycache__/
 apps/trading/e2e/logs/
 apps/trading/e2e/.pytest_cache/
 apps/trading/e2e/traces/
 
-.nx/cache
-
+.nx/

.prettierignore

@@ -1,6 +1,7 @@
 # Add files here to ignore them from prettier formatting
 
 /dist
+/dist-result
 /coverage
 __generated__
 __generated___
@@ -13,3 +14,10 @@ apps/static/src/assets/testnet-tranches.json
 /apps/**/cypress/downloads/
 
 /.nx/cache
+
+# apps/trading/e2e
+__pycache__/
+apps/trading/e2e/logs/
+apps/trading/e2e/.pytest_cache/
+apps/trading/e2e/traces/
+.pytest_cache/

apps/explorer/netlify.toml

@@ -1,4 +0,0 @@
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200

apps/explorer/project.json

@@ -74,15 +74,6 @@
         ]
       }
     },
-    "build-netlify": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "cp apps/explorer/netlify.toml netlify.toml",
-          "nx build explorer"
-        ]
-      }
-    },
     "build-spec": {
       "executor": "nx:run-commands",
       "outputs": [],

apps/explorer/src/app/app.tsx

@@ -1,3 +1,4 @@
+import '../i18n';
 import {
   NetworkLoader,
   NodeFailure,
@@ -28,20 +29,24 @@ function App() {
   );
   return (
     <TendermintWebsocketProvider>
-      <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
-        <NodeGuard
-          skeleton={<div>{t('Loading')}</div>}
-          failure={<NodeFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />}
-        >
-          <Suspense fallback={splashLoading}>
-            <RouterProvider router={router} fallbackElement={splashLoading} />
-          </Suspense>
-        </NodeGuard>
-        <NodeSwitcherDialog
-          open={nodeSwitcherOpen}
-          setOpen={setNodeSwitcherOpen}
-        />
-      </NetworkLoader>
+      <Suspense fallback={splashLoading}>
+        <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
+          <NodeGuard
+            skeleton={<div>{t('Loading')}</div>}
+            failure={
+              <NodeFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />
+            }
+          >
+            <Suspense fallback={splashLoading}>
+              <RouterProvider router={router} fallbackElement={splashLoading} />
+            </Suspense>
+          </NodeGuard>
+          <NodeSwitcherDialog
+            open={nodeSwitcherOpen}
+            setOpen={setNodeSwitcherOpen}
+          />
+        </NetworkLoader>
+      </Suspense>
     </TendermintWebsocketProvider>
   );
 }

apps/explorer/src/app/components/assets/assets-table.tsx

@@ -12,7 +12,8 @@ import { type VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { useNavigate } from 'react-router-dom';
-import { type RowClickedEvent, ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
+import type { RowClickedEvent } from 'ag-grid-community';
 
 type AssetsTableProps = {
   data: AssetFieldsFragment[] | null;

apps/explorer/src/app/components/proposals/proposals-table.tsx

@@ -8,7 +8,8 @@ import {
   type VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { type RowClickedEvent, ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
+import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {

apps/explorer/src/app/components/signature/signature.tsx

@@ -0,0 +1,59 @@
+import { useState } from 'react';
+import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
+import {
+  CopyWithTooltip,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+
+interface SignatureProps {
+  signature: BlockExplorerTransactionResult['signature'];
+}
+
+const valueClass =
+  'font-mono px-2.5 py-0.5 text-xs max-w-[200px] cursor-pointer';
+const valueClassClosed = 'text-ellipsis overflow-hidden';
+const valueClassOpen = 'break-words text-left';
+
+/**
+ * Viewer component for a vega signature. Featuers copy and pasting, truncation
+ *
+ * @param signature
+ */
+export const Signature = ({ signature }: SignatureProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  if (!signature || !signature.value || !signature.version || !signature.algo) {
+    return null;
+  }
+
+  return (
+    <div className="inline-flex border rounded signature-component relative pr-[20px]">
+      <span
+        className="bg-gray-100 px-2.5 py-0.5 text-xs text-gray-500 select-none cursor-default"
+        title={`Version ${signature.version}`}
+      >
+        {signature.algo}
+      </span>
+      <div
+        className={
+          isOpen
+            ? `${valueClass} ${valueClassOpen}`
+            : `${valueClass} ${valueClassClosed}`
+        }
+      >
+        <CopyWithTooltip text={signature.value}>
+          <span title={signature.value}>{signature.value}</span>
+        </CopyWithTooltip>
+      </div>
+      <button
+        onClick={() => setIsOpen(!isOpen)}
+        className="absolute top-[-3px] right-0 pr-2"
+        title={t('Show full signature')}
+      >
+        <VegaIcon name={isOpen ? VegaIconNames.EYE_OFF : VegaIconNames.EYE} />
+      </button>
+    </div>
+  );
+};

apps/explorer/src/app/components/txs/details/shared/tx-details-shared.tsx

@@ -9,6 +9,7 @@ import { Time } from '../../../time';
 import { ChainResponseCode } from '../chain-response-code/chain-reponse.code';
 import { TxDataView } from '../../tx-data-view';
 import Hash from '../../../links/hash';
+import { Signature } from '../../../signature/signature';
 
 interface TxDetailsSharedProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -75,6 +76,12 @@ export const TxDetailsShared = ({
           <BlockLink height={height} />
         </TableCell>
       </TableRow>
+      <TableRow modifier="bordered">
+        <TableCell {...sharedHeaderProps}>{t('Signature')}</TableCell>
+        <TableCell>
+          <Signature signature={txData.signature} />
+        </TableCell>
+      </TableRow>
       <TableRow modifier="bordered">
         <TableCell {...sharedHeaderProps}>{t('Time')}</TableCell>
         <TableCell>

apps/explorer/src/app/components/txs/tx-transfer.spec.tsx

@@ -98,6 +98,8 @@ describe('TxDetailsTransfer', () => {
       },
     },
     signature: {
+      version: '1',
+      algo: 'vega/ed25519',
       value:
         '610c2e196a7d4fed4413b9e82af267b1ff3e30e943df3a3d28096fd60604d430d752fbaf6dd4f84d496be78885bb6118f40560bff7832c06bd7a3d67b718b700',
     },

apps/explorer/src/app/components/txs/txs-infinite-list.spec.tsx

@@ -20,6 +20,8 @@ const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
       '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
     type: 'Submit Order',
     signature: {
+      version: '1',
+      algo: 'vega/ed25519',
       value: '123',
     },
     code: 0,

apps/explorer/src/app/routes/txs/id/tx-details.spec.tsx

@@ -23,6 +23,8 @@ const txData: BlockExplorerTransactionResult = {
   type: 'type',
   command: {} as ValidatorHeartbeat,
   signature: {
+    version: '1',
+    algo: 'vega/ed25519',
     value: '123',
   },
 };

apps/explorer/src/app/routes/types/block-explorer-response.d.ts

@@ -11,6 +11,8 @@ export interface BlockExplorerTransactionResult {
   cursor: string;
   command: components['schemas']['blockexplorerv1transaction'];
   signature: {
+    version: string;
+    algo: string;
     value: string;
   };
   error?: string;

apps/explorer/src/app/setup-tests.ts

@@ -3,6 +3,9 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
+import { locales } from '@vegaprotocol/i18n';
+import i18n from 'i18next';
+import { initReactI18next } from 'react-i18next';
 
 Object.defineProperty(window, 'ResizeObserver', {
   writable: false,
@@ -13,3 +16,14 @@ Object.defineProperty(window, 'ResizeObserver', {
     disconnect: jest.fn(),
   })),
 });
+
+// Set up i18n instance so that components have the correct default
+// en translations
+i18n.use(initReactI18next).init({
+  // we init with resources
+  resources: locales,
+  fallbackLng: 'en',
+  nsSeparator: false,
+  ns: ['explorer'],
+  defaultNS: 'explorer',
+});

apps/explorer/src/assets/locales

@@ -0,0 +1 @@
+../../../../libs/i18n/src/locales

apps/explorer/src/i18n/index.ts

@@ -0,0 +1,45 @@
+import type { Module } from 'i18next';
+import i18n from 'i18next';
+import HttpBackend from 'i18next-http-backend';
+import LocizeBackend from 'i18next-locize-backend';
+import LanguageDetector from 'i18next-browser-languagedetector';
+import { initReactI18next } from 'react-i18next';
+
+const isInDev = process.env.NODE_ENV === 'development';
+const useLocize = isInDev && !!process.env.NX_USE_LOCIZE;
+
+const backend = useLocize
+  ? {
+      projectId: '96ac1231-4bdd-455a-b9d7-f5322a2e7430',
+      apiKey: process.env.NX_LOCIZE_API_KEY,
+      referenceLng: 'en',
+    }
+  : {
+      loadPath: '/assets/locales/{{lng}}/{{ns}}.json',
+    };
+
+const Backend: Module = useLocize ? LocizeBackend : HttpBackend;
+
+i18n
+  .use(Backend)
+  .use(LanguageDetector)
+  .use(initReactI18next)
+  .init({
+    lng: 'en',
+    fallbackLng: 'en',
+    supportedLngs: ['en'],
+    load: 'languageOnly',
+    debug: isInDev,
+    // have a common namespace used around the full app
+    ns: ['explorer'],
+    defaultNS: 'explorer',
+    keySeparator: false, // we use content as keys
+    nsSeparator: false,
+    backend,
+    saveMissing: useLocize && !!process.env.NX_LOCIZE_API_KEY,
+    interpolation: {
+      escapeValue: false,
+    },
+  });
+
+export default i18n;

apps/governance-e2e/src/fixtures/mocks/proposals.ts

@@ -133,7 +133,7 @@ export const proposalsData = {
               instrument: {
                 name: 'UNIDAI Monthly (Dec 2022)',
                 code: 'UNIDAI.MF21',
-                futureProduct: {
+                product: {
                   settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
                   __typename: 'FutureProduct',
                 },
@@ -240,7 +240,7 @@ export const proposalsData = {
               instrument: {
                 name: 'ETHBTC Quarterly (Feb 2023)',
                 code: 'ETHBTC.QM21',
-                futureProduct: {
+                product: {
                   settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
                   __typename: 'FutureProduct',
                 },

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -302,14 +302,17 @@ context(
 
               cy.getByTestId(vegaWalletCurrencyTitle)
                 .contains(name)
-                .parent()
-                .siblings(txTimeout)
-                .should((elementAmount) => {
-                  const displayedAmount = parseFloat(elementAmount.text());
-                  // @ts-ignore clash between jest and cypress
-                  expect(displayedAmount).be.gte(expectedAmount);
+                .parent() // back to currency-title
+                .parent() // back to container
+                .within(() => {
+                  cy.get(
+                    '[data-account-type="account_type_general"] [data-value]'
+                  ).should((elementAmount) => {
+                    const displayedAmount = parseFloat(elementAmount.text());
+                    // @ts-ignore clash between jest and cypress
+                    expect(displayedAmount).be.gte(expectedAmount);
+                  });
                 });
-
               cy.getByTestId(vegaWalletCurrencyTitle)
                 .contains(name)
                 .parent()

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

@@ -256,10 +256,7 @@ export function validateWalletCurrency(
     .parent()
     .parent()
     .within(() => {
-      cy.getByTestId('currency-value', txTimeout).should(
-        'have.text',
-        expectedAmount
-      );
+      cy.get('[data-value]', txTimeout).should('have.text', expectedAmount);
     });
 }
 

apps/governance/.env

@@ -35,6 +35,5 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=false
 NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
+NX_REFERRALS=true
 NX_GOVERNANCE_TRANSFERS=false
-NX_VOLUME_DISCOUNTS=false

apps/governance/.env.capsule

@@ -31,9 +31,8 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 CYPRESS_FAIRGROUND=false
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_VOLUME_DISCOUNTS=true

apps/governance/.env.devnet

@@ -28,4 +28,3 @@ NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_VOLUME_DISCOUNTS=true

apps/governance/.env.mainnet

@@ -22,9 +22,8 @@ NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
-NX_VOLUME_DISCOUNTS=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true

apps/governance/.env.mainnet-mirror

@@ -21,9 +21,8 @@ NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
-NX_VOLUME_DISCOUNTS=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true

apps/governance/.env.stagnet1

@@ -25,4 +25,3 @@ NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
 NX_GOVERNANCE_TRANSFERS=true
-NX_VOLUME_DISCOUNTS=true

apps/governance/.env.testnet

@@ -29,4 +29,3 @@ NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_VOLUME_DISCOUNTS=true

apps/governance/.env.validators-testnet

@@ -20,9 +20,8 @@ NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=false
-NX_VOLUME_DISCOUNTS=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true

apps/governance/README.md

@@ -49,10 +49,6 @@ There are a few different configuration options offered for this app:
 | `NX_ETH_WALLET_MNEMONIC` (optional) | The mnemonic to be used to sign transactions with in browser                                                                                         |
 | `NX_LOCAL_PROVIDER_URL` (optional)  | The local node to use to send transaction to when signing in browser                                                                                 |
 
-## Example configs:
-
-For example configurations, check out our [netlify.toml](./netlify.toml).
-
 ## Testing
 
 To run the minimal set of unit tests, run the following:

apps/governance/netlify.toml

@@ -1,4 +0,0 @@
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200

apps/governance/project.json

@@ -69,15 +69,6 @@
         "jestConfig": "apps/governance/jest.config.ts"
       }
     },
-    "build-netlify": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "cp apps/governance/netlify.toml netlify.toml",
-          "nx build token"
-        ]
-      }
-    },
     "build-spec": {
       "executor": "nx:run-commands",
       "outputs": [],

apps/governance/src/components/heading/heading.tsx

@@ -23,10 +23,13 @@ export const Heading = ({
       })}
     >
       <h1
-        className={classNames('font-alpha calt text-5xl break-words', {
-          'mt-0': !marginTop,
-          'mb-0': !marginBottom,
-        })}
+        className={classNames(
+          'font-alpha calt text-5xl [word-break:break-word]',
+          {
+            'mt-0': !marginTop,
+            'mb-0': !marginBottom,
+          }
+        )}
       >
         {title}
       </h1>

apps/governance/src/components/vega-wallet/hooks.ts

@@ -114,6 +114,16 @@ export const usePollForDelegations = () => {
                     isAssetTypeERC20(a.asset) &&
                     a.asset.source.contractAddress === vegaToken.address;
 
+                  const isVesting =
+                    a.type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS ||
+                    a.type === Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS;
+
+                  let icon = noIcon;
+                  if (isVega) {
+                    if (isVesting) icon = vegaVesting;
+                    else icon = vegaBlack;
+                  }
+
                   return {
                     isVega,
                     name: a.asset.name,
@@ -124,14 +134,7 @@ export const usePollForDelegations = () => {
                     balance: new BigNumber(
                       addDecimal(a.balance, a.asset.decimals)
                     ),
-                    image: isVega
-                      ? vegaBlack
-                      : a.type ===
-                          Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS ||
-                        a.type ===
-                          Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS
-                      ? vegaVesting
-                      : noIcon,
+                    image: icon,
                     border: isVega,
                     address: isAssetTypeERC20(a.asset)
                       ? a.asset.source.contractAddress

apps/governance/src/components/vega-wallet/vega-wallet.tsx

@@ -11,7 +11,10 @@ import { BigNumber } from '../../lib/bignumber';
 import { truncateMiddle } from '../../lib/truncate-middle';
 import Routes from '../../routes/routes';
 import { BulletHeader } from '../bullet-header';
-import type { WalletCardAssetProps } from '../wallet-card';
+import type {
+  WalletCardAssetProps,
+  WalletCardAssetWithMultipleBalancesProps,
+} from '../wallet-card';
 import {
   WalletCard,
   WalletCardActions,
@@ -27,6 +30,7 @@ import { Button, ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { toBigNum } from '@vegaprotocol/utils';
 import { usePendingBalancesStore } from '../../hooks/use-pending-balances-manager';
 import { StakingEventType } from '../../hooks/use-get-association-breakdown';
+import omit from 'lodash/omit';
 
 export const VegaWallet = () => {
   const { t } = useTranslation();
@@ -99,12 +103,29 @@ const VegaWalletAssetList = ({ accounts }: VegaWalletAssetsListProps) => {
   if (!accounts.length) {
     return null;
   }
+
+  const groupedByAsset = accounts.reduce((all, a) => {
+    const foundIndex = all.findIndex((acc) => acc.assetId === a.assetId);
+    if (foundIndex > -1) {
+      const found = all[foundIndex];
+      all[foundIndex] = {
+        ...found,
+        balances: [...found.balances, { balance: a.balance, type: a.type }],
+      };
+      return all;
+    }
+    const acc = {
+      ...omit(a, 'balance', 'type'),
+      balances: [{ balance: a.balance, type: a.type }],
+    };
+    return [...all, acc];
+  }, [] as WalletCardAssetWithMultipleBalancesProps[]);
   return (
     <>
       <WalletCardHeader>
         <BulletHeader tag="h2">{t('assets')}</BulletHeader>
       </WalletCardHeader>
-      {accounts.map((a, i) => (
+      {groupedByAsset.map((a, i) => (
         <WalletCardAsset key={i} {...a} />
       ))}
     </>
@@ -182,6 +203,7 @@ const VegaWalletConnected = ({ vegaKeys }: VegaWalletConnectedProps) => {
         subheading={t('Associated')}
         symbol="VEGA"
         balance={currentStakeAvailable}
+        allowZeroBalance={true}
       />
       {totalPending.eq(0) ? null : (
         <>
@@ -192,6 +214,7 @@ const VegaWalletConnected = ({ vegaKeys }: VegaWalletConnectedProps) => {
             subheading={t('Pending association')}
             symbol="VEGA"
             balance={totalPending}
+            allowZeroBalance={true}
           />
           <WalletCardAsset
             image={vegaWhite}
@@ -200,6 +223,7 @@ const VegaWalletConnected = ({ vegaKeys }: VegaWalletConnectedProps) => {
             subheading={t('Total associated after pending')}
             symbol="VEGA"
             balance={pendingStakeAmount}
+            allowZeroBalance={true}
           />
         </>
       )}

apps/governance/src/components/wallet-card/wallet-card.tsx

@@ -103,7 +103,7 @@ export const WalletCardActions = ({
   return <div className="flex justify-end gap-2 mb-4">{children}</div>;
 };
 
-export interface WalletCardAssetProps {
+export type WalletCardAssetProps = {
   image: string;
   name: string;
   symbol: string;
@@ -113,42 +113,61 @@ export interface WalletCardAssetProps {
   border?: boolean;
   subheading?: string;
   type?: Schema.AccountType;
-}
+  allowZeroBalance?: boolean;
+};
+
+export type WalletCardAssetWithMultipleBalancesProps = Omit<
+  WalletCardAssetProps,
+  'balance' | 'type'
+> & {
+  balances: { balance: BigNumber; type?: Schema.AccountType }[];
+};
 
 export const WalletCardAsset = ({
   image,
   name,
   symbol,
-  balance,
   decimals,
   assetId,
   border,
   subheading,
-  type,
-}: WalletCardAssetProps) => {
-  const [integers, decimalsPlaces, separator] = useNumberParts(
-    balance,
-    decimals
-  );
-  const { t } = useTranslation();
-  const consoleLink = useLinks(DApp.Console);
-  const transferAssetLink = (assetId: string) =>
-    consoleLink(CONSOLE_TRANSFER_ASSET.replace(':assetId', assetId));
-  const { param: baseRate } = useNetworkParam('rewards_vesting_baseRate');
+  allowZeroBalance = false,
+  ...props
+}: WalletCardAssetProps | WalletCardAssetWithMultipleBalancesProps) => {
+  const balance = 'balance' in props ? props.balance : undefined;
+  const type = 'type' in props ? props.type : undefined;
+  const balances =
+    'balances' in props
+      ? props.balances
+      : balance
+      ? [{ balance, type }]
+      : undefined;
 
-  const isRedeemable =
-    type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS && assetId;
+  const values =
+    balances &&
+    balances.length > 0 &&
+    balances
+      .filter((b) => allowZeroBalance || !b.balance.isZero())
+      .sort((a, b) => {
+        const order = [
+          Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS,
+          Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
+          Schema.AccountType.ACCOUNT_TYPE_GENERAL,
+          undefined,
+        ];
+        return order.indexOf(a.type) - order.indexOf(b.type);
+      })
+      .map(({ balance, type }, i) => (
+        <CurrencyValue
+          key={i}
+          balance={balance}
+          decimals={decimals}
+          type={type}
+          assetId={assetId}
+        />
+      ));
 
-  const accountTypeTooltip = useMemo(() => {
-    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS) {
-      return t('VestedRewardsTooltip');
-    }
-    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS && baseRate) {
-      return t('VestingRewardsTooltip', { baseRate });
-    }
-
-    return null;
-  }, [baseRate, t, type]);
+  if (!values || values.length === 0) return;
 
   return (
     <div className="flex flex-nowrap gap-2 mt-2 mb-4">
@@ -169,35 +188,92 @@ export const WalletCardAsset = ({
             {subheading || symbol}
           </div>
         </div>
-        {type ? (
-          <div className="mb-[2px] flex gap-2 items-baseline">
-            <Tooltip description={accountTypeTooltip}>
-              <span className="px-2 py-1 leading-none text-xs bg-vega-cdark-700 rounded">
-                {Schema.AccountTypeMapping[type]}
-              </span>
-            </Tooltip>
-            {isRedeemable ? (
-              <Tooltip description={t('RedeemRewardsTooltip')}>
-                <AnchorButton
-                  variant="primary"
-                  size="xs"
-                  href={transferAssetLink(assetId)}
-                  target="_blank"
-                  className="px-2 py-1 leading-none text-xs bg-vega-yellow text-black rounded"
-                >
-                  {t('Redeem')}
-                </AnchorButton>
-              </Tooltip>
-            ) : null}
-          </div>
-        ) : null}
-        <div className="basis-full font-mono" data-testid="currency-value">
-          <span>
-            {integers}
-            {separator}
-          </span>
-          <span className="text-neutral-400">{decimalsPlaces}</span>
+        {values}
+      </div>
+    </div>
+  );
+};
+
+const useAccountTypeTooltip = (type?: Schema.AccountType) => {
+  const { t } = useTranslation();
+  const { param: baseRate } = useNetworkParam('rewards_vesting_baseRate');
+  const accountTypeTooltip = useMemo(() => {
+    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS) {
+      return t('VestedRewardsTooltip');
+    }
+    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS && baseRate) {
+      return t('VestingRewardsTooltip', { baseRate });
+    }
+
+    return null;
+  }, [baseRate, t, type]);
+
+  return accountTypeTooltip;
+};
+
+const CurrencyValue = ({
+  balance,
+  decimals,
+  type,
+  assetId,
+}: {
+  balance: BigNumber;
+  decimals: number;
+  type?: Schema.AccountType;
+  assetId?: string;
+}) => {
+  const { t } = useTranslation();
+  const consoleLink = useLinks(DApp.Console);
+  const transferAssetLink = (assetId: string) =>
+    consoleLink(CONSOLE_TRANSFER_ASSET.replace(':assetId', assetId));
+
+  const [integers, decimalsPlaces, separator] = useNumberParts(
+    balance,
+    decimals
+  );
+  const accountTypeTooltip = useAccountTypeTooltip(type);
+
+  const accountType = type && (
+    <Tooltip description={accountTypeTooltip}>
+      <span className="px-2 py-1 leading-none text-xs bg-vega-cdark-700 rounded">
+        {Schema.AccountTypeMapping[type]}
+      </span>
+    </Tooltip>
+  );
+  const isRedeemable =
+    type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS && assetId;
+  const redeemBtn = isRedeemable ? (
+    <Tooltip description={t('RedeemRewardsTooltip')}>
+      <AnchorButton
+        variant="primary"
+        size="xs"
+        href={transferAssetLink(assetId)}
+        target="_blank"
+        className="px-2 py-1 leading-none text-xs bg-vega-yellow text-black rounded"
+      >
+        {t('Redeem')}
+      </AnchorButton>
+    </Tooltip>
+  ) : null;
+
+  return (
+    <div
+      className="basis-full font-mono mb-1"
+      data-account-type={type?.toLowerCase() || 'unspecified'}
+      data-testid="currency-value"
+    >
+      {type && (
+        <div data-type className="flex gap-1">
+          {accountType}
+          {redeemBtn}
         </div>
+      )}
+      <div data-value>
+        <span>
+          {integers}
+          {separator}
+        </span>
+        <span className="text-neutral-400">{decimalsPlaces}</span>
       </div>
     </div>
   );

apps/governance/src/i18n/index.ts

@@ -34,6 +34,7 @@ i18n
     ns: ['governance'],
     defaultNS: 'governance',
     keySeparator: false, // we use content as keys
+    nsSeparator: false,
     backend,
     saveMissing: useLocize && !!process.env.NX_LOCIZE_API_KEY,
     interpolation: {

apps/governance/src/routes/home/index.tsx

@@ -189,7 +189,6 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
       includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
     },
   });
 

apps/governance/src/routes/proposals/components/proposal-asset-details/proposal-asset-details.tsx

@@ -7,8 +7,10 @@ import type { AssetFieldsFragment } from '@vegaprotocol/assets';
 
 export const ProposalAssetDetails = ({
   asset,
+  originalAsset,
 }: {
   asset: AssetFieldsFragment;
+  originalAsset?: AssetFieldsFragment;
 }) => {
   const { t } = useTranslation();
   const [showAssetDetails, setShowAssetDetails] = useState(false);
@@ -27,6 +29,7 @@ export const ProposalAssetDetails = ({
         <div className="mb-10 pb-4">
           <AssetDetailsTable
             asset={asset}
+            originalAsset={originalAsset}
             omitRows={[
               AssetDetail.STATUS,
               AssetDetail.INFRASTRUCTURE_FEE_ACCOUNT_BALANCE,

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -77,7 +77,7 @@ describe('Proposal header', () => {
               __typename: 'InstrumentConfiguration',
               name: 'Some market',
               code: 'FX:BTCUSD/DEC99',
-              futureProduct: {
+              product: {
                 __typename: 'FutureProduct',
                 settlementAsset: {
                   __typename: 'Asset',

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -39,6 +39,18 @@ export const ProposalHeader = ({
 
   const titleContent = shorten(title ?? '', 100);
 
+  const getAsset = (proposal: ProposalQuery['proposal']) => {
+    const terms = proposal?.terms;
+    if (
+      terms?.change.__typename === 'NewMarket' &&
+      (terms.change.instrument.product?.__typename === 'FutureProduct' ||
+        terms.change.instrument.product?.__typename === 'PerpetualProduct')
+    ) {
+      return terms.change.instrument.product.settlementAsset;
+    }
+    return undefined;
+  };
+
   switch (change?.__typename) {
     case 'NewMarket': {
       proposalType =
@@ -54,10 +66,10 @@ export const ProposalHeader = ({
           <span>
             {t('Code')}: {change.instrument.code}.
           </span>{' '}
-          {change.instrument.futureProduct?.settlementAsset.symbol ? (
+          {proposal?.terms && getAsset(proposal)?.symbol ? (
             <>
               <span className="font-semibold">
-                {change.instrument.futureProduct.settlementAsset.symbol}
+                {getAsset(proposal)?.symbol}
               </span>{' '}
               {t('settled future')}.
             </>

apps/governance/src/routes/proposals/components/proposal-volume-discount-program-details/proposal-volume-discount-program-details.tsx

@@ -78,7 +78,7 @@ export const ProposalVolumeDiscountProgramDetails = ({
               {t('BenefitTiers')}
             </h3>
             <KeyValueTable>
-              {benefitTiers
+              {[...benefitTiers]
                 .sort(
                   (a, b) =>
                     Number(a.minimumRunningNotionalTakerVolume) -

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -65,10 +65,13 @@ export const Proposal = ({
     ? removePaginationWrapper(assetData.assetsConnection?.edges)[0]
     : undefined;
 
+  const originalAsset = asset;
+
   if (proposal.terms.change.__typename === 'UpdateAsset' && asset) {
     asset = {
       ...asset,
       quantum: proposal.terms.change.quantum,
+      source: { ...asset.source },
     };
 
     if (asset.source.__typename === 'ERC20') {
@@ -228,7 +231,7 @@ export const Proposal = ({
         proposal.terms.change.__typename === 'UpdateAsset') &&
         asset && (
           <div className="mb-4">
-            <ProposalAssetDetails asset={asset} />
+            <ProposalAssetDetails asset={asset} originalAsset={originalAsset} />
           </div>
         )}
 

apps/governance/src/routes/proposals/components/propose/proposal-form-transaction-dialog.tsx

@@ -1,7 +1,7 @@
 import {
   getProposalDialogIcon,
   getProposalDialogIntent,
-  getProposalDialogTitle,
+  useGetProposalDialogTitle,
 } from '@vegaprotocol/proposals';
 import type { ProposalEventFieldsFragment } from '@vegaprotocol/proposals';
 import type { DialogProps } from '@vegaprotocol/proposals';
@@ -15,6 +15,7 @@ export const ProposalFormTransactionDialog = ({
   finalizedProposal,
   TransactionDialog,
 }: ProposalFormTransactionDialogProps) => {
+  const title = useGetProposalDialogTitle(finalizedProposal?.state);
   // Render a custom complete UI if the proposal was rejected otherwise
   // pass undefined so that the default vega transaction dialog UI gets used
   const completeContent = finalizedProposal?.rejectionReason ? (
@@ -24,7 +25,7 @@ export const ProposalFormTransactionDialog = ({
   return (
     <div data-testid="proposal-transaction-dialog">
       <TransactionDialog
-        title={getProposalDialogTitle(finalizedProposal?.state)}
+        title={title}
         intent={getProposalDialogIntent(finalizedProposal?.state)}
         icon={getProposalDialogIcon(finalizedProposal?.state)}
         content={{

apps/governance/src/routes/proposals/components/vote-breakdown/vote-breakdown.spec.tsx

@@ -8,7 +8,7 @@ import {
   networkParamsQueryMock,
   nextWeek,
 } from '../../test-helpers/mocks';
-import { VoteBreakdown } from './vote-breakdown';
+import { CompactVotes, VoteBreakdown } from './vote-breakdown';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MockedResponse } from '@apollo/client/testing';
 import {
@@ -346,3 +346,22 @@ describe('VoteBreakdown', () => {
     expect(style.width).toBe(`${expectedProgress}%`);
   });
 });
+
+describe('CompactVotes', () => {
+  it.each([
+    [0, '0'],
+    [1, '1'],
+    [12, '12'],
+    [123, '123'],
+    [1234, '1.2K'],
+    [12345, '12.3K'],
+    [123456, '123.5K'],
+    [1234567, '1.2M'],
+    [12345678, '12.3M'],
+    [123456789, '123.5M'],
+    [1234567890, '1.2B'],
+  ])('compacts %s to %s', (input, output) => {
+    const { getByTestId } = render(<CompactVotes number={BigNumber(input)} />);
+    expect(getByTestId('compact-number').textContent).toBe(output);
+  });
+});

apps/governance/src/routes/proposals/components/vote-breakdown/vote-breakdown.tsx

@@ -3,11 +3,21 @@ import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { useVoteInformation } from '../../hooks';
 import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
-import { formatNumber, toBigNum } from '@vegaprotocol/utils';
+import { formatNumber } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
 import type { ReactNode } from 'react';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { CompactNumber } from '@vegaprotocol/react-helpers';
+
+export const CompactVotes = ({ number }: { number: BigNumber }) => (
+  <CompactNumber
+    number={number}
+    decimals={number.isGreaterThan(1000) ? 1 : 0}
+    compactAbove={1000}
+    compactDisplay="short"
+  />
+);
 
 interface VoteBreakdownProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
@@ -198,10 +208,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                     )}
                   >
                     <button>
-                      {yesEquityLikeShareWeight
-                        .dividedBy(toBigNum(10 ** 6, 0))
-                        .toFixed(1)}
-                      M
+                      <CompactVotes number={yesEquityLikeShareWeight} />
                     </button>
                   </Tooltip>
                   <span>
@@ -226,10 +233,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                     )}
                   >
                     <button>
-                      {noEquityLikeShareWeight
-                        .dividedBy(toBigNum(10 ** 6, 0))
-                        .toFixed(1)}
-                      M
+                      <CompactVotes number={noEquityLikeShareWeight} />
                     </button>
                   </Tooltip>
                   <span>
@@ -279,10 +283,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                     )}
                   >
                     <button>
-                      {totalEquityLikeShareWeight
-                        .dividedBy(toBigNum(10 ** 6, 0))
-                        .toFixed(1)}
-                      M
+                      <CompactVotes number={totalEquityLikeShareWeight} />
                     </button>
                   </Tooltip>
                   <span>
@@ -321,7 +322,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
               <span>{t('tokenVotesFor')}:</span>
               <Tooltip description={formatNumber(yesTokens, defaultDP)}>
                 <button data-testid="num-votes-for">
-                  {yesTokens.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
+                  <CompactVotes number={yesTokens} />
                 </button>
               </Tooltip>
               <span>
@@ -341,7 +342,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
               <span>{t('tokenVotesAgainst')}:</span>
               <Tooltip description={formatNumber(noTokens, defaultDP)}>
                 <button data-testid="num-votes-against">
-                  {noTokens.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
+                  <CompactVotes number={noTokens} />
                 </button>
               </Tooltip>
               <span>
@@ -384,7 +385,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
               <span>{t('totalTokensVoted')}:</span>
               <Tooltip description={formatNumber(totalTokensVoted, defaultDP)}>
                 <button data-testid="total-voted">
-                  {totalTokensVoted.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
+                  <CompactVotes number={totalTokensVoted} />
                 </button>
               </Tooltip>
               <span data-testid="total-voted-percentage">

apps/governance/src/routes/proposals/proposal/Proposal.graphql

@@ -84,7 +84,6 @@ query Proposal(
   $includeNewMarketProductField: Boolean!
   $includeUpdateMarketState: Boolean!
   $includeUpdateReferralProgram: Boolean!
-  $includeUpdateVolumeDiscountProgram: Boolean!
 ) {
   proposal(id: $proposalId) {
     id
@@ -104,7 +103,6 @@ query Proposal(
     ...UpdateMarketState @include(if: $includeUpdateMarketState)
     ...UpdateReferralProgram @include(if: $includeUpdateReferralProgram)
     ...UpdateVolumeDiscountProgram
-      @include(if: $includeUpdateVolumeDiscountProgram)
     terms {
       closingDatetime
       enactmentDatetime
@@ -132,46 +130,25 @@ query Proposal(
           instrument {
             name
             code
-            futureProduct {
-              settlementAsset {
-                id
-                name
-                symbol
-                decimals
-                quantum
-              }
-              quoteName
-
-              dataSourceSpecForSettlementData {
-                sourceType {
-                  ... on DataSourceDefinitionInternal {
-                    sourceType {
-                      ... on DataSourceSpecConfigurationTime {
-                        conditions {
-                          operator
-                          value
-                        }
-                      }
-                    }
-                  }
-                  ... on DataSourceDefinitionExternal {
-                    sourceType {
-                      ... on DataSourceSpecConfiguration {
-                        signers {
-                          signer {
-                            ... on PubKey {
-                              key
-                            }
-                            ... on ETHAddress {
-                              address
-                            }
-                          }
-                        }
-                        filters {
-                          key {
-                            name
-                            type
-                          }
+            product {
+              ... on FutureProduct {
+                settlementAsset {
+                  id
+                  name
+                  symbol
+                  decimals
+                  quantum
+                }
+                quoteName
+                dataSourceSpecBinding {
+                  settlementDataProperty
+                  tradingTerminationProperty
+                }
+                dataSourceSpecForSettlementData {
+                  sourceType {
+                    ... on DataSourceDefinitionInternal {
+                      sourceType {
+                        ... on DataSourceSpecConfigurationTime {
                           conditions {
                             operator
                             value
@@ -179,52 +156,44 @@ query Proposal(
                         }
                       }
                     }
+                    ... on DataSourceDefinitionExternal {
+                      sourceType {
+                        ... on DataSourceSpecConfiguration {
+                          signers {
+                            signer {
+                              ... on PubKey {
+                                key
+                              }
+                              ... on ETHAddress {
+                                address
+                              }
+                            }
+                          }
+                          filters {
+                            key {
+                              name
+                              type
+                            }
+                            conditions {
+                              operator
+                              value
+                            }
+                          }
+                        }
+                      }
+                    }
                   }
                 }
               }
-              # dataSourceSpecForTradingTermination {
-              #   sourceType {
-              #     ... on DataSourceDefinitionInternal {
-              #       sourceType {
-              #         ... on DataSourceSpecConfigurationTime {
-              #           conditions {
-              #             operator
-              #             value
-              #           }
-              #         }
-              #       }
-              #     }
-              #     ... on DataSourceDefinitionExternal {
-              #       sourceType {
-              #         ... on DataSourceSpecConfiguration {
-              #           signers {
-              #             signer {
-              #               ... on PubKey {
-              #                 key
-              #               }
-              #               ... on ETHAddress {
-              #                 address
-              #               }
-              #             }
-              #           }
-              #           filters {
-              #             key {
-              #               name
-              #               type
-              #             }
-              #             conditions {
-              #               operator
-              #               value
-              #             }
-              #           }
-              #         }
-              #       }
-              #     }
-              #   }
-              # }
-              dataSourceSpecBinding {
-                settlementDataProperty
-                tradingTerminationProperty
+              ... on PerpetualProduct {
+                settlementAsset {
+                  id
+                  name
+                  symbol
+                  decimals
+                  quantum
+                }
+                quoteName
               }
             }
           }

apps/governance/src/routes/proposals/proposal/proposal-container.tsx

@@ -62,7 +62,6 @@ export const ProposalContainer = () => {
       includeNewMarketProductField: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketState: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralProgram: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountProgram: !!FLAGS.VOLUME_DISCOUNTS,
     },
     skip: !params.proposalId,
   });

apps/governance/src/routes/proposals/proposals/Proposals.graphql

@@ -101,9 +101,16 @@ fragment ProposalFields on Proposal {
         instrument {
           name
           code
-          futureProduct {
-            settlementAsset {
-              symbol
+          product {
+            ... on FutureProduct {
+              settlementAsset {
+                symbol
+              }
+            }
+            ... on PerpetualProduct {
+              settlementAsset {
+                symbol
+              }
             }
           }
         }
@@ -164,7 +171,6 @@ query Proposals(
   $includeNewMarketProductFields: Boolean!
   $includeUpdateMarketStates: Boolean!
   $includeUpdateReferralPrograms: Boolean!
-  $includeUpdateVolumeDiscountPrograms: Boolean!
 ) {
   proposalsConnection {
     edges {
@@ -174,7 +180,6 @@ query Proposals(
         ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
         ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
         ...UpdateVolumeDiscountPrograms
-          @include(if: $includeUpdateVolumeDiscountPrograms)
       }
     }
   }

apps/governance/src/routes/proposals/proposals/__generated__/Proposals.ts

@@ -11,17 +11,16 @@ export type UpdateReferralProgramsFragment = { __typename?: 'Proposal', terms: {
 
 export type UpdateVolumeDiscountProgramsFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } } };
 
-export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, product?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename?: 'PerpetualProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename?: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
 
 export type ProposalsQueryVariables = Types.Exact<{
   includeNewMarketProductFields: Types.Scalars['Boolean'];
   includeUpdateMarketStates: Types.Scalars['Boolean'];
   includeUpdateReferralPrograms: Types.Scalars['Boolean'];
-  includeUpdateVolumeDiscountPrograms: Types.Scalars['Boolean'];
 }>;
 
 
-export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null, product?: { __typename: 'FutureProduct' } | { __typename: 'PerpetualProduct' } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram', windowLength: number, endOfProgram: any, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
+export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, product?: { __typename: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename: 'PerpetualProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram', windowLength: number, endOfProgram: any, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
 
 export const NewMarketProductFieldsFragmentDoc = gql`
     fragment NewMarketProductFields on Proposal {
@@ -131,9 +130,16 @@ export const ProposalFieldsFragmentDoc = gql`
         instrument {
           name
           code
-          futureProduct {
-            settlementAsset {
-              symbol
+          product {
+            ... on FutureProduct {
+              settlementAsset {
+                symbol
+              }
+            }
+            ... on PerpetualProduct {
+              settlementAsset {
+                symbol
+              }
             }
           }
         }
@@ -191,7 +197,7 @@ export const ProposalFieldsFragmentDoc = gql`
 }
     `;
 export const ProposalsDocument = gql`
-    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!, $includeUpdateVolumeDiscountPrograms: Boolean!) {
+    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!) {
   proposalsConnection {
     edges {
       node {
@@ -199,7 +205,7 @@ export const ProposalsDocument = gql`
         ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
         ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
         ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
-        ...UpdateVolumeDiscountPrograms @include(if: $includeUpdateVolumeDiscountPrograms)
+        ...UpdateVolumeDiscountPrograms
       }
     }
   }
@@ -225,7 +231,6 @@ ${UpdateVolumeDiscountProgramsFragmentDoc}`;
  *      includeNewMarketProductFields: // value for 'includeNewMarketProductFields'
  *      includeUpdateMarketStates: // value for 'includeUpdateMarketStates'
  *      includeUpdateReferralPrograms: // value for 'includeUpdateReferralPrograms'
- *      includeUpdateVolumeDiscountPrograms: // value for 'includeUpdateVolumeDiscountPrograms'
  *   },
  * });
  */

apps/governance/src/routes/proposals/proposals/proposals-container.tsx

@@ -52,7 +52,6 @@ export const ProposalsContainer = () => {
       includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
     },
   });
 

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -8,7 +8,7 @@ import {
   doesValueEquateToParam,
 } from '@vegaprotocol/proposals';
 import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
-import { validateJson } from '@vegaprotocol/utils';
+import { useValidateJson } from '@vegaprotocol/utils';
 import {
   NetworkParams,
   useNetworkParams,
@@ -41,6 +41,7 @@ export interface NewAssetProposalFormFields {
 const DOCS_LINK = '/new-asset-proposal';
 
 export const ProposeNewAsset = () => {
+  const validateJson = useValidateJson();
   const {
     params,
     loading: networkParamsLoading,

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx

@@ -7,7 +7,7 @@ import {
   doesValueEquateToParam,
 } from '@vegaprotocol/proposals';
 import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
-import { validateJson } from '@vegaprotocol/utils';
+import { useValidateJson } from '@vegaprotocol/utils';
 import {
   NetworkParams,
   useNetworkParams,
@@ -39,6 +39,7 @@ export interface NewMarketProposalFormFields {
 const DOCS_LINK = '/new-market-proposal';
 
 export const ProposeNewMarket = () => {
+  const validateJson = useValidateJson();
   const {
     params,
     loading: networkParamsLoading,

apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx

@@ -14,7 +14,7 @@ import {
   RoundedWrapper,
   TextArea,
 } from '@vegaprotocol/ui-toolkit';
-import { validateJson } from '@vegaprotocol/utils';
+import { useValidateJson } from '@vegaprotocol/utils';
 import {
   NetworkParams,
   useNetworkParams,
@@ -31,6 +31,7 @@ export interface RawProposalFormFields {
 }
 
 export const ProposeRaw = () => {
+  const validateJson = useValidateJson();
   const {
     params,
     loading: networkParamsLoading,

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx

@@ -7,7 +7,7 @@ import {
   doesValueEquateToParam,
 } from '@vegaprotocol/proposals';
 import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
-import { validateJson } from '@vegaprotocol/utils';
+import { useValidateJson } from '@vegaprotocol/utils';
 import {
   NetworkParams,
   useNetworkParams,
@@ -39,6 +39,7 @@ export interface UpdateAssetProposalFormFields {
 const DOCS_LINK = '/update-asset-proposal';
 
 export const ProposeUpdateAsset = () => {
+  const validateJson = useValidateJson();
   const {
     params,
     loading: networkParamsLoading,

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -8,7 +8,7 @@ import {
   useProposalSubmit,
 } from '@vegaprotocol/proposals';
 import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
-import { validateJson } from '@vegaprotocol/utils';
+import { useValidateJson } from '@vegaprotocol/utils';
 import {
   NetworkParams,
   useNetworkParams,
@@ -53,6 +53,7 @@ export interface UpdateMarketProposalFormFields {
 const DOCS_LINK = '/update-market-proposal';
 
 export const ProposeUpdateMarket = () => {
+  const validateJson = useValidateJson();
   const {
     params,
     loading: networkParamsLoading,
@@ -260,7 +261,7 @@ export const ProposeUpdateMarket = () => {
               </FormGroup>
 
               {selectedMarket && (
-                <div className="mt-[-20px] mb-6">
+                <div className="mb-6 mt-[-20px]">
                   <KeyValueTable data-testid="update-market-details">
                     <KeyValueTableRow>
                       {t('MarketName')}

apps/governance/src/routes/proposals/rejected/rejected-proposals-container.tsx

@@ -42,7 +42,6 @@ export const RejectedProposalsContainer = () => {
       includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
-      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
     },
   });
 

apps/liquidity-provision-dashboard/netlify.toml

@@ -1,4 +0,0 @@
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200

apps/liquidity-provision-dashboard/project.json

@@ -82,15 +82,6 @@
         "jestConfig": "apps/liquidity-provision-dashboard/jest.config.ts"
       }
     },
-    "build-netlify": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "cp apps/liquidity-provision-dashboard/netlify.toml netlify.toml",
-          "nx build liquidity-provision-dashboard"
-        ]
-      }
-    },
     "build-spec": {
       "executor": "nx:run-commands",
       "outputs": [],

apps/multisig-signer/netlify.toml

@@ -1,4 +0,0 @@
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200

apps/multisig-signer/project.json

@@ -66,15 +66,6 @@
         "jestConfig": "apps/multisig-signer/jest.config.ts"
       }
     },
-    "build-netlify": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "cp apps/multisig-signer/netlify.toml netlify.toml",
-          "nx build multisig-signer"
-        ]
-      }
-    },
     "build-spec": {
       "executor": "nx:run-commands",
       "outputs": [],

apps/static/netlify.toml

@@ -1,4 +0,0 @@
-[[headers]]  
-  for = "/*"
-    [headers.values]
-    Access-Control-Allow-Origin = "*"

apps/static/project.json

@@ -46,15 +46,6 @@
           "buildTarget": "static:build:production"
         }
       }
-    },
-    "build-netlify": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "cp apps/static/netlify.toml netlify.toml",
-          "nx build static"
-        ]
-      }
     }
   }
 }

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

@@ -1,23 +1,6 @@
-import { removeDecimal } from '@vegaprotocol/cypress';
-import * as Schema from '@vegaprotocol/types';
-import {
-  OrderStatusMapping,
-  OrderTypeMapping,
-  Side,
-} from '@vegaprotocol/types';
-import { isBefore, isAfter, addSeconds, subSeconds } from 'date-fns';
-import { createOrder } from '../support/create-order';
 import { connectEthereumWallet } from '../support/ethereum-wallet';
 import { selectAsset } from '../support/helpers';
 
-const orderSize = 'size';
-const orderType = 'type';
-const orderStatus = 'status';
-const orderRemaining = 'remaining';
-const orderPrice = 'price';
-const orderTimeInForce = 'timeInForce';
-const orderUpdatedAt = 'updatedAt';
-const assetSelectField = 'select[name="asset"]';
 const amountField = 'input[name="amount"]';
 const txTimeout = Cypress.env('txTimeout');
 const sepoliaUrl = Cypress.env('ETHERSCAN_URL');
@@ -25,18 +8,10 @@ const btcName = 0;
 const vegaName = 4;
 const btcSymbol = 'tBTC';
 const vegaSymbol = 'VEGA';
-const usdcSymbol = 'fUSDC';
 const toastContent = 'toast-content';
-const openOrdersTab = 'Open';
 const depositsTab = 'Deposits';
-const collateralTab = 'Collateral';
 const toastCloseBtn = 'toast-close';
-const price = '390';
-const size = '0.0005';
-const newPrice = '200';
 const completeWithdrawalBtn = 'complete-withdrawal';
-const submitTransferBtn = '[type="submit"]';
-const transferForm = 'transfer-form';
 const depositSubmit = 'deposit-submit';
 const approveSubmit = 'approve-submit';
 const dialogContent = 'dialog-content';
@@ -116,33 +91,6 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
       });
   });
 
-  it('can key to key transfers', function () {
-    // 1003-TRAN-023
-    // 1003-TRAN-006
-    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
-
-    cy.getByTestId(collateralTab).click();
-    cy.getByTestId('open-transfer').eq(1).click();
-    cy.getByTestId('transfer-form').should('be.visible');
-    cy.getByTestId('transfer-form').find('[name="toAddress"]').select(1);
-    cy.get('select option')
-      .contains('BTC')
-      .invoke('index')
-      .then((index) => {
-        cy.get(assetSelectField).select(index, { force: true });
-      });
-    cy.getByTestId(transferForm)
-      .find(amountField)
-      .focus()
-      .type('1', { delay: 100 });
-    cy.getByTestId(transferForm).find(submitTransferBtn).click();
-    cy.getByTestId(toastContent).should(
-      'contain.text',
-      'Transfer completeYour transaction has been confirmed View in block explorerTransferTo 7f9cf0…c255351.00 tBTC'
-    );
-    cy.getByTestId(toastCloseBtn).click();
-  });
-
   it('can not withdrawal because of no MultiSign', function () {
     // 1002-WITH-022
     // 1002-WITH-023
@@ -187,143 +135,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
     cy.setVegaWallet();
   });
 
-  it('shows node health', function () {
-    // 0006-NETW-010
-    const regex = /^Operational\d+$/;
-    const market = this.market;
-    cy.visit(`/#/markets/${market.id}`);
-    cy.getByTestId('node-health-trigger').realHover();
-    cy.getByTestId('node-health')
-      .children()
-      .first()
-      .invoke('text')
-      .should('match', regex);
-    cy.getByTestId('node-health')
-      .children()
-      .eq(1)
-      .should('contain.text', new URL(Cypress.env('VEGA_URL')).hostname);
-  });
-
-  it('can place and receive an order', function () {
-    const market = this.market;
-    cy.visit(`/#/markets/${market.id}`);
-    const order = {
-      marketId: market.id,
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_BUY,
-      size: size,
-      price: price,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-    };
-    const rawPrice = removeDecimal(order.price, market.decimalPlaces);
-    cy.getByTestId(toastCloseBtn, txTimeout).click();
-    cy.getByTestId('Collateral').click();
-    cy.get('[col-id="asset.symbol"]', txTimeout).should(
-      'contain.text',
-      usdcSymbol
-    );
-
-    createOrder(order);
-
-    cy.getByTestId(toastContent).should(
-      'contain.text',
-      `Order submittedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+${order.size} @ ${order.price}.00 ${usdcSymbol}`,
-      { matchCase: false }
-    );
-    cy.getByTestId(toastCloseBtn).click();
-    // orderbook cells are keyed by price level
-    cy.getByTestId('tab-orderbook')
-      .get(`[data-testid="price-${rawPrice}"]`)
-      .should('contain.text', order.price)
-      .get(`[data-testid="bid-vol-${rawPrice}"]`)
-      .should('contain.text', order.size);
-
-    cy.getByTestId(openOrdersTab).click();
-    cy.getByTestId('tab-open-orders').within(() => {
-      cy.get('.ag-center-cols-container')
-        .children()
-        .first()
-        .within(() => {
-          cy.get(`[col-id='${orderSize}']`).should(
-            'contain.text',
-            order.side === Side.SIDE_BUY ? '+' : '-' + order.size
-          );
-
-          cy.get(`[col-id='${orderType}']`).should(
-            'contain.text',
-            OrderTypeMapping[order.type]
-          );
-
-          cy.get(`[col-id='${orderStatus}']`).should(
-            'contain.text',
-            OrderStatusMapping.STATUS_ACTIVE
-          );
-
-          cy.get(`[col-id='${orderRemaining}']`).should('contain.text', '0.00');
-
-          cy.get(`[col-id='${orderPrice}']`).then(($price) => {
-            expect(parseFloat($price.text())).to.equal(parseFloat(order.price));
-          });
-
-          cy.get(`[col-id='${orderTimeInForce}']`).should(
-            'contain.text',
-            'GTC'
-          );
-
-          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
-        });
-    });
-  });
-  it('can edit order', function () {
-    const market = this.market;
-    cy.visit(`/#/markets/${market.id}`);
-    cy.getByTestId(toastCloseBtn, txTimeout).click();
-    cy.getByTestId(openOrdersTab).click();
-    cy.getByTestId('edit').first().click();
-    cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
-    cy.get('#limitPrice').focus().clear().type(newPrice);
-    cy.getByTestId('edit-order').find('[type="submit"]').click();
-
-    cy.getByTestId(toastContent).should(
-      'contain.text',
-      `Order submittedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+${size} @ ${price}.00 ${usdcSymbol}+${size} @ ${newPrice}.00 ${usdcSymbol}`,
-      { matchCase: false }
-    );
-
-    cy.getByTestId(toastCloseBtn).click({ multiple: true });
-    cy.getByTestId(openOrdersTab).click();
-    cy.get('.ag-center-cols-container')
-      .children()
-      .first()
-      .within(() => {
-        cy.get(`[col-id='${orderPrice}']`).then(($price) => {
-          expect(parseFloat($price.text())).to.equal(parseFloat(newPrice));
-        });
-        checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
-      });
-  });
-
-  it('can cancel order', function () {
-    const market = this.market;
-    cy.visit(`/#/markets/${market.id}`);
-    cy.getByTestId(toastCloseBtn, txTimeout).click();
-    cy.getByTestId(openOrdersTab).click();
-    cy.getByTestId('cancel').first().click();
-    cy.getByTestId(toastContent).should(
-      'contain.text',
-      `Order cancelledYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+${size} @ ${newPrice}.00 ${usdcSymbol}`,
-      { matchCase: false }
-    );
-    cy.getByTestId(toastCloseBtn).click({ multiple: true });
-    cy.getByTestId('Closed').click();
-    cy.getByTestId('tab-closed-orders')
-      .get('.ag-center-cols-container')
-      .children()
-      .first()
-      .get(`[col-id='${orderStatus}']`, txTimeout)
-      .should('contain.text', OrderStatusMapping.STATUS_CANCELLED);
-  });
-
   it('can withdrawal', function () {
     // 1002-WITH-0014
     // 1002-WITH-006
@@ -524,22 +335,3 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
     });
   });
 });
-
-function checkIfDataAndTimeOfCreationAndUpdateIsEqual(date: string) {
-  cy.get(`[col-id='${date}'] .ag-cell-wrapper`)
-    .children('span')
-    .children('span')
-    .invoke('data', 'value')
-    .then(($dateTime) => {
-      // allow a date 5 seconds either side to allow for
-      // unexpected latency
-      const minBefore = subSeconds(new Date(), 5);
-      const maxAfter = addSeconds(new Date(), 5);
-      // eslint-disable-next-line no-console
-      console.log(maxAfter);
-      const date = new Date($dateTime.toString());
-      expect(isAfter(date, minBefore) && isBefore(date, maxAfter)).to.equal(
-        true
-      );
-    });
-}

apps/trading-e2e/src/integration/home-node-network.cy.ts

@@ -1,72 +0,0 @@
-const dialogContent = 'dialog-content';
-const nodeHealth = 'node-health';
-const nodeHealthTrigger = 'node-health-trigger';
-
-describe('home', { tags: '@regression' }, () => {
-  before(() => {
-    cy.setOnBoardingViewed();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/');
-  });
-
-  describe('node health', () => {
-    it('shows current block height', () => {
-      // 0006-NETW-004
-      // 0006-NETW-008
-      // 0006-NETW-009
-      cy.getByTestId(nodeHealthTrigger).realHover();
-      cy.getByTestId(nodeHealth)
-        .children()
-        .first()
-        .should('contain.text', 'Operational', {
-          timeout: 10000,
-        })
-        .should('contain.text', '100'); // all mocked queries have x-block-height header set to 100
-      cy.getByTestId(nodeHealth)
-        .children()
-        .eq(1)
-        .should('contain.text', new URL(Cypress.env('VEGA_URL')).hostname);
-    });
-
-    it('shows node switcher details', () => {
-      // 0006-NETW-012
-      // 0006-NETW-013
-      // 0006-NETW-014
-      // 0006-NETW-015
-      // 0006-NETW-016
-      cy.getByTestId(nodeHealthTrigger).click();
-      cy.getByTestId(dialogContent).should('contain.text', 'Connected node');
-      cy.getByTestId(dialogContent).should(
-        'contain.text',
-        'This app will only work on CUSTOM. Select a node to connect to.'
-      );
-      cy.getByTestId('node')
-        .first()
-        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
-        .next()
-        .should('contain.text', 'Response time')
-        .next()
-        .should('contain.text', 'Block')
-        .next()
-        .should('contain.text', 'Subscription');
-      cy.getByTestId('custom-row').should('contain.text', 'Other');
-      cy.getByTestId('dialog-close').click();
-    });
-
-    it('switch to other node', () => {
-      // 0006-NETW-017
-      // 0006-NETW-018
-      // 0006-NETW-019
-      // 0006-NETW-020
-      cy.getByTestId(nodeHealthTrigger).click();
-      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('node-url-custom').click({ force: true });
-      cy.getByTestId('connect').should('be.disabled');
-      cy.get("input[placeholder='https://']")
-        .focus()
-        .type(new URL(Cypress.env('VEGA_URL')).origin + '/graphql');
-      cy.getByTestId('connect').click();
-    });
-  });
-});

apps/trading-e2e/src/integration/live-env.cy.ts

@@ -1,204 +0,0 @@
-const marketInfoBtn = 'Info';
-const marketInfoSubtitle = 'accordion-title';
-const marketSummaryBlock = 'header-summary';
-const marketExpiry = 'market-expiry';
-const marketPrice = 'market-price';
-const marketChange = 'market-change';
-const marketVolume = 'market-volume';
-const marketMode = 'market-trading-mode';
-const marketSettlement = 'market-settlement-asset';
-const percentageValue = 'price-change-percentage';
-const priceChangeValue = 'price-change';
-const itemHeader = 'item-header';
-const itemValue = 'item-value';
-const marketListContent = 'popover-content';
-
-describe(
-  'Console - market info - live env',
-  { tags: '@live', testIsolation: true },
-  () => {
-    before(() => {
-      cy.visit('/');
-      cy.contains('Loading market data...').should('not.exist');
-      cy.getByTestId('link').should('be.visible');
-      cy.getByTestId('dialog-close').click();
-      cy.getByTestId(marketInfoBtn).click();
-    });
-    const titles = ['Market data', 'Market specification', 'Market governance'];
-    const subtitles = [
-      'Current fees',
-      'Market price',
-      'Market volume',
-      'Insurance pool',
-      'Key details',
-      'Instrument',
-      'Settlement asset',
-      'Metadata',
-      'Risk model',
-      'Risk parameters',
-      'Risk factors',
-      'Price monitoring bounds 1',
-      'Liquidity monitoring parameters',
-      'Liquidity',
-      'Liquidity price range',
-      'Oracle',
-      'Proposal',
-    ];
-
-    it('market info titles are displayed', () => {
-      cy.getByTestId('split-view-view')
-        .find('.text-lg')
-        .each((element, index) => {
-          cy.wrap(element).should('have.text', titles[index]);
-        });
-    });
-
-    it('market info subtitles are displayed', () => {
-      cy.getByTestId('popover-trigger').click();
-      cy.contains('Loading market data...').should('not.exist');
-      cy.contains('[data-testid="link"]', 'AAVEDAI.MF21').click();
-      cy.getByTestId(marketInfoBtn).click();
-      cy.getByTestId(marketInfoSubtitle).each((element, index) => {
-        cy.wrap(element).should('have.text', subtitles[index]);
-      });
-    });
-
-    it('renders correctly liquidity in trading tab', () => {
-      cy.getByTestId('Liquidity').click();
-      cy.contains('Loading').should('not.exist');
-      cy.contains('Something went wrong').should('not.exist');
-      cy.contains('Application error').should('not.exist');
-      cy.getByTestId('tab-liquidity').within(() => {
-        cy.get('[col-id="partyId"]').eq(1).should('not.be.empty');
-      });
-    });
-  }
-);
-
-describe(
-  'Console - market summary - live env',
-  { tags: '@live', testIsolation: true },
-  () => {
-    before(() => {
-      cy.visit('/');
-      cy.getByTestId('dialog-close').click();
-      cy.getByTestId(marketSummaryBlock).should('be.visible');
-    });
-
-    it('must display market name', () => {
-      cy.getByTestId('popover-trigger').should('not.be.empty');
-    });
-
-    it('must see market expiry', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketExpiry).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Expiry');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market price', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketPrice).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Price');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market change', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketChange).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Change (24h)');
-          cy.getByTestId(percentageValue).should('not.be.empty');
-          cy.getByTestId(priceChangeValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market volume', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketVolume).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Volume (24h)');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market mode', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketMode).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market settlement', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketSettlement).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Settlement asset');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-  }
-);
-
-describe(
-  'Console - markets table - live env',
-  { tags: '@live', testIsolation: true },
-  () => {
-    beforeEach(() => {
-      cy.visit('/');
-    });
-
-    it('renders markets correctly', () => {
-      cy.get('[data-testid^="market-link-"]').should('not.be.empty');
-      cy.getByTestId('price').invoke('text').should('not.be.empty');
-      cy.getByTestId('settlement-asset').should('not.be.empty');
-      cy.getByTestId('price-change-percentage').should('not.be.empty');
-      cy.getByTestId('price-change').should('not.be.empty');
-      cy.getByTestId('sparkline-svg').should('be.visible');
-    });
-
-    it('renders market list drop down', () => {
-      openMarketDropDown();
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="price"]')
-        .invoke('text')
-        .should('not.be.empty');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="trading-mode-col"]')
-        .should('not.be.empty');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="taker-fee"]')
-        .should('contain.text', '%');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="market-volume"]')
-        .should('not.be.empty');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="market-name"]')
-        .should('not.be.empty');
-    });
-
-    it('Able to select market from dropdown', () => {
-      cy.getByTestId('popover-trigger')
-        .invoke('text')
-        .then((marketName) => {
-          openMarketDropDown();
-          cy.get('[data-testid^=market-link]').eq(1).click();
-          cy.getByTestId('popover-trigger').should('not.be.equal', marketName);
-        });
-    });
-  }
-);
-
-function openMarketDropDown() {
-  cy.contains('Loading...').should('not.exist');
-  cy.getByTestId('link').should('be.visible');
-  cy.getByTestId('dialog-close').click();
-  cy.getByTestId('popover-trigger').click();
-  cy.contains('Loading market data...').should('not.exist');
-}

apps/trading-e2e/src/integration/market-liquidity.cy.ts

@@ -1,311 +0,0 @@
-import { checkSorting } from '@vegaprotocol/cypress';
-import * as Schema from '@vegaprotocol/types';
-
-const liquidityTab = 'Liquidity';
-const rowSelector =
-  '[data-testid="tab-liquidity"] .ag-center-cols-container .ag-row';
-const rowSelectorLiquidityActive =
-  '[data-testid="tab-active"] .ag-center-cols-container .ag-row';
-const rowSelectorLiquidityInactive =
-  '[data-testid="tab-inactive"] .ag-center-cols-container .ag-row';
-const marketSummaryBlock = 'header-summary';
-const itemValue = 'item-value';
-const itemHeader = 'item-header';
-const colCommitmentAmount = '[col-id="commitmentAmount"]';
-const colEquityLikeShare = '[col-id="feeShare.equityLikeShare"]';
-const colFee = '[col-id="fee"]';
-const colCommitmentAmount_1 = '[col-id="commitmentAmount_1"]';
-const colBalance = '[col-id="balance"]';
-const colStatus = '[col-id="status"]';
-const colCreatedAt = '[col-id="createdAt"] button';
-const colUpdatedAt = '[col-id="updatedAt"] button';
-
-const headers = [
-  'Party',
-  'Status',
-  'Commitment (tDAI)',
-  'Obligation',
-  'Fee',
-  'Adjusted stake share',
-  'Share',
-  'Live supplied liquidity',
-  'Fees accrued this epoch',
-  'Live time on book',
-  'Live liquidity quality score (%)',
-  'Last time on the book',
-  'Last fee penalty',
-  'Last bond penalty',
-  'Created',
-  'Updated',
-];
-
-describe('liquidity table - trading', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setOnBoardingViewed();
-    cy.mockSubscription();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.visit('/#/markets/market-0');
-    cy.wait('@MarketData');
-    cy.getByTestId(liquidityTab).click();
-    cy.wait('@LiquidityProvisions');
-  });
-
-  it('can see table headers', () => {
-    // 5002-LIQP-001
-    cy.getByTestId('tab-liquidity').within(($headers) => {
-      cy.wrap($headers)
-        .get('.ag-header-cell-text')
-        .each(($header, i) => {
-          cy.wrap($header).should('have.text', headers[i]);
-        });
-    });
-  });
-
-  it('renders liquidity table correctly', () => {
-    // 5002-LIQP-002
-    cy.get(rowSelector)
-      .first()
-      .find('[col-id="partyId"]')
-      .should('have.text', '69464e…dc6f');
-
-    cy.get(rowSelector)
-      .first()
-      .find(colCommitmentAmount)
-      .should('have.text', '4,000.00');
-
-    cy.get(rowSelector)
-      .first()
-      .find(colEquityLikeShare)
-      .should('have.text', '100.00%');
-
-    cy.get(rowSelector).first().find(colFee).should('have.text', '0.09%');
-
-    cy.get(rowSelector)
-      .first()
-      .find(colCommitmentAmount_1)
-      .should('have.text', '4,000.00');
-
-    cy.get(rowSelector)
-      .first()
-      .find(colBalance)
-      .scrollIntoView()
-      .should('have.text', '4,000.00');
-
-    cy.get(rowSelector).first().find(colStatus).should('have.text', 'Active');
-
-    cy.get(rowSelector).first().find(colCreatedAt).should('not.be.empty');
-    cy.get(rowSelector).first().find(colUpdatedAt).should('not.be.empty');
-  });
-
-  it('liquidity status column should be sorted properly', () => {
-    // 5002-LIQP-003
-    const liquidityColDefault = ['Active', 'Pending'];
-    const liquidityColAsc = ['Active', 'Pending'];
-    const liquidityColDesc = ['Pending', 'Active'];
-    checkSorting(
-      'status',
-      liquidityColDefault,
-      liquidityColAsc,
-      liquidityColDesc
-    );
-  });
-});
-
-describe('liquidity table view', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setOnBoardingViewed();
-    cy.mockSubscription();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.visit('/#/liquidity/market-0');
-    cy.wait('@LiquidityProvisions');
-  });
-
-  it('can see header title', () => {
-    // 5002-LIQP-004
-    // 5002-LIQP-005
-    cy.getByTestId('header-title').should(
-      'contain.text',
-      'BTCUSD.MF21 liquidity provision'
-    );
-  });
-
-  it('can see target stake', () => {
-    // 5002-LIQP-006
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('target-stake').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Target stake');
-        cy.getByTestId(itemValue).should('have.text', '10.00 tDAI').realHover();
-      });
-    });
-    cy.getByTestId('tooltip-content').should(
-      'contain.text',
-      `The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.`
-    );
-  });
-
-  it('can see supplied stake', () => {
-    // 5002-LIQP-007
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('supplied-stake').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Supplied stake');
-        cy.getByTestId(itemValue).should('have.text', '0.01 tDAI').realHover();
-      });
-    });
-    cy.getByTestId('tooltip-content').should(
-      'contain.text',
-      'The current amount of liquidity supplied for this market.'
-    );
-  });
-
-  it('can see liquidity supplied', () => {
-    // 5002-LIQP-008
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('liquidity-supplied').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
-        cy.getByTestId('indicator').should('be.visible');
-        cy.getByTestId(itemValue).should('have.text', ' 0.10%').realHover();
-      });
-    });
-  });
-
-  it('can see market id', () => {
-    // 5002-LIQP-009
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('liquidity-market-id').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Market ID');
-        cy.getByTestId(itemValue).should('have.text', 'market-0');
-      });
-    });
-  });
-
-  it('can see market id', () => {
-    // 5002-LIQP-010
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('liquidity-learn-more').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Learn more');
-        cy.getByTestId(itemValue).should('have.text', 'Providing liquidity');
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and(
-            'include',
-            'https://docs.vega.xyz/testnet/concepts/liquidity/provision'
-          );
-      });
-    });
-  });
-
-  describe('liquidity table view', { tags: '@smoke' }, () => {
-    it('can see table headers', () => {
-      cy.getByTestId('tab-active').within(($headers) => {
-        cy.wrap($headers)
-          .get('.ag-header-cell-text')
-          .each(($header, i) => {
-            cy.wrap($header).should('have.text', headers[i]);
-          });
-      });
-    });
-
-    it('renders liquidity active table correctly', () => {
-      // 5002-LIQP-011
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find('[col-id="partyId"]')
-        .should('have.text', '69464e…dc6f');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colCommitmentAmount)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colEquityLikeShare)
-        .should('have.text', '100.00%');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colFee)
-        .should('have.text', '0.09%');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colCommitmentAmount_1)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colBalance)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colStatus)
-        .should('have.text', 'Active');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colCreatedAt)
-        .should('not.be.empty');
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colUpdatedAt)
-        .should('not.be.empty');
-    });
-
-    it('renders liquidity inactive table correctly', () => {
-      // 5002-LIQP-012
-      cy.getByTestId('Inactive').click();
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find('[col-id="partyId"]')
-        .should('have.text', 'cc464e…dc6f');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colCommitmentAmount)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colEquityLikeShare)
-        .should('have.text', '100.00%');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colFee)
-        .should('have.text', '0.40%');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colCommitmentAmount_1)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colBalance)
-        .should('have.text', '2,000.00');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colStatus)
-        .should('have.text', 'Pending');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colCreatedAt)
-        .should('not.be.empty');
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colUpdatedAt)
-        .should('not.be.empty');
-    });
-  });
-});

apps/trading-e2e/src/integration/market-proposal-notification.cy.ts

@@ -1,47 +0,0 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { proposalListQuery, marketUpdateProposal } from '@vegaprotocol/mock';
-import * as Schema from '@vegaprotocol/types';
-
-const marketSummaryBlock = 'header-summary';
-
-describe('Market proposal notification', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.mockGQL((req) => {
-      aliasGQLQuery(
-        req,
-        'ProposalsList',
-        proposalListQuery({
-          proposalsConnection: {
-            edges: [{ node: marketUpdateProposal }],
-          },
-        })
-      );
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@MarketData');
-    cy.getByTestId(marketSummaryBlock).should('be.visible');
-  });
-
-  it('should display market proposal notification if proposal found', () => {
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('market-proposal-notification').should(
-        'contain.text',
-        'Changes have been proposed for this market'
-      );
-      cy.getByTestId('market-proposal-notification').within(() => {
-        cy.getByTestId('external-link').should(
-          'have.attr',
-          'href',
-          `${Cypress.env('VEGA_TOKEN_URL')}/proposals/123`
-        );
-      });
-    });
-  });
-});

apps/trading-e2e/src/integration/market-summary.cy.ts

@@ -1,216 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-
-const expirtyTooltip = 'expiry-tooltip';
-const externalLink = 'external-link';
-const itemHeader = 'item-header';
-const itemValue = 'item-value';
-const link = 'link';
-const liquidityLink = 'view-liquidity-link';
-const liquiditySupplied = 'liquidity-supplied';
-const liquiditySuppliedTooltip = 'liquidity-supplied-tooltip';
-const marketChange = 'market-change';
-const marketExpiry = 'market-expiry';
-const marketMode = 'market-trading-mode';
-const marketName = 'header-title';
-const marketPrice = 'market-price';
-const marketSettlement = 'market-settlement-asset';
-const marketState = 'market-state';
-const marketSummaryBlock = 'header-summary';
-const marketVolume = 'market-volume';
-const percentageValue = 'price-change-percentage';
-const priceChangeValue = 'price-change';
-const tradingModeTooltip = 'trading-mode-tooltip';
-
-describe('Market trading page', () => {
-  before(() => {
-    cy.clearAllLocalStorage();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.mockSubscription();
-    cy.setOnBoardingViewed();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@MarketData');
-    cy.getByTestId(marketSummaryBlock).should('be.visible');
-  });
-
-  describe('Market summary', { tags: '@smoke' }, () => {
-    // 7002-SORD-001
-    // 7002-SORD-002
-    it('must display market name', () => {
-      // 6002-MDET-001
-      cy.getByTestId(marketName).should('not.be.empty');
-    });
-
-    it('must see market expiry', () => {
-      // 6002-MDET-002
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketExpiry).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Expiry');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market price', () => {
-      // 6002-MDET-003
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketPrice).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Mark Price');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market change', () => {
-      // 6002-MDET-004
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketChange).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Change (24h)');
-          cy.getByTestId(percentageValue).should('not.be.empty');
-          cy.getByTestId(priceChangeValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market volume', () => {
-      // 6002-MDET-005
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketVolume).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Volume (24h)');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market mode', () => {
-      // 6002-MDET-006
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketMode).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
-          cy.getByTestId(itemValue).should(
-            'have.text',
-            'Monitoring auction - liquidity (target not met)'
-          );
-        });
-      });
-    });
-
-    it('must see market status', () => {
-      // 6002-MDET-007
-      // 7002-SORD-061
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketState).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Status');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-
-    it('must see market settlement', () => {
-      // 6002-MDET-008
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketSettlement).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Settlement asset');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-    it('must see market liquidity supplied', () => {
-      // 6002-MDET-009
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(liquiditySupplied).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-  });
-
-  describe('Market tooltips', { tags: '@smoke' }, () => {
-    it('should see expiry tooltip', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketExpiry).within(() => {
-          cy.getByTestId(itemValue)
-            .should('have.text', 'Not time-based')
-            .realHover();
-        });
-      });
-      cy.getByTestId(expirtyTooltip)
-        .eq(0)
-        .should(
-          'contain.text',
-          'This market expires when triggered by its oracle, not on a set date.'
-        )
-        .within(() => {
-          cy.getByTestId(link)
-            .should('have.attr', 'href')
-            .and('include', Cypress.env('EXPLORER_URL'));
-        });
-    });
-
-    it('should see trading conditions tooltip', () => {
-      const toolTipLabel = 'tooltip-label';
-      const toolTipValue = 'tooltip-value';
-      const auctionToolTipLabels = [
-        'Auction start',
-        'Est. auction end',
-        'Target liquidity',
-        'Current liquidity',
-        'Est. uncrossing price',
-        'Est. uncrossing vol',
-      ];
-
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketMode).within(() => {
-          cy.getByTestId(itemValue)
-            .should('contain.text', 'Monitoring auction')
-            .and('contain.text', 'liquidity')
-            .realHover();
-        });
-      });
-      cy.getByTestId(tradingModeTooltip)
-        .should(
-          'contain.text',
-          'This market is in auction until it reaches sufficient liquidity.'
-        )
-        .eq(0)
-        .within(() => {
-          cy.getByTestId(externalLink)
-            .should('have.attr', 'href')
-            .and('include', Cypress.env('TRADING_MODE_LINK'));
-
-          for (let i = 0; i < 6; i++) {
-            cy.getByTestId(toolTipLabel)
-              .eq(i)
-              .should('have.text', auctionToolTipLabels[i]);
-            cy.getByTestId(toolTipValue).eq(i).should('not.be.empty');
-          }
-        });
-    });
-
-    it('should see liquidity supplied tooltip', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(liquiditySupplied).within(() => {
-          cy.getByTestId(itemValue).realHover();
-        });
-      });
-      cy.getByTestId(liquiditySuppliedTooltip)
-        .should('contain.text', 'Supplied stake')
-        .and('contain.text', 'Target stake')
-        .first()
-        .within(() => {
-          cy.getByTestId(liquidityLink).should(
-            'have.text',
-            'View liquidity provision table'
-          );
-          cy.getByTestId(externalLink).should(
-            'have.text',
-            'Learn about providing liquidity'
-          );
-        });
-    });
-  });
-});

apps/trading-e2e/src/integration/trading-deal-ticket-submit-account-validation.cy.ts

@@ -1,87 +0,0 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import {
-  accountsQuery,
-  amendGeneralAccountBalance,
-  amendMarginAccountBalance,
-} from '@vegaprotocol/mock';
-
-describe.skip(
-  'account validation',
-  { tags: '@regression', testIsolation: true },
-  () => {
-    describe('zero balance error', () => {
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '0');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-      });
-
-      it('should show an error if your balance is zero', () => {
-        const accounts = accountsQuery();
-        amendMarginAccountBalance(accounts, 'market-0', '0');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        // 7002-SORD-060
-        cy.getByTestId('place-order').should('be.enabled');
-        // 7002-SORD-003
-        cy.getByTestId('deal-ticket-error-message-zero-balance').should(
-          'have.text',
-          'You need ' +
-            'tDAI' +
-            ' in your wallet to trade in this market. See all your collateral.Make a deposit'
-        );
-        cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
-      });
-    });
-
-    describe('not enough balance warning', () => {
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '1');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-
-        cy.get('[data-testid="deal-ticket-form"]').then(($form) => {
-          if (!$form.length) {
-            cy.getByTestId('Order').click();
-          }
-        });
-      });
-
-      it('should display info and button for deposit', () => {
-        // 7002-SORD-003
-
-        // warning should show immediately
-        cy.getByTestId('deal-ticket-warning-margin').should(
-          'contain.text',
-          'You may not have enough margin available to open this position'
-        );
-        cy.getByTestId('deal-ticket-warning-margin').should(
-          'contain.text',
-          'You may not have enough margin available to open this position. 5.00 tDAI is currently required. You have only 0.01001 tDAI available.'
-        );
-        cy.getByTestId('deal-ticket-deposit-dialog-button').click();
-        cy.getByTestId('sidebar-content')
-          .find('h2')
-          .eq(0)
-          .should('have.text', 'Deposit');
-      });
-    });
-  }
-);

apps/trading-e2e/src/integration/trading-deal-ticket-submit-batch-auction.cy.ts

@@ -1,87 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-const displayTomorrow = () => {
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  return tomorrow.toISOString().substring(0, 16);
-};
-
-describe(
-  'must submit order for market in batch auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '50000',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        postOnly: false,
-        reduceOnly: false,
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);

apps/trading-e2e/src/integration/trading-deal-ticket-submit-monitoring-auction.cy.ts

@@ -1,85 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-const displayTomorrow = () => {
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  return tomorrow.toISOString().substring(0, 16);
-};
-
-describe(
-  'must submit order for market in monitoring auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        price: '50000',
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);

apps/trading-e2e/src/integration/trading-deal-ticket-submit-opening-auction.cy.ts

@@ -1,85 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-const displayTomorrow = () => {
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  return tomorrow.toISOString().substring(0, 16);
-};
-
-describe(
-  'must submit order for market in opening auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '50000',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);

apps/trading-e2e/src/integration/vega-wallet-prompt.cy.ts

@@ -1,103 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-describe(
-  'vega wallet - prompt',
-  { tags: '@regression', testIsolation: true },
-  () => {
-    describe('must submit order', { tags: '@smoke' }, () => {
-      // 7002-SORD-039
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-      });
-
-      it('must see a prompt to check connected vega wallet to approve transaction', () => {
-        // 0003-WTXN-002
-        cy.mockVegaWalletTransaction(1000);
-        const order: OrderSubmission = {
-          marketId: 'market-0',
-          type: Schema.OrderType.TYPE_MARKET,
-          side: Schema.Side.SIDE_BUY,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-          size: '100',
-        };
-        createOrder(order);
-        cy.getByTestId('toast-content').should(
-          'contain.text',
-          'Please go to your Vega wallet application and approve or reject the transaction.'
-        );
-      });
-
-      it('must show error returned by wallet ', () => {
-        // 0003-WTXN-009
-        // 0003-WTXN-011
-        // 0002-WCON-016
-        // 0003-WTXN-008
-
-        //trigger error from the wallet
-        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
-          req.on('response', (res) => {
-            res.send({
-              jsonrpc: '2.0',
-              id: '1',
-            });
-          });
-        });
-
-        const order: OrderSubmission = {
-          marketId: 'market-0',
-          type: Schema.OrderType.TYPE_MARKET,
-          side: Schema.Side.SIDE_BUY,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-          size: '100',
-        };
-        createOrder(order);
-        cy.getByTestId('toast-content').should(
-          'contain.text',
-          'The connection to your Vega Wallet has been lost.'
-        );
-        cy.getByTestId('connect-vega-wallet').click();
-        cy.getByTestId('dialog-content').should('be.visible');
-      });
-
-      it('must see that the order was rejected by the connected wallet', () => {
-        // 0003-WTXN-007
-
-        //trigger rejection error from the wallet
-        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
-          req.alias = 'client.send_transaction';
-          req.reply({
-            statusCode: 400,
-            body: {
-              jsonrpc: '2.0',
-              error: {
-                code: 3001,
-                data: 'the user rejected the wallet connection',
-                message: 'User error',
-              },
-              id: '0',
-            },
-          });
-        });
-
-        const order: OrderSubmission = {
-          marketId: 'market-0',
-          type: Schema.OrderType.TYPE_MARKET,
-          side: Schema.Side.SIDE_BUY,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-          size: '100',
-        };
-        createOrder(order);
-        cy.getByTestId('toast-content').should(
-          'contain.text',
-          'Error occurredthe user rejected the wallet connection'
-        );
-      });
-    });
-  }
-);

apps/trading-e2e/src/integration/wallet-eth.cy.ts

@@ -26,18 +26,6 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
     cy.getByTestId('tab-deposits').should('not.be.empty');
   });
 
-  it.skip('should see QR code modal for WalletConnect', () => {
-    // 0004-EWAL-003
-
-    cy.getByTestId('Deposits').click();
-    cy.getByTestId('deposit-button').click();
-    cy.getByTestId('connect-eth-wallet-btn').click();
-    cy.getByTestId('web3-connector-list').should('exist');
-    cy.getByTestId('web3-connector-WalletConnect').click();
-    // testing if exists rather than visible because of the long loading time
-    cy.get('#w3m-modal').should('exist');
-  });
-
   it('able to disconnect eth wallet', () => {
     // 0004-EWAL-004
     // 0004-EWAL-005

apps/trading-e2e/src/integration/wallet-vega.cy.ts

@@ -1,91 +0,0 @@
-import {
-  mockConnectWallet,
-  mockConnectWalletWithUserError,
-} from '@vegaprotocol/cypress';
-
-const connectVegaBtn = 'connect-vega-wallet';
-const manageVegaBtn = 'manage-vega-wallet';
-const dialogContent = 'dialog-content';
-
-describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
-  beforeEach(() => {
-    // Using portfolio page as it requires vega wallet connection
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setOnBoardingViewed();
-    cy.visit('/#/portfolio');
-    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
-  });
-
-  it('can connect', () => {
-    // 0002-WCON-002
-    // 0002-WCON-005
-    // 0002-WCON-007
-    // 0002-WCON-009
-
-    mockConnectWallet();
-    cy.getByTestId(connectVegaBtn).click();
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(dialogContent).should(
-      'contain.text',
-      'Approve the connection from your Vega wallet app.'
-    );
-    cy.getByTestId(dialogContent).should('not.exist');
-    cy.getByTestId(manageVegaBtn).should('exist');
-  });
-
-  it('can not connect', () => {
-    // 0002-WCON-002
-    // 0002-WCON-005
-    // 0002-WCON-007
-    // 0002-WCON-015
-
-    mockConnectWalletWithUserError();
-    cy.getByTestId(connectVegaBtn).click();
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.getByTestId('dialog-content')
-      .should('contain.text', 'User error')
-      .and('contain.text', 'the user rejected the wallet connection');
-  });
-
-  it('can change selected public key and disconnect', () => {
-    // 0002-WCON-022
-    // 0002-WCON-023
-    // 0002-WCON-025
-    // 0002-WCON-026
-    // 0002-WCON-021
-    // 0002-WCON-027
-    // 0002-WCON-030
-    // 0002-WCON-029
-    // 0002-WCON-008
-    // 0002-WCON-035
-    // 0002-WCON-014
-    // 0002-WCON-010
-    // 0003-WTXN-004
-
-    mockConnectWallet();
-    const key2 = Cypress.env('VEGA_PUBLIC_KEY2');
-    const truncatedKey2 = Cypress.env('TRUNCATED_VEGA_PUBLIC_KEY2');
-    cy.connectVegaWallet();
-    cy.getByTestId('manage-vega-wallet').click();
-    cy.getByTestId('keypair-list').should('exist');
-    cy.getByTestId(`key-${key2}`).should('contain.text', truncatedKey2);
-    cy.getByTestId(`key-${key2}`)
-      .find('[data-testid="copy-vega-public-key"]')
-      .should('be.visible');
-    cy.get(`[data-testid="key-${key2}"] > .mr-2`).click();
-    cy.getByTestId('keypair-list')
-      .find('[data-state="checked"]')
-      .should('be.visible');
-    cy.getByTestId('disconnect').click();
-    cy.getByTestId('connect-vega-wallet').should('exist');
-    cy.getByTestId('manage-vega-wallet').should('not.exist');
-    cy.getByTestId('connect-vega-wallet').click();
-    cy.contains('Enter a custom wallet location');
-  });
-});

apps/trading/.env.mainnet

@@ -28,3 +28,4 @@ NX_REFERRALS=false
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+NX_DISABLE_CLOSE_POSITION=true

apps/trading/client-pages/assets/assets.tsx

@@ -1,9 +1,10 @@
-import { t } from '@vegaprotocol/i18n';
+import { useT } from '../../lib/use-t';
 import { Links } from '../../lib/links';
 import classNames from 'classnames';
 import { NavLink, Outlet } from 'react-router-dom';
 
 export const Assets = () => {
+  const t = useT();
   const linkClasses = ({ isActive }: { isActive: boolean }) => {
     return classNames('border-b-2 border-transparent', {
       'border-vega-yellow': isActive,

apps/trading/client-pages/deposit/deposit-get-started.tsx

@@ -1,4 +1,3 @@
-import { t } from '@vegaprotocol/i18n';
 import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
 import { GetStartedCheckList } from '../../components/welcome-dialog';
 import {
@@ -8,8 +7,10 @@ import {
 } from '../../components/welcome-dialog/use-get-onboarding-step';
 import { Links } from '../../lib/links';
 import classNames from 'classnames';
+import { useT } from '../../lib/use-t';
 
 export const DepositGetStarted = () => {
+  const t = useT();
   const onboardingDismissed = useOnboardingStore((store) => store.dismissed);
   const dismiss = useOnboardingStore((store) => store.dismiss);
   const step = useGetOnboardingStep();

apps/trading/client-pages/disclaimer/disclaimer.tsx

@@ -1,6 +1,7 @@
-import { t } from '@vegaprotocol/i18n';
+import { useT } from '../../lib/use-t';
 
 export const Disclaimer = () => {
+  const t = useT();
   return (
     <>
       <h1 className="text-4xl uppercase xl:text-5xl font-alpha calt">
@@ -8,37 +9,44 @@ export const Disclaimer = () => {
       </h1>
       <p className="mt-10 mb-6">
         {t(
-          'Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets. The Vega Protocol is an implementation layer (layer one) protocol made of free, public, open-source or source-available software.  Use of the Vega Protocol involves various risks, including but not limited to, losses while digital assets are supplied to the Vega Protocol and losses due to the fluctuation of prices of assets.'
+          'DISCLAIMER_P1',
+          'Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets. The Vega Protocol is an implementation layer (layer one) protocol made of free, public, open-source or source-available software. Use of the Vega Protocol involves various risks, including but not limited to, losses while digital assets are supplied to the Vega Protocol and losses due to the fluctuation of prices of assets.'
         )}
       </p>
       <p className="mb-6">
         {t(
-          'Before using the Vega Protocol, review the relevant documentation at docs.vega.xyz to make sure that you understand how it works.  Conduct your own due diligence and consult your financial advisor before making any investment decisions.'
+          'DISCLAIMER_P2',
+          'Before using the Vega Protocol, review the relevant documentation at docs.vega.xyz to make sure that you understand how it works. Conduct your own due diligence and consult your financial advisor before making any investment decisions.'
         )}
       </p>
       <p className="mb-6">
         {t(
-          'As described in the Vega Protocol core license, the Vega Protocol is provided “as is”, at your own risk, and without warranties of any kind.  Although Gobalsky Labs Limited developed much of the initial code for the Vega Protocol, it does not provide or control the Vega Protocol, which is run by third parties deploying it on a bespoke blockchain.  Upgrades and modifications to the Vega Protocol are managed in a community-driven way by holders of the VEGA governance token.'
+          'DISCLAIMER_P3',
+          'As described in the Vega Protocol core license, the Vega Protocol is provided “as is”, at your own risk, and without warranties of any kind. Although Gobalsky Labs Limited developed much of the initial code for the Vega Protocol, it does not provide or control the Vega Protocol, which is run by third parties deploying it on a bespoke blockchain. Upgrades and modifications to the Vega Protocol are managed in a community-driven way by holders of the VEGA governance token.'
         )}
       </p>
       <p className="mb-8">
         {t(
+          'DISCLAIMER_P4',
           'No developer or entity involved in creating the Vega Protocol will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the Vega Protocol, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or legal costs, or loss of profits, cryptoassets, tokens or anything else of value.'
         )}
       </p>
       <p className="mb-8">
         {t(
-          'This website is hosted on a decentralised network, the Interplanetary File System (“IPFS”).  The IPFS decentralised web is made up of all the computers (nodes) connected to it.  Data is therefore stored on many different computers.'
+          'DISCLAIMER_P5',
+          'This website is hosted on a decentralised network, the Interplanetary File System (“IPFS”). The IPFS decentralised web is made up of all the computers (nodes) connected to it. Data is therefore stored on many different computers.'
         )}
       </p>
       <p className="mb-8">
         {t(
-          "The information provided on this website does not constitute investment advice, financial advice, trading advice, or any other sort of advice and you should not treat any of the website's content as such.  No party recommends that any cryptoasset should be bought, sold, or held by you via this website. No party ensures the accuracy of information listed on this website or holds any responsibility for any missing or wrong information. You understand that you are using any and all information available here at your own risk."
+          'DISCLAIMER_P6',
+          "The information provided on this website does not constitute investment advice, financial advice, trading advice, or any other sort of advice and you should not treat any of the website's content as such. No party recommends that any cryptoasset should be bought, sold, or held by you via this website. No party ensures the accuracy of information listed on this website or holds any responsibility for any missing or wrong information. You understand that you are using any and all information available here at your own risk."
         )}
       </p>
       <p className="mb-8">
         {t(
-          'Additionally, just as you can access email protocols such as SMTP through multiple email clients, you can potentially access the Vega Protocol through many web or mobile interfaces.  You are responsible for doing your own diligence on those interfaces to understand the associated risks and any fees.'
+          'DISCLAIMER_P7',
+          'Additionally, just as you can access email protocols such as SMTP through multiple email clients, you can potentially access the Vega Protocol through many web or mobile interfaces. You are responsible for doing your own diligence on those interfaces to understand the associated risks and any fees.'
         )}
       </p>
     </>

apps/trading/client-pages/fees/fees.tsx

@@ -1,10 +1,21 @@
-import { t } from '@vegaprotocol/i18n';
 import { FeesContainer } from '../../components/fees-container';
+import { useT } from '../../lib/use-t';
+import { usePageTitleStore } from '../../stores';
+import { titlefy } from '@vegaprotocol/utils';
+import { useEffect } from 'react';
 
 export const Fees = () => {
+  const t = useT();
+  const title = t('Fees');
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+  useEffect(() => {
+    updateTitle(titlefy([title]));
+  }, [updateTitle, title]);
   return (
     <div className="container p-4 mx-auto">
-      <h1 className="px-4 pb-4 text-2xl">{t('Fees')}</h1>
+      <h1 className="px-4 pb-4 text-2xl">{title}</h1>
       <FeesContainer />
     </div>
   );

apps/trading/client-pages/home/home.tsx

@@ -1,34 +1,11 @@
-import { useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
-import { useGlobalStore } from '../../stores';
-import { useTopTradedMarkets } from '../../lib/hooks/use-top-traded-markets';
-import { Links } from '../../lib/links';
+import { useNavigateToLastMarket } from '../../lib/hooks/use-navigate-to-last-market';
 
 // The home pages only purpose is to redirect to the users last market,
 // the top traded if they are new, or fall back to the list of markets.
 // Thats why we just render a loader here
 export const Home = () => {
-  const navigate = useNavigate();
-  const { data } = useTopTradedMarkets();
-  const marketId = useGlobalStore((store) => store.marketId);
-
-  useEffect(() => {
-    if (marketId) {
-      navigate(Links.MARKET(marketId), {
-        replace: true,
-      });
-    } else if (data) {
-      const marketDataId = data[0]?.id;
-      if (marketDataId) {
-        navigate(Links.MARKET(marketDataId), {
-          replace: true,
-        });
-      } else {
-        navigate(Links.MARKETS());
-      }
-    }
-  }, [marketId, data, navigate]);
+  useNavigateToLastMarket();
 
   return (
     <Splash>

apps/trading/client-pages/liquidity/liquidity-sidebar.tsx

@@ -1,4 +1,3 @@
-import { t } from '@vegaprotocol/i18n';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import {
   SidebarButton,
@@ -6,8 +5,10 @@ import {
   ViewType,
 } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
+import { useT } from '../../lib/use-t';
 
 export const LiquiditySidebar = () => {
+  const t = useT();
   const currentRouteId = useGetCurrentRouteId();
 
   return (

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -1,11 +1,11 @@
 import { matchFilter, lpAggregatedDataProvider } from '@vegaprotocol/liquidity';
-import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { Tab, Tabs } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { LiquidityContainer } from '../../components/liquidity-container';
+import { useT } from '../../lib/use-t';
 
 const enum LiquidityTabs {
   Active = 'active',
@@ -24,6 +24,7 @@ export const LiquidityViewContainer = ({
 }: {
   marketId: string | undefined;
 }) => {
+  const t = useT();
   const [tab, setTab] = useState<string | undefined>(undefined);
   const { pubKey } = useVegaWallet();
 

apps/trading/client-pages/market/constants.ts

@@ -1,3 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-
-export const NO_MARKET = t('No market');

apps/trading/client-pages/market/market-header-stats.tsx

@@ -1,7 +1,6 @@
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { DocsLinks, useEnvironment } from '@vegaprotocol/environment';
 import { ButtonLink, ExternalLink, Link } from '@vegaprotocol/ui-toolkit';
-import { MarketProposalNotification } from '@vegaprotocol/proposals';
 import type { Market } from '@vegaprotocol/markets';
 import {
   addDecimalsFormatNumber,
@@ -9,7 +8,6 @@ import {
   getExpiryDate,
   getMarketExpiryDate,
 } from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
 import {
   Last24hPriceChange,
   Last24hVolume,
@@ -31,12 +29,14 @@ import { MarketLiquiditySupplied } from '../../components/liquidity-supplied';
 import { useEffect, useState } from 'react';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { PriceCell } from '@vegaprotocol/datagrid';
+import { useT } from '../../lib/use-t';
 
 interface MarketHeaderStatsProps {
   market: Market;
 }
 
 export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
+  const t = useT();
   const { VEGA_EXPLORER_URL } = useEnvironment();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
 
@@ -144,7 +144,6 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
           />
         </HeaderStat>
       )}
-      <MarketProposalNotification marketId={market.id} />
     </>
   );
 };
@@ -234,6 +233,7 @@ const useFormatCountdown = (
   startTime?: number,
   every?: number
 ) => {
+  const t = useT();
   if (startTime && every) {
     const diff = every - ((now - startTime) % every);
     const hours = (diff / 3.6e6) | 0;
@@ -276,6 +276,7 @@ const ExpiryTooltipContent = ({
   market,
   explorerUrl,
 }: ExpiryTooltipContentProps) => {
+  const t = useT();
   if (market.marketTimestamps.close === null) {
     const oracleId =
       market.tradableInstrument.instrument.product.__typename === 'Future'

apps/trading/client-pages/market/market.tsx

@@ -1,9 +1,8 @@
 import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
-import { ExternalLink, Loader, Splash } from '@vegaprotocol/ui-toolkit';
+import { Link, Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { getAsset, marketDataProvider, useMarket } from '@vegaprotocol/markets';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
@@ -12,6 +11,8 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { Links } from '../../lib/links';
 import { ViewType, useSidebar } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
+import { useT, ns } from '../../lib/use-t';
+import { Trans } from 'react-i18next';
 
 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
   return markPrice && decimalPlaces
@@ -57,6 +58,7 @@ const TitleUpdater = ({
 };
 
 export const MarketPage = () => {
+  const t = useT();
   const { marketId } = useParams();
   const navigate = useNavigate();
   const currentRouteId = useGetCurrentRouteId();
@@ -111,10 +113,19 @@ export const MarketPage = () => {
             {t('This market URL is not available any more.')}
           </p>
           <p className="justify-center text-sm">
-            {t(`Please choose another market from the`)}{' '}
-            <ExternalLink onClick={() => navigate(Links.MARKETS())}>
-              {t('market list')}
-            </ExternalLink>
+            <Trans
+              defaults="Please choose another market from the <0>market list</0>"
+              ns={ns}
+              components={[
+                <Link
+                  className="underline underline-offset-4 "
+                  onClick={() => navigate(Links.MARKETS())}
+                  key="link"
+                >
+                  market list
+                </Link>,
+              ]}
+            />
           </p>
         </span>
       </Splash>

apps/trading/client-pages/market/trade-grid.tsx

@@ -4,10 +4,8 @@ import { LayoutPriority } from 'allotment';
 import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import { t } from '@vegaprotocol/i18n';
 import { OracleBanner, useMarket } from '@vegaprotocol/markets';
 import type { Market } from '@vegaprotocol/markets';
-import { Filter } from '@vegaprotocol/orders';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import {
   ResizableGrid,
@@ -21,6 +19,7 @@ import {
   MarketTerminationBanner,
 } from '../../components/market-banner';
 import { FLAGS } from '@vegaprotocol/environment';
+import { useT } from '../../lib/use-t';
 
 interface TradeGridProps {
   market: Market | null;
@@ -35,6 +34,7 @@ const MainGrid = memo(
     marketId: string;
     pinnedAsset?: PinnedAsset;
   }) => {
+    const t = useT();
     const { data: market } = useMarket(marketId);
     const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
     const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
@@ -125,13 +125,13 @@ const MainGrid = memo(
                 name={t('Open')}
                 menu={<TradingViews.activeOrders.menu />}
               >
-                <TradingViews.orders.component filter={Filter.Open} />
+                <TradingViews.activeOrders.component />
               </Tab>
               <Tab id="closed-orders" name={t('Closed')}>
-                <TradingViews.orders.component filter={Filter.Closed} />
+                <TradingViews.closedOrders.component />
               </Tab>
               <Tab id="rejected-orders" name={t('Rejected')}>
-                <TradingViews.orders.component filter={Filter.Rejected} />
+                <TradingViews.rejectedOrders.component />
               </Tab>
               <Tab
                 id="orders"

apps/trading/client-pages/market/trade-panels.tsx

@@ -4,8 +4,6 @@ import { OracleBanner } from '@vegaprotocol/markets';
 import type { TradingView } from './trade-views';
 import { TradingViews } from './trade-views';
 import { useState } from 'react';
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import { NO_MARKET } from './constants';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import classNames from 'classnames';
 import {
@@ -14,6 +12,8 @@ import {
   MarketTerminationBanner,
 } from '../../components/market-banner';
 import { FLAGS } from '@vegaprotocol/environment';
+import { useT } from '../../lib/use-t';
+import { Splash } from '@vegaprotocol/ui-toolkit';
 
 interface TradePanelsProps {
   market: Market | null;
@@ -30,8 +30,10 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
       throw new Error(`No component for view: ${view}`);
     }
 
-    if (!market) return <Splash>{NO_MARKET}</Splash>;
+    if (!market) return <NoMarketSplash />;
 
+    // Watch out here, we don't know what component is being rendered
+    // so watch out for clashes in props
     return <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
   };
 
@@ -74,33 +76,89 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
         </AutoSizer>
       </div>
       <div className="flex flex-nowrap overflow-x-auto max-w-full border-t border-default">
-        {Object.keys(TradingViews).map((key) => {
-          const isActive = view === key;
-          const className = classNames(
-            'py-2 px-4 min-w-[100px] capitalize text-sm',
-            {
-              'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
+        {Object.keys(TradingViews)
+          // filter to control available views for the current market
+          // eg only perps should get the funding views
+          .filter((_key) => {
+            const key = _key as TradingView;
+            const perpOnlyViews = ['funding', 'fundingPayments'];
+
+            if (
+              market?.tradableInstrument.instrument.product.__typename ===
+              'Perpetual'
+            ) {
+              return true;
             }
-          );
-          if (
-            market?.tradableInstrument.instrument.product.__typename !==
-              'Perpetual' &&
-            (key === 'funding' || key === 'fundingPayments')
-          ) {
-            return null;
-          }
-          return (
-            <button
-              data-testid={key}
-              onClick={() => setView(key as TradingView)}
-              className={className}
-              key={key}
-            >
-              {TradingViews[key as keyof typeof TradingViews].label}
-            </button>
-          );
-        })}
+
+            if (perpOnlyViews.includes(key)) {
+              return false;
+            }
+
+            return true;
+          })
+          .map((_key) => {
+            const key = _key as TradingView;
+            const isActive = view === key;
+            return (
+              <ViewButton
+                key={key}
+                view={key}
+                isActive={isActive}
+                onClick={() => setView(key)}
+              />
+            );
+          })}
       </div>
     </div>
   );
 };
+
+export const NoMarketSplash = () => {
+  const t = useT();
+  return <Splash>{t('No market')}</Splash>;
+};
+
+const ViewButton = ({
+  view,
+  isActive,
+  onClick,
+}: {
+  view: TradingView;
+  isActive: boolean;
+  onClick: () => void;
+}) => {
+  const label = useViewLabel(view);
+  const className = classNames('py-2 px-4 min-w-[100px] capitalize text-sm', {
+    'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
+  });
+
+  return (
+    <button data-testid={view} onClick={onClick} className={className}>
+      {label}
+    </button>
+  );
+};
+
+const useViewLabel = (view: TradingView) => {
+  const t = useT();
+
+  const labels = {
+    candles: t('Candles'),
+    depth: t('Depth'),
+    liquidity: t('Liquidity'),
+    funding: t('Funding'),
+    fundingPayments: t('Funding Payments'),
+    orderbook: t('Orderbook'),
+    trades: t('Trades'),
+    positions: t('Positions'),
+    activeOrders: t('Active'),
+    closedOrders: t('Closed'),
+    rejectedOrders: t('Rejected'),
+    orders: t('All'),
+    stopOrders: t('Stop'),
+    collateral: t('Collateral'),
+    fills: t('Fills'),
+  };
+
+  return labels[view];
+};

apps/trading/client-pages/market/trade-views.tsx

@@ -1,12 +1,9 @@
-import type { ComponentProps } from 'react';
-import { Splash } from '@vegaprotocol/ui-toolkit';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import {
   CandlesChartContainer,
   CandlesMenu,
 } from '@vegaprotocol/candles-chart';
 import { Filter, OpenOrdersMenu } from '@vegaprotocol/orders';
-import { NO_MARKET } from './constants';
 import { TradesContainer } from '../../components/trades-container';
 import { OrderbookContainer } from '../../components/orderbook-container';
 import { FillsContainer } from '../../components/fills-container';
@@ -15,96 +12,60 @@ import { AccountsContainer } from '../../components/accounts-container';
 import { LiquidityContainer } from '../../components/liquidity-container';
 import { FundingContainer } from '../../components/funding-container';
 import { FundingPaymentsContainer } from '../../components/funding-payments-container';
-import type { OrderContainerProps } from '../../components/orders-container';
 import { OrdersContainer } from '../../components/orders-container';
 import { StopOrdersContainer } from '../../components/stop-orders-container';
 import { AccountsMenu } from '../../components/accounts-menu';
 import { PositionsMenu } from '../../components/positions-menu';
 
-type MarketDependantView =
-  | typeof CandlesChartContainer
-  | typeof DepthChartContainer
-  | typeof OrderbookContainer
-  | typeof TradesContainer;
-
-type MarketDependantViewProps = ComponentProps<MarketDependantView>;
-
-const requiresMarket = (View: MarketDependantView) => {
-  const WrappedComponent = (props: MarketDependantViewProps) =>
-    props.marketId ? <View {...props} /> : <Splash>{NO_MARKET}</Splash>;
-  WrappedComponent.displayName = `RequiresMarket(${View.name})`;
-  return WrappedComponent;
-};
-
 export type TradingView = keyof typeof TradingViews;
 
 export const TradingViews = {
   candles: {
-    label: 'Candles',
-    component: requiresMarket(CandlesChartContainer),
+    component: CandlesChartContainer,
     menu: CandlesMenu,
   },
   depth: {
-    label: 'Depth',
-    component: requiresMarket(DepthChartContainer),
+    component: DepthChartContainer,
   },
   liquidity: {
-    label: 'Liquidity',
-    component: requiresMarket(LiquidityContainer),
+    component: LiquidityContainer,
   },
   funding: {
-    label: 'Funding',
-    component: requiresMarket(FundingContainer),
+    component: FundingContainer,
   },
   fundingPayments: {
-    label: 'Funding Payments',
     component: FundingPaymentsContainer,
   },
   orderbook: {
-    label: 'Orderbook',
-    component: requiresMarket(OrderbookContainer),
+    component: OrderbookContainer,
   },
   trades: {
-    label: 'Trades',
-    component: requiresMarket(TradesContainer),
+    component: TradesContainer,
   },
   positions: {
-    label: 'Positions',
     component: PositionsContainer,
     menu: PositionsMenu,
   },
   activeOrders: {
-    label: 'Active',
-    component: (props: OrderContainerProps) => (
-      <OrdersContainer {...props} filter={Filter.Open} />
-    ),
+    component: () => <OrdersContainer filter={Filter.Open} />,
     menu: OpenOrdersMenu,
   },
   closedOrders: {
-    label: 'Closed',
-    component: (props: OrderContainerProps) => (
-      <OrdersContainer {...props} filter={Filter.Closed} />
-    ),
+    component: () => <OrdersContainer filter={Filter.Closed} />,
   },
   rejectedOrders: {
-    label: 'Rejected',
-    component: (props: OrderContainerProps) => (
-      <OrdersContainer {...props} filter={Filter.Rejected} />
-    ),
+    component: () => <OrdersContainer filter={Filter.Rejected} />,
   },
   orders: {
-    label: 'All',
     component: OrdersContainer,
     menu: OpenOrdersMenu,
   },
   stopOrders: {
-    label: 'Stop',
     component: StopOrdersContainer,
   },
   collateral: {
-    label: 'Collateral',
     component: AccountsContainer,
     menu: AccountsMenu,
   },
-  fills: { label: 'Fills', component: FillsContainer },
-};
+  fills: { component: FillsContainer },
+} as const;

apps/trading/client-pages/markets/closed.tsx

@@ -8,7 +8,6 @@ import type {
 import { AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { useMemo } from 'react';
-import { t } from '@vegaprotocol/i18n';
 import type { Asset } from '@vegaprotocol/types';
 import type { ProductType } from '@vegaprotocol/types';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -24,6 +23,7 @@ import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 import { MarketCodeCell } from './market-code-cell';
 import { MarketActionsDropdown } from './market-table-actions';
+import { useT } from '../../lib/use-t';
 
 type SettlementAsset = Pick<
   Asset,
@@ -127,6 +127,7 @@ const ClosedMarketsDataGrid = ({
   rowData: Row[];
   error: Error | undefined;
 }) => {
+  const t = useT();
   const handleOnSelect = useMarketClickHandler();
   const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
 
@@ -274,7 +275,7 @@ const ClosedMarketsDataGrid = ({
         },
       },
     ];
-  }, [openAssetDialog]);
+  }, [openAssetDialog, t]);
 
   return (
     <AgGrid

apps/trading/client-pages/markets/market-code-cell.tsx

@@ -2,7 +2,7 @@ import compact from 'lodash/compact';
 import type { ProductType } from '@vegaprotocol/types';
 import { ProductTypeMapping, ProductTypeShortName } from '@vegaprotocol/types';
 import { StackedCell } from '@vegaprotocol/datagrid';
-import { t } from '@vegaprotocol/i18n';
+import { useT } from '../../lib/use-t';
 
 export interface MarketCodeCellProps {
   value: string | undefined; // market code
@@ -14,6 +14,7 @@ export interface MarketCodeCellProps {
 }
 
 export const MarketCodeCell = ({ value, data }: MarketCodeCellProps) => {
+  const t = useT();
   if (!value || !data || !data.productType) return null;
 
   const infoSpanClasses =

apps/trading/client-pages/markets/market-list-table.tsx

@@ -1,7 +1,14 @@
 import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
-import { AgGrid, PriceFlashCell } from '@vegaprotocol/datagrid';
+import {
+  AgGrid,
+  PriceFlashCell,
+  useDataGridEvents,
+} from '@vegaprotocol/datagrid';
 import type { MarketMaybeWithData } from '@vegaprotocol/markets';
 import { useColumnDefs } from './use-column-defs';
+import type { DataGridStore } from '../../stores/datagrid-store-slice';
+import { type StateCreator, create } from 'zustand';
+import { persist } from 'zustand/middleware';
 
 export const getRowId = ({ data }: { data: { id: string } }) => data.id;
 
@@ -18,8 +25,37 @@ const components = {
 
 type Props = TypedDataAgGrid<MarketMaybeWithData>;
 
+export type DataGridSlice = {
+  gridStore: DataGridStore;
+  updateGridStore: (gridStore: DataGridStore) => void;
+};
+
+export const createDataGridSlice: StateCreator<DataGridSlice> = (set) => ({
+  gridStore: {},
+  updateGridStore: (newStore) => {
+    set((curr) => ({
+      gridStore: {
+        ...curr.gridStore,
+        ...newStore,
+      },
+    }));
+  },
+});
+
+const useMarketsStore = create<DataGridSlice>()(
+  persist(createDataGridSlice, {
+    name: 'vega_market_list_store',
+  })
+);
+
 export const MarketListTable = (props: Props) => {
   const columnDefs = useColumnDefs();
+  const gridStore = useMarketsStore((store) => store.gridStore);
+  const updateGridStore = useMarketsStore((store) => store.updateGridStore);
+
+  const gridStoreCallbacks = useDataGridEvents(gridStore, (colState) => {
+    updateGridStore(colState);
+  });
 
   return (
     <AgGrid
@@ -28,6 +64,7 @@ export const MarketListTable = (props: Props) => {
       columnDefs={columnDefs}
       components={components}
       rowHeight={45}
+      {...gridStoreCallbacks}
       {...props}
     />
   );

apps/trading/client-pages/markets/market-table-actions.tsx

@@ -1,4 +1,3 @@
-import { t } from '@vegaprotocol/i18n';
 import {
   TradingDropdownItem,
   TradingDropdownCopyItem,
@@ -11,6 +10,7 @@ import { DApp, EXPLORER_MARKET, useLinks } from '@vegaprotocol/environment';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { useNavigate } from 'react-router-dom';
 import { Links } from '../../lib/links';
+import { useT } from '../../lib/use-t';
 
 export const MarketActionsDropdown = ({
   marketId,
@@ -23,6 +23,7 @@ export const MarketActionsDropdown = ({
   successorMarketID: string | null | undefined;
   parentMarketID: string | null | undefined;
 }) => {
+  const t = useT();
   const navigate = useNavigate();
   const open = useAssetDetailsDialogStore((store) => store.open);
   const linkCreator = useLinks(DApp.Explorer);

apps/trading/client-pages/markets/markets-page.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
 import { titlefy } from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
 import {
   LocalStoragePersistTabs as Tabs,
   Tab,
@@ -15,8 +14,10 @@ import {
   TOKEN_NEW_MARKET_PROPOSAL,
   useLinks,
 } from '@vegaprotocol/environment';
+import { useT } from '../../lib/use-t';
 
 export const MarketsPage = () => {
+  const t = useT();
   const { updateTitle } = usePageTitleStore((store) => ({
     updateTitle: store.updateTitle,
   }));
@@ -25,8 +26,8 @@ export const MarketsPage = () => {
   const externalLink = governanceLink(TOKEN_NEW_MARKET_PROPOSAL);
 
   useEffect(() => {
-    updateTitle(titlefy(['Markets']));
-  }, [updateTitle]);
+    updateTitle(titlefy([t('Markets')]));
+  }, [updateTitle, t]);
 
   return (
     <div className="h-full pt-0.5 pb-3 px-1.5">

apps/trading/client-pages/markets/markets-sidebar.tsx

@@ -1,7 +1,4 @@
-import { Route, Routes, useParams } from 'react-router-dom';
-import { MarketState } from '@vegaprotocol/types';
-import { t } from '@vegaprotocol/i18n';
-import { useMarket } from '@vegaprotocol/markets';
+import { Route, Routes } from 'react-router-dom';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import {
   SidebarButton,
@@ -9,14 +6,11 @@ import {
   ViewType,
 } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
+import { useT } from '../../lib/use-t';
 
 export const MarketsSidebar = () => {
-  const { marketId } = useParams();
+  const t = useT();
   const currentRouteId = useGetCurrentRouteId();
-  const { data } = useMarket(marketId);
-  const active =
-    data &&
-    [MarketState.STATE_ACTIVE, MarketState.STATE_PENDING].includes(data.state);
 
   return (
     <>
@@ -44,14 +38,12 @@ export const MarketsSidebar = () => {
           element={
             <>
               <SidebarDivider />
-              {active && (
-                <SidebarButton
-                  view={ViewType.Order}
-                  icon={VegaIconNames.TICKET}
-                  tooltip={t('Order')}
-                  routeId={currentRouteId}
-                />
-              )}
+              <SidebarButton
+                view={ViewType.Order}
+                icon={VegaIconNames.TICKET}
+                tooltip={t('Order')}
+                routeId={currentRouteId}
+              />
               <SidebarButton
                 view={ViewType.Info}
                 icon={VegaIconNames.BREAKDOWN}

apps/trading/client-pages/markets/open-markets.tsx

@@ -2,16 +2,17 @@ import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { MarketMaybeWithData } from '@vegaprotocol/markets';
 import { marketListProvider } from '@vegaprotocol/markets';
 import { useEffect } from 'react';
-import { t } from '@vegaprotocol/i18n';
 import type { CellClickedEvent } from 'ag-grid-community';
 import MarketListTable from './market-list-table';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 import { Interval } from '@vegaprotocol/types';
 import { useYesterday } from '@vegaprotocol/react-helpers';
+import { useT } from '../../lib/use-t';
 
 const POLLING_TIME = 2000;
 
 export const OpenMarkets = () => {
+  const t = useT();
   const handleOnSelect = useMarketClickHandler();
   const yesterday = useYesterday();
   const { data, error, reload } = useDataProvider({
@@ -42,7 +43,7 @@ export const OpenMarkets = () => {
         if (!data) return;
 
         // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
+        // event.preventDefault or event.stopPropagation do not seem to apply for ag-grid
         const colId = column.getColId();
 
         if (

apps/trading/client-pages/markets/settlement-date-cell.tsx

@@ -1,8 +1,8 @@
 import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
-import { t } from '@vegaprotocol/i18n';
 import { MarketState } from '@vegaprotocol/types';
 import { Link } from '@vegaprotocol/ui-toolkit';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
+import { useT } from '../../lib/use-t';
 import { formatDistanceToNowStrict, isAfter } from 'date-fns';
 
 export interface SettlementDataCellProps {
@@ -18,6 +18,7 @@ export const SettlementDateCell = ({
   closeTimestamp,
   marketState,
 }: SettlementDataCellProps) => {
+  const t = useT();
   const linkCreator = useLinks(DApp.Explorer);
   const date = closeTimestamp ? new Date(closeTimestamp) : metaDate;
 
@@ -31,12 +32,12 @@ export const SettlementDateCell = ({
 
     if (expiryHasPassed) {
       if (marketState !== MarketState.STATE_SETTLED) {
-        text = t('Expected %s ago', distance);
+        text = t('Expected {{distance}} ago', { distance });
       } else {
-        text = t('%s ago', distance);
+        text = t('{{distance}} ago', { distance });
       }
     } else {
-      text = t('Expected in %s', distance);
+      text = t('Expected in {{distance}}', { distance });
     }
   }
 

apps/trading/client-pages/markets/settlement-price-cell.tsx

@@ -1,10 +1,10 @@
 import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
-import { t } from '@vegaprotocol/i18n';
 import type { DataSourceFilterFragment } from '@vegaprotocol/markets';
 import { useOracleSpecBindingData } from '@vegaprotocol/markets';
 import { PropertyKeyType } from '@vegaprotocol/types';
 import { Link } from '@vegaprotocol/ui-toolkit';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { useT } from '../../lib/use-t';
 
 export interface SettlementPriceCellProps {
   oracleSpecId: string | undefined;
@@ -17,6 +17,7 @@ export const SettlementPriceCell = ({
   settlementDataSpecBinding,
   filter,
 }: SettlementPriceCellProps) => {
+  const t = useT();
   const linkCreator = useLinks(DApp.Explorer);
   const { property, loading } = useOracleSpecBindingData(
     oracleSpecId,

apps/trading/client-pages/markets/use-column-defs.tsx

@@ -1,6 +1,5 @@
 import { useMemo } from 'react';
 import type { ColDef, ValueFormatterParams } from 'ag-grid-community';
-import { t } from '@vegaprotocol/i18n';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
@@ -18,10 +17,12 @@ import type {
 import { MarketActionsDropdown } from './market-table-actions';
 import { calcCandleVolume, getAsset } from '@vegaprotocol/markets';
 import { MarketCodeCell } from './market-code-cell';
+import { useT } from '../../lib/use-t';
 
 const { MarketTradingMode, AuctionTrigger } = Schema;
 
 export const useColumnDefs = () => {
+  const t = useT();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
   return useMemo<ColDef[]>(
     () => [
@@ -50,6 +51,29 @@ export const useColumnDefs = () => {
         headerName: t('Description'),
         field: 'tradableInstrument.instrument.name',
       },
+      {
+        headerName: t('Settlement asset'),
+        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
+        cellRenderer: ({
+          data,
+        }: VegaICellRendererParams<
+          MarketMaybeWithData,
+          'tradableInstrument.instrument.product.settlementAsset.symbol'
+        >) => {
+          const value = data && getAsset(data);
+          return value ? (
+            <ButtonLink
+              onClick={(e) => {
+                openAssetDetailsDialog(value.id, e.target as HTMLElement);
+              }}
+            >
+              {value.symbol}
+            </ButtonLink>
+          ) : (
+            ''
+          );
+        },
+      },
       {
         headerName: t('Trading mode'),
         field: 'tradingMode',
@@ -141,27 +165,21 @@ export const useColumnDefs = () => {
         },
       },
       {
-        headerName: t('Settlement asset'),
-        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
-        cellRenderer: ({
+        headerName: t('Open Interest'),
+        field: 'data.openInterest',
+        type: 'rightAligned',
+        valueFormatter: ({
           data,
-        }: VegaICellRendererParams<
+        }: VegaValueFormatterParams<
           MarketMaybeWithData,
-          'tradableInstrument.instrument.product.settlementAsset.symbol'
-        >) => {
-          const value = data && getAsset(data);
-          return value ? (
-            <ButtonLink
-              onClick={(e) => {
-                openAssetDetailsDialog(value.id, e.target as HTMLElement);
-              }}
-            >
-              {value.symbol}
-            </ButtonLink>
-          ) : (
-            ''
-          );
-        },
+          'data.openInterest'
+        >) =>
+          data?.data?.openInterest === undefined
+            ? '-'
+            : addDecimalsFormatNumber(
+                data?.data?.openInterest,
+                data?.positionDecimalPlaces
+              ),
       },
       {
         headerName: t('Spread'),
@@ -216,6 +234,6 @@ export const useColumnDefs = () => {
         },
       },
     ],
-    [openAssetDetailsDialog]
+    [openAssetDetailsDialog, t]
   );
 };