Merge remote-tracking branch 'origin/main' into chore/4733-improve-tooltip-to-main

chore: remove underline from tooltip triggers
chore: remove underline from tooltip
2023-09-26 12:07:51 +02:00 · 2023-09-26 10:02:56 +02:00 · 2023-09-26 10:02:30 +02:00
52 changed files with 149 additions and 540 deletions
@@ -5,12 +5,12 @@ on:
    branches:
      - release/*
      - develop
-      - main
  pull_request:
    types:
      - opened
      - ready_for_review
      - reopened
+      - edited
      - synchronize
 jobs:
  node-modules:
@@ -42,6 +42,13 @@ jobs:
        if: steps.cache.outputs.cache-hit != 'true'
        run: yarn install --pure-lockfile

+  lint-pr-title:
+    needs: node-modules
+    if: ${{ github.event_name == 'pull_request' }}
+    name: Verify PR title
+    uses: ./.github/workflows/lint-pr.yml
+    secrets: inherit
+
  lint-format:
    timeout-minutes: 20
    needs: node-modules
@@ -177,33 +184,10 @@ jobs:
  #   with:
  #     github-sha: ${{ github.event.pull_request.head.sha || github.sha }}

-  check-e2e-needed:
-    runs-on: ubuntu-latest
-    needs: build-sources
-    name: '(CI) check if e2e needed'
-    outputs:
-      run-tests: ${{ steps.check-test.outputs.e2e-needed }}
-    steps:
-      - name: Check branch
-        id: check-test
-        run: |
-          if [[ "${{ github.base_ref }}" == "develop" ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "main" ]]; then 
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push"  &&  "${{ github.ref_name }}" == *"release/"* ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          else
-            echo "e2e-needed=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Print result
-        run: |
-          echo "e2e-needed: ${{ steps.check-test.outputs.e2e-needed }}"
-
  cypress:
-    needs: [build-sources, check-e2e-needed]
+    needs: build-sources
    name: '(CI) cypress'
-    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
+    # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }}
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
    with:
@@ -6,37 +6,23 @@ on:
      github-sha:
        required: true
        type: string
-  workflow_dispatch:
-    inputs:
-      console-test-branch:
-        type: choice
-        description: 'main: v0.72.14, develop: v0.73.0-preview7'
-        options:
-          - main
-          - develop

 jobs:
  run-tests:
    name: run-tests
-    runs-on: 8-cores
+    runs-on: console-test
    timeout-minutes: 20
    steps:
      #----------------------------------------------
      #       check-out frontend-monorepo
      #----------------------------------------------
-      - name: Checkout frontend-monorepo
+      - name: Checkout console test repo
        uses: actions/checkout@v3
        with:
-          ref: ${{ inputs.github-sha || github.sha }}
+          ref: ${{ inputs.github-sha }}
      #----------------------------------------------
      #       cache node modules
      #----------------------------------------------
-      - name: setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: yarn
-
      - name: Cache node modules
        id: cache
        uses: actions/cache@v3
@@ -79,42 +65,32 @@ jobs:
        uses: actions/checkout@v3
        with:
          repository: vegaprotocol/console-test
-          ref: ${{ inputs.console-test-branch }}
          path: './console-test'
-
-      - name: Load console test envs
-        id: console-test-env
-        uses: falti/dotenv-action@v1.0.4
-        with:
-          path: './console-test/.env.${{ inputs.console-test-branch }}'
-          export-variables: true
-          keys-case: upper
-          log-variables: true
-
      #----------------------------------------------
      # install dependencies if cache does not exist
      #----------------------------------------------
      - name: Install dependencies
        working-directory: ./console-test
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
        run: poetry install --no-interaction --no-root
      #----------------------------------------------
      # install vega binaries
      #----------------------------------------------
      - name: Install vega binaries
        working-directory: ./console-test
-        run: poetry run python -m vega_sim.tools.load_binaries --force --version ${{ env.VEGA_VERSION }}
+        run: poetry run python -m vega_sim.tools.load_binaries --force
      #----------------------------------------------
      # install playwright
      #----------------------------------------------
      - name: install playwright
-        run: poetry run playwright install --with-deps chromium
+        run: poetry run playwright install
        working-directory: ./console-test
      #----------------------------------------------
      # run tests
      #----------------------------------------------
      - name: Run tests
        working-directory: ./console-test
-        run: poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
+        run: poetry run pytest -v -s --numprocesses 2 --dist loadfile --durations=20
      - name: Check files
        run: |
          ls -al .
@@ -129,13 +105,3 @@ jobs:
          name: playwright-trace
          path: ./traces/
          retention-days: 15
-      #----------------------------------------------
-      #  -----  upload logs  -----
-      #----------------------------------------------
-      - name: Upload worker logs
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: worker-logs
-          path: ./logs/
-          retention-days: 15
@@ -13,35 +13,13 @@ on:
        type: string

 jobs:
-  runner-choice:
-    runs-on: ubuntu-latest
-    outputs:
-      runner: ${{ steps.step.outputs.runner }}
-    steps:
-      - name: Check branch
-        id: step
-        run: |
-          if [[ "${{ github.base_ref }}" == "main" ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          else
-            echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Print runner
-        run: echo ${{ steps.step.outputs.runner }}
-
  e2e:
    strategy:
      fail-fast: false
      matrix:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
-    needs: runner-choice
-    runs-on: ${{ needs.runner-choice.outputs.runner }}
+    runs-on: self-hosted-runner
    timeout-minutes: 120
    steps:
      # Checks if skip cache was requested
@@ -85,7 +63,6 @@ jobs:
      - name: Run Vegacapsule network and Vega wallet
        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        timeout-minutes: 10

      ######
      ## Run some tests
@@ -2,12 +2,7 @@
 name: Verify PR title

 on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
+  workflow_call:

 jobs:
  lint_pr:
@@ -16,16 +11,21 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}

      - name: Setup node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn

-      - name: Install dependencies
-        run: |
-          rm package.json 
-          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}

      - name: Check PR title
        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -30,18 +30,12 @@ jobs:
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
          echo IS_S3_RELEASE=false >> $GITHUB_ENV
          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
-          echo IS_MAIN_IMAGE=false >> $GITHUB_ENV

      - name: Is dev image
-        if: ${{ github.ref_name == 'develop' && github.event_name == 'push' && matrix.app == 'trading' }}
+        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
        run: |
          echo IS_DEV_IMAGE=true >> $GITHUB_ENV

-      - name: Is main image
-        if: ${{ github.ref_name == 'main' && github.event_name == 'push' && matrix.app == 'trading' }}
-        run: |
-          echo IS_MAIN_IMAGE=true >> $GITHUB_ENV
-
      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
        run: |
@@ -63,7 +57,7 @@ jobs:
          echo IS_IPFS_RELEASE=true >> $GITHUB_ENV

      - name: Is S3 Release
-        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' && github.ref_name != 'main'}}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
        run: |
          echo IS_S3_RELEASE=true >> $GITHUB_ENV

@@ -87,7 +81,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -185,7 +179,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -195,7 +189,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || '' }}

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -222,7 +216,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}

      # bucket creation in github.com/vegaprotocol/terraform//frontend
      - name: Publish dist to s3
@@ -8,9 +8,7 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';

 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleSpecsQuery({
-    errorPolicy: 'ignore',
-  });
+  const { data, loading, error } = useExplorerOracleSpecsQuery();

  useDocumentTitle(['Oracles']);
  useScrollToLocation();
@@ -8,7 +8,6 @@ NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

@@ -17,7 +17,7 @@ NX_VEGA_REST_URL=https://api.vega.community/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

@@ -10,7 +10,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -15,7 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -6,11 +6,6 @@ import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { ProposalDocument } from './__generated__/Proposal';

-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useDataProvider: jest.fn(() => ({ data: [], loading: false })),
-}));
-
 jest.mock('../components/proposal', () => ({
  Proposal: () => <div data-testid="proposal" />,
 }));
@@ -24,7 +24,9 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {

  beforeEach(() => {
    cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-fee-margin-required').click();
+    cy.getByTestId('deal-ticket-fee-margin-required').within(() => {
+      cy.get('button').click();
+    });
  });

  describe('limit order', () => {
@@ -109,7 +111,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
          'Total margin available100.01 tDAI'
        );
      });
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
    });

    it('must have current margin allocation', () => {
@@ -119,7 +120,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
          'Current margin allocation'
        );
      });
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
    });

    it('should open usage breakdown dialog when clicked on current margin allocation', () => {
@@ -128,7 +128,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
      });
      cy.getByTestId('usage-breakdown').should('exist');
      cy.getByTestId('dialog-close').click();
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
    });
  });
 });
@@ -9,7 +9,7 @@ import {
  testOrderAmendment,
 } from '../support/order-validation';

-const orderSymbol = 'instrument-code';
+const orderSymbol = 'market.tradableInstrument.instrument.code';
 const orderSize = 'size';
 const orderType = 'type';
 const orderStatus = 'status';
@@ -229,7 +229,10 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
      status: Schema.OrderStatus.STATUS_FILLED,
    });
    cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Filled');
-    cy.get(`[col-id="${orderSymbol}"]`).contains('[title="Future"]', 'Futr');
+    cy.get('[col-id="market.tradableInstrument.instrument.code"]').contains(
+      '[title="Future"]',
+      'Futr'
+    );
  });

  it('must see a rejected order', () => {
@@ -86,8 +86,8 @@ describe('trades', { tags: '@smoke' }, () => {
  });

  it('copy price to deal ticket form', () => {
+    cy.getByTestId('Order').click();
    // 6005-THIS-007
-    cy.getByTestId('order-type-Limit').click();
    cy.get(colIdPrice).last().should('be.visible').click();
    cy.getByTestId('order-price').should('have.value', '171.16898');
  });
@@ -12,7 +12,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
@@ -16,7 +16,6 @@ NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -16,7 +16,7 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -17,7 +17,6 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -1,5 +0,0 @@
-import MarketPage from '../market';
-
-export const ClosedMarketPage = () => {
-  return <MarketPage closed />;
-};
@@ -1 +0,0 @@
-export { ClosedMarketPage as default } from './closed-market';
@@ -12,7 +12,6 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 import { ViewType, useSidebar } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
-import { MarketState } from '@vegaprotocol/types';

 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
  return markPrice && decimalPlaces
@@ -57,7 +56,7 @@ const TitleUpdater = ({
  return null;
 };

-export const MarketPage = ({ closed }: { closed?: boolean }) => {
+export const MarketPage = () => {
  const { marketId } = useParams();
  const navigate = useNavigate();
  const currentRouteId = useGetCurrentRouteId();
@@ -71,33 +70,16 @@ export const MarketPage = ({ closed }: { closed?: boolean }) => {
  const { data, error, loading } = useMarket(marketId);

  useEffect(() => {
-    if (
-      data?.state &&
-      [
-        MarketState.STATE_SETTLED,
-        MarketState.STATE_TRADING_TERMINATED,
-      ].includes(data.state) &&
-      currentRouteId !== Routes.CLOSED_MARKETS &&
-      marketId
-    ) {
-      navigate(Links[Routes.CLOSED_MARKETS](marketId));
-    }
-  }, [data?.state, currentRouteId, navigate, marketId]);
-
-  useEffect(() => {
-    if (data?.id && data.id !== lastMarketId && !closed) {
+    if (data?.id && data.id !== lastMarketId) {
      update({ marketId: data.id });
    }
-  }, [update, lastMarketId, data?.id, closed]);
+  }, [update, lastMarketId, data?.id]);

  useEffect(() => {
    if (largeScreen && view === undefined) {
-      setViews(
-        { type: closed ? ViewType.Info : ViewType.Order },
-        currentRouteId
-      );
+      setViews({ type: ViewType.Order }, currentRouteId);
    }
-  }, [setViews, view, currentRouteId, largeScreen, closed]);
+  }, [setViews, view, currentRouteId, largeScreen]);

  const tradeView = useMemo(() => {
    if (largeScreen) {
@@ -128,7 +128,7 @@ const MainGrid = memo(
                </Tab>
              ) : null}
              <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component />
+                <TradingViews.fills.component marketId={marketId} />
              </Tab>
              <Tab
                id="accounts"
@@ -24,8 +24,6 @@ import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { MarketActionsDropdown } from './market-table-actions';
 import { MarketCodeCell } from './market-code-cell';
-import type { CellClickedEvent } from 'ag-grid-community';
-import { useClosedMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 type SettlementAsset =
  MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
@@ -114,7 +112,6 @@ const ClosedMarketsDataGrid = ({
  rowData: Row[];
  error: Error | undefined;
 }) => {
-  const handleOnSelect = useClosedMarketClickHandler();
  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);

  const colDefs = useMemo(() => {
@@ -271,27 +268,6 @@ const ClosedMarketsDataGrid = ({
      overlayNoRowsTemplate={error ? error.message : t('No markets')}
      components={components}
      rowHeight={45}
-      onCellClicked={({ data, column, event }: CellClickedEvent<Row>) => {
-        if (!data) return;
-
-        // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
-        const colId = column.getColId();
-
-        if (
-          [
-            'settlementDate',
-            'settlementDataOracleId',
-            'settlementAsset',
-            'market-actions',
-          ].includes(colId)
-        ) {
-          return;
-        }
-
-        // @ts-ignore metaKey exists
-        handleOnSelect(data.id, event ? event.metaKey : false);
-      }}
    />
  );
 };
@@ -9,7 +9,7 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

-export const FillsContainer = () => {
+export const FillsContainer = ({ marketId }: { marketId?: string }) => {
  const onMarketClick = useMarketClickHandler(true);
  const { pubKey } = useVegaWallet();

@@ -31,6 +31,7 @@ export const FillsContainer = () => {
  return (
    <FillsManager
      partyId={pubKey}
+      marketId={marketId}
      onMarketClick={onMarketClick}
      gridProps={gridStoreCallbacks}
    />
@@ -24,7 +24,6 @@ export const LayoutWithSidebar = () => {
      <div className="col-span-full">
        <Routes>
          <Route path={AppRoutes.MARKET} element={<MarketHeader />} />
-          <Route path={AppRoutes.CLOSED_MARKETS} element={<MarketHeader />} />
          <Route path={AppRoutes.LIQUIDITY} element={<LiquidityHeader />} />
        </Routes>
      </div>
@@ -28,20 +28,14 @@ export interface OrderContainerProps {
  filter?: Filter;
 }

-const AUTO_SIZE_COLUMNS = ['instrument-code'];
-
 export const OrdersContainer = ({ filter }: OrderContainerProps) => {
  const { pubKey, isReadOnly } = useVegaWallet();
  const onMarketClick = useMarketClickHandler(true);
  const onOrderTypeClick = useMarketLiquidityClickHandler();
  const { gridState, updateGridState } = useOrderListGridState(filter);
-  const gridStoreCallbacks = useDataGridEvents(
-    gridState,
-    (newState) => {
-      updateGridState(filter, newState);
-    },
-    AUTO_SIZE_COLUMNS
-  );
+  const gridStoreCallbacks = useDataGridEvents(gridState, (newState) => {
+    updateGridState(filter, newState);
+  });

  if (!pubKey) {
    return <Splash>{t('Please connect Vega wallet')}</Splash>;
@@ -10,8 +10,6 @@ import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

-const AUTO_SIZE_COLUMNS = ['marketCode'];
-
 export const PositionsContainer = ({ allKeys }: { allKeys?: boolean }) => {
  const onMarketClick = useMarketClickHandler(true);
  const { pubKey, pubKeys, isReadOnly } = useVegaWallet();
@@ -19,11 +17,7 @@ export const PositionsContainer = ({ allKeys }: { allKeys?: boolean }) => {
  const showClosed = usePositionsStore((store) => store.showClosedMarkets);
  const gridStore = usePositionsStore((store) => store.gridStore);
  const updateGridStore = usePositionsStore((store) => store.updateGridStore);
-  const gridStoreCallbacks = useDataGridEvents(
-    gridStore,
-    updateGridStore,
-    AUTO_SIZE_COLUMNS
-  );
+  const gridStoreCallbacks = useDataGridEvents(gridStore, updateGridStore);

  if (!pubKey) {
    return (
@@ -110,20 +110,6 @@ export const Sidebar = () => {
              </>
            }
          />
-          <Route
-            path={AppRoutes.CLOSED_MARKETS}
-            element={
-              <>
-                <SidebarDivider />
-                <SidebarButton
-                  view={ViewType.Info}
-                  icon={VegaIconNames.BREAKDOWN}
-                  tooltip={t('Market specification')}
-                  routeId={currentRouteId}
-                />
-              </>
-            }
-          />
        </Routes>
      </nav>
      <nav className={classNames(navClasses, 'ml-auto lg:mt-auto lg:ml-0')}>
@@ -27,8 +27,8 @@ const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
  const dismiss = useOnboardingStore((store) => store.dismiss);
  const setDialogOpen = useOnboardingStore((store) => store.setDialogOpen);
  const marketId = useGlobalStore((store) => store.marketId);
-  const setWalletDialogOpen = useOnboardingStore(
-    (store) => store.setWalletDialogOpen
+  const openVegaWalletDialog = useVegaWalletDialogStore(
+    (store) => store.openVegaWalletDialog
  );
  const setViews = useSidebar((store) => store.setViews);

@@ -40,7 +40,7 @@ const GetStartedButton = ({ step }: { step: OnboardingStep }) => {

  if (step <= OnboardingStep.ONBOARDING_CONNECT_STEP) {
    return (
-      <TradingButton {...buttonProps} onClick={() => setWalletDialogOpen(true)}>
+      <TradingButton {...buttonProps} onClick={() => openVegaWalletDialog()}>
        {t('Connect')}
      </TradingButton>
    );
@@ -70,7 +70,7 @@ const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
  }

  return (
-    <TradingButton {...buttonProps} onClick={() => setWalletDialogOpen(true)}>
+    <TradingButton {...buttonProps} onClick={() => openVegaWalletDialog()}>
      {t('Get started')}
    </TradingButton>
  );
@@ -12,20 +12,16 @@ import { useGlobalStore } from '../../stores';
 const ONBOARDING_STORAGE_KEY = 'vega_onboarding';
 export const useOnboardingStore = create<{
  dialogOpen: boolean;
-  walletDialogOpen: boolean;
  dismissed: boolean;
  dismiss: () => void;
  setDialogOpen: (isOpen: boolean) => void;
-  setWalletDialogOpen: (isOpen: boolean) => void;
 }>()(
  persist(
    (set) => ({
      dialogOpen: true,
-      walletDialogOpen: false,
      dismissed: false,
      dismiss: () => set({ dismissed: true }),
      setDialogOpen: (isOpen) => set({ dialogOpen: isOpen }),
-      setWalletDialogOpen: (isOpen) => set({ walletDialogOpen: isOpen }),
    }),
    {
      name: ONBOARDING_STORAGE_KEY,
@@ -3,54 +3,30 @@ import { t } from '@vegaprotocol/i18n';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { WelcomeDialogContent } from './welcome-dialog-content';
 import { useOnboardingStore } from './use-get-onboarding-step';
-import { VegaConnectDialog } from '@vegaprotocol/wallet';
-import { Connectors } from '../../lib/vega-connectors';
-import { RiskMessage } from './risk-message';

 export const WelcomeDialog = () => {
  const { VEGA_ENV } = useEnvironment();
  const dismissed = useOnboardingStore((store) => store.dismissed);
  const dialogOpen = useOnboardingStore((store) => store.dialogOpen);
  const dismiss = useOnboardingStore((store) => store.dismiss);
-  const walletDialogOpen = useOnboardingStore(
-    (store) => store.walletDialogOpen
-  );
-  const setWalletDialogOpen = useOnboardingStore(
-    (store) => store.setWalletDialogOpen
-  );
-
-  const content = walletDialogOpen ? (
-    <VegaConnectDialog
-      connectors={Connectors}
-      riskMessage={<RiskMessage />}
-      onClose={() => setWalletDialogOpen(false)}
-      contentOnly
-    />
-  ) : (
-    <WelcomeDialogContent />
-  );
-
-  const onClose = walletDialogOpen ? () => setWalletDialogOpen(false) : dismiss;
-
-  const title = walletDialogOpen ? null : (
-    <span className="font-alpha calt" data-testid="welcome-title">
-      {t('Console')}{' '}
-      <span className="text-vega-clight-100 dark:text-vega-cdark-100">
-        {VEGA_ENV}
-      </span>
-    </span>
-  );

  return (
    <Dialog
      open={dismissed ? false : dialogOpen}
-      title={title}
+      title={
+        <span className="font-alpha calt" data-testid="welcome-title">
+          {t('Console')}{' '}
+          <span className="text-vega-clight-100 dark:text-vega-cdark-100">
+            {VEGA_ENV}
+          </span>
+        </span>
+      }
      size="medium"
-      onChange={onClose}
+      onChange={() => dismiss()}
      intent={Intent.None}
      dataTestId="welcome-dialog"
    >
-      {content}
+      <WelcomeDialogContent />
    </Dialog>
  );
 };
@@ -20,16 +20,3 @@ export const useMarketLiquidityClickHandler = () => {
    window.open(`/#/liquidity/${selectedId}`, metaKey ? '_blank' : '_self');
  }, []);
 };
-
-export const useClosedMarketClickHandler = (replace = false) => {
-  const navigate = useNavigate();
-
-  return (selectedId: string, metaKey?: boolean) => {
-    const link = Links[Routes.CLOSED_MARKETS](selectedId);
-    if (metaKey) {
-      window.open(`/#${link}`, '_blank');
-    } else {
-      navigate(link, { replace });
-    }
-  };
-};
@@ -23,10 +23,6 @@ const LazyMarket = dynamic(() => import('../client-pages/market'), {
  ssr: false,
 });

-const ClosedMarket = dynamic(() => import('../client-pages/closed-market'), {
-  ssr: false,
-});
-
 const LazyPortfolio = dynamic(() => import('../client-pages/portfolio'), {
  ssr: false,
 });
@@ -43,7 +39,6 @@ export enum Routes {
  HOME = '/',
  MARKET = '/markets/:marketId',
  MARKETS = '/markets/all',
-  CLOSED_MARKETS = '/markets/all/closed/:marketId',
  PORTFOLIO = '/portfolio',
  LIQUIDITY = '/liquidity/:marketId',
  DISCLAIMER = '/disclaimer',
@@ -57,8 +52,6 @@ export const Links: ConsoleLinks = {
  [Routes.MARKET]: (marketId: string) =>
    trimEnd(Routes.MARKET.replace(':marketId', marketId)),
  [Routes.MARKETS]: () => Routes.MARKETS,
-  [Routes.CLOSED_MARKETS]: (marketId: string) =>
-    trimEnd(Routes.CLOSED_MARKETS.replace(':marketId', marketId)),
  [Routes.PORTFOLIO]: () => Routes.PORTFOLIO,
  [Routes.LIQUIDITY]: (marketId: string) =>
    trimEnd(Routes.LIQUIDITY.replace(':marketId', marketId)),
@@ -91,11 +84,6 @@ export const routerConfig: RouteObject[] = [
            element: <LazyMarket />,
            id: Routes.MARKET,
          },
-          {
-            path: 'all/closed/:marketId',
-            element: <ClosedMarket />,
-            id: Routes.CLOSED_MARKETS,
-          },
        ],
      },
      {
@@ -110,8 +110,8 @@ html [data-theme='light'] {
  --pennant-color-depth-sell-fill: theme(colors.market.red.DEFAULT);
  --pennant-color-depth-sell-stroke: theme(colors.market.red.650);

-  --pennant-color-volume-buy: theme(colors.market.green.DEFAULT);
-  --pennant-color-volume-sell: theme(colors.market.red.DEFAULT);
+  --pennant-color-volume-buy: theme(colors.market.green.300);
+  --pennant-color-volume-sell: theme(colors.market.red.300);
 }

 html [data-theme='dark'] {
@@ -132,7 +132,7 @@ html [data-theme='dark'] {
  --pennant-color-depth-sell-stroke: theme(colors.market.red.DEFAULT);

  --pennant-color-volume-buy: theme(colors.market.green.600);
-  --pennant-color-volume-sell: theme(colors.market.red.DEFAULT);
+  --pennant-color-volume-sell: theme(colors.market.red.650);
 }

 /**
@@ -5,6 +5,8 @@ import type { MutableRefObject } from 'react';
 import { useRef } from 'react';
 import type { AgGridReact } from 'ag-grid-react';

+const GRID_EVENT_DEBOUNCE_TIME = 500;
+
 const gridProps = {
  rowData: [{ id: 1 }],
  columnDefs: [
@@ -16,29 +18,25 @@ const gridProps = {
  ],
  style: { width: 500, height: 300 },
 };
-const GRID_EVENT_DEBOUNCE_TIME = 300;
-let gridRef: MutableRefObject<AgGridReact | null>;
-function TestComponent({
-  hookParams,
-}: {
-  hookParams: Parameters<typeof useDataGridEvents>;
-}) {
-  const hookCallbacks = useDataGridEvents(...hookParams);
-  gridRef = useRef<AgGridReact | null>(null);
-  return <AgGridThemed gridRef={gridRef} {...gridProps} {...hookCallbacks} />;
-}

 // Not using render hook so I can pass event callbacks
 // to a rendered grid
 function setup(...args: Parameters<typeof useDataGridEvents>) {
-  return render(<TestComponent hookParams={args} />);
+  let gridRef;
+
+  function TestComponent() {
+    const hookCallbacks = useDataGridEvents(...args);
+    gridRef = useRef<AgGridReact | null>(null);
+    return <AgGridThemed gridRef={gridRef} {...gridProps} {...hookCallbacks} />;
+  }
+  render(<TestComponent />);
+  return gridRef as unknown as MutableRefObject<AgGridReact>;
 }

 describe('useDataGridEvents', () => {
  const originalWarn = console.warn;

  beforeAll(() => {
-    gridRef = undefined;
    jest.useFakeTimers();

    // disabling some ag grid warnings that are caused by test setup only
@@ -57,15 +55,15 @@ describe('useDataGridEvents', () => {
      columnState: undefined,
    };

-    setup(initialState, callback);
+    const result = setup(initialState, callback);

    // column state was not updated, so the default width provided by the
    // col def should be set
-    expect(gridRef.current?.columnApi.getColumnState()[0].width).toEqual(
+    expect(result.current.columnApi.getColumnState()[0].width).toEqual(
      gridProps.columnDefs[0].width
    );
    // no filters set
-    expect(gridRef.current?.api.getFilterModel()).toEqual({});
+    expect(result.current.api.getFilterModel()).toEqual({});

    // Set filter
    const idFilter = {
@@ -74,7 +72,7 @@ describe('useDataGridEvents', () => {
      type: 'equals',
    };
    await act(async () => {
-      gridRef.current?.api.setFilterModel({
+      result.current.api.setFilterModel({
        id: idFilter,
      });
    });
@@ -90,7 +88,7 @@ describe('useDataGridEvents', () => {
      },
    });
    callback.mockClear();
-    expect(gridRef.current?.api.getFilterModel()['id']).toEqual(idFilter);
+    expect(result.current.api.getFilterModel()['id']).toEqual(idFilter);
  });

  it('applies grid state on ready', async () => {
@@ -107,11 +105,11 @@ describe('useDataGridEvents', () => {
      columnState: [colState],
    };

-    setup(initialState, jest.fn());
+    const result = setup(initialState, jest.fn());

    await waitFor(() => {
-      expect(gridRef.current?.api.getFilterModel()['id']).toEqual(idFilter);
-      expect(gridRef.current?.columnApi.getColumnState()[0]).toEqual(
+      expect(result.current.api.getFilterModel()['id']).toEqual(idFilter);
+      expect(result.current.columnApi.getColumnState()[0]).toEqual(
        expect.objectContaining(colState)
      );
    });
@@ -124,13 +122,13 @@ describe('useDataGridEvents', () => {
      columnState: undefined,
    };

-    setup(initialState, callback);
+    const result = setup(initialState, callback);

    const newWidth = 400;

    // Set col width multiple times
    await act(async () => {
-      gridRef.current?.columnApi.setColumnWidth('id', newWidth);
+      result.current.columnApi.setColumnWidth('id', newWidth);
    });

    expect(callback).not.toHaveBeenCalled();
@@ -141,23 +139,4 @@ describe('useDataGridEvents', () => {

    expect(callback).toHaveBeenCalledTimes(0);
  });
-
-  it('columns for autosizing should be handle', () => {
-    const callback = jest.fn();
-    const initialState = {
-      filterModel: undefined,
-      columnState: undefined,
-    };
-
-    const { rerender } = setup(initialState, callback, ['id']);
-    jest.spyOn(gridRef.current?.columnApi, 'autoSizeColumns');
-    rerender(<TestComponent hookParams={[initialState, callback, ['id']]} />);
-    act(() => {
-      gridRef.current?.api.setRowData([{ id: 'test-id' }]);
-      jest.advanceTimersByTime(GRID_EVENT_DEBOUNCE_TIME);
-    });
-    expect(gridRef.current?.columnApi.autoSizeColumns).toHaveBeenCalledWith([
-      'id',
-    ]);
-  });
 });
@@ -6,7 +6,6 @@ import type {
  FilterChangedEvent,
  FirstDataRenderedEvent,
  SortChangedEvent,
-  GridReadyEvent,
 } from 'ag-grid-community';
 import { useCallback } from 'react';

@@ -18,8 +17,7 @@ type State = {

 export const useDataGridEvents = (
  state: State,
-  callback: (data: State) => void,
-  autoSizeColumns?: string[]
+  callback: (data: State) => void
 ) => {
  /**
   * Callback for filter events
@@ -80,7 +78,7 @@ export const useDataGridEvents = (
   * State only applied if found, otherwise columns sized to fit available space
   */
  const onGridReady = useCallback(
-    ({ api, columnApi }: GridReadyEvent) => {
+    ({ api, columnApi }: FirstDataRenderedEvent) => {
      if (!api || !columnApi) return;

      if (state.columnState) {
@@ -99,16 +97,6 @@ export const useDataGridEvents = (
    [state]
  );

-  const onFirstDataRendered = useCallback(
-    ({ columnApi }: FirstDataRenderedEvent) => {
-      if (!columnApi) return;
-      if (!state?.columnState && autoSizeColumns?.length) {
-        columnApi.autoSizeColumns(autoSizeColumns);
-      }
-    },
-    [state, autoSizeColumns]
-  );
-
  return {
    onGridReady,
    // these events don't use the 'finished' flag
@@ -118,6 +106,5 @@ export const useDataGridEvents = (
    // these trigger a lot so this callback uses the 'finished' flag
    onColumnMoved: onDebouncedColumnChange,
    onColumnResized: onDebouncedColumnChange,
-    onFirstDataRendered,
  };
 };
@@ -12,7 +12,6 @@ import { formatRange, formatValue } from '@vegaprotocol/utils';
 import { marketMarginDataProvider } from '@vegaprotocol/accounts';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import * as AccordionPrimitive from '@radix-ui/react-accordion';
-import * as Schema from '@vegaprotocol/types';

 import {
  MARGIN_DIFF_TOOLTIP_TEXT,
@@ -38,16 +37,14 @@ export interface DealTicketFeeDetailsProps {
  assetSymbol: string;
  order: OrderSubmissionBody['orderSubmission'];
  market: Market;
-  isMarketInAuction?: boolean;
 }

 export const DealTicketFeeDetails = ({
  assetSymbol,
  order,
  market,
-  isMarketInAuction,
 }: DealTicketFeeDetailsProps) => {
-  const feeEstimate = useEstimateFees(order, isMarketInAuction);
+  const feeEstimate = useEstimateFees(order);
  const { settlementAsset: asset } =
    market.tradableInstrument.instrument.product;
  const { decimals: assetDecimals, quantum } = asset;
@@ -67,7 +64,7 @@ export const DealTicketFeeDetails = ({
        <>
          <span>
            {t(
-              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}. Fees estimated are "taker" fees and will only be payable if the order trades aggressively. Rebate equal to the maker portion will be paid to the trader if the order trades passively.`
+              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
            )}
          </span>
          <FeesBreakdown
@@ -90,7 +87,6 @@ export interface DealTicketMarginDetailsProps {
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  assetSymbol: string;
  positionEstimate: EstimatePositionQuery['estimatePosition'];
-  side: Schema.Side;
 }

 export const DealTicketMarginDetails = ({
@@ -100,7 +96,6 @@ export const DealTicketMarginDetails = ({
  market,
  onMarketClick,
  positionEstimate,
-  side,
 }: DealTicketMarginDetailsProps) => {
  const [breakdownDialog, setBreakdownDialog] = useState(false);
  const { pubKey: partyId } = useVegaWallet();
@@ -170,7 +165,10 @@ export const DealTicketMarginDetails = ({
            : '0',
          assetDecimals
        )}
-        formattedValue={formatValue(
+        formattedValue={formatRange(
+          deductionFromCollateralBestCase > 0
+            ? deductionFromCollateralBestCase.toString()
+            : '0',
          deductionFromCollateralWorstCase > 0
            ? deductionFromCollateralWorstCase.toString()
            : '0',
@@ -189,7 +187,8 @@ export const DealTicketMarginDetails = ({
          marginEstimate?.worstCase.initialLevel,
          assetDecimals
        )}
-        formattedValue={formatValue(
+        formattedValue={formatRange(
+          marginEstimate?.bestCase.initialLevel,
          marginEstimate?.worstCase.initialLevel,
          assetDecimals,
          quantum
@@ -201,7 +200,6 @@ export const DealTicketMarginDetails = ({
  }

  let liquidationPriceEstimate = emptyValue;
-  let liquidationPriceEstimateRange = emptyValue;

  if (liquidationEstimate) {
    const liquidationEstimateBestCaseIncludingBuyOrders = BigInt(
@@ -211,7 +209,8 @@ export const DealTicketMarginDetails = ({
      liquidationEstimate.bestCase.including_sell_orders.replace(/\..*/, '')
    );
    const liquidationEstimateBestCase =
-      side === Schema.Side.SIDE_BUY
+      liquidationEstimateBestCaseIncludingBuyOrders >
+      liquidationEstimateBestCaseIncludingSellOrders
        ? liquidationEstimateBestCaseIncludingBuyOrders
        : liquidationEstimateBestCaseIncludingSellOrders;

@@ -222,19 +221,14 @@ export const DealTicketMarginDetails = ({
      liquidationEstimate.worstCase.including_sell_orders.replace(/\..*/, '')
    );
    const liquidationEstimateWorstCase =
-      side === Schema.Side.SIDE_BUY
+      liquidationEstimateWorstCaseIncludingBuyOrders >
+      liquidationEstimateWorstCaseIncludingSellOrders
        ? liquidationEstimateWorstCaseIncludingBuyOrders
        : liquidationEstimateWorstCaseIncludingSellOrders;

    // The estimate order query API gives us the liquidation price in formatted by asset decimals.
    // We need to calculate it with asset decimals, but display it with market decimals precision until the API changes.
-    liquidationPriceEstimate = formatValue(
-      liquidationEstimateWorstCase.toString(),
-      assetDecimals,
-      undefined,
-      market.decimalPlaces
-    );
-    liquidationPriceEstimateRange = formatRange(
+    liquidationPriceEstimate = formatRange(
      (liquidationEstimateBestCase < liquidationEstimateWorstCase
        ? liquidationEstimateBestCase
        : liquidationEstimateWorstCase
@@ -292,7 +286,8 @@ export const DealTicketMarginDetails = ({
                  }
                >
                  <div className="font-mono text-right">
-                    {formatValue(
+                    {formatRange(
+                      marginRequiredBestCase,
                      marginRequiredWorstCase,
                      assetDecimals,
                      quantum
@@ -350,7 +345,7 @@ export const DealTicketMarginDetails = ({
      {projectedMargin}
      <KeyValue
        label={t('Liquidation')}
-        value={liquidationPriceEstimateRange}
+        value={liquidationPriceEstimate}
        formattedValue={liquidationPriceEstimate}
        symbol={quoteName}
        labelDescription={LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT}
@@ -36,7 +36,7 @@ import {
  formatValue,
 } from '@vegaprotocol/utils';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
-import { getDerivedPrice, isMarketInAuction } from '@vegaprotocol/markets';
+import { getDerivedPrice } from '@vegaprotocol/markets';
 import {
  validateExpiration,
  validateMarketState,
@@ -182,7 +182,6 @@ export const DealTicket = ({
  const iceberg = watch('iceberg');
  const peakSize = watch('peakSize');
  const expiresAt = watch('expiresAt');
-  const postOnly = watch('postOnly');

  useEffect(() => {
    const size = storedFormValues?.[dealTicketType]?.size;
@@ -212,7 +211,6 @@ export const DealTicket = ({
      size: rawSize,
      timeInForce,
      type,
-      postOnly,
    },
    market.id,
    market.decimalPlaces,
@@ -221,7 +219,8 @@ export const DealTicket = ({

  const price =
    normalizedOrder &&
-    getDerivedPrice(normalizedOrder, marketPrice ?? undefined);
+    marketPrice &&
+    getDerivedPrice(normalizedOrder, marketPrice);

  const notionalSize = getNotionalSize(
    price,
@@ -475,7 +474,6 @@ export const DealTicket = ({
          }
          assetSymbol={assetSymbol}
          market={market}
-          isMarketInAuction={isMarketInAuction(marketData.marketTradingMode)}
        />
      </div>
      <Controller
@@ -678,7 +676,6 @@ export const DealTicket = ({
        )}
      </Button>
      <DealTicketMarginDetails
-        side={normalizedOrder.side}
        onMarketClick={onMarketClick}
        assetSymbol={assetSymbol}
        marginAccountBalance={marginAccountBalance}
@@ -1,78 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { useEstimateFees } from './use-estimate-fees';
-import { Side, OrderTimeInForce, OrderType } from '@vegaprotocol/types';
-
-import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
-
-const data: EstimateFeesQuery = {
-  estimateFees: {
-    totalFeeAmount: '12',
-    fees: {
-      infrastructureFee: '2',
-      liquidityFee: '4',
-      makerFee: '6',
-    },
-  },
-};
-
-const mockUseEstimateFeesQuery = jest.fn((...args) => ({
-  data,
-}));
-
-jest.mock('./__generated__/EstimateOrder', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useEstimateFeesQuery: jest.fn((...args) => mockUseEstimateFeesQuery(...args)),
-}));
-
-jest.mock('@vegaprotocol/wallet', () => ({
-  useVegaWallet: () => ({ pubKey: 'pubKey' }),
-}));
-
-describe('useEstimateFees', () => {
-  it('returns 0 as estimated values if order is postOnly', () => {
-    const { result } = renderHook(() =>
-      useEstimateFees({
-        marketId: 'marketId',
-        side: Side.SIDE_BUY,
-        size: '1',
-        price: '1',
-        timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-        type: OrderType.TYPE_LIMIT,
-        postOnly: true,
-      })
-    );
-    expect(result.current).toEqual({
-      totalFeeAmount: '0',
-      fees: {
-        infrastructureFee: '0',
-        liquidityFee: '0',
-        makerFee: '0',
-      },
-    });
-    expect(mockUseEstimateFeesQuery.mock.lastCall?.[0].skip).toBeTruthy();
-  });
-
-  it('divide values by 2 if market is in auction', () => {
-    const { result } = renderHook(() =>
-      useEstimateFees(
-        {
-          marketId: 'marketId',
-          side: Side.SIDE_BUY,
-          size: '1',
-          price: '1',
-          timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-          type: OrderType.TYPE_LIMIT,
-        },
-        true
-      )
-    );
-    expect(result.current).toEqual({
-      totalFeeAmount: '6',
-      fees: {
-        infrastructureFee: '1',
-        liquidityFee: '2',
-        makerFee: '3',
-      },
-    });
-  });
-});
@@ -1,16 +1,13 @@
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';

-import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
 import { useEstimateFeesQuery } from './__generated__/EstimateOrder';

-const divideByTwo = (n: string) => (BigInt(n) / BigInt(2)).toString();
-
 export const useEstimateFees = (
-  order?: OrderSubmissionBody['orderSubmission'],
-  isMarketInAuction?: boolean
-): EstimateFeesQuery['estimateFees'] | undefined => {
+  order?: OrderSubmissionBody['orderSubmission']
+) => {
  const { pubKey } = useVegaWallet();
+
  const { data } = useEstimateFeesQuery({
    variables: order && {
      marketId: order.marketId,
@@ -22,28 +19,7 @@ export const useEstimateFees = (
      type: order.type,
    },
    fetchPolicy: 'no-cache',
-    skip: !pubKey || !order?.size || !order?.price || order.postOnly,
+    skip: !pubKey || !order?.size || !order?.price,
  });
-  if (order?.postOnly) {
-    return {
-      totalFeeAmount: '0',
-      fees: {
-        infrastructureFee: '0',
-        liquidityFee: '0',
-        makerFee: '0',
-      },
-    };
-  }
-  return isMarketInAuction && data?.estimateFees
-    ? {
-        totalFeeAmount: divideByTwo(data.estimateFees.totalFeeAmount),
-        fees: {
-          infrastructureFee: divideByTwo(
-            data.estimateFees.fees.infrastructureFee
-          ),
-          liquidityFee: divideByTwo(data.estimateFees.fees.liquidityFee),
-          makerFee: divideByTwo(data.estimateFees.fees.makerFee),
-        },
-      }
-    : data?.estimateFees;
+  return data?.estimateFees;
 };
@@ -9,12 +9,14 @@ import { fillsWithMarketProvider } from './fills-data-provider';

 interface FillsManagerProps {
  partyId: string;
+  marketId?: string;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  gridProps: ReturnType<typeof useDataGridEvents>;
 }

 export const FillsManager = ({
  partyId,
+  marketId,
  onMarketClick,
  gridProps,
 }: FillsManagerProps) => {
@@ -22,6 +24,9 @@ export const FillsManager = ({
  const filter: Schema.TradesFilter | Schema.TradesSubscriptionFilter = {
    partyIds: [partyId],
  };
+  if (marketId) {
+    filter.marketIds = [marketId];
+  }
  const { data, error } = useDataProvider({
    dataProvider: fillsWithMarketProvider,
    update: ({ data }) => {
@@ -175,7 +175,7 @@ export const Orderbook = ({
  );

  return (
-    <div className="h-full text-xs grid grid-rows-[1fr_min-content] overflow-hidden">
+    <div className="h-full text-xs grid grid-rows-[1fr_min-content]">
      <div>
        <ReactVirtualizedAutoSizer>
          {({ width, height }) => {
@@ -60,7 +60,6 @@ export const FeesBreakdown = ({
    .plus(fees.infrastructureFee)
    .plus(fees.liquidityFee)
    .toString();
-  if (totalFees === '0') return null;
  const formatValue = (value: string | number | null | undefined): string => {
    return value && !isNaN(Number(value))
      ? addDecimalsFormatNumber(value, decimals)
@@ -33,7 +33,7 @@ export const getDerivedPrice = (
    type: Schema.OrderType;
    price?: string | undefined;
  },
-  marketPrice?: string
+  marketPrice: string
 ) => {
  // If order type is market we should use either the mark price
  // or the uncrossing price. If order type is limit use the price
@@ -79,7 +79,6 @@ export const OrderListTable = memo<
        () => [
          {
            headerName: t('Market'),
-            colId: 'instrument-code',
            field: 'market.tradableInstrument.instrument.code',
            cellRenderer: 'MarketNameCell',
            cellRendererParams: { idPath: 'market.id', onMarketClick },
@@ -15,7 +15,6 @@ import { useCallback, useState } from 'react';
 import type { WalletClientError } from '@vegaprotocol/wallet-client';
 import { t } from '@vegaprotocol/i18n';
 import type { Connectors, VegaConnector } from '../connectors';
-import { DEFAULT_SNAP_VERSION } from '../connectors';
 import {
  DEFAULT_SNAP_ID,
  InjectedConnector,
@@ -51,15 +50,11 @@ export type WalletType = 'injected' | 'jsonRpc' | 'view' | 'snap';
 export interface VegaConnectDialogProps {
  connectors: Connectors;
  riskMessage?: ReactNode;
-  contentOnly?: boolean;
-  onClose?: () => void;
 }

 export const VegaConnectDialog = ({
  connectors,
  riskMessage,
-  contentOnly,
-  onClose,
 }: VegaConnectDialogProps) => {
  const { disconnect, acknowledgeNeeded } = useVegaWallet();
  const vegaWalletDialogOpen = useVegaWalletDialogStore(
@@ -85,24 +80,19 @@ export const VegaConnectDialog = ({
  // This value will already be in the cache, if it failed the app wont render
  const { data } = useChainIdQuery();

-  const content = data && (
-    <ConnectDialogContainer
-      connectors={connectors}
-      appChainId={data.statistics.chainId}
-      riskMessage={riskMessage}
-      onClose={onClose}
-    />
-  );
-  if (contentOnly) {
-    return content;
-  }
  return (
    <Dialog
      open={vegaWalletDialogOpen}
      size="small"
      onChange={onVegaWalletDialogChange}
    >
-      {content}
+      {data && (
+        <ConnectDialogContainer
+          connectors={connectors}
+          appChainId={data.statistics.chainId}
+          riskMessage={riskMessage}
+        />
+      )}
    </Dialog>
  );
 };
@@ -111,20 +101,15 @@ const ConnectDialogContainer = ({
  connectors,
  appChainId,
  riskMessage,
-  onClose,
 }: {
  connectors: Connectors;
  appChainId: string;
  riskMessage?: ReactNode;
-  onClose?: () => void;
 }) => {
  const { vegaUrl, vegaWalletServiceUrl } = useVegaWallet();
-  const closeVegaWalletDialog = useVegaWalletDialogStore(
+  const closeDialog = useVegaWalletDialogStore(
    (store) => store.closeVegaWalletDialog
  );
-  const closeDialog = useCallback(() => {
-    onClose ? onClose() : closeVegaWalletDialog();
-  }, [closeVegaWalletDialog, onClose]);
  const [selectedConnector, setSelectedConnector] = useState<VegaConnector>();
  const [walletUrl, setWalletUrl] = useState(vegaWalletServiceUrl);

@@ -269,7 +254,7 @@ const ConnectorList = ({
              </>
            }
            description={t(
-              `Connect with Vega Wallet extension
+              `Connect Vega Wallet extension
              for %s to access all features including key
              management and detailed transaction views from your
              browser.`,
@@ -301,18 +286,8 @@ const ConnectorList = ({
        {connectors['snap'] !== undefined ? (
          <div>
            {snapStatus === SnapStatus.INSTALLED ? (
-              <ConnectionOptionWithDescription
+              <ConnectionOption
                type="snap"
-                title={
-                  <>
-                    <span>{t('Metamask Snap')}</span>
-                    {'  '}
-                    <span className="text-xs"> {t('quick start')}</span>
-                  </>
-                }
-                description={t(
-                  `Connect directly via Metamask with the Vega Snap for single key support without advanced features.`
-                )}
                text={
                  <>
                    <div className="flex items-center justify-center w-full h-full text-base gap-1">
@@ -340,7 +315,7 @@ const ConnectorList = ({
                    </>
                  }
                  description={t(
-                    `Install Metamask with the Vega Snap for single key support without advanced features.`
+                    `Connect directly via Metamask with the Vega Snap for single key support without advanced features.`
                  )}
                  text={
                    <>
@@ -353,9 +328,7 @@ const ConnectorList = ({
                    </>
                  }
                  onClick={() => {
-                    requestSnap(DEFAULT_SNAP_ID, {
-                      version: DEFAULT_SNAP_VERSION,
-                    });
+                    requestSnap(DEFAULT_SNAP_ID);
                  }}
                />
                {snapStatus === SnapStatus.NOT_SUPPORTED ? (
@@ -131,12 +131,7 @@ const Error = ({
  );

  if (error) {
-    if (error.message === InjectedConnectorErrors.USER_REJECTED.message) {
-      title = t('User rejected');
-      text = t('The user rejected the wallet connection');
-    } else if (
-      error.message === InjectedConnectorErrors.INVALID_CHAIN.message
-    ) {
+    if (error.message === InjectedConnectorErrors.INVALID_CHAIN.message) {
      title = t('Wrong network');
      text = t(
        'To complete your wallet connection, set your wallet network in your app to "%s".',
@@ -42,7 +42,6 @@ declare global {
 }

 export const InjectedConnectorErrors = {
-  USER_REJECTED: new Error('Connection denied'),
  VEGA_UNDEFINED: new Error('window.vega not found'),
  INVALID_CHAIN: new Error('Invalid chain'),
 };
@@ -41,7 +41,6 @@ const ethereumRequest = <T>(args: RequestArguments): Promise<T> => {

 export const LOCAL_SNAP_ID = 'local:http://localhost:8080';
 export const DEFAULT_SNAP_ID = 'npm:@vegaprotocol/snap';
-export const DEFAULT_SNAP_VERSION = '0.2.0';

 type GetSnapsResponse = Record<string, Snap>;

@@ -70,7 +70,7 @@
    "jsondiffpatch": "^0.4.1",
    "lodash": "^4.17.21",
    "next": "13.3.0",
-    "pennant": "1.13.2",
+    "pennant": "1.12.0",
    "react": "18.2.0",
    "react-copy-to-clipboard": "^5.0.4",
    "react-dom": "18.2.0",
@@ -195,6 +195,7 @@
 		"market.fee.factors.makerFee": "0.004",
 		"market.liquidity.stakeToCcyVolume": "0.3",
 		"market.liquidity.targetstake.triggering.ratio": "0.7",
+    "market.liquidity.providersFeeCalculationTimeStep": "5s",
 		"network.checkpoint.timeElapsedBetweenCheckpoints": "10s",
 		"reward.asset": "{{.GetVegaContractID "VEGA"}}",
 		"reward.staking.delegation.competitionLevel": "3.1",
@@ -20253,10 +20253,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.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.13.2.tgz#8ae0cf23ecee35a7e8baddaa9477e94006581e3b"
-  integrity sha512-gdzTUfuvR3Jse247+++mUdJJcDrExtoxljZ6TjVjnvOD7Y0Cx7yiA47VKzztcw5JmoEHbMoDeX3ySznAjIpi7Q==
+pennant@1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.12.0.tgz#e12707d5f1aac554d81bad060637e608335e0b50"
+  integrity sha512-xosg5erRf+Ke9iORdqyv+SOGcD3uJX1dgf990q1DvHuzz36w2txCZsfnvcXhRO++HYVKS9sU/YLPRLJgolFGtA==
  dependencies:
    "@babel/runtime" "^7.13.10"
    "@d3fc/d3fc-technical-indicator" "^8.0.1"
Author	SHA1	Message	Date
maciek	0f6ea3a1ab	Merge remote-tracking branch 'origin/main' into chore/4733-improve-tooltip-to-main	2023-09-26 12:07:51 +02:00
maciek	54a6ba729e	chore: remove underline from tooltip triggers	2023-09-26 10:02:56 +02:00
maciek	68bd9c4a16	chore: remove underline from tooltip	2023-09-26 10:02:30 +02:00
				`@@ -1 +0,0 @@`
				`export { ClosedMarketPage as default } from './closed-market';`