feat: add 8H interval, upgrade pennant

feat: change 7D to 1W
feat(trading): add additional intervals
2024-03-06 11:18:39 +01:00 · 2024-03-06 11:18:38 +01:00 · 2024-03-06 11:18:38 +01:00 · 2024-03-05 16:15:51 +00:00 · 2024-03-05 16:09:14 +00:00 · 2024-03-05 15:49:50 +00:00
57 changed files with 380 additions and 1365 deletions
@@ -1,36 +0,0 @@
-name: Cypress Console tests -- live environment
-
-# This workflow runs using provided url
-
-on:
-  workflow_dispatch:
-    inputs:
-      url:
-        description: 'Url'
-        required: true
-        type: string
-
-jobs:
-  cypress-run:
-    name: Run Cypress Trading tests -- live environment
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Use Node.js 20
-        id: Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Run Cypress tests
-        uses: cypress-io/github-action@v4
-        with:
-          browser: chrome
-          record: true
-          project: ./apps/trading-e2e
-          config: baseUrl=${{ github.event.inputs.url }}
-          env: grepTags=@live
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -12,7 +12,6 @@ on:
        options:
          - explorer-e2e
          - governance-e2e
-          - trading-e2e
      tags:
        description: 'Test tags to run'
        required: true
@@ -10,5 +10,5 @@ jobs:
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
    with:
-      projects: '["explorer-e2e","governance-e2e","trading-e2e"]'
+      projects: '["explorer-e2e","governance-e2e"]'
      tags: '@smoke @regression @slow'
@@ -7,6 +7,7 @@ import {
  navigateTo,
  navigation,
  turnTelemetryOff,
+  setRiskAccepted,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -57,6 +58,7 @@ context(
    // 1002-STKE-002, 1002-STKE-032
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
+      setRiskAccepted();
      ethereumWalletConnect();
      cy.connectVegaWallet();
      vegaWalletSetSpecifiedApprovalAmount('1000');
@@ -5,6 +5,7 @@ import {
  navigateTo,
  navigation,
  turnTelemetryOff,
+  setRiskAccepted,
 } from '../../support/common.functions';
 import {
  stakingPageAssociateTokens,
@@ -57,6 +58,7 @@ context(
        function () {
          cy.clearLocalStorage();
          turnTelemetryOff();
+          setRiskAccepted();
          cy.mockChainId();
          cy.reload();
          waitForSpinner();
@@ -82,20 +82,20 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    it('should have information on active nodes', function () {
      cy.getByTestId('node-information')
        .first()
-        .should('contain.text', '1')
+        .should('contain.text', '2')
        .and('contain.text', 'active nodes');
    });

    it('should have information on consensus nodes', function () {
      cy.getByTestId('node-information')
        .last()
-        .should('contain.text', '1')
+        .should('contain.text', '2')
        .and('contain.text', 'consensus nodes');
    });

    it('should contain link to specific validators', function () {
      cy.getByTestId('validators')
-        .should('have.length', '1')
+        .should('have.length', '2')
        .each(($validator) => {
          cy.wrap($validator).find('a').should('have.attr', 'href');
        });
@@ -3,6 +3,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import {
  navigation,
+  setRiskAccepted,
  verifyPageHeader,
  verifyTabHighlighted,
 } from '../../support/common.functions';
@@ -187,6 +188,7 @@ context('Validators Page - verify elements on page', function () {
      before('connect wallets and click on validator', function () {
        cy.mockChainId();
        cy.visit('/validators');
+        setRiskAccepted();
        cy.connectVegaWallet();
        clickOnValidatorFromList(0);
      });
@@ -1,5 +1,8 @@
 import { truncateByChars } from '@vegaprotocol/utils';
-import { waitForSpinner } from '../../support/common.functions';
+import {
+  setRiskAccepted,
+  waitForSpinner,
+} from '../../support/common.functions';
 import {
  vegaWalletFaucetAssetsWithoutCheck,
  vegaWalletTeardown,
@@ -11,7 +14,6 @@ const connectButton = 'connect-vega-wallet';
 const getVegaLink = 'link';
 const dialog = '[role="dialog"]:visible';
 const dialogHeader = 'dialog-title';
-const walletDialogHeader = 'wallet-dialog-title';
 const connectorsList = 'connectors-list';
 const dialogCloseBtn = 'dialog-close';
 const accountNo = 'vega-account-truncated';
@@ -34,6 +36,7 @@ context(
  () => {
    before('visit token home page', () => {
      cy.visit('/');
+      setRiskAccepted();
      cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
    });

@@ -63,17 +66,12 @@ context(

      it('should have Connect Vega header visible', () => {
        cy.get(dialog).within(() => {
-          cy.getByTestId(walletDialogHeader)
+          cy.getByTestId(connectorsList)
            .should('be.visible')
-            .and('have.text', 'Get a Vega wallet');
-        });
-      });
-
-      it('should have jsonRpc and hosted connection options visible on list', function () {
-        cy.getByTestId(connectorsList).within(() => {
-          cy.getByTestId('connector-jsonRpc')
-            .should('be.visible')
-            .and('have.text', 'Use the Desktop App/CLI');
+            .and(
+              'have.text',
+              'Get the Vega WalletGet MetaMask>_Command Line WalletView as public key'
+            );
        });
      });

@@ -88,7 +86,6 @@ context(
      before('connect vega wallet', function () {
        cy.mockChainId();
        cy.visit('/');
-        cy.wait('@ChainId');
        cy.connectVegaWallet();
        vegaWalletTeardown();
      });
@@ -102,6 +102,12 @@ export function turnTelemetryOff() {
  );
 }

+export function setRiskAccepted() {
+  cy.window().then((win) =>
+    win.localStorage.setItem('vega_wallet_risk_accepted', 'true')
+  );
+}
+
 export function dissociateFromSecondWalletKey() {
  const secondWalletKey = Cypress.env('vegaWalletPublicKey2Short');
  cy.getByTestId('vega-in-wallet')
@@ -0,0 +1,44 @@
+import {
+  useLinks,
+  DApp,
+  CONSOLE_REWARDS_PAGE,
+} from '@vegaprotocol/environment';
+import {
+  ExternalLink,
+  Intent,
+  NotificationBanner,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+import { Trans } from 'react-i18next';
+import { useMatch } from 'react-router-dom';
+import Routes from '../../routes/routes';
+import { type ReactNode } from 'react';
+
+const ConsoleRewardsLink = ({ children }: { children: ReactNode }) => {
+  const consoleLink = useLinks(DApp.Console);
+  return (
+    <ExternalLink
+      href={consoleLink(CONSOLE_REWARDS_PAGE)}
+      className="underline inline-flex gap-1 items-center"
+      title="Rewards in Console"
+    >
+      <span>{children}</span>
+      <VegaIcon size={12} name={VegaIconNames.OPEN_EXTERNAL} />
+    </ExternalLink>
+  );
+};
+
+export const RewardsMovedNotification = () => {
+  const onRewardsPage = useMatch(Routes.REWARDS);
+  if (!onRewardsPage) return null;
+
+  return (
+    <NotificationBanner intent={Intent.Warning}>
+      <Trans
+        i18nKey="rewardsMovedNotification"
+        components={[<ConsoleRewardsLink>Console</ConsoleRewardsLink>]}
+      />
+    </NotificationBanner>
+  );
+};
@@ -10,6 +10,7 @@ import {
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { RewardsMovedNotification } from '../notifications/rewards-moved-notification';

 interface AppLayoutProps {
  children: ReactNode;
@@ -45,8 +46,10 @@ export const AppLayout = ({ children }: AppLayoutProps) => {

 const NotificationsContainer = () => {
  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
+
  return (
    <div data-testid="banners">
+      <RewardsMovedNotification />
      <ProtocolUpgradeProposalNotification
        mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
      />
@@ -288,7 +288,7 @@ describe('Consensus validators table', () => {

    expect(
      grid.querySelector('[role="gridcell"][col-id="totalPenalties"]')
-    ).toHaveTextContent('13.16%');
+    ).toHaveTextContent('10.07%');

    expect(
      grid.querySelector('[role="gridcell"][col-id="normalisedVotingPower"]')
@@ -185,15 +185,19 @@ export const ConsensusValidatorsTable = ({
          const { rawValidatorScore: previousEpochValidatorScore } =
            getLastEpochScoreAndPerformance(previousEpochData, id);

-          const overstakingPenalty = calculateOverallPenalty(
+          const overstakingPenalty = calculateOverstakedPenalty(
            id,
            allNodesInPreviousEpoch
          );
-          const totalPenalty = calculateOverstakedPenalty(
+          const totalPenalty = calculateOverallPenalty(
            id,
            allNodesInPreviousEpoch
          );

+          const lastEpochDataForNode = allNodesInPreviousEpoch.find(
+            (node) => node.id === id
+          );
+
          return {
            id,
            [ValidatorFields.RANKING_INDEX]: stakedTotalRanking,
@@ -239,6 +243,12 @@ export const ConsensusValidatorsTable = ({
              : undefined,
            [ValidatorFields.MULTISIG_ERROR]:
              multisigStatus?.showMultisigStatusError,
+            [ValidatorFields.MULTISIG_PENALTY]: formatNumberPercentage(
+              new BigNumber(1)
+                .minus(lastEpochDataForNode?.rewardScore?.multisigScore ?? 1)
+                .times(100),
+              2
+            ),
          };
        }
      );
@@ -378,7 +388,6 @@ export const ConsensusValidatorsTable = ({
          headerTooltip: t('StakeDescription').toString(),
          cellRenderer: TotalStakeRenderer,
          width: 120,
-          sort: 'desc',
        },
        {
          field: ValidatorFields.PENDING_STAKE,
@@ -400,6 +409,7 @@ export const ConsensusValidatorsTable = ({
          headerTooltip: t('NormalisedVotingPowerDescription').toString(),
          cellRenderer: VotingPowerRenderer,
          width: 120,
+          sort: 'desc',
        },
        {
          field: ValidatorFields.TOTAL_PENALTIES,
@@ -40,6 +40,7 @@ export enum ValidatorFields {
  PENDING_USER_STAKE = 'pendingUserStake',
  USER_STAKE_SHARE = 'userStakeShare',
  MULTISIG_ERROR = 'multisigError',
+  MULTISIG_PENALTY = 'multisigPenalty',
 }

 export const addUserDataToValidator = (
@@ -327,7 +328,7 @@ interface TotalPenaltiesRendererProps {
    overstakedAmount: string;
    overstakingPenalty: string;
    totalPenalties: string;
-    multisigError?: boolean;
+    multisigPenalty: string;
  };
 }

@@ -346,11 +347,9 @@ export const TotalPenaltiesRenderer = ({
          <div data-testid="overstaked-penalty-tooltip">
            {t('overstakedPenalty')}: {data.overstakingPenalty}
          </div>
-          {data.multisigError && (
-            <div data-testid="multisig-error-tooltip">
-              {t('multisigPenalty')}: 100%
-            </div>
-          )}
+          <div data-testid="multisig-error-tooltip">
+            {t('multisigPenalty')}: {data.multisigPenalty}
+          </div>
        </>
      }
    >
@@ -37,7 +37,6 @@ import {
 import type { ReactNode } from 'react';
 import type { StakingNodeFieldsFragment } from '../__generated__/Staking';
 import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
-import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';

 const statuses = {
  [Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ]: 'status-ersatz',
@@ -105,9 +104,10 @@ export const ValidatorTable = ({
    };
  }, [node, previousEpochData?.epoch.validatorsConnection?.edges]);

-  const multisigStatus = previousEpochData
-    ? getMultisigStatusInfo(previousEpochData)
-    : undefined;
+  const previousNodeData =
+    previousEpochData?.epoch.validatorsConnection?.edges?.find(
+      (e) => e?.node.id === node.id
+    );

  return (
    <>
@@ -293,21 +293,15 @@ export const ValidatorTable = ({
                  data-testid="multisig-penalty"
                  className="flex gap-2 items-baseline"
                >
-                  {multisigStatus?.zeroScoreNodes.find(
-                    (n) => n.id === node.id
-                  ) ? (
-                    <Tooltip
-                      description={t('multisigPenaltyThisNodeIndicator')}
-                    >
-                      <span className="inline-block w-2 h-2 rounded-full bg-vega-red-500"></span>
-                    </Tooltip>
-                  ) : null}
                  <Tooltip description={t('multisigPenaltyDescription')}>
                    <span>
                      {formatNumberPercentage(
-                        BigNumber(
-                          multisigStatus?.showMultisigStatusError ? 100 : 0
-                        ),
+                        new BigNumber(1)
+                          .minus(
+                            previousNodeData?.node.rewardScore?.multisigScore ??
+                              1
+                          )
+                          .times(100),
                        2
                      )}
                    </span>
@@ -1,41 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=''
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_ENV=CUSTOM
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
-NX_VEGA_URL=http://localhost:3008/graphql
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
-NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_SENTRY_DSN=https://dummy@o999999.ingest.sentry.io/9999999
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-
-# Expose some env vars to cypress environment for market setup
-CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
-CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
-CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
-CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
-CYPRESS_CONSOLE_URL=https://console.fairground.wtf
-CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
-CYPRESS_ORACLE_PUBKEY=6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
-CYPRESS_VEGA_ENV=CUSTOM
-CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
-CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
-CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3008/graphql
-CYPRESS_VEGA_WALLET_URL=http://localhost:1789
-CYPRESS_VEGA_WALLET_API_TOKEN=
-
-# Cosmic elevator flags (MUST be doubled with CYPRESS_ prefix)
-NX_SUCCESSOR_MARKETS=true
-CYPRESS_NX_SUCCESSOR_MARKETS=true
@@ -1,33 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=''
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_ENV=CUSTOM
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
-NX_VEGA_URL=http://localhost:3008/graphql
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
-NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-
-# Expose some env vars to cypress environment for market setup
-CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
-CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
-CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
-CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
-CYPRESS_CONSOLE_URL=https://console.fairground.wtf
-CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
-CYPRESS_VEGA_ENV=CUSTOM
-CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
-CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
-CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3008/graphql
-CYPRESS_VEGA_WALLET_URL=http://localhost:1789
-CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -1,19 +0,0 @@
-{
-  "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {
-        "cypress/unsafe-to-chain-command": 0
-      }
-    },
-    {
-      "files": ["src/plugins/index.js"],
-      "rules": {
-        "@typescript-eslint/no-var-requires": "off",
-        "no-undef": "off"
-      }
-    }
-  ]
-}
@@ -1,41 +0,0 @@
-const { defineConfig } = require('cypress');
-
-module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
-  e2e: {
-    setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
-      require('@cypress/grep/src/plugin')(config);
-      return config;
-    },
-    baseUrl: 'http://localhost:4200',
-    fileServerFolder: '.',
-    fixturesFolder: false,
-    specPattern: '**/*.cy.{js,jsx,ts,tsx}',
-    supportFile: './src/support/index.js',
-    video: false,
-    videosFolder: '../../dist/cypress/apps/trading-e2e/videos',
-    videoUploadOnPasses: false,
-    screenshotsFolder: '../../dist/cypress/apps/trading-e2e/screenshots',
-    chromeWebSecurity: false,
-    projectId: 'et4snf',
-    defaultCommandTimeout: 10000,
-    viewportWidth: 1800,
-    viewportHeight: 900,
-    responseTimeout: 50000,
-    requestTimeout: 20000,
-    retries: 1,
-    testIsolation: false,
-    experimentalMemoryManagement: true,
-  },
-  env: {
-    ETHERSCAN_URL: 'https://sepolia.etherscan.io',
-    ETHEREUM_CHAIN_ID: 11155111,
-    TRADING_MODE_LINK:
-      'https://docs.vega.xyz/testnet/concepts/trading-on-vega/trading-modes#auction-type-liquidity-monitoring',
-    grepTags: '@regression @smoke @slow',
-    grepFilterSpecs: true,
-    grepOmitFiltered: true,
-    txTimeout: { timeout: 70000 },
-  },
-});
@@ -1 +0,0 @@
-declare module '*.scss';
@@ -1,39 +0,0 @@
-{
-  "name": "trading-e2e",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/trading-e2e/src",
-  "projectType": "application",
-  "targets": {
-    "e2e": {
-      "executor": "@nx/cypress:cypress",
-      "options": {
-        "cypressConfig": "apps/trading-e2e/cypress.config.js",
-        "devServerTarget": "trading:serve"
-      },
-      "configurations": {
-        "production": {
-          "devServerTarget": "trading:serve:production"
-        },
-        "live": {
-          "devServerTarget": ""
-        }
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/trading-e2e/**/*.{js,ts}"]
-      }
-    },
-    "build": {
-      "executor": "nx:run-commands",
-      "outputs": [],
-      "options": {
-        "command": "yarn tsc --project ./apps/trading-e2e/"
-      }
-    }
-  },
-  "tags": [],
-  "implicitDependencies": ["trading"]
-}
@@ -1,20 +0,0 @@
-/// <reference types="cypress" />
-
-declare namespace Cypress {
-  // specify additional properties in the TestConfig object
-  // in our case we will add "tags" property
-  interface SuiteConfigOverrides {
-    /**
-     * List of tags for this test
-     * @example a single tag
-     *  it('logs in', { tags: '@smoke' }, () => { ... })
-     * @example multiple tags
-     *  it('works', { tags: ['@smoke', '@slow'] }, () => { ... })
-     */
-    tags?: string | string[];
-  }
-
-  interface Cypress {
-    grep?: (grep?: string, tags?: string, burn?: string) => void;
-  }
-}
@@ -1,337 +0,0 @@
-import { connectEthereumWallet } from '../support/ethereum-wallet';
-import { selectAsset } from '../support/helpers';
-
-const amountField = 'input[name="amount"]';
-const txTimeout = Cypress.env('txTimeout');
-const sepoliaUrl = Cypress.env('ETHERSCAN_URL');
-const btcName = 0;
-const vegaName = 4;
-const btcSymbol = 'tBTC';
-const vegaSymbol = 'VEGA';
-const toastContent = 'toast-content';
-const depositsTab = 'Deposits';
-const toastCloseBtn = 'toast-close';
-const completeWithdrawalBtn = 'complete-withdrawal';
-const depositSubmit = 'deposit-submit';
-const approveSubmit = 'approve-submit';
-const dialogContent = 'dialog-content';
-
-// Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
-describe('capsule - without MultiSign', { tags: '@slow' }, () => {
-  before(() => {
-    cy.createMarket();
-    cy.get('@markets').then((markets) => {
-      cy.wrap(markets[0]).as('market');
-    });
-    cy.setOnBoardingViewed();
-    cy.visit('/#/portfolio');
-  });
-
-  it('can deposit', function () {
-    cy.visit('/#/portfolio');
-    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
-
-    // 1001-DEPO-001
-    // 1001-DEPO-002
-    // 1001-DEPO-003
-    // 1001-DEPO-005
-    // 1001-DEPO-006
-    // 1001-DEPO-007
-    // 1001-DEPO-008
-    // 1001-DEPO-009
-    // 1001-DEPO-010
-
-    cy.getByTestId(depositsTab).click();
-    cy.getByTestId('deposit-button').click();
-    connectEthereumWallet('Unknown');
-    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
-
-    cy.getByTestId('approve-default').should(
-      'contain.text',
-      `Before you can make a deposit of your chosen asset, ${btcSymbol}, you need to approve its use in your Ethereum wallet`
-    );
-    cy.getByTestId(approveSubmit).click();
-    cy.getByTestId('approve-pending').should('exist');
-    cy.getByTestId('approve-confirmed').should('exist');
-    cy.get(amountField).focus();
-    cy.get(amountField).clear().type('10');
-    cy.getByTestId(depositSubmit).click();
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      `Transaction confirmedYour transaction has been confirmed.View on EtherscanDeposit 10.00 ${btcSymbol}`,
-      { matchCase: false }
-    );
-    cy.getByTestId(toastCloseBtn).click();
-    cy.getByTestId('Collateral').click();
-
-    cy.highlight('deposit verification');
-
-    cy.get('[col-id="asset.symbol"]', txTimeout).should(
-      'contain.text',
-      btcSymbol
-    );
-    cy.getByTestId(depositsTab).click();
-    cy.get('.ag-cell-value', txTimeout).should('contain.text', btcSymbol);
-    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);
-
-    cy.get('[col-id="txHash"]')
-      .should('have.length.above', 2)
-      .eq(1)
-      .parent()
-      .within(() => {
-        cy.get('[col-id="asset.symbol"]').should('have.text', btcSymbol);
-        cy.get('[col-id="amount"]').should('have.text', '10.00');
-        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
-        cy.get('[col-id="status"]').should('have.text', 'Finalized');
-        cy.get('[col-id="txHash"]')
-          .find('a')
-          .should('have.attr', 'href')
-          .and('contain', `${sepoliaUrl}/tx/0x`);
-      });
-  });
-
-  it('can not withdrawal because of no MultiSign', function () {
-    // 1002-WITH-022
-    // 1002-WITH-023
-    // 0003-WTXN-011
-    cy.getByTestId('Withdrawals').click();
-    cy.getByTestId('withdraw-dialog-button').click();
-    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
-    cy.get(amountField).focus();
-    cy.get(amountField).clear().type('1');
-    cy.getByTestId('submit-withdrawal').click();
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      'Funds unlocked'
-    );
-    // cy.getByTestId(toastCloseBtn).click();
-    cy.highlight('withdrawals verification');
-    cy.getByTestId('toast-complete-withdrawal').last().click();
-
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      'Error occurredcannot estimate gas'
-    );
-    cy.getByTestId(completeWithdrawalBtn).should(
-      'contain.text',
-      'Complete withdrawal'
-    );
-  });
-});
-
-describe('capsule', { tags: '@slow', testIsolation: true }, () => {
-  before(() => {
-    cy.updateCapsuleMultiSig();
-  });
-
-  beforeEach(() => {
-    cy.createMarket();
-    cy.get('@markets').then((markets) => {
-      cy.wrap(markets[0]).as('market');
-    });
-    cy.setOnBoardingViewed();
-    cy.setVegaWallet();
-  });
-
-  it('can withdrawal', function () {
-    // 1002-WITH-0014
-    // 1002-WITH-006
-    // 1002-WITH-009
-    // 1002-WITH-011
-    // 1002-WITH-024
-    // 1002-WITH-012
-    // 1002-WITH-013
-    // 1002-WITH-014
-    // 1002-WITH-015
-    // 1002-WITH-016
-    // 1002-WITH-017
-    // 1002-WITH-019
-    // 1002-WITH-020
-    // 1002-WITH-021
-    const ethWalletAddress = Cypress.env('ETHEREUM_WALLET_ADDRESS');
-
-    cy.visit('/#/portfolio');
-    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
-    cy.getByTestId(toastCloseBtn, txTimeout).click();
-    cy.getByTestId('Withdrawals').click();
-    cy.getByTestId('withdraw-dialog-button').click();
-    connectEthereumWallet('Unknown');
-    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
-    cy.get(amountField).clear().type('1');
-    cy.getByTestId('submit-withdrawal').click();
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      'Funds unlocked'
-    );
-
-    cy.highlight('withdrawals verification');
-    cy.getByTestId('toast-complete-withdrawal').click();
-
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      'Transaction confirmed'
-    );
-    cy.getByTestId(toastContent, txTimeout)
-      .should('contain.text', 'Funds unlocked')
-      .and('contain.text', 'Your funds have been unlocked for withdrawal.')
-      .and(
-        'contain.text',
-        'View in block explorerYou can save your withdrawal details for extra security.'
-      )
-      .and('contain.text', 'Withdraw 1.00 tBTCComplete withdrawal');
-    cy.getByTestId('toast-withdrawal-details').click();
-    cy.getByTestId(dialogContent)
-      .last()
-      .within(() => {
-        cy.getByTestId('dialog-title').should(
-          'contain.text',
-          'Save withdrawal details'
-        );
-        cy.getByTestId('copy-button').should('be.visible');
-        cy.getByTestId('assetSource_value').should(
-          'have.text',
-          '0xb63D135B0a6854EEb765d69ca36210cC70BECAE0'
-        );
-        cy.getByTestId('amount_value').should('have.text', '100000');
-        cy.getByTestId('nonce_value').invoke('text').should('not.be.empty');
-        cy.getByTestId('signatures_value')
-          .invoke('text')
-          .should('not.be.empty');
-        cy.getByTestId('targetAddress_value').should(
-          'have.text',
-          ethWalletAddress
-        );
-        cy.getByTestId('creation_value').invoke('text').should('not.be.empty');
-      });
-    cy.getByTestId('close-withdrawal-approval-dialog').click();
-
-    cy.get('.ag-center-cols-container')
-      .find('[col-id="status"]')
-      .eq(0, txTimeout)
-      .should('contain.text', 'Completed');
-
-    cy.get('[col-id="txHash"]', txTimeout)
-      .should('have.length.above', 1)
-      .eq(1)
-      .parent()
-      .within(() => {
-        cy.get('[col-id="asset.symbol"]').should('have.text', btcSymbol);
-        cy.get('[col-id="amount"]').should('have.text', '1.00');
-        cy.get('[col-id="details.receiverAddress"]')
-          .find('a')
-          .should('have.attr', 'href')
-          .and('contain', `${sepoliaUrl}/address/`);
-        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
-        cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
-        cy.get('[col-id="status"]').should('have.text', 'Completed');
-        cy.get('[col-id="txHash"]')
-          .find('a')
-          .should('have.attr', 'href')
-          .and('contain', `${sepoliaUrl}/tx/0x`);
-      });
-
-    cy.getByTestId('withdraw-dialog-button').click({ force: true });
-    // cy.getByTestId('BALANCE_AVAILABLE_value').should('have.text', '6.999');
-  });
-
-  it('approved amount is less than deposit', function () {
-    // 1001-DEPO-006
-    // 1001-DEPO-007
-    cy.visit('/#/portfolio');
-    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
-    cy.getByTestId(toastCloseBtn, txTimeout).click();
-    cy.getByTestId(depositsTab).click();
-    cy.getByTestId('deposit-button').click();
-    connectEthereumWallet('Unknown');
-    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
-    cy.contains('Deposits of tBTC not approved').should('not.exist');
-    cy.contains('Use maximum').should('be.visible');
-    cy.get(amountField).clear().type('20000000');
-    cy.getByTestId(depositSubmit).should('be.visible');
-    cy.getByTestId(depositSubmit).click();
-    cy.getByTestId('input-error-text').should(
-      'contain.text',
-      `You can't deposit more than you have in your Ethereum wallet`
-    );
-  });
-
-  it('withdraw - delay verification', function () {
-    // 1001-DEPO-024
-    // 1002-WITH-007
-
-    cy.visit('/#/portfolio');
-    cy.get('[data-testid="pathname-/portfolio"]', txTimeout).should('exist');
-    cy.getByTestId(toastCloseBtn, txTimeout).click();
-    cy.getByTestId(depositsTab).click();
-    cy.getByTestId('deposit-button').click();
-    connectEthereumWallet('Unknown');
-    selectAsset(vegaName);
-    cy.getByTestId('approve-submit').click();
-    cy.getByTestId('approve-confirmed').should(
-      'contain.text',
-      'You approved deposits of up to VEGA'
-    );
-    cy.get(amountField).clear().type('10000');
-    cy.getByTestId('deposit-submit').click();
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      `Your transaction has been confirmed.`,
-      { matchCase: false }
-    );
-    cy.getByTestId(toastCloseBtn).click({ multiple: true });
-    cy.getByTestId('Collateral').click();
-
-    cy.highlight('deposit verification');
-
-    cy.get('[col-id="asset.symbol"]', txTimeout).should(
-      'contain.text',
-      vegaSymbol
-    );
-    cy.getByTestId(depositsTab).click();
-    cy.get('.ag-cell-value', txTimeout).should('contain.text', vegaSymbol);
-    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);
-
-    cy.get('[col-id="txHash"]')
-      .should('have.length.above', 2)
-      .eq(1)
-      .parent()
-      .within(() => {
-        cy.get('[col-id="asset.symbol"]').should('have.text', vegaSymbol);
-        cy.get('[col-id="amount"]').should('have.text', '10,000.00');
-        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
-        cy.get('[col-id="status"]').should('have.text', 'Finalized');
-        cy.get('[col-id="txHash"]')
-          .find('a')
-          .should('have.attr', 'href')
-          .and('contain', `${sepoliaUrl}/tx/0x`);
-      });
-
-    cy.getByTestId('Withdrawals').click(txTimeout);
-    cy.getByTestId('withdraw-dialog-button').click();
-    selectAsset(1);
-    cy.get(amountField).clear().type('10000');
-    cy.getByTestId('DELAY_TIME_value').should('have.text', '5 days');
-    cy.getByTestId('submit-withdrawal').click();
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      'Your funds have been unlocked'
-    );
-    cy.getByTestId(toastCloseBtn).click();
-    cy.getByTestId(completeWithdrawalBtn).first().should('be.visible').click();
-    cy.getByTestId(toastContent, txTimeout).should('contain.text', 'Delayed');
-    cy.getByTestId('tab-withdrawals').within(() => {
-      cy.get('.ag-center-cols-container')
-        .children()
-        .first()
-        .within(() => {
-          cy.get('[col-id="status"]').contains(
-            /Delayed \(ready in (\d{1,2}:\d{2}:\d{2}:\d{2})\)/
-          );
-        });
-    });
-  });
-});
@@ -1,43 +0,0 @@
-import { connectEthereumWallet } from '../support/ethereum-wallet';
-
-const connectEthWalletBtn = 'connect-eth-wallet-btn';
-
-describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
-  beforeEach(() => {
-    cy.mockWeb3Provider();
-    // Using portfolio withdrawals tab is it requires Ethereum wallet connection
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-    cy.visit('/#/portfolio');
-    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
-    cy.getByTestId('Withdrawals').click();
-  });
-
-  it('can connect', () => {
-    // 0004-EWAL-001
-
-    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-MetaMask').click();
-    cy.getByTestId('web3-connector-list').should('not.exist');
-    cy.getByTestId('tab-deposits').should('not.be.empty');
-  });
-
-  it('able to disconnect eth wallet', () => {
-    // 0004-EWAL-004
-    // 0004-EWAL-005
-    // 0004-EWAL-006
-
-    cy.getByTestId('Deposits').click();
-    cy.getByTestId('deposit-button').click();
-    connectEthereumWallet('MetaMask');
-    cy.getByTestId('ethereum-address').should('have.text', '0xEe7D…d94F');
-    cy.getByTestId('disconnect-ethereum-wallet')
-      .should('have.text', 'Disconnect')
-      .click();
-    cy.getByTestId(connectEthWalletBtn).should('exist');
-  });
-});
@@ -1,29 +0,0 @@
-import { OrderType } from '@vegaprotocol/types';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-
-const orderSizeField = 'order-size';
-const orderPriceField = 'order-price';
-const orderTIFDropDown = 'order-tif';
-const placeOrderBtn = 'place-order';
-
-export const createOrder = (order: OrderSubmission): void => {
-  cy.log('Placing order', order);
-  const { type, side, size, price, timeInForce, expiresAt } = order;
-
-  cy.getByTestId(
-    `order-type-${type === OrderType.TYPE_LIMIT ? 'Limit' : 'Market'}`
-  ).click();
-  cy.getByTestId(`order-side-${side}`).click();
-  cy.getByTestId(orderSizeField).clear().type(size);
-  if (price) {
-    cy.getByTestId(orderPriceField).clear().type(price);
-  }
-  cy.getByTestId(orderTIFDropDown).select(timeInForce);
-  if (timeInForce === 'TIME_IN_FORCE_GTT') {
-    if (!expiresAt) {
-      throw new Error('Specify expiresAt if using GTT');
-    }
-    cy.getByTestId('date-picker-field').type(expiresAt);
-  }
-  cy.getByTestId(placeOrderBtn).click();
-};
@@ -1,18 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-
-export const orderSizeField = 'order-size';
-export const orderPriceField = 'order-price';
-export const orderTIFDropDown = 'order-tif';
-export const placeOrderBtn = 'place-order';
-export const toggleShort = 'order-side-SIDE_SELL';
-export const toggleLong = 'order-side-SIDE_BUY';
-export const toggleLimit = 'order-type-Limit';
-export const toggleMarket = 'order-type-Market';
-
-export const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
-  return {
-    code: Schema.OrderTimeInForceCode[value],
-    value,
-    text: Schema.OrderTimeInForceMapping[value],
-  };
-});
@@ -1,5 +0,0 @@
-export const connectEthereumWallet = (connectorName: string) => {
-  cy.getByTestId('connect-eth-wallet-btn').should('be.enabled').click();
-  cy.getByTestId('web3-connector-list').should('be.visible');
-  cy.getByTestId(`web3-connector-${connectorName}`).click();
-};
@@ -1,11 +0,0 @@
-export const selectAsset = (assetIndex: number) => {
-  cy.log(`selecting asset: ${assetIndex}`);
-  cy.getByTestId('select-asset').click();
-  cy.get('[data-testid="rich-select-option"]').eq(assetIndex).click();
-
-  // The asset only gets set once the queries (getWithdrawThreshold, getDelay)
-  // against the Ethereum change resolve, we should fix this but for now just force
-  // some wait time
-  // eslint-disable-next-line
-  cy.wait(100);
-};
@@ -1,8 +0,0 @@
-import '@vegaprotocol/cypress';
-import 'cypress-real-events/support';
-import registerCypressGrep from '@cypress/grep';
-import { addMockTradingPage } from './trading';
-import 'cypress-mochawesome-reporter/register';
-
-registerCypressGrep();
-addMockTradingPage();
@@ -1,36 +0,0 @@
-import type {
-  OrdersUpdateSubscription,
-  OrdersUpdateSubscriptionVariables,
-  OrderUpdateFieldsFragment,
-} from '@vegaprotocol/orders';
-import type { onMessage } from '@vegaprotocol/cypress';
-import type { PartialDeep } from 'type-fest';
-import { orderUpdateSubscription } from '@vegaprotocol/mock';
-
-const sendOrderUpdate: ((data: OrdersUpdateSubscription) => void)[] = [];
-const getOnOrderUpdate = () => {
-  const onOrderUpdate: onMessage<
-    OrdersUpdateSubscription,
-    OrdersUpdateSubscriptionVariables
-  > = (send) => {
-    sendOrderUpdate.push(send);
-  };
-  return onOrderUpdate;
-};
-
-export const getSubscriptionMocks = () => ({
-  OrdersUpdate: getOnOrderUpdate(),
-});
-
-export function updateOrder(
-  override?: PartialDeep<OrderUpdateFieldsFragment>
-): void {
-  const update: OrdersUpdateSubscription = orderUpdateSubscription({
-    // @ts-ignore partial deep check failing
-    orders: [override],
-  });
-  if (!sendOrderUpdate) {
-    throw new Error('OrderSub not called');
-  }
-  sendOrderUpdate.forEach((send) => send(update));
-}
@@ -1,81 +0,0 @@
-import type {
-  OrderAmendment,
-  OrderAmendmentBody,
-  OrderCancellation,
-  OrderCancellationBody,
-  OrderSubmission,
-  OrderSubmissionBody,
-  Transaction,
-} from '@vegaprotocol/wallet';
-
-export const testOrderSubmission = (
-  order: OrderSubmission,
-  expected?: Partial<OrderSubmission>
-) => {
-  const expectedOrder = {
-    ...order,
-    ...expected,
-  };
-
-  const transaction: OrderSubmissionBody = {
-    orderSubmission: expectedOrder,
-  };
-  vegaWalletTransaction(transaction);
-  verifyToast();
-};
-
-export const testOrderAmendment = (
-  order: OrderAmendment,
-  expected?: Partial<OrderAmendment>
-) => {
-  const expectedOrder = {
-    ...order,
-    ...expected,
-  };
-
-  const transaction: OrderAmendmentBody = {
-    orderAmendment: expectedOrder,
-  };
-  vegaWalletTransaction(transaction);
-  verifyToast();
-};
-
-export const testOrderCancellation = (
-  order: OrderCancellation,
-  expected?: Partial<OrderCancellation>
-) => {
-  const expectedOrder = {
-    ...order,
-    ...expected,
-  };
-
-  const transaction: OrderCancellationBody = {
-    orderCancellation: expectedOrder,
-  };
-  vegaWalletTransaction(transaction);
-  verifyToast();
-};
-
-const vegaWalletTransaction = (transaction: Transaction) => {
-  cy.wait('@VegaWalletTransaction')
-    .its('request')
-    .then((req) => {
-      expect(req.body.params).to.deep.equal({
-        publicKey: Cypress.env('VEGA_PUBLIC_KEY'),
-        sendingMode: 'TYPE_SYNC',
-        transaction,
-      });
-      expect(req.headers.authorization).to.equal(
-        `VWT ${Cypress.env('VEGA_WALLET_API_TOKEN')}`
-      );
-    });
-};
-
-const verifyToast = () => {
-  cy.getByTestId('toast').should('contain.text', 'Awaiting confirmation');
-  cy.getByTestId('toast')
-    .find('a')
-    .invoke('attr', 'href')
-    .should('include', `${Cypress.env('EXPLORER_URL')}/txs/test-tx-hash`);
-  cy.getByTestId('toast-close').click();
-};
@@ -1,252 +0,0 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import * as Schema from '@vegaprotocol/types';
-import type { CyHttpMessages } from 'cypress/types/net-stubbing';
-import type { Provider, Status } from '@vegaprotocol/markets';
-import {
-  accountsQuery,
-  assetQuery,
-  assetsQuery,
-  candlesQuery,
-  chartQuery,
-  depositsQuery,
-  estimateFeesQuery,
-  marginsQuery,
-  marketCandlesQuery,
-  marketDataQuery,
-  marketDepthQuery,
-  marketInfoQuery,
-  marketsCandlesQuery,
-  marketsDataQuery,
-  marketsQuery,
-  networkParamsQuery,
-  nodeGuardQuery,
-  ordersQuery,
-  estimatePositionQuery,
-  positionsQuery,
-  proposalListQuery,
-  tradesQuery,
-  withdrawalsQuery,
-  protocolUpgradeProposalsQuery,
-  blockStatisticsQuery,
-  networkParamQuery,
-  liquidityProvisionsQuery,
-  successorMarketQuery,
-  parentMarketIdQuery,
-  successorMarketIdsQuery,
-  successorMarketProposalDetailsQuery,
-  liquidityProvidersQuery,
-} from '@vegaprotocol/mock';
-import type { PartialDeep } from 'type-fest';
-import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
-
-type MarketPageMockData = {
-  state: Schema.MarketState;
-  tradingMode?: Schema.MarketTradingMode;
-  trigger?: Schema.AuctionTrigger;
-};
-
-const ORACLE_PUBKEY = Cypress.env('ORACLE_PUBKEY');
-
-const marketDataOverride = (
-  data: MarketPageMockData
-): PartialDeep<MarketDataQuery> => ({
-  marketsConnection: {
-    edges: [
-      {
-        node: {
-          data: {
-            // @ts-ignore conflict between incoming and outgoing types
-            trigger: data.trigger,
-            // @ts-ignore same as above
-            marketTradingMode: data.tradingMode,
-            marketState: data.state,
-          },
-        },
-      },
-    ],
-  },
-});
-
-const marketsDataOverride = (
-  data: MarketPageMockData
-): PartialDeep<MarketsQuery> => ({
-  marketsConnection: {
-    edges: [
-      {
-        node: {
-          // @ts-ignore conflict between incoming and outgoing types
-          tradingMode: data.tradingMode,
-          state: data.state,
-        },
-      },
-    ],
-  },
-});
-
-const mockTradingPage = (
-  req: CyHttpMessages.IncomingHttpRequest,
-  state: Schema.MarketState = Schema.MarketState.STATE_ACTIVE,
-  tradingMode?: Schema.MarketTradingMode,
-  trigger?: Schema.AuctionTrigger
-) => {
-  aliasGQLQuery(req, 'NodeGuard', nodeGuardQuery());
-  aliasGQLQuery(
-    req,
-    'Markets',
-    marketsQuery(marketsDataOverride({ state, tradingMode, trigger }))
-  );
-  aliasGQLQuery(
-    req,
-    'MarketData',
-    marketDataQuery(marketDataOverride({ state, tradingMode, trigger }))
-  );
-  aliasGQLQuery(req, 'MarketsData', marketsDataQuery());
-  aliasGQLQuery(req, 'MarketsCandles', marketsCandlesQuery());
-  aliasGQLQuery(req, 'MarketCandles', marketCandlesQuery());
-  aliasGQLQuery(req, 'MarketDepth', marketDepthQuery());
-  aliasGQLQuery(req, 'Orders', ordersQuery());
-  aliasGQLQuery(req, 'Accounts', accountsQuery());
-  aliasGQLQuery(req, 'Positions', positionsQuery());
-  aliasGQLQuery(req, 'Margins', marginsQuery());
-  aliasGQLQuery(req, 'Assets', assetsQuery());
-  aliasGQLQuery(req, 'Asset', assetQuery());
-  aliasGQLQuery(
-    req,
-    'MarketInfo',
-    marketInfoQuery({
-      market: {
-        tradableInstrument: {
-          instrument: {
-            product: {
-              __typename: 'Future',
-              dataSourceSpecForSettlementData: {
-                data: {
-                  sourceType: {
-                    sourceType: {
-                      signers: [
-                        {
-                          __typename: 'Signer',
-                          signer: {
-                            __typename: 'PubKey',
-                            key: ORACLE_PUBKEY,
-                          },
-                        },
-                      ],
-                    },
-                  },
-                },
-              },
-              dataSourceSpecForTradingTermination: {
-                data: {
-                  sourceType: {
-                    sourceType: {
-                      signers: [
-                        {
-                          __typename: 'Signer',
-                          signer: {
-                            __typename: 'PubKey',
-                            key: ORACLE_PUBKEY,
-                          },
-                        },
-                      ],
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    })
-  );
-  aliasGQLQuery(req, 'Trades', tradesQuery());
-  aliasGQLQuery(req, 'Chart', chartQuery());
-  aliasGQLQuery(req, 'LiquidityProvisions', liquidityProvisionsQuery());
-  aliasGQLQuery(req, 'LiquidityProviders', liquidityProvidersQuery());
-  aliasGQLQuery(req, 'Candles', candlesQuery());
-  aliasGQLQuery(req, 'Withdrawals', withdrawalsQuery());
-  aliasGQLQuery(req, 'NetworkParams', networkParamsQuery());
-  aliasGQLQuery(req, 'NetworkParam', networkParamQuery);
-  aliasGQLQuery(req, 'EstimateFees', estimateFeesQuery());
-  aliasGQLQuery(req, 'EstimatePosition', estimatePositionQuery());
-  aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
-  aliasGQLQuery(req, 'Deposits', depositsQuery());
-  aliasGQLQuery(
-    req,
-    'ProtocolUpgradeProposals',
-    protocolUpgradeProposalsQuery()
-  );
-  aliasGQLQuery(req, 'BlockStatistics', blockStatisticsQuery());
-  aliasGQLQuery(req, 'SuccessorMarket', successorMarketQuery());
-  aliasGQLQuery(req, 'ParentMarketId', parentMarketIdQuery());
-  aliasGQLQuery(req, 'SuccessorMarketIds', successorMarketIdsQuery());
-  aliasGQLQuery(
-    req,
-    'SuccessorMarketProposalDetails',
-    successorMarketProposalDetailsQuery()
-  );
-};
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Cypress {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    interface Chainable<Subject> {
-      mockTradingPage(
-        state?: Schema.MarketState,
-        tradingMode?: Schema.MarketTradingMode,
-        trigger?: Schema.AuctionTrigger,
-        oracleStatus?: Status
-      ): void;
-    }
-  }
-}
-
-export const addMockTradingPage = () => {
-  Cypress.Commands.add(
-    'mockTradingPage',
-    (
-      state = Schema.MarketState.STATE_ACTIVE,
-      tradingMode,
-      trigger,
-      oracleStatus
-    ) => {
-      cy.mockChainId();
-      cy.mockGQL((req) => {
-        mockTradingPage(req, state, tradingMode, trigger);
-      });
-
-      const oracle: Provider = {
-        name: 'Another oracle',
-        url: 'https://zombo.com',
-        description_markdown:
-          'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
-        oracle: {
-          status: oracleStatus || 'GOOD',
-          status_reason: '',
-          first_verified: '2022-01-01T00:00:00.000Z',
-          last_verified: '2022-12-31T00:00:00.000Z',
-          type: 'public_key',
-          public_key: ORACLE_PUBKEY,
-        },
-        proofs: [
-          {
-            format: 'signed_message',
-            available: true,
-            type: 'public_key',
-            public_key: ORACLE_PUBKEY,
-            message: 'SOMEHEX',
-          },
-        ],
-        github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
-      };
-      // Prevent request to github, return some dummy content
-      cy.intercept(
-        'GET',
-        /^https:\/\/raw.githubusercontent.com\/vegaprotocol\/well-known/,
-        {
-          body: [oracle],
-        }
-      );
-    }
-  );
-};
@@ -1,19 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "sourceMap": false,
-    "outDir": "../../dist/out-tsc",
-    "allowJs": true,
-    "types": ["cypress", "node", "cypress-real-events", "@cypress/grep"],
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": false,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": ["src/**/*.ts", "src/**/*.js", "./declaration.d.ts"]
-}
@@ -49,10 +49,4 @@ To run the minimal set of unit tests, run the following:
 yarn nx test trading
 ```

-To run the UI automation tests with a mocked API, run:
-
-```bash
-yarn nx run trading-e2e:e2e
-```
-
-To run tests with market sim please read [the readme](e2e/README.md).
+To run the UI automation tests please read [e2e/README.md](e2e/README.md)
@@ -6,7 +6,12 @@ export const SUPPORTED_INTERVALS = [
  Interval.INTERVAL_I1M,
  Interval.INTERVAL_I5M,
  Interval.INTERVAL_I15M,
+  Interval.INTERVAL_I30M,
  Interval.INTERVAL_I1H,
+  Interval.INTERVAL_I4H,
  Interval.INTERVAL_I6H,
+  Interval.INTERVAL_I8H,
+  Interval.INTERVAL_I12H,
  Interval.INTERVAL_I1D,
+  Interval.INTERVAL_I7D,
 ] as const;
@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.74.6
+VEGA_VERSION=v0.75.0-preview.2
 LOCAL_SERVER=false
@@ -877,13 +877,13 @@ testing = ["filelock"]

 [[package]]
 name = "python-dateutil"
-version = "2.8.2"
+version = "2.9.0.post0"
 description = "Extensions to the standard Python datetime module"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 files = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+    {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"},
+    {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"},
 ]

 [package.dependencies]
@@ -1166,7 +1166,7 @@ profile = ["pytest-profiling", "snakeviz"]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git/"
 reference = "HEAD"
-resolved_reference = "33fec45ce8044ef7f53b625584ce590d174f9057"
+resolved_reference = "53eed8942acb670783105cb1115bab76710a46dc"

 [[package]]
 name = "websocket-client"
@@ -77,7 +77,7 @@ def test_market_info_market_volume(page: Page):
    page.get_by_test_id(market_title_test_id).get_by_text(
        "Market volume").click()
    fields = [
-        ["24 Hour Volume", "-"],
+        ["24 Hour Volume", "0 (0 )"],
        ["Open Interest", "1"],
        ["Best Bid Volume", "99"],
        ["Best Offer Volume", "99"],
@@ -57,7 +57,7 @@ class TestPerpetuals:
        page.goto(f"/#/markets/{perps_market}")
        page.get_by_test_id("Funding payments").click()
        row = page.locator(row_selector)
-        expect(row.locator(col_amount)).to_have_text("9.00 tDAI")
+        expect(row.locator(col_amount)).to_have_text("4.45 tDAI")

    @pytest.mark.usefixtures("risk_accepted", "auth")
    def test_funding_payment_loss(self, perps_market, page: Page, vega):
@@ -65,7 +65,7 @@ class TestPerpetuals:
        change_keys(page, vega, "market_maker")
        page.get_by_test_id("Funding payments").click()
        row = page.locator(row_selector)
-        expect(row.locator(col_amount)).to_have_text("-27.00 tDAI")
+        expect(row.locator(col_amount)).to_have_text("-13.35 tDAI")

    @pytest.mark.usefixtures("risk_accepted", "auth")
    def test_funding_header(self, perps_market, page: Page):
@@ -24,7 +24,6 @@ import {
  ProtocolUpgradeInProgressNotification,
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
-import { ViewingBanner } from '../components/viewing-banner';
 import { Telemetry } from '../components/telemetry';
 import { SSRLoader } from './ssr-loader';
 import { PartyActiveOrdersHandler } from './party-active-orders-handler';
@@ -77,7 +76,6 @@ function AppBody({ Component }: AppProps) {
            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
          />
          <ProtocolUpgradeInProgressNotification />
-          <ViewingBanner />
        </div>
        <div data-testid={`pathname-${location.pathname}`}>
          <Component />
@@ -6,7 +6,12 @@ export const PENNANT_INTERVAL_MAP = {
  [Interval.INTERVAL_I1M]: PennantInterval.I1M,
  [Interval.INTERVAL_I5M]: PennantInterval.I5M,
  [Interval.INTERVAL_I15M]: PennantInterval.I15M,
+  [Interval.INTERVAL_I30M]: PennantInterval.I30M,
  [Interval.INTERVAL_I1H]: PennantInterval.I1H,
+  [Interval.INTERVAL_I4H]: PennantInterval.I4H,
  [Interval.INTERVAL_I6H]: PennantInterval.I6H,
+  [Interval.INTERVAL_I8H]: PennantInterval.I8H,
+  [Interval.INTERVAL_I12H]: PennantInterval.I12H,
  [Interval.INTERVAL_I1D]: PennantInterval.I1D,
+  [Interval.INTERVAL_I7D]: PennantInterval.I7D,
 } as const;
@@ -34,18 +34,28 @@ const INTERVAL_TO_PENNANT_MAP = {
  [PennantInterval.I1M]: Schema.Interval.INTERVAL_I1M,
  [PennantInterval.I5M]: Schema.Interval.INTERVAL_I5M,
  [PennantInterval.I15M]: Schema.Interval.INTERVAL_I15M,
+  [PennantInterval.I30M]: Schema.Interval.INTERVAL_I30M,
  [PennantInterval.I1H]: Schema.Interval.INTERVAL_I1H,
+  [PennantInterval.I4H]: Schema.Interval.INTERVAL_I4H,
  [PennantInterval.I6H]: Schema.Interval.INTERVAL_I6H,
+  [PennantInterval.I8H]: Schema.Interval.INTERVAL_I8H,
+  [PennantInterval.I12H]: Schema.Interval.INTERVAL_I12H,
  [PennantInterval.I1D]: Schema.Interval.INTERVAL_I1D,
+  [PennantInterval.I7D]: Schema.Interval.INTERVAL_I7D,
 };

 const defaultConfig = {
  decimalPlaces: 5,
  supportedIntervals: [
+    PennantInterval.I7D,
    PennantInterval.I1D,
+    PennantInterval.I12H,
+    PennantInterval.I8H,
    PennantInterval.I6H,
+    PennantInterval.I4H,
    PennantInterval.I1H,
    PennantInterval.I15M,
+    PennantInterval.I30M,
    PennantInterval.I5M,
    PennantInterval.I1M,
  ],
@@ -137,10 +147,15 @@ export class VegaDataSource implements DataSource {
          decimalPlaces: this._decimalPlaces,
          positionDecimalPlaces: this._positionDecimalPlaces,
          supportedIntervals: [
+            PennantInterval.I7D,
            PennantInterval.I1D,
+            PennantInterval.I12H,
+            PennantInterval.I8H,
            PennantInterval.I6H,
+            PennantInterval.I4H,
            PennantInterval.I1H,
            PennantInterval.I15M,
+            PennantInterval.I30M,
            PennantInterval.I5M,
            PennantInterval.I1M,
          ],
@@ -255,6 +270,10 @@ const getDuration = (
  multiplier: number
 ): Duration => {
  switch (interval) {
+    case 'I7D':
+      return {
+        days: 7 * multiplier,
+      };
    case 'I1D':
      return {
        days: 1 * multiplier,
@@ -271,14 +290,30 @@ const getDuration = (
      return {
        minutes: 5 * multiplier,
      };
+    case 'I4H':
+      return {
+        hours: 4 * multiplier,
+      };
    case 'I6H':
      return {
        hours: 6 * multiplier,
      };
+    case 'I8H':
+      return {
+        hours: 8 * multiplier,
+      };
+    case 'I12H':
+      return {
+        hours: 12 * multiplier,
+      };
    case 'I15M':
      return {
        minutes: 15 * multiplier,
      };
+    case 'I30M':
+      return {
+        minutes: 30 * multiplier,
+      };
  }
 };

@@ -288,14 +323,24 @@ const getDifference = (
  dateRight: Date
 ): number => {
  switch (interval) {
+    case 'I7D':
+      return differenceInDays(dateRight, dateLeft) / 7;
    case 'I1D':
      return differenceInDays(dateRight, dateLeft);
+    case 'I12H':
+      return differenceInHours(dateRight, dateLeft) / 12;
+    case 'I8H':
+      return differenceInHours(dateRight, dateLeft) / 8;
    case 'I6H':
      return differenceInHours(dateRight, dateLeft) / 6;
+    case 'I4H':
+      return differenceInHours(dateRight, dateLeft) / 4;
    case 'I1H':
      return differenceInHours(dateRight, dateLeft);
    case 'I15M':
      return differenceInMinutes(dateRight, dateLeft) / 15;
+    case 'I30M':
+      return differenceInMinutes(dateRight, dateLeft) / 30;
    case 'I5M':
      return differenceInMinutes(dateRight, dateLeft) / 5;
    case 'I1M':
@@ -12,7 +12,7 @@ declare global {
  }
 }

-const chainId = 'test-id';
+const chainId = 'vega-stagnet1-202307191148';

 export function addMockChainId() {
  Cypress.Commands.add('mockChainId', () => {
@@ -37,10 +37,12 @@ export function addVegaWalletConnect() {
  Cypress.Commands.add('connectVegaWallet', (isMobile) => {
    mockConnectWallet();
    cy.highlight(`Connecting Vega Wallet`);
+    cy.get('[data-testid="splash-loader"]', { timeout: 20000 }).should(
+      'not.exist'
+    );
    const connectVegaWalletButton = `[data-testid=connect-vega-wallet${
      isMobile ? '-mobile' : ''
    }]:visible`;
-
    cy.get(connectVegaWalletButton).then((btn) => {
      if (btn.length === 0) {
        cy.log('could not find the button, perhaps already connected');
@@ -13,7 +13,8 @@ declare global {

 const hasMethod = (req: CyHttpMessages.IncomingHttpRequest, method: string) => {
  const { body } = req;
-  return 'method' in body && body.method === method;
+  const b = JSON.parse(body);
+  return 'method' in b && b.method === method;
 };

 export function addMockWalletCommand() {
@@ -72,7 +73,7 @@ export const aliasWalletConnectQuery = (
      body: {
        jsonrpc: '2.0',
        result: {
-          chainID: 'test-id',
+          chainID: 'vega-fairground-202305051805',
        },
        id: '1',
      },
@@ -134,6 +134,7 @@ export const CONSOLE_TRANSFER = '#/portfolio/assets/transfer';
 export const CONSOLE_TRANSFER_ASSET =
  '#/portfolio/assets/transfer?assetId=:assetId';
 export const CONSOLE_MARKET_PAGE = '#/markets/:marketId';
+export const CONSOLE_REWARDS_PAGE = '#/rewards';

 // Governance pages
 export const TOKEN_NEW_MARKET_PROPOSAL = '/proposals/propose/new-market';
@@ -971,5 +971,6 @@
  "YourIdentityAnonymous": "Your identity is always anonymous on Vega",
  "yourStake": "Your stake",
  "yourVote": "Your vote",
-  "youVoted": "You voted"
+  "youVoted": "You voted",
+  "rewardsMovedNotification": "Trading and liquidity rewards have moved. Visit <0>Console</0> to view your rewards."
 }
@@ -1,8 +1,6 @@
 {
  "{{liquidityPriceRange}} of mid price": "{{liquidityPriceRange}} of mid price",
  "{{probability}} probability price bounds": "{{probability}} probability price bounds",
-  "24 hour change is unavailable at this time. The price change in the last 120 hours is:": "24 hour change is unavailable at this time. The price change in the last 120 hours is:",
-  "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
  "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.": "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.",
  "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.": "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.",
  "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.": "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.",
@@ -51,9 +49,6 @@
  "Market": "Market",
  "Market data": "Market data",
  "Market governance": "Market governance",
-  "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:",
-  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:",
-  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
  "Market ID": "Market ID",
  "Market price": "Market price",
  "Market specification": "Market specification",
@@ -142,12 +142,17 @@
  "Hoarder reward multiplier": "Hoarder reward multiplier",
  "How it works": "How it works",
  "I want a code": "I want a code",
+  "INTERVAL_I12H": "12H",
  "INTERVAL_I15M": "15m",
-  "INTERVAL_I1D": "1D",
-  "INTERVAL_I1H": "1H",
+  "INTERVAL_I1D": "D",
+  "INTERVAL_I1H": "1h",
  "INTERVAL_I1M": "1m",
+  "INTERVAL_I30M": "30m",
+  "INTERVAL_I4H": "4H",
  "INTERVAL_I5M": "5m",
-  "INTERVAL_I6H": "6H",
+  "INTERVAL_I6H": "6h",
+  "INTERVAL_I8H": "8h",
+  "INTERVAL_I7D": "W",
  "Improve vega console": "Improve vega console",
  "Inactive": "Inactive",
  "Index Price": "Index Price",
@@ -2,16 +2,14 @@ import { type ReactNode } from 'react';
 import {
  addDecimalsFormatNumber,
  formatNumberPercentage,
-  getDateTimeFormat,
  priceChange,
  priceChangePercentage,
 } from '@vegaprotocol/utils';
-import { PriceChangeCell, signedNumberCssClass } from '@vegaprotocol/datagrid';
-import { Tooltip, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { signedNumberCssClass } from '@vegaprotocol/datagrid';
+import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { useCandles } from '../../hooks/use-candles';
 import BigNumber from 'bignumber.js';
 import classNames from 'classnames';
-import { useT } from '../../use-t';

 interface Props {
  marketId?: string;
@@ -24,7 +22,6 @@ export const Last24hPriceChange = ({
  decimalPlaces,
  fallback,
 }: Props) => {
-  const t = useT();
  const { oneDayCandles, fiveDaysCandles, error } = useCandles({
    marketId,
  });
@@ -35,56 +32,6 @@ export const Last24hPriceChange = ({
    return nonIdeal;
  }

-  if (fiveDaysCandles.length < 24) {
-    return (
-      <Tooltip
-        description={
-          <span className="justify-start">
-            {t(
-              'Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:',
-              {
-                start: getDateTimeFormat().format(
-                  new Date(fiveDaysCandles[0].periodStart)
-                ),
-                end: getDateTimeFormat().format(
-                  new Date(
-                    fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
-                  )
-                ),
-              }
-            )}
-            <PriceChangeCell
-              candles={fiveDaysCandles.map((c) => c.close) || []}
-              decimalPlaces={decimalPlaces}
-            />
-          </span>
-        }
-      >
-        <span>{nonIdeal}</span>
-      </Tooltip>
-    );
-  }
-
-  if (oneDayCandles.length < 24) {
-    return (
-      <Tooltip
-        description={
-          <span className="justify-start">
-            {t(
-              '24 hour change is unavailable at this time. The price change in the last 120 hours is:'
-            )}{' '}
-            <PriceChangeCell
-              candles={fiveDaysCandles.map((c) => c.close) || []}
-              decimalPlaces={decimalPlaces}
-            />
-          </span>
-        }
-      >
-        <span>{nonIdeal}</span>
-      </Tooltip>
-    );
-  }
-
  const candles = oneDayCandles?.map((c) => c.close) || [];
  const change = priceChange(candles);
  const changePercentage = priceChangePercentage(candles);
@@ -2,7 +2,6 @@ import { calcCandleVolume, calcCandleVolumePrice } from '../../market-utils';
 import {
  addDecimalsFormatNumber,
  formatNumber,
-  getDateTimeFormat,
  isNumeric,
 } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
@@ -37,83 +36,6 @@ export const Last24hVolume = ({
    return nonIdeal;
  }

-  if (fiveDaysCandles.length < 24) {
-    const candleVolume = calcCandleVolume(fiveDaysCandles);
-    const candleVolumePrice = calcCandleVolumePrice(
-      fiveDaysCandles,
-      marketDecimals,
-      positionDecimalPlaces
-    );
-    const candleVolumeValue =
-      candleVolume && isNumeric(positionDecimalPlaces)
-        ? addDecimalsFormatNumber(
-            candleVolume,
-            positionDecimalPlaces,
-            formatDecimals
-          )
-        : '-';
-    return (
-      <Tooltip
-        description={
-          <div>
-            <span className="flex flex-col">
-              {t(
-                'Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}',
-                {
-                  start: getDateTimeFormat().format(
-                    new Date(fiveDaysCandles[0].periodStart)
-                  ),
-                  end: getDateTimeFormat().format(
-                    new Date(
-                      fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
-                    )
-                  ),
-                  candleVolumeValue,
-                  candleVolumePrice,
-                  quoteUnit,
-                }
-              )}
-            </span>
-          </div>
-        }
-      >
-        <span>{nonIdeal}</span>
-      </Tooltip>
-    );
-  }
-
-  if (oneDayCandles.length < 24) {
-    const candleVolume = calcCandleVolume(fiveDaysCandles);
-    const candleVolumePrice = calcCandleVolumePrice(
-      fiveDaysCandles,
-      marketDecimals,
-      positionDecimalPlaces
-    );
-    const candleVolumeValue =
-      candleVolume && isNumeric(positionDecimalPlaces)
-        ? addDecimalsFormatNumber(
-            candleVolume,
-            positionDecimalPlaces,
-            formatDecimals
-          )
-        : '-';
-    return (
-      <Tooltip
-        description={
-          <div>
-            <span className="flex flex-col">
-              {t(
-                '24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of ({{candleVolumePrice}} {{quoteUnit}})',
-                { candleVolumeValue, candleVolumePrice, quoteUnit }
-              )}
-            </span>
-          </div>
-        }
-      >
-        <span>{nonIdeal}</span>
-      </Tooltip>
-    );
-  }
  const candleVolume = oneDayCandles
    ? calcCandleVolume(oneDayCandles)
    : initialValue;
@@ -8,7 +8,7 @@ export const useCandles = ({ marketId }: { marketId?: string }) => {
  const fiveDaysAgo = useFiveDaysAgo();
  const yesterday = useYesterday();
  const since = new Date(fiveDaysAgo).toISOString();
-  const { data, error } = useThrottledDataProvider({
+  const { data: fiveDaysCandles, error } = useThrottledDataProvider({
    dataProvider: marketCandlesProvider,
    variables: {
      marketId: marketId || '',
@@ -18,13 +18,6 @@ export const useCandles = ({ marketId }: { marketId?: string }) => {
    skip: !marketId,
  });

-  const fiveDaysCandles = data?.filter((c) => {
-    if (c.open === '' || c.close === '' || c.high === '' || c.close === '') {
-      return false;
-    }
-    return true;
-  });
-
  const oneDayCandles = fiveDaysCandles?.filter((candle) =>
    isCandleLessThan24hOld(candle, yesterday)
  );
@@ -15,9 +15,14 @@ export const TRADINGVIEW_INTERVAL_MAP = {
  [Interval.INTERVAL_I1M]: '1',
  [Interval.INTERVAL_I5M]: '5',
  [Interval.INTERVAL_I15M]: '15',
+  [Interval.INTERVAL_I30M]: '30',
  [Interval.INTERVAL_I1H]: '60',
+  [Interval.INTERVAL_I4H]: '240',
  [Interval.INTERVAL_I6H]: '360',
+  [Interval.INTERVAL_I8H]: '480',
+  [Interval.INTERVAL_I12H]: '720',
  [Interval.INTERVAL_I1D]: '1D',
+  [Interval.INTERVAL_I7D]: '1W',
 } as const;

 export type ResolutionRecord = typeof TRADINGVIEW_INTERVAL_MAP;
@@ -32,9 +32,14 @@ const resolutionMap: Record<string, Interval> = {
  '1': Interval.INTERVAL_I1M,
  '5': Interval.INTERVAL_I5M,
  '15': Interval.INTERVAL_I15M,
+  '30': Interval.INTERVAL_I30M,
  '60': Interval.INTERVAL_I1H,
+  '240': Interval.INTERVAL_I4H,
  '360': Interval.INTERVAL_I6H,
+  '480': Interval.INTERVAL_I8H,
+  '720': Interval.INTERVAL_I12H,
  '1D': Interval.INTERVAL_I1D,
+  '1W': Interval.INTERVAL_I7D,
 } as const;

 const supportedResolutions = Object.keys(resolutionMap);
@@ -11,7 +11,6 @@
    "build:all": "nx run-many --all --target=build",
    "build-spec:all": "nx run-many --all --target=build-spec",
    "lint:all": "nx run-many --all --target=lint",
-    "e2e:all": "nx run-many --all --target=e2e",
    "vegacapsule": "vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl",
    "release": "git checkout develop ; git pull ; node scripts/make-release.js",
    "trading:test": "cd apps/trading/e2e && poetry run pytest -k",
@@ -77,7 +76,7 @@
    "jsondiffpatch": "^0.4.1",
    "lodash": "^4.17.21",
    "next": "13.3.0",
-    "pennant": "^1.15.0",
+    "pennant": "^1.16.2",
    "react": "18.2.0",
    "react-copy-to-clipboard": "5.1.0",
    "react-dom": "18.2.0",
@@ -7,18 +7,18 @@ projects = []
 projects_e2e = []

 previews = {
-  'governance': 'not deployed',
-  'explorer': 'not deployed',
-  'trading': 'not deployed',
-  'tools': 'not deployed',
+    'governance': 'not deployed',
+    'explorer': 'not deployed',
+    'trading': 'not deployed',
+    'tools': 'not deployed',
 }

 main_apps = ['governance', 'explorer', 'trading']

-preview_governance="not deployed"
-preview_trading="not deployed"
-preview_explorer="not deployed"
-preview_tools="not deployed"
+preview_governance = "not deployed"
+preview_trading = "not deployed"
+preview_explorer = "not deployed"
+preview_tools = "not deployed"

 # take input from the pipeline
 parser = ArgumentParser()
@@ -30,7 +30,8 @@ parser.add_argument('--event-name', help='name of event in CI')
 args = parser.parse_args()

 # run yarn affected command
-affected=check_output(f'yarn nx print-affected --base={environ["NX_BASE"]} --head={environ["NX_HEAD"]} --select=projects'.split()).decode('utf-8')
+affected = check_output(
+    f'yarn nx print-affected --base={environ["NX_BASE"]} --head={environ["NX_HEAD"]} --select=projects'.split()).decode('utf-8')


 # print useful information
@@ -44,46 +45,54 @@ print(affected)
 print(">>>> eof debug")

 # define affection actions -> add to projects arrays and generate preview link
+
+
 def affect_app(app, preview_name=None):
-  print(f"{app} is affected")
-  projects.append(app)
-  if not preview_name:
-    preview_name=app
-  previews[app] = f'https://{preview_name}.{args.branch_slug}.vega.rocks'
+    print(f"{app} is affected")
+    projects.append(app)
+    if not preview_name:
+        preview_name = app
+    previews[app] = f'https://{preview_name}.{args.branch_slug}.vega.rocks'
+

 # check appearance in the affected string for main apps
 for app in main_apps:
-  if app in affected:
-    affect_app(app)
+    if app in affected:
+        affect_app(app)

 # if non of main apps is affected - test all of them
 if not projects:
-  for app in main_apps:
-    affect_app(app)
+    for app in main_apps:
+        affect_app(app)

 # generate e2e targets
 projects_e2e = [f'{app}-e2e' for app in projects]

+# remove trading-e2e because it doesn't exists any more (new target is: console-e2e)
+if "trading-e2e" in projects_e2e:
+    projects_e2e.remove("trading-e2e")
+
 # check affection for multisig-signer which is deployed only from develop and pull requests
 if args.event_name == 'pull_request' or 'develop' in args.github_ref:
-  if 'multisig-signer' in affected:
-    affect_app('multisig-signer', 'tools')
+    if 'multisig-signer' in affected:
+        affect_app('multisig-signer', 'tools')

 # now parse apps that are deployed from develop but don't have previews
 if 'develop' in args.github_ref:
-  for app in ['static', 'ui-toolkit']:
-    if app in affected:
-      projects.append(app)
+    for app in ['static', 'ui-toolkit']:
+        if app in affected:
+            projects.append(app)

 # if ref is in format release/{env}-{app} then only {app} is deployed
 if 'release' in args.github_ref:
-  for app in main_apps:
-    if f'{args.github_ref}'.endswith(app):
-      projects = [app]
-      projects_e2e = [f'{app}-e2e']
+    for app in main_apps:
+        if f'{args.github_ref}'.endswith(app):
+            projects = [app]
+            projects_e2e = [f'{app}-e2e']


 projects = json.dumps(projects)
+
 projects_e2e = json.dumps(projects_e2e)

 print(f'Projects: {projects}')
@@ -91,20 +100,20 @@ print(f'Projects E2E: {projects_e2e}')

 print('>> Previews')
 for preview, preview_value in previews.items():
-  print(f'{preview}: {preview_value}')
+    print(f'{preview}: {preview_value}')
 print('>> EOF Previews')


 lines_to_write = [
-  f'PREVIEW_GOVERNANCE={previews["governance"]}',
-  f'PREVIEW_EXPLORER={previews["explorer"]}',
-  f'PREVIEW_TRADING={previews["trading"]}',
-  f'PREVIEW_TOOLS={previews["tools"]}',
-  f'PROJECTS={projects}',
-  f'PROJECTS_E2E={projects_e2e}',
+    f'PREVIEW_GOVERNANCE={previews["governance"]}',
+    f'PREVIEW_EXPLORER={previews["explorer"]}',
+    f'PREVIEW_TRADING={previews["trading"]}',
+    f'PREVIEW_TOOLS={previews["tools"]}',
+    f'PROJECTS={projects}',
+    f'PROJECTS_E2E={projects_e2e}',
 ]
 env_file = environ['GITHUB_ENV']
 print(f'Line to add to GITHUB_ENV file: {env_file}')
 print(lines_to_write)
 with open(env_file, 'a') as _f:
-  _f.write('\n'.join(lines_to_write))
+    _f.write('\n'.join(lines_to_write))
@@ -1460,13 +1460,20 @@
  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==

-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.6", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.22.6", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
  version "7.23.2"
  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
  dependencies:
    regenerator-runtime "^0.14.0"

+"@babel/runtime@^7.13.10", "@babel/runtime@^7.21.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
+  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/runtime@^7.22.5":
  version "7.23.4"
  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e"
@@ -2438,14 +2445,22 @@
  resolved "https://registry.yarnpkg.com/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz#c05ed35ad82df8e6ac616c68b92c2282bd083ba4"
  integrity sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==

-"@floating-ui/core@^1.4.2":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.0.tgz#5c05c60d5ae2d05101c3021c1a2a350ddc027f8c"
-  integrity sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==
+"@floating-ui/core@^1.0.0", "@floating-ui/core@^1.4.2":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.0.tgz#fa41b87812a16bf123122bf945946bae3fdf7fc1"
+  integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==
  dependencies:
-    "@floating-ui/utils" "^0.1.3"
+    "@floating-ui/utils" "^0.2.1"

-"@floating-ui/dom@^1.2.1", "@floating-ui/dom@^1.5.1":
+"@floating-ui/dom@^1.2.1":
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.3.tgz#954e46c1dd3ad48e49db9ada7218b0985cee75ef"
+  integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==
+  dependencies:
+    "@floating-ui/core" "^1.0.0"
+    "@floating-ui/utils" "^0.2.0"
+
+"@floating-ui/dom@^1.5.1":
  version "1.5.3"
  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.3.tgz#54e50efcb432c06c23cd33de2b575102005436fa"
  integrity sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==
@@ -2472,6 +2487,11 @@
  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9"
  integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==

+"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2"
+  integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==
+
 "@graphql-codegen/add@^3.2.1":
  version "3.2.3"
  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-3.2.3.tgz#f1ecee085987e7c21841edc4b1fd48877c663e1a"
@@ -7024,9 +7044,9 @@
  integrity sha512-5a21DF7avVPmiUau8KTsv5r76yGqbMgq4QtByoCBPXUrVFWFkd3Ob4OOhmePNRbQqfUCNFjgB4sO7sUURnKcBg==

 "@types/d3-shape@^2.0.0":
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-2.1.6.tgz#38b161512d303c69e709df573db203f199343324"
-  integrity sha512-UvUXi3uJk7i9gstNlyh/+lidKy96AVp6lG6it586lYVIHjS2oRKkOSfaWdON6+Ziu+EqB8kbN3onxk+eP2wSmw==
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-2.1.7.tgz#7c3bd6a9c758b54ba495cab0575cb18359251123"
+  integrity sha512-HedHlfGHdwzKqX9+PiQVXZrdmGlwo7naoefJP7kCNk4Y7qcpQt1tUaoRa6qn0kbTdlaIHGO7111qLtb/6J8uuw==
  dependencies:
    "@types/d3-path" "^2"

@@ -7300,11 +7320,16 @@
  dependencies:
    "@types/node" "*"

-"@types/lodash@^4.14.167", "@types/lodash@^4.14.168", "@types/lodash@^4.14.171":
+"@types/lodash@^4.14.167", "@types/lodash@^4.14.171":
  version "4.14.201"
  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.201.tgz#76f47cb63124e806824b6c18463daf3e1d480239"
  integrity sha512-y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ==

+"@types/lodash@^4.14.168":
+  version "4.14.202"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8"
+  integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==
+
 "@types/mdast@^3.0.0":
  version "3.0.15"
  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.15.tgz#49c524a263f30ffa28b71ae282f813ed000ab9f5"
@@ -7391,7 +7416,14 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.61.tgz#5ea47e3018348bf3bbbe646b396ba5e720310be1"
  integrity sha512-k0N7BqGhJoJzdh6MuQg1V1ragJiXTh8VUBAZTWjJ9cUq23SG0F0xavOwZbhiP4J3y20xd6jxKx+xNUhkMAi76Q==

-"@types/node@^18.0.0", "@types/node@^18.17.5":
+"@types/node@^18.0.0":
+  version "18.19.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.21.tgz#f4ca1ac8ffb05ee4b89163c2d6fac9a1a59ee149"
+  integrity sha512-2Q2NeB6BmiTFQi4DHBzncSoq/cJMLDdhPaAoJFnFCyD9a8VPZRf7a1GAwp1Edb7ROaZc5Jz/tnZyL6EsWMRaqw==
+  dependencies:
+    undici-types "~5.26.4"
+
+"@types/node@^18.17.5":
  version "18.18.9"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.9.tgz#5527ea1832db3bba8eb8023ce8497b7d3f299592"
  integrity sha512-0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ==
@@ -7425,7 +7457,12 @@
  resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.3.tgz#47fe8e784c2dee24fe636cab82e090d3da9b7dec"
  integrity sha512-A0D0aTXvjlqJ5ZILMz3rNfDBOx9hHxLZYv2by47Sm/pqW35zzjusrZTryatjN/Rf8Us2gZrJD+KeHbUSTux1Cw==

-"@types/prop-types@*", "@types/prop-types@^15.0.0":
+"@types/prop-types@*":
+  version "15.7.11"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563"
+  integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==
+
+"@types/prop-types@^15.0.0":
  version "15.7.10"
  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.10.tgz#892afc9332c4d62a5ea7e897fe48ed2085bbb08a"
  integrity sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==
@@ -7454,13 +7491,20 @@
  dependencies:
    "@types/react" "*"

-"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.5":
+"@types/react-dom@^18.0.0":
  version "18.2.15"
  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.15.tgz#921af67f9ee023ac37ea84b1bc0cc40b898ea522"
  integrity sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==
  dependencies:
    "@types/react" "*"

+"@types/react-dom@^18.0.5":
+  version "18.2.20"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.20.tgz#cbdf7abb3cc2377980bb1294bc51375016a8320f"
+  integrity sha512-HXN/biJY8nv20Cn9ZbCFq3liERd4CozVZmKbaiZ9KiKTrWqsP7eoGDO6OOGvJQwoVFuiXaiJ7nBBjiFFbRmQMQ==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-router-dom@^5.3.3":
  version "5.3.3"
  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83"
@@ -7485,7 +7529,14 @@
  dependencies:
    "@types/react" "*"

-"@types/react-virtualized-auto-sizer@^1.0.0", "@types/react-virtualized-auto-sizer@^1.0.1":
+"@types/react-virtualized-auto-sizer@^1.0.0":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.4.tgz#42044ef75ac2d2667893a5943e54a9f037f985a3"
+  integrity sha512-nhYwlFiYa8M3S+O2T9QO/e1FQUYMr/wJENUdf/O0dhRi1RS/93rjrYQFYdbUqtdFySuhrtnEDX29P6eKOttY+A==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-virtualized-auto-sizer@^1.0.1":
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.3.tgz#13f4387c1b0b635b89d403970863b1ff464cd91e"
  integrity sha512-xRsQJiM8BuwGiDl77yyFZqq32lLvI4msFtw7nVbw9qh9c2LvchDXezwjEWmysJkXnLZWjHJX9lT8MCPkFy5BfQ==
@@ -7507,10 +7558,10 @@
  dependencies:
    "@types/react" "*"

-"@types/react@*", "@types/react@>=16", "@types/react@^18.0.14":
-  version "18.2.37"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.37.tgz#0f03af69e463c0f19a356c2660dbca5d19c44cae"
-  integrity sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==
+"@types/react@*", "@types/react@^18.0.14":
+  version "18.2.63"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.63.tgz#4637c56146ad90f96d0583171edab953f7e6fe57"
+  integrity sha512-ppaqODhs15PYL2nGUOaOu2RSCCB4Difu4UFrP4I3NHLloXC/ESQzQMi9nvjfT1+rudd0d2L3fQPJxRSey+rGlQ==
  dependencies:
    "@types/prop-types" "*"
    "@types/scheduler" "*"
@@ -7525,6 +7576,15 @@
    "@types/scheduler" "*"
    csstype "^3.0.2"

+"@types/react@>=16":
+  version "18.2.37"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.37.tgz#0f03af69e463c0f19a356c2660dbca5d19c44cae"
+  integrity sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/resolve@1.17.1":
  version "1.17.1"
  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -7545,9 +7605,9 @@
  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==

 "@types/scheduler@*":
-  version "0.16.6"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.6.tgz#eb26db6780c513de59bee0b869ef289ad3068711"
-  integrity sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA==
+  version "0.16.8"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
+  integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==

 "@types/semver@^7.3.12", "@types/semver@^7.3.4", "@types/semver@^7.5.0":
  version "7.5.5"
@@ -9999,7 +10059,22 @@ check-more-types@^2.24.0:
  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
  integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==

-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2, chokidar@^3.5.3:
+"chokidar@>=3.0.0 <4.0.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chokidar@^3.5.2, chokidar@^3.5.3:
  version "3.5.3"
  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -10051,11 +10126,16 @@ cjs-module-lexer@^1.0.0:
  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==

-classnames@*, classnames@^2.2, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.0, classnames@^2.3.1:
+classnames@*, classnames@^2.2, classnames@^2.2.5, classnames@^2.3.1:
  version "2.3.2"
  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==

+classnames@^2.2.6, classnames@^2.3.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
+  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
+
 clean-css@^5.2.2:
  version "5.3.2"
  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.2.tgz#70ecc7d4d4114921f5d298349ff86a31a9975224"
@@ -10890,9 +10970,9 @@ cssstyle@^2.3.0:
    cssom "~0.3.6"

 csstype@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
-  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==

 cypress-mochawesome-reporter@^3.3.0:
  version "3.6.1"
@@ -11400,11 +11480,11 @@ del@^6.0.0:
    slash "^3.0.0"

 delaunator@5:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b"
-  integrity sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.1.tgz#39032b08053923e924d6094fe2cde1a99cc51278"
+  integrity sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==
  dependencies:
-    robust-predicates "^3.0.0"
+    robust-predicates "^3.0.2"

 delay@^5.0.0:
  version "5.0.0"
@@ -14314,9 +14394,9 @@ immer@^9.0.12:
  integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==

 immutable@^4.0.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
-  integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
+  integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==

 immutable@~3.7.6:
  version "3.7.6"
@@ -17903,10 +17983,10 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

-pennant@^1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.15.0.tgz#21854cf78466cbd27eda8143c21abcde070d4d76"
-  integrity sha512-p3H4vu6BP7nUqn7s2pjyTl0FMJUT2U5lq5UKuxy55F2E66sJnvp5XFvNjRZvi42vyzsxG8WURgwQDQKNqQgWAw==
+pennant@^1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.16.2.tgz#5c6a63a2beda07ff86f7e33400d8570c171ac479"
+  integrity sha512-/n1GzSWZFlgYCfSZubmZA2eiIoOvZPJJP9RKc/u2pOIPlp5Bn2Lq5uKyAT9bvjh/YDQtMhBKf92Q6DxJEDnJNw==
  dependencies:
    "@babel/runtime" "^7.13.10"
    "@d3fc/d3fc-technical-indicator" "^8.0.1"
@@ -19219,7 +19299,12 @@ react-use-websocket@^3.0.0:
  resolved "https://registry.yarnpkg.com/react-use-websocket/-/react-use-websocket-3.0.0.tgz#754cb8eea76f55d31c5676d4abe3e573bc2cea04"
  integrity sha512-BInlbhXYrODBPKIplDAmI0J1VPM+1KhCLN09o+dzgQ8qMyrYs4t5kEYmCrTqyRuMTmpahylHFZWQXpfYyDkqOw==

-react-virtualized-auto-sizer@^1.0.4, react-virtualized-auto-sizer@^1.0.6:
+react-virtualized-auto-sizer@^1.0.4:
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.23.tgz#ddb18f775a00f672577f1ec01306a94ca26161b8"
+  integrity sha512-5id3UTx+fG7b7SIOKL9/7aR1vP8+MtIT84cJCf09F6pYalB/nvHlx5EQvsSk27SwHUKjgPamG/nS8ynI0uSfKA==
+
+react-virtualized-auto-sizer@^1.0.6:
  version "1.0.20"
  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.20.tgz#d9a907253a7c221c52fa57dc775a6ef40c182645"
  integrity sha512-OdIyHwj4S4wyhbKHOKM1wLSj/UDXm839Z3Cvfg2a9j+He6yDa6i5p0qQvEiCnyQlGO/HyfSnigQwuxvYalaAXA==
@@ -19430,9 +19515,9 @@ regenerator-runtime@^0.13.7:
  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==

 regenerator-runtime@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
-  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==

 regenerator-transform@^0.15.2:
  version "0.15.2"
@@ -19727,7 +19812,7 @@ rimraf@~2.6.2:
  dependencies:
    glob "^7.1.3"

-robust-predicates@^3.0.0:
+robust-predicates@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771"
  integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==
@@ -19916,7 +20001,7 @@ sass@1.55.0:
    immutable "^4.0.0"
    source-map-js ">=0.6.2 <2.0.0"

-sass@^1.42.1, sass@^1.49.9:
+sass@^1.42.1:
  version "1.69.5"
  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
  integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
@@ -19925,6 +20010,15 @@ sass@^1.42.1, sass@^1.49.9:
    immutable "^4.0.0"
    source-map-js ">=0.6.2 <2.0.0"

+sass@^1.49.9:
+  version "1.71.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54"
+  integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
 sax@^1.2.4:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
Author	SHA1	Message	Date
Bartłomiej Głownia	e5d8996b1a	feat: add 8H interval, upgrade pennant	2024-03-06 11:18:39 +01:00
Bartłomiej Głownia	ba882d3c25	feat: change 7D to 1W	2024-03-06 11:18:38 +01:00
Bartłomiej Głownia	bddc1ac7dd	feat(trading): add additional intervals	2024-03-06 11:18:38 +01:00
m.ray	38d13085fb	chore(trading): remove view as pubkey banner (#5926 )	2024-03-05 16:15:51 +00:00
daro-maj	c0f4278b81	fix(trading): fix ci cypress issue (#5922 )	2024-03-05 16:09:14 +00:00
Ben	b2777043b4	chore(trading): update vega and market-sim (#5919 )	2024-03-05 15:49:50 +00:00
Matthew Russell	4d19b55096	Merge pull request #5912 from vegaprotocol/main chore(trading,governance): back merge hotfixes	2024-03-05 04:14:14 -05:00
Matthew Russellandbwallacee	7ea7362a7d	fix(trading): market into tab 24hr vol and price fix (#5910 ) Co-authored-by: bwallacee <ben@vega.xyz>	2024-03-04 19:08:42 +00:00
Art	bbfe42ddb1	fix(governance): rewards moved to console notification (#5904 )	2024-03-04 18:09:52 +00:00
Matthew Russell	b163af3e8a	fix(trading): 24hr price and volume in header (#5908 )	2024-03-04 18:00:54 +00:00
daro-maj	e6b3ff456d	fix(trading): fix tests due to new wallet connection method (#5903 )	2024-03-04 15:58:33 +01:00
Matthew Russell	00dbb7dd60	chore(trading): delete trading-e2e cypress tests (#5901 )	2024-03-03 14:25:04 +00:00
Matthew Russell	82df401611	fix(governance): incorrect penalty information in validators table and page (#5896 )	2024-03-01 22:22:17 +00:00