test: update test to check for top traded by default

.eslintrc.json

@@ -95,12 +95,6 @@
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
       "rules": {}
-    },
-    {
-      "files": ["*.json"],
-      "rules": {
-        "@nx/dependency-checks": "error"
-      }
     }
   ]
 }

.github/workflows/ci-cd-trigger.yml

@@ -21,6 +21,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
       - name: Cache node modules
         id: cache
         uses: actions/cache@v3
@@ -38,6 +39,7 @@ jobs:
           node-version-file: '.nvmrc'
           # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
           cache: yarn
+
       - name: yarn install
         if: steps.cache.outputs.cache-hit != 'true'
         run: yarn install --pure-lockfile
@@ -49,11 +51,11 @@ jobs:
     uses: ./.github/workflows/lint-pr.yml
     secrets: inherit
 
-  lint-format:
-    timeout-minutes: 20
+  lint-test-build:
+    timeout-minutes: 60
     needs: node-modules
     runs-on: ubuntu-22.04
-    name: '(CI) lint + format check'
+    name: '(CI) lint + unit test + build'
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -79,76 +81,6 @@ jobs:
         with:
           main-branch-name: develop
 
-      - name: Check formatting
-        run: yarn nx format:check
-
-      - name: Lint affected
-        run: yarn nx affected:lint --max-warnings=0
-
-      - name: Build affected spec
-        run: yarn nx affected --target=build-spec
-
-  test-affected:
-    timeout-minutes: 30
-    needs: build-sources
-    runs-on: ubuntu-22.04
-    name: 'run unit test of affected apps'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: develop
-
-      - name: Test affected
-        run: yarn nx affected:test
-
-  build-sources:
-    timeout-minutes: 30
-    needs: lint-format
-    runs-on: ubuntu-22.04
-    name: 'Build sources of affected apps'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: develop
-
       # See affected apps
       - name: See affected apps
         run: |
@@ -165,8 +97,21 @@ jobs:
           echo "preview_explorer: ${{ env.PREVIEW_EXPLORER }}"
           echo "preview_tools: ${{ env.PREVIEW_TOOLS }}"
 
+      - name: Check formatting
+        run: yarn nx format:check
+
+      - name: Lint affected
+        run: yarn nx affected:lint --max-warnings=0
+
+      - name: Build affected spec
+        run: yarn nx affected --target=build-spec
+
+      - name: Test affected
+        run: yarn nx affected:test
+
       - name: Build affected
         run: yarn nx affected:build || (yarn install && yarn nx affected:build)
+
     outputs:
       projects: ${{ env.PROJECTS }}
       projects-e2e: ${{ env.PROJECTS_E2E }}
@@ -176,38 +121,38 @@ jobs:
       preview_tools: ${{ env.PREVIEW_TOOLS }}
 
   console-e2e:
-    needs: build-sources
+    needs: lint-test-build
     name: '(CI) console python'
     uses: ./.github/workflows/console-test-run.yml
     secrets: inherit
-    if: ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
+    if: ${{ contains(fromJSON(needs.lint-test-build.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
     with:
       github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
   cypress:
-    needs: build-sources
+    needs: lint-test-build
     name: '(CI) cypress'
-    # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }}
+    # if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
-      projects: ${{ needs.build-sources.outputs.projects-e2e }}
+      projects: ${{ needs.lint-test-build.outputs.projects-e2e }}
       tags: '@smoke'
 
   publish-dist:
-    needs: build-sources
+    needs: lint-test-build
     name: '(CD) publish dist'
     if: ${{ (github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo') || github.event_name == 'push' }}
     uses: ./.github/workflows/publish-dist.yml
     secrets: inherit
     with:
-      projects: ${{ needs.build-sources.outputs.projects }}
+      projects: ${{ needs.lint-test-build.outputs.projects }}
 
   dist-check:
     runs-on: ubuntu-latest
     needs:
       - publish-dist
-      - build-sources
+      - lint-test-build
     if: ${{ github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo' }}
     timeout-minutes: 60
     name: '(CD) comment preview links'
@@ -223,27 +168,27 @@ jobs:
         run: |
           # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
           regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
-          if [[ "${{ needs.build-sources.outputs.preview_governance }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_governance }}"; do
-              echo "waiting for governance preview: ${{ needs.build-sources.outputs.preview_governance }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
+              echo "waiting for governance preview: ${{ needs.lint-test-build.outputs.preview_governance }}"
               sleep 5
             done
           fi
-          if [[ "${{ needs.build-sources.outputs.preview_explorer }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_explorer }}"; do
-              echo "waiting for explorer preview: ${{ needs.build-sources.outputs.preview_explorer }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
+              echo "waiting for explorer preview: ${{ needs.lint-test-build.outputs.preview_explorer }}"
               sleep 5
             done
           fi
-          if [[ "${{ needs.build-sources.outputs.preview_trading }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_trading }}"; do
-              echo "waiting for trading preview: ${{ needs.build-sources.outputs.preview_trading }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
+              echo "waiting for trading preview: ${{ needs.lint-test-build.outputs.preview_trading }}"
               sleep 5
             done
           fi
-          if [[ "${{ needs.build-sources.outputs.preview_tools }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_tools }}"; do
-              echo "waiting for tools preview: ${{ needs.build-sources.outputs.preview_tools }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
+              echo "waiting for tools preview: ${{ needs.lint-test-build.outputs.preview_tools }}"
               sleep 5
             done
           fi
@@ -255,10 +200,10 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             Previews
-            * governance: ${{ needs.build-sources.outputs.preview_governance }}
-            * explorer: ${{ needs.build-sources.outputs.preview_explorer  }}
-            * trading: ${{ needs.build-sources.outputs.preview_trading }}
-            * tools: ${{ needs.build-sources.outputs.preview_tools }}
+            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
+            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
+            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
+            * tools: ${{ needs.lint-test-build.outputs.preview_tools }}
 
   # Report single result at the end, to avoid mess with required checks in PR
   cypress-check:

.github/workflows/cypress-run.yml

@@ -37,7 +37,6 @@ jobs:
 
       # Restore node_modules from cache if possible
       - name: Restore node_modules from cache
-        id: cache-node-modules
         uses: actions/cache@v3
         with:
           path: |
@@ -47,7 +46,6 @@ jobs:
 
       # Install frontend dependencies
       - name: Install root dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile
         working-directory: frontend-monorepo
 
@@ -69,7 +67,7 @@ jobs:
       ######
 
       - name: Run Cypress tests
-        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --browser chrome --env.grepTags="${{ inputs.tags }}"
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }}  --browser chrome --env.grepTags="${{ inputs.tags }}"
         working-directory: frontend-monorepo
         env:
           CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}

.husky/commit-msg

@@ -3,3 +3,6 @@
 
 # Lint commit messages to ensure they follow conventional commit standards
 yarn commitlint --edit "${1}"
+
+# Lint all staged files
+yarn lint-staged

.husky/pre-commit

@@ -1,5 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-# Lint all staged files
-yarn lint-staged

.husky/pre-push

@@ -1,8 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-# Lint all staged files
-yarn nx format:check
-
-# Test all projects with changes
-yarn nx affected -t test --exclude trading

.nvmrc

@@ -1 +1 @@
-16.20.2
+16.15.1

apps/explorer-e2e/src/integration/oracles.cy.js

@@ -1,68 +0,0 @@
-context('Oracle page', { tags: '@smoke' }, () => {
-  describe('Verify elements on page', () => {
-    before('create market and navigate to oracle page', () => {
-      cy.createMarket();
-      cy.visit('/oracles');
-    });
-    it('should see oracle data', () => {
-      cy.getByTestId('oracle-details').should('have.length.at.least', 2);
-      cy.getByTestId('oracle-details')
-        .should('exist')
-        .eq(0)
-        .within(() => {
-          cy.get('tr')
-            .eq(0)
-            .within(() => {
-              cy.get('th').should('have.text', 'ID');
-              cy.get('a').invoke('text').should('have.length', 64);
-              cy.get('a')
-                .should('have.attr', 'href')
-                .and('contain', '/oracles/');
-            });
-          cy.get('tr')
-            .eq(1)
-            .within(() => {
-              cy.get('th').should('have.text', 'Type');
-              cy.get('td').should('have.text', 'External data');
-            });
-          cy.get('tr')
-            .eq(2)
-            .within(() => {
-              cy.get('th').should('have.text', 'Signer');
-              cy.getByTestId('keytype').should('have.text', 'Vega');
-              cy.get('a').invoke('text').should('have.length', 64);
-              cy.get('a')
-                .should('have.attr', 'href')
-                .and('contain', '/parties/');
-            });
-          cy.get('tr')
-            .eq(3)
-            .within(() => {
-              cy.get('th').should('have.text', 'Settlement for');
-              cy.get('a').invoke('text').should('have.length', 64);
-              cy.get('a')
-                .should('have.attr', 'href')
-                .and('contain', '/markets/');
-            });
-          cy.get('tr')
-            .eq(4)
-            .within(() => {
-              cy.get('th').should('have.text', 'Matched data');
-              cy.get('td').should('have.text', '❌');
-            });
-          cy.get('details')
-            .eq(0)
-            .within(() => {
-              cy.contains('Filter').click();
-              cy.get('.language-json').should('exist');
-            });
-          cy.get('details')
-            .eq(1)
-            .within(() => {
-              cy.contains('JSON').click();
-              cy.get('.language-json').should('exist');
-            });
-        });
-    });
-  });
-});

apps/explorer/src/app/routes/network-parameters/index.tsx

@@ -1,2 +1 @@
 export * from './network-parameters';
-export * from './structure-network-params';

apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx

@@ -1,105 +1,82 @@
 import { render, screen } from '@testing-library/react';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParametersTable } from './network-parameters';
-import { MemoryRouter } from 'react-router-dom';
-
-const renderComponent = (data: NetworkParamsQuery | undefined) => {
-  return render(
-    <MemoryRouter>
-      <NetworkParametersTable data={data} loading={false} />
-    </MemoryRouter>
-  );
-};
-
-const mockData = {
-  networkParametersConnection: {
-    edges: [
-      {
-        node: {
-          key: 'spam.protection.delegation.min.tokens',
-          value: '3',
-        },
-      },
-      {
-        node: {
-          key: 'spam.protection.voting.min.tokens',
-          value: '1',
-        },
-      },
-      {
-        node: {
-          key: 'reward.staking.delegation.minimumValidatorStake',
-          value: '2',
-        },
-      },
-      {
-        node: {
-          key: 'reward.asset',
-          value:
-            'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55',
-        },
-      },
-    ],
-  },
-};
 
 describe('NetworkParametersTable', () => {
-  it('renders headers correctly', () => {
-    renderComponent(mockData);
-
-    const allHeadings = screen.getAllByRole('heading');
-    expect(
-      allHeadings.map((h) => {
-        return {
-          text: h.textContent,
-          level: h.tagName,
-          testId: h.getAttribute('data-testid'),
-        };
-      })
-    ).toEqual([
-      {
-        text: 'Network Parameters',
-        level: 'H1',
-        testId: 'network-param-header',
+  it('renders correctly when it has network params', () => {
+    const data: NetworkParamsQuery = {
+      networkParametersConnection: {
+        edges: [
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.liquidityProvision.minLpStakeQuantumMultiple',
+              value: '1',
+            },
+          },
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.fee.factors.infrastructureFee',
+              value: '0.0005',
+            },
+          },
+        ],
       },
-      { text: 'Spam', level: 'H1', testId: 'spam' },
-      { text: 'Protection', level: 'H2', testId: 'spam-protection' },
-      { text: 'Delegation', level: 'H3', testId: 'spam-protection-delegation' },
-      { text: 'Min', level: 'H4', testId: 'spam-protection-delegation-min' },
-      { text: 'Voting', level: 'H3', testId: 'spam-protection-voting' },
-      { text: 'Min', level: 'H4', testId: 'spam-protection-voting-min' },
-      { text: 'Reward', level: 'H1', testId: 'reward' },
-      { text: 'Staking', level: 'H2', testId: 'reward-staking' },
-      { text: 'Delegation', level: 'H3', testId: 'reward-staking-delegation' },
-    ]);
+    };
+    render(<NetworkParametersTable data={data} loading={false} />);
+    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
+      'Network Parameters'
+    );
+    const rows = screen.getAllByTestId('key-value-table-row');
+    expect(rows[0].children[0]).toHaveTextContent(
+      'market.fee.factors.infrastructureFee'
+    );
+    expect(rows[1].children[0]).toHaveTextContent(
+      'market.liquidityProvision.minLpStakeQuantumMultiple'
+    );
+    expect(rows[0].children[1]).toHaveTextContent('0.0005');
+    expect(rows[1].children[1]).toHaveTextContent('1');
   });
 
-  it('renders network params correctly', () => {
-    renderComponent(mockData);
-
-    const delegationMinTokensRow = screen.getByTestId(
-      'spam-protection-delegation-min-tokens'
+  it('renders the rows in ascending order', () => {
+    const data: NetworkParamsQuery = {
+      networkParametersConnection: {
+        edges: [
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.fee.factors.infrastructureFee',
+              value: '0.0005',
+            },
+          },
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.liquidityProvision.minLpStakeQuantumMultiple',
+              value: '1',
+            },
+          },
+        ],
+      },
+    };
+    render(<NetworkParametersTable data={data} loading={false} />);
+    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
+      'Network Parameters'
     );
-    expect(delegationMinTokensRow).toHaveTextContent('0.000000000000000003');
-
-    const votingMinTokensRow = screen.getByTestId(
-      'spam-protection-voting-min-tokens'
+    const rows = screen.getAllByTestId('key-value-table-row');
+    expect(rows[0].children[0]).toHaveTextContent(
+      'market.fee.factors.infrastructureFee'
     );
-    expect(votingMinTokensRow).toHaveTextContent('0.000000000000000001');
-
-    const minimumValidatorStakeRow = screen.getByTestId(
-      'reward-staking-delegation-minimumValidatorStake'
-    );
-    expect(minimumValidatorStakeRow).toHaveTextContent('2');
-
-    const assetRow = screen.getByTestId('reward-asset');
-    expect(assetRow).toHaveTextContent(
-      'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55'
+    expect(rows[1].children[0]).toHaveTextContent(
+      'market.liquidityProvision.minLpStakeQuantumMultiple'
     );
+    expect(rows[0].children[1]).toHaveTextContent('0.0005');
+    expect(rows[1].children[1]).toHaveTextContent('1');
   });
 
   it('does not render rows when is loading', () => {
-    renderComponent(undefined);
+    render(<NetworkParametersTable data={undefined} loading={true} />);
     expect(screen.getByTestId('network-param-header')).toHaveTextContent(
       'Network Parameters'
     );

apps/explorer/src/app/routes/network-parameters/network-parameters.tsx

@@ -1,8 +1,6 @@
-import startCase from 'lodash/startCase';
-import classNames from 'classnames';
-import { Link } from 'react-router-dom';
 import {
   AsyncRenderer,
+  KeyValueTable,
   KeyValueTableRow,
   SyntaxHighlighter,
 } from '@vegaprotocol/ui-toolkit';
@@ -14,12 +12,11 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
+import orderBy from 'lodash/orderBy';
 import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { structureNetworkParams } from './structure-network-params';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import type { GroupedParams } from './structure-network-params';
 
 const PERCENTAGE_PARAMS = [
   'governance.proposal.asset.requiredMajority',
@@ -61,54 +58,6 @@ const BIG_NUMBER_PARAMS = [
   'governance.proposal.updateAsset.minVoterBalance',
 ];
 
-export const renderGroupedParams = (
-  group: GroupedParams,
-  level: number,
-  parentKeys: string[] = []
-) => {
-  const Header = `h${level}` as keyof JSX.IntrinsicElements;
-  const headerStyles = classNames('uppercase font-semibold', {
-    'pt-6 text-3xl underline': level === 1,
-    'pt-3 text-2xl': level === 2,
-    'pt-2 text-lg': level === 3,
-    'pt-2 text-default': level === 4,
-  });
-
-  return Object.entries(group).map(([key, value]) => {
-    const fullPath = [...parentKeys, key].join('.');
-    const isLeafNode = typeof value !== 'object';
-    const id = parentKeys.concat([key]).join('-');
-
-    return (
-      <div key={key}>
-        {!isLeafNode && (
-          <div id={id}>
-            <Link to={`#${id}`}>
-              <Header className={headerStyles} data-testid={id}>
-                {startCase(key)}
-              </Header>
-            </Link>
-          </div>
-        )}
-        {isLeafNode ? (
-          typeof value === 'string' ? (
-            <div data-testid={id}>
-              <NetworkParameterRow
-                key={fullPath}
-                row={{ key: fullPath, value: value }}
-              />
-            </div>
-          ) : null
-        ) : (
-          <div className="pb-1">
-            {renderGroupedParams(value, level + 1, [...parentKeys, key])}
-          </div>
-        )}
-      </div>
-    );
-  });
-};
-
 export const NetworkParameterRow = ({
   row: { key, value },
 }: {
@@ -128,9 +77,7 @@ export const NetworkParameterRow = ({
     >
       {key}
       {isSyntaxRow ? (
-        <div className="pb-2">
-          <SyntaxHighlighter data={JSON.parse(value)} />
-        </div>
+        <SyntaxHighlighter data={JSON.parse(value)} />
       ) : isNaN(Number(value)) ? (
         value
       ) : BIG_NUMBER_PARAMS.includes(key) ? (
@@ -166,12 +113,17 @@ export const NetworkParametersTable = ({
       loading={loading}
       error={error}
       render={(data) => {
-        const flatParams = removePaginationWrapper(
-          data.networkParametersConnection.edges
+        const ascParams = orderBy(
+          removePaginationWrapper(data.networkParametersConnection.edges),
+          (param) => param.key,
+          'asc'
         );
-        const groupedParams = structureNetworkParams(flatParams);
         return (
-          <div className="-mt-6">{renderGroupedParams(groupedParams, 1)}</div>
+          <KeyValueTable data-testid="parameters">
+            {(ascParams || []).map((row) => (
+              <NetworkParameterRow key={row.key} row={row} />
+            ))}
+          </KeyValueTable>
         );
       }}
     />

apps/explorer/src/app/routes/network-parameters/structure-network-params.spec.tsx

@@ -1,109 +0,0 @@
-import type { GroupedParams } from './structure-network-params';
-import {
-  structureParams,
-  sortGroupedParams,
-  structureNetworkParams,
-} from './structure-network-params';
-
-describe('structureParams', () => {
-  it('should correctly structure params', () => {
-    const input = [
-      { key: 'spam.protection.delegation.min.tokens', value: '10' },
-      { key: 'spam.protection.voting.min.tokens', value: '5' },
-    ];
-    const output: GroupedParams = {
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-          voting: {
-            min: {
-              tokens: '5',
-            },
-          },
-        },
-      },
-    };
-    expect(structureParams(input)).toEqual(output);
-  });
-
-  it('should handle top-level keys correctly', () => {
-    const input = [{ key: 'levelOne', value: '10' }];
-    const output = {
-      levelOne: '10',
-    };
-    expect(structureParams(input)).toEqual(output);
-  });
-});
-
-describe('sortGroupedParams', () => {
-  it('should correctly sort grouped params', () => {
-    const input: GroupedParams = {
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-        },
-      },
-      reward: '50',
-    };
-    const output: GroupedParams = {
-      reward: '50',
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-        },
-      },
-    };
-    expect(sortGroupedParams(input)).toEqual(output);
-  });
-
-  it('should handle already sorted keys', () => {
-    const input = {
-      a: '10',
-      b: {
-        c: '5',
-        d: '6',
-      },
-    };
-    expect(sortGroupedParams(input)).toEqual(input);
-  });
-});
-
-describe('structureNetworkParams', () => {
-  it('should structure and sort network params correctly', () => {
-    const input = [
-      { key: 'spam.protection.delegation.min.tokens', value: '10' },
-      { key: 'reward.asset', value: '50' },
-    ];
-    const output: GroupedParams = {
-      reward: {
-        asset: '50',
-      },
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-        },
-      },
-    };
-    expect(structureNetworkParams(input)).toEqual(output);
-  });
-
-  it('should return an empty object if no params are provided', () => {
-    expect(structureNetworkParams([])).toEqual({});
-  });
-});

apps/explorer/src/app/routes/network-parameters/structure-network-params.tsx

@@ -1,107 +0,0 @@
-/**
- * Categorizes and sorts an array of key-value pairs of network params into a nested object structure.
- *
- * The function takes an array of network params where keys are dot-delimited
- * strings representing nested categories (e.g., 'spam.protection.delegation.min.tokens').
- *
- * Why this is necessary:
- * A flat key-value structure wouldn't provide the hierarchical information needed.
- * Organizing network parameters like this allows the rendering of nested headers
- * and their corresponding network params.
- *
- * It also ensures that items with the minimum amount of nesting are ordered first. This
- * allows us to render these items first, before more deeply nested items are rendered with
- * subheaders. This creates a more intuitive UI.
- *
- * For example, given the input:
- * [
- *   { key: 'spam.protection.delegation.min.tokens', value: '10' },
- *   { key: 'spam.protection.voting.min.tokens', value: '5' },
- *   { key: 'reward.staking.delegation.minimumValidatorStake', value: '2' }
- *   { key: 'reward.asset', value: 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55' }
- * ]
- *
- * The output will be:
- * {
- *   spam: {
- *     protection: {
- *       delegation: {
- *         min: {
- *           tokens: '10'
- *         }
- *       },
- *       voting: {
- *         min: {
- *           tokens: '5'
- *         }
- *       }
- *     }
- *   },
- *   reward: {
- *     asset: 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55',
- *     staking: {
- *       delegation: {
- *         minimumValidatorStake: '2'
- *       }
- *     }
- *   }
- * }
- *
- * @param {Array} params - An array of key-value pairs to categorize and sort.
- * @returns {GroupedParams} - A nested object that groups the key-value pairs.
- */
-
-export type GroupedParams = {
-  [key: string]: string | GroupedParams;
-};
-
-export const structureParams = (
-  params: { key: string; value: string }[]
-): GroupedParams => {
-  const grouped: GroupedParams = {};
-
-  params.forEach(({ key, value }) => {
-    const parts = key.split('.');
-    let node: GroupedParams = grouped;
-
-    parts.forEach((part, i) => {
-      if (typeof node[part] === 'undefined') {
-        node[part] = i === parts.length - 1 ? value : {};
-      }
-
-      if (typeof node[part] === 'object') {
-        node = node[part] as GroupedParams;
-      }
-    });
-  });
-
-  return grouped;
-};
-
-export const sortGroupedParams = (
-  groupedParams: GroupedParams
-): GroupedParams => {
-  const sorted: GroupedParams = {};
-
-  // Sort top-level keys first
-  Object.entries(groupedParams).forEach(([key, value]) => {
-    if (typeof value === 'string') {
-      sorted[key] = value;
-    }
-  });
-
-  Object.entries(groupedParams).forEach(([key, value]) => {
-    if (typeof value === 'object') {
-      sorted[key] = sortGroupedParams(value);
-    }
-  });
-
-  return sorted;
-};
-
-export const structureNetworkParams = (
-  params: { key: string; value: string }[]
-) => {
-  const grouped = structureParams(params);
-  return sortGroupedParams(grouped);
-};

apps/explorer/src/app/routes/oracles/home/index.tsx

@@ -38,12 +38,7 @@ const Oracles = () => {
               const dataConnection = o?.node.dataConnection;
 
               return (
-                <div
-                  id={id}
-                  key={id}
-                  className="mb-10"
-                  data-testid="oracle-details"
-                >
+                <div id={id} key={id} className="mb-10">
                   <OracleDetails
                     id={id}
                     dataSource={o?.node}

apps/governance-e2e/src/integration/view/proposal.cy.ts

@@ -183,7 +183,7 @@ context(
         .first()
         .find('[data-testid="view-proposal-btn"]')
         .click();
-      cy.url().should('contain', '/protocol-upgrades/v1/2015942');
+      cy.url().should('contain', '/protocol-upgrades/v1');
       cy.getByTestId('protocol-upgrade-proposal').within(() => {
         cy.get('h1').should('have.text', 'Vega Release v1');
         cy.getByTestId('protocol-upgrade-block-height').should(
@@ -243,7 +243,7 @@ context(
           );
         cy.getByTestId('external-link')
           .should('have.attr', 'href')
-          .and('contain', '/proposals/protocol-upgrade/v1/2015942');
+          .and('contain', '/proposals/protocol-upgrade/v1');
       });
 
       // estimate does not display possibly due to mocks or Cypress unless the proposal is clicked on several times

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

@@ -54,7 +54,7 @@ export const WalletCardRow = ({
 }) => {
   const ref = React.useRef<HTMLDivElement | null>(null);
   useAnimateValue(ref, value);
-  const [integers, decimalsPlaces, separator] = useNumberParts(value, decimals);
+  const [integers, decimalsPlaces] = useNumberParts(value, decimals);
 
   return (
     <div
@@ -75,10 +75,7 @@ export const WalletCardRow = ({
           className="font-mono flex-1 text-right"
           data-testid="associated-amount"
         >
-          <span>
-            {integers}
-            {separator}
-          </span>
+          <span>{integers}.</span>
           <span>{decimalsPlaces}</span>
         </span>
       )}
@@ -113,10 +110,7 @@ export const WalletCardAsset = ({
   border,
   subheading,
 }: WalletCardAssetProps) => {
-  const [integers, decimalsPlaces, separator] = useNumberParts(
-    balance,
-    decimals
-  );
+  const [integers, decimalsPlaces] = useNumberParts(balance, decimals);
 
   return (
     <div className="flex flex-nowrap mt-2 mb-4">
@@ -138,10 +132,7 @@ export const WalletCardAsset = ({
           </div>
         </div>
         <div className="px-2 basis-full font-mono" data-testid="currency-value">
-          <span>
-            {integers}
-            {separator}
-          </span>
+          <span>{integers}.</span>
           <span className="text-neutral-400">{decimalsPlaces}</span>
         </div>
       </div>

apps/governance/src/i18n/translations/dev.json

@@ -201,8 +201,6 @@
   "STATE_WAITING_FOR_NODE_VOTE": "Waiting for node vote",
   "UpdateNetworkParameter": "Network parameter",
   "NewFreeform": "Freeform",
-  "setToPass": "Set to pass",
-  "setToFail": "Set to fail",
   "tokenVotes": "Token votes",
   "liquidityVotes": "Liquidity votes",
   "castYourVote": "Cast your vote",
@@ -211,23 +209,13 @@
   "against": "Against",
   "majorityRequired": "Majority Required",
   "participation": "Participation",
-  "majorityThreshold": "majority threshold",
-  "participationThreshold": "participation threshold",
-  "met": "met",
-  "notMet": "not met",
+  "met": "Met",
+  "notMet": "Not Met",
   "governanceRequired": "Required",
   "daysLeft": "{{daysLeft}} left to vote.",
   "toVote": "to vote",
   "voteFor": "Vote for",
   "voteAgainst": "Vote against",
-  "tokenVote": "Token vote",
-  "tokenVotesFor": "Token votes for",
-  "tokenVotesAgainst": "Token votes against",
-  "totalTokensVoted": "Total tokens voted",
-  "liquidityProviderVote": "Liquidity provider vote",
-  "liquidityProviderVotesFor": "LP votes for",
-  "liquidityProviderVotesAgainst": "LP votes against",
-  "totalLiquidityProviderTokensVoted": "Total LP tokens voted",
   "votingThresholdInfo": "If the token vote passes the participation threshold it will be the deciding vote. If not, the outcome will be determined by liquidity providers on this market.",
   "noGovernanceTokens": "You need some VEGA tokens to participate in governance",
   "youVoted": "You voted",
@@ -474,7 +462,7 @@
   "rewardsColLiquidityProvisionHeader": "LIQUIDITY PROVISION",
   "rewardsColLiquidityProvisionTooltip": "Liquidity provision rewards are distributed based on how much you have earned in liquidity fees, funded by a liquidity reward pool for that market",
   "rewardsColMarketCreationHeader": "MARKET CREATION",
-  "rewardsColMarketCreationTooltip": "Market creation rewards are paid out to the creator of any market that exceeds a set threshold of cumulative volume in a given epoch, currently {{marketCreationQuantumMultiple}}",
+  "rewardsColMarketCreationTooltip": "Market creation rewards are paid out to the creator of any market that exceeds a set threshold of cumulative volume in a given epoch, currently [rewards.marketCreationQuantumMultiple]",
   "rewardsColTotalHeader": "TOTAL",
   "ofTotalDistributed": "of total distributed",
   "checkBackSoon": "Check back soon",

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

@@ -31,6 +31,10 @@ import {
   orderByDate,
   orderByUpgradeBlockHeight,
 } from '../proposals/components/proposals-list/proposals-list';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { BigNumber } from '../../lib/bignumber';
 
 const nodesToShow = 6;
@@ -43,34 +47,57 @@ const HomeProposals = ({
   protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
   const { t } = useTranslation();
+  const {
+    params: networkParams,
+    loading: networkParamsLoading,
+    error: networkParamsError,
+  } = useNetworkParams([
+    NetworkParams.governance_proposal_market_requiredMajority,
+    NetworkParams.governance_proposal_updateMarket_requiredMajority,
+    NetworkParams.governance_proposal_updateMarket_requiredMajorityLP,
+    NetworkParams.governance_proposal_asset_requiredMajority,
+    NetworkParams.governance_proposal_updateAsset_requiredMajority,
+    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
+    NetworkParams.governance_proposal_freeform_requiredMajority,
+  ]);
 
   return (
-    <section className="mb-16" data-testid="home-proposals">
-      <Heading title={t('vegaGovernance')} />
-      <h3 className="mb-6">{t('homeProposalsIntro')}</h3>
-      <div className="mb-8">
-        <ExternalLink href={ExternalLinks.GOVERNANCE_PAGE}>
-          {t(`readMoreGovernance`)}
-        </ExternalLink>
-      </div>
+    <AsyncRenderer
+      loading={networkParamsLoading}
+      error={networkParamsError}
+      data={networkParams}
+    >
+      <section className="mb-16" data-testid="home-proposals">
+        <Heading title={t('vegaGovernance')} />
+        <h3 className="mb-6">{t('homeProposalsIntro')}</h3>
+        <div className="mb-8">
+          <ExternalLink href={ExternalLinks.GOVERNANCE_PAGE}>
+            {t(`readMoreGovernance`)}
+          </ExternalLink>
+        </div>
 
-      <SubHeading title={t('latestProposals')} />
-      <ul data-testid="home-proposal-list" className="grid gap-6">
-        {protocolUpgradeProposals.map((proposal, index) => (
-          <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
-        ))}
+        <SubHeading title={t('latestProposals')} />
+        <ul data-testid="home-proposal-list" className="grid gap-6">
+          {protocolUpgradeProposals.map((proposal, index) => (
+            <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
+          ))}
 
-        {proposals.map((proposal) => (
-          <ProposalsListItem key={proposal.id} proposal={proposal} />
-        ))}
-      </ul>
+          {proposals.map((proposal) => (
+            <ProposalsListItem
+              key={proposal.id}
+              proposal={proposal}
+              networkParams={networkParams}
+            />
+          ))}
+        </ul>
 
-      <div className="mt-6">
-        <Link to={`${Routes.PROPOSALS}`}>
-          <Button size="md">{t('homeProposalsButtonText')}</Button>
-        </Link>
-      </div>
-    </section>
+        <div className="mt-6">
+          <Link to={`${Routes.PROPOSALS}`}>
+            <Button size="md">{t('homeProposalsButtonText')}</Button>
+          </Link>
+        </div>
+      </section>
+    </AsyncRenderer>
   );
 };
 

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

@@ -16,6 +16,7 @@ import { ProposalHeader } from './proposal-header';
 import {
   lastWeek,
   nextWeek,
+  mockNetworkParams,
   mockWalletContext,
   createUserVoteQueryMock,
 } from '../../test-helpers/mocks';
@@ -47,6 +48,7 @@ const renderComponent = (
             <ProposalHeader
               proposal={proposal}
               isListItem={isListItem}
+              networkParams={mockNetworkParams}
               voteState={voteState}
             />
           </VegaWalletContext.Provider>

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

@@ -8,19 +8,22 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
+import { ProposalVotingStatus } from '../proposal-voting-status';
+import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
 import { FLAGS } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
 import type { VoteState } from '../vote-details/use-user-vote';
-import { VoteBreakdown } from '../vote-breakdown';
 
 export const ProposalHeader = ({
   proposal,
+  networkParams,
   isListItem = true,
   voteState,
 }: {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  networkParams: Partial<NetworkParamsResult>;
   isListItem?: boolean;
   voteState?: VoteState | null;
 }) => {
@@ -143,7 +146,7 @@ export const ProposalHeader = ({
               className="flex items-center gap-2"
               data-testid={`user-voted-${voteState.toLowerCase()}`}
             >
-              <div data-testid="you-voted-icon">
+              <div className="text-vega-green" data-testid="you-voted-icon">
                 <VegaIcon name={VegaIconNames.VOTE} size={24} />
               </div>
               <div>
@@ -182,7 +185,7 @@ export const ProposalHeader = ({
         </div>
       )}
 
-      <VoteBreakdown proposal={proposal} />
+      <ProposalVotingStatus proposal={proposal} networkParams={networkParams} />
     </>
   );
 };

apps/governance/src/routes/proposals/components/proposal-votes-table/index.tsx

@@ -0,0 +1 @@
+export { ProposalVotesTable } from './proposal-votes-table';

apps/governance/src/routes/proposals/components/proposal-votes-table/proposal-votes-table.spec.tsx

@@ -0,0 +1,119 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
+import { ProposalVotesTable } from './proposal-votes-table';
+import { ProposalType } from '../proposal/proposal';
+import {
+  generateNoVotes,
+  generateProposal,
+  generateYesVotes,
+} from '../../test-helpers/generate-proposals';
+
+const defaultProposal = generateProposal();
+const defaultProposalType = ProposalType.PROPOSAL_NETWORK_PARAMETER;
+const updateMarketProposal = generateProposal({
+  terms: {
+    change: {
+      __typename: 'UpdateMarket',
+      marketId: '12345',
+    },
+  },
+  votes: {
+    __typename: 'ProposalVotes',
+    yes: generateYesVotes(10),
+    no: generateNoVotes(0),
+  },
+});
+const updateMarketProposalType = ProposalType.PROPOSAL_UPDATE_MARKET;
+
+const renderComponent = (
+  proposal = defaultProposal,
+  proposalType = defaultProposalType
+) =>
+  render(
+    <MockedProvider>
+      <AppStateProvider>
+        <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
+      </AppStateProvider>
+    </MockedProvider>
+  );
+
+describe('Proposal Votes Table', () => {
+  it('should render successfully', () => {
+    const { baseElement } = renderComponent();
+    expect(baseElement).toBeTruthy();
+  });
+
+  it('should show vote breakdown fields, excluding custom update market fields', () => {
+    renderComponent();
+    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
+    expect(screen.getByText('Expected to pass')).toBeInTheDocument();
+    expect(screen.getByText('Token majority met')).toBeInTheDocument();
+    expect(screen.getByText('Token participation met')).toBeInTheDocument();
+    expect(screen.getByText('Tokens for proposal')).toBeInTheDocument();
+    expect(screen.getByText('Total Supply')).toBeInTheDocument();
+    expect(screen.getByText('Tokens against proposal')).toBeInTheDocument();
+    expect(screen.getByText('Participation required')).toBeInTheDocument();
+    expect(screen.getByText('Majority Required')).toBeInTheDocument();
+    expect(screen.getByText('Number of voting parties')).toBeInTheDocument();
+    expect(screen.getByText('Total tokens voted')).toBeInTheDocument();
+    expect(
+      screen.getByText('Total tokens voted percentage')
+    ).toBeInTheDocument();
+    expect(screen.getByText('Number of votes for')).toBeInTheDocument();
+    expect(screen.getByText('Number of votes against')).toBeInTheDocument();
+    expect(screen.getByText('Yes percentage')).toBeInTheDocument();
+    expect(screen.getByText('No percentage')).toBeInTheDocument();
+    expect(screen.queryByText('Liquidity majority met')).toBeNull();
+    expect(screen.queryByText('Liquidity participation met')).toBeNull();
+    expect(screen.queryByText('Liquidity shares for proposal')).toBeNull();
+  });
+
+  it('displays different breakdown fields for update market proposal', () => {
+    renderComponent(updateMarketProposal, updateMarketProposalType);
+    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
+    expect(screen.getByText('Liquidity majority met')).toBeInTheDocument();
+    expect(screen.getByText('Liquidity participation met')).toBeInTheDocument();
+    expect(
+      screen.getByText('Liquidity shares for proposal')
+    ).toBeInTheDocument();
+    expect(screen.queryByText('Number of voting parties')).toBeNull();
+    expect(screen.queryByText('Total tokens voted')).toBeNull();
+    expect(screen.queryByText('Total tokens voted percentage')).toBeNull();
+    expect(screen.queryByText('Number of votes for')).toBeNull();
+    expect(screen.queryByText('Number of votes against')).toBeNull();
+    expect(screen.queryByText('Yes percentage')).toBeNull();
+    expect(screen.queryByText('No percentage')).toBeNull();
+  });
+
+  it('displays if an update market proposal will pass by token vote', () => {
+    renderComponent(updateMarketProposal, updateMarketProposalType);
+    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
+    expect(screen.getByText('👍 by token vote')).toBeInTheDocument();
+  });
+
+  it('displays if an update market proposal will pass by LP vote', () => {
+    renderComponent(
+      generateProposal({
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+            marketId: '12345',
+          },
+        },
+        votes: {
+          __typename: 'ProposalVotes',
+          yes: {
+            ...generateYesVotes(0, 1, '10'),
+          },
+          no: {
+            ...generateNoVotes(0, 1, '0'),
+          },
+        },
+      }),
+      updateMarketProposalType
+    );
+    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
+    expect(screen.getByText('👍 by liquidity vote')).toBeInTheDocument();
+  });
+});

apps/governance/src/routes/proposals/components/proposal-votes-table/proposal-votes-table.tsx

@@ -0,0 +1,177 @@
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  KeyValueTable,
+  KeyValueTableRow,
+  Thumbs,
+  RoundedWrapper,
+} from '@vegaprotocol/ui-toolkit';
+import { formatNumber, formatNumberPercentage } from '@vegaprotocol/utils';
+import { SubHeading } from '../../../../components/heading';
+import { useVoteInformation } from '../../hooks';
+import { useAppState } from '../../../../contexts/app-state/app-state-context';
+import { ProposalType } from '../proposal/proposal';
+import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+
+interface ProposalVotesTableProps {
+  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposalType: ProposalType | null;
+}
+
+export const ProposalVotesTable = ({
+  proposal,
+  proposalType,
+}: ProposalVotesTableProps) => {
+  const { t } = useTranslation();
+  const {
+    appState: { totalSupply },
+  } = useAppState();
+  const [showDetails, setShowDetails] = useState(false);
+  const {
+    willPassByTokenVote,
+    willPassByLPVote,
+    totalTokensPercentage,
+    participationMet,
+    participationLPMet,
+    totalTokensVoted,
+    noPercentage,
+    yesPercentage,
+    noTokens,
+    yesTokens,
+    yesEquityLikeShareWeight,
+    yesVotes,
+    noVotes,
+    totalVotes,
+    requiredMajorityPercentage,
+    requiredParticipation,
+    majorityMet,
+    majorityLPMet,
+  } = useVoteInformation({ proposal });
+
+  const isUpdateMarket = proposalType === ProposalType.PROPOSAL_UPDATE_MARKET;
+  const updateMarketWillPass = willPassByTokenVote || willPassByLPVote;
+  const updateMarketVotePassMethod = willPassByTokenVote
+    ? t('byTokenVote')
+    : t('byLiquidityVote');
+
+  return (
+    <>
+      <CollapsibleToggle
+        toggleState={showDetails}
+        setToggleState={setShowDetails}
+        dataTestId="vote-breakdown-toggle"
+      >
+        <SubHeading title={t('voteBreakdown')} />
+      </CollapsibleToggle>
+
+      {showDetails && (
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable
+            data-testid="proposal-votes-table"
+            numerical={true}
+            headingLevel={4}
+          >
+            <KeyValueTableRow>
+              {t('expectedToPass')}
+              {isUpdateMarket ? (
+                updateMarketWillPass ? (
+                  <Thumbs up={true} text={updateMarketVotePassMethod} />
+                ) : (
+                  <Thumbs up={false} />
+                )
+              ) : willPassByTokenVote ? (
+                <Thumbs up={true} />
+              ) : (
+                <Thumbs up={false} />
+              )}
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              {t('majorityMet')}
+              {majorityMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+            </KeyValueTableRow>
+            {isUpdateMarket && (
+              <KeyValueTableRow>
+                {t('majorityLPMet')}
+                {majorityLPMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+              </KeyValueTableRow>
+            )}
+            <KeyValueTableRow>
+              {t('participationMet')}
+              {participationMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+            </KeyValueTableRow>
+            {isUpdateMarket && (
+              <KeyValueTableRow>
+                {t('participationLPMet')}
+                {participationLPMet ? (
+                  <Thumbs up={true} />
+                ) : (
+                  <Thumbs up={false} />
+                )}
+              </KeyValueTableRow>
+            )}
+            <KeyValueTableRow>
+              {t('tokenForProposal')}
+              {formatNumber(yesTokens, 2)}
+            </KeyValueTableRow>
+            {isUpdateMarket && (
+              <KeyValueTableRow>
+                {t('tokenLPForProposal')}
+                {formatNumber(yesEquityLikeShareWeight, 2)}
+              </KeyValueTableRow>
+            )}
+            <KeyValueTableRow>
+              {t('totalSupply')}
+              {formatNumber(totalSupply, 2)}
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              {t('tokensAgainstProposal')}
+              {formatNumber(noTokens, 2)}
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              {t('participationRequired')}
+              {formatNumberPercentage(requiredParticipation)}
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              {t('majorityRequired')}
+              {formatNumberPercentage(requiredMajorityPercentage)}
+            </KeyValueTableRow>
+            {!isUpdateMarket && (
+              <>
+                <KeyValueTableRow>
+                  {t('numberOfVotingParties')}
+                  {formatNumber(totalVotes, 0)}
+                </KeyValueTableRow>
+                <KeyValueTableRow>
+                  {t('totalTokensVotes')}
+                  {formatNumber(totalTokensVoted, 2)}
+                </KeyValueTableRow>
+                <KeyValueTableRow>
+                  {t('totalTokenVotedPercentage')}
+                  {formatNumberPercentage(totalTokensPercentage, 2)}
+                </KeyValueTableRow>
+                <KeyValueTableRow>
+                  {t('numberOfForVotes')}
+                  {formatNumber(yesVotes, 0)}
+                </KeyValueTableRow>
+                <KeyValueTableRow>
+                  {t('numberOfAgainstVotes')}
+                  {formatNumber(noVotes, 0)}
+                </KeyValueTableRow>
+                <KeyValueTableRow>
+                  {t('yesPercentage')}
+                  {formatNumberPercentage(yesPercentage, 2)}
+                </KeyValueTableRow>
+                <KeyValueTableRow noBorder={true}>
+                  {t('noPercentage')}
+                  {formatNumberPercentage(noPercentage, 2)}
+                </KeyValueTableRow>
+              </>
+            )}
+          </KeyValueTable>
+        </RoundedWrapper>
+      )}
+    </>
+  );
+};

apps/governance/src/routes/proposals/components/proposal-voting-status/index.tsx

@@ -0,0 +1 @@
+export * from './proposal-voting-status';

apps/governance/src/routes/proposals/components/proposal-voting-status/proposal-voting-status.spec.tsx

@@ -0,0 +1,153 @@
+import { render, screen } from '@testing-library/react';
+import { BrowserRouter as Router } from 'react-router-dom';
+import { MockedProvider } from '@apollo/client/testing';
+import { VegaWalletContext } from '@vegaprotocol/wallet';
+import {
+  lastWeek,
+  mockWalletContext,
+  networkParamsQueryMock,
+  nextWeek,
+  mockNetworkParams,
+} from '../../test-helpers/mocks';
+import { ProposalVotingStatus } from './proposal-voting-status';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { MockedResponse } from '@apollo/client/testing';
+import {
+  generateNoVotes,
+  generateProposal,
+  generateYesVotes,
+} from '../../test-helpers/generate-proposals';
+import { ProposalState } from '@vegaprotocol/types';
+import { BigNumber } from '../../../../lib/bignumber';
+import type { AppState } from '../../../../contexts/app-state/app-state-context';
+
+const mockTotalSupply = new BigNumber(100);
+// Note - giving a fixedTokenValue of 1 means a ratio of 1:1 votes to tokens, making sums easier :)
+const fixedTokenValue = 1000000000000000000;
+
+const mockAppState: AppState = {
+  totalAssociated: new BigNumber('50063005'),
+  decimals: 18,
+  totalSupply: mockTotalSupply,
+  vegaWalletManageOverlay: false,
+  transactionOverlay: false,
+  bannerMessage: '',
+  disconnectNotice: false,
+};
+
+jest.mock('../../../../contexts/app-state/app-state-context', () => ({
+  useAppState: () => ({
+    appState: mockAppState,
+  }),
+}));
+
+const renderComponent = (
+  proposal: ProposalQuery['proposal'],
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  mocks: MockedResponse<any>[] = [networkParamsQueryMock]
+) =>
+  render(
+    <Router>
+      <MockedProvider mocks={mocks}>
+        <VegaWalletContext.Provider value={mockWalletContext}>
+          <ProposalVotingStatus
+            proposal={proposal}
+            networkParams={mockNetworkParams}
+          />
+        </VegaWalletContext.Provider>
+      </MockedProvider>
+    </Router>
+  );
+
+describe('ProposalVotingStatus', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+    jest.setSystemTime(0);
+  });
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('Renders majority reached', () => {
+    const yesVotes = 100;
+    const noVotes = 0;
+
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_PASSED,
+        terms: {
+          closingDatetime: lastWeek.toString(),
+          enactmentDatetime: nextWeek.toString(),
+        },
+        votes: {
+          __typename: 'ProposalVotes',
+          yes: generateYesVotes(yesVotes, fixedTokenValue),
+          no: generateNoVotes(noVotes, fixedTokenValue),
+        },
+      })
+    );
+    expect(screen.getByTestId('majority-reached')).toBeInTheDocument();
+  });
+
+  it('Renders majority not reached', () => {
+    const yesVotes = 20;
+    const noVotes = 80;
+
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_PASSED,
+        terms: {
+          closingDatetime: lastWeek.toString(),
+          enactmentDatetime: nextWeek.toString(),
+        },
+        votes: {
+          __typename: 'ProposalVotes',
+          yes: generateYesVotes(yesVotes, fixedTokenValue),
+          no: generateNoVotes(noVotes, fixedTokenValue),
+        },
+      })
+    );
+    expect(screen.getByTestId('majority-not-reached')).toBeInTheDocument();
+  });
+
+  it('Renders participation reached', () => {
+    const yesVotes = 1000;
+    const noVotes = 0;
+
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_PASSED,
+        terms: {
+          closingDatetime: lastWeek.toString(),
+          enactmentDatetime: nextWeek.toString(),
+        },
+        votes: {
+          __typename: 'ProposalVotes',
+          yes: generateYesVotes(yesVotes, fixedTokenValue),
+          no: generateNoVotes(noVotes, fixedTokenValue),
+        },
+      })
+    );
+    expect(screen.getByTestId('participation-reached')).toBeInTheDocument();
+  });
+
+  it('Renders participation not reached', () => {
+    const yesVotes = 0;
+    const noVotes = 0;
+
+    renderComponent(
+      generateProposal({
+        terms: {
+          closingDatetime: lastWeek.toString(),
+          enactmentDatetime: nextWeek.toString(),
+        },
+        votes: {
+          __typename: 'ProposalVotes',
+          yes: generateYesVotes(yesVotes, fixedTokenValue),
+          no: generateNoVotes(noVotes, fixedTokenValue),
+        },
+      })
+    );
+    expect(screen.getByTestId('participation-not-reached')).toBeInTheDocument();
+  });
+});

apps/governance/src/routes/proposals/components/proposal-voting-status/proposal-voting-status.tsx

@@ -0,0 +1,174 @@
+import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
+import { Icon } from '@vegaprotocol/ui-toolkit';
+import { useVoteInformation } from '../../hooks';
+import { BigNumber } from '../../../../lib/bignumber';
+import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+
+const statusClasses = (reached: boolean) =>
+  classNames('flex items-center gap-2 px-4 py-2 rounded-md', {
+    'bg-vega-green-700': reached,
+    'bg-vega-red-700': !reached,
+  });
+
+const MajorityStatus = ({
+  reached,
+  requiredMajority,
+}: {
+  reached: boolean;
+  requiredMajority: string | null | undefined;
+}) => {
+  const { t } = useTranslation();
+
+  return (
+    <div
+      className={statusClasses(reached)}
+      data-testid="proposal-majority-status"
+    >
+      {reached ? <Icon name="tick" /> : <Icon name="cross" />}
+      {reached ? (
+        <div data-testid="majority-reached">
+          {requiredMajority ? (
+            <>
+              {new BigNumber(requiredMajority).times(100).toString()}%{' '}
+              {t('majorityVotedForProposal')}
+            </>
+          ) : (
+            t('requiredMajorityVotedForProposal')
+          )}
+        </div>
+      ) : (
+        <div data-testid="majority-not-reached">
+          {requiredMajority ? (
+            <>
+              {new BigNumber(requiredMajority).times(100).toString()}%{' '}
+              {t('majorityNotVotedForProposal')}
+            </>
+          ) : (
+            t('requiredMajorityNotVotedForProposal')
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
+
+const ParticipationStatus = ({ reached }: { reached: boolean }) => {
+  const { t } = useTranslation();
+
+  return (
+    <div className={statusClasses(reached)}>
+      {reached ? (
+        <>
+          <Icon name="tick" />
+          <div data-testid="participation-reached">
+            {t('minParticipationReached')}
+          </div>
+        </>
+      ) : (
+        <>
+          <Icon name="cross" />
+          <div data-testid="participation-not-reached">
+            {t('minParticipationNotReached')}
+          </div>
+        </>
+      )}
+    </div>
+  );
+};
+
+export const ProposalVotingStatus = ({
+  proposal,
+  networkParams,
+}: {
+  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  networkParams: Partial<NetworkParamsResult>;
+}) => {
+  const { t } = useTranslation();
+  const { majorityMet, majorityLPMet, participationMet, participationLPMet } =
+    useVoteInformation({
+      proposal,
+    });
+
+  if (!proposal) {
+    return null;
+  }
+
+  const isUpdateMarket = proposal?.terms.change.__typename === 'UpdateMarket';
+
+  let requiredVotingMajority = null;
+  let requiredVotingMajorityLP = null;
+
+  if (networkParams) {
+    switch (proposal.terms.change.__typename) {
+      case 'NewMarket':
+        requiredVotingMajority =
+          networkParams.governance_proposal_market_requiredMajority;
+        break;
+      case 'UpdateMarket':
+        requiredVotingMajority =
+          networkParams.governance_proposal_updateMarket_requiredMajority;
+        requiredVotingMajorityLP =
+          networkParams.governance_proposal_updateMarket_requiredMajorityLP;
+        break;
+      case 'NewAsset':
+        requiredVotingMajority =
+          networkParams.governance_proposal_asset_requiredMajority;
+        break;
+      case 'UpdateAsset':
+        requiredVotingMajority =
+          networkParams.governance_proposal_updateAsset_requiredMajority;
+        break;
+      case 'UpdateNetworkParameter':
+        requiredVotingMajority =
+          networkParams.governance_proposal_updateNetParam_requiredMajority;
+        break;
+      case 'NewFreeform':
+        requiredVotingMajority =
+          networkParams.governance_proposal_freeform_requiredMajority;
+        break;
+    }
+  }
+
+  if (isUpdateMarket) {
+    return (
+      <div className="mb-6">
+        <p>{t('Token vote')}</p>
+        <div
+          className="grid grid-cols-2 gap-4 items-center"
+          data-testid="token-vote-statuses"
+        >
+          <MajorityStatus
+            reached={majorityMet}
+            requiredMajority={requiredVotingMajority}
+          />{' '}
+          <ParticipationStatus reached={participationMet} />
+        </div>
+
+        <p className="mt-4">{t('Liquidity provider vote')}</p>
+        <div
+          className="grid grid-cols-2 gap-4 items-center"
+          data-testid="lp-vote-statuses"
+        >
+          <MajorityStatus
+            reached={majorityLPMet}
+            requiredMajority={requiredVotingMajorityLP}
+          />{' '}
+          <ParticipationStatus reached={participationLPMet} />
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="grid grid-cols-2 gap-4 items-center mb-6">
+      <MajorityStatus
+        reached={majorityMet}
+        requiredMajority={requiredVotingMajority}
+      />{' '}
+      <ParticipationStatus reached={participationMet} />
+    </div>
+  );
+};

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

@@ -34,6 +34,12 @@ jest.mock('../proposal-change-table', () => ({
 jest.mock('../proposal-json', () => ({
   ProposalJson: () => <div data-testid="proposal-json"></div>,
 }));
+jest.mock('../proposal-votes-table', () => ({
+  ProposalVotesTable: () => <div data-testid="proposal-votes-table"></div>,
+}));
+jest.mock('../vote-details', () => ({
+  VoteDetails: () => <div data-testid="proposal-vote-details"></div>,
+}));
 jest.mock('../list-asset', () => ({
   ListAsset: () => <div data-testid="proposal-list-asset"></div>,
 }));
@@ -98,6 +104,8 @@ it('renders each section', async () => {
   expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
+  expect(screen.getByTestId('proposal-votes-table')).toBeInTheDocument();
+  expect(screen.getByTestId('proposal-vote-details')).toBeInTheDocument();
   expect(screen.queryByTestId('proposal-list-asset')).not.toBeInTheDocument();
 });
 

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

@@ -5,8 +5,9 @@ import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalDescription } from '../proposal-description';
 import { ProposalChangeTable } from '../proposal-change-table';
 import { ProposalJson } from '../proposal-json';
+import { ProposalVotesTable } from '../proposal-votes-table';
 import { ProposalAssetDetails } from '../proposal-asset-details';
-import { UserVote } from '../vote-details';
+import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
 import Routes from '../../../routes';
 import { ProposalMarketData } from '../proposal-market-data';
@@ -21,6 +22,14 @@ import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useVoteSubmit } from '@vegaprotocol/proposals';
 import { useUserVote } from '../vote-details/use-user-vote';
 
+export enum ProposalType {
+  PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
+  PROPOSAL_UPDATE_MARKET = 'PROPOSAL_UPDATE_MARKET',
+  PROPOSAL_NEW_ASSET = 'PROPOSAL_NEW_ASSET',
+  PROPOSAL_UPDATE_ASSET = 'PROPOSAL_UPDATE_ASSET',
+  PROPOSAL_NETWORK_PARAMETER = 'PROPOSAL_NETWORK_PARAMETER',
+  PROPOSAL_FREEFORM = 'PROPOSAL_FREEFORM',
+}
 export interface ProposalProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
   networkParams: Partial<NetworkParamsResult>;
@@ -71,32 +80,39 @@ export const Proposal = ({
   }
 
   let minVoterBalance = null;
+  let proposalType = null;
 
   if (networkParams) {
     switch (proposal.terms.change.__typename) {
       case 'NewMarket':
         minVoterBalance =
           networkParams.governance_proposal_market_minVoterBalance;
+        proposalType = ProposalType.PROPOSAL_NEW_MARKET;
         break;
       case 'UpdateMarket':
         minVoterBalance =
           networkParams.governance_proposal_updateMarket_minVoterBalance;
+        proposalType = ProposalType.PROPOSAL_UPDATE_MARKET;
         break;
       case 'NewAsset':
         minVoterBalance =
           networkParams.governance_proposal_asset_minVoterBalance;
+        proposalType = ProposalType.PROPOSAL_NEW_ASSET;
         break;
       case 'UpdateAsset':
         minVoterBalance =
           networkParams.governance_proposal_updateAsset_minVoterBalance;
+        proposalType = ProposalType.PROPOSAL_UPDATE_ASSET;
         break;
       case 'UpdateNetworkParameter':
         minVoterBalance =
           networkParams.governance_proposal_updateNetParam_minVoterBalance;
+        proposalType = ProposalType.PROPOSAL_NETWORK_PARAMETER;
         break;
       case 'NewFreeform':
         minVoterBalance =
           networkParams.governance_proposal_freeform_minVoterBalance;
+        proposalType = ProposalType.PROPOSAL_FREEFORM;
         break;
     }
   }
@@ -124,81 +140,91 @@ export const Proposal = ({
       <ProposalHeader
         proposal={proposal}
         isListItem={false}
+        networkParams={networkParams}
         voteState={voteState}
       />
 
-      <div className="my-10">
-        <ProposalChangeTable proposal={proposal} />
-      </div>
-
-      {proposal.terms.change.__typename === 'NewAsset' &&
-      proposal.terms.change.source.__typename === 'ERC20' &&
-      proposal.id ? (
-        <ListAsset
-          assetId={proposal.id}
-          withdrawalThreshold={proposal.terms.change.source.withdrawThreshold}
-          lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
-        />
-      ) : null}
-
-      <div className="mb-4">
-        <ProposalDescription description={proposal.rationale.description} />
-      </div>
-
-      {newMarketData && (
-        <div className="mb-4">
-          <ProposalMarketData
-            marketData={newMarketData}
-            parentMarketData={parentMarketData ? parentMarketData : undefined}
-          />
+      <div id="details">
+        <div className="my-10">
+          <ProposalChangeTable proposal={proposal} />
         </div>
-      )}
 
-      {proposal.terms.change.__typename === 'UpdateMarket' && (
-        <div className="mb-4">
-          <ProposalMarketChanges
-            originalProposal={
-              originalMarketProposalRestData?.data?.proposal?.terms?.newMarket
-                ?.changes || {}
-            }
-            latestEnactedProposal={
-              mostRecentlyEnactedAssociatedMarketProposal?.node?.proposal?.terms
-                ?.updateMarket?.changes || {}
-            }
-            updatedProposal={
-              restData?.data?.proposal?.terms?.updateMarket?.changes || {}
-            }
+        {proposal.terms.change.__typename === 'NewAsset' &&
+        proposal.terms.change.source.__typename === 'ERC20' &&
+        proposal.id ? (
+          <ListAsset
+            assetId={proposal.id}
+            withdrawalThreshold={proposal.terms.change.source.withdrawThreshold}
+            lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
           />
-        </div>
-      )}
+        ) : null}
 
-      {(proposal.terms.change.__typename === 'NewAsset' ||
-        proposal.terms.change.__typename === 'UpdateAsset') &&
-        asset && (
+        <div className="mb-4">
+          <ProposalDescription description={proposal.rationale.description} />
+        </div>
+
+        {newMarketData && (
           <div className="mb-4">
-            <ProposalAssetDetails asset={asset} />
+            <ProposalMarketData
+              marketData={newMarketData}
+              parentMarketData={parentMarketData ? parentMarketData : undefined}
+            />
           </div>
         )}
 
-      <div className="mb-10">
-        <RoundedWrapper paddingBottom={true}>
-          <UserVote
-            proposal={proposal}
-            minVoterBalance={minVoterBalance}
-            spamProtectionMinTokens={
-              networkParams?.spam_protection_voting_min_tokens
-            }
-            submit={submit}
-            dialog={Dialog}
-            transaction={transaction}
-            voteState={voteState}
-            voteDatetime={voteDatetime}
-          />
-        </RoundedWrapper>
+        {proposal.terms.change.__typename === 'UpdateMarket' && (
+          <div className="mb-4">
+            <ProposalMarketChanges
+              originalProposal={
+                originalMarketProposalRestData?.data?.proposal?.terms?.newMarket
+                  ?.changes || {}
+              }
+              latestEnactedProposal={
+                mostRecentlyEnactedAssociatedMarketProposal?.node?.proposal
+                  ?.terms?.updateMarket?.changes || {}
+              }
+              updatedProposal={
+                restData?.data?.proposal?.terms?.updateMarket?.changes || {}
+              }
+            />
+          </div>
+        )}
+
+        {(proposal.terms.change.__typename === 'NewAsset' ||
+          proposal.terms.change.__typename === 'UpdateAsset') &&
+          asset && (
+            <div className="mb-4">
+              <ProposalAssetDetails asset={asset} />
+            </div>
+          )}
+
+        <div className="mb-6">
+          <ProposalJson proposal={restData?.data?.proposal} />
+        </div>
       </div>
 
-      <div className="mb-6">
-        <ProposalJson proposal={restData?.data?.proposal} />
+      <div id="voting">
+        <div className="mb-10">
+          <RoundedWrapper paddingBottom={true}>
+            <VoteDetails
+              proposal={proposal}
+              proposalType={proposalType}
+              minVoterBalance={minVoterBalance}
+              spamProtectionMinTokens={
+                networkParams?.spam_protection_voting_min_tokens
+              }
+              submit={submit}
+              dialog={Dialog}
+              transaction={transaction}
+              voteState={voteState}
+              voteDatetime={voteDatetime}
+            />
+          </RoundedWrapper>
+        </div>
+
+        <div className="mb-4">
+          <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
+        </div>
       </div>
     </section>
   );

apps/governance/src/routes/proposals/components/proposals-list-item/proposals-list-item-details.spec.tsx

@@ -6,7 +6,11 @@ import { MockedProvider } from '@apollo/client/testing';
 import { render, screen } from '@testing-library/react';
 import { format } from 'date-fns';
 import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import { generateProposal } from '../../test-helpers/generate-proposals';
+import {
+  generateNoVotes,
+  generateProposal,
+  generateYesVotes,
+} from '../../test-helpers/generate-proposals';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
 import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
 import {
@@ -89,6 +93,84 @@ describe('Proposals list item details', () => {
     );
   });
 
+  it('Renders proposal state: Update market proposal - Currently expected to pass by LP vote', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+          },
+        },
+        votes: {
+          yes: {
+            ...generateYesVotes(0),
+            totalEquityLikeShareWeight: '1000',
+          },
+          no: {
+            ...generateNoVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Currently expected to pass by LP vote'
+    );
+  });
+
+  it('Renders proposal state: Update market proposal - Currently expected to pass by token vote', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+          },
+        },
+        votes: {
+          yes: {
+            ...generateYesVotes(1000, 1000),
+            totalEquityLikeShareWeight: '0',
+          },
+          no: {
+            ...generateNoVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Currently expected to pass by token vote'
+    );
+  });
+
+  it('Renders proposal state: Update market proposal - Currently expected to fail', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+          },
+        },
+        votes: {
+          yes: {
+            ...generateYesVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+          no: {
+            ...generateNoVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Currently expected to fail'
+    );
+  });
+
   it('Renders proposal state: Open - 5 minutes left to vote', () => {
     renderComponent(
       generateProposal({
@@ -131,6 +213,43 @@ describe('Proposals list item details', () => {
     );
   });
 
+  it('Renders proposal state: Open - majority not reached', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          enactmentDatetime: nextWeek.toString(),
+        },
+        votes: {
+          no: generateNoVotes(1, 1000000000000000000),
+          yes: generateYesVotes(1, 1000000000000000000),
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Currently expected to fail'
+    );
+  });
+
+  it('Renders proposal state: Open - will pass', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        votes: {
+          __typename: 'ProposalVotes',
+          yes: generateYesVotes(3000, 1000000000000000000),
+          no: generateNoVotes(0),
+        },
+        terms: {
+          closingDatetime: nextWeek.toString(),
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Currently expected to pass'
+    );
+  });
+
   it('Renders proposal state: Rejected', () => {
     renderComponent(
       generateProposal({

apps/governance/src/routes/proposals/components/proposals-list-item/proposals-list-item-details.tsx

@@ -11,6 +11,7 @@ import {
 import Routes from '../../../routes';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { useVoteInformation } from '../../hooks';
 
 export const ProposalsListItemDetails = ({
   proposal,
@@ -19,10 +20,18 @@ export const ProposalsListItemDetails = ({
 }) => {
   const { t } = useTranslation();
   const state = proposal?.state;
+  const { willPassByTokenVote, willPassByLPVote } = useVoteInformation({
+    proposal,
+  });
+  const updateMarketWillPass = willPassByTokenVote || willPassByLPVote;
+  const updateMarketVotePassMethod = willPassByTokenVote
+    ? t('byTokenVote')
+    : t('byLPVote');
   const nowToEnactmentInHours = differenceInHours(
     new Date(proposal?.terms.closingDatetime),
     new Date()
   );
+  const isUpdateMarket = proposal?.terms.change.__typename === 'UpdateMarket';
 
   let voteDetails: ReactNode;
   let voteStatus: ReactNode;
@@ -69,11 +78,31 @@ export const ProposalsListItemDetails = ({
     }
     case ProposalState.STATE_OPEN: {
       voteDetails = (
-        <span className={nowToEnactmentInHours < 6 ? 'text-vega-orange' : ''}>
+        <span className={nowToEnactmentInHours < 6 ? 'text-vega-pink' : ''}>
           {formatDistanceToNowStrict(new Date(proposal?.terms.closingDatetime))}{' '}
           {t('left to vote')}
         </span>
       );
+      voteStatus =
+        (isUpdateMarket &&
+          (updateMarketWillPass ? (
+            <>
+              {t('currentlySetTo')} {t('pass')} {updateMarketVotePassMethod}
+            </>
+          ) : (
+            <>
+              {t('currentlySetTo')} {t('fail')}
+            </>
+          ))) ||
+        (willPassByTokenVote ? (
+          <>
+            {t('currentlySetTo')} {t('pass')}
+          </>
+        ) : (
+          <>
+            {t('currentlySetTo')} {t('fail')}
+          </>
+        ));
       break;
     }
     case ProposalState.STATE_REJECTED: {

apps/governance/src/routes/proposals/components/proposals-list-item/proposals-list-item.tsx

@@ -4,19 +4,28 @@ import { ProposalsListItemDetails } from './proposals-list-item-details';
 import { useUserVote } from '../vote-details/use-user-vote';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 
 interface ProposalsListItemProps {
   proposal?: ProposalFieldsFragment | ProposalQuery['proposal'] | null;
+  networkParams: Partial<NetworkParamsResult> | null;
 }
 
-export const ProposalsListItem = ({ proposal }: ProposalsListItemProps) => {
+export const ProposalsListItem = ({
+  proposal,
+  networkParams,
+}: ProposalsListItemProps) => {
   const { voteState } = useUserVote(proposal?.id);
-  if (!proposal || !proposal.id) return null;
+  if (!proposal || !proposal.id || !networkParams) return null;
 
   return (
     <li id={proposal.id} data-testid="proposals-list-item">
       <RoundedWrapper paddingBottom={true} heightFull={true}>
-        <ProposalHeader proposal={proposal} voteState={voteState} />
+        <ProposalHeader
+          proposal={proposal}
+          networkParams={networkParams}
+          voteState={voteState}
+        />
         <ProposalsListItemDetails proposal={proposal} />
       </RoundedWrapper>
     </li>

apps/governance/src/routes/proposals/components/proposals-list/proposals-list.tsx

@@ -8,6 +8,7 @@ import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
 import {
+  AsyncRenderer,
   Button,
   Toggle,
   VegaIcon,
@@ -19,6 +20,10 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { DocsLinks, ExternalLinks } from '@vegaprotocol/environment';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 
 interface ProposalsListProps {
   proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
@@ -70,6 +75,20 @@ export const ProposalsList = ({
   lastBlockHeight,
 }: ProposalsListProps) => {
   const { t } = useTranslation();
+  const {
+    params: networkParams,
+    loading: networkParamsLoading,
+    error: networkParamsError,
+  } = useNetworkParams([
+    NetworkParams.governance_proposal_market_requiredMajority,
+    NetworkParams.governance_proposal_updateMarket_requiredMajority,
+    NetworkParams.governance_proposal_updateMarket_requiredMajorityLP,
+    NetworkParams.governance_proposal_asset_requiredMajority,
+    NetworkParams.governance_proposal_updateAsset_requiredMajority,
+    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
+    NetworkParams.governance_proposal_freeform_requiredMajority,
+  ]);
+
   const [filterString, setFilterString] = useState('');
   const [closedProposalsView, setClosedProposalsView] =
     useState<ClosedProposalsViewOptions>(
@@ -134,166 +153,181 @@ export const ProposalsList = ({
     p?.party?.id?.toString().includes(filterString);
 
   return (
-    <div data-testid="proposals-list">
-      <div className="grid xs:grid-cols-2 items-center">
-        <Heading
-          centerContent={false}
-          marginBottom={false}
-          title={t('pageTitleProposals')}
-        />
+    <AsyncRenderer
+      loading={networkParamsLoading}
+      error={networkParamsError}
+      data={networkParams}
+    >
+      <div data-testid="proposals-list">
+        <div className="grid xs:grid-cols-2 items-center">
+          <Heading
+            centerContent={false}
+            marginBottom={false}
+            title={t('pageTitleProposals')}
+          />
 
-        {DocsLinks && (
-          <div className="xs:justify-self-end" data-testid="new-proposal-link">
-            <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
-              <Button variant="primary" size="sm">
-                <div className="flex items-center gap-1">
-                  {t('NewProposal')}
-                  <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />
-                </div>
-              </Button>
-            </ExternalLink>
-          </div>
+          {DocsLinks && (
+            <div
+              className="xs:justify-self-end"
+              data-testid="new-proposal-link"
+            >
+              <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
+                <Button variant="primary" size="sm">
+                  <div className="flex items-center gap-1">
+                    {t('NewProposal')}
+                    <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />
+                  </div>
+                </Button>
+              </ExternalLink>
+            </div>
+          )}
+        </div>
+
+        <p className="mb-8">
+          {t(
+            `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
+          )}{' '}
+          <ExternalLink
+            data-testid="proposal-documentation-link"
+            href={ExternalLinks.GOVERNANCE_PAGE}
+            className="text-white"
+          >
+            {t(`Find out more about Vega governance`)}
+          </ExternalLink>
+        </p>
+
+        {proposals.length > 0 && (
+          <ProposalsListFilter
+            filterString={filterString}
+            setFilterString={(value) => {
+              setFilterString(value);
+              if (value.length > 0) {
+                // If the filter is engaged, ensure the user is viewing governance proposals,
+                // as network upgrades do not have IDs to filter by and will be excluded.
+                setClosedProposalsView(
+                  ClosedProposalsViewOptions.NetworkGovernance
+                );
+              }
+            }}
+          />
         )}
-      </div>
 
-      <p className="mb-8">
-        {t(
-          `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
-        )}{' '}
-        <ExternalLink
-          data-testid="proposal-documentation-link"
-          href={ExternalLinks.GOVERNANCE_PAGE}
-          className="text-white"
-        >
-          {t(`Find out more about Vega governance`)}
-        </ExternalLink>
-      </p>
+        <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
+          <SubHeading title={t('openProposals')} />
 
-      {proposals.length > 0 && (
-        <ProposalsListFilter
-          filterString={filterString}
-          setFilterString={(value) => {
-            setFilterString(value);
-            if (value.length > 0) {
-              // If the filter is engaged, ensure the user is viewing governance proposals,
-              // as network upgrades do not have IDs to filter by and will be excluded.
-              setClosedProposalsView(
-                ClosedProposalsViewOptions.NetworkGovernance
-              );
-            }
-          }}
-        />
-      )}
+          {sortedProposals.open.length > 0 ||
+          sortedProtocolUpgradeProposals.open.length > 0 ? (
+            <ul data-testid="open-proposals">
+              {filterString.length < 1 &&
+                sortedProtocolUpgradeProposals.open.map((proposal) => (
+                  <ProtocolUpgradeProposalsListItem
+                    key={proposal.upgradeBlockHeight}
+                    proposal={proposal}
+                  />
+                ))}
 
-      <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
-        <SubHeading title={t('openProposals')} />
-
-        {sortedProposals.open.length > 0 ||
-        sortedProtocolUpgradeProposals.open.length > 0 ? (
-          <ul data-testid="open-proposals">
-            {filterString.length < 1 &&
-              sortedProtocolUpgradeProposals.open.map((proposal) => (
-                <ProtocolUpgradeProposalsListItem
-                  key={proposal.upgradeBlockHeight}
+              {sortedProposals.open.filter(filterPredicate).map((proposal) => (
+                <ProposalsListItem
+                  key={proposal?.id}
                   proposal={proposal}
+                  networkParams={networkParams}
                 />
               ))}
+            </ul>
+          ) : (
+            <p className="mb-0" data-testid="no-open-proposals">
+              {t('noOpenProposals')}
+            </p>
+          )}
+        </section>
 
-            {sortedProposals.open.filter(filterPredicate).map((proposal) => (
-              <ProposalsListItem key={proposal?.id} proposal={proposal} />
-            ))}
-          </ul>
-        ) : (
-          <p className="mb-0" data-testid="no-open-proposals">
-            {t('noOpenProposals')}
-          </p>
-        )}
-      </section>
-
-      <section className="relative">
-        <SubHeading title={t('closedProposals')} />
-        {sortedProposals.closed.length > 0 ||
-        sortedProtocolUpgradeProposals.closed.length > 0 ? (
-          <>
-            {
-              // We need both the closed proposals and closed protocol upgrade
-              // proposals to be present for there to be a toggle. It also gets
-              // hidden if the user has filtered the list, as the upgrade proposals
-              // do not have the necessary fields for filtering.
-              sortedProposals.closed.length > 0 &&
-                sortedProtocolUpgradeProposals.closed.length > 0 &&
-                filterString.length < 1 && (
-                  <div
-                    className="grid w-full justify-end xl:-mt-12 pb-6"
-                    data-testid="toggle-closed-proposals"
-                  >
-                    <div className="w-[440px]">
-                      <Toggle
-                        name="closed-proposals-toggle"
-                        toggles={[
-                          {
-                            label: t(
-                              ClosedProposalsViewOptions.NetworkGovernance
-                            ),
-                            value: ClosedProposalsViewOptions.NetworkGovernance,
-                          },
-                          {
-                            label: t(
-                              ClosedProposalsViewOptions.NetworkUpgrades
-                            ),
-                            value: ClosedProposalsViewOptions.NetworkUpgrades,
-                          },
-                        ]}
-                        checkedValue={closedProposalsView}
-                        onChange={(e) =>
-                          setClosedProposalsView(
-                            e.target.value as ClosedProposalsViewOptions
-                          )
-                        }
-                      />
+        <section className="relative">
+          <SubHeading title={t('closedProposals')} />
+          {sortedProposals.closed.length > 0 ||
+          sortedProtocolUpgradeProposals.closed.length > 0 ? (
+            <>
+              {
+                // We need both the closed proposals and closed protocol upgrade
+                // proposals to be present for there to be a toggle. It also gets
+                // hidden if the user has filtered the list, as the upgrade proposals
+                // do not have the necessary fields for filtering.
+                sortedProposals.closed.length > 0 &&
+                  sortedProtocolUpgradeProposals.closed.length > 0 &&
+                  filterString.length < 1 && (
+                    <div
+                      className="grid w-full justify-end xl:-mt-12 pb-6"
+                      data-testid="toggle-closed-proposals"
+                    >
+                      <div className="w-[440px]">
+                        <Toggle
+                          name="closed-proposals-toggle"
+                          toggles={[
+                            {
+                              label: t(
+                                ClosedProposalsViewOptions.NetworkGovernance
+                              ),
+                              value:
+                                ClosedProposalsViewOptions.NetworkGovernance,
+                            },
+                            {
+                              label: t(
+                                ClosedProposalsViewOptions.NetworkUpgrades
+                              ),
+                              value: ClosedProposalsViewOptions.NetworkUpgrades,
+                            },
+                          ]}
+                          checkedValue={closedProposalsView}
+                          onChange={(e) =>
+                            setClosedProposalsView(
+                              e.target.value as ClosedProposalsViewOptions
+                            )
+                          }
+                        />
+                      </div>
                     </div>
-                  </div>
-                )
-            }
+                  )
+              }
 
-            <ul data-testid="closed-proposals">
-              {closedProposalsView ===
-                ClosedProposalsViewOptions.NetworkUpgrades && (
-                <div data-testid="closed-upgrade-proposals">
-                  {sortedProtocolUpgradeProposals.closed.map((proposal) => (
-                    <ProtocolUpgradeProposalsListItem
-                      key={proposal.upgradeBlockHeight}
-                      proposal={proposal}
-                    />
-                  ))}
-                </div>
-              )}
-
-              {closedProposalsView ===
-                ClosedProposalsViewOptions.NetworkGovernance && (
-                <div data-testid="closed-governance-proposals">
-                  {sortedProposals.closed
-                    .filter(filterPredicate)
-                    .map((proposal) => (
-                      <ProposalsListItem
-                        key={proposal?.id}
+              <ul data-testid="closed-proposals">
+                {closedProposalsView ===
+                  ClosedProposalsViewOptions.NetworkUpgrades && (
+                  <div data-testid="closed-upgrade-proposals">
+                    {sortedProtocolUpgradeProposals.closed.map((proposal) => (
+                      <ProtocolUpgradeProposalsListItem
+                        key={proposal.upgradeBlockHeight}
                         proposal={proposal}
                       />
                     ))}
-                </div>
-              )}
-            </ul>
-          </>
-        ) : (
-          <p className="mb-0" data-testid="no-closed-proposals">
-            {t('noClosedProposals')}
-          </p>
-        )}
-      </section>
+                  </div>
+                )}
 
-      <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
-        {t('seeRejectedProposals')}
-      </Link>
-    </div>
+                {closedProposalsView ===
+                  ClosedProposalsViewOptions.NetworkGovernance && (
+                  <div data-testid="closed-governance-proposals">
+                    {sortedProposals.closed
+                      .filter(filterPredicate)
+                      .map((proposal) => (
+                        <ProposalsListItem
+                          key={proposal?.id}
+                          proposal={proposal}
+                          networkParams={networkParams}
+                        />
+                      ))}
+                  </div>
+                )}
+              </ul>
+            </>
+          ) : (
+            <p className="mb-0" data-testid="no-closed-proposals">
+              {t('noClosedProposals')}
+            </p>
+          )}
+        </section>
+
+        <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
+          {t('seeRejectedProposals')}
+        </Link>
+      </div>
+    </AsyncRenderer>
   );
 };

apps/governance/src/routes/proposals/components/proposals-list/rejected-proposals-list.tsx

@@ -1,10 +1,15 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 
 interface ProposalsListProps {
   proposals: Array<ProposalQuery['proposal'] | ProposalFieldsFragment>;
@@ -12,6 +17,19 @@ interface ProposalsListProps {
 
 export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
   const { t } = useTranslation();
+  const {
+    params: networkParams,
+    loading: networkParamsLoading,
+    error: networkParamsError,
+  } = useNetworkParams([
+    NetworkParams.governance_proposal_market_requiredMajority,
+    NetworkParams.governance_proposal_updateMarket_requiredMajority,
+    NetworkParams.governance_proposal_updateMarket_requiredMajorityLP,
+    NetworkParams.governance_proposal_asset_requiredMajority,
+    NetworkParams.governance_proposal_updateAsset_requiredMajority,
+    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
+    NetworkParams.governance_proposal_freeform_requiredMajority,
+  ]);
   const [filterString, setFilterString] = useState('');
 
   const filterPredicate = (
@@ -21,7 +39,11 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
     p?.party?.id?.toString().includes(filterString);
 
   return (
-    <>
+    <AsyncRenderer
+      loading={networkParamsLoading}
+      error={networkParamsError}
+      data={networkParams}
+    >
       <Heading title={t('pageTitleRejectedProposals')} />
       <ProposalsListFilter
         filterString={filterString}
@@ -31,7 +53,11 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
         {proposals.length > 0 ? (
           <ul data-testid="rejected-proposals">
             {proposals.filter(filterPredicate).map((proposal) => (
-              <ProposalsListItem key={proposal?.id} proposal={proposal} />
+              <ProposalsListItem
+                key={proposal?.id}
+                proposal={proposal}
+                networkParams={networkParams}
+              />
             ))}
           </ul>
         ) : (
@@ -40,6 +66,6 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
           </p>
         )}
       </section>
-    </>
+    </AsyncRenderer>
   );
 };

apps/governance/src/routes/proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item.tsx

@@ -67,7 +67,7 @@ export const ProtocolUpgradeProposalsListItem = ({
         <Link
           to={`${Routes.PROTOCOL_UPGRADES}/${stripFullStops(
             proposal.vegaReleaseTag
-          )}/${proposal.upgradeBlockHeight}`}
+          )}`}
         >
           <Button data-testid="view-proposal-btn">{t('viewDetails')}</Button>
         </Link>

apps/governance/src/routes/proposals/components/vote-breakdown/index.ts

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

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

@@ -1,348 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { BrowserRouter as Router } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import {
-  lastWeek,
-  mockWalletContext,
-  networkParamsQueryMock,
-  nextWeek,
-} from '../../test-helpers/mocks';
-import { VoteBreakdown } from './vote-breakdown';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MockedResponse } from '@apollo/client/testing';
-import {
-  generateNoVotes,
-  generateProposal,
-  generateYesVotes,
-} from '../../test-helpers/generate-proposals';
-import { ProposalState } from '@vegaprotocol/types';
-import { BigNumber } from '../../../../lib/bignumber';
-import type { AppState } from '../../../../contexts/app-state/app-state-context';
-
-const mockTotalSupply = new BigNumber(100);
-// Note - giving a fixedTokenValue of 1 means a ratio of 1:1 votes to tokens, making sums easier :)
-const fixedTokenValue = 1000000000000000000;
-
-const mockAppState: AppState = {
-  totalAssociated: new BigNumber('50063005'),
-  decimals: 18,
-  totalSupply: mockTotalSupply,
-  vegaWalletManageOverlay: false,
-  transactionOverlay: false,
-  bannerMessage: '',
-  disconnectNotice: false,
-};
-
-jest.mock('../../../../contexts/app-state/app-state-context', () => ({
-  useAppState: () => ({
-    appState: mockAppState,
-  }),
-}));
-
-const renderComponent = (
-  proposal: ProposalQuery['proposal'],
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  mocks: MockedResponse<any>[] = [networkParamsQueryMock]
-) =>
-  render(
-    <Router>
-      <MockedProvider mocks={mocks}>
-        <VegaWalletContext.Provider value={mockWalletContext}>
-          <VoteBreakdown proposal={proposal} />
-        </VegaWalletContext.Provider>
-      </MockedProvider>
-    </Router>
-  );
-
-describe('VoteBreakdown', () => {
-  beforeAll(() => {
-    jest.useFakeTimers();
-    jest.setSystemTime(0);
-  });
-  afterAll(() => {
-    jest.useRealTimers();
-  });
-
-  it('Renders majority reached', () => {
-    const yesVotes = 100;
-    const noVotes = 0;
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(screen.getByTestId('token-majority-met')).toBeInTheDocument();
-  });
-
-  it('Renders majority not reached', () => {
-    const yesVotes = 20;
-    const noVotes = 80;
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(screen.getByTestId('token-majority-not-met')).toBeInTheDocument();
-  });
-
-  it('Renders participation reached', () => {
-    const yesVotes = 1000;
-    const noVotes = 0;
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(screen.getByTestId('token-participation-met')).toBeInTheDocument();
-  });
-
-  it('Renders participation not reached', () => {
-    const yesVotes = 0;
-    const noVotes = 0;
-
-    renderComponent(
-      generateProposal({
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(
-      screen.getByTestId('token-participation-not-met')
-    ).toBeInTheDocument();
-  });
-
-  it('Renders proposal state: Update market proposal - Currently expected to pass by LP vote', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_OPEN,
-        terms: {
-          change: {
-            __typename: 'UpdateMarket',
-          },
-        },
-        votes: {
-          yes: {
-            ...generateYesVotes(0),
-            totalEquityLikeShareWeight: '1000',
-          },
-          no: {
-            ...generateNoVotes(0),
-            totalEquityLikeShareWeight: '0',
-          },
-        },
-      })
-    );
-    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to pass by liquidity vote'
-    );
-  });
-
-  it('Renders proposal state: Update market proposal - Currently expected to pass by token vote', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_OPEN,
-        terms: {
-          change: {
-            __typename: 'UpdateMarket',
-          },
-        },
-        votes: {
-          yes: {
-            ...generateYesVotes(1000, fixedTokenValue),
-            totalEquityLikeShareWeight: '0',
-          },
-          no: {
-            ...generateNoVotes(0, fixedTokenValue),
-            totalEquityLikeShareWeight: '0',
-          },
-        },
-      })
-    );
-    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to pass by token vote'
-    );
-  });
-
-  it('Renders proposal state: Update market proposal - Currently expected to fail', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_OPEN,
-        terms: {
-          change: {
-            __typename: 'UpdateMarket',
-          },
-        },
-        votes: {
-          yes: {
-            ...generateYesVotes(0),
-            totalEquityLikeShareWeight: '0',
-          },
-          no: {
-            ...generateNoVotes(0),
-            totalEquityLikeShareWeight: '0',
-          },
-        },
-      })
-    );
-    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to fail'
-    );
-  });
-
-  it('Progress bar displays status - token majority', () => {
-    const yesVotes = 80;
-    const noVotes = 20;
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-
-    const element = screen.getByTestId('token-majority-progress');
-    const style = window.getComputedStyle(element);
-
-    expect(style.width).toBe(`${yesVotes}%`);
-  });
-
-  it('Progress bar displays status - token participation', () => {
-    const yesVotes = 40;
-    const noVotes = 20;
-    const totalVotes = yesVotes + noVotes;
-    const totalSupplyValue = mockTotalSupply.toNumber();
-    const expectedProgress = (totalVotes / totalSupplyValue) * 100; // Here it should be 60%
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-
-    const element = screen.getByTestId('token-participation-progress');
-    const style = window.getComputedStyle(element);
-
-    expect(style.width).toBe(`${expectedProgress}%`);
-  });
-
-  it('Progress bar displays status -  LP majority', () => {
-    const yesVotesLP = 800;
-    const noVotesLP = 200;
-    const expectedProgress = (yesVotesLP / (yesVotesLP + noVotesLP)) * 100; // 80%
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          change: {
-            __typename: 'UpdateMarket',
-          },
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: {
-            ...generateYesVotes(0),
-            totalEquityLikeShareWeight: `${yesVotesLP}`,
-          },
-          no: {
-            ...generateNoVotes(0),
-            totalEquityLikeShareWeight: `${noVotesLP}`,
-          },
-        },
-      })
-    );
-
-    const element = screen.getByTestId('lp-majority-progress');
-    const style = window.getComputedStyle(element);
-    expect(style.width).toBe(`${expectedProgress}%`);
-  });
-
-  it('Progress bar displays status - LP participation', () => {
-    const yesVotesLP = 400;
-    const noVotesLP = 600;
-    const totalVotesLP = yesVotesLP + noVotesLP;
-    const totalLPSupply = 1000;
-    const expectedProgress = (totalVotesLP / totalLPSupply) * 100; // 100%
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          change: {
-            __typename: 'UpdateMarket',
-          },
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: {
-            ...generateYesVotes(0),
-            totalEquityLikeShareWeight: `${yesVotesLP}`,
-          },
-          no: {
-            ...generateNoVotes(0),
-            totalEquityLikeShareWeight: `${noVotesLP}`,
-          },
-        },
-      })
-    );
-
-    const element = screen.getByTestId('lp-participation-progress');
-    const style = window.getComputedStyle(element);
-    expect(style.width).toBe(`${expectedProgress}%`);
-  });
-});

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

@@ -1,378 +0,0 @@
-import classNames from 'classnames';
-import BigNumber from 'bignumber.js';
-import { useTranslation } from 'react-i18next';
-import { useVoteInformation } from '../../hooks';
-import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
-import { formatNumber, toBigNum } from '@vegaprotocol/utils';
-import { ProposalState } from '@vegaprotocol/types';
-import type { ReactNode } from 'react';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-
-interface VoteBreakdownProps {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}
-
-interface VoteProgressProps {
-  percentageFor: BigNumber;
-  colourfulBg?: boolean;
-  testId?: string;
-  children?: ReactNode;
-}
-
-const VoteProgress = ({
-  percentageFor,
-  colourfulBg,
-  testId,
-  children,
-}: VoteProgressProps) => {
-  const containerClasses = classNames(
-    'relative h-10 rounded-md border border-vega-dark-300 overflow-hidden',
-    colourfulBg ? 'bg-vega-pink' : 'bg-vega-dark-400'
-  );
-
-  const progressClasses = classNames(
-    'absolute h-full top-0 left-0',
-    colourfulBg ? 'bg-vega-green' : 'bg-white'
-  );
-
-  const textClasses = classNames(
-    'absolute top-0 left-0 w-full h-full flex items-center justify-start px-3 text-black'
-  );
-
-  return (
-    <div className={containerClasses}>
-      <div
-        className={progressClasses}
-        style={{ width: `${percentageFor}%` }}
-        data-testid={testId}
-      ></div>
-      <div className={textClasses}>{children}</div>
-    </div>
-  );
-};
-
-interface StatusProps {
-  reached: boolean;
-  threshold: BigNumber;
-  text: string;
-  testId?: string;
-}
-
-const Status = ({ reached, threshold, text, testId }: StatusProps) => {
-  const { t } = useTranslation();
-
-  return (
-    <div data-testid={testId}>
-      {reached ? (
-        <div className="flex items-center gap-2">
-          <Icon name="tick" size={4} />
-          <span>
-            {threshold.toString()}% {text} {t('met')}
-          </span>
-        </div>
-      ) : (
-        <div className="flex items-center gap-2">
-          <Icon name="cross" size={4} />
-          <span>
-            {threshold.toString()}% {text} {t('not met')}
-          </span>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
-  const {
-    totalTokensPercentage,
-    participationMet,
-    totalTokensVoted,
-    totalLPTokensPercentage,
-    noPercentage,
-    noLPPercentage,
-    yesPercentage,
-    yesLPPercentage,
-    yesTokens,
-    noTokens,
-    yesEquityLikeShareWeight,
-    noEquityLikeShareWeight,
-    totalEquityLikeShareWeight,
-    requiredMajorityPercentage,
-    requiredMajorityLPPercentage,
-    requiredParticipation,
-    requiredParticipationLP,
-    participationLPMet,
-    majorityMet,
-    majorityLPMet,
-    willPassByTokenVote,
-    willPassByLPVote,
-  } = useVoteInformation({ proposal });
-
-  const { t } = useTranslation();
-  const defaultDP = 2;
-  const isProposalOpen = proposal?.state === ProposalState.STATE_OPEN;
-  const isUpdateMarket = proposal?.terms?.change?.__typename === 'UpdateMarket';
-  const participationThresholdProgress = BigNumber.min(
-    totalTokensPercentage.dividedBy(requiredParticipation).multipliedBy(100),
-    new BigNumber(100)
-  );
-  const lpParticipationThresholdProgress =
-    requiredParticipationLP &&
-    BigNumber.min(
-      totalLPTokensPercentage
-        .dividedBy(requiredParticipationLP)
-        .multipliedBy(100),
-      new BigNumber(100)
-    );
-  const willPass = willPassByTokenVote || willPassByLPVote;
-  const updateMarketVotePassMethod = willPassByTokenVote
-    ? t('byTokenVote')
-    : t('byLiquidityVote');
-
-  const sectionWrapperClasses = classNames('grid sm:grid-cols-2 gap-6');
-  const headingClasses = classNames('mb-2 text-vega-dark-400');
-  const progressDetailsClasses = classNames(
-    'flex justify-between flex-wrap mt-2 text-sm'
-  );
-
-  return (
-    <div className="mb-6">
-      {isProposalOpen && (
-        <div
-          data-testid="vote-status"
-          className="flex items-center gap-1 mb-2 text-bold"
-        >
-          <span>
-            {willPass ? (
-              <Icon name="tick" size={5} className="text-vega-green" />
-            ) : (
-              <Icon name="cross" size={5} className="text-vega-pink" />
-            )}
-          </span>
-          <span>{t('currentlySetTo')} </span>
-          {willPass ? (
-            <span>
-              <span className="text-vega-green">{t('pass')}</span>
-              {isUpdateMarket && <span> {updateMarketVotePassMethod}</span>}
-            </span>
-          ) : (
-            <span className="text-vega-pink">{t('fail')}</span>
-          )}
-        </div>
-      )}
-
-      {isUpdateMarket && (
-        <div className="mb-4">
-          <h3 className={headingClasses}>{t('liquidityProviderVote')}</h3>
-          <div className={sectionWrapperClasses}>
-            <section data-testid="lp-majority-breakdown">
-              <VoteProgress
-                percentageFor={yesLPPercentage}
-                colourfulBg={true}
-                testId="lp-majority-progress"
-              >
-                <Status
-                  reached={majorityLPMet}
-                  threshold={requiredMajorityLPPercentage}
-                  text={t('majorityThreshold')}
-                  testId={
-                    majorityLPMet ? 'lp-majority-met' : 'lp-majority-not-met'
-                  }
-                />
-              </VoteProgress>
-
-              <div className={progressDetailsClasses}>
-                <div className="flex items-center gap-1">
-                  <span>{t('liquidityProviderVotesFor')}:</span>
-                  <Tooltip
-                    description={formatNumber(
-                      yesEquityLikeShareWeight,
-                      defaultDP
-                    )}
-                  >
-                    <button>
-                      {yesEquityLikeShareWeight
-                        .dividedBy(toBigNum(10 ** 6, 0))
-                        .toFixed(1)}
-                      M
-                    </button>
-                  </Tooltip>
-                  <span>
-                    (
-                    <Tooltip
-                      description={
-                        <span>{yesLPPercentage.toFixed(defaultDP)}%</span>
-                      }
-                    >
-                      <button>{yesLPPercentage.toFixed(0)}%</button>
-                    </Tooltip>
-                    )
-                  </span>
-                </div>
-
-                <div className="flex items-center gap-1">
-                  <span>{t('liquidityProviderVotesAgainst')}:</span>
-                  <Tooltip
-                    description={formatNumber(
-                      noEquityLikeShareWeight,
-                      defaultDP
-                    )}
-                  >
-                    <button>
-                      {noEquityLikeShareWeight
-                        .dividedBy(toBigNum(10 ** 6, 0))
-                        .toFixed(1)}
-                      M
-                    </button>
-                  </Tooltip>
-                  <span>
-                    (
-                    <Tooltip
-                      description={
-                        <span>{noLPPercentage.toFixed(defaultDP)}%</span>
-                      }
-                    >
-                      <button>{noLPPercentage.toFixed(0)}%</button>
-                    </Tooltip>
-                    )
-                  </span>
-                </div>
-              </div>
-            </section>
-
-            <section data-testid="lp-participation-breakdown">
-              <VoteProgress
-                percentageFor={
-                  lpParticipationThresholdProgress || new BigNumber(0)
-                }
-                testId="lp-participation-progress"
-              >
-                <Status
-                  reached={participationLPMet}
-                  threshold={requiredParticipationLP || new BigNumber(1)}
-                  text={t('participationThreshold')}
-                  testId={
-                    participationLPMet
-                      ? 'lp-participation-met'
-                      : 'lp-participation-not-met'
-                  }
-                />
-              </VoteProgress>
-
-              <div className="flex mt-2 text-sm">
-                <div className="flex items-center gap-1">
-                  <span>{t('totalLiquidityProviderTokensVoted')}:</span>
-                  <Tooltip
-                    description={formatNumber(
-                      totalEquityLikeShareWeight,
-                      defaultDP
-                    )}
-                  >
-                    <button>
-                      {totalEquityLikeShareWeight
-                        .dividedBy(toBigNum(10 ** 6, 0))
-                        .toFixed(1)}
-                      M
-                    </button>
-                  </Tooltip>
-                  <span>
-                    ({totalEquityLikeShareWeight.toFixed(defaultDP)}%)
-                  </span>
-                </div>
-              </div>
-            </section>
-          </div>
-        </div>
-      )}
-
-      {isUpdateMarket && <h3 className={headingClasses}>{t('tokenVote')}</h3>}
-      <div className={sectionWrapperClasses}>
-        <section data-testid="token-majority-breakdown">
-          <VoteProgress
-            percentageFor={yesPercentage}
-            colourfulBg={true}
-            testId="token-majority-progress"
-          >
-            <Status
-              reached={majorityMet}
-              threshold={requiredMajorityPercentage}
-              text={t('majorityThreshold')}
-              testId={
-                majorityMet ? 'token-majority-met' : 'token-majority-not-met'
-              }
-            />
-          </VoteProgress>
-
-          <div className={progressDetailsClasses}>
-            <div className="flex items-center gap-1">
-              <span>{t('tokenVotesFor')}:</span>
-              <Tooltip description={formatNumber(yesTokens, defaultDP)}>
-                <button>
-                  {yesTokens.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
-                </button>
-              </Tooltip>
-              <span>
-                (
-                <Tooltip
-                  description={<span>{yesPercentage.toFixed(defaultDP)}%</span>}
-                >
-                  <button>{yesPercentage.toFixed(0)}%</button>
-                </Tooltip>
-                )
-              </span>
-            </div>
-
-            <div className="flex items-center gap-1">
-              <span>{t('tokenVotesAgainst')}:</span>
-              <Tooltip description={formatNumber(noTokens, defaultDP)}>
-                <button>
-                  {noTokens.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
-                </button>
-              </Tooltip>
-              <span>
-                (
-                <Tooltip
-                  description={<span>{noPercentage.toFixed(defaultDP)}%</span>}
-                >
-                  <button>{noPercentage.toFixed(0)}%</button>
-                </Tooltip>
-                )
-              </span>
-            </div>
-          </div>
-        </section>
-
-        <section data-testid="token-participation-breakdown">
-          <VoteProgress
-            percentageFor={participationThresholdProgress}
-            testId="token-participation-progress"
-          >
-            <Status
-              reached={participationMet}
-              threshold={requiredParticipation}
-              text={t('participationThreshold')}
-              testId={
-                participationMet
-                  ? 'token-participation-met'
-                  : 'token-participation-not-met'
-              }
-            />
-          </VoteProgress>
-
-          <div className="flex mt-2 text-sm">
-            <div className="flex items-center gap-1">
-              <span>{t('totalTokensVoted')}:</span>
-              <Tooltip description={formatNumber(totalTokensVoted, defaultDP)}>
-                <button>
-                  {totalTokensVoted.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
-                </button>
-              </Tooltip>
-              <span>({totalTokensPercentage.toFixed(defaultDP)}%)</span>
-            </div>
-          </div>
-        </section>
-      </div>
-    </div>
-  );
-};

apps/governance/src/routes/proposals/components/vote-details/index.tsx

@@ -1 +1 @@
-export { UserVote } from './user-vote';
+export { VoteDetails } from './vote-details';

apps/governance/src/routes/proposals/components/vote-details/user-vote.tsx

@@ -1,78 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { ProposalState } from '@vegaprotocol/types';
-import { ConnectToVega } from '../../../../components/connect-to-vega';
-import { VoteButtonsContainer } from './vote-buttons';
-import { SubHeading } from '../../../../components/heading';
-import type { VoteValue } from '@vegaprotocol/types';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { VoteState } from './use-user-vote';
-
-interface UserVoteProps {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  minVoterBalance: string | null | undefined;
-  spamProtectionMinTokens: string | null | undefined;
-  transaction: VegaTxState | null;
-  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
-  dialog: (props: DialogProps) => JSX.Element;
-  voteState: VoteState | null;
-  voteDatetime: Date | null;
-}
-
-export const UserVote = ({
-  proposal,
-  minVoterBalance,
-  spamProtectionMinTokens,
-  submit,
-  transaction,
-  dialog,
-  voteState,
-  voteDatetime,
-}: UserVoteProps) => {
-  const { pubKey } = useVegaWallet();
-
-  const { t } = useTranslation();
-
-  return (
-    <section data-testid="user-vote">
-      {proposal?.state === ProposalState.STATE_OPEN ? (
-        <SubHeading title={t('castYourVote')} />
-      ) : (
-        <SubHeading title={t('yourVote')} />
-      )}
-
-      {pubKey ? (
-        proposal && (
-          <VoteButtonsContainer
-            voteState={voteState}
-            voteDatetime={voteDatetime}
-            proposalState={proposal.state}
-            proposalId={proposal.id ?? ''}
-            minVoterBalance={minVoterBalance}
-            spamProtectionMinTokens={spamProtectionMinTokens}
-            className="flex"
-            submit={submit}
-            transaction={transaction}
-            dialog={dialog}
-          />
-        )
-      ) : (
-        <div className="pb-2">
-          <div className="mb-4">
-            <div className="flex items-center gap-2 mb-2">
-              <Icon name={'info-sign'} />
-              <div>{t('connectAVegaWalletToVote')}</div>
-            </div>
-            <ExternalLink href="https://blog.vega.xyz/how-to-vote-on-vega-2195d1e52ec5">
-              {t('findOutMoreAboutHowToVote')}
-            </ExternalLink>
-          </div>
-          <ConnectToVega />
-        </div>
-      )}
-    </section>
-  );
-};

apps/governance/src/routes/proposals/components/vote-details/vote-buttons.tsx

@@ -190,15 +190,14 @@ export const VoteButtons = ({
         (voteState === VoteState.Yes || voteState === VoteState.No) && (
           <p data-testid="you-voted">
             <span>{t('youVoted')}:</span>{' '}
-            <span className="mx-1 text-white font-bold uppercase">
+            <span className="text-white font-bold">
               {t(`voteState_${voteState}`)}
             </span>{' '}
             {voteDatetime ? (
-              <span>on {format(voteDatetime, DATE_FORMAT_LONG)}. </span>
+              <span>{format(voteDatetime, DATE_FORMAT_LONG)}. </span>
             ) : null}
             {proposalVotable ? (
               <ButtonLink
-                className="text-white"
                 data-testid="change-vote-button"
                 onClick={() => {
                   setChangeVote(true);

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

@@ -0,0 +1,255 @@
+import { useTranslation } from 'react-i18next';
+import { formatDistanceToNow } from 'date-fns';
+import { RoundedWrapper, Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { ProposalState } from '@vegaprotocol/types';
+import { VoteProgress } from '@vegaprotocol/proposals';
+import { formatNumber } from '../../../../lib/format-number';
+import { ConnectToVega } from '../../../../components/connect-to-vega';
+import { useVoteInformation } from '../../hooks';
+import { CurrentProposalStatus } from '../current-proposal-status';
+import { VoteButtonsContainer } from './vote-buttons';
+import { SubHeading } from '../../../../components/heading';
+import { ProposalType } from '../proposal/proposal';
+import type { VoteValue } from '@vegaprotocol/types';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { VoteState } from './use-user-vote';
+
+interface VoteDetailsProps {
+  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  minVoterBalance: string | null | undefined;
+  spamProtectionMinTokens: string | null | undefined;
+  proposalType: ProposalType | null;
+  transaction: VegaTxState | null;
+  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
+  dialog: (props: DialogProps) => JSX.Element;
+  voteState: VoteState | null;
+  voteDatetime: Date | null;
+}
+
+export const VoteDetails = ({
+  proposal,
+  minVoterBalance,
+  spamProtectionMinTokens,
+  proposalType,
+  submit,
+  transaction,
+  dialog,
+  voteState,
+  voteDatetime,
+}: VoteDetailsProps) => {
+  const { pubKey } = useVegaWallet();
+  const {
+    totalTokensPercentage,
+    participationMet,
+    totalTokensVoted,
+    totalLPTokensPercentage,
+    noPercentage,
+    noLPPercentage,
+    yesPercentage,
+    yesLPPercentage,
+    yesTokens,
+    noTokens,
+    requiredMajorityPercentage,
+    requiredMajorityLPPercentage,
+    requiredParticipation,
+    requiredParticipationLP,
+    participationLPMet,
+  } = useVoteInformation({ proposal });
+
+  const { t } = useTranslation();
+
+  const defaultDecimals = 2;
+  const daysLeft = t('daysLeft', {
+    daysLeft: formatDistanceToNow(new Date(proposal?.terms.closingDatetime)),
+  });
+
+  return (
+    <>
+      {proposalType === ProposalType.PROPOSAL_UPDATE_MARKET && (
+        <section>
+          <SubHeading title={t('liquidityVotes')} />
+          <p data-testid="liquidity-votes-status">
+            <span>
+              <CurrentProposalStatus proposal={proposal} />
+            </span>
+            {'. '}
+            {proposal?.state === ProposalState.STATE_OPEN ? daysLeft : null}
+          </p>
+          <table className="w-full mb-8">
+            <thead>
+              <tr>
+                <th className="text-vega-green w-[18%] text-left">
+                  {t('for')}
+                </th>
+                <th>
+                  <VoteProgress
+                    threshold={requiredMajorityLPPercentage}
+                    progress={yesLPPercentage}
+                  />
+                </th>
+                <th className="text-danger w-[18%] text-right">
+                  {t('against')}
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td
+                  className="text-left"
+                  data-testid="vote-progress-indicator-percentage-for"
+                >
+                  {yesLPPercentage.toFixed(defaultDecimals)}%
+                </td>
+                <td className="text-center text-white">
+                  {t('majorityRequired')}{' '}
+                  {requiredMajorityLPPercentage.toFixed(defaultDecimals)}%
+                </td>
+                <td
+                  className="text-right"
+                  data-testid="vote-progress-indicator-percentage-against"
+                >
+                  {noLPPercentage.toFixed(defaultDecimals)}%
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+          <p className="mb-6">
+            {t('participation')}
+            {': '}
+            {participationLPMet ? (
+              <span className="text-vega-green mx-4">{t('met')}</span>
+            ) : (
+              <span className="text-danger mx-4">{t('notMet')}</span>
+            )}{' '}
+            {formatNumber(totalLPTokensPercentage, defaultDecimals)}%
+            <span className="ml-4">
+              {requiredParticipationLP && (
+                <>
+                  ({formatNumber(requiredParticipationLP, defaultDecimals)}%{' '}
+                  {t('governanceRequired')})
+                </>
+              )}
+            </span>
+          </p>
+        </section>
+      )}
+      <section data-testid="votes-table">
+        <SubHeading title={t('tokenVotes')} />
+        <p data-testid="token-votes-status">
+          <span>
+            <CurrentProposalStatus proposal={proposal} />
+          </span>
+          {'. '}
+          {proposal?.state === ProposalState.STATE_OPEN ? daysLeft : null}
+        </p>
+        <table className="w-full mb-4">
+          <thead>
+            <tr>
+              <th className="text-vega-green w-[18%] text-left">{t('for')}</th>
+              <th>
+                <VoteProgress
+                  threshold={requiredMajorityPercentage}
+                  progress={yesPercentage}
+                />
+              </th>
+              <th className="text-danger w-[18%] text-right">{t('against')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td
+                className="text-left"
+                data-testid="vote-progress-indicator-percentage-for"
+              >
+                {yesPercentage.toFixed(defaultDecimals)}%
+              </td>
+              <td className="text-center text-white">
+                {t('majorityRequired')}{' '}
+                {requiredMajorityPercentage.toFixed(defaultDecimals)}%
+              </td>
+              <td
+                className="text-right"
+                data-testid="vote-progress-indicator-percentage-against"
+              >
+                {noPercentage.toFixed(defaultDecimals)}%
+              </td>
+            </tr>
+            <tr>
+              <td data-testid="vote-progress-indicator-tokens-for">
+                {' '}
+                {formatNumber(yesTokens, defaultDecimals)}{' '}
+              </td>
+              <td></td>
+              <td
+                data-testid="vote-progress-indicator-tokens-against"
+                className="text-right"
+              >
+                {formatNumber(noTokens, defaultDecimals)}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <p className="mb-6">
+          {t('participation')}
+          {': '}
+          {participationMet ? (
+            <span className="text-vega-green mx-4">{t('met')}</span>
+          ) : (
+            <span className="text-danger mx-4">{t('notMet')}</span>
+          )}{' '}
+          {formatNumber(totalTokensVoted, defaultDecimals)}{' '}
+          {formatNumber(totalTokensPercentage, defaultDecimals)}%
+          <span className="ml-4">
+            ({formatNumber(requiredParticipation, defaultDecimals)}%{' '}
+            {t('governanceRequired')})
+          </span>
+        </p>
+        {proposalType === ProposalType.PROPOSAL_UPDATE_MARKET && (
+          <p>{t('votingThresholdInfo')}</p>
+        )}
+
+        <section className="mt-10">
+          {proposal?.state === ProposalState.STATE_OPEN ? (
+            <SubHeading title={t('castYourVote')} />
+          ) : (
+            <SubHeading title={t('yourVote')} />
+          )}
+
+          {pubKey ? (
+            proposal && (
+              <VoteButtonsContainer
+                voteState={voteState}
+                voteDatetime={voteDatetime}
+                proposalState={proposal.state}
+                proposalId={proposal.id ?? ''}
+                minVoterBalance={minVoterBalance}
+                spamProtectionMinTokens={spamProtectionMinTokens}
+                className="flex"
+                submit={submit}
+                transaction={transaction}
+                dialog={dialog}
+              />
+            )
+          ) : (
+            <RoundedWrapper paddingBottom={true}>
+              <div className="mb-4">
+                <div className="flex items-center gap-2 mb-2">
+                  <Icon name={'info-sign'} />
+                  <div>{t('connectAVegaWalletToVote')}</div>
+                </div>
+                <ExternalLink href="https://blog.vega.xyz/how-to-vote-on-vega-2195d1e52ec5">
+                  {t('findOutMoreAboutHowToVote')}
+                </ExternalLink>
+              </div>
+              <ConnectToVega />
+            </RoundedWrapper>
+          )}
+        </section>
+      </section>
+    </>
+  );
+};

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.spec.tsx

@@ -43,10 +43,7 @@ describe('EpochIndividualRewardsTable', () => {
   it('should render correctly', () => {
     const { getByTestId } = render(
       <AppStateProvider>
-        <EpochIndividualRewardsTable
-          data={mockData}
-          marketCreationQuantumMultiple={'1000'}
-        />
+        <EpochIndividualRewardsTable data={mockData} />
       </AppStateProvider>
     );
     expect(getByTestId('epoch-individual-rewards-table')).toBeInTheDocument();

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.tsx

@@ -8,7 +8,6 @@ import type { EpochIndividualReward } from './generate-epoch-individual-rewards-
 
 interface EpochIndividualRewardsGridProps {
   data: EpochIndividualReward;
-  marketCreationQuantumMultiple: string | null;
 }
 
 interface RewardItemProps {
@@ -70,11 +69,9 @@ const RewardItem = ({
 
 export const EpochIndividualRewardsTable = ({
   data,
-  marketCreationQuantumMultiple,
 }: EpochIndividualRewardsGridProps) => {
   return (
     <RewardsTable
-      marketCreationQuantumMultiple={marketCreationQuantumMultiple}
       dataTestId="epoch-individual-rewards-table"
       epoch={Number(data.epoch)}
     >

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -9,7 +9,6 @@ import { useVegaWallet } from '@vegaprotocol/wallet';
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 import { generateEpochIndividualRewardsList } from './generate-epoch-individual-rewards-list';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';
-import { useNetworkParam } from '@vegaprotocol/network-parameters';
 
 const EPOCHS_PAGE_SIZE = 10;
 
@@ -27,9 +26,6 @@ export const EpochIndividualRewards = ({
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
   const { delegationsPagination } = ENV;
-  const { param: marketCreationQuantumMultiple } = useNetworkParam(
-    'rewards_marketCreationQuantumMultiple'
-  );
 
   const { data, loading, error, refetch } = useRewardsQuery({
     notifyOnNetworkStatusChange: true,
@@ -107,7 +103,6 @@ export const EpochIndividualRewards = ({
           {epochIndividualRewardSummaries.map(
             (epochIndividualRewardSummary) => (
               <EpochIndividualRewardsTable
-                marketCreationQuantumMultiple={marketCreationQuantumMultiple}
                 data={epochIndividualRewardSummary}
               />
             )

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.spec.tsx

@@ -66,10 +66,7 @@ describe('EpochTotalRewardsTable', () => {
   it('should render correctly', () => {
     const { getByTestId } = render(
       <AppStateProvider>
-        <EpochTotalRewardsTable
-          data={mockData}
-          marketCreationQuantumMultiple={'1000'}
-        />
+        <EpochTotalRewardsTable data={mockData} />
       </AppStateProvider>
     );
     expect(getByTestId('epoch-total-rewards-table')).toBeInTheDocument();

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.tsx

@@ -8,7 +8,6 @@ import type { EpochTotalSummary } from './generate-epoch-total-rewards-list';
 
 interface EpochTotalRewardsGridProps {
   data: EpochTotalSummary;
-  marketCreationQuantumMultiple: string | null;
 }
 
 interface RewardItemProps {
@@ -53,14 +52,9 @@ const RewardItem = ({
 
 export const EpochTotalRewardsTable = ({
   data,
-  marketCreationQuantumMultiple,
 }: EpochTotalRewardsGridProps) => {
   return (
-    <RewardsTable
-      marketCreationQuantumMultiple={marketCreationQuantumMultiple}
-      dataTestId="epoch-total-rewards-table"
-      epoch={data.epoch}
-    >
+    <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
       {Array.from(data.assetRewards.values()).map(
         ({ name, rewards, totalAmount, decimals }, i) => (
           <div className="contents" key={i}>

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards.tsx

@@ -6,7 +6,6 @@ import { useEpochAssetsRewardsQuery } from '../home/__generated__/Rewards';
 import { generateEpochTotalRewardsList } from './generate-epoch-total-rewards-list';
 import { EpochTotalRewardsTable } from './epoch-total-rewards-table';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';
-import { useNetworkParam } from '@vegaprotocol/network-parameters';
 
 const EPOCHS_PAGE_SIZE = 10;
 
@@ -19,10 +18,6 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
   const epochId = Number(currentEpoch.id) - 1;
   const totalPages = Math.ceil(epochId / EPOCHS_PAGE_SIZE);
   const { t } = useTranslation();
-  const { param: marketCreationQuantumMultiple } = useNetworkParam(
-    'rewards_marketCreationQuantumMultiple'
-  );
-  console.log(marketCreationQuantumMultiple);
   const [page, setPage] = useState(1);
   const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
     notifyOnNetworkStatusChange: true,
@@ -75,11 +70,7 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
         >
           {Array.from(epochTotalRewardSummaries.values()).map(
             (epochTotalSummary, index) => (
-              <EpochTotalRewardsTable
-                marketCreationQuantumMultiple={marketCreationQuantumMultiple}
-                data={epochTotalSummary}
-                key={index}
-              />
+              <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
             )
           )}
           <Pagination

apps/governance/src/routes/rewards/shared-rewards-table-assets/shared-rewards-table-assets.tsx

@@ -77,11 +77,7 @@ const ColumnHeader = ({
   </div>
 );
 
-const ColumnHeaders = ({
-  marketCreationQuantumMultiple,
-}: {
-  marketCreationQuantumMultiple: string | null;
-}) => {
+const ColumnHeaders = () => {
   const { t } = useTranslation();
   return (
     <div className="contents">
@@ -93,9 +89,7 @@ const ColumnHeaders = ({
         <ColumnHeader
           key={columnTitle}
           title={t(columnTitle)}
-          tooltipContent={t(description, {
-            marketCreationQuantumMultiple,
-          })}
+          tooltipContent={t(description)}
           className={headerGridItemStyles()}
         />
       ))}
@@ -111,7 +105,6 @@ export interface RewardTableProps {
   dataTestId: string;
   epoch: number;
   children: ReactNode;
-  marketCreationQuantumMultiple: string | null;
 }
 
 // Rewards table children will be the row items. Make sure they contain
@@ -120,15 +113,12 @@ export const RewardsTable = ({
   dataTestId,
   epoch,
   children,
-  marketCreationQuantumMultiple,
 }: RewardTableProps) => (
   <div data-testid={dataTestId} className="mb-12">
     <SubHeading title={`EPOCH ${epoch}`} />
 
     <div className={gridStyles}>
-      <ColumnHeaders
-        marketCreationQuantumMultiple={marketCreationQuantumMultiple}
-      />
+      <ColumnHeaders />
       {children}
     </div>
   </div>

apps/governance/src/routes/router-config.tsx

@@ -279,7 +279,7 @@ const routerConfig = [
     ],
   },
   {
-    path: `${Routes.PROTOCOL_UPGRADES}/:proposalReleaseTag/:proposalBlockHeight`,
+    path: `${Routes.PROTOCOL_UPGRADES}/:proposalReleaseTag`,
     element: <LazyProtocolUpgradeProposal />,
   },
   {

apps/trading-e2e/src/integration/order-book.cy.ts

@@ -0,0 +1,117 @@
+const orderbookTab = 'Orderbook';
+const orderbookTable = 'tab-orderbook';
+const askPrice = 'price-9894185';
+const bidPrice = 'price-9889001';
+const askVolume = 'ask-vol-9894185';
+const bidVolume = 'bid-vol-9889001';
+const askCumulative = 'cumulative-vol-9894185';
+const bidCumulative = 'cumulative-vol-9889001';
+const midPrice = 'last-traded-4612690000';
+const priceResolution = 'resolution';
+const dealTicketPrice = 'order-price';
+const dealTicketSize = 'order-size';
+const resPrice = 'price-990';
+
+describe('order book', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setOnBoardingViewed();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.mockTradingPage();
+  });
+
+  it('show order book', () => {
+    // 6003-ORDB-001
+    // 6003-ORDB-002
+    cy.getByTestId(orderbookTab).click();
+    cy.getByTestId(orderbookTable).should('be.visible');
+    cy.getByTestId(orderbookTable).should('not.be.empty');
+  });
+
+  it('show orders prices', () => {
+    // 6003-ORDB-003
+    cy.getByTestId(askPrice).should('have.text', '98.94185');
+    cy.getByTestId(bidPrice).should('have.text', '98.89001');
+  });
+
+  it('show prices volumes', () => {
+    // 6003-ORDB-004
+    cy.getByTestId(askVolume).should('have.text', '1');
+    cy.getByTestId(bidVolume).should('have.text', '1');
+  });
+
+  it('show prices cumulative volumes', () => {
+    // 6003-ORDB-005
+    cy.getByTestId(askCumulative).should('have.text', '38');
+    cy.getByTestId(bidCumulative).should('have.text', '7');
+  });
+
+  it('show mid price', () => {
+    // 6003-ORDB-006
+    cy.getByTestId(midPrice).should('have.text', '46,126.90');
+  });
+
+  it('sort prices descending', () => {
+    // 6003-ORDB-007
+    const prices: number[] = [];
+    cy.getByTestId(orderbookTable).within(() => {
+      cy.get('[data-testid*=price]')
+        .each(($el) => {
+          prices.push(Number($el.text()));
+        })
+        .then(() => {
+          expect(prices).to.deep.equal(prices.sort((a, b) => b - a));
+        });
+    });
+  });
+
+  it('copy price to deal ticket form', () => {
+    // 6003-ORDB-009
+    cy.getByTestId(askPrice).click();
+    cy.getByTestId(dealTicketPrice).should('have.value', '98.94185');
+  });
+
+  it('copy size to deal ticket form', () => {
+    // 6003-ORDB-009
+    cy.getByTestId(bidCumulative).click();
+    cy.getByTestId(dealTicketSize).should('have.value', '7');
+  });
+
+  it('copy size to deal ticket form', () => {
+    // 6003-ORDB-009
+    cy.getByTestId(bidVolume).click();
+    cy.getByTestId(dealTicketSize).should('have.value', '1');
+  });
+
+  it('change price resolution', () => {
+    // 6003-ORDB-008
+    const resolutions = [
+      '0.00000',
+      '0.0000',
+      '0.000',
+      '0.00',
+      '0.0',
+      '0',
+      '10',
+      '100',
+      '1,000',
+      '10,000',
+    ];
+    cy.getByTestId(priceResolution).click();
+    cy.get('[role="menu"]')
+      .find('[role="menuitem"]')
+      .each(($el, index) => {
+        expect($el.text()).to.equal(resolutions[index]);
+      });
+
+    cy.get('[role="menuitem"]').eq(4).click();
+    cy.getByTestId(resPrice).should('have.text', '99.0');
+    cy.getByTestId(askPrice).should('not.exist');
+    cy.getByTestId(bidPrice).should('not.exist');
+  });
+});

apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts

@@ -24,9 +24,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
 
   beforeEach(() => {
     cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-fee-margin-required').within(() => {
-      cy.get('button').click();
-    });
   });
 
   describe('limit order', () => {

apps/trading/.env.mainnet

@@ -16,12 +16,12 @@ 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
 # TAG name of the current app version - TODO: bump to the latest upon release
-NX_APP_VERSION=v0.21.0-core-0.72.14
+NX_APP_VERSION=v0.20.21-core-0.71.6
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
-NX_STOP_ORDERS=true
-NX_ICEBERG_ORDERS=true
+NX_SUCCESSOR_MARKETS=false
+NX_STOP_ORDERS=false
+# NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=false
 

apps/trading/.env.mainnet-mirror

@@ -19,9 +19,9 @@ NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-ma
 NX_APP_VERSION=v0.20.19-core-0.71.6
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
-NX_STOP_ORDERS=true
-NX_ICEBERG_ORDERS=true
+NX_SUCCESSOR_MARKETS=false
+NX_STOP_ORDERS=false
+# NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=false
 

apps/trading/.env.stagnet1

@@ -19,6 +19,6 @@ NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fa
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
-NX_ICEBERG_ORDERS=true
+# NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true

apps/trading/.env.validators-testnet

@@ -19,9 +19,9 @@ NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fa
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
-NX_STOP_ORDERS=true
-NX_ICEBERG_ORDERS=true
+NX_SUCCESSOR_MARKETS=false
+NX_STOP_ORDERS=false
+# NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=false
 

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

@@ -1,49 +1,27 @@
 import React, { useEffect } from 'react';
 import { titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  LocalStoragePersistTabs as Tabs,
-  Tab,
-  TradingAnchorButton,
-} from '@vegaprotocol/ui-toolkit';
+import { LocalStoragePersistTabs as Tabs, Tab } from '@vegaprotocol/ui-toolkit';
 import { Markets } from './markets';
 import { Proposed } from './proposed';
 import { usePageTitleStore } from '../../stores';
 import { Closed } from './closed';
-import {
-  DApp,
-  TOKEN_NEW_MARKET_PROPOSAL,
-  useLinks,
-} from '@vegaprotocol/environment';
 
 export const MarketsPage = () => {
   const { updateTitle } = usePageTitleStore((store) => ({
     updateTitle: store.updateTitle,
   }));
-
-  const tokenLink = useLinks(DApp.Token);
-  const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);
-
   useEffect(() => {
     updateTitle(titlefy(['Markets']));
   }, [updateTitle]);
-
   return (
     <div className="h-full pt-0.5 pb-3 px-1.5">
-      <div className="h-full my-1 border rounded-sm border-default">
+      <div className="h-full my-1 border border-default rounded-sm">
         <Tabs storageKey="console-markets">
           <Tab id="open-markets" name={t('Open markets')}>
             <Markets />
           </Tab>
-          <Tab
-            id="proposed-markets"
-            name={t('Proposed markets')}
-            menu={
-              <TradingAnchorButton size="extra-small" href={externalLink}>
-                {t('Propose a new market')}
-              </TradingAnchorButton>
-            }
-          >
+          <Tab id="proposed-markets" name={t('Proposed markets')}>
             <Proposed />
           </Tab>
           <Tab id="closed-markets" name={t('Closed markets')}>

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

@@ -1,6 +1,24 @@
+import { t } from '@vegaprotocol/i18n';
+import {
+  DApp,
+  TOKEN_NEW_MARKET_PROPOSAL,
+  useLinks,
+} from '@vegaprotocol/environment';
 import { ProposalsList } from '@vegaprotocol/proposals';
+import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { SuccessorMarketRenderer } from './successor-market-cell';
 
 export const Proposed = () => {
-  return <ProposalsList SuccessorMarketRenderer={SuccessorMarketRenderer} />;
+  const tokenLink = useLinks(DApp.Token);
+  const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);
+  return (
+    <>
+      <div className="h-[400px]">
+        <ProposalsList SuccessorMarketRenderer={SuccessorMarketRenderer} />
+      </div>
+      <ExternalLink className="py-4 px-[11px] text-sm" href={externalLink}>
+        {t('Propose a new market')}
+      </ExternalLink>
+    </>
+  );
 };

apps/trading/client-pages/portfolio/account-history-container.tsx

@@ -4,7 +4,7 @@ import { useVegaWallet } from '@vegaprotocol/wallet';
 import compact from 'lodash/compact';
 import uniqBy from 'lodash/uniqBy';
 import type { ChangeEvent } from 'react';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import type { AccountHistoryQuery } from './__generated__/AccountHistory';
 import { useAccountHistoryQuery } from './__generated__/AccountHistory';
 import * as Schema from '@vegaprotocol/types';
@@ -12,13 +12,12 @@ import type { AssetFieldsFragment } from '@vegaprotocol/assets';
 import { useAssetsDataProvider } from '@vegaprotocol/assets';
 import {
   AsyncRenderer,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
   Splash,
   Toggle,
-  TradingButton,
-  TradingDropdown,
-  TradingDropdownContent,
-  TradingDropdownItem,
-  TradingDropdownTrigger,
 } from '@vegaprotocol/ui-toolkit';
 import { AccountTypeMapping } from '@vegaprotocol/types';
 import { PriceChart } from 'pennant';
@@ -151,7 +150,6 @@ const AccountHistoryManager = ({
         )
       : null;
   }, [accounts, marketFilterCb]);
-
   const resolveMarket = useCallback(
     (m: Market) => {
       setMarket(m);
@@ -176,114 +174,111 @@ const AccountHistoryManager = ({
     }),
     [pubKey, asset, accountType, range, market?.id]
   );
-
   const { data } = useAccountHistoryQuery({
     variables,
     skip: !asset || !pubKey,
   });
 
+  const accountTypeMenu = useMemo(() => {
+    return (
+      <DropdownMenu
+        trigger={
+          <DropdownMenuTrigger>
+            {accountType
+              ? `${
+                  AccountTypeMapping[
+                    accountType as keyof typeof Schema.AccountType
+                  ]
+                } Account`
+              : t('Select account type')}
+          </DropdownMenuTrigger>
+        }
+      >
+        <DropdownMenuContent>
+          {[
+            Schema.AccountType.ACCOUNT_TYPE_GENERAL,
+            Schema.AccountType.ACCOUNT_TYPE_BOND,
+            Schema.AccountType.ACCOUNT_TYPE_MARGIN,
+          ].map((type) => (
+            <DropdownMenuItem
+              key={type}
+              onClick={() => setAccountType(type as Schema.AccountType)}
+            >
+              {AccountTypeMapping[type as keyof typeof Schema.AccountType]}
+            </DropdownMenuItem>
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+  }, [accountType]);
+  const assetsMenu = useMemo(() => {
+    return (
+      <DropdownMenu
+        trigger={
+          <DropdownMenuTrigger>
+            {asset ? asset.symbol : t('Select asset')}
+          </DropdownMenuTrigger>
+        }
+      >
+        <DropdownMenuContent>
+          {assets.map((a) => (
+            <DropdownMenuItem key={a.id} onClick={() => setAssetId(a.id)}>
+              {a.symbol}
+            </DropdownMenuItem>
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+  }, [asset, assets, setAssetId]);
+  const marketsMenu = useMemo(() => {
+    return accountType === Schema.AccountType.ACCOUNT_TYPE_MARGIN &&
+      markets?.length ? (
+      <DropdownMenu
+        trigger={
+          <DropdownMenuTrigger>
+            {market
+              ? market.tradableInstrument.instrument.code
+              : t('Select market')}
+          </DropdownMenuTrigger>
+        }
+      >
+        <DropdownMenuContent>
+          {market && (
+            <DropdownMenuItem key="0" onClick={() => setMarket(null)}>
+              {t('All markets')}
+            </DropdownMenuItem>
+          )}
+          {markets?.map((m) => (
+            <DropdownMenuItem key={m.id} onClick={() => resolveMarket(m)}>
+              {m.tradableInstrument.instrument.code}
+            </DropdownMenuItem>
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
+    ) : null;
+  }, [markets, market, accountType, resolveMarket]);
+
+  useEffect(() => {
+    if (
+      accountType !== Schema.AccountType.ACCOUNT_TYPE_MARGIN ||
+      market?.tradableInstrument.instrument.product.settlementAsset.id !==
+        asset?.id
+    ) {
+      setMarket(null);
+    }
+  }, [accountType, asset?.id, market]);
+
   return (
-    <div className="flex flex-col h-full gap-2">
-      <div className="flex flex-wrap justify-between px-1 pt-2 gap-2">
-        <div className="flex items-center gap-1 shrink-0">
-          <TradingDropdown
-            trigger={
-              <TradingDropdownTrigger>
-                <TradingButton size="small">
-                  {accountType
-                    ? `${
-                        AccountTypeMapping[
-                          accountType as keyof typeof Schema.AccountType
-                        ]
-                      } Account`
-                    : t('Select account type')}
-                </TradingButton>
-              </TradingDropdownTrigger>
-            }
-          >
-            <TradingDropdownContent>
-              {[
-                Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-                Schema.AccountType.ACCOUNT_TYPE_BOND,
-                Schema.AccountType.ACCOUNT_TYPE_MARGIN,
-              ].map((type) => (
-                <TradingDropdownItem
-                  key={type}
-                  onClick={() => {
-                    setAccountType(type as Schema.AccountType);
-
-                    // if not a margin account clear any market selection
-                    if (type !== Schema.AccountType.ACCOUNT_TYPE_MARGIN) {
-                      setMarket(null);
-                    }
-                  }}
-                >
-                  {AccountTypeMapping[type as keyof typeof Schema.AccountType]}
-                </TradingDropdownItem>
-              ))}
-            </TradingDropdownContent>
-          </TradingDropdown>
-
-          <TradingDropdown
-            trigger={
-              <TradingDropdownTrigger>
-                <TradingButton size="small">
-                  {asset ? asset.symbol : t('Select asset')}
-                </TradingButton>
-              </TradingDropdownTrigger>
-            }
-          >
-            <TradingDropdownContent>
-              {assets.map((a) => (
-                <TradingDropdownItem
-                  key={a.id}
-                  onClick={() => {
-                    setAssetId(a.id);
-
-                    // if the selected asset is different to the selected market clear the market
-                    if (
-                      a.id !==
-                      market?.tradableInstrument.instrument.product
-                        .settlementAsset.id
-                    ) {
-                      setMarket(null);
-                    }
-                  }}
-                >
-                  {a.symbol}
-                </TradingDropdownItem>
-              ))}
-            </TradingDropdownContent>
-          </TradingDropdown>
-          <TradingDropdown
-            trigger={
-              <TradingDropdownTrigger>
-                <TradingButton size="small">
-                  {market
-                    ? market.tradableInstrument.instrument.code
-                    : t('Select market')}
-                </TradingButton>
-              </TradingDropdownTrigger>
-            }
-          >
-            <TradingDropdownContent>
-              {market && (
-                <TradingDropdownItem key="0" onClick={() => setMarket(null)}>
-                  {t('All markets')}
-                </TradingDropdownItem>
-              )}
-              {markets?.map((m) => (
-                <TradingDropdownItem
-                  key={m.id}
-                  onClick={() => resolveMarket(m)}
-                >
-                  {m.tradableInstrument.instrument.code}
-                </TradingDropdownItem>
-              ))}
-            </TradingDropdownContent>
-          </TradingDropdown>
+    <div className="h-full w-full flex flex-col gap-8">
+      <div className="w-full flex flex-col-reverse lg:flex-row items-start lg:items-center justify-between gap-4 px-2">
+        <div className="flex items-center gap-4 shrink-0">
+          <>
+            {accountTypeMenu}
+            {assetsMenu}
+            {marketsMenu}
+          </>
         </div>
-        <div className="justify-items-end">
+        <div className="pt-1 justify-items-end">
           <Toggle
             id="account-history-date-range"
             name="account-history-date-range"
@@ -292,19 +287,16 @@ const AccountHistoryManager = ({
             onChange={(e: ChangeEvent<HTMLInputElement>) =>
               setRange(e.target.value as keyof typeof DateRange)
             }
-            size="sm"
           />
         </div>
       </div>
-      <div className="flex-1">
+      <div className="h-5/6 px-4">
         {asset && (
-          <div className="h-full">
-            <AccountHistoryChart
-              data={data}
-              accountType={accountType}
-              asset={asset}
-            />
-          </div>
+          <AccountHistoryChart
+            data={data}
+            accountType={accountType}
+            asset={asset}
+          />
         )}
       </div>
     </div>

apps/trading/components/accounts-menu/accounts-menu.tsx

@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { TradingButton } from '@vegaprotocol/ui-toolkit';
+import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
 
 export const AccountsMenu = () => {
@@ -8,6 +8,7 @@ export const AccountsMenu = () => {
   return (
     <>
       <TradingButton
+        intent={Intent.Primary}
         size="extra-small"
         data-testid="open-transfer"
         onClick={() => setView({ type: ViewType.Transfer })}
@@ -15,6 +16,7 @@ export const AccountsMenu = () => {
         {t('Transfer')}
       </TradingButton>
       <TradingButton
+        intent={Intent.Primary}
         size="extra-small"
         onClick={() => setView({ type: ViewType.Deposit })}
       >

apps/trading/components/deposits-menu/deposits-menu.tsx

@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { TradingButton } from '@vegaprotocol/ui-toolkit';
+import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
 
 export const DepositsMenu = () => {
@@ -7,6 +7,7 @@ export const DepositsMenu = () => {
 
   return (
     <TradingButton
+      intent={Intent.Primary}
       size="extra-small"
       onClick={() => setView({ type: ViewType.Deposit })}
       data-testid="deposit-button"

apps/trading/components/market-selector/asset-dropdown.tsx

@@ -1,12 +1,13 @@
 import { t } from '@vegaprotocol/i18n';
 import {
-  TradingDropdown,
-  TradingDropdownCheckboxItem,
-  TradingDropdownContent,
-  TradingDropdownItemIndicator,
-  TradingDropdownTrigger,
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuItemIndicator,
+  DropdownMenuTrigger,
+  VegaIcon,
+  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import { MarketSelectorButton } from './market-selector-button';
 
 type Assets = Array<{ id: string; symbol: string }>;
 
@@ -24,19 +25,17 @@ export const AssetDropdown = ({
   }
 
   return (
-    <TradingDropdown
+    <DropdownMenu
       trigger={
-        <TradingDropdownTrigger data-testid="asset-trigger">
-          <MarketSelectorButton>
-            {triggerText({ assets, checkedAssets })}
-          </MarketSelectorButton>
-        </TradingDropdownTrigger>
+        <DropdownMenuTrigger data-testid="asset-trigger">
+          <TriggerText assets={assets} checkedAssets={checkedAssets} />
+        </DropdownMenuTrigger>
       }
     >
-      <TradingDropdownContent>
+      <DropdownMenuContent>
         {assets?.map((a) => {
           return (
-            <TradingDropdownCheckboxItem
+            <DropdownMenuCheckboxItem
               key={a.id}
               checked={checkedAssets.includes(a.id)}
               onCheckedChange={(checked) => {
@@ -47,16 +46,16 @@ export const AssetDropdown = ({
               data-testid={`asset-id-${a.id}`}
             >
               {a.symbol}
-              <TradingDropdownItemIndicator />
-            </TradingDropdownCheckboxItem>
+              <DropdownMenuItemIndicator />
+            </DropdownMenuCheckboxItem>
           );
         })}
-      </TradingDropdownContent>
-    </TradingDropdown>
+      </DropdownMenuContent>
+    </DropdownMenu>
   );
 };
 
-const triggerText = ({
+const TriggerText = ({
   assets,
   checkedAssets,
 }: {
@@ -73,5 +72,9 @@ const triggerText = ({
     text = t(`${checkedAssets.length} Assets`);
   }
 
-  return text;
+  return (
+    <span className="flex justify-between items-center">
+      {text} <VegaIcon name={VegaIconNames.CHEVRON_DOWN} />
+    </span>
+  );
 };

apps/trading/components/market-selector/index.ts

@@ -1,3 +1,2 @@
 export * from './market-selector';
 export * from './market-selector-item';
-export * from './market-selector-button';

apps/trading/components/market-selector/market-selector-button.tsx

@@ -1,23 +0,0 @@
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import classNames from 'classnames';
-import type { ButtonHTMLAttributes } from 'react';
-import { forwardRef } from 'react';
-
-export const MarketSelectorButton = forwardRef<
-  HTMLButtonElement,
-  ButtonHTMLAttributes<HTMLButtonElement>
->((props, ref) => (
-  <button
-    {...props}
-    className={classNames(
-      'flex items-center justify-between px-2 border rounded gap-1',
-      'border-vega-clight-600 dark:border-vega-cdark-600 bg-vega-clight-700 dark:bg-vega-cdark-700',
-      'text-secondary data-[state=open]:text-vega-clight-50 dark:data-[state=open]:text-vega-cdark-50'
-    )}
-    ref={ref}
-  >
-    {props.children}
-    <VegaIcon name={VegaIconNames.CHEVRON_DOWN} />
-  </button>
-));
-MarketSelectorButton.displayName = 'MarketSelectorButton';

apps/trading/components/market-selector/market-selector-item.tsx

@@ -31,7 +31,7 @@ export const MarketSelectorItem = ({
     <div style={style} role="row">
       <Link
         to={`/markets/${market.id}`}
-        className={classNames('h-full flex items-center gap-2 mx-2 px-2', {
+        className={classNames('h-full flex items-center gap-2 px-4', {
           'hover:bg-vega-clight-700 dark:hover:bg-vega-cdark-700':
             market.id !== currentMarketId,
           'bg-vega-clight-600 dark:bg-vega-cdark-600':
@@ -94,7 +94,7 @@ const MarketData = ({
   return (
     <>
       <div className="w-2/5" role="gridcell">
-        <h3 className="overflow-hidden text-sm text-ellipsis lg:text-base whitespace-nowrap">
+        <h3 className="text-ellipsis text-sm lg:text-base whitespace-nowrap overflow-hidden">
           {market.tradableInstrument.instrument.code}{' '}
           {allProducts && productType && (
             <MarketProductPill productType={productType} />
@@ -107,7 +107,7 @@ const MarketData = ({
         )}
       </div>
       <div
-        className="w-1/5 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis"
+        className="w-1/5 text-xs lg:text-sm whitespace-nowrap text-ellipsis overflow-hidden"
         title={instrument.product.settlementAsset.symbol}
         data-testid="market-selector-price"
         role="gridcell"
@@ -115,14 +115,14 @@ const MarketData = ({
         {price} {instrument.product.settlementAsset.symbol}
       </div>
       <div
-        className="w-1/5 overflow-hidden text-xs text-right lg:text-sm whitespace-nowrap text-ellipsis"
+        className="w-1/5 text-xs lg:text-sm text-right whitespace-nowrap text-ellipsis overflow-hidden"
         title={t('24h vol')}
         data-testid="market-selector-volume"
         role="gridcell"
       >
         {volume}
       </div>
-      <div className="flex justify-end w-1/5" role="gridcell">
+      <div className="w-1/5 flex justify-end" role="gridcell">
         {oneDayCandles && (
           <Sparkline
             width={64}

apps/trading/components/market-selector/market-selector.tsx

@@ -52,7 +52,7 @@ export const MarketSelector = ({
   }, [reload]);
 
   return (
-    <div data-testid="market-selector" className="md:w-[580px]">
+    <div data-testid="market-selector">
       <div className="px-2 pt-2 mb-2">
         <ProductSelector
           product={filter.product}

apps/trading/components/market-selector/product-selector.tsx

@@ -33,14 +33,11 @@ export const ProductSelector = ({
   return (
     <div className="flex mb-2">
       {Object.keys(Product).map((t) => {
-        const classes = classNames(
-          'text-sm px-3 py-1.5 rounded hover:text-vega-clight-50 dark:hover:text-vega-cdark-50',
-          {
-            'bg-vega-clight-500 dark:bg-vega-cdark-500 text-default':
-              t === product,
-            'text-secondary': t !== product,
-          }
-        );
+        const classes = classNames('px-3 py-1.5 rounded', {
+          'bg-vega-clight-500 dark:bg-vega-cdark-500 text-default':
+            t === product,
+          'text-secondary': t !== product,
+        });
         return (
           <button
             key={t}
@@ -56,7 +53,7 @@ export const ProductSelector = ({
       })}
       <Link
         to={Routes.MARKETS}
-        className="flex items-center ml-auto text-sm gap-2"
+        className="flex items-center gap-2 ml-auto"
         title={t('See all markets')}
       >
         <span className="underline underline-offset-4">{t('Browse')}</span>

apps/trading/components/market-selector/sort-dropdown.tsx

@@ -1,14 +1,13 @@
 import {
-  TradingDropdown,
-  TradingDropdownContent,
-  TradingDropdownItemIndicator,
-  TradingDropdownRadioGroup,
-  TradingDropdownRadioItem,
-  TradingDropdownTrigger,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItemIndicator,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import { MarketSelectorButton } from './market-selector-button';
 
 export const Sort = {
   Gained: 'Gained',
@@ -45,23 +44,24 @@ export const SortDropdown = ({
   onSelect: (sort: SortType) => void;
 }) => {
   return (
-    <TradingDropdown
+    <DropdownMenu
       trigger={
-        <TradingDropdownTrigger data-testid="sort-trigger">
-          <MarketSelectorButton>
+        <DropdownMenuTrigger data-testid="sort-trigger">
+          <span className="flex items-center justify-between gap-1">
             {SortTypeMapping[currentSort]}
-          </MarketSelectorButton>
-        </TradingDropdownTrigger>
+            <VegaIcon name={VegaIconNames.CHEVRON_DOWN} />
+          </span>
+        </DropdownMenuTrigger>
       }
     >
-      <TradingDropdownContent>
-        <TradingDropdownRadioGroup
+      <DropdownMenuContent>
+        <DropdownMenuRadioGroup
           value={currentSort}
           onValueChange={(value) => onSelect(value as SortType)}
         >
           {Object.keys(Sort).map((key) => {
             return (
-              <TradingDropdownRadioItem
+              <DropdownMenuRadioItem
                 inset
                 key={key}
                 value={key}
@@ -71,12 +71,12 @@ export const SortDropdown = ({
                   <VegaIcon name={SortIconMapping[key as SortType]} />{' '}
                   {SortTypeMapping[key as SortType]}
                 </span>
-                <TradingDropdownItemIndicator />
-              </TradingDropdownRadioItem>
+                <DropdownMenuItemIndicator />
+              </DropdownMenuRadioItem>
             );
           })}
-        </TradingDropdownRadioGroup>
-      </TradingDropdownContent>
-    </TradingDropdown>
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
   );
 };

apps/trading/components/positions-menu/positions-menu.tsx

@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { TradingButton } from '@vegaprotocol/ui-toolkit';
+import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
 import { usePositionsStore } from '../positions-container';
 
 export const PositionsMenu = () => {
@@ -7,6 +7,7 @@ export const PositionsMenu = () => {
   const toggle = usePositionsStore((store) => store.toggleClosedMarkets);
   return (
     <TradingButton
+      intent={Intent.Primary}
       size="extra-small"
       data-testid="open-transfer"
       onClick={toggle}

apps/trading/components/vega-wallet-container/index.ts

@@ -0,0 +1 @@
+export * from './vega-wallet-container';

apps/trading/components/vega-wallet-container/vega-wallet-container.spec.tsx

@@ -0,0 +1,27 @@
+import { render, screen } from '@testing-library/react';
+import { VegaWalletContainer } from './vega-wallet-container';
+import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { VegaWalletContext } from '@vegaprotocol/wallet';
+import type { PartialDeep } from 'type-fest';
+
+const generateJsx = (context: PartialDeep<VegaWalletContextShape>) => {
+  return (
+    <VegaWalletContext.Provider value={context as VegaWalletContextShape}>
+      <VegaWalletContainer>
+        <div data-testid="child" />
+      </VegaWalletContainer>
+    </VegaWalletContext.Provider>
+  );
+};
+
+describe('VegaWalletContainer', () => {
+  it('doesnt render children if not connected', () => {
+    render(generateJsx({ pubKey: null }));
+    expect(screen.queryByTestId('child')).not.toBeInTheDocument();
+  });
+
+  it('renders children if connected', () => {
+    render(generateJsx({ pubKey: '0x123' }));
+    expect(screen.getByTestId('child')).toBeInTheDocument();
+  });
+});

apps/trading/components/vega-wallet-container/vega-wallet-container.tsx

@@ -0,0 +1,35 @@
+import type { ReactNode } from 'react';
+import { t } from '@vegaprotocol/i18n';
+import { Button, Splash } from '@vegaprotocol/ui-toolkit';
+import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+
+interface VegaWalletContainerProps {
+  children: ReactNode;
+}
+
+export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
+  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+    openVegaWalletDialog: store.openVegaWalletDialog,
+  }));
+  const { pubKey } = useVegaWallet();
+
+  if (!pubKey) {
+    return (
+      <Splash>
+        <div className="text-center">
+          <p className="mb-4" data-testid="connect-vega-wallet-text">
+            {t('Connect your Vega wallet')}
+          </p>
+          <Button
+            onClick={openVegaWalletDialog}
+            data-testid="vega-wallet-connect"
+          >
+            {t('Connect')}
+          </Button>
+        </div>
+      </Splash>
+    );
+  }
+
+  return <>{children}</>;
+};

apps/trading/components/welcome-dialog/telemetry-approval.tsx

@@ -16,32 +16,29 @@ export const TelemetryApproval = ({
   setTelemetryValue,
 }: Props) => {
   return (
-    <div className="flex flex-col">
+    <div className="flex flex-col py-3">
       <div className="mr-4" role="form">
-        <p className="mb-4">
+        <div className="mt-2">
           {t(
             'Help us identify bugs and improve Vega Governance by sharing anonymous usage data.'
           )}
-        </p>
-        <div className="flex items-start mb-2 gap-3">
-          <VegaIcon name={VegaIconNames.EYE_OFF} size={18} />
-          <div className="flex flex-col gap-1">
-            <h6 className="font-semibold">{t('Anonymous')}</h6>
-            <p className="text-muted">
-              {t('Your identity is always anonymous on Vega')}
-            </p>
+        </div>
+        <div className="flex items-center mt-2">
+          <VegaIcon name={VegaIconNames.EYE_OFF} size={24} />
+          <div className="flex flex-col gap-1 ml-6">
+            <div className="font-semibold">{t('Anonymous')}</div>
+            <div>{t('Your identity is always anonymous on Vega')}</div>
           </div>
         </div>
-        <div className="flex items-start mb-4 gap-3">
-          <VegaIcon name={VegaIconNames.COG} size={18} />
-          <div className="flex flex-col gap-1">
-            <h6 className="font-semibold">{t('Optional')}</h6>
-            <p className="text-muted">
-              {t('You can opt out any time via settings')}
-            </p>
+
+        <div className="flex items-center mt-2">
+          <VegaIcon name={VegaIconNames.COG} size={24} />
+          <div className="flex flex-col gap-1 ml-6">
+            <div className="font-semibold">{t('Optional')}</div>
+            <div>{t('You can opt out any time via settings')}</div>
           </div>
         </div>
-        <div className="flex flex-col items-center justify-around gap-2">
+        <div className="flex flex-col justify-around items-center mt-10 gap-4 w-full px-4">
           <TradingButton
             onClick={() => setTelemetryValue('false')}
             size="small"

apps/trading/components/welcome-dialog/welcome-dialog.tsx

@@ -92,7 +92,7 @@ export const WelcomeDialog = () => {
       intent: Intent.Primary,
       content: (
         <>
-          <h3 className="mb-1 text-sm uppercase">
+          <h3 className="text-sm uppercase mb-1">
             {t('Improve vega console')}
           </h3>
           <TelemetryApproval

apps/trading/components/withdrawals-menu/withdrawals-menu.tsx

@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { TradingButton } from '@vegaprotocol/ui-toolkit';
+import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
 
 export const WithdrawalsMenu = () => {
@@ -7,6 +7,7 @@ export const WithdrawalsMenu = () => {
 
   return (
     <TradingButton
+      intent={Intent.Primary}
       size="extra-small"
       onClick={() => setView({ type: ViewType.Withdraw })}
       data-testid="withdraw-dialog-button"

apps/trading/pages/_document.page.tsx

@@ -4,37 +4,22 @@ export default function Document() {
   return (
     <>
       <Head>
-        {/* 
-          meta tags
-          - next advised against using _document for this, so they exist in our 
-          - single page index.page.tsx
-        */}
-
-        {/* icons */}
-        <link
-          rel="icon"
-          type="image/x-icon"
-          href="https://static.vega.xyz/favicon.ico"
-        />
+        <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
         <link
           rel="apple-touch-icon"
           content="https://static.vega.xyz/favicon.ico"
         />
-
-        {/* fonts */}
         <link
           rel="preload"
           href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
           as="font"
           type="font/woff2"
         />
-
-        {/* styles */}
-        <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
-        {/* eslint-disable-next-line @next/next/no-css-tags */}
-        <link rel="stylesheet" href="/preloader.css" media="all" />
-
-        {/* scripts */}
+        <link
+          rel="icon"
+          type="image/x-icon"
+          href="https://static.vega.xyz/favicon.ico"
+        />
         <script src="/theme-setter.js" type="text/javascript" async />
       </Head>
       <Html>

apps/trading/pages/index.page.tsx

@@ -10,16 +10,23 @@ export default function Index() {
   return (
     <>
       <Head>
+        <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta charSet="utf-8" />
+        <link
+          rel="icon"
+          type="image/x-icon"
+          href="https://static.vega.xyz/favicon.ico"
+        />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta name="theme-color" content="#000000" />
-        <meta name="description" content="Vega Protocol - Console" />
+        <meta name="description" content="Vega Protocol - VEGA Console" />
         <meta name="og:type" content="website" />
         <meta name="og:url" content="https://console.vega.xyz/" />
         <meta name="og:title" content="Vega Protocol - Console" />
         <meta name="og:site_name" content="Vega Protocol - Console" />
         <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
+
         <meta
           name="twitter:card"
           content="https://static.vega.xyz/favicon.ico"
@@ -32,6 +39,26 @@ export default function Index() {
         />
         <meta name="twitter:image:alt" content="VEGA logo" />
         <meta name="twitter:site" content="@vegaprotocol" />
+
+        <meta name="description" content="Vega Protocol - Console" />
+        <link
+          rel="apple-touch-icon"
+          content="https://static.vega.xyz/favicon.ico"
+        />
+        <link
+          rel="preload"
+          href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
+          as="font"
+          type="font/woff2"
+        />
+        {/* eslint-disable-next-line @next/next/no-css-tags */}
+        <link rel="stylesheet" href="/preloader.css" media="all" />
+        <link
+          rel="icon"
+          type="image/x-icon"
+          href="https://static.vega.xyz/favicon.ico"
+        />
+        <script src="/theme-setter.js" type="text/javascript" async />
       </Head>
       <ClientRouter />
     </>

libs/aaa/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "extends": ["plugin:@nx/react", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}

libs/aaa/README.md

@@ -1,7 +0,0 @@
-# aaa
-
-This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test aaa` to execute the unit tests via [Jest](https://jestjs.io).

libs/aaa/jest.config.ts

@@ -1,18 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'aaa',
-  preset: '../../jest.preset.js',
-  transform: {
-    '^.+\\.[tj]sx?$': [
-      '@swc/jest',
-      {
-        jsc: {
-          parser: { syntax: 'typescript', tsx: true },
-          transform: { react: { runtime: 'automatic' } },
-        },
-      },
-    ],
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/libs/aaa',
-};

libs/aaa/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@vegaprotocol/aaa",
-  "version": "0.0.1",
-  "peerDependencies": {
-      "react": "18.2.0",
-      "react-dom": "18.2.0"
-  }
-}

libs/aaa/project.json

@@ -1,51 +0,0 @@
-{
-  "name": "aaa",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/aaa/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/aaa/**/*.{ts,tsx,js,jsx}"]
-      }
-    },
-    "build": {
-      "executor": "@nx/rollup:rollup",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/libs/aaa",
-        "tsConfig": "libs/aaa/tsconfig.lib.json",
-        "project": "libs/aaa/package.json",
-        "entryFile": "libs/aaa/src/index.ts",
-        "external": ["react", "react-dom", "react/jsx-runtime"],
-        "rollupConfig": "@nx/react/plugins/bundle-rollup",
-        "compiler": "swc",
-        "format": ["esm", "cjs"],
-        "assets": [
-          {
-            "glob": "libs/aaa/README.md",
-            "input": ".",
-            "output": "."
-          }
-        ]
-      }
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "libs/aaa/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
-      }
-    }
-  }
-}

libs/aaa/src/index.ts

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

libs/aaa/src/lib/aaa.module.css

@@ -1,7 +0,0 @@
-/*
- * Replace this with your own classes
- *
- * e.g.
- * .container {
- * }
-*/

libs/aaa/src/lib/aaa.spec.tsx

@@ -1,10 +0,0 @@
-import { render } from '@testing-library/react';
-
-import Aaa from './aaa';
-
-describe('Aaa', () => {
-  it('should render successfully', () => {
-    const { baseElement } = render(<Aaa />);
-    expect(baseElement).toBeTruthy();
-  });
-});

libs/aaa/src/lib/aaa.tsx

@@ -1,17 +0,0 @@
-import { useState } from 'react';
-import styles from './aaa.module.css';
-
-/* eslint-disable-next-line */
-export interface AaaProps {}
-
-export function Aaa(props: AaaProps) {
-  const [count, setCount] = useState(0);
-  return (
-    <div className={styles['container']}>
-      <h1>Welcome to Aaa!</h1>
-      <button onClick={() => setCount((x) => x + 1)}>{count}</button>
-    </div>
-  );
-}
-
-export default Aaa;

libs/aaa/tsconfig.json

@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "allowJs": false,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "declaration": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ],
-  "extends": "../../tsconfig.base.json"
-}

libs/aaa/tsconfig.lib.json

@@ -1,26 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "types": ["node"],
-    "module": "esnext",
-    "target": "es2017",
-    "declaration": true
-  },
-  "files": [
-    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nx/react/typings/image.d.ts"
-  ],
-  "exclude": [
-    "jest.config.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.js",
-    "src/**/*.test.js",
-    "src/**/*.spec.jsx",
-    "src/**/*.test.jsx"
-  ],
-  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
-}

libs/aaa/tsconfig.spec.json

@@ -1,20 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
-  },
-  "include": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ]
-}

libs/accounts/src/lib/accounts-actions-dropdown.tsx

@@ -2,8 +2,8 @@ import { ETHERSCAN_ADDRESS, useEtherscanLink } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import {
   ActionsDropdown,
-  TradingDropdownCopyItem,
-  TradingDropdownItem,
+  DropdownMenuCopyItem,
+  DropdownMenuItem,
   Link,
   VegaIcon,
   VegaIconNames,
@@ -30,49 +30,49 @@ export const AccountsActionsDropdown = ({
 
   return (
     <ActionsDropdown>
-      <TradingDropdownItem
+      <DropdownMenuItem
         key={'deposit'}
         data-testid="deposit"
         onClick={onClickDeposit}
       >
         <VegaIcon name={VegaIconNames.DEPOSIT} size={16} />
         {t('Deposit')}
-      </TradingDropdownItem>
-      <TradingDropdownItem
+      </DropdownMenuItem>
+      <DropdownMenuItem
         key={'withdraw'}
         data-testid="withdraw"
         onClick={onClickWithdraw}
       >
         <VegaIcon name={VegaIconNames.WITHDRAW} size={16} />
         {t('Withdraw')}
-      </TradingDropdownItem>
-      <TradingDropdownItem
+      </DropdownMenuItem>
+      <DropdownMenuItem
         key={'transfer'}
         data-testid="transfer"
         onClick={onClickTransfer}
       >
         <VegaIcon name={VegaIconNames.TRANSFER} size={16} />
         {t('Transfer')}
-      </TradingDropdownItem>
-      <TradingDropdownItem
+      </DropdownMenuItem>
+      <DropdownMenuItem
         key={'breakdown'}
         data-testid="breakdown"
         onClick={onClickBreakdown}
       >
         <VegaIcon name={VegaIconNames.BREAKDOWN} size={16} />
         {t('View usage breakdown')}
-      </TradingDropdownItem>
-      <TradingDropdownItem
+      </DropdownMenuItem>
+      <DropdownMenuItem
         onClick={(e) => {
           openAssetDialog(assetId, e.target as HTMLElement);
         }}
       >
         <VegaIcon name={VegaIconNames.INFO} size={16} />
         {t('View asset details')}
-      </TradingDropdownItem>
-      <TradingDropdownCopyItem value={assetId} text={t('Copy asset ID')} />
+      </DropdownMenuItem>
+      <DropdownMenuCopyItem value={assetId} text={t('Copy asset ID')} />
       {assetContractAddress && (
-        <TradingDropdownItem>
+        <DropdownMenuItem>
           <Link
             href={etherscanLink(
               ETHERSCAN_ADDRESS.replace(':hash', assetContractAddress)
@@ -84,7 +84,7 @@ export const AccountsActionsDropdown = ({
               {t('View on Etherscan')}
             </span>
           </Link>
-        </TradingDropdownItem>
+        </DropdownMenuItem>
       )}
     </ActionsDropdown>
   );

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

@@ -11,13 +11,9 @@ import type {
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { COL_DEFS } from '@vegaprotocol/datagrid';
-import {
-  Intent,
-  TradingButton,
-  VegaIcon,
-  VegaIconNames,
-  TooltipCellComponent,
-} from '@vegaprotocol/ui-toolkit';
+import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+
+import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   IGetRowsParams,
@@ -190,7 +186,7 @@ export const AccountTable = ({
           ) : (
             <>
               <span className="underline">{valueFormatted}</span>
-              <span className="inline-block ml-2 w-14 text-muted">
+              <span className="ml-2 inline-block w-14 text-muted">
                 {t('0.00%')}
               </span>
             </>
@@ -252,26 +248,26 @@ export const AccountTable = ({
         colId: 'accounts-actions',
         field: 'asset.id',
         ...COL_DEFS.actions,
-        minWidth: showDepositButton ? 105 : COL_DEFS.actions.minWidth,
-        maxWidth: showDepositButton ? 105 : COL_DEFS.actions.maxWidth,
+        minWidth: showDepositButton ? 130 : COL_DEFS.actions.minWidth,
+        maxWidth: showDepositButton ? 130 : COL_DEFS.actions.maxWidth,
         cellRenderer: ({
           value: assetId,
           node,
         }: VegaICellRendererParams<AccountFields, 'asset.id'>) => {
           if (!assetId) return null;
-          if (node.rowPinned && node.data?.balance === '0') {
+          if (node.rowPinned && node.data?.total === '0') {
             return (
               <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
-                <TradingButton
-                  size="extra-small"
-                  intent={Intent.Primary}
+                <Button
+                  size="xs"
+                  variant="primary"
                   data-testid="deposit"
                   onClick={() => {
                     onClickDeposit && onClickDeposit(assetId);
                   }}
                 >
                   <VegaIcon name={VegaIconNames.DEPOSIT} /> {t('Deposit')}
-                </TradingButton>
+                </Button>
               </CenteredGridCellWrapper>
             );
           }

libs/accounts/src/lib/transfer-form.tsx

@@ -8,6 +8,7 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
+  Button,
   TradingFormGroup,
   TradingInput,
   TradingInputError,
@@ -15,7 +16,6 @@ import {
   TradingSelect,
   Tooltip,
   TradingCheckbox,
-  TradingButton,
 } from '@vegaprotocol/ui-toolkit';
 import type { Transfer } from '@vegaprotocol/wallet';
 import { normalizeTransfer } from '@vegaprotocol/wallet';
@@ -276,9 +276,9 @@ export const TransferForm = ({
           decimals={asset?.decimals}
         />
       )}
-      <TradingButton type="submit" fill={true}>
+      <Button type="submit" variant="primary" fill={true}>
         {t('Confirm transfer')}
-      </TradingButton>
+      </Button>
     </form>
   );
 };
@@ -309,8 +309,8 @@ export const TransferFee = ({
   const totalValue = new BigNumber(transferAmount).plus(fee).toString();
 
   return (
-    <div className="flex flex-col mb-4 text-xs gap-2">
-      <div className="flex flex-wrap items-center justify-between gap-1">
+    <div className="mb-4 flex flex-col gap-2 text-xs">
+      <div className="flex justify-between gap-1 items-center flex-wrap">
         <Tooltip
           description={t(
             `The transfer fee is set by the network parameter transfer.fee.factor, currently set to %s`,
@@ -324,7 +324,7 @@ export const TransferFee = ({
           {formatNumber(fee, decimals)}
         </div>
       </div>
-      <div className="flex flex-wrap items-center justify-between gap-1">
+      <div className="flex justify-between gap-1 items-center flex-wrap">
         <Tooltip
           description={t(
             `The total amount to be transferred (without the fee)`
@@ -337,7 +337,7 @@ export const TransferFee = ({
           {formatNumber(amount, decimals)}
         </div>
       </div>
-      <div className="flex flex-wrap items-center justify-between gap-1">
+      <div className="flex justify-between gap-1 items-center flex-wrap">
         <Tooltip
           description={t(
             `The total amount taken from your account. The amount to be transferred plus the fee.`
@@ -384,7 +384,7 @@ export const AddressField = ({
             setIsInput((curr) => !curr);
             onChange();
           }}
-          className="absolute top-0 right-0 ml-auto text-sm underline"
+          className="ml-auto text-sm absolute top-0 right-0 underline"
         >
           {isInput ? t('Select from wallet') : t('Enter manually')}
         </button>

libs/announcements/src/lib/hooks/use-announcement.ts

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 import type { AppNameType, Announcement } from '../schema';
 import { AnnouncementsSchema } from '../schema';
 import { sha256 } from 'ethers/lib/utils';
+import { useLocalStorageSnapshot } from '@vegaprotocol/react-helpers';
 
 const getData = async (name: AppNameType, url: string) => {
   const now = new Date();
@@ -38,8 +39,14 @@ export const useDismissedAnnouncement = (): [
   string | null | undefined,
   (data: object) => void
 ] => {
-  const setDismissed = useCallback((data: object) => console.log('foo'), []);
-  return ['yes', setDismissed];
+  const [dismissed, setDismissedInStorage] = useLocalStorageSnapshot(
+    'dismissed-announcement'
+  );
+  const setDismissed = useCallback(
+    (data: object) => setDismissedInStorage(checksum(data)),
+    [setDismissedInStorage]
+  );
+  return [dismissed, setDismissed];
 };
 
 export const useAnnouncement = (name: AppNameType, url: string) => {

libs/assets/src/lib/asset-details-dialog.tsx

@@ -2,10 +2,9 @@ import { t } from '@vegaprotocol/i18n';
 import {
   Button,
   Dialog,
+  Icon,
   Splash,
   SyntaxHighlighter,
-  VegaIcon,
-  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import { create } from 'zustand';
 import { AssetDetailsTable } from './asset-details-table';
@@ -83,7 +82,7 @@ export const AssetDetailsDialog = ({
   return (
     <Dialog
       title={title}
-      icon={<VegaIcon name={VegaIconNames.INFO} />}
+      icon={<Icon name="info-sign"></Icon>}
       open={open}
       onChange={(isOpen) => onChange(isOpen)}
       onCloseAutoFocus={(e) => {
@@ -98,7 +97,7 @@ export const AssetDetailsDialog = ({
       }}
     >
       {content}
-      <p className="my-4 text-xs">
+      <p className="text-xs my-4">
         {t(
           'There is 1 unit of the settlement asset (%s) to every 1 quote unit.',
           [assetSymbol]

libs/assets/src/lib/asset-details-table.tsx

@@ -3,8 +3,11 @@ import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type * as Schema from '@vegaprotocol/types';
 import type { KeyValueTableRowProps } from '@vegaprotocol/ui-toolkit';
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { CopyWithTooltip, truncateMiddle } from '@vegaprotocol/ui-toolkit';
+import {
+  CopyWithTooltip,
+  Icon,
+  truncateMiddle,
+} from '@vegaprotocol/ui-toolkit';
 import {
   KeyValueTable,
   KeyValueTableRow,
@@ -115,7 +118,7 @@ export const rows: Rows = [
           </EtherscanLink>{' '}
           <CopyWithTooltip text={asset.source.contractAddress}>
             <button title={t('Copy address to clipboard')}>
-              <VegaIcon size={14} name={VegaIconNames.COPY} />
+              <Icon size={3} name="duplicate" />
             </button>
           </CopyWithTooltip>
         </>

libs/candles-chart/src/lib/candles-menu.spec.tsx

@@ -3,31 +3,15 @@ import userEvent from '@testing-library/user-event';
 import { CandlesMenu } from './candles-menu';
 
 describe('CandlesMenu', () => {
-  it('should render with the correct default studies', async () => {
+  it('should render with volume study showing by default', async () => {
     render(<CandlesMenu />);
 
     await userEvent.click(
-      screen.getByRole('button', {
-        name: 'Studies',
+      screen.getByText('Studies', {
+        selector: '[type="button"]',
       })
     );
     expect(await screen.findByRole('menu')).toBeInTheDocument();
     expect(screen.getByText('Volume')).toHaveAttribute('data-state', 'checked');
-    expect(screen.getByText('MACD')).toHaveAttribute('data-state', 'checked');
-  });
-
-  it('should render with the correct default overlays', async () => {
-    render(<CandlesMenu />);
-
-    await userEvent.click(
-      screen.getByRole('button', {
-        name: 'Overlays',
-      })
-    );
-    expect(await screen.findByRole('menu')).toBeInTheDocument();
-    expect(screen.getByText('Moving average')).toHaveAttribute(
-      'data-state',
-      'checked'
-    );
   });
 });

libs/candles-chart/src/lib/candles-menu.tsx

@@ -10,14 +10,13 @@ import {
   studyLabels,
 } from 'pennant';
 import {
-  TradingButton,
-  TradingDropdown,
-  TradingDropdownCheckboxItem,
-  TradingDropdownContent,
-  TradingDropdownItemIndicator,
-  TradingDropdownRadioGroup,
-  TradingDropdownRadioItem,
-  TradingDropdownTrigger,
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuItemIndicator,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
   Icon,
 } from '@vegaprotocol/ui-toolkit';
 import type { IconName } from '@blueprintjs/icons';
@@ -45,76 +44,69 @@ export const CandlesMenu = () => {
   } = useCandlesChartSettings();
   const triggerClasses = 'text-xs';
   const contentAlign = 'end';
-  const triggerButtonProps = { size: 'extra-small' } as const;
 
   return (
     <>
-      <TradingDropdown
+      <DropdownMenu
         trigger={
-          <TradingDropdownTrigger className={triggerClasses}>
-            <TradingButton {...triggerButtonProps}>
-              {t(`Interval: ${intervalLabels[interval]}`)}
-            </TradingButton>
-          </TradingDropdownTrigger>
+          <DropdownMenuTrigger className={triggerClasses}>
+            {t(`Interval: ${intervalLabels[interval]}`)}
+          </DropdownMenuTrigger>
         }
       >
-        <TradingDropdownContent align={contentAlign}>
-          <TradingDropdownRadioGroup
+        <DropdownMenuContent align={contentAlign}>
+          <DropdownMenuRadioGroup
             value={interval}
             onValueChange={(value) => {
               setInterval(value as Interval);
             }}
           >
             {Object.values(Interval).map((timeInterval) => (
-              <TradingDropdownRadioItem
+              <DropdownMenuRadioItem
                 key={timeInterval}
                 inset
                 value={timeInterval}
               >
                 {intervalLabels[timeInterval]}
-                <TradingDropdownItemIndicator />
-              </TradingDropdownRadioItem>
+                <DropdownMenuItemIndicator />
+              </DropdownMenuRadioItem>
             ))}
-          </TradingDropdownRadioGroup>
-        </TradingDropdownContent>
-      </TradingDropdown>
-      <TradingDropdown
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <DropdownMenu
         trigger={
-          <TradingDropdownTrigger className={triggerClasses}>
-            <TradingButton {...triggerButtonProps}>
-              <Icon name={chartTypeIcon.get(chartType) as IconName} />
-            </TradingButton>
-          </TradingDropdownTrigger>
+          <DropdownMenuTrigger className={triggerClasses}>
+            <Icon name={chartTypeIcon.get(chartType) as IconName} />
+          </DropdownMenuTrigger>
         }
       >
-        <TradingDropdownContent align={contentAlign}>
-          <TradingDropdownRadioGroup
+        <DropdownMenuContent align={contentAlign}>
+          <DropdownMenuRadioGroup
             value={chartType}
             onValueChange={(value) => {
               setType(value as ChartType);
             }}
           >
             {Object.values(ChartType).map((type) => (
-              <TradingDropdownRadioItem key={type} inset value={type}>
+              <DropdownMenuRadioItem key={type} inset value={type}>
                 {chartTypeLabels[type]}
-                <TradingDropdownItemIndicator />
-              </TradingDropdownRadioItem>
+                <DropdownMenuItemIndicator />
+              </DropdownMenuRadioItem>
             ))}
-          </TradingDropdownRadioGroup>
-        </TradingDropdownContent>
-      </TradingDropdown>
-      <TradingDropdown
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <DropdownMenu
         trigger={
-          <TradingDropdownTrigger className={triggerClasses}>
-            <TradingButton {...triggerButtonProps}>
-              {t('Overlays')}
-            </TradingButton>
-          </TradingDropdownTrigger>
+          <DropdownMenuTrigger className={triggerClasses}>
+            {t('Overlays')}
+          </DropdownMenuTrigger>
         }
       >
-        <TradingDropdownContent align={contentAlign}>
+        <DropdownMenuContent align={contentAlign}>
           {Object.values(Overlay).map((overlay) => (
-            <TradingDropdownCheckboxItem
+            <DropdownMenuCheckboxItem
               key={overlay}
               checked={overlays.includes(overlay)}
               onCheckedChange={() => {
@@ -129,23 +121,21 @@ export const CandlesMenu = () => {
               }}
             >
               {overlayLabels[overlay]}
-              <TradingDropdownItemIndicator />
-            </TradingDropdownCheckboxItem>
+              <DropdownMenuItemIndicator />
+            </DropdownMenuCheckboxItem>
           ))}
-        </TradingDropdownContent>
-      </TradingDropdown>
-      <TradingDropdown
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <DropdownMenu
         trigger={
-          <TradingDropdownTrigger className={triggerClasses}>
-            <TradingButton {...triggerButtonProps}>
-              {t('Studies')}
-            </TradingButton>
-          </TradingDropdownTrigger>
+          <DropdownMenuTrigger className={triggerClasses}>
+            {t('Studies')}
+          </DropdownMenuTrigger>
         }
       >
-        <TradingDropdownContent align={contentAlign}>
+        <DropdownMenuContent align={contentAlign}>
           {Object.values(Study).map((study) => (
-            <TradingDropdownCheckboxItem
+            <DropdownMenuCheckboxItem
               key={study}
               checked={studies.includes(study)}
               onCheckedChange={() => {
@@ -160,11 +150,11 @@ export const CandlesMenu = () => {
               }}
             >
               {studyLabels[study]}
-              <TradingDropdownItemIndicator />
-            </TradingDropdownCheckboxItem>
+              <DropdownMenuItemIndicator />
+            </DropdownMenuCheckboxItem>
           ))}
-        </TradingDropdownContent>
-      </TradingDropdown>
+        </DropdownMenuContent>
+      </DropdownMenu>
     </>
   );
 };

libs/candles-chart/src/lib/use-candles-chart-settings.ts

@@ -15,8 +15,8 @@ interface StoredSettings {
 const DEFAULT_CHART_SETTINGS = {
   interval: Interval.I15M,
   type: ChartType.CANDLE,
-  overlays: [Overlay.MOVING_AVERAGE],
-  studies: [Study.MACD, Study.VOLUME],
+  overlays: [],
+  studies: [Study.VOLUME],
 };
 
 export const useCandlesChartSettingsStore = create<

libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx

@@ -12,8 +12,6 @@ import { formatRange, formatValue } from '@vegaprotocol/utils';
 import { marketMarginDataProvider } from '@vegaprotocol/accounts';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 
-import * as Accordion from '@radix-ui/react-accordion';
-
 import {
   MARGIN_DIFF_TOOLTIP_TEXT,
   DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
@@ -24,7 +22,6 @@ import {
 } from '../../constants';
 import { useEstimateFees } from '../../hooks';
 import { KeyValue } from './key-value';
-import { TOOLTIP_TRIGGER_CLASS_NAME } from '@vegaprotocol/ui-toolkit';
 
 const emptyValue = '-';
 
@@ -247,72 +244,55 @@ export const DealTicketMarginDetails = ({
 
   return (
     <>
-      <Accordion.Root type="single" collapsible>
-        <Accordion.Item value="margin">
-          <KeyValue
-            id="margin-required"
-            label={
-              <Accordion.Trigger className={TOOLTIP_TRIGGER_CLASS_NAME}>
-                {t('Margin required')}
-              </Accordion.Trigger>
-            }
-            value={formatRange(
-              marginRequiredBestCase,
-              marginRequiredWorstCase,
-              assetDecimals
-            )}
-            formattedValue={formatRange(
-              marginRequiredBestCase,
-              marginRequiredWorstCase,
-              assetDecimals,
-              quantum
-            )}
-            labelDescription={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}
-            symbol={assetSymbol}
-          />
-          <Accordion.Content>
-            <KeyValue
-              label={t('Total margin available')}
-              indent
-              value={formatValue(totalMarginAvailable, assetDecimals)}
-              formattedValue={formatValue(
-                totalMarginAvailable,
-                assetDecimals,
-                quantum
-              )}
-              symbol={assetSymbol}
-              labelDescription={TOTAL_MARGIN_AVAILABLE(
-                formatValue(generalAccountBalance, assetDecimals, quantum),
-                formatValue(marginAccountBalance, assetDecimals, quantum),
-                formatValue(
-                  currentMargins?.maintenanceLevel,
-                  assetDecimals,
-                  quantum
-                ),
-                assetSymbol
-              )}
-            />
-            {deductionFromCollateral}
-            <KeyValue
-              label={t('Current margin allocation')}
-              indent
-              onClick={
-                generalAccountBalance
-                  ? () => setBreakdownDialog(true)
-                  : undefined
-              }
-              value={formatValue(marginAccountBalance, assetDecimals)}
-              symbol={assetSymbol}
-              labelDescription={MARGIN_ACCOUNT_TOOLTIP_TEXT}
-              formattedValue={formatValue(
-                marginAccountBalance,
-                assetDecimals,
-                quantum
-              )}
-            />
-          </Accordion.Content>
-        </Accordion.Item>
-      </Accordion.Root>
+      <KeyValue
+        label={t('Margin required')}
+        value={formatRange(
+          marginRequiredBestCase,
+          marginRequiredWorstCase,
+          assetDecimals
+        )}
+        formattedValue={formatRange(
+          marginRequiredBestCase,
+          marginRequiredWorstCase,
+          assetDecimals,
+          quantum
+        )}
+        labelDescription={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}
+        symbol={assetSymbol}
+      />
+      <KeyValue
+        label={t('Total margin available')}
+        indent
+        value={formatValue(totalMarginAvailable, assetDecimals)}
+        formattedValue={formatValue(
+          totalMarginAvailable,
+          assetDecimals,
+          quantum
+        )}
+        symbol={assetSymbol}
+        labelDescription={TOTAL_MARGIN_AVAILABLE(
+          formatValue(generalAccountBalance, assetDecimals, quantum),
+          formatValue(marginAccountBalance, assetDecimals, quantum),
+          formatValue(currentMargins?.maintenanceLevel, assetDecimals, quantum),
+          assetSymbol
+        )}
+      />
+      {deductionFromCollateral}
+      <KeyValue
+        label={t('Current margin allocation')}
+        indent
+        onClick={
+          generalAccountBalance ? () => setBreakdownDialog(true) : undefined
+        }
+        value={formatValue(marginAccountBalance, assetDecimals)}
+        symbol={assetSymbol}
+        labelDescription={MARGIN_ACCOUNT_TOOLTIP_TEXT}
+        formattedValue={formatValue(
+          marginAccountBalance,
+          assetDecimals,
+          quantum
+        )}
+      />
       {projectedMargin}
       <KeyValue
         label={t('Liquidation price estimate')}

libs/deal-ticket/src/components/deal-ticket/deal-ticket.spec.tsx

@@ -21,8 +21,6 @@ import {
 import * as positionsTools from '@vegaprotocol/positions';
 import { OrdersDocument } from '@vegaprotocol/orders';
 import { formatForInput } from '@vegaprotocol/utils';
-import type { PartialDeep } from 'type-fest';
-import type { Market } from '@vegaprotocol/markets';
 
 jest.mock('zustand');
 jest.mock('./deal-ticket-fee-details', () => ({
@@ -38,19 +36,12 @@ const market = generateMarket();
 const marketData = generateMarketData();
 const submit = jest.fn();
 
-function generateJsx(
-  mocks: MockedResponse[] = [],
-  marketOverrides: PartialDeep<Market> = {}
-) {
-  const joinedMarket: Market = {
-    ...market,
-    ...marketOverrides,
-  } as Market;
+function generateJsx(mocks: MockedResponse[] = []) {
   return (
     <MockedProvider mocks={[...mocks]}>
       <VegaWalletContext.Provider value={{ pubKey, isReadOnly: false } as any}>
         <DealTicket
-          market={joinedMarket}
+          market={market}
           marketData={marketData}
           marketPrice={marketPrice}
           submit={submit}
@@ -376,6 +367,7 @@ describe('DealTicket', () => {
     expect(screen.getByTestId('iceberg')).toBeDisabled();
   });
 
+  // eslint-disable-next-line jest/no-disabled-tests
   it('handles TIF select box dependent on order type', async () => {
     render(generateJsx());
 
@@ -541,25 +533,6 @@ describe('DealTicket', () => {
     expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
   });
 
-  it('validates size when positionDecimalPlaces is negative', async () => {
-    render(generateJsx([], { positionDecimalPlaces: -4 }));
-    const sizeErrorMessage = 'deal-ticket-error-message-size';
-    const sizeInput = 'order-size';
-    await userEvent.click(screen.getByTestId('place-order'));
-    // default value should be invalid
-    expect(screen.getByTestId(sizeErrorMessage)).toBeInTheDocument();
-    expect(screen.getByTestId(sizeErrorMessage)).toHaveTextContent(
-      'Size cannot be lower than 10000'
-    );
-    await userEvent.type(screen.getByTestId(sizeInput), '10001');
-    expect(screen.getByTestId(sizeErrorMessage)).toHaveTextContent(
-      'Size must be a multiple of 10000 for this market'
-    );
-    await userEvent.clear(screen.getByTestId(sizeInput));
-    await userEvent.type(screen.getByTestId(sizeInput), '10000');
-    expect(screen.queryByTestId(sizeErrorMessage)).toBeNull();
-  });
-
   it('validates iceberg field', async () => {
     const peakSizeErrorMessage = 'deal-ticket-peak-error-message';
     const minimumSizeErrorMessage = 'deal-ticket-minimum-error-message';

libs/deal-ticket/src/components/deal-ticket/key-value.tsx

@@ -3,8 +3,7 @@ import classnames from 'classnames';
 import type { ReactNode } from 'react';
 
 export interface KeyValuePros {
-  id?: string;
-  label: ReactNode;
+  label: string;
   value?: string | null | undefined;
   symbol: string;
   indent?: boolean | undefined;
@@ -14,7 +13,6 @@ export interface KeyValuePros {
 }
 
 export const KeyValue = ({
-  id,
   label,
   value,
   labelDescription,
@@ -33,11 +31,9 @@ export const KeyValue = ({
   );
   return (
     <div
-      data-testid={`deal-ticket-fee-${
-        !id && typeof label === 'string'
-          ? label.toLocaleLowerCase().replace(/\s/g, '-')
-          : id
-      }`}
+      data-testid={
+        'deal-ticket-fee-' + label.toLocaleLowerCase().replace(/\s/g, '-')
+      }
       key={typeof label === 'string' ? label : 'value-dropdown'}
       className={classnames(
         'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',