build(explorer): update validator testnet be url

The environment file for validator testnet contains an old URL that no longer works. This updates it.

- Update block explorer api url

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

@@ -4,54 +4,14 @@ on:
   push:
     branches:
       - release/*
-      - develop
   pull_request:
     types:
       - opened
-      - ready_for_review
       - reopened
-      - edited
       - synchronize
+      - ready_for_review
 jobs:
-  node-modules:
-    runs-on: ubuntu-22.04
-    name: 'Cache yarn modules'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Cache node modules
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-          # comment out "resotre-keys" if you need to rebuild yarn from 0
-          restore-keys: |
-            ${{ runner.os }}-cache-node-modules-
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: steps.cache.outputs.cache-hit != 'true'
-        with:
-          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
-
-  lint-pr-title:
-    needs: node-modules
-    if: ${{ github.event_name == 'pull_request' }}
-    name: Verify PR title
-    uses: ./.github/workflows/lint-pr.yml
-    secrets: inherit
-
   lint-test-build:
-    timeout-minutes: 20
-    needs: node-modules
     runs-on: ubuntu-22.04
     name: '(CI) lint + unit test + build'
     steps:
@@ -67,11 +27,8 @@ jobs:
           # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
           cache: yarn
 
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         uses: nrwl/nx-set-shas@v3
@@ -91,7 +48,7 @@ jobs:
         run: yarn nx affected:test
 
       - name: Build affected
-        run: yarn nx affected:build || (yarn install && yarn nx affected:build)
+        run: yarn nx affected:build
 
       # See affected apps
       - name: See affected apps
@@ -138,43 +95,6 @@ jobs:
     with:
       projects: ${{ needs.lint-test-build.outputs.projects }}
 
-  dist-check:
-    runs-on: ubuntu-latest
-    needs: publish-dist
-    if: ${{ github.event_name == 'pull_request' }}
-    name: '(CD) comment preview links'
-    steps:
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body-includes: Previews
-
-      - name: Inject slug/short variables
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: rlespinasse/github-slug-action@v4
-        with:
-          prefix: CI_
-
-      - name: Create comment
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Previews
-            - explorer https://explorer.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - trading https://trading.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - governance https://governance.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-
-  cypress-check:
-    name: '(CI) cypress - check'
-    runs-on: ubuntu-latest
-    needs: cypress
-    steps:
-      - run: echo Done!
-
   # Report single result at the end, to avoid mess with required checks in PR
   cypress-result:
     if: ${{ always() }}

.github/workflows/cypress-run.yml

@@ -72,18 +72,6 @@ jobs:
           CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
           CYPRESS_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}
 
-      ######
-      ## Show test summary on github page
-      ######
-
-      - name: Show test summary
-        if: success() || failure()
-        uses: dorny/test-reporter@v1
-        with:
-          name: UI Tests
-          path: mochawesome.json
-          reporter: mocha-json
-
       ######
       ## Upload logs
       ######
@@ -103,5 +91,5 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: ${{ failure() }}
         with:
-          name: test-report
-          path: frontend-monorepo/apps/trading-e2e/reports
+          name: logs-${{ matrix.project }}
+          path: /home/runner/.vegacapsule/testnet/logs

.github/workflows/lint_pr.yml

@@ -2,11 +2,15 @@
 name: Verify PR title
 
 on:
-  workflow_call:
-
+  pull_request:
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - edited
+      - synchronize
 jobs:
   lint_pr:
-    timeout-minutes: 10
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -19,11 +23,8 @@ jobs:
           # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
           cache: yarn
 
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile
 
       - name: Check PR title
         run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js

.github/workflows/publish-dist.yml

@@ -15,7 +15,6 @@ jobs:
         app: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.app }}
     runs-on: ubuntu-22.04
-    timeout-minutes: 20
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -37,131 +36,66 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
       # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Define variables
+      - name: Check node version
+        id: tags
         run: |
-          envName=''
-          dockerfile="dist.Dockerfile"
-          if [[ "${{ github.event_name }}" = "push" ]]; then
-            domain="vega.rocks"
-            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
-                domain="vega.community"
-                if [[ "${{ matrix.app }}" = "trading" ]]; then
-                  dockerfile="ipfs.Dockerfile"
-                fi
-              fi
-            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet3"
-            fi
-            bucketName="${{ matrix.app }}.${envName}.${domain}"
-            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
-          fi
           nodeVersion=$(cat .nvmrc | head -n 1)
-          echo ENV_NAME=${envName} >> $GITHUB_ENV
-          echo NODE_VERSION=${nodeVersion} >> $GITHUB_ENV
-          echo DOCKERFILE=docker/${dockerfile} >> $GITHUB_ENV
+          echo ::set-output name=nodeVersion::${nodeVersion}
 
-      - name: Build local dist
-        if: ${{ env.DOCKERFILE != 'docker/ipfs.Dockerfile' }}
-        run: |
-          flags=""
-          if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            if [[ "${{ env.ENV_NAME }}" != "ops-vega" ]]; then
-              flags="--env=${{ env.ENV_NAME }}"
-            fi
+          if [[ "${{ github.event_name }}" = "push" ]]; then
+            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+            bucketName="${{ github.event.repository.name }}-$envName"
+            echo ::set-output name=bucketName::${bucketName}
+            echo ::set-output name=envName::${envName}
           fi
 
-          if [ "${{ matrix.app }}" = "trading" ]; then
-            yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
-            DIST_LOCATION=dist/apps/trading/exported
-          else
-            yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
-            DIST_LOCATION=dist/apps/${{ matrix.app }}
-          fi
-          mv $DIST_LOCATION dist-result
-          tree dist-result
-
       - name: Build and export to local Docker
         id: docker_build
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
         uses: docker/build-push-action@v3
         with:
-          context: .
-          file: ${{ env.DOCKERFILE }}
           load: true
           build-args: |
             APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
-            ENV_NAME=${{ env.ENV_NAME }}
+            NODE_VERSION=${{ steps.tags.outputs.nodeVersion }}
+            ENV_NAME=${{ steps.tags.outputs.envName || '' }}
           tags: |
             ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
 
-      - name: Image digest
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
-        run: echo ${{ steps.docker_build.outputs.digest }}
-
       - name: Sanity check docker image
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
         run: |
           echo "Check ipfs-hash"
-          if [[ "${{ env.DOCKERFILE }}" = "docker/ipfs.Dockerfile" ]];  then
-            docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          fi
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat ipfs-hash
 
           echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree .'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local ls -lah
 
-      - name: Copy dist to local filesystem
-        if: ${{ env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' }}
-        run: |
+          echo "Copy dist to local filesystem"
           docker create --name=dist ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
           docker cp dist:/usr/share/nginx/html dist
 
-          echo "check local dist files"
-          tree dist/html
-          mv dist/html dist-result
+          echo "Check local dist"
+          ls -al dist
 
       - name: Publish dist as docker image
         uses: docker/build-push-action@v3
         if: ${{ github.event_name == 'pull_request' }}
         with:
-          context: .
-          file: ${{ env.DOCKERFILE }}
           push: true
           build-args: |
             APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
-            ENV_NAME=${{ env.ENV_NAME }}
+            NODE_VERSION=${{ steps.tags.outputs.nodeVersion }}
           tags: |
             ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
 
-      # bucket creation in github.com/vegaprotocol/terraform//frontend
-      - name: Publish dist to s3
-        uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' }}
-        with:
-          args: --acl private --follow-symlinks --delete
-        env:
-          AWS_S3_BUCKET: ${{ env.BUCKET_NAME }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: 'eu-west-1'
-          SOURCE_DIR: 'dist-result'
+      # - uses: shallwefootball/s3-upload-action@master
+      #   if: ${{ github.event_name == 'push' }}
+      #   name: Upload dist S3
+      #   with:
+      #     aws_key_id: ${{ secrets.AWS_KEY_ID }}
+      #     aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+      #     aws_bucket: ${{ steps.tags.outputs.bucketName }}
+      #     source_dir: 'dist'
 
       - name: Add preview label
         uses: actions-ecosystem/action-add-labels@v1
@@ -169,3 +103,6 @@ jobs:
         with:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

@@ -46,6 +46,3 @@ cypress.env.json
 
 # Next.js
 .next
-
-#cypress
-/apps/trading-e2e/cypress/reports/html

Dockerfile

@@ -13,7 +13,7 @@ RUN apk add --update --no-cache \
 COPY . ./
 RUN yarn --network-timeout 100000 --pure-lockfile
 # work around for different build process in trading
-RUN sh docker/docker-build.sh
+RUN sh ./docker-build.sh
 
 # Server environment
 # if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
@@ -23,7 +23,6 @@ FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a
 EXPOSE 80
 # Copy dist
 WORKDIR /usr/share/nginx/html
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY --from=build /app/dist/apps/${APP}/* /usr/share/nginx/html
-RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > /ipfs-hash; apk del go-ipfs
+COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/dist/apps/${APP} /usr/share/nginx/html
+RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > ipfs-hash; apk del go-ipfs

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

@@ -10,7 +10,7 @@ export const Footer = () => {
   const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
   const { screenSize } = useScreenDimensions();
   const showFullFeedbackLabel = useMemo(
-    () => ['md', 'lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
+    () => ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
     [screenSize]
   );
 

apps/explorer/src/app/routes/layout.tsx

@@ -38,16 +38,14 @@ const DialogsContainer = () => {
 export const Layout = () => {
   const isHome = Boolean(useMatch(Routes.HOME));
   const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
-  const fixedWidthClasses = 'w-full max-w-[1500px] mx-auto';
-
   return (
     <>
       <div
         className={classNames(
-          'min-h-screen',
+          'max-w-[1500px] min-h-[100vh]',
           'mx-auto my-0',
           'grid grid-rows-[auto_1fr_auto] grid-cols-1',
-          'border-vega-light-200 dark:border-vega-dark-200',
+          'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
           'antialiased text-black dark:text-white',
           'overflow-hidden relative'
         )}
@@ -61,13 +59,13 @@ export const Layout = () => {
           )}
           <Header />
         </div>
-        <div className={fixedWidthClasses}>
+        <div>
           <main className="p-4">
             {!isHome && <BreadcrumbsContainer className="mb-4" />}
             <Outlet />
           </main>
         </div>
-        <div className={fixedWidthClasses}>
+        <div>
           <Footer />
         </div>
       </div>

apps/governance-e2e/src/integration/flow/proposal-details.cy.ts

@@ -44,8 +44,7 @@ describe(
   function () {
     before('connect wallets and set approval limit', function () {
       cy.visit('/');
-      ethereumWalletConnect();
-      cy.associateTokensToVegaWallet('1');
+      vegaWalletSetSpecifiedApprovalAmount('1000');
     });
 
     beforeEach('visit proposals tab', function () {
@@ -214,7 +213,6 @@ describe(
 
     // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060
     it('Newly created proposal details - ability to increase associated tokens - by voting again after association', function () {
-      vegaWalletSetSpecifiedApprovalAmount('1000');
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getSubmittedProposalFromProposalList(rawProposal.rationale.title)

apps/governance-e2e/src/integration/flow/proposal-enacted.cy.ts

@@ -13,6 +13,7 @@ import {
   createUpdateNetworkProposalTxBody,
   createFreeFormProposalTxBody,
 } from '../../support/proposal.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';
 
@@ -32,6 +33,10 @@ context(
     before('Connect wallets and set approval', function () {
       cy.visit('/');
       vegaWalletSetSpecifiedApprovalAmount('1000');
+      cy.connectVegaWallet();
+      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      cy.clearLocalStorage();
     });
 
     beforeEach('visit proposals', function () {
@@ -109,7 +114,7 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.get(openProposals, { timeout: 6000 }).within(() => {
+      cy.get(openProposals).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil('[data-testid="proposals-list-item"]')
           .within(() => cy.get(viewProposalButton).click());

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

@@ -232,7 +232,7 @@ context(
 
     it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
       const errorMsg =
-        'Invalid params: the transaction does not use a valid Vega command: unknown field "unexpected" in vega.commands.v1.ProposalSubmission';
+        'Invalid params: the transaction does not use a valid Vega command: unknown field unexpected" in vega.commands.v1.ProposalSubmission';
 
       // 3001-VOTE-038 3002-PROP-013 3002-PROP-014
       goToMakeNewProposal(governanceProposalType.RAW);
@@ -313,7 +313,7 @@ context(
 
     it('Unable to vote on a proposal - when vega wallet disconnected - option to connect from within', function () {
       createRawProposal();
-      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="manage-vega-wallet"]').click();
       cy.get('[data-testid="disconnect"]').click();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getSubmittedProposalFromProposalList(

apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts

@@ -218,7 +218,7 @@ context(
 
     it('Unable to submit new market proposal with missing/invalid fields', function () {
       const errorMsg =
-        'Invalid params: the transaction does not use a valid Vega command: unknown field "invalid" in vega.NewMarket';
+        'Invalid params: the transaction is not a valid Vega command: unknown field "filters" in vega.DataSourceDefinition';
 
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
       cy.get(newProposalSubmitButton).should('be.visible').click();
@@ -436,7 +436,7 @@ context(
       });
     });
 
-    it('Able to submit update asset proposal using max deadline', function () {
+    it.only('Able to submit update asset proposal using max deadline', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
       cy.get(maxVoteDeadline).click();

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -25,11 +25,11 @@ const vegaWalletUnstakedBalance =
   '[data-testid="vega-wallet-balance-unstaked"]';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
-const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
+const ethWalletAssociateButton = '[data-testid="associate-btn"]';
 const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
-const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
+const ethWalletDissociateButton = '[href="/token/disassociate"]';
 const vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
 const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
 const connectedVegaKey = '[data-testid="connected-vega-key"]';
@@ -78,12 +78,12 @@ context(
 
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          6
+          3
         );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
 
         // 0005-ETXN-002
         verifyEthWalletAssociatedBalance('2.0');
@@ -111,12 +111,12 @@ context(
         stakingPageDisassociateTokens('2');
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          6
+          3
         );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
         cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
           'not.exist'
         );
@@ -192,12 +192,12 @@ context(
 
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          6
+          3
         );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get(vegaWallet).within(() => {
@@ -210,12 +210,12 @@ context(
         });
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          6
+          3
         );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '1.00');
         validateWalletCurrency('Total associated after pending', '1.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
         verifyEthWalletAssociatedBalance('1.0');
         verifyEthWalletTotalAssociatedBalance('1.0');
       });
@@ -266,7 +266,7 @@ context(
         // 1004-ASSO-008
         // 1004-ASSO-010
         // No warning visible as described in AC, but the button is disabled
-        cy.get(ethWalletAssociateButton).click();
+        cy.get(ethWalletAssociateButton).first().click();
         cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
         cy.get(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
         cy.get(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
@@ -278,12 +278,12 @@ context(
         vegaWalletAssociate('2');
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          6
+          3
         );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
         validateWalletCurrency('Associated', '2.00');
       });
 
@@ -294,24 +294,24 @@ context(
         });
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          6
+          3
         );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
         validateWalletCurrency('Associated', '0.00');
       });
 
       it('Able to associate tokens to different public key of connected vega wallet', function () {
-        cy.get(ethWalletAssociateButton).click();
+        cy.get(ethWalletAssociateButton).first().click();
         cy.get(associateWalletRadioButton).click();
         cy.get(connectedVegaKey).should(
           'have.text',
           Cypress.env('vegaWalletPublicKey')
         );
 
-        cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+        cy.get('[data-testid="manage-vega-wallet"]').click();
         cy.get('[data-testid="select-keypair-button"]').eq(0).click();
         cy.get(connectedVegaKey).should(
           'have.text',

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

@@ -166,7 +166,6 @@ export function goToMakeNewProposal(proposalType: string) {
   navigateTo(navigation.proposals);
   cy.get(newProposalButton).should('be.visible').click();
   cy.url().should('include', '/proposals/propose');
-  cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
   cy.get('li').should('contain.text', proposalType).and('be.visible');
   cy.get('li').contains(proposalType).click();
 }

apps/governance-e2e/src/support/wallet-teardown.functions.ts

@@ -8,7 +8,6 @@ import {
 } from '@vegaprotocol/smart-contracts';
 import { ethers, Wallet } from 'ethers';
 
-const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
 const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
@@ -60,7 +59,7 @@ export async function faucetAsset(assetEthAddress: string) {
 }
 
 export async function vegaWalletTeardown() {
-  cy.get(associatedAmountInWallet)
+  cy.get('[data-testid="associated-amount"]')
     .should('be.visible')
     .invoke('text')
     .then((associatedAmount) => {
@@ -69,12 +68,12 @@ export async function vegaWalletTeardown() {
           $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
           associatedAmount != '0.00'
         ) {
-          vegaWalletTeardownStaking(stakingBridgeContract);
           vegaWalletTeardownVesting(vestingContract);
+          vegaWalletTeardownStaking(stakingBridgeContract);
         }
       });
       cy.get(vegaWalletContainer).within(() => {
-        cy.get(associatedAmountInWallet, {
+        cy.getByTestId('associated-amount', {
           timeout: transactionTimeout,
         }).contains('0.00', {
           timeout: transactionTimeout,
@@ -91,7 +90,7 @@ export async function vegaWalletSetSpecifiedApprovalAmount(
   await promiseWithTimeout(
     token.approve(
       ethStakingBridgeContractAddress,
-      resetAmount + '0'.repeat(18)
+      resetAmount.concat('000000000000000000')
     ),
     10 * 60 * 1000,
     'set approval amount'
@@ -105,23 +104,12 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
     { timeout: transactionTimeout, log: false }
   ).then((stakeBalance) => {
     if (Number(stakeBalance) != 0) {
-      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
-        () => {
-          cy.get(associatedAmountInWallet)
-            .invoke('text')
-            .then(($walletAmount) => {
-              cy.wrap(
-                stakingBridgeContract.remove_stake(
-                  String(stakeBalance),
-                  vegaWalletPubKey
-                ),
-                { timeout: transactionTimeout, log: false }
-              );
-              cy.get(associatedAmountInWallet, {
-                timeout: transactionTimeout,
-              }).should('not.have.text', $walletAmount);
-            });
-        }
+      cy.wrap(
+        stakingBridgeContract.remove_stake(
+          String(stakeBalance),
+          vegaWalletPubKey
+        ),
+        { timeout: transactionTimeout, log: false }
       );
     }
   });
@@ -136,6 +124,7 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
     if (Number(vestingAmount) != 0) {
       // Wait needed to allow time for ganache to process tx for stakingBridgeContract.remove_stake
       // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(1000);
       cy.wrap(
         vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
         { timeout: transactionTimeout, log: false }

apps/governance/.env.validator-testnet

@@ -8,4 +8,3 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/src/components/page-templates/app-layout.tsx

@@ -1,19 +1,15 @@
 import classNames from 'classnames';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { ReactNode } from 'react';
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
-import { Nav } from '../nav';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import React from 'react';
 
 interface AppLayoutProps {
   children: ReactNode;
 }
 export const AppLayout = ({ children }: AppLayoutProps) => {
-  const { VEGA_ENV, ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
   const { isReadOnly } = useVegaWallet();
   const AppLayoutClasses = classNames(
-    'app w-full max-w-[1500px] mx-auto grid',
+    'app w-full max-w-[1500px] mx-auto grid min-h-full',
+    'border-neutral-700 lg:border-l lg:border-r',
     'lg:text-body-large',
     {
       'grid-rows-[repeat(2,min-content)_1fr_min-content]': !isReadOnly,
@@ -21,18 +17,5 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
     }
   );
 
-  return (
-    <div className="min-h-full">
-      <div className="lg:text-body-large">
-        {ANNOUNCEMENTS_CONFIG_URL && (
-          <AnnouncementBanner
-            app="governance"
-            configUrl={ANNOUNCEMENTS_CONFIG_URL}
-          />
-        )}
-        <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
-      </div>
-      <div className={AppLayoutClasses}>{children}</div>
-    </div>
-  );
+  return <div className={AppLayoutClasses}>{children}</div>;
 };

apps/governance/src/components/page-templates/template-sidebar.tsx

@@ -1,16 +1,28 @@
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import React from 'react';
 
+import { Nav } from '../nav';
+
 export interface TemplateSidebarProps {
   children: React.ReactNode;
   sidebar: React.ReactNode[];
 }
 
 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
+  const { VEGA_ENV, ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
   const { isReadOnly, pubKey, disconnect } = useVegaWallet();
   return (
     <>
+      {ANNOUNCEMENTS_CONFIG_URL && (
+        <AnnouncementBanner
+          app="governance"
+          configUrl={ANNOUNCEMENTS_CONFIG_URL}
+        />
+      )}
+      <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
       {isReadOnly ? (
         <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
       ) : null}

apps/governance/src/hooks/use-refresh-after-epoch.ts

@@ -1,8 +1,9 @@
+import type { ObservableQuery } from '@apollo/client';
 import { useEffect } from 'react';
 
 export const useRefreshAfterEpoch = (
   epochExpiry: string | undefined,
-  refetch: () => void
+  refetch: ObservableQuery['refetch']
 ) => {
   return useEffect(() => {
     const epochInterval = setInterval(() => {

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

@@ -443,8 +443,8 @@
   "rewardType": "Reward type",
   "rewardsAndFeesReceived": "Rewards and fees received",
   "ThisDoesNotIncludeFeesReceivedForMakersOrLiquidityProviders": "This does not include fees received for makers or liquidity providers",
-  "totalDistributed": "Total distributed",
-  "earnedByMe": "Earned by me",
+  "totalDistributed": "TOTAL DISTRIBUTED",
+  "earnedByMe": "EARNED BY ME",
   "noRewardsHaveBeenDistributedYet": "NO REWARDS HAVE BEEN DISTRIBUTED YET",
   "rewardsColAssetHeader": "ASSET",
   "rewardsColStakingHeader": "STAKING",

apps/governance/src/lib/epoch-pagination.ts

@@ -1,15 +0,0 @@
-export const calculateEpochOffset = ({
-  epochId,
-  page,
-  size,
-}: {
-  epochId: number;
-  page: number;
-  size: number;
-}) => {
-  // offset the epoch by the current page number times the page size while making sure it doesn't go below the minimum epoch value
-  return {
-    fromEpoch: Math.max(0, epochId - size * page) + 1,
-    toEpoch: epochId - size * page + size,
-  };
-};

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

@@ -3,7 +3,7 @@ import { AppStateProvider } from '../../../contexts/app-state/app-state-provider
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 
 const mockData = {
-  epoch: 4441,
+  epoch: '4441',
   rewards: [
     {
       asset: 'tDAI',

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

@@ -1,43 +1,32 @@
-import { useMemo, useEffect, useState, useCallback } from 'react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
-import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
 import { useRewardsQuery } from '../home/__generated__/Rewards';
 import { ENV } from '../../../config';
 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';
 
-const EPOCHS_PAGE_SIZE = 10;
-
-type EpochTotalRewardsProps = {
-  currentEpoch: EpochFieldsFragment;
-};
-
-export const EpochIndividualRewards = ({
-  currentEpoch,
-}: EpochTotalRewardsProps) => {
-  // we start from the previous epoch when displaying rewards data, because the current one has no calculated data while ongoing
-  const epochId = Number(currentEpoch.id) - 1;
-  const totalPages = Math.ceil(epochId / EPOCHS_PAGE_SIZE);
-  const [page, setPage] = useState(1);
+export const EpochIndividualRewards = () => {
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
   const { delegationsPagination } = ENV;
 
-  const { data, loading, error, refetch } = useRewardsQuery({
-    notifyOnNetworkStatusChange: true,
+  const { data, loading, error } = useRewardsQuery({
     variables: {
       partyId: pubKey || '',
-      fromEpoch: epochId - EPOCHS_PAGE_SIZE,
-      toEpoch: epochId,
       delegationsPagination: delegationsPagination
         ? {
             first: Number(delegationsPagination),
           }
         : undefined,
+      // we can use the same value for rewardsPagination as delegationsPagination
+      rewardsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
     skip: !pubKey,
   });
@@ -50,37 +39,8 @@ export const EpochIndividualRewards = ({
 
   const epochIndividualRewardSummaries = useMemo(() => {
     if (!data?.party) return [];
-    return generateEpochIndividualRewardsList({
-      rewards,
-      epochId,
-      page,
-      size: EPOCHS_PAGE_SIZE,
-    });
-  }, [data?.party, epochId, page, rewards]);
-
-  const refetchData = useCallback(
-    async (toPage?: number) => {
-      const targetPage = toPage ?? page;
-      await refetch({
-        partyId: pubKey || '',
-        ...calculateEpochOffset({ epochId, page, size: EPOCHS_PAGE_SIZE }),
-        delegationsPagination: delegationsPagination
-          ? {
-              first: Number(delegationsPagination),
-            }
-          : undefined,
-      });
-      setPage(targetPage);
-    },
-    [epochId, page, refetch, delegationsPagination, pubKey]
-  );
-
-  useEffect(() => {
-    // when the epoch changes, we want to refetch the data to update the current page
-    if (data) {
-      refetchData();
-    }
-  }, [epochId, data, refetchData]);
+    return generateEpochIndividualRewardsList(rewards);
+  }, [data?.party, rewards]);
 
   return (
     <AsyncRenderer
@@ -93,24 +53,17 @@ export const EpochIndividualRewards = ({
             {t('Connected Vega key')}:{' '}
             <span className="text-white">{pubKey}</span>
           </p>
-          {epochIndividualRewardSummaries.map(
-            (epochIndividualRewardSummary) => (
-              <EpochIndividualRewardsTable
-                data={epochIndividualRewardSummary}
-              />
+          {epochIndividualRewardSummaries.length ? (
+            epochIndividualRewardSummaries.map(
+              (epochIndividualRewardSummary) => (
+                <EpochIndividualRewardsTable
+                  data={epochIndividualRewardSummary}
+                />
+              )
             )
+          ) : (
+            <p>{t('noRewards')}</p>
           )}
-          <Pagination
-            isLoading={loading}
-            hasPrevPage={page > 1}
-            hasNextPage={page < totalPages}
-            onBack={() => refetchData(page - 1)}
-            onNext={() => refetchData(page + 1)}
-            onFirst={() => refetchData(1)}
-            onLast={() => refetchData(totalPages)}
-          >
-            {t('Page')} {page}
-          </Pagination>
         </div>
       )}
     />

apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts

@@ -43,16 +43,6 @@ describe('generateEpochIndividualRewardsList', () => {
     epoch: { id: '1' },
   };
 
-  const reward5: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-    amount: '150',
-    percentageOfTotal: '0.15',
-    receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
-    party: { id: 'blah' },
-    epoch: { id: '3' },
-  };
-
   const rewardWrongType: RewardFieldsFragment = {
     rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
     amount: '50',
@@ -64,38 +54,20 @@ describe('generateEpochIndividualRewardsList', () => {
   };
 
   it('should return an empty array if no rewards are provided', () => {
-    expect(
-      generateEpochIndividualRewardsList({ rewards: [], epochId: 1 })
-    ).toEqual([
-      {
-        epoch: 1,
-        rewards: [],
-      },
-    ]);
+    expect(generateEpochIndividualRewardsList([])).toEqual([]);
   });
 
   it('should filter out any rewards of the wrong type', () => {
-    const result = generateEpochIndividualRewardsList({
-      rewards: [rewardWrongType],
-      epochId: 1,
-    });
+    const result = generateEpochIndividualRewardsList([rewardWrongType]);
 
-    expect(result).toEqual([
-      {
-        epoch: 1,
-        rewards: [],
-      },
-    ]);
+    expect(result).toEqual([]);
   });
 
   it('should return reward in the correct format', () => {
-    const result = generateEpochIndividualRewardsList({
-      rewards: [reward1],
-      epochId: 1,
-    });
+    const result = generateEpochIndividualRewardsList([reward1]);
 
     expect(result[0]).toEqual({
-      epoch: 1,
+      epoch: '1',
       rewards: [
         {
           asset: 'USD',
@@ -133,24 +105,21 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('should return an array sorted by epoch descending', () => {
     const rewards = [reward1, reward2, reward3, reward4];
-    const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
+    const result1 = generateEpochIndividualRewardsList(rewards);
 
-    expect(result1[0].epoch).toEqual(2);
-    expect(result1[1].epoch).toEqual(1);
+    expect(result1[0].epoch).toEqual('2');
+    expect(result1[1].epoch).toEqual('1');
 
     const reorderedRewards = [reward4, reward3, reward2, reward1];
-    const result2 = generateEpochIndividualRewardsList({
-      rewards: reorderedRewards,
-      epochId: 2,
-    });
+    const result2 = generateEpochIndividualRewardsList(reorderedRewards);
 
-    expect(result2[0].epoch).toEqual(2);
-    expect(result2[1].epoch).toEqual(1);
+    expect(result2[0].epoch).toEqual('2');
+    expect(result2[1].epoch).toEqual('1');
   });
 
   it('correctly calculates the total value of rewards for an asset', () => {
     const rewards = [reward1, reward4];
-    const result = generateEpochIndividualRewardsList({ rewards, epochId: 1 });
+    const result = generateEpochIndividualRewardsList(rewards);
 
     expect(result[0].rewards[0].totalAmount).toEqual('200');
   });
@@ -158,11 +127,11 @@ describe('generateEpochIndividualRewardsList', () => {
   it('returns data in the expected shape', () => {
     // Just sanity checking the whole structure here
     const rewards = [reward1, reward2, reward3, reward4];
-    const result = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
+    const result = generateEpochIndividualRewardsList(rewards);
 
     expect(result).toEqual([
       {
-        epoch: 2,
+        epoch: '2',
         rewards: [
           {
             asset: 'GBP',
@@ -227,165 +196,7 @@ describe('generateEpochIndividualRewardsList', () => {
         ],
       },
       {
-        epoch: 1,
-        rewards: [
-          {
-            asset: 'USD',
-            totalAmount: '200',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '100',
-                percentageOfTotal: '0.1',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '100',
-                percentageOfTotal: '0.1',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-        ],
-      },
-    ]);
-  });
-
-  it('returns data correctly for the requested epoch range', () => {
-    const rewards = [reward1, reward2, reward3, reward4, reward5];
-    const resultPageOne = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 3,
-      page: 1,
-      size: 2,
-    });
-
-    expect(resultPageOne).toEqual([
-      {
-        epoch: 3,
-        rewards: [
-          {
-            asset: 'USD',
-            totalAmount: '150',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '150',
-                percentageOfTotal: '0.15',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-        ],
-      },
-      {
-        epoch: 2,
-        rewards: [
-          {
-            asset: 'GBP',
-            totalAmount: '200',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '200',
-                percentageOfTotal: '0.2',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-          {
-            asset: 'EUR',
-            totalAmount: '50',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '50',
-                percentageOfTotal: '0.05',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-        ],
-      },
-    ]);
-
-    const resultPageTwo = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 3,
-      page: 2,
-      size: 2,
-    });
-
-    expect(resultPageTwo).toEqual([
-      {
-        epoch: 1,
+        epoch: '1',
         rewards: [
           {
             asset: 'USD',

apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.ts

@@ -2,10 +2,9 @@ import { BigNumber } from '../../../lib/bignumber';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
 import type { RewardFieldsFragment } from '../home/__generated__/Rewards';
 import type { AccountType } from '@vegaprotocol/types';
-import { calculateEpochOffset } from '../../../lib/epoch-pagination';
 
 export interface EpochIndividualReward {
-  epoch: number;
+  epoch: string;
   rewards: {
     asset: string;
     totalAmount: string;
@@ -28,29 +27,11 @@ const emptyRowAccountTypes = accountTypes.map((type) => [
   },
 ]);
 
-export const generateEpochIndividualRewardsList = ({
-  rewards,
-  epochId,
-  page = 1,
-  size = 10,
-}: {
-  rewards: RewardFieldsFragment[];
-  epochId: number;
-  page?: number;
-  size?: number;
-}) => {
-  const map: Map<string, EpochIndividualReward> = new Map();
-  const { fromEpoch, toEpoch } = calculateEpochOffset({ epochId, page, size });
-
-  for (let i = toEpoch; i >= fromEpoch; i--) {
-    map.set(i.toString(), {
-      epoch: i,
-      rewards: [],
-    });
-  }
-
+export const generateEpochIndividualRewardsList = (
+  rewards: RewardFieldsFragment[]
+) => {
   // We take the rewards and aggregate them by epoch and asset.
-  const epochIndividualRewards = rewards.reduce((acc, reward) => {
+  const epochIndividualRewards = rewards.reduce((map, reward) => {
     const epochId = reward.epoch.id;
     const assetName = reward.asset.name;
     const rewardType = reward.rewardType;
@@ -59,14 +40,14 @@ export const generateEpochIndividualRewardsList = ({
 
     // if the rewardType is not of a type we display in the table, we skip it.
     if (!accountTypes.includes(rewardType)) {
-      return acc;
+      return map;
     }
 
-    if (!acc.has(epochId)) {
-      return acc;
+    if (!map.has(epochId)) {
+      map.set(epochId, { epoch: epochId, rewards: [] });
     }
 
-    const epoch = acc.get(epochId);
+    const epoch = map.get(epochId);
 
     let asset = epoch?.rewards.find((r) => r.asset === assetName);
 
@@ -95,8 +76,8 @@ export const generateEpochIndividualRewardsList = ({
       });
     }
 
-    return acc;
-  }, map);
+    return map;
+  }, new Map<string, EpochIndividualReward>());
 
   return Array.from(epochIndividualRewards.values()).sort(
     (a, b) => Number(b.epoch) - Number(a.epoch)

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

@@ -1,64 +1,44 @@
 import { render } from '@testing-library/react';
 import { AppStateProvider } from '../../../contexts/app-state/app-state-provider';
 import { EpochTotalRewardsTable } from './epoch-total-rewards-table';
-import type {
-  AggregatedEpochRewardSummary,
-  RewardType,
-  RewardItem,
-} from './generate-epoch-total-rewards-list';
 import { AccountType } from '@vegaprotocol/types';
 
-const assetId =
-  'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663';
-
-const rewardsList = [
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-    amount: '295',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-    amount: '0',
-  },
-];
-
-const rewards: Map<RewardType, RewardItem> = new Map();
-
-rewardsList.forEach((r) => {
-  rewards.set(r.rewardType, r);
-});
-
-const assetRewards: Map<
-  AggregatedEpochRewardSummary['assetId'],
-  AggregatedEpochRewardSummary
-> = new Map();
-
-assetRewards.set(assetId, {
-  assetId,
-  name: 'tDAI TEST',
-  rewards,
-  totalAmount: '295',
-});
-
 const mockData = {
   epoch: 4431,
-  assetRewards,
+  assetRewards: [
+    {
+      assetId:
+        'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
+      name: 'tDAI TEST',
+      rewards: [
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+          amount: '295',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+          amount: '0',
+        },
+      ],
+      totalAmount: '295',
+    },
+  ],
 };
 
 describe('EpochTotalRewardsTable', () => {

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

@@ -48,19 +48,17 @@ export const EpochTotalRewardsTable = ({
 }: EpochTotalRewardsGridProps) => {
   return (
     <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
-      {Array.from(data.assetRewards.values()).map(
-        ({ name, rewards, totalAmount }, i) => (
-          <div className="contents" key={i}>
-            <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
-              {name}
-            </div>
-            {Array.from(rewards.values()).map(({ rewardType, amount }, i) => (
-              <RewardItem key={i} dataTestId={rewardType} value={amount} />
-            ))}
-            <RewardItem dataTestId="total" value={totalAmount} last={true} />
+      {data.assetRewards.map(({ name, rewards, totalAmount }, i) => (
+        <div className="contents" key={i}>
+          <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
+            {name}
           </div>
-        )
-      )}
+          {rewards.map(({ rewardType, amount }, i) => (
+            <RewardItem key={i} dataTestId={rewardType} value={amount} />
+          ))}
+          <RewardItem dataTestId="total" value={totalAmount} last={true} />
+        </div>
+      ))}
     </RewardsTable>
   );
 };

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

@@ -1,62 +1,21 @@
-import { useState, useCallback, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
-import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEpochAssetsRewardsQuery } from '../home/__generated__/Rewards';
+import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { generateEpochTotalRewardsList } from './generate-epoch-total-rewards-list';
+import { NoRewards } from '../no-rewards';
 import { EpochTotalRewardsTable } from './epoch-total-rewards-table';
-import { calculateEpochOffset } from '../../../lib/epoch-pagination';
 
-const EPOCHS_PAGE_SIZE = 10;
-
-type EpochTotalRewardsProps = {
-  currentEpoch: EpochFieldsFragment;
-};
-
-export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
-  // we start from the previous epoch when displaying rewards data, because the current one has no calculated data while ongoing
-  const epochId = Number(currentEpoch.id) - 1;
-  const totalPages = Math.ceil(epochId / EPOCHS_PAGE_SIZE);
-  const { t } = useTranslation();
-  const [page, setPage] = useState(1);
+export const EpochTotalRewards = () => {
   const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
-    notifyOnNetworkStatusChange: true,
     variables: {
-      epochRewardSummariesFilter: {
-        fromEpoch: epochId - EPOCHS_PAGE_SIZE,
+      epochRewardSummariesPagination: {
+        first: 10,
       },
     },
   });
+  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);
 
-  const refetchData = useCallback(
-    async (toPage?: number) => {
-      const targetPage = toPage ?? page;
-      await refetch({
-        epochRewardSummariesFilter: calculateEpochOffset({
-          epochId,
-          page: targetPage,
-          size: EPOCHS_PAGE_SIZE,
-        }),
-      });
-      setPage(targetPage);
-    },
-    [epochId, page, refetch]
-  );
-
-  useEffect(() => {
-    // when the epoch changes, we want to refetch the data to update the current page
-    if (data) {
-      refetchData();
-    }
-  }, [epochId, data, refetchData]);
-
-  const epochTotalRewardSummaries =
-    generateEpochTotalRewardsList({
-      data,
-      epochId,
-      page,
-      size: EPOCHS_PAGE_SIZE,
-    }) || [];
+  const epochTotalRewardSummaries = generateEpochTotalRewardsList(data) || [];
 
   return (
     <AsyncRenderer
@@ -68,22 +27,15 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
           className="max-w-full overflow-auto"
           data-testid="epoch-rewards-total"
         >
-          {Array.from(epochTotalRewardSummaries.values()).map(
-            (epochTotalSummary, index) => (
-              <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
-            )
+          {epochTotalRewardSummaries.length === 0 ? (
+            <NoRewards />
+          ) : (
+            <>
+              {epochTotalRewardSummaries.map((epochTotalSummary, index) => (
+                <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
+              ))}
+            </>
           )}
-          <Pagination
-            isLoading={loading}
-            hasPrevPage={page > 1}
-            hasNextPage={page < totalPages}
-            onBack={() => refetchData(page - 1)}
-            onNext={() => refetchData(page + 1)}
-            onFirst={() => refetchData(1)}
-            onLast={() => refetchData(totalPages)}
-          >
-            {t('Page')} {page}
-          </Pagination>
         </div>
       )}
     />

apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts

@@ -3,23 +3,13 @@ import { AccountType } from '@vegaprotocol/types';
 
 describe('generateEpochAssetRewardsList', () => {
   it('should return an empty array if data is undefined', () => {
-    const result = generateEpochTotalRewardsList({ epochId: 1 });
+    const result = generateEpochTotalRewardsList(undefined);
 
-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map(),
-          },
-        ],
-      ])
-    );
+    expect(result).toEqual([]);
   });
 
-  it('should return an empty map if empty data is provided', () => {
-    const data = {
+  it('should return an empty array if empty data is provided', () => {
+    const epochData = {
       assetsConnection: {
         edges: [],
       },
@@ -33,23 +23,13 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
+    const result = generateEpochTotalRewardsList(epochData);
 
-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map(),
-          },
-        ],
-      ])
-    );
+    expect(result).toEqual([]);
   });
 
-  it('should return an empty map if no epochRewardSummaries are provided', () => {
-    const data = {
+  it('should return an empty array if no epochRewardSummaries are provided', () => {
+    const epochData = {
       assetsConnection: {
         edges: [
           {
@@ -76,23 +56,13 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
+    const result = generateEpochTotalRewardsList(epochData);
 
-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map(),
-          },
-        ],
-      ])
-    );
+    expect(result).toEqual([]);
   });
 
-  it('should return a map of unnamed assets if no asset names are provided (should not happen)', () => {
-    const data = {
+  it('should return an array of unnamed assets if no asset names are provided (should not happen)', () => {
+    const epochData = {
       assetsConnection: {
         edges: [],
       },
@@ -115,80 +85,50 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
+    const result = generateEpochTotalRewardsList(epochData);
 
-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
+    expect(result).toEqual([
+      {
+        epoch: 1,
+        assetRewards: [
           {
-            epoch: 1,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: '',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '123',
-                },
-              ],
-            ]),
+            assetId: '1',
+            name: '',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                amount: '123',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                amount: '0',
+              },
+            ],
+            totalAmount: '123',
           },
         ],
-      ])
-    );
+      },
+    ]);
   });
 
-  it('should return the aggregated epoch summaries', () => {
-    const data = {
+  it('should return an array of aggregated epoch summaries', () => {
+    const epochData = {
       assetsConnection: {
         edges: [
           {
@@ -240,425 +180,81 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList({ data, epochId: 2 });
+    const result = generateEpochTotalRewardsList(epochData);
 
-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
+    expect(result).toEqual([
+      {
+        epoch: 1,
+        assetRewards: [
           {
-            epoch: 1,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '100',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '223',
-                },
-              ],
-            ]),
-          },
-        ],
-        [
-          '2',
-          {
-            epoch: 2,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '5',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '5',
-                },
-              ],
-            ]),
-          },
-        ],
-      ])
-    );
-  });
-
-  it('should return the requested range for aggregated epoch summaries', () => {
-    const data = {
-      assetsConnection: {
-        edges: [
-          {
-            node: {
-              id: '1',
-              name: 'Asset 1',
-            },
-          },
-          {
-            node: {
-              id: '2',
-              name: 'Asset 2',
-            },
+            assetId: '1',
+            name: 'Asset 1',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '100',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                amount: '123',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                amount: '0',
+              },
+            ],
+            totalAmount: '223',
           },
         ],
       },
-      epochRewardSummaries: {
-        edges: [
+      {
+        epoch: 2,
+        assetRewards: [
           {
-            node: {
-              epoch: 1,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-              amount: '123',
-            },
-          },
-          {
-            node: {
-              epoch: 1,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-              amount: '100',
-            },
-          },
-          {
-            node: {
-              epoch: 2,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-              amount: '6',
-            },
-          },
-          {
-            node: {
-              epoch: 2,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-              amount: '27',
-            },
-          },
-          {
-            node: {
-              epoch: 3,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-              amount: '15',
-            },
+            assetId: '1',
+            name: 'Asset 1',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '5',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                amount: '0',
+              },
+            ],
+            totalAmount: '5',
           },
         ],
       },
-      epoch: {
-        timestamps: {
-          expiry: null,
-        },
-      },
-    };
-
-    const resultPageOne = generateEpochTotalRewardsList({
-      data,
-      epochId: 3,
-      page: 1,
-      size: 2,
-    });
-
-    expect(resultPageOne).toEqual(
-      new Map([
-        [
-          '2',
-          {
-            epoch: 2,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '33',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '33',
-                },
-              ],
-            ]),
-          },
-        ],
-        [
-          '3',
-          {
-            epoch: 3,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '15',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '15',
-                },
-              ],
-            ]),
-          },
-        ],
-      ])
-    );
-
-    const resultPageTwo = generateEpochTotalRewardsList({
-      data,
-      epochId: 3,
-      page: 2,
-      size: 2,
-    });
-
-    expect(resultPageTwo).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '100',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '223',
-                },
-              ],
-            ]),
-          },
-        ],
-      ])
-    );
+    ]);
   });
 });

apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.ts

@@ -5,97 +5,127 @@ import type {
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
 import type { AccountType } from '@vegaprotocol/types';
-import { calculateEpochOffset } from '../../../lib/epoch-pagination';
+import { BigNumber } from '../../../lib/bignumber';
 
 interface EpochSummaryWithNamedReward extends EpochRewardSummaryFieldsFragment {
   name: string;
 }
 
-export type RewardType = EpochRewardSummaryFieldsFragment['rewardType'];
-export type RewardItem = Pick<
-  EpochRewardSummaryFieldsFragment,
-  'rewardType' | 'amount'
->;
-
-export type AggregatedEpochRewardSummary = {
+export interface AggregatedEpochRewardSummary {
   assetId: EpochRewardSummaryFieldsFragment['assetId'];
   name: EpochSummaryWithNamedReward['name'];
-  rewards: Map<RewardType, RewardItem>;
+  rewards: {
+    rewardType: EpochRewardSummaryFieldsFragment['rewardType'];
+    amount: EpochRewardSummaryFieldsFragment['amount'];
+  }[];
   totalAmount: string;
-};
+}
 
-export type EpochTotalSummary = {
+export interface EpochTotalSummary {
   epoch: EpochRewardSummaryFieldsFragment['epoch'];
-  assetRewards: Map<
-    EpochRewardSummaryFieldsFragment['assetId'],
-    AggregatedEpochRewardSummary
-  >;
-};
+  assetRewards: AggregatedEpochRewardSummary[];
+}
 
-const emptyRowAccountTypes: Map<RewardType, RewardItem> = new Map();
+const emptyRowAccountTypes = Object.keys(RowAccountTypes).map((type) => ({
+  rewardType: type as AccountType,
+  amount: '0',
+}));
 
-Object.keys(RowAccountTypes).forEach((type) => {
-  emptyRowAccountTypes.set(type as AccountType, {
-    rewardType: type as AccountType,
-    amount: '0',
-  });
-});
-
-export const generateEpochTotalRewardsList = ({
-  data,
-  epochId,
-  page = 1,
-  size = 10,
-}: {
-  data?: EpochAssetsRewardsQuery | undefined;
-  epochId: number;
-  page?: number;
-  size?: number;
-}) => {
+export const generateEpochTotalRewardsList = (
+  epochData: EpochAssetsRewardsQuery | undefined
+) => {
   const epochRewardSummaries = removePaginationWrapper(
-    data?.epochRewardSummaries?.edges
+    epochData?.epochRewardSummaries?.edges
   );
 
-  const assets = removePaginationWrapper(data?.assetsConnection?.edges);
+  const assets = removePaginationWrapper(epochData?.assetsConnection?.edges);
 
-  const map: Map<string, EpochTotalSummary> = new Map();
-  const { fromEpoch, toEpoch } = calculateEpochOffset({ epochId, page, size });
+  // Because the epochRewardSummaries don't have the asset name, we need to find it in the assets list
+  const epochSummariesWithNamedReward: EpochSummaryWithNamedReward[] =
+    epochRewardSummaries.map((epochReward) => ({
+      ...epochReward,
+      name:
+        assets.find((asset) => asset.id === epochReward.assetId)?.name || '',
+    }));
 
-  for (let i = toEpoch; i >= fromEpoch; i--) {
-    map.set(i.toString(), {
-      epoch: i,
-      assetRewards: new Map(),
+  // Aggregating the epoch summaries by epoch number
+  const aggregatedEpochSummariesByEpochNumber =
+    epochSummariesWithNamedReward.reduce((acc, epochReward) => {
+      const epoch = epochReward.epoch;
+      const epochSummaryIndex = acc.findIndex(
+        (epochSummary) => epochSummary[0].epoch === epoch
+      );
+
+      if (epochSummaryIndex === -1) {
+        acc.push([epochReward]);
+      } else {
+        acc[epochSummaryIndex].push(epochReward);
+      }
+
+      return acc;
+    }, [] as EpochSummaryWithNamedReward[][]);
+
+  // Now aggregate the array of arrays of epoch summaries by asset rewards.
+  const epochTotalRewards: EpochTotalSummary[] =
+    aggregatedEpochSummariesByEpochNumber.map((epochSummaries) => {
+      const assetRewards = epochSummaries.reduce((acc, epochSummary) => {
+        const assetRewardIndex = acc.findIndex(
+          (assetReward) =>
+            assetReward.assetId === epochSummary.assetId &&
+            assetReward.name === epochSummary.name
+        );
+
+        if (assetRewardIndex === -1) {
+          acc.push({
+            assetId: epochSummary.assetId,
+            name: epochSummary.name,
+            rewards: [
+              ...emptyRowAccountTypes.map((emptyRowAccountType) => {
+                if (
+                  emptyRowAccountType.rewardType === epochSummary.rewardType
+                ) {
+                  return {
+                    rewardType: epochSummary.rewardType,
+                    amount: epochSummary.amount,
+                  };
+                } else {
+                  return emptyRowAccountType;
+                }
+              }),
+            ],
+            totalAmount: epochSummary.amount,
+          });
+        } else {
+          acc[assetRewardIndex].rewards = acc[assetRewardIndex].rewards.map(
+            (reward) => {
+              if (reward.rewardType === epochSummary.rewardType) {
+                return {
+                  rewardType: epochSummary.rewardType,
+                  amount: (
+                    Number(reward.amount) + Number(epochSummary.amount)
+                  ).toString(),
+                };
+              } else {
+                return reward;
+              }
+            }
+          );
+          acc[assetRewardIndex].totalAmount = (
+            Number(acc[assetRewardIndex].totalAmount) +
+            Number(epochSummary.amount)
+          ).toString();
+        }
+
+        return acc;
+      }, [] as AggregatedEpochRewardSummary[]);
+
+      return {
+        epoch: epochSummaries[0].epoch,
+        assetRewards: assetRewards.sort((a, b) => {
+          return new BigNumber(b.totalAmount).comparedTo(a.totalAmount);
+        }),
+      };
     });
-  }
 
-  return epochRewardSummaries.reduce((acc, reward) => {
-    const epoch = acc.get(reward.epoch.toString());
-
-    if (epoch) {
-      const matchingAsset = assets.find((asset) => asset.id === reward.assetId);
-      const assetWithRewards = epoch.assetRewards.get(reward.assetId);
-
-      const rewards =
-        assetWithRewards?.rewards || new Map(emptyRowAccountTypes);
-      const rewardItem = rewards?.get(reward.rewardType);
-      const amount = (
-        (Number(rewardItem?.amount) || 0) + Number(reward.amount)
-      ).toString();
-
-      rewards?.set(reward.rewardType, {
-        rewardType: reward.rewardType,
-        amount,
-      });
-
-      epoch.assetRewards.set(reward.assetId, {
-        assetId: reward.assetId,
-        name: matchingAsset?.name || '',
-        rewards: rewards || new Map(emptyRowAccountTypes),
-        totalAmount: (
-          Number(reward.amount) + Number(assetWithRewards?.totalAmount || 0)
-        ).toString(),
-      });
-    }
-    return acc;
-  }, map);
+  return epochTotalRewards;
 };

apps/governance/src/routes/rewards/home/Rewards.graphql

@@ -23,18 +23,12 @@ fragment DelegationFields on Delegation {
 
 query Rewards(
   $partyId: ID!
-  $fromEpoch: Int
-  $toEpoch: Int
-  $rewardsPagination: Pagination
   $delegationsPagination: Pagination
+  $rewardsPagination: Pagination
 ) {
   party(id: $partyId) {
     id
-    rewardsConnection(
-      fromEpoch: $fromEpoch
-      toEpoch: $toEpoch
-      pagination: $rewardsPagination
-    ) {
+    rewardsConnection(pagination: $rewardsPagination) {
       edges {
         node {
           ...RewardFields
@@ -49,6 +43,14 @@ query Rewards(
       }
     }
   }
+  epoch {
+    id
+    timestamps {
+      start
+      end
+      expiry
+    }
+  }
 }
 
 fragment EpochRewardSummaryFields on EpochRewardSummary {
@@ -58,10 +60,7 @@ fragment EpochRewardSummaryFields on EpochRewardSummary {
   rewardType
 }
 
-query EpochAssetsRewards(
-  $epochRewardSummariesFilter: RewardSummaryFilter
-  $epochRewardSummariesPagination: Pagination
-) {
+query EpochAssetsRewards($epochRewardSummariesPagination: Pagination) {
   assetsConnection {
     edges {
       node {
@@ -70,16 +69,18 @@ query EpochAssetsRewards(
       }
     }
   }
-  epochRewardSummaries(
-    filter: $epochRewardSummariesFilter
-    pagination: $epochRewardSummariesPagination
-  ) {
+  epochRewardSummaries(pagination: $epochRewardSummariesPagination) {
     edges {
       node {
         ...EpochRewardSummaryFields
       }
     }
   }
+  epoch {
+    timestamps {
+      expiry
+    }
+  }
 }
 
 fragment EpochFields on Epoch {

apps/governance/src/routes/rewards/home/__generated__/Rewards.ts

@@ -9,24 +9,21 @@ export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: stri
 
 export type RewardsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
-  fromEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
-  toEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
-  rewardsPagination?: Types.InputMaybe<Types.Pagination>;
   delegationsPagination?: Types.InputMaybe<Types.Pagination>;
+  rewardsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;
 
 
-export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null };
+export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } } };
 
 export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
 
 export type EpochAssetsRewardsQueryVariables = Types.Exact<{
-  epochRewardSummariesFilter?: Types.InputMaybe<Types.RewardSummaryFilter>;
   epochRewardSummariesPagination?: Types.InputMaybe<Types.Pagination>;
 }>;
 
 
-export type EpochAssetsRewardsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string } } | null> | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };
+export type EpochAssetsRewardsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string } } | null> | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null, epoch: { __typename?: 'Epoch', timestamps: { __typename?: 'EpochTimestamps', expiry?: any | null } } };
 
 export type EpochFieldsFragment = { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } };
 
@@ -79,14 +76,10 @@ export const EpochFieldsFragmentDoc = gql`
 }
     `;
 export const RewardsDocument = gql`
-    query Rewards($partyId: ID!, $fromEpoch: Int, $toEpoch: Int, $rewardsPagination: Pagination, $delegationsPagination: Pagination) {
+    query Rewards($partyId: ID!, $delegationsPagination: Pagination, $rewardsPagination: Pagination) {
   party(id: $partyId) {
     id
-    rewardsConnection(
-      fromEpoch: $fromEpoch
-      toEpoch: $toEpoch
-      pagination: $rewardsPagination
-    ) {
+    rewardsConnection(pagination: $rewardsPagination) {
       edges {
         node {
           ...RewardFields
@@ -101,6 +94,14 @@ export const RewardsDocument = gql`
       }
     }
   }
+  epoch {
+    id
+    timestamps {
+      start
+      end
+      expiry
+    }
+  }
 }
     ${RewardFieldsFragmentDoc}
 ${DelegationFieldsFragmentDoc}`;
@@ -118,10 +119,8 @@ ${DelegationFieldsFragmentDoc}`;
  * const { data, loading, error } = useRewardsQuery({
  *   variables: {
  *      partyId: // value for 'partyId'
- *      fromEpoch: // value for 'fromEpoch'
- *      toEpoch: // value for 'toEpoch'
- *      rewardsPagination: // value for 'rewardsPagination'
  *      delegationsPagination: // value for 'delegationsPagination'
+ *      rewardsPagination: // value for 'rewardsPagination'
  *   },
  * });
  */
@@ -137,7 +136,7 @@ export type RewardsQueryHookResult = ReturnType<typeof useRewardsQuery>;
 export type RewardsLazyQueryHookResult = ReturnType<typeof useRewardsLazyQuery>;
 export type RewardsQueryResult = Apollo.QueryResult<RewardsQuery, RewardsQueryVariables>;
 export const EpochAssetsRewardsDocument = gql`
-    query EpochAssetsRewards($epochRewardSummariesFilter: RewardSummaryFilter, $epochRewardSummariesPagination: Pagination) {
+    query EpochAssetsRewards($epochRewardSummariesPagination: Pagination) {
   assetsConnection {
     edges {
       node {
@@ -146,16 +145,18 @@ export const EpochAssetsRewardsDocument = gql`
       }
     }
   }
-  epochRewardSummaries(
-    filter: $epochRewardSummariesFilter
-    pagination: $epochRewardSummariesPagination
-  ) {
+  epochRewardSummaries(pagination: $epochRewardSummariesPagination) {
     edges {
       node {
         ...EpochRewardSummaryFields
       }
     }
   }
+  epoch {
+    timestamps {
+      expiry
+    }
+  }
 }
     ${EpochRewardSummaryFieldsFragmentDoc}`;
 
@@ -171,7 +172,6 @@ export const EpochAssetsRewardsDocument = gql`
  * @example
  * const { data, loading, error } = useEpochAssetsRewardsQuery({
  *   variables: {
- *      epochRewardSummariesFilter: // value for 'epochRewardSummariesFilter'
  *      epochRewardSummariesPagination: // value for 'epochRewardSummariesPagination'
  *   },
  * });

apps/governance/src/routes/rewards/home/rewards-page.tsx

@@ -114,7 +114,7 @@ export const RewardsPage = () => {
               </p>
             </div>
 
-            <div className="w-[360px]">
+            <div className="w-[440px]">
               <Toggle
                 name="epoch-reward-view-toggle"
                 toggles={[
@@ -136,15 +136,11 @@ export const RewardsPage = () => {
           </section>
 
           {toggleRewardsView === 'total' ? (
-            epochData?.epoch ? (
-              <EpochTotalRewards currentEpoch={epochData?.epoch} />
-            ) : null
+            <EpochTotalRewards />
           ) : (
             <section>
               {pubKey && pubKeys?.length ? (
-                epochData?.epoch ? (
-                  <EpochIndividualRewards currentEpoch={epochData?.epoch} />
-                ) : null
+                <EpochIndividualRewards />
               ) : (
                 <ConnectToSeeRewards />
               )}

apps/governance/src/routes/staking/PreviousEpoch.graphql

@@ -7,10 +7,9 @@ query PreviousEpoch($epochId: ID) {
           id
           rewardScore {
             rawValidatorScore
-            performanceScore
           }
           rankingScore {
-            stakeScore
+            performanceScore
           }
         }
       }

apps/governance/src/routes/staking/__generated__/PreviousEpoch.ts

@@ -8,7 +8,7 @@ export type PreviousEpochQueryVariables = Types.Exact<{
 }>;
 
 
-export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string } | null, rankingScore: { __typename?: 'RankingScore', stakeScore: string } } } | null> | null } | null } };
+export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string } | null, rankingScore: { __typename?: 'RankingScore', performanceScore: string } } } | null> | null } | null } };
 
 
 export const PreviousEpochDocument = gql`
@@ -21,10 +21,9 @@ export const PreviousEpochDocument = gql`
           id
           rewardScore {
             rawValidatorScore
-            performanceScore
           }
           rankingScore {
-            stakeScore
+            performanceScore
           }
         }
       }

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.spec.tsx

@@ -81,10 +81,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
             id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
             rewardScore: {
               rawValidatorScore: '0.25',
-              performanceScore: '0.9998677767864936',
             },
             rankingScore: {
-              stakeScore: '0.2499583402766206',
+              performanceScore: '0.9998677767864936',
             },
           },
         },
@@ -93,10 +92,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
             id: '966438c6bffac737cfb08173ffcb3f393c4692b099ad80cb45a82e2dc0a8cf99',
             rewardScore: {
               rawValidatorScore: '0.3',
-              performanceScore: '1',
             },
             rankingScore: {
-              stakeScore: '0.25',
+              performanceScore: '1',
             },
           },
         },
@@ -105,10 +103,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
             id: '12c81b738e8051152e1afe44376ec37bca9216466e6d44cdd772194bad0ada81',
             rewardScore: {
               rawValidatorScore: '0.35',
-              performanceScore: '0.999629748500531',
             },
             rankingScore: {
-              stakeScore: '0.2312',
+              performanceScore: '0.999629748500531',
             },
           },
         },

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -10,6 +10,7 @@ import {
   getFormattedPerformanceScore,
   getLastEpochScoreAndPerformance,
   getNormalisedVotingPower,
+  getOverstakedAmount,
   getOverstakingPenalty,
   getPerformancePenalty,
   getTotalPenalties,
@@ -51,6 +52,7 @@ interface CanonisedConsensusNodeProps {
   [ValidatorFields.STAKED_BY_OPERATOR]: string;
   [ValidatorFields.PERFORMANCE_SCORE]: string;
   [ValidatorFields.PERFORMANCE_PENALTY]: string;
+  [ValidatorFields.OVERSTAKED_AMOUNT]: string;
   [ValidatorFields.OVERSTAKING_PENALTY]: string;
   [ValidatorFields.TOTAL_PENALTIES]: string;
   [ValidatorFields.PENDING_STAKE]: string;
@@ -162,11 +164,14 @@ export const ConsensusValidatorsTable = ({
           pendingUserStake,
           userStakeShare,
         }) => {
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { rawValidatorScore, performanceScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);
+
+          const overstakedAmount = getOverstakedAmount(
+            rawValidatorScore,
+            stakedTotal,
+            totalStake
+          );
 
           return {
             id,
@@ -179,7 +184,7 @@ export const ConsensusValidatorsTable = ({
             [ValidatorFields.NORMALISED_VOTING_POWER]:
               getNormalisedVotingPower(votingPower),
             [ValidatorFields.UNNORMALISED_VOTING_POWER]:
-              getUnnormalisedVotingPower(previousEpochValidatorScore),
+              getUnnormalisedVotingPower(rawValidatorScore),
             [ValidatorFields.STAKE_SHARE]: stakedTotalPercentage(stakeScore),
             [ValidatorFields.STAKED_BY_DELEGATES]: formatNumber(
               toBigNum(stakedByDelegates, decimals),
@@ -189,19 +194,18 @@ export const ConsensusValidatorsTable = ({
               toBigNum(stakedByOperator, decimals),
               2
             ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
-            ),
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]:
+              getPerformancePenalty(performanceScore),
+            [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
             [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+              overstakedAmount,
+              totalStake
             ),
             [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
+              rawValidatorScore,
+              performanceScore,
               stakedTotal,
               totalStake
             ),

apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx

@@ -7,6 +7,7 @@ import { BigNumber } from '../../../../lib/bignumber';
 import {
   getFormattedPerformanceScore,
   getLastEpochScoreAndPerformance,
+  getOverstakedAmount,
   getOverstakingPenalty,
   getPerformancePenalty,
   getTotalPenalties,
@@ -81,21 +82,21 @@ export const StandbyPendingValidatorsTable = ({
           pendingUserStake,
           userStakeShare,
         }) => {
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { rawValidatorScore, performanceScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);
 
+          const overstakedAmount = getOverstakedAmount(
+            rawValidatorScore,
+            stakedTotal,
+            totalStake
+          );
           let individualStakeNeededForPromotion,
             individualStakeNeededForPromotionDescription;
 
-          if (stakeNeededForPromotion && previousEpochPerformanceScore) {
+          if (stakeNeededForPromotion && performanceScore) {
             const stakedTotalBigNum = new BigNumber(stakedTotal);
             const stakeNeededBigNum = new BigNumber(stakeNeededForPromotion);
-            const performanceScoreBigNum = new BigNumber(
-              previousEpochPerformanceScore
-            );
+            const performanceScoreBigNum = new BigNumber(performanceScore);
 
             const calc = stakeNeededBigNum
               .dividedBy(performanceScoreBigNum)
@@ -141,19 +142,18 @@ export const StandbyPendingValidatorsTable = ({
               toBigNum(stakedByOperator, decimals),
               2
             ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
-            ),
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]:
+              getPerformancePenalty(performanceScore),
+            [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
             [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+              overstakedAmount,
+              totalStake
             ),
             [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
+              rawValidatorScore,
+              performanceScore,
               stakedTotal,
               totalStake
             ),

apps/governance/src/routes/staking/home/validator-tables/validator-tables.tsx

@@ -155,16 +155,16 @@ export const ValidatorTables = ({
   return (
     <section data-testid="validator-tables">
       <div className="grid w-full justify-end">
-        <div className="w-[340px]">
+        <div className="w-[400px]">
           <Toggle
             name="validators-view-toggle"
             toggles={[
               {
-                label: t('All validators'),
+                label: t('ALL VALIDATORS'),
                 value: 'all',
               },
               {
-                label: t('Staked by me'),
+                label: t('STAKED BY ME'),
                 value: 'myStake',
               },
             ]}

apps/governance/src/routes/staking/node/validator-table.tsx

@@ -20,6 +20,7 @@ import { SubHeading } from '../../../components/heading';
 import {
   getLastEpochScoreAndPerformance,
   getNormalisedVotingPower,
+  getOverstakedAmount,
   getOverstakingPenalty,
   getPerformancePenalty,
   getTotalPenalties,
@@ -74,9 +75,15 @@ export const ValidatorTable = ({
 
   const stakedOnNode = toBigNum(node.stakedTotal, decimals);
 
-  const { rawValidatorScore, performanceScore, stakeScore } =
+  const { rawValidatorScore, performanceScore } =
     getLastEpochScoreAndPerformance(previousEpochData, node.id);
 
+  const overstakedAmount = getOverstakedAmount(
+    rawValidatorScore,
+    stakedTotal,
+    node.stakedTotal
+  );
+
   const stakePercentage = getStakePercentage(total, stakedOnNode);
 
   const totalPenaltiesAmount = getTotalPenalties(
@@ -238,7 +245,7 @@ export const ValidatorTable = ({
 
               <Tooltip description={t('OverstakedPenaltyDescription')}>
                 <span data-testid="overstaking-penalty">
-                  {getOverstakingPenalty(rawValidatorScore, stakeScore)}
+                  {getOverstakingPenalty(overstakedAmount, node.stakedTotal)}
                 </span>
               </Tooltip>
             </KeyValueTableRow>

apps/governance/src/routes/staking/shared.spec.ts

@@ -4,6 +4,7 @@ import {
   getNormalisedVotingPower,
   getUnnormalisedVotingPower,
   getOverstakingPenalty,
+  getOverstakedAmount,
   getFormattedPerformanceScore,
   getPerformancePenalty,
   getTotalPenalties,
@@ -21,10 +22,9 @@ describe('getLastEpochScoreAndPerformance', () => {
               id: '0x123',
               rewardScore: {
                 rawValidatorScore: '0.25',
-                performanceScore: '0.75',
               },
               rankingScore: {
-                stakeScore: '0.25',
+                performanceScore: '0.75',
               },
             },
           },
@@ -33,10 +33,9 @@ describe('getLastEpochScoreAndPerformance', () => {
               id: '0x234',
               rewardScore: {
                 rawValidatorScore: '0.35',
-                performanceScore: '0.85',
               },
               rankingScore: {
-                stakeScore: '0.25',
+                performanceScore: '0.85',
               },
             },
           },
@@ -51,14 +50,12 @@ describe('getLastEpochScoreAndPerformance', () => {
     ).toEqual({
       rawValidatorScore: '0.25',
       performanceScore: '0.75',
-      stakeScore: '0.25',
     });
     expect(
       getLastEpochScoreAndPerformance(mockPreviousEpochData, '0x234')
     ).toEqual({
       rawValidatorScore: '0.35',
       performanceScore: '0.85',
-      stakeScore: '0.25',
     });
   });
 });
@@ -82,34 +79,40 @@ describe('getUnnormalisedVotingPower', () => {
 });
 
 describe('getOverstakingPenalty', () => {
-  it('returns "0%" when both arguments are null or undefined', () => {
-    expect(getOverstakingPenalty(null, null)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, undefined)).toBe('0%');
-    expect(getOverstakingPenalty(null, undefined)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, null)).toBe('0%');
+  it('should return the overstaking penalty', () => {
+    expect(
+      getOverstakingPenalty(new BigNumber(100), Number(1000).toString())
+    ).toEqual('10.00%');
+    expect(
+      getOverstakingPenalty(new BigNumber(500), Number(2000).toString())
+    ).toEqual('25.00%');
+  });
+});
+
+describe('getOverstakedAmount', () => {
+  it('should return the overstaked amount', () => {
+    expect(
+      // If a validator score is 0, any amount staked on the node is considered overstaked
+      getOverstakedAmount('0', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(20));
+    expect(
+      getOverstakedAmount('0.05', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(15));
+    expect(
+      getOverstakedAmount('0.1', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(10));
+    expect(
+      getOverstakedAmount('0.15', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(5));
+    expect(
+      getOverstakedAmount('0.2', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(0));
   });
 
-  it('returns "0%" when one argument is null or undefined', () => {
-    expect(getOverstakingPenalty('10', null)).toBe('0%');
-    expect(getOverstakingPenalty(null, '20')).toBe('0%');
-    expect(getOverstakingPenalty('10', undefined)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, '20')).toBe('0%');
-  });
-
-  it('returns "0%" when validatorScore or stakeScore is zero', () => {
-    expect(getOverstakingPenalty('0', '20')).toBe('0%');
-    expect(getOverstakingPenalty('10', '0')).toBe('0%');
-  });
-
-  it('returns the correct overstaking penalty', () => {
-    expect(getOverstakingPenalty('0.18', '0.2')).toBe('10.00%');
-    expect(getOverstakingPenalty('0.2', '0.2')).toBe('0.00%');
-    expect(getOverstakingPenalty('0.04', '0.2')).toBe('80.00%');
-  });
-
-  it('handles string numbers with decimals', () => {
-    expect(getOverstakingPenalty('7.5', '15')).toBe('50.00%');
-    expect(getOverstakingPenalty('12.5', '25')).toBe('50.00%');
+  it('should return 0 if the overstaked amount is negative', () => {
+    expect(
+      getOverstakedAmount('0.8', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(0));
   });
 });
 

apps/governance/src/routes/staking/shared.ts

@@ -15,8 +15,7 @@ export const getLastEpochScoreAndPerformance = (
 
   return {
     rawValidatorScore: validator?.rewardScore?.rawValidatorScore,
-    performanceScore: validator?.rewardScore?.performanceScore,
-    stakeScore: validator?.rankingScore?.stakeScore,
+    performanceScore: validator?.rankingScore?.performanceScore,
   };
 };
 
@@ -43,26 +42,31 @@ export const getPerformancePenalty = (performanceScore?: string) =>
     2
   );
 
-export const getOverstakingPenalty = (
+export const getOverstakedAmount = (
   validatorScore: string | null | undefined,
-  stakeScore: string | null | undefined
+  totalStake: string,
+  stakedOnNode: string
 ) => {
-  if (!validatorScore || !stakeScore) {
-    return '0%';
-  }
+  const toReturn = validatorScore
+    ? new BigNumber(stakedOnNode).minus(
+        new BigNumber(validatorScore).times(new BigNumber(totalStake))
+      )
+    : new BigNumber(0);
 
+  return toReturn.isNegative() ? new BigNumber(0) : toReturn;
+};
+
+export const getOverstakingPenalty = (
+  overstakedAmount: BigNumber,
+  stakedOnNode: string
+) => {
   // avoid division by zero
-  if (
-    new BigNumber(validatorScore).isZero() ||
-    new BigNumber(stakeScore).isZero()
-  ) {
-    return '0%';
+  if (new BigNumber(stakedOnNode).isZero() || overstakedAmount.isZero()) {
+    return '0';
   }
 
   return formatNumberPercentage(
-    new BigNumber(1)
-      .minus(new BigNumber(validatorScore).dividedBy(new BigNumber(stakeScore)))
-      .times(100),
+    overstakedAmount.dividedBy(new BigNumber(stakedOnNode)).times(100),
     2
   );
 };

apps/trading-e2e/cypress.config.js

@@ -1,10 +1,8 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
   e2e: {
     setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },

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

@@ -411,7 +411,6 @@ describe('capsule', { tags: '@slow' }, () => {
 
   it('approved amount is less than deposit', function () {
     // 1001-DEPO-006
-    // 1001-DEPO-007
     cy.getByTestId(depositsTab).click();
     cy.getByTestId('deposit-button').click();
     cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
@@ -431,8 +430,8 @@ describe('capsule', { tags: '@slow' }, () => {
   });
 
   it('withdraw - delay verification', function () {
+    // 1001-DEPO-007
     // 1001-DEPO-024
-    // 1002-WITH-007
 
     cy.visit('/#/portfolio');
     cy.get('main[data-testid="/portfolio"]').should('exist');

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

@@ -56,15 +56,6 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
     );
   });
 
-  it('test', () => {
-    cy.getByTestId('enter-pubkey-manually').click();
-    cy.get(toAddressField).clear().type('INVALID_DEPOSIT_TO_ADDRESS');
-    cy.get(`[data-testid="${formFieldError}"][aria-describedby="to"]`).should(
-      'have.text',
-      'Invalid Vega key'
-    );
-  });
-
   it('invalid amount', () => {
     mockWeb3DepositCalls({
       allowance: '1000',
@@ -85,7 +76,6 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
   });
 
   it('insufficient funds', () => {
-    // 1001-DEPO-004
     mockWeb3DepositCalls({
       allowance: '1000',
       depositLifetimeLimit: '1000',
@@ -97,10 +87,7 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
       .clear()
       .type('850')
       .next(`[data-testid="${formFieldError}"]`)
-      .should(
-        'have.text',
-        "You can't deposit more than you have in your Ethereum wallet, 800 tEURO"
-      );
+      .should('have.text', 'Insufficient amount in Ethereum wallet');
   });
 });
 

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

@@ -1,5 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsQuery } from '@vegaprotocol/mock';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 
@@ -85,7 +85,6 @@ describe('markets table', { tags: '@smoke' }, () => {
     cy.getByTestId('view-market-list-link')
       .should('have.attr', 'href', '#/markets/all')
       .click();
-
     cy.get('[data-testid="All markets"]').should(
       'have.attr',
       'data-state',
@@ -118,85 +117,6 @@ describe('markets table', { tags: '@smoke' }, () => {
         `${Cypress.env('VEGA_TOKEN_URL')}/proposals/propose/new-market`
       );
   });
-  it('proposed markets tab should be sorted properly', () => {
-    cy.getByTestId('view-market-list-link').click();
-    cy.get('[data-testid="Proposed markets"]').click();
-    const marketColDefault = [
-      'ETHUSD',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'AAPL.MF21',
-      'BTCUSD.MF21',
-      'TSLA.QM21',
-      'AAVEDAI.MF21',
-      'ETHBTC.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColAsc = [
-      'AAPL.MF21',
-      'AAVEDAI.MF21',
-      'BTCUSD.MF21',
-      'ETHBTC.QM21',
-      'ETHDAI.MF21',
-      'ETHUSD',
-      'ETHUSD',
-      'LINKUSD',
-      'TSLA.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColDesc = [
-      'UNIDAI.MF21',
-      'TSLA.QM21',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'ETHBTC.QM21',
-      'BTCUSD.MF21',
-      'AAVEDAI.MF21',
-      'AAPL.MF21',
-    ];
-    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);
-
-    const stateColDefault = [
-      'Open',
-      'Passed',
-      'Waiting for Node Vote',
-      'Open',
-      'Passed',
-      'Open',
-      'Passed',
-      'Open',
-      'Waiting for Node Vote',
-      'Open',
-    ];
-    const stateColAsc = [
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-    ];
-    const stateColDesc = [
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-    ];
-    checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
-  });
 
   it('opening auction subsets should be properly displayed', () => {
     cy.mockTradingPage(

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

@@ -41,12 +41,6 @@ describe('accounts', { tags: '@smoke' }, () => {
       .should('have.text', '100,001.01');
   });
 
-  it('asset detail should be properly rendered', () => {
-    cy.getByTestId('Collateral').click();
-    cy.getByTestId('asset').contains('tEURO').click();
-    cy.get('[data-testid$="_label"]').should('have.length', 16);
-  });
-
   describe('sorting by ag-grid columns should work well', () => {
     it('sorting by asset', () => {
       cy.getByTestId('Collateral').click();

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

@@ -1,329 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { mockConnectWallet } from '@vegaprotocol/cypress';
-
-const orderSizeField = 'order-size';
-const orderPriceField = 'order-price';
-const orderTIFDropDown = 'order-tif';
-const placeOrderBtn = 'place-order';
-const toggleShort = 'order-side-SIDE_SELL';
-const toggleLong = 'order-side-SIDE_BUY';
-const toggleLimit = 'order-type-TYPE_LIMIT';
-const toggleMarket = 'order-type-TYPE_MARKET';
-
-const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
-  return {
-    code: Schema.OrderTimeInForceCode[value],
-    value,
-    text: Schema.OrderTimeInForceMapping[value],
-  };
-});
-
-describe('time in force default values', () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must have market order set up to IOC by default', function () {
-    // 7002-SORD-030
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-  });
-
-  it('must have time in force set to GTC for limit order', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTC')[0].text
-    );
-  });
-});
-
-describe('deal ticket validation', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must show place order button and connect wallet if wallet is not connected', () => {
-    // 0003-WTXN-001
-    cy.getByTestId('connect-vega-wallet'); // Not connected
-    cy.getByTestId('order-connect-wallet').should('exist');
-    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
-  });
-
-  it('must be able to select order direction - long/short', function () {
-    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
-  });
-
-  it('must be able to select order type - limit/market', function () {
-    // 7002-SORD-005
-    // 7002-SORD-006
-    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
-  });
-
-  it('order connect vega wallet button should connect', () => {
-    mockConnectWallet();
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
-    cy.getByTestId('dialog-content').should('be.visible');
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).children('input').should('be.checked');
-    cy.getByTestId(orderPriceField).should('have.value', '101');
-  });
-});
-
-describe('deal ticket size validation', { tags: '@smoke' }, function () {
-  beforeEach(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must warn if order size input has too many digits after the decimal place', function () {
-    // 7002-SORD-016
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('1.234');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size must be whole numbers for this market'
-    );
-  });
-
-  it('must warn if order size is set to 0', function () {
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('0');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size cannot be lower than 1'
-    );
-  });
-});
-
-describe('limit order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleLimit).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must see the price unit', function () {
-    // 7002-SORD-018
-    cy.getByTestId(orderPriceField)
-      .siblings('label')
-      .should('have.text', 'Price (DAI)');
-  });
-
-  it('must see warning when placing an order with expiry date in past', () => {
-    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
-    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('0.1');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-
-    cy.log('choosing yesterday');
-    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
-
-    cy.getByTestId(placeOrderBtn).click();
-
-    cy.getByTestId('dealticket-error-message-expiry').should(
-      'have.text',
-      'The expiry date that you have entered appears to be in the past'
-    );
-  });
-
-  it('must see warning if price has too many digits after decimal place', function () {
-    // 7002-SORD-059
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderPriceField).clear().type('1.123456');
-    cy.getByTestId('dealticket-error-message-price-limit').should(
-      'have.text',
-      'Price accepts up to 5 decimal places'
-    );
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist;
-    validTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-025
-      // 7002-SORD-026
-      // 7002-SORD-027
-      // 7002-SORD-028
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    it('selections should be remembered', () => {
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'IOC')[0].text
-      );
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
-      cy.getByTestId(toggleLimit).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'GTT')[0].text
-      );
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'FOK')[0].text
-      );
-    });
-  });
-});
-
-describe('market order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleMarket).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must not see the price unit', function () {
-    // 7002-SORD-019
-    cy.getByTestId(orderPriceField).should('not.exist');
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-    const invalidTIF = TIFlist.filter(
-      (tif) => !['FOK', 'IOC'].includes(tif.code)
-    );
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    invalidTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-027
-      // 7002-SORD-028
-      it(`must not be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
-      });
-    });
-  });
-});
-
-describe('post and reduce order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleMarket).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-
-  validTIF.forEach((tif) => {
-    // 7002-SORD-025
-    // 7002-SORD-026
-
-    it(`post and reduce order market for ${tif.code}`, function () {
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.disabled');
-      cy.getByTestId('reduce-only').should('be.enabled');
-    });
-  });
-
-  validTIF.forEach((tif) => {
-    it(`post and reduce order limit for ${tif.code}`, function () {
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.disabled');
-      cy.getByTestId('reduce-only').should('be.enabled');
-    });
-  });
-
-  const validTIFLimit = TIFlist.filter((tif) =>
-    ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
-  );
-
-  validTIFLimit.forEach((tif) => {
-    it(`post and reduce order for limit ${tif.code}`, function () {
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.enabled');
-      cy.getByTestId('reduce-only').should('be.disabled');
-    });
-  });
-});

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

@@ -1,5 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { aliasGQLQuery, mockConnectWallet } from '@vegaprotocol/cypress';
 import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import {
@@ -13,6 +13,8 @@ const orderSizeField = 'order-size';
 const orderPriceField = 'order-price';
 const orderTIFDropDown = 'order-tif';
 const placeOrderBtn = 'place-order';
+const toggleShort = 'order-side-SIDE_SELL';
+const toggleLong = 'order-side-SIDE_BUY';
 const toggleLimit = 'order-type-TYPE_LIMIT';
 const toggleMarket = 'order-type-TYPE_MARKET';
 
@@ -30,6 +32,34 @@ const displayTomorrow = () => {
   return tomorrow.toISOString().substring(0, 16);
 };
 
+describe('time in force default values', () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must have market order set up to IOC by default', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleMarket).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'IOC')[0].text
+    );
+  });
+
+  it('must have time in force set to GTC for limit order', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleLimit).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'GTC')[0].text
+    );
+  });
+});
+
 describe('must submit order', { tags: '@smoke' }, () => {
   // 7002-SORD-039
   before(() => {
@@ -363,6 +393,227 @@ describe(
   }
 );
 
+describe('deal ticket validation', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must show place order button and connect wallet if wallet is not connected', () => {
+    // 0003-WTXN-001
+    cy.getByTestId('connect-vega-wallet'); // Not connected
+    cy.getByTestId('order-connect-wallet').should('exist');
+    cy.getByTestId(placeOrderBtn).should('exist');
+    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
+  });
+
+  it('must be able to select order direction - long/short', function () {
+    // 7002-SORD-004
+    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
+    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
+  });
+
+  it('must be able to select order type - limit/market', function () {
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
+    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
+    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
+  });
+
+  it('order connect vega wallet button should connect', () => {
+    mockConnectWallet();
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('101');
+    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('dialog-content').should('be.visible');
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.wait('@walletReq');
+    cy.getByTestId(placeOrderBtn).should('be.visible');
+    cy.getByTestId(toggleLimit).children('input').should('be.checked');
+    cy.getByTestId(orderPriceField).should('have.value', '101');
+  });
+});
+
+describe('deal ticket size validation', { tags: '@smoke' }, function () {
+  beforeEach(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must warn if order size input has too many digits after the decimal place', function () {
+    // 7002-SORD-016
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('1.234');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size must be whole numbers for this market'
+    );
+  });
+
+  it('must warn if order size is set to 0', function () {
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('0');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size cannot be lower than 1'
+    );
+  });
+});
+
+describe('limit order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleLimit).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must see the price unit', function () {
+    // 7002-SORD-018
+    cy.getByTestId(orderPriceField)
+      .siblings('label')
+      .should('have.text', 'Price (DAI)');
+  });
+
+  it('must see warning when placing an order with expiry date in past', () => {
+    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
+    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+
+    cy.log('choosing yesterday');
+    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
+
+    cy.getByTestId(placeOrderBtn).click();
+
+    cy.getByTestId('dealticket-error-message-expiry').should(
+      'have.text',
+      'The expiry date that you have entered appears to be in the past'
+    );
+  });
+
+  it('must see warning if price has too many digits after decimal place', function () {
+    // 7002-SORD-059
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderPriceField).clear().type('1.123456');
+    cy.getByTestId('dealticket-error-message-price-limit').should(
+      'have.text',
+      'Price accepts up to 5 decimal places'
+    );
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist;
+    validTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-025
+      // 7002-SORD-026
+      // 7002-SORD-027
+      // 7002-SORD-028
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    it('selections should be remembered', () => {
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'IOC')[0].text
+      );
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
+      cy.getByTestId(toggleLimit).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'GTT')[0].text
+      );
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'FOK')[0].text
+      );
+    });
+  });
+});
+
+describe('market order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleMarket).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must not see the price unit', function () {
+    // 7002-SORD-019
+    cy.getByTestId(orderPriceField).should('not.exist');
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+    const invalidTIF = TIFlist.filter(
+      (tif) => !['FOK', 'IOC'].includes(tif.code)
+    );
+
+    validTIF.forEach((tif) => {
+      // 7002-SORD-025
+      // 7002-SORD-026
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    invalidTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-027
+      // 7002-SORD-028
+      it(`must not be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
+      });
+    });
+  });
+});
+
 describe('suspended market validation', { tags: '@regression' }, () => {
   before(() => {
     cy.setVegaWallet();
@@ -514,8 +765,6 @@ describe('account validation', { tags: '@regression' }, () => {
     it('must show error returned by wallet ', () => {
       // 0003-WTXN-009
       // 0003-WTXN-011
-      // 0002-WCON-016
-      // 0003-WTXN-008
 
       //trigger error from the wallet
       cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
@@ -539,8 +788,6 @@ describe('account validation', { tags: '@regression' }, () => {
         'contain.text',
         'The connection to your Vega Wallet has been lost.'
       );
-      cy.getByTestId('connect-vega-wallet').click();
-      cy.getByTestId('dialog-content').should('be.visible');
     });
 
     it('must see that the order was rejected by the connected wallet', () => {

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

@@ -117,7 +117,6 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
     // 0002-WCON-002
     // 0002-WCON-005
     // 0002-WCON-007
-    // 0002-WCON-009
 
     mockConnectWallet();
     cy.getByTestId(connectVegaBtn).click();
@@ -125,10 +124,6 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
       .find('[data-testid="connector-jsonRpc"]')
       .click();
     cy.wait('@walletReq');
-    cy.getByTestId(dialogContent).should(
-      'contain.text',
-      'Approve the connection from your Vega wallet app.'
-    );
     cy.getByTestId(dialogContent).should('not.exist');
     cy.getByTestId(manageVegaBtn).should('exist');
   });
@@ -137,7 +132,6 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
     // 0002-WCON-002
     // 0002-WCON-005
     // 0002-WCON-007
-    // 0002-WCON-015
 
     mockConnectWalletWithUserError();
     cy.getByTestId(connectVegaBtn).click();

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

@@ -8,7 +8,6 @@ import {
 import { tooltipMapping } from '@vegaprotocol/market-info';
 import {
   addDecimalsFormatNumber,
-  createDocsLinks,
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -24,7 +23,6 @@ import {
   Tabs,
   Link as UiToolkitLink,
   Indicator,
-  ExternalLink,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { memo, useCallback, useEffect, useRef, useState } from 'react';
@@ -39,7 +37,6 @@ import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 
 import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
-import { useEnvironment } from '@vegaprotocol/environment';
 
 const enum LiquidityTabs {
   Active = 'active',
@@ -147,7 +144,6 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
     market?.tradableInstrument.instrument.product.settlementAsset.decimals || 0;
   const symbol =
     market?.tradableInstrument.instrument.product.settlementAsset.symbol;
-  const { VEGA_DOCS_URL } = useEnvironment();
 
   const { params } = useNetworkParams([
     NetworkParams.market_liquidity_stakeToCcyVolume,
@@ -215,13 +211,6 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
       <HeaderStat heading={t('Market ID')}>
         <div className="break-word">{marketId}</div>
       </HeaderStat>
-      <HeaderStat heading={t('Learn more')}>
-        {VEGA_DOCS_URL && (
-          <ExternalLink href={createDocsLinks(VEGA_DOCS_URL).LIQUIDITY}>
-            {t('Providing liquidity')}
-          </ExternalLink>
-        )}
-      </HeaderStat>
     </Header>
   );
 });

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

@@ -29,10 +29,7 @@ import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import {
-  useMarketClickHandler,
-  useMarketLiquidityClickHandler,
-} from '../../lib/hooks/use-market-click-handler';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 type MarketDependantView =
   | typeof CandlesChartContainer
@@ -82,7 +79,6 @@ const MarketBottomPanel = memo(
   ({ marketId, pinnedAsset }: BottomPanelProps) => {
     const { screenSize } = useScreenDimensions();
     const onMarketClick = useMarketClickHandler(true);
-    const onOrderTypeClick = useMarketLiquidityClickHandler(true);
 
     return 'xxxl' === screenSize ? (
       <ResizableGrid proportionalLayout minSize={200}>
@@ -98,7 +94,6 @@ const MarketBottomPanel = memo(
                   <TradingViews.Orders
                     marketId={marketId}
                     onMarketClick={onMarketClick}
-                    onOrderTypeClick={onOrderTypeClick}
                     enforceBottomPlaceholder
                   />
                 </VegaWalletContainer>
@@ -155,7 +150,6 @@ const MarketBottomPanel = memo(
               <TradingViews.Orders
                 marketId={marketId}
                 onMarketClick={onMarketClick}
-                onOrderTypeClick={onOrderTypeClick}
                 enforceBottomPlaceholder
               />
             </VegaWalletContainer>
@@ -299,7 +293,6 @@ interface TradePanelsProps {
   market: Market | null;
   onSelect: (marketId: string, metaKey?: boolean) => void;
   onMarketClick?: (marketId: string) => void;
-  onOrderTypeClick?: (marketId: string) => void;
   onClickCollateral: () => void;
   pinnedAsset?: PinnedAsset;
 }
@@ -310,16 +303,12 @@ export const TradePanels = ({
   onClickCollateral,
   pinnedAsset,
 }: TradePanelsProps) => {
-  const onMarketClick = useMarketClickHandler(true);
-  const onOrderTypeClick = useMarketLiquidityClickHandler(true);
-
   const [view, setView] = useState<TradingView>('Candles');
   const renderView = () => {
     const Component = memo<{
       marketId: string;
       onSelect: (marketId: string, metaKey?: boolean) => void;
       onMarketClick?: (marketId: string) => void;
-      onOrderTypeClick?: (marketId: string) => void;
       onClickCollateral: () => void;
       pinnedAsset?: PinnedAsset;
     }>(TradingViews[view]);
@@ -336,8 +325,6 @@ export const TradePanels = ({
         onSelect={onSelect}
         onClickCollateral={onClickCollateral}
         pinnedAsset={pinnedAsset}
-        onMarketClick={onMarketClick}
-        onOrderTypeClick={onOrderTypeClick}
       />
     );
   };

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

@@ -301,7 +301,7 @@ export const AccountHistoryChart = ({
   asset: AssetFieldsFragment;
 }) => {
   const { theme } = useThemeSwitcher();
-  const values: { cols: [string, string]; rows: [Date, number][] } | null =
+  const values: { cols: string[]; rows: [Date, ...number[]][] } | null =
     useMemo(() => {
       if (!data?.balanceChanges.edges.length) {
         return null;

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

@@ -19,10 +19,7 @@ import { usePageTitleStore } from '../../stores';
 import { LedgerContainer } from '@vegaprotocol/ledger';
 import { AccountsContainer } from '../../components/accounts-container';
 import { AccountHistoryContainer } from './account-history-container';
-import {
-  useMarketClickHandler,
-  useMarketLiquidityClickHandler,
-} from '../../lib/hooks/use-market-click-handler';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 export const Portfolio = () => {
   const { updateTitle } = usePageTitleStore((store) => ({
@@ -34,7 +31,6 @@ export const Portfolio = () => {
   }, [updateTitle]);
 
   const onMarketClick = useMarketClickHandler(true);
-  const onOrderTypeClick = useMarketLiquidityClickHandler(true);
 
   const wrapperClasses = 'h-full max-h-full flex flex-col';
   return (
@@ -58,10 +54,7 @@ export const Portfolio = () => {
               </Tab>
               <Tab id="orders" name={t('Orders')}>
                 <VegaWalletContainer>
-                  <OrderListContainer
-                    onMarketClick={onMarketClick}
-                    onOrderTypeClick={onOrderTypeClick}
-                  />
+                  <OrderListContainer onMarketClick={onMarketClick} />
                 </VegaWalletContainer>
               </Tab>
               <Tab id="fills" name={t('Fills')}>

apps/trading/components/liquidity-supplied/liquidity-supplied.tsx

@@ -8,7 +8,6 @@ import type { MarketData } from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import {
-  ExternalLink,
   Indicator,
   KeyValueTable,
   KeyValueTableRow,
@@ -19,11 +18,9 @@ import { useCheckLiquidityStatus } from '@vegaprotocol/liquidity';
 import { AuctionTrigger, MarketTradingMode } from '@vegaprotocol/types';
 import {
   addDecimalsFormatNumber,
-  createDocsLinks,
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { useEnvironment } from '@vegaprotocol/environment';
 
 interface Props {
   marketId?: string;
@@ -47,8 +44,6 @@ export const MarketLiquiditySupplied = ({
     params.market_liquidity_targetstake_triggering_ratio
   );
 
-  const { VEGA_DOCS_URL } = useEnvironment();
-
   const variables = useMemo(
     () => ({
       marketId: marketId || '',
@@ -131,14 +126,6 @@ export const MarketLiquiditySupplied = ({
       <Link href={`/#/liquidity/${marketId}`} data-testid="view-liquidity-link">
         {t('View liquidity provision table')}
       </Link>
-      {VEGA_DOCS_URL && (
-        <ExternalLink
-          href={createDocsLinks(VEGA_DOCS_URL).LIQUIDITY}
-          className="mt-2"
-        >
-          {t('Learn about providing liquidity')}
-        </ExternalLink>
-      )}
       {showMessage && (
         <p className="mt-4">
           {t(

apps/trading/components/navbar/navbar.tsx

@@ -23,7 +23,6 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 
 import { Links, Routes } from '../../pages/client-router';
-import { createDocsLinks } from '@vegaprotocol/utils';
 
 export const Navbar = ({
   theme = 'system',
@@ -38,7 +37,6 @@ export const Navbar = ({
   const tradingPath = marketId
     ? Links[Routes.MARKET](marketId)
     : Links[Routes.MARKET]();
-
   return (
     <Navigation
       appName="Console"
@@ -91,9 +89,7 @@ export const Navbar = ({
             <NavigationContent>
               <NavigationList>
                 <NavigationItem>
-                  <NavExternalLink
-                    href={createDocsLinks(VEGA_DOCS_URL).NEW_TO_VEGA}
-                  >
+                  <NavExternalLink href={VEGA_DOCS_URL}>
                     {t('Docs')}
                   </NavExternalLink>
                 </NavigationItem>

apps/trading/components/select-market/select-market-columns.tsx

@@ -185,7 +185,7 @@ export const columns = (
           onClick={(e) => {
             e.preventDefault();
             e.stopPropagation();
-            onSelect(market.id, e.metaKey || e.ctrlKey);
+            onSelect(market.id, e.metaKey);
           }}
         >
           <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -366,7 +366,7 @@ export const columnsPositionMarkets = (
           onClick={(e) => {
             e.preventDefault();
             e.stopPropagation();
-            onSelect(market.id, e.metaKey || e.ctrlKey);
+            onSelect(market.id, e.metaKey);
           }}
         >
           <UILink>{market.tradableInstrument.instrument.code}</UILink>

apps/trading/components/select-market/select-market-table.tsx

@@ -44,7 +44,7 @@ export const SelectMarketTableRow = ({
     <tr
       className={`hover:bg-neutral-200 dark:hover:bg-neutral-700 cursor-pointer relative h-[34px]`}
       onClick={(ev) => {
-        onSelect(marketId, ev.metaKey || ev.ctrlKey);
+        onSelect(marketId, ev.metaKey);
       }}
       data-testid={`market-link-${marketId}`}
     >

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

@@ -8,10 +8,6 @@ import type {
   MarketData,
 } from '@vegaprotocol/market-list';
 import { SelectMarketLandingTable } from './welcome-landing-dialog';
-const mockMarketClickHandler = jest.fn();
-jest.mock('../../lib/hooks/use-market-click-handler', () => ({
-  useMarketClickHandler: () => mockMarketClickHandler,
-}));
 
 type Market = MarketMaybeWithCandles & MarketMaybeWithData;
 type PartialMarket = Partial<
@@ -178,25 +174,4 @@ describe('WelcomeLandingDialog', () => {
     fireEvent.click(screen.getAllByTestId(`market-link-2`)[0]);
     expect(onClose).toHaveBeenCalled();
   });
-
-  it('should not call onClose when metaKey is held', () => {
-    const onClose = jest.fn();
-
-    render(
-      <MemoryRouter>
-        <SelectMarketLandingTable
-          markets={[MARKET_A as Market, MARKET_B as Market]}
-          onClose={onClose}
-        />
-      </MemoryRouter>,
-      { wrapper: MockedProvider }
-    );
-    fireEvent.click(screen.getAllByTestId(`market-link-1`)[0], {
-      metaKey: true,
-    });
-    expect(mockMarketClickHandler).toHaveBeenCalled();
-    expect(onClose).not.toHaveBeenCalled();
-    fireEvent.click(screen.getAllByTestId(`market-link-1`)[0]);
-    expect(onClose).toHaveBeenCalled();
-  });
 });

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

@@ -12,10 +12,9 @@ import {
   SelectMarketTableRow,
 } from '../select-market';
 import { WelcomeDialogHeader } from './welcome-dialog-header';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import { ProposedMarkets } from './proposed-markets';
 import { Links, Routes } from '../../pages/client-router';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 export const SelectMarketLandingTable = ({
   markets,
@@ -24,14 +23,24 @@ export const SelectMarketLandingTable = ({
   markets: MarketMaybeWithDataAndCandles[] | null;
   onClose: () => void;
 }) => {
-  const onSelect = useMarketClickHandler();
-  const onSelectMarket = useCallback(
-    (id: string, metaKey?: boolean) => {
-      onSelect(id, metaKey);
-      if (!metaKey) {
-        onClose();
+  const params = useParams();
+  const navigate = useNavigate();
+  const marketId = params.marketId;
+
+  const onSelect = useCallback(
+    (id: string) => {
+      if (id && id !== marketId) {
+        navigate(Links[Routes.MARKET](id));
       }
     },
+    [marketId, navigate]
+  );
+
+  const onSelectMarket = useCallback(
+    (id: string) => {
+      onSelect(id);
+      onClose();
+    },
     [onSelect, onClose]
   );
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -64,7 +73,7 @@ export const SelectMarketLandingTable = ({
                 key={i}
                 detailed={false}
                 onSelect={onSelectMarket}
-                columns={columns(market, onSelectMarket, onCellClick)}
+                columns={columns(market, onSelect, onCellClick)}
               />
             ))}
           </tbody>

apps/trading/lib/hooks/use-market-click-handler.ts

@@ -19,21 +19,3 @@ export const useMarketClickHandler = (replace = false) => {
     [navigate, marketId, replace, isMarketPage]
   );
 };
-
-export const useMarketLiquidityClickHandler = (replace = false) => {
-  const navigate = useNavigate();
-  const { marketId } = useParams();
-  const { pathname } = useLocation();
-  const isLiquidityPage = pathname.match(/^\/liquidity\/(.+)/);
-  return useCallback(
-    (selectedId: string, metaKey?: boolean) => {
-      const link = Links[Routes.LIQUIDITY](selectedId);
-      if (metaKey) {
-        window.open(`/#${link}`, '_blank');
-      } else if (selectedId !== marketId || !isLiquidityPage) {
-        navigate(link, { replace });
-      }
-    },
-    [navigate, marketId, replace, isLiquidityPage]
-  );
-};

apps/trading/lib/hooks/use-vega-transaction-toasts.spec.tsx

@@ -7,11 +7,7 @@ import {
 } from '@vegaprotocol/types';
 import type { VegaStoredTxState } from '@vegaprotocol/wallet';
 import { VegaTxStatus } from '@vegaprotocol/wallet';
-import {
-  VegaTransactionDetails,
-  getVegaTransactionContentIntent,
-} from './use-vega-transaction-toasts';
-import { Intent } from '@vegaprotocol/ui-toolkit';
+import { VegaTransactionDetails } from './use-vega-transaction-toasts';
 
 jest.mock('@vegaprotocol/assets', () => {
   const A1 = {
@@ -282,27 +278,3 @@ describe('VegaTransactionDetails', () => {
     expect(queryByTestId('toast-panel')?.textContent).toEqual(details);
   });
 });
-
-describe('getVegaTransactionContentIntent', () => {
-  it('returns the correct intent for a transaction', () => {
-    expect(getVegaTransactionContentIntent(withdraw).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(submitOrder).intent).toBe(
-      Intent.Success
-    );
-    expect(getVegaTransactionContentIntent(editOrder).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(cancelOrder).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(cancelAll).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(closePosition).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(batch).intent).toBe(Intent.Primary);
-  });
-});

apps/trading/lib/hooks/use-vega-transaction-toasts.tsx

@@ -39,14 +39,10 @@ import { t } from '@vegaprotocol/i18n';
 import { useAssetsDataProvider } from '@vegaprotocol/assets';
 import { useEthWithdrawApprovalsStore } from '@vegaprotocol/web3';
 import { DApp, EXPLORER_TX, useLinks } from '@vegaprotocol/environment';
-import {
-  getOrderToastIntent,
-  getOrderToastTitle,
-  getRejectionReason,
-  useOrderByIdQuery,
-} from '@vegaprotocol/orders';
+import { getRejectionReason, useOrderByIdQuery } from '@vegaprotocol/orders';
 import { useMarketList } from '@vegaprotocol/market-list';
 import type { Side } from '@vegaprotocol/types';
+import { OrderStatus } from '@vegaprotocol/types';
 import { OrderStatusMapping } from '@vegaprotocol/types';
 import { Size } from '@vegaprotocol/react-helpers';
 
@@ -482,10 +478,12 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
       getRejectionReason(tx.order) || tx.order.rejectionReason || '';
     return (
       <>
-        <ToastHeading>{getOrderToastTitle(tx.order.status)}</ToastHeading>
-        {rejectionReason ? (
+        <ToastHeading>{t('Order rejected')}</ToastHeading>
+        {rejectionReason || tx.order.rejectionReason ? (
           <p>
-            {t('Your order has been rejected because: %s', [rejectionReason])}
+            {t('Your order has been rejected because: %s', [
+              rejectionReason || tx.order.rejectionReason,
+            ])}
           </p>
         ) : (
           <p>{t('Your order has been rejected.')}</p>
@@ -508,7 +506,7 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
   if (isOrderSubmissionTransaction(tx.body) && tx.order?.rejectionReason) {
     return (
       <div>
-        <h3 className="font-bold">{getOrderToastTitle(tx.order.status)}</h3>
+        <h3 className="font-bold">{t('Order rejected')}</h3>
         <p>{t('Your order was rejected.')}</p>
         {tx.txHash && (
           <p className="break-all">
@@ -547,11 +545,7 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
 
   return (
     <>
-      <ToastHeading>
-        {tx.order?.status
-          ? getOrderToastTitle(tx.order.status)
-          : t('Confirmed')}
-      </ToastHeading>
+      <ToastHeading>{t('Confirmed')}</ToastHeading>
       <p>{t('Your transaction has been confirmed ')}</p>
       {tx.txHash && (
         <p className="break-all">
@@ -586,7 +580,7 @@ const VegaTxErrorToastContent = ({ tx }: VegaTxToastContentProps) => {
     tx.error instanceof WalletError &&
     walletNoConnectionCodes.includes(tx.error.code);
   if (orderRejection) {
-    label = getOrderToastTitle(tx.order?.status) || t('Order rejected');
+    label = t('Order rejected');
     errorMessage = t('Your order has been rejected because: %s', [
       orderRejection || tx.order?.rejectionReason || ' ',
     ]);
@@ -638,8 +632,30 @@ export const useVegaTransactionToasts = () => {
   );
 
   const fromVegaTransaction = (tx: VegaStoredTxState): Toast => {
+    let content: ToastContent;
     const closeAfter = isFinal(tx) ? CLOSE_AFTER : undefined;
-    const { intent, content } = getVegaTransactionContentIntent(tx);
+    if (tx.status === VegaTxStatus.Requested) {
+      content = <VegaTxRequestedToastContent tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Pending) {
+      content = <VegaTxPendingToastContentProps tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Complete) {
+      content = <VegaTxCompleteToastsContent tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Error) {
+      content = <VegaTxErrorToastContent tx={tx} />;
+    }
+
+    // Transaction can be successful but the order can be rejected by the network
+    const intent =
+      (tx.order &&
+        [OrderStatus.STATUS_REJECTED, OrderStatus.STATUS_STOPPED].includes(
+          tx.order.status
+        )) ||
+      tx.order?.rejectionReason
+        ? Intent.Danger
+        : intentMap[tx.status];
 
     return {
       id: `vega-${tx.id}`,
@@ -663,27 +679,3 @@ export const useVegaTransactionToasts = () => {
     }
   );
 };
-
-export const getVegaTransactionContentIntent = (tx: VegaStoredTxState) => {
-  let content: ToastContent;
-  if (tx.status === VegaTxStatus.Requested) {
-    content = <VegaTxRequestedToastContent tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Pending) {
-    content = <VegaTxPendingToastContentProps tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Complete) {
-    content = <VegaTxCompleteToastsContent tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Error) {
-    content = <VegaTxErrorToastContent tx={tx} />;
-  }
-
-  // Transaction can be successful but the order can be rejected by the network
-  const intent =
-    (tx.order &&
-      !isOrderAmendmentTransaction(tx.body) &&
-      getOrderToastIntent(tx.order.status)) ||
-    intentMap[tx.status];
-  return { intent, content };
-};

apps/trading/pages/_app.page.tsx

@@ -33,8 +33,6 @@ import { ViewingBanner } from '../components/viewing-banner';
 import { Banner } from '../components/banner';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
-import { activeOrdersProvider } from '@vegaprotocol/orders';
 
 const DEFAULT_TITLE = t('Welcome to Vega trading!');
 
@@ -97,7 +95,6 @@ function AppBody({ Component }: AppProps) {
       <ToastsManager />
       <InitializeHandlers />
       <MaybeConnectEagerly />
-      <PartyData />
     </div>
   );
 }
@@ -130,18 +127,6 @@ function VegaTradingApp(props: AppProps) {
 
 export default VegaTradingApp;
 
-const PartyData = () => {
-  const { pubKey } = useVegaWallet();
-  const variables = { partyId: pubKey || '' };
-  const skip = !pubKey;
-  useDataProvider({
-    dataProvider: activeOrdersProvider,
-    variables,
-    skip,
-  });
-  return null;
-};
-
 const MaybeConnectEagerly = () => {
   useVegaEagerConnect(Connectors);
   useEthereumEagerConnect();

apps/trading/pages/client-router.tsx

@@ -31,7 +31,7 @@ export enum Routes {
   MARKET = '/markets',
   MARKETS = '/markets/all',
   PORTFOLIO = '/portfolio',
-  LIQUIDITY = '/liquidity',
+  LIQUIDITY = 'liquidity/:marketId',
 }
 
 type ConsoleLinks = { [r in Routes]: (...args: string[]) => string };
@@ -41,10 +41,8 @@ export const Links: ConsoleLinks = {
     marketId ? trimEnd(`${Routes.MARKET}/${marketId}`, '/') : Routes.MARKET,
   [Routes.MARKETS]: () => Routes.MARKETS,
   [Routes.PORTFOLIO]: () => Routes.PORTFOLIO,
-  [Routes.LIQUIDITY]: (marketId: string | null | undefined) =>
-    marketId
-      ? trimEnd(`${Routes.LIQUIDITY}/${marketId}`, '/')
-      : Routes.LIQUIDITY,
+  [Routes.LIQUIDITY]: (marketId: string) =>
+    Routes.LIQUIDITY.replace(':marketId', marketId),
 };
 
 const routerConfig: RouteObject[] = [
@@ -72,16 +70,6 @@ const routerConfig: RouteObject[] = [
   {
     path: Routes.LIQUIDITY,
     element: <LazyLiquidity />,
-    children: [
-      {
-        index: true,
-        element: <LazyLiquidity />,
-      },
-      {
-        path: ':marketId',
-        element: <LazyLiquidity />,
-      },
-    ],
   },
   {
     path: Routes.PORTFOLIO,

apps/trading/pages/styles.css

@@ -34,18 +34,6 @@ html [data-theme='dark'] {
   /* sell candles only use stroke as the candle is solid (without border) */
   --pennant-color-sell-stroke: theme('colors.vega.pink.500');
 
-  /* studies */
-  --pennant-color-eldar-ray-bear-power: theme('colors.vega.pink.500');
-  --pennant-color-eldar-ray-bull-power: theme('colors.vega.green.650');
-
-  --pennant-color-macd-divergence-buy: theme('colors.vega.green.650');
-  --pennant-color-macd-divergence-sell: theme('colors.vega.pink.500');
-  --pennant-color-macd-signal: theme('colors.vega.blue.500');
-  --pennant-color-macd-macd: theme('colors.vega.yellow.500');
-
-  --pennant-color-volume-buy: theme('colors.vega.green.650');
-  --pennant-color-volume-sell: theme('colors.vega.pink.500');
-
   /* depth chart */
   --pennant-color-depth-buy-fill: theme('colors.vega.green.650');
   --pennant-color-depth-buy-stroke: theme('colors.vega.green.500');
@@ -62,9 +50,6 @@ html [data-theme='light'] {
   /* sell candles only use stroke as the candle is solid (without border) */
   --pennant-color-sell-stroke: theme('colors.vega.pink.400');
 
-  --pennant-color-volume-buy: theme('colors.vega.green.400');
-  --pennant-color-volume-sell: theme('colors.vega.pink.400');
-
   /* depth chart */
   --pennant-color-depth-buy-fill: theme('colors.vega.green.400');
   --pennant-color-depth-buy-stroke: theme('colors.vega.green.550');

docker-build.sh

@@ -5,9 +5,7 @@ export PATH="/app/node_modules/.bin:$PATH"
 flags="--network-timeout 100000 --pure-lockfile"
 
 if [[ ! -z "${ENV_NAME}" ]]; then
-  if [[ "${ENV_NAME}" != "ops-vega" ]]; then
-    flags="--env=${ENV_NAME} $flags"
-  fi
+  flags="--env=${ENV_NAME} $flags"
 fi
 
 if [ "${APP}" = "trading" ]; then
@@ -18,3 +16,7 @@ if [ "${APP}" = "trading" ]; then
 else
   yarn nx build ${APP} $flags
 fi
+
+env_vars_file="/app/dist/apps/${APP}/.env"
+# make sure there are no exposed .env files
+rm $env_vars_file || echo "No env vars file"

docker/dist.Dockerfile

@@ -1,6 +0,0 @@
-FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
-EXPOSE 80
-WORKDIR /usr/share/nginx/html
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY ./dist-result/ /usr/share/nginx/html/

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

@@ -1,10 +1,4 @@
-import {
-  act,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
 import { AddressField, TransferFee, TransferForm } from './transfer-form';
 import { AccountType } from '@vegaprotocol/types';
@@ -33,34 +27,6 @@ describe('TransferForm', () => {
     submitTransfer: jest.fn(),
   };
 
-  it('validates a manually entered address', async () => {
-    render(<TransferForm {...props} />);
-    submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(3);
-    const toggle = screen.getByText('Enter manually');
-    fireEvent.click(toggle);
-    // has switched to input
-    expect(toggle).toHaveTextContent('Select from wallet');
-    expect(screen.getByLabelText('Vega key')).toHaveAttribute('type', 'text');
-    fireEvent.change(screen.getByLabelText('Vega key'), {
-      target: { value: 'invalid-address' },
-    });
-    await waitFor(() => {
-      const errors = screen.getAllByTestId('input-error-text');
-      expect(errors[0]).toHaveTextContent('Invalid Vega key');
-    });
-
-    // same pubkey
-    fireEvent.change(screen.getByLabelText('Vega key'), {
-      target: { value: pubKey },
-    });
-
-    await waitFor(() => {
-      const errors = screen.getAllByTestId('input-error-text');
-      expect(errors[0]).toHaveTextContent('Vega key is the same');
-    });
-  });
-
   it('validates fields and submits', async () => {
     render(<TransferForm {...props} />);
 
@@ -96,17 +62,15 @@ describe('TransferForm', () => {
       formatNumber(asset.balance, asset.decimals)
     );
 
-    const amountInput = screen.getByLabelText('Amount');
-
     // Test amount validation
-    fireEvent.change(amountInput, {
+    fireEvent.change(screen.getByLabelText('Amount'), {
       target: { value: '0.00000001' },
     });
     expect(
       await screen.findByText('Value is below minimum')
     ).toBeInTheDocument();
 
-    fireEvent.change(amountInput, {
+    fireEvent.change(screen.getByLabelText('Amount'), {
       target: { value: '9999999' },
     });
     expect(
@@ -114,7 +78,7 @@ describe('TransferForm', () => {
     ).toBeInTheDocument();
 
     // set valid amount
-    fireEvent.change(amountInput, {
+    fireEvent.change(screen.getByLabelText('Amount'), {
       target: { value: amount },
     });
     expect(screen.getByTestId('transfer-fee')).toHaveTextContent(
@@ -136,191 +100,78 @@ describe('TransferForm', () => {
     });
   });
 
-  describe('IncludeFeesCheckbox', () => {
-    it('validates fields and submits when checkbox is checked', async () => {
-      render(<TransferForm {...props} />);
-
-      // check current pubkey not shown
-      const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
-      expect(keySelect.children).toHaveLength(2);
-      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
-        '',
-        props.pubKeys[1],
-      ]);
-
-      submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(3);
-
-      // Select a pubkey
-      fireEvent.change(screen.getByLabelText('Vega key'), {
-        target: { value: props.pubKeys[1] },
-      });
-
-      // Select asset
-      fireEvent.change(
-        // Bypass RichSelect and target hidden native select
-        // eslint-disable-next-line
-        document.querySelector('select[name="asset"]')!,
-        { target: { value: asset.id } }
-      );
-
-      // assert rich select as updated
-      expect(await screen.findByTestId('select-asset')).toHaveTextContent(
-        asset.name
-      );
-      expect(screen.getByTestId('asset-balance')).toHaveTextContent(
-        formatNumber(asset.balance, asset.decimals)
-      );
-
-      const amountInput = screen.getByLabelText('Amount');
-      const checkbox = screen.getByTestId('include-transfer-fee');
-      expect(checkbox).not.toBeChecked();
-      act(() => {
-        /* fire events that update state */
-        // set valid amount
-        fireEvent.change(amountInput, {
-          target: { value: amount },
-        });
-        // check include fees checkbox
-        fireEvent.click(checkbox);
-      });
-
-      expect(checkbox).toBeChecked();
-      const expectedFee = new BigNumber(amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const expectedAmount = new BigNumber(amount).minus(expectedFee).toFixed();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
-        expectedAmount
-      );
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(
-        amount
-      );
-
-      submit();
-
-      await waitFor(() => {
-        expect(props.submitTransfer).toHaveBeenCalledTimes(1);
-        expect(props.submitTransfer).toHaveBeenCalledWith({
-          fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-          toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-          to: props.pubKeys[1],
-          asset: asset.id,
-          amount: removeDecimal(amount, asset.decimals),
-          oneOff: {},
-        });
-      });
+  it('validates a manually entered address', async () => {
+    render(<TransferForm {...props} />);
+    submit();
+    expect(await screen.findAllByText('Required')).toHaveLength(3);
+    const toggle = screen.getByText('Enter manually');
+    fireEvent.click(toggle);
+    // has switched to input
+    expect(toggle).toHaveTextContent('Select from wallet');
+    expect(screen.getByLabelText('Vega key')).toHaveAttribute('type', 'text');
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: 'invalid-address' },
+    });
+    await waitFor(() => {
+      const errors = screen.getAllByTestId('input-error-text');
+      expect(errors[0]).toHaveTextContent('Invalid Vega key');
     });
 
-    it('validates fields when checkbox is not checked', async () => {
-      render(<TransferForm {...props} />);
-
-      // check current pubkey not shown
-      const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
-      expect(keySelect.children).toHaveLength(2);
-      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
-        '',
-        props.pubKeys[1],
-      ]);
-
-      submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(3);
-
-      // Select a pubkey
-      fireEvent.change(screen.getByLabelText('Vega key'), {
-        target: { value: props.pubKeys[1] },
-      });
-
-      // Select asset
-      fireEvent.change(
-        // Bypass RichSelect and target hidden native select
-        // eslint-disable-next-line
-        document.querySelector('select[name="asset"]')!,
-        { target: { value: asset.id } }
-      );
-
-      // assert rich select as updated
-      expect(await screen.findByTestId('select-asset')).toHaveTextContent(
-        asset.name
-      );
-      expect(screen.getByTestId('asset-balance')).toHaveTextContent(
-        formatNumber(asset.balance, asset.decimals)
-      );
-
-      const amountInput = screen.getByLabelText('Amount');
-      const checkbox = screen.getByTestId('include-transfer-fee');
-      expect(checkbox).not.toBeChecked();
-      act(() => {
-        /* fire events that update state */
-        // set valid amount
-        fireEvent.change(amountInput, {
-          target: { value: amount },
-        });
-      });
-      expect(checkbox).not.toBeChecked();
-      const expectedFee = new BigNumber(amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const total = new BigNumber(amount).plus(expectedFee).toFixed();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
-    });
-  });
-
-  describe('AddressField', () => {
-    const props = {
-      pubKeys: ['pubkey-1', 'pubkey-2'],
-      select: <div>select</div>,
-      input: <div>input</div>,
-      onChange: jest.fn(),
-    };
-
-    it('toggles content and calls onChange', async () => {
-      const mockOnChange = jest.fn();
-      render(<AddressField {...props} onChange={mockOnChange} />);
-
-      // select should be shown as multiple pubkeys provided
-      expect(screen.getByText('select')).toBeInTheDocument();
-      expect(screen.queryByText('input')).not.toBeInTheDocument();
-      fireEvent.click(screen.getByText('Enter manually'));
-      expect(screen.queryByText('select')).not.toBeInTheDocument();
-      expect(screen.getByText('input')).toBeInTheDocument();
-      expect(mockOnChange).toHaveBeenCalledTimes(1);
-      fireEvent.click(screen.getByText('Select from wallet'));
-      expect(screen.getByText('select')).toBeInTheDocument();
-      expect(screen.queryByText('input')).not.toBeInTheDocument();
-      expect(mockOnChange).toHaveBeenCalledTimes(2);
+    // same pubkey
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: pubKey },
     });
 
-    it('Does not provide select option if there is only a single key', () => {
-      render(<AddressField {...props} pubKeys={['single-pubKey']} />);
-      expect(screen.getByText('input')).toBeInTheDocument();
-      expect(screen.queryByText('Select from wallet')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('TransferFee', () => {
-    const props = {
-      amount: '200',
-      feeFactor: '0.001',
-      fee: '0.2',
-      transferAmount: '200',
-      decimals: 8,
-    };
-    it('calculates and renders the transfer fee', () => {
-      render(<TransferFee {...props} />);
-
-      const expected = new BigNumber(props.amount)
-        .times(props.feeFactor)
-        .toFixed();
-      const total = new BigNumber(props.amount).plus(expected).toFixed();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expected);
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
-        props.amount
-      );
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
+    await waitFor(() => {
+      const errors = screen.getAllByTestId('input-error-text');
+      expect(errors[0]).toHaveTextContent('Vega key is the same');
     });
   });
 });
+
+describe('AddressField', () => {
+  const props = {
+    pubKeys: ['pubkey-1', 'pubkey-2'],
+    select: <div>select</div>,
+    input: <div>input</div>,
+    onChange: jest.fn(),
+  };
+
+  it('toggles content and calls onChange', async () => {
+    const mockOnChange = jest.fn();
+    render(<AddressField {...props} onChange={mockOnChange} />);
+
+    // select should be shown as multiple pubkeys provided
+    expect(screen.getByText('select')).toBeInTheDocument();
+    expect(screen.queryByText('input')).not.toBeInTheDocument();
+    fireEvent.click(screen.getByText('Enter manually'));
+    expect(screen.queryByText('select')).not.toBeInTheDocument();
+    expect(screen.getByText('input')).toBeInTheDocument();
+    expect(mockOnChange).toHaveBeenCalledTimes(1);
+    fireEvent.click(screen.getByText('Select from wallet'));
+    expect(screen.getByText('select')).toBeInTheDocument();
+    expect(screen.queryByText('input')).not.toBeInTheDocument();
+    expect(mockOnChange).toHaveBeenCalledTimes(2);
+  });
+
+  it('Does not provide select option if there is only a single key', () => {
+    render(<AddressField {...props} pubKeys={['single-pubKey']} />);
+    expect(screen.getByText('input')).toBeInTheDocument();
+    expect(screen.queryByText('Select from wallet')).not.toBeInTheDocument();
+  });
+});
+
+describe('TransferFee', () => {
+  const props = {
+    amount: '200',
+    feeFactor: '0.001',
+  };
+  it('calculates and renders the transfer fee', () => {
+    render(<TransferFee {...props} />);
+
+    const expected = new BigNumber(props.amount)
+      .times(props.feeFactor)
+      .toFixed();
+    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expected);
+  });
+});

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

@@ -16,7 +16,6 @@ import {
   RichSelect,
   Select,
   Tooltip,
-  Checkbox,
 } from '@vegaprotocol/ui-toolkit';
 import type { Transfer } from '@vegaprotocol/wallet';
 import { normalizeTransfer } from '@vegaprotocol/wallet';
@@ -64,26 +63,6 @@ export const TransferForm = ({
   const amount = watch('amount');
   const assetId = watch('asset');
 
-  const [includeFee, setIncludeFee] = useState(false);
-
-  const transferAmount = useMemo(() => {
-    if (!amount) return undefined;
-    if (includeFee && feeFactor) {
-      return new BigNumber(1).minus(feeFactor).times(amount).toString();
-    }
-    return amount;
-  }, [amount, includeFee, feeFactor]);
-
-  const fee = useMemo(() => {
-    if (!transferAmount) return undefined;
-    if (includeFee) {
-      return new BigNumber(amount).minus(transferAmount).toString();
-    }
-    return (
-      feeFactor && new BigNumber(feeFactor).times(transferAmount).toString()
-    );
-  }, [amount, includeFee, transferAmount, feeFactor]);
-
   const asset = useMemo(() => {
     return assets.find((a) => a.id === assetId);
   }, [assets, assetId]);
@@ -93,16 +72,13 @@ export const TransferForm = ({
       if (!asset) {
         throw new Error('Submitted transfer with no asset selected');
       }
-      if (!transferAmount) {
-        throw new Error('Submitted transfer with no amount selected');
-      }
-      const transfer = normalizeTransfer(fields.toAddress, transferAmount, {
+      const transfer = normalizeTransfer(fields.toAddress, fields.amount, {
         id: asset.id,
         decimals: asset.decimals,
       });
       submitTransfer(transfer);
     },
-    [asset, submitTransfer, transferAmount]
+    [asset, submitTransfer]
   );
 
   const min = useMemo(() => {
@@ -237,32 +213,7 @@ export const TransferForm = ({
           <InputError forInput="amount">{errors.amount.message}</InputError>
         )}
       </FormGroup>
-      <div className="mb-4">
-        <Checkbox
-          name="include-transfer-fee"
-          disabled={!transferAmount}
-          label={
-            <Tooltip
-              description={t(
-                `The fee will be taken from the amount you are transferring.`
-              )}
-            >
-              <div>{t('Include transfer fee')}</div>
-            </Tooltip>
-          }
-          checked={includeFee}
-          onCheckedChange={() => setIncludeFee(!includeFee)}
-        />
-      </div>
-      {transferAmount && fee && (
-        <TransferFee
-          amount={transferAmount}
-          transferAmount={transferAmount}
-          feeFactor={feeFactor}
-          fee={fee}
-          decimals={asset?.decimals}
-        />
-      )}
+      <TransferFee amount={amount} feeFactor={feeFactor} />
       <Button type="submit" variant="primary" fill={true}>
         {t('Confirm transfer')}
       </Button>
@@ -272,71 +223,34 @@ export const TransferForm = ({
 
 export const TransferFee = ({
   amount,
-  transferAmount,
   feeFactor,
-  fee,
-  decimals,
 }: {
   amount: string;
-  transferAmount: string;
   feeFactor: string | null;
-  fee?: string;
-  decimals?: number;
 }) => {
-  if (!feeFactor || !amount || !transferAmount || !fee) return null;
+  if (!feeFactor || !amount) return null;
 
-  const totalValue = new BigNumber(transferAmount).plus(fee).toString();
+  // using toFixed without an argument will always return a
+  // number in normal notation without rounding, formatting functions
+  // arent working in a way which won't round the decimal places
+  const value = new BigNumber(amount).times(feeFactor).toFixed();
 
   return (
-    <div className="mb-4 flex flex-col gap-2 text-xs">
-      <div className="flex justify-between gap-1 items-center flex-wrap">
+    <div className="mb-4 flex justify-between items-center gap-4 flex-wrap">
+      <div>
         <Tooltip
           description={t(
-            `The transfer fee is set by the network parameter transfer.fee.factor, currently set to %s`,
-            [feeFactor]
+            `The transfer fee is set by the network parameter transfer.fee.factor, currently set to ${feeFactor}`
           )}
         >
           <div>{t('Transfer fee')}</div>
         </Tooltip>
-
-        <div
-          data-testid="transfer-fee"
-          className="text-neutral-500 dark:text-neutral-300"
-        >
-          {formatNumber(fee, decimals)}
-        </div>
       </div>
-      <div className="flex justify-between gap-1 items-center flex-wrap">
-        <Tooltip
-          description={t(
-            `The total amount to be transferred (without the fee)`
-          )}
-        >
-          <div>{t('Amount to be transferred')}</div>
-        </Tooltip>
-
-        <div
-          data-testid="transfer-amount"
-          className="text-neutral-500 dark:text-neutral-300"
-        >
-          {formatNumber(amount, decimals)}
-        </div>
-      </div>
-      <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.`
-          )}
-        >
-          <div>{t('Total amount (with fee)')}</div>
-        </Tooltip>
-
-        <div
-          data-testid="total-transfer-fee"
-          className="text-neutral-500 dark:text-neutral-300"
-        >
-          {formatNumber(totalValue, decimals)}
-        </div>
+      <div
+        data-testid="transfer-fee"
+        className="text-neutral-500 dark:text-neutral-300"
+      >
+        {value}
       </div>
     </div>
   );

libs/accounts/src/setup-tests.ts

@@ -1,6 +1 @@
 import '@testing-library/jest-dom';
-import ResizeObserver from 'resize-observer-polyfill';
-import { defaultFallbackInView } from 'react-intersection-observer';
-
-defaultFallbackInView(true);
-global.ResizeObserver = ResizeObserver;

libs/assets/src/lib/Assets.graphql

@@ -1,25 +1,8 @@
-fragment AssetListFields on Asset {
-  id
-  name
-  symbol
-  decimals
-  quantum
-  source {
-    __typename
-    ... on ERC20 {
-      contractAddress
-      lifetimeLimit
-      withdrawThreshold
-    }
-  }
-  status
-}
-
 query Assets {
   assetsConnection {
     edges {
       node {
-        ...AssetListFields
+        ...AssetFields
       }
     }
   }

libs/assets/src/lib/__generated__/Assets.ts

@@ -1,44 +1,26 @@
 import * as Types from '@vegaprotocol/types';
 
 import { gql } from '@apollo/client';
+import { AssetFieldsFragmentDoc } from './Asset';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type AssetListFieldsFragment = { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } };
-
 export type AssetsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type AssetsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } } } | null> | null } | null };
+export type AssetsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string }, infrastructureFeeAccount?: { __typename?: 'AccountBalance', balance: string } | null, globalRewardPoolAccount?: { __typename?: 'AccountBalance', balance: string } | null, takerFeeRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null, makerFeeRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null, lpFeeRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null, marketProposerRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null } } | null> | null } | null };
+
 
-export const AssetListFieldsFragmentDoc = gql`
-    fragment AssetListFields on Asset {
-  id
-  name
-  symbol
-  decimals
-  quantum
-  source {
-    __typename
-    ... on ERC20 {
-      contractAddress
-      lifetimeLimit
-      withdrawThreshold
-    }
-  }
-  status
-}
-    `;
 export const AssetsDocument = gql`
     query Assets {
   assetsConnection {
     edges {
       node {
-        ...AssetListFields
+        ...AssetFields
       }
     }
   }
 }
-    ${AssetListFieldsFragmentDoc}`;
+    ${AssetFieldsFragmentDoc}`;
 
 /**
  * __useAssetsQuery__

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

@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react';
 import * as Schema from '@vegaprotocol/types';
 import { AssetDetailsDialog } from './asset-details-dialog';
 import { AssetDetail, testId } from './asset-details-table';
-import { AssetDocument } from './__generated__/Asset';
+import { AssetsDocument } from './__generated__/Assets';
 import { generateBuiltinAsset, generateERC20Asset } from './test-helpers';
 
 const mockedData = {
@@ -39,17 +39,15 @@ const mockedData = {
   },
 };
 
-const mocks = mockedData.data.assetsConnection.edges.map((mock) => ({
-  request: {
-    query: AssetDocument,
-    variables: { assetId: mock.node.id },
-  },
-  result: {
-    data: {
-      assetsConnection: { edges: [mock] },
+const mocks = [
+  {
+    request: {
+      query: AssetsDocument,
+      variables: {},
     },
+    result: mockedData,
   },
-}));
+];
 
 const WrappedAssetDetailsDialog = ({ assetId }: { assetId: string }) => (
   <MockedProvider mocks={mocks}>

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

@@ -1,4 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
+import { useAssetsDataProvider } from './assets-data-provider';
 import {
   Button,
   Dialog,
@@ -9,7 +10,6 @@ import {
 import { create } from 'zustand';
 import { AssetDetailsTable } from './asset-details-table';
 import { AssetProposalNotification } from '@vegaprotocol/proposals';
-import { useAssetDataProvider } from './asset-data-provider';
 
 export type AssetDetailsDialogStore = {
   isOpen: boolean;
@@ -55,8 +55,9 @@ export const AssetDetailsDialog = ({
   onChange,
   asJson = false,
 }: AssetDetailsDialogProps) => {
-  const { data: asset } = useAssetDataProvider(assetId);
+  const { data } = useAssetsDataProvider();
 
+  const asset = data?.find((a) => a.id === assetId);
   const assetSymbol = asset?.symbol || '';
 
   const content = asset ? (

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

@@ -11,7 +11,6 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
 import type { Asset } from './asset-data-provider';
-import { WITHDRAW_THRESHOLD_TOOLTIP_TEXT } from './constants';
 
 type Rows = {
   key: AssetDetail;
@@ -122,7 +121,9 @@ export const rows: Rows = [
   {
     key: AssetDetail.WITHDRAWAL_THRESHOLD,
     label: t('Withdrawal threshold'),
-    tooltip: WITHDRAW_THRESHOLD_TOOLTIP_TEXT,
+    tooltip: t(
+      'The maximum you can withdraw instantly. There’s no limit on the size of a withdrawal, but all withdrawals over the threshold will have a delay time added to them'
+    ),
     value: (asset) =>
       num(asset, (asset.source as Schema.ERC20).withdrawThreshold),
   },

libs/assets/src/lib/assets.mock.ts

@@ -1,10 +1,8 @@
 import merge from 'lodash/merge';
-import type {
-  AssetsQuery,
-  AssetListFieldsFragment,
-} from './__generated__/Assets';
+import type { AssetsQuery } from './__generated__/Assets';
 import * as Types from '@vegaprotocol/types';
 import type { PartialDeep } from 'type-fest';
+import type { AssetFieldsFragment } from './__generated__/Asset';
 
 export const assetsQuery = (
   override?: PartialDeep<AssetsQuery>
@@ -20,7 +18,7 @@ export const assetsQuery = (
   return merge(defaultAssets, override);
 };
 
-const assetFields: AssetListFieldsFragment[] = [
+const assetFields: AssetFieldsFragment[] = [
   {
     __typename: 'Asset',
     id: 'asset-id',
@@ -35,6 +33,30 @@ const assetFields: AssetListFieldsFragment[] = [
     },
     quantum: '1',
     status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
   },
   {
     __typename: 'Asset',
@@ -50,6 +72,30 @@ const assetFields: AssetListFieldsFragment[] = [
     },
     quantum: '1',
     status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
   },
   {
     __typename: 'Asset',
@@ -58,10 +104,20 @@ const assetFields: AssetListFieldsFragment[] = [
     decimals: 5,
     name: 'Asto',
     source: {
+      maxFaucetAmountMint: '5000000000',
       __typename: 'BuiltinAsset',
     },
     quantum: '1',
     status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '0',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: null,
+    takerFeeRewardAccount: null,
+    makerFeeRewardAccount: null,
+    lpFeeRewardAccount: null,
+    marketProposerRewardAccount: null,
   },
   {
     __typename: 'Asset',
@@ -70,10 +126,20 @@ const assetFields: AssetListFieldsFragment[] = [
     decimals: 5,
     name: 'tBTC TEST',
     source: {
+      maxFaucetAmountMint: '5000000000',
       __typename: 'BuiltinAsset',
     },
     quantum: '1',
     status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '0',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: null,
+    takerFeeRewardAccount: null,
+    makerFeeRewardAccount: null,
+    lpFeeRewardAccount: null,
+    marketProposerRewardAccount: null,
   },
   // NOTE: These assets ids and contract addresses are real assets on Sepolia, this is needed
   // because we don't currently mock our seplia infura provider. If we change network these will
@@ -92,6 +158,30 @@ const assetFields: AssetListFieldsFragment[] = [
       __typename: 'ERC20',
     },
     quantum: '1',
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
   },
   {
     __typename: 'Asset',
@@ -107,5 +197,29 @@ const assetFields: AssetListFieldsFragment[] = [
       __typename: 'ERC20',
     },
     quantum: '1',
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
   },
 ];

libs/assets/src/lib/constants.ts

@@ -1,4 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-export const WITHDRAW_THRESHOLD_TOOLTIP_TEXT = t(
-  "The maximum you can withdraw instantly. There's no limit on the size of a withdrawal, but all withdrawals over the threshold will have a delay time added to them"
-);

libs/assets/src/lib/index.ts

@@ -5,4 +5,3 @@ export * from './assets-data-provider';
 export * from './asset-details-dialog';
 export * from './asset-details-table';
 export * from './asset-option';
-export * from './constants';

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

@@ -1,6 +1,6 @@
 import 'pennant/dist/style.css';
 import {
-  CandlestickChart,
+  Chart,
   ChartType,
   Interval,
   Overlay,
@@ -234,7 +234,7 @@ export const CandlesChartContainer = ({
         </DropdownMenu>
       </div>
       <div className="flex-1">
-        <CandlestickChart
+        <Chart
           dataSource={dataSource}
           options={{
             chartType: chartType,

libs/cypress/src/lib/utils.ts

@@ -52,9 +52,6 @@ export const checkSorting = (
     cy.get(`[col-id="${column}"]`).click();
   });
   checkSortChange(orderTabDesc, column);
-  cy.get('.ag-header-container').within(() => {
-    cy.get(`[col-id="${column}"]`).click();
-  });
 };
 
 const checkSortChange = (tabsArr: string[], column: string) => {

libs/datagrid/src/index.ts

@@ -10,7 +10,6 @@ export * from './lib/cells/price-flash-cell';
 export * from './lib/cells/vol-cell';
 export * from './lib/cells/centered-grid-cell';
 export * from './lib/cells/market-name-cell';
-export * from './lib/cells/order-type-cell';
 
 export * from './lib/filters/date-range-filter';
 export * from './lib/filters/set-filter';

libs/datagrid/src/lib/cells/cumulative-vol-cell.tsx

@@ -1,6 +1,6 @@
 import { memo } from 'react';
 import { BID_COLOR, ASK_COLOR } from './vol-cell';
-import { addDecimalsFixedFormatNumber } from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { NumericCell } from './numeric-cell';
 
 export interface CumulativeVolProps {
@@ -55,7 +55,7 @@ export const CumulativeVol = memo(
         (
         <NumericCell
           value={Number(indicativeVolume)}
-          valueFormatted={addDecimalsFixedFormatNumber(
+          valueFormatted={addDecimalsFormatNumber(
             indicativeVolume,
             positionDecimalPlaces ?? 0
           )}
@@ -67,7 +67,7 @@ export const CumulativeVol = memo(
         {ask ? (
           <NumericCell
             value={ask}
-            valueFormatted={addDecimalsFixedFormatNumber(
+            valueFormatted={addDecimalsFormatNumber(
               ask,
               positionDecimalPlaces ?? 0
             )}
@@ -77,7 +77,7 @@ export const CumulativeVol = memo(
         {bid ? (
           <NumericCell
             value={ask}
-            valueFormatted={addDecimalsFixedFormatNumber(
+            valueFormatted={addDecimalsFormatNumber(
               bid,
               positionDecimalPlaces ?? 0
             )}

libs/datagrid/src/lib/cells/market-name-cell.tsx

@@ -21,7 +21,7 @@ export const MarketNameCell = ({
       ev.preventDefault();
       ev.stopPropagation();
       if (onMarketClick) {
-        onMarketClick(id, ev.metaKey || ev.ctrlKey);
+        onMarketClick(id, ev.metaKey);
       }
     },
     [id, onMarketClick]

libs/datagrid/src/lib/cells/order-type-cell.tsx

@@ -1,52 +0,0 @@
-import type { MouseEvent } from 'react';
-import { useMemo } from 'react';
-import { useCallback } from 'react';
-import { t } from '@vegaprotocol/i18n';
-import * as Schema from '@vegaprotocol/types';
-
-interface OrderTypeCellProps {
-  value?: Schema.OrderType;
-  data?: Schema.Order;
-  onClick?: (marketId: string, metaKey?: boolean) => void;
-}
-
-export const OrderTypeCell = ({
-  value,
-  data: order,
-  onClick,
-}: OrderTypeCellProps) => {
-  const id = order ? order.market.id : '';
-
-  const label = useMemo(() => {
-    if (!order) {
-      return undefined;
-    }
-    if (!value) return '-';
-    if (order?.peggedOrder) {
-      return t('Pegged');
-    }
-    if (order?.liquidityProvision) {
-      return t('Liquidity provision');
-    }
-    return Schema.OrderTypeMapping[value];
-  }, [order, value]);
-
-  const handleOnClick = useCallback(
-    (ev: MouseEvent<HTMLButtonElement>) => {
-      ev.preventDefault();
-      ev.stopPropagation();
-      if (onClick) {
-        onClick(id, ev.metaKey || ev.ctrlKey);
-      }
-    },
-    [id, onClick]
-  );
-  if (!order) return null;
-  return order?.liquidityProvision ? (
-    <button onClick={handleOnClick} tabIndex={0} className="underline">
-      {label}
-    </button>
-  ) : (
-    <span>{label}</span>
-  );
-};

libs/datagrid/src/lib/filters/date-range-filter.spec.tsx

@@ -8,7 +8,7 @@ const commonProps = {
 
 describe('DateRangeFilter', () => {
   it('should be properly rendered', async () => {
-    const defaultValue = {
+    const defaultRangeFilter = {
       start: '2023-02-14T13:53:01+01:00',
       end: '2023-02-21T13:53:01+01:00',
     };
@@ -17,7 +17,7 @@ describe('DateRangeFilter', () => {
     render(
       <DateRangeFilter
         {...(commonProps as unknown as DateRangeFilterProps)}
-        defaultValue={defaultValue}
+        defaultRangeFilter={defaultRangeFilter}
       />
     );
 

libs/datagrid/src/lib/filters/date-range-filter.tsx

@@ -1,5 +1,5 @@
 import type { ChangeEvent } from 'react';
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo } from 'react';
 import type * as Schema from '@vegaprotocol/types';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import type { IDoesFilterPassParams, IFilterParams } from 'ag-grid-community';
@@ -17,9 +17,9 @@ import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { InputError } from '@vegaprotocol/ui-toolkit';
 
-const defaultValue: Schema.DateRange = {};
+const defaultFilterValue: Schema.DateRange = {};
 export interface DateRangeFilterProps extends IFilterParams {
-  defaultValue?: Schema.DateRange;
+  defaultRangeFilter?: Schema.DateRange;
   maxSubDays?: number;
   maxNextDays?: number;
   maxDaysRange?: number;
@@ -27,9 +27,8 @@ export interface DateRangeFilterProps extends IFilterParams {
 
 export const DateRangeFilter = forwardRef(
   (props: DateRangeFilterProps, ref) => {
-    const defaultDates = props?.defaultValue || defaultValue;
+    const defaultDates = props?.defaultRangeFilter || defaultFilterValue;
     const [value, setValue] = useState<Schema.DateRange>(defaultDates);
-    const valueRef = useRef<Schema.DateRange>(value);
     const [error, setError] = useState<string>('');
     const [minStartDate, maxStartDate, minEndDate, maxEndDate] = useMemo(() => {
       const minStartDate =
@@ -94,7 +93,7 @@ export const DateRangeFilter = forwardRef(
         },
 
         isFilterActive() {
-          return valueRef.current.start || valueRef.current.end;
+          return value.start || value.end;
         },
 
         getModel() {
@@ -102,13 +101,13 @@ export const DateRangeFilter = forwardRef(
             return null;
           }
 
-          return { value: valueRef.current };
+          return { value };
         },
 
         setModel(model?: { value: Schema.DateRange } | null) {
-          valueRef.current =
-            model?.value || props?.defaultValue || defaultValue;
-          setValue(valueRef.current);
+          setValue(
+            model?.value || props?.defaultRangeFilter || defaultFilterValue
+          );
         },
       };
     });
@@ -186,8 +185,10 @@ export const DateRangeFilter = forwardRef(
       update = { ...update, end: checkForEndDate(endDate, startDate) };
 
       if (validate(name, date, update)) {
-        valueRef.current = { ...valueRef.current, ...update };
-        setValue(valueRef.current);
+        setValue((curr) => ({
+          ...curr,
+          ...update,
+        }));
       }
     };
     useEffect(() => {
@@ -240,8 +241,7 @@ export const DateRangeFilter = forwardRef(
             className="ag-standard-button ag-filter-apply-panel-button"
             onClick={() => {
               setError('');
-              valueRef.current = defaultDates;
-              setValue(valueRef.current);
+              setValue(defaultDates);
             }}
           >
             {t('Reset')}

libs/datagrid/src/lib/filters/set-filter.tsx

@@ -1,17 +1,10 @@
 import type { ChangeEvent } from 'react';
-import {
-  forwardRef,
-  useEffect,
-  useImperativeHandle,
-  useState,
-  useRef,
-} from 'react';
+import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import type { IDoesFilterPassParams, IFilterParams } from 'ag-grid-community';
 import { t } from '@vegaprotocol/i18n';
 
 export const SetFilter = forwardRef((props: IFilterParams, ref) => {
   const [value, setValue] = useState<string[]>([]);
-  const valueRef = useRef(value);
 
   // expose AG Grid Filter Lifecycle callbacks
   useImperativeHandle(ref, () => {
@@ -35,28 +28,29 @@ export const SetFilter = forwardRef((props: IFilterParams, ref) => {
       },
 
       isFilterActive() {
-        return valueRef.current.length !== 0;
+        return value.length !== 0;
       },
 
       getModel() {
         if (!this.isFilterActive()) {
           return null;
         }
-        return { value: valueRef.current };
+
+        return { value };
       },
 
       setModel(model?: { value: string[] } | null) {
-        valueRef.current = !model ? [] : model.value;
-        setValue(valueRef.current);
+        setValue(!model ? [] : model.value);
       },
     };
   });
 
   const onChange = (event: ChangeEvent<HTMLInputElement>) => {
-    valueRef.current = event.target.checked
-      ? [...value, event.target.value]
-      : value.filter((v) => v !== event.target.value);
-    setValue(valueRef.current);
+    setValue(
+      event.target.checked
+        ? [...value, event.target.value]
+        : value.filter((v) => v !== event.target.value)
+    );
   };
 
   useEffect(() => {
@@ -83,7 +77,7 @@ export const SetFilter = forwardRef((props: IFilterParams, ref) => {
         <button
           type="button"
           className="ag-standard-button ag-filter-apply-panel-button"
-          onClick={() => setValue((valueRef.current = []))}
+          onClick={() => setValue([])}
         >
           {t('Reset')}
         </button>

libs/deal-ticket/src/components/trading-mode-tooltip/compile-grid-data.tsx

@@ -78,9 +78,7 @@ export const compileGridData = (
       label: (
         <Link
           to={`/liquidity/${market.id}`}
-          onClick={(ev) =>
-            onSelect && onSelect(market.id, ev.metaKey || ev.ctrlKey)
-          }
+          onClick={(ev) => onSelect && onSelect(market.id, ev.metaKey)}
         >
           <UILink>{t('Current liquidity')}</UILink>
         </Link>

libs/deal-ticket/src/hooks/index.ts

@@ -1,2 +1,6 @@
 export * from './__generated__/EstimateOrder';
+export * from './use-calculate-slippage';
 export * from './use-fee-deal-ticket-details';
+export * from './use-market-positions';
+export * from './use-maximum-position-size';
+export * from './use-order-closeout';

libs/deal-ticket/src/hooks/use-calculate-slippage.spec.tsx

@@ -0,0 +1,144 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { renderHook } from '@testing-library/react';
+import * as Schema from '@vegaprotocol/types';
+import type { Market } from '@vegaprotocol/market-list';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { useCalculateSlippage } from './use-calculate-slippage';
+
+const mockData = {
+  decimalPlaces: 0,
+  positionDecimalPlaces: 0,
+  depth: {
+    buy: [
+      {
+        price: '5',
+        volume: '2',
+      },
+      {
+        price: '4',
+        volume: '3',
+      },
+      {
+        price: '3',
+        volume: '2',
+      },
+      {
+        price: '2',
+        volume: '1',
+      },
+      {
+        price: '1',
+        volume: '1',
+      },
+    ],
+    sell: [
+      {
+        price: '6',
+        volume: '1',
+      },
+      {
+        price: '7',
+        volume: '3',
+      },
+      {
+        price: '8',
+        volume: '2',
+      },
+      {
+        price: '9',
+        volume: '1',
+      },
+      {
+        price: '10',
+        volume: '2',
+      },
+    ],
+  },
+};
+
+let mockOrderBookData = {
+  data: mockData,
+};
+
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
+  useDataProvider: jest.fn(() => ({
+    data: {
+      marketsConnection: [],
+    },
+  })),
+  useThrottledDataProvider: jest.fn(() => mockOrderBookData),
+}));
+
+describe('useCalculateSlippage Hook', () => {
+  describe('calculate proper result', () => {
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+    const market = {
+      id: 'marketId',
+      decimalPlaces: 0,
+      positionDecimalPlaces: 0,
+    } as Market;
+
+    it('long order', () => {
+      const { result } = renderHook(
+        () =>
+          useCalculateSlippage({
+            market,
+            order: {
+              size: '10',
+              side: Schema.Side.SIDE_BUY,
+            } as OrderSubmissionBody['orderSubmission'],
+          }),
+        {
+          wrapper: MockedProvider,
+        }
+      );
+      expect(result.current).toEqual('33.33');
+    });
+
+    it('short order', () => {
+      const { result } = renderHook(
+        () =>
+          useCalculateSlippage({
+            market,
+            order: {
+              size: '10',
+              side: Schema.Side.SIDE_SELL,
+            } as OrderSubmissionBody['orderSubmission'],
+          }),
+        {
+          wrapper: MockedProvider,
+        }
+      );
+      expect(result.current).toEqual('31.11');
+    });
+
+    it('when no order book result should be null', () => {
+      mockOrderBookData = {
+        data: {
+          ...mockData,
+          depth: {
+            ...mockData.depth,
+            buy: [],
+          },
+        },
+      };
+      const { result } = renderHook(
+        () =>
+          useCalculateSlippage({
+            market,
+            order: {
+              size: '10',
+              side: Schema.Side.SIDE_SELL,
+            } as OrderSubmissionBody['orderSubmission'],
+          }),
+        {
+          wrapper: MockedProvider,
+        }
+      );
+      expect(result.current).toBeNull();
+    });
+  });
+});

libs/deal-ticket/src/hooks/use-calculate-slippage.ts

@@ -0,0 +1,63 @@
+import { marketDepthProvider } from '@vegaprotocol/market-depth';
+import * as Schema from '@vegaprotocol/types';
+import type { Market } from '@vegaprotocol/market-list';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { BigNumber } from 'bignumber.js';
+import { formatNumber, toBigNum } from '@vegaprotocol/utils';
+import { useThrottledDataProvider } from '@vegaprotocol/react-helpers';
+
+interface Props {
+  market: Market;
+  order: OrderSubmissionBody['orderSubmission'];
+}
+
+export const useCalculateSlippage = ({ market, order }: Props) => {
+  const { data } = useThrottledDataProvider(
+    {
+      dataProvider: marketDepthProvider,
+      variables: { marketId: market.id },
+    },
+    1000
+  );
+  const volPriceArr =
+    data?.depth[order.side === Schema.Side.SIDE_BUY ? 'sell' : 'buy'] || [];
+  if (volPriceArr.length && market) {
+    const decimals = market.decimalPlaces ?? 0;
+    const positionDecimals = market.positionDecimalPlaces ?? 0;
+    const bestPrice = toBigNum(volPriceArr[0].price, decimals);
+    const { size } = order;
+    let descSize = new BigNumber(size);
+    let i = 0;
+    const volPricePairs: Array<[BigNumber, BigNumber]> = [];
+    while (!descSize.isZero() && i < volPriceArr.length) {
+      const price = toBigNum(volPriceArr[i].price, decimals);
+      const amount = BigNumber.min(
+        descSize,
+        toBigNum(volPriceArr[i].volume, positionDecimals)
+      );
+      volPricePairs.push([price, amount]);
+      descSize = BigNumber.max(0, descSize.minus(amount));
+      i++;
+    }
+    if (volPricePairs.length) {
+      const volWeightAvPricePair = volPricePairs.reduce(
+        (agg, item) => {
+          agg[0] = agg[0].plus(item[0].multipliedBy(item[1]));
+          agg[1] = agg[1].plus(item[1]);
+          return agg;
+        },
+        [new BigNumber(0), new BigNumber(0)]
+      );
+      const volWeightAvPrice = volWeightAvPricePair[0].dividedBy(
+        volWeightAvPricePair[1]
+      );
+      const slippage = volWeightAvPrice
+        .minus(bestPrice)
+        .absoluteValue()
+        .dividedBy(bestPrice)
+        .multipliedBy(100);
+      return formatNumber(slippage, 2);
+    }
+  }
+  return null;
+};

libs/deal-ticket/src/hooks/use-fee-deal-ticket-details.tsx

@@ -18,6 +18,7 @@ import {
   DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
   TOTAL_MARGIN_AVAILABLE,
 } from '../constants';
+import { useOrderCloseOut } from './use-order-closeout';
 import { useMarketAccountBalance } from '@vegaprotocol/accounts';
 import { getDerivedPrice } from '../utils/get-price';
 import { useEstimateOrderQuery } from './__generated__/EstimateOrder';
@@ -48,6 +49,12 @@ export const useFeeDealTicketDetails = (
     skip: !pubKey || !market || !order.size || !price,
   });
 
+  const estCloseOut = useOrderCloseOut({
+    order,
+    market,
+    marketData,
+  });
+
   const notionalSize = useMemo(() => {
     if (price && order.size) {
       return toBigNum(order.size, market.positionDecimalPlaces)
@@ -67,8 +74,16 @@ export const useFeeDealTicketDetails = (
       notionalSize,
       accountBalance,
       estimateOrder: estMargin?.estimateOrder,
+      estCloseOut,
     };
-  }, [market, assetSymbol, notionalSize, accountBalance, estMargin]);
+  }, [
+    market,
+    assetSymbol,
+    notionalSize,
+    accountBalance,
+    estMargin,
+    estCloseOut,
+  ]);
 };
 
 export interface FeeDetails {
@@ -77,6 +92,7 @@ export interface FeeDetails {
   market: Market;
   assetSymbol: string;
   notionalSize: string | null;
+  estCloseOut: string | null;
   estimateOrder: EstimateOrderQuery['estimateOrder'] | undefined;
   estimatedInitialMargin: string;
   estimatedTotalInitialMargin: string;

libs/deal-ticket/src/hooks/use-initial-margin.ts

@@ -15,8 +15,8 @@ export const useInitialMargin = (
   marketId: OrderSubmissionBody['orderSubmission']['marketId'],
   order?: OrderSubmissionBody['orderSubmission']
 ) => {
-  const { pubKey } = useVegaWallet();
-  const commonVariables = { marketId, partyId: pubKey || '' };
+  const { pubKey: partyId } = useVegaWallet();
+  const commonVariables = { marketId, partyId: partyId || '' };
   const { data: marketData } = useDataProvider({
     dataProvider: marketDataProvider,
     variables: { marketId },
@@ -24,7 +24,7 @@ export const useInitialMargin = (
   const { data: activeVolumeAndMargin } = useDataProvider({
     dataProvider: volumeAndMarginProvider,
     variables: commonVariables,
-    skip: !pubKey,
+    skip: !partyId,
   });
   const { data: marketInfo } = useDataProvider({
     dataProvider: marketInfoProvider,

libs/deal-ticket/src/hooks/use-market-positions.spec.ts

@@ -0,0 +1,53 @@
+import { renderHook } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import { useMarketPositions } from './use-market-positions';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));
+let mockMarketAccountBalance: {
+  accountBalance: string;
+  accountDecimals: number | null;
+} = { accountBalance: '50001000000', accountDecimals: 5 };
+jest.mock('@vegaprotocol/accounts', () => ({
+  ...jest.requireActual('@vegaprotocol/accounts'),
+  useMarketAccountBalance: jest.fn(() => mockMarketAccountBalance),
+}));
+
+jest.mock('@vegaprotocol/positions', () => ({
+  ...jest.requireActual('@vegaprotocol/positions'),
+  useMarketPositionOpenVolume: jest.fn(() => '100002'),
+}));
+
+describe('useOrderPosition Hook', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should return proper positive value', () => {
+    const { result } = renderHook(
+      () => useMarketPositions({ marketId: 'marketId' }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current?.openVolume).toEqual('100002');
+    expect(result.current?.balance).toEqual('50001000000');
+  });
+
+  it('if balance equal 0 return null', () => {
+    mockMarketAccountBalance = { accountBalance: '0', accountDecimals: 5 };
+    const { result } = renderHook(
+      () => useMarketPositions({ marketId: 'marketId' }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBeNull();
+  });
+
+  it('if no markets return null', () => {
+    mockMarketAccountBalance = { accountBalance: '', accountDecimals: null };
+    const { result } = renderHook(
+      () => useMarketPositions({ marketId: 'marketId' }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBeNull();
+  });
+});

libs/deal-ticket/src/hooks/use-market-positions.ts

@@ -0,0 +1,34 @@
+import { useMemo } from 'react';
+import { BigNumber } from 'bignumber.js';
+import { useMarketAccountBalance } from '@vegaprotocol/accounts';
+import { useMarketPositionOpenVolume } from '@vegaprotocol/positions';
+
+interface Props {
+  marketId: string;
+}
+
+export type PositionMargin = {
+  openVolume: string;
+  balance: string;
+  balanceDecimals?: number;
+} | null;
+
+export const useMarketPositions = ({ marketId }: Props): PositionMargin => {
+  const { accountBalance, accountDecimals } = useMarketAccountBalance(marketId);
+  const openVolume = useMarketPositionOpenVolume(marketId);
+
+  return useMemo(() => {
+    if (accountBalance && accountDecimals) {
+      const balance = new BigNumber(accountBalance);
+      const volume = new BigNumber(openVolume);
+      if (!balance.isZero() && !volume.isZero()) {
+        return {
+          balance: accountBalance,
+          balanceDecimals: accountDecimals,
+          openVolume,
+        };
+      }
+    }
+    return null;
+  }, [accountBalance, accountDecimals, openVolume]);
+};

libs/deal-ticket/src/hooks/use-maximum-position-size.spec.ts

@@ -0,0 +1,120 @@
+import { renderHook } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import * as Schema from '@vegaprotocol/types';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import type { PositionMargin } from './use-market-positions';
+import { useMaximumPositionSize } from './use-maximum-position-size';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));
+
+let mockAccountBalance: {
+  accountBalance: string;
+  accountDecimals: number | null;
+} = { accountBalance: '200000', accountDecimals: 5 };
+jest.mock('@vegaprotocol/accounts', () => ({
+  ...jest.requireActual('@vegaprotocol/accounts'),
+  useAccountBalance: jest.fn(() => mockAccountBalance),
+}));
+
+const defaultMockMarketPositions = {
+  openVolume: '1',
+  balance: '100000',
+};
+
+let mockMarketPositions: PositionMargin | null = defaultMockMarketPositions;
+
+const mockOrder: OrderSubmissionBody['orderSubmission'] = {
+  type: Schema.OrderType.TYPE_MARKET,
+  size: '1',
+  side: Schema.Side.SIDE_BUY,
+  timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+  marketId: 'market-id',
+};
+
+jest.mock('./use-market-positions', () => ({
+  useMarketPositions: ({
+    marketId,
+    partyId,
+  }: {
+    marketId: string;
+    partyId: string;
+  }) => mockMarketPositions,
+}));
+
+describe('useMaximumPositionSize', () => {
+  it('should return correct size when no open positions', () => {
+    mockMarketPositions = null;
+    const price = '50';
+    const expected = 4000;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+
+  it('should return correct size when open positions and same side', () => {
+    const price = '50';
+    mockMarketPositions = defaultMockMarketPositions;
+    const expected = 3999;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+
+  it('should return correct size when open positions and opposite side', () => {
+    const price = '50';
+    mockOrder.side = Schema.Side.SIDE_SELL;
+    mockMarketPositions = defaultMockMarketPositions;
+    const expected = 4001;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+
+  it('should return zero if no account balance', () => {
+    mockAccountBalance = {
+      accountBalance: '0',
+      accountDecimals: 5,
+    };
+    const price = '50';
+    mockMarketPositions = defaultMockMarketPositions;
+    const expected = 0;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+});

libs/deal-ticket/src/hooks/use-maximum-position-size.ts

@@ -0,0 +1,46 @@
+import * as Schema from '@vegaprotocol/types';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { useAccountBalance } from '@vegaprotocol/accounts';
+import { BigNumber } from 'bignumber.js';
+import { useMarketPositions } from './use-market-positions';
+
+interface Props {
+  marketId: string;
+  price?: string;
+  settlementAssetId: string;
+  order: OrderSubmissionBody['orderSubmission'];
+}
+
+const getSize = (balance: string, price: string) =>
+  new BigNumber(balance).dividedBy(new BigNumber(price));
+
+export const useMaximumPositionSize = ({
+  marketId,
+  price,
+  settlementAssetId,
+  order,
+}: Props): number => {
+  const { accountBalance } = useAccountBalance(settlementAssetId) || {};
+  const marketPositions = useMarketPositions({ marketId: marketId });
+  if (!accountBalance || new BigNumber(accountBalance || 0).isZero()) {
+    return 0;
+  }
+
+  const size = getSize(accountBalance, price || '');
+
+  if (!marketPositions) {
+    return size.toNumber() || 0;
+  }
+
+  const isSameSide =
+    (new BigNumber(marketPositions.openVolume).isPositive() &&
+      order.side === Schema.Side.SIDE_BUY) ||
+    (new BigNumber(marketPositions.openVolume).isNegative() &&
+      order.side === Schema.Side.SIDE_SELL);
+
+  const adjustedForVolume = new BigNumber(size)[isSameSide ? 'minus' : 'plus'](
+    marketPositions.openVolume
+  );
+
+  return adjustedForVolume.isNegative() ? 0 : adjustedForVolume.toNumber();
+};

libs/deal-ticket/src/hooks/use-order-closeout.spec.tsx

@@ -0,0 +1,117 @@
+import { renderHook } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
+import { useOrderCloseOut } from './use-order-closeout';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));
+let mockMarketMargin: string | undefined = undefined;
+jest.mock('@vegaprotocol/positions', () => ({
+  ...jest.requireActual('@vegaprotocol/positions'),
+  useMarketMargin: () => mockMarketMargin,
+}));
+
+describe('useOrderCloseOut', () => {
+  const order = { size: '2', side: 'SIDE_BUY' };
+  const market = {
+    decimalPlaces: 5,
+    tradableInstrument: {
+      instrument: {
+        product: {
+          settlementAsset: {
+            id: 'assetId',
+          },
+        },
+      },
+    },
+  } as unknown as Market;
+
+  const marketData = {
+    markPrice: 100000,
+  } as unknown as MarketData;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return proper null value', () => {
+    mockMarketMargin = '-1';
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: order as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData: {
+            markPrice: '0',
+          } as MarketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual(null);
+  });
+
+  it('should return proper sell value', () => {
+    mockMarketMargin = '0';
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: {
+            ...order,
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual('1');
+  });
+
+  it('should return proper sell value on limit order', () => {
+    mockMarketMargin = '0';
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: {
+            ...order,
+            price: '1000000',
+            type: 'TYPE_LIMIT',
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual('1000000');
+  });
+
+  it('should return proper empty value', () => {
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: {
+            ...order,
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData: {
+            markPrice: '0',
+          } as MarketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual('0');
+  });
+});