fix(fills): side_unspecified added for the aggresor

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

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

@@ -4,14 +4,54 @@ on:
   push:
     branches:
       - release/*
+      - develop
   pull_request:
     types:
       - opened
-      - reopened
-      - synchronize
       - ready_for_review
+      - reopened
+      - edited
+      - synchronize
 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:
@@ -27,8 +67,11 @@ jobs:
           # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
           cache: yarn
 
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         uses: nrwl/nx-set-shas@v3
@@ -48,7 +91,7 @@ jobs:
         run: yarn nx affected:test
 
       - name: Build affected
-        run: yarn nx affected:build
+        run: yarn nx affected:build || (yarn install && yarn nx affected:build)
 
       # See affected apps
       - name: See affected apps
@@ -95,6 +138,43 @@ 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/lint-pr.yml

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

.github/workflows/publish-dist.yml

@@ -15,6 +15,7 @@ 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
@@ -36,66 +37,131 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Check node version
-        id: tags
-        run: |
-          nodeVersion=$(cat .nvmrc | head -n 1)
-          echo ::set-output name=nodeVersion::${nodeVersion}
+      - 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
+        run: |
+          envName=''
+          dockerfile="dist.Dockerfile"
           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}
+            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
+
+      - 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
+          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=${{ steps.tags.outputs.nodeVersion }}
-            ENV_NAME=${{ steps.tags.outputs.envName || '' }}
+            NODE_VERSION=${{ env.NODE_VERSION }}
+            ENV_NAME=${{ env.ENV_NAME }}
           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"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat ipfs-hash
+          if [[ "${{ env.DOCKERFILE }}" = "docker/ipfs.Dockerfile" ]];  then
+            docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
+          fi
 
           echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local ls -lah
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree .'
 
-          echo "Copy dist to local filesystem"
+      - name: Copy dist to local filesystem
+        if: ${{ env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' }}
+        run: |
           docker create --name=dist ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
           docker cp dist:/usr/share/nginx/html dist
 
-          echo "Check local dist"
-          ls -al dist
+          echo "check local dist files"
+          tree dist/html
+          mv dist/html dist-result
 
       - 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=${{ steps.tags.outputs.nodeVersion }}
+            NODE_VERSION=${{ env.NODE_VERSION }}
+            ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
 
-      # - 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'
+      # 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'
 
       - name: Add preview label
         uses: actions-ecosystem/action-add-labels@v1
@@ -103,6 +169,3 @@ jobs:
         with:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

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(
-    () => ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
+    () => ['md', 'lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
     [screenSize]
   );
 

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

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

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

@@ -44,7 +44,8 @@ describe(
   function () {
     before('connect wallets and set approval limit', function () {
       cy.visit('/');
-      vegaWalletSetSpecifiedApprovalAmount('1000');
+      ethereumWalletConnect();
+      cy.associateTokensToVegaWallet('1');
     });
 
     beforeEach('visit proposals tab', function () {
@@ -213,6 +214,7 @@ 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,7 +13,6 @@ 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';
 
@@ -33,10 +32,6 @@ context(
     before('Connect wallets and set approval', function () {
       cy.visit('/');
       vegaWalletSetSpecifiedApprovalAmount('1000');
-      cy.connectVegaWallet();
-      ethereumWalletConnect();
-      ensureSpecifiedUnstakedTokensAreAssociated('1');
-      cy.clearLocalStorage();
     });
 
     beforeEach('visit proposals', function () {
@@ -114,7 +109,7 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.get(openProposals).within(() => {
+      cy.get(openProposals, { timeout: 6000 }).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"]').click();
+      cy.get('[data-testid="manage-vega-wallet"]:visible').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 is not a valid Vega command: unknown field "filters" in vega.DataSourceDefinition';
+        'Invalid params: the transaction does not use a valid Vega command: unknown field "invalid" in vega.NewMarket';
 
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
       cy.get(newProposalSubmitButton).should('be.visible').click();
@@ -436,7 +436,7 @@ context(
       });
     });
 
-    it.only('Able to submit update asset proposal using max deadline', function () {
+    it('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"]';
+const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
 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"]';
+const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
 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',
-          3
+          6
         );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
 
         // 0005-ETXN-002
         verifyEthWalletAssociatedBalance('2.0');
@@ -111,12 +111,12 @@ context(
         stakingPageDisassociateTokens('2');
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          3
+          6
         );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
           'not.exist'
         );
@@ -192,12 +192,12 @@ context(
 
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          3
+          6
         );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get(vegaWallet).within(() => {
@@ -210,12 +210,12 @@ context(
         });
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          3
+          6
         );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '1.00');
         validateWalletCurrency('Total associated after pending', '1.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         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).first().click();
+        cy.get(ethWalletAssociateButton).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',
-          3
+          6
         );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         validateWalletCurrency('Associated', '2.00');
       });
 
@@ -294,24 +294,24 @@ context(
         });
         cy.getByTestId('currency-title', txTimeout).should(
           'have.length.above',
-          3
+          6
         );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         validateWalletCurrency('Associated', '0.00');
       });
 
       it('Able to associate tokens to different public key of connected vega wallet', function () {
-        cy.get(ethWalletAssociateButton).first().click();
+        cy.get(ethWalletAssociateButton).click();
         cy.get(associateWalletRadioButton).click();
         cy.get(connectedVegaKey).should(
           'have.text',
           Cypress.env('vegaWalletPublicKey')
         );
 
-        cy.get('[data-testid="manage-vega-wallet"]').click();
+        cy.get('[data-testid="manage-vega-wallet"]:visible').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,6 +166,7 @@ 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,6 +8,7 @@ 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');
@@ -59,7 +60,7 @@ export async function faucetAsset(assetEthAddress: string) {
 }
 
 export async function vegaWalletTeardown() {
-  cy.get('[data-testid="associated-amount"]')
+  cy.get(associatedAmountInWallet)
     .should('be.visible')
     .invoke('text')
     .then((associatedAmount) => {
@@ -68,12 +69,12 @@ export async function vegaWalletTeardown() {
           $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
           associatedAmount != '0.00'
         ) {
-          vegaWalletTeardownVesting(vestingContract);
           vegaWalletTeardownStaking(stakingBridgeContract);
+          vegaWalletTeardownVesting(vestingContract);
         }
       });
       cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('associated-amount', {
+        cy.get(associatedAmountInWallet, {
           timeout: transactionTimeout,
         }).contains('0.00', {
           timeout: transactionTimeout,
@@ -90,7 +91,7 @@ export async function vegaWalletSetSpecifiedApprovalAmount(
   await promiseWithTimeout(
     token.approve(
       ethStakingBridgeContractAddress,
-      resetAmount.concat('000000000000000000')
+      resetAmount + '0'.repeat(18)
     ),
     10 * 60 * 1000,
     'set approval amount'
@@ -104,12 +105,23 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
     { timeout: transactionTimeout, log: false }
   ).then((stakeBalance) => {
     if (Number(stakeBalance) != 0) {
-      cy.wrap(
-        stakingBridgeContract.remove_stake(
-          String(stakeBalance),
-          vegaWalletPubKey
-        ),
-        { timeout: transactionTimeout, log: false }
+      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);
+            });
+        }
       );
     }
   });
@@ -124,7 +136,6 @@ 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/src/components/page-templates/app-layout.tsx

@@ -1,15 +1,19 @@
 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 min-h-full',
-    'border-neutral-700 lg:border-l lg:border-r',
+    'app w-full max-w-[1500px] mx-auto grid',
     'lg:text-body-large',
     {
       'grid-rows-[repeat(2,min-content)_1fr_min-content]': !isReadOnly,
@@ -17,5 +21,18 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
     }
   );
 
-  return <div className={AppLayoutClasses}>{children}</div>;
+  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>
+  );
 };

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

@@ -1,28 +1,16 @@
-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,9 +1,8 @@
-import type { ObservableQuery } from '@apollo/client';
 import { useEffect } from 'react';
 
 export const useRefreshAfterEpoch = (
   epochExpiry: string | undefined,
-  refetch: ObservableQuery['refetch']
+  refetch: () => void
 ) => {
   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

@@ -0,0 +1,15 @@
+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,32 +1,43 @@
-import { useMemo } from 'react';
+import { useMemo, useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, Pagination } 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';
 
-export const EpochIndividualRewards = () => {
+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);
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
   const { delegationsPagination } = ENV;
 
-  const { data, loading, error } = useRewardsQuery({
+  const { data, loading, error, refetch } = useRewardsQuery({
+    notifyOnNetworkStatusChange: true,
     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,
   });
@@ -39,8 +50,37 @@ export const EpochIndividualRewards = () => {
 
   const epochIndividualRewardSummaries = useMemo(() => {
     if (!data?.party) return [];
-    return generateEpochIndividualRewardsList(rewards);
-  }, [data?.party, rewards]);
+    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 (
     <AsyncRenderer
@@ -53,17 +93,24 @@ export const EpochIndividualRewards = () => {
             {t('Connected Vega key')}:{' '}
             <span className="text-white">{pubKey}</span>
           </p>
-          {epochIndividualRewardSummaries.length ? (
-            epochIndividualRewardSummaries.map(
-              (epochIndividualRewardSummary) => (
-                <EpochIndividualRewardsTable
-                  data={epochIndividualRewardSummary}
-                />
-              )
+          {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,6 +43,16 @@ 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',
@@ -54,20 +64,38 @@ describe('generateEpochIndividualRewardsList', () => {
   };
 
   it('should return an empty array if no rewards are provided', () => {
-    expect(generateEpochIndividualRewardsList([])).toEqual([]);
+    expect(
+      generateEpochIndividualRewardsList({ rewards: [], epochId: 1 })
+    ).toEqual([
+      {
+        epoch: 1,
+        rewards: [],
+      },
+    ]);
   });
 
   it('should filter out any rewards of the wrong type', () => {
-    const result = generateEpochIndividualRewardsList([rewardWrongType]);
+    const result = generateEpochIndividualRewardsList({
+      rewards: [rewardWrongType],
+      epochId: 1,
+    });
 
-    expect(result).toEqual([]);
+    expect(result).toEqual([
+      {
+        epoch: 1,
+        rewards: [],
+      },
+    ]);
   });
 
   it('should return reward in the correct format', () => {
-    const result = generateEpochIndividualRewardsList([reward1]);
+    const result = generateEpochIndividualRewardsList({
+      rewards: [reward1],
+      epochId: 1,
+    });
 
     expect(result[0]).toEqual({
-      epoch: '1',
+      epoch: 1,
       rewards: [
         {
           asset: 'USD',
@@ -105,21 +133,24 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('should return an array sorted by epoch descending', () => {
     const rewards = [reward1, reward2, reward3, reward4];
-    const result1 = generateEpochIndividualRewardsList(rewards);
+    const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
 
-    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(reorderedRewards);
+    const result2 = generateEpochIndividualRewardsList({
+      rewards: reorderedRewards,
+      epochId: 2,
+    });
 
-    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);
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 1 });
 
     expect(result[0].rewards[0].totalAmount).toEqual('200');
   });
@@ -127,11 +158,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);
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
 
     expect(result).toEqual([
       {
-        epoch: '2',
+        epoch: 2,
         rewards: [
           {
             asset: 'GBP',
@@ -196,7 +227,165 @@ describe('generateEpochIndividualRewardsList', () => {
         ],
       },
       {
-        epoch: '1',
+        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,
         rewards: [
           {
             asset: 'USD',

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

@@ -2,9 +2,10 @@ 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: string;
+  epoch: number;
   rewards: {
     asset: string;
     totalAmount: string;
@@ -27,11 +28,29 @@ const emptyRowAccountTypes = accountTypes.map((type) => [
   },
 ]);
 
-export const generateEpochIndividualRewardsList = (
-  rewards: RewardFieldsFragment[]
-) => {
+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: [],
+    });
+  }
+
   // We take the rewards and aggregate them by epoch and asset.
-  const epochIndividualRewards = rewards.reduce((map, reward) => {
+  const epochIndividualRewards = rewards.reduce((acc, reward) => {
     const epochId = reward.epoch.id;
     const assetName = reward.asset.name;
     const rewardType = reward.rewardType;
@@ -40,14 +59,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 map;
+      return acc;
     }
 
-    if (!map.has(epochId)) {
-      map.set(epochId, { epoch: epochId, rewards: [] });
+    if (!acc.has(epochId)) {
+      return acc;
     }
 
-    const epoch = map.get(epochId);
+    const epoch = acc.get(epochId);
 
     let asset = epoch?.rewards.find((r) => r.asset === assetName);
 
@@ -76,8 +95,8 @@ export const generateEpochIndividualRewardsList = (
       });
     }
 
-    return map;
-  }, new Map<string, EpochIndividualReward>());
+    return acc;
+  }, map);
 
   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,44 +1,64 @@
 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: [
-    {
-      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',
-    },
-  ],
+  assetRewards,
 };
 
 describe('EpochTotalRewardsTable', () => {

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

@@ -48,17 +48,19 @@ export const EpochTotalRewardsTable = ({
 }: EpochTotalRewardsGridProps) => {
   return (
     <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
-      {data.assetRewards.map(({ name, rewards, totalAmount }, i) => (
-        <div className="contents" key={i}>
-          <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
-            {name}
+      {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} />
           </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,21 +1,62 @@
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+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 { 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';
 
-export const EpochTotalRewards = () => {
+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);
   const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
+    notifyOnNetworkStatusChange: true,
     variables: {
-      epochRewardSummariesPagination: {
-        first: 10,
+      epochRewardSummariesFilter: {
+        fromEpoch: epochId - EPOCHS_PAGE_SIZE,
       },
     },
   });
-  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);
 
-  const epochTotalRewardSummaries = generateEpochTotalRewardsList(data) || [];
+  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,
+    }) || [];
 
   return (
     <AsyncRenderer
@@ -27,15 +68,22 @@ export const EpochTotalRewards = () => {
           className="max-w-full overflow-auto"
           data-testid="epoch-rewards-total"
         >
-          {epochTotalRewardSummaries.length === 0 ? (
-            <NoRewards />
-          ) : (
-            <>
-              {epochTotalRewardSummaries.map((epochTotalSummary, index) => (
-                <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
-              ))}
-            </>
+          {Array.from(epochTotalRewardSummaries.values()).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,13 +3,23 @@ import { AccountType } from '@vegaprotocol/types';
 
 describe('generateEpochAssetRewardsList', () => {
   it('should return an empty array if data is undefined', () => {
-    const result = generateEpochTotalRewardsList(undefined);
+    const result = generateEpochTotalRewardsList({ epochId: 1 });
 
-    expect(result).toEqual([]);
+    expect(result).toEqual(
+      new Map([
+        [
+          '1',
+          {
+            epoch: 1,
+            assetRewards: new Map(),
+          },
+        ],
+      ])
+    );
   });
 
-  it('should return an empty array if empty data is provided', () => {
-    const epochData = {
+  it('should return an empty map if empty data is provided', () => {
+    const data = {
       assetsConnection: {
         edges: [],
       },
@@ -23,13 +33,23 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList(epochData);
+    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
 
-    expect(result).toEqual([]);
+    expect(result).toEqual(
+      new Map([
+        [
+          '1',
+          {
+            epoch: 1,
+            assetRewards: new Map(),
+          },
+        ],
+      ])
+    );
   });
 
-  it('should return an empty array if no epochRewardSummaries are provided', () => {
-    const epochData = {
+  it('should return an empty map if no epochRewardSummaries are provided', () => {
+    const data = {
       assetsConnection: {
         edges: [
           {
@@ -56,13 +76,23 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList(epochData);
+    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
 
-    expect(result).toEqual([]);
+    expect(result).toEqual(
+      new Map([
+        [
+          '1',
+          {
+            epoch: 1,
+            assetRewards: new Map(),
+          },
+        ],
+      ])
+    );
   });
 
-  it('should return an array of unnamed assets if no asset names are provided (should not happen)', () => {
-    const epochData = {
+  it('should return a map of unnamed assets if no asset names are provided (should not happen)', () => {
+    const data = {
       assetsConnection: {
         edges: [],
       },
@@ -85,50 +115,80 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList(epochData);
+    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
 
-    expect(result).toEqual([
-      {
-        epoch: 1,
-        assetRewards: [
+    expect(result).toEqual(
+      new Map([
+        [
+          '1',
           {
-            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',
+            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',
+                },
+              ],
+            ]),
           },
         ],
-      },
-    ]);
+      ])
+    );
   });
 
-  it('should return an array of aggregated epoch summaries', () => {
-    const epochData = {
+  it('should return the aggregated epoch summaries', () => {
+    const data = {
       assetsConnection: {
         edges: [
           {
@@ -180,81 +240,425 @@ describe('generateEpochAssetRewardsList', () => {
       },
     };
 
-    const result = generateEpochTotalRewardsList(epochData);
+    const result = generateEpochTotalRewardsList({ data, epochId: 2 });
 
-    expect(result).toEqual([
-      {
-        epoch: 1,
-        assetRewards: [
+    expect(result).toEqual(
+      new Map([
+        [
+          '1',
           {
-            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',
+            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',
+            },
           },
         ],
       },
-      {
-        epoch: 2,
-        assetRewards: [
+      epochRewardSummaries: {
+        edges: [
           {
-            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',
+            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',
+            },
           },
         ],
       },
-    ]);
+      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,127 +5,97 @@ 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 { BigNumber } from '../../../lib/bignumber';
+import { calculateEpochOffset } from '../../../lib/epoch-pagination';
 
 interface EpochSummaryWithNamedReward extends EpochRewardSummaryFieldsFragment {
   name: string;
 }
 
-export interface AggregatedEpochRewardSummary {
+export type RewardType = EpochRewardSummaryFieldsFragment['rewardType'];
+export type RewardItem = Pick<
+  EpochRewardSummaryFieldsFragment,
+  'rewardType' | 'amount'
+>;
+
+export type AggregatedEpochRewardSummary = {
   assetId: EpochRewardSummaryFieldsFragment['assetId'];
   name: EpochSummaryWithNamedReward['name'];
-  rewards: {
-    rewardType: EpochRewardSummaryFieldsFragment['rewardType'];
-    amount: EpochRewardSummaryFieldsFragment['amount'];
-  }[];
+  rewards: Map<RewardType, RewardItem>;
   totalAmount: string;
-}
+};
 
-export interface EpochTotalSummary {
+export type EpochTotalSummary = {
   epoch: EpochRewardSummaryFieldsFragment['epoch'];
-  assetRewards: AggregatedEpochRewardSummary[];
-}
+  assetRewards: Map<
+    EpochRewardSummaryFieldsFragment['assetId'],
+    AggregatedEpochRewardSummary
+  >;
+};
 
-const emptyRowAccountTypes = Object.keys(RowAccountTypes).map((type) => ({
-  rewardType: type as AccountType,
-  amount: '0',
-}));
+const emptyRowAccountTypes: Map<RewardType, RewardItem> = new Map();
 
-export const generateEpochTotalRewardsList = (
-  epochData: EpochAssetsRewardsQuery | undefined
-) => {
+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;
+}) => {
   const epochRewardSummaries = removePaginationWrapper(
-    epochData?.epochRewardSummaries?.edges
+    data?.epochRewardSummaries?.edges
   );
 
-  const assets = removePaginationWrapper(epochData?.assetsConnection?.edges);
+  const assets = removePaginationWrapper(data?.assetsConnection?.edges);
 
-  // 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 || '',
-    }));
+  const map: Map<string, EpochTotalSummary> = new Map();
+  const { fromEpoch, toEpoch } = calculateEpochOffset({ epochId, page, size });
 
-  // 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);
-        }),
-      };
+  for (let i = toEpoch; i >= fromEpoch; i--) {
+    map.set(i.toString(), {
+      epoch: i,
+      assetRewards: new Map(),
     });
+  }
 
-  return epochTotalRewards;
+  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);
 };

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

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

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

@@ -9,21 +9,24 @@ export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: stri
 
 export type RewardsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
-  delegationsPagination?: Types.InputMaybe<Types.Pagination>;
+  fromEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
+  toEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
   rewardsPagination?: Types.InputMaybe<Types.Pagination>;
+  delegationsPagination?: 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, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | 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 };
 
 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, epoch: { __typename?: 'Epoch', timestamps: { __typename?: 'EpochTimestamps', expiry?: any | 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 };
 
 export type EpochFieldsFragment = { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } };
 
@@ -76,10 +79,14 @@ export const EpochFieldsFragmentDoc = gql`
 }
     `;
 export const RewardsDocument = gql`
-    query Rewards($partyId: ID!, $delegationsPagination: Pagination, $rewardsPagination: Pagination) {
+    query Rewards($partyId: ID!, $fromEpoch: Int, $toEpoch: Int, $rewardsPagination: Pagination, $delegationsPagination: Pagination) {
   party(id: $partyId) {
     id
-    rewardsConnection(pagination: $rewardsPagination) {
+    rewardsConnection(
+      fromEpoch: $fromEpoch
+      toEpoch: $toEpoch
+      pagination: $rewardsPagination
+    ) {
       edges {
         node {
           ...RewardFields
@@ -94,14 +101,6 @@ export const RewardsDocument = gql`
       }
     }
   }
-  epoch {
-    id
-    timestamps {
-      start
-      end
-      expiry
-    }
-  }
 }
     ${RewardFieldsFragmentDoc}
 ${DelegationFieldsFragmentDoc}`;
@@ -119,8 +118,10 @@ ${DelegationFieldsFragmentDoc}`;
  * const { data, loading, error } = useRewardsQuery({
  *   variables: {
  *      partyId: // value for 'partyId'
- *      delegationsPagination: // value for 'delegationsPagination'
+ *      fromEpoch: // value for 'fromEpoch'
+ *      toEpoch: // value for 'toEpoch'
  *      rewardsPagination: // value for 'rewardsPagination'
+ *      delegationsPagination: // value for 'delegationsPagination'
  *   },
  * });
  */
@@ -136,7 +137,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($epochRewardSummariesPagination: Pagination) {
+    query EpochAssetsRewards($epochRewardSummariesFilter: RewardSummaryFilter, $epochRewardSummariesPagination: Pagination) {
   assetsConnection {
     edges {
       node {
@@ -145,18 +146,16 @@ export const EpochAssetsRewardsDocument = gql`
       }
     }
   }
-  epochRewardSummaries(pagination: $epochRewardSummariesPagination) {
+  epochRewardSummaries(
+    filter: $epochRewardSummariesFilter
+    pagination: $epochRewardSummariesPagination
+  ) {
     edges {
       node {
         ...EpochRewardSummaryFields
       }
     }
   }
-  epoch {
-    timestamps {
-      expiry
-    }
-  }
 }
     ${EpochRewardSummaryFieldsFragmentDoc}`;
 
@@ -172,6 +171,7 @@ 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-[440px]">
+            <div className="w-[360px]">
               <Toggle
                 name="epoch-reward-view-toggle"
                 toggles={[
@@ -136,11 +136,15 @@ export const RewardsPage = () => {
           </section>
 
           {toggleRewardsView === 'total' ? (
-            <EpochTotalRewards />
+            epochData?.epoch ? (
+              <EpochTotalRewards currentEpoch={epochData?.epoch} />
+            ) : null
           ) : (
             <section>
               {pubKey && pubKeys?.length ? (
-                <EpochIndividualRewards />
+                epochData?.epoch ? (
+                  <EpochIndividualRewards currentEpoch={epochData?.epoch} />
+                ) : null
               ) : (
                 <ConnectToSeeRewards />
               )}

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-[400px]">
+        <div className="w-[340px]">
           <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/trading-e2e/src/integration/trading-accounts.cy.ts

@@ -41,6 +41,12 @@ 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/client-pages/market/trade-grid.tsx

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

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

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

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

@@ -19,3 +19,21 @@ 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,7 +7,11 @@ import {
 } from '@vegaprotocol/types';
 import type { VegaStoredTxState } from '@vegaprotocol/wallet';
 import { VegaTxStatus } from '@vegaprotocol/wallet';
-import { VegaTransactionDetails } from './use-vega-transaction-toasts';
+import {
+  VegaTransactionDetails,
+  getVegaTransactionContentIntent,
+} from './use-vega-transaction-toasts';
+import { Intent } from '@vegaprotocol/ui-toolkit';
 
 jest.mock('@vegaprotocol/assets', () => {
   const A1 = {
@@ -278,3 +282,27 @@ 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

@@ -547,7 +547,11 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
 
   return (
     <>
-      <ToastHeading>{t('Confirmed')}</ToastHeading>
+      <ToastHeading>
+        {tx.order?.status
+          ? getOrderToastTitle(tx.order.status)
+          : t('Confirmed')}
+      </ToastHeading>
       <p>{t('Your transaction has been confirmed ')}</p>
       {tx.txHash && (
         <p className="break-all">
@@ -634,25 +638,8 @@ export const useVegaTransactionToasts = () => {
   );
 
   const fromVegaTransaction = (tx: VegaStoredTxState): Toast => {
-    let content: ToastContent;
     const closeAfter = isFinal(tx) ? CLOSE_AFTER : undefined;
-    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 && getOrderToastIntent(tx.order.status)) ||
-      intentMap[tx.status];
+    const { intent, content } = getVegaTransactionContentIntent(tx);
 
     return {
       id: `vega-${tx.id}`,
@@ -676,3 +663,27 @@ 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,6 +33,8 @@ 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!');
 
@@ -95,6 +97,7 @@ function AppBody({ Component }: AppProps) {
       <ToastsManager />
       <InitializeHandlers />
       <MaybeConnectEagerly />
+      <PartyData />
     </div>
   );
 }
@@ -127,6 +130,18 @@ 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/:marketId',
+  LIQUIDITY = '/liquidity',
 }
 
 type ConsoleLinks = { [r in Routes]: (...args: string[]) => string };
@@ -41,8 +41,10 @@ export const Links: ConsoleLinks = {
     marketId ? trimEnd(`${Routes.MARKET}/${marketId}`, '/') : Routes.MARKET,
   [Routes.MARKETS]: () => Routes.MARKETS,
   [Routes.PORTFOLIO]: () => Routes.PORTFOLIO,
-  [Routes.LIQUIDITY]: (marketId: string) =>
-    Routes.LIQUIDITY.replace(':marketId', marketId),
+  [Routes.LIQUIDITY]: (marketId: string | null | undefined) =>
+    marketId
+      ? trimEnd(`${Routes.LIQUIDITY}/${marketId}`, '/')
+      : Routes.LIQUIDITY,
 };
 
 const routerConfig: RouteObject[] = [
@@ -70,6 +72,16 @@ const routerConfig: RouteObject[] = [
   {
     path: Routes.LIQUIDITY,
     element: <LazyLiquidity />,
+    children: [
+      {
+        index: true,
+        element: <LazyLiquidity />,
+      },
+      {
+        path: ':marketId',
+        element: <LazyLiquidity />,
+      },
+    ],
   },
   {
     path: Routes.PORTFOLIO,

docker/dist.Dockerfile

@@ -0,0 +1,6 @@
+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/

docker/docker-build.sh

@@ -5,7 +5,9 @@ export PATH="/app/node_modules/.bin:$PATH"
 flags="--network-timeout 100000 --pure-lockfile"
 
 if [[ ! -z "${ENV_NAME}" ]]; then
-  flags="--env=${ENV_NAME} $flags"
+  if [[ "${ENV_NAME}" != "ops-vega" ]]; then
+    flags="--env=${ENV_NAME} $flags"
+  fi
 fi
 
 if [ "${APP}" = "trading" ]; then
@@ -16,7 +18,3 @@ 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/ipfs.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-build.sh
+RUN sh docker/docker-build.sh
 
 # Server environment
 # if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
@@ -23,6 +23,7 @@ FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a
 EXPOSE 80
 # Copy dist
 WORKDIR /usr/share/nginx/html
-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
+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

libs/assets/src/lib/Assets.graphql

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

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

@@ -1,26 +1,44 @@
 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', 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 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 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 {
-        ...AssetFields
+        ...AssetListFields
       }
     }
   }
 }
-    ${AssetFieldsFragmentDoc}`;
+    ${AssetListFieldsFragmentDoc}`;
 
 /**
  * __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 { AssetsDocument } from './__generated__/Assets';
+import { AssetDocument } from './__generated__/Asset';
 import { generateBuiltinAsset, generateERC20Asset } from './test-helpers';
 
 const mockedData = {
@@ -39,15 +39,17 @@ const mockedData = {
   },
 };
 
-const mocks = [
-  {
-    request: {
-      query: AssetsDocument,
-      variables: {},
-    },
-    result: mockedData,
+const mocks = mockedData.data.assetsConnection.edges.map((mock) => ({
+  request: {
+    query: AssetDocument,
+    variables: { assetId: mock.node.id },
   },
-];
+  result: {
+    data: {
+      assetsConnection: { edges: [mock] },
+    },
+  },
+}));
 
 const WrappedAssetDetailsDialog = ({ assetId }: { assetId: string }) => (
   <MockedProvider mocks={mocks}>

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

@@ -1,5 +1,4 @@
 import { t } from '@vegaprotocol/i18n';
-import { useAssetsDataProvider } from './assets-data-provider';
 import {
   Button,
   Dialog,
@@ -10,6 +9,7 @@ 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,9 +55,8 @@ export const AssetDetailsDialog = ({
   onChange,
   asJson = false,
 }: AssetDetailsDialogProps) => {
-  const { data } = useAssetsDataProvider();
+  const { data: asset } = useAssetDataProvider(assetId);
 
-  const asset = data?.find((a) => a.id === assetId);
   const assetSymbol = asset?.symbol || '';
 
   const content = asset ? (

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

@@ -11,6 +11,7 @@ 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;
@@ -121,9 +122,7 @@ export const rows: Rows = [
   {
     key: AssetDetail.WITHDRAWAL_THRESHOLD,
     label: t('Withdrawal threshold'),
-    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'
-    ),
+    tooltip: WITHDRAW_THRESHOLD_TOOLTIP_TEXT,
     value: (asset) =>
       num(asset, (asset.source as Schema.ERC20).withdrawThreshold),
   },

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

@@ -1,8 +1,10 @@
 import merge from 'lodash/merge';
-import type { AssetsQuery } from './__generated__/Assets';
+import type {
+  AssetsQuery,
+  AssetListFieldsFragment,
+} 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>
@@ -18,7 +20,7 @@ export const assetsQuery = (
   return merge(defaultAssets, override);
 };
 
-const assetFields: AssetFieldsFragment[] = [
+const assetFields: AssetListFieldsFragment[] = [
   {
     __typename: 'Asset',
     id: 'asset-id',
@@ -33,30 +35,6 @@ const assetFields: AssetFieldsFragment[] = [
     },
     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',
@@ -72,30 +50,6 @@ const assetFields: AssetFieldsFragment[] = [
     },
     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',
@@ -104,20 +58,10 @@ const assetFields: AssetFieldsFragment[] = [
     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',
@@ -126,20 +70,10 @@ const assetFields: AssetFieldsFragment[] = [
     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
@@ -158,30 +92,6 @@ const assetFields: AssetFieldsFragment[] = [
       __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',
@@ -197,29 +107,5 @@ const assetFields: AssetFieldsFragment[] = [
       __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

@@ -0,0 +1,4 @@
+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,3 +5,4 @@ export * from './assets-data-provider';
 export * from './asset-details-dialog';
 export * from './asset-details-table';
 export * from './asset-option';
+export * from './constants';

libs/datagrid/src/index.ts

@@ -10,6 +10,7 @@ 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/order-type-cell.tsx

@@ -0,0 +1,52 @@
+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 defaultRangeFilter = {
+    const defaultValue = {
       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)}
-        defaultRangeFilter={defaultRangeFilter}
+        defaultValue={defaultValue}
       />
     );
 

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

@@ -1,5 +1,5 @@
 import type { ChangeEvent } from 'react';
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useRef } 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 defaultFilterValue: Schema.DateRange = {};
+const defaultValue: Schema.DateRange = {};
 export interface DateRangeFilterProps extends IFilterParams {
-  defaultRangeFilter?: Schema.DateRange;
+  defaultValue?: Schema.DateRange;
   maxSubDays?: number;
   maxNextDays?: number;
   maxDaysRange?: number;
@@ -27,8 +27,9 @@ export interface DateRangeFilterProps extends IFilterParams {
 
 export const DateRangeFilter = forwardRef(
   (props: DateRangeFilterProps, ref) => {
-    const defaultDates = props?.defaultRangeFilter || defaultFilterValue;
+    const defaultDates = props?.defaultValue || defaultValue;
     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 =
@@ -93,7 +94,7 @@ export const DateRangeFilter = forwardRef(
         },
 
         isFilterActive() {
-          return value.start || value.end;
+          return valueRef.current.start || valueRef.current.end;
         },
 
         getModel() {
@@ -101,13 +102,13 @@ export const DateRangeFilter = forwardRef(
             return null;
           }
 
-          return { value };
+          return { value: valueRef.current };
         },
 
         setModel(model?: { value: Schema.DateRange } | null) {
-          setValue(
-            model?.value || props?.defaultRangeFilter || defaultFilterValue
-          );
+          valueRef.current =
+            model?.value || props?.defaultValue || defaultValue;
+          setValue(valueRef.current);
         },
       };
     });
@@ -185,10 +186,8 @@ export const DateRangeFilter = forwardRef(
       update = { ...update, end: checkForEndDate(endDate, startDate) };
 
       if (validate(name, date, update)) {
-        setValue((curr) => ({
-          ...curr,
-          ...update,
-        }));
+        valueRef.current = { ...valueRef.current, ...update };
+        setValue(valueRef.current);
       }
     };
     useEffect(() => {
@@ -241,7 +240,8 @@ export const DateRangeFilter = forwardRef(
             className="ag-standard-button ag-filter-apply-panel-button"
             onClick={() => {
               setError('');
-              setValue(defaultDates);
+              valueRef.current = defaultDates;
+              setValue(valueRef.current);
             }}
           >
             {t('Reset')}

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

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

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: partyId } = useVegaWallet();
-  const commonVariables = { marketId, partyId: partyId || '' };
+  const { pubKey } = useVegaWallet();
+  const commonVariables = { marketId, partyId: pubKey || '' };
   const { data: marketData } = useDataProvider({
     dataProvider: marketDataProvider,
     variables: { marketId },
@@ -24,7 +24,7 @@ export const useInitialMargin = (
   const { data: activeVolumeAndMargin } = useDataProvider({
     dataProvider: volumeAndMarginProvider,
     variables: commonVariables,
-    skip: !partyId,
+    skip: !pubKey,
   });
   const { data: marketInfo } = useDataProvider({
     dataProvider: marketInfoProvider,

libs/fills/src/lib/fills-table.spec.tsx

@@ -120,6 +120,40 @@ describe('FillsTable', () => {
     expect(amountCell).toHaveClass('text-vega-pink');
   });
 
+  it('should format cells correctly for side unspecified', async () => {
+    const partyId = 'party-id';
+    const buyerFill = generateFill({
+      ...defaultFill,
+      seller: {
+        id: partyId,
+      },
+      aggressor: Schema.Side.SIDE_UNSPECIFIED,
+      sellerFee: {
+        makerFee: '1',
+        infrastructureFee: '1',
+        liquidityFee: '1',
+      },
+    });
+    render(<FillsTable partyId={partyId} rowData={[buyerFill]} />);
+
+    const cells = screen.getAllByRole('gridcell');
+    const expectedValues = [
+      buyerFill.market?.tradableInstrument.instrument.name || '',
+      '-3.00',
+      '1.00 BTC',
+      '3.00 BTC',
+      '-',
+      '0.03 BTC',
+      getDateTimeFormat().format(new Date(buyerFill.createdAt)),
+    ];
+    cells.forEach((cell, i) => {
+      expect(cell).toHaveTextContent(expectedValues[i]);
+    });
+
+    const amountCell = cells.find((c) => c.getAttribute('col-id') === 'size');
+    expect(amountCell).toHaveClass('text-vega-pink');
+  });
+
   it('should render correct maker or taker role', async () => {
     const partyId = 'party-id';
     const takerFill = generateFill({
@@ -190,7 +224,7 @@ describe('FillsTable', () => {
         makerFee: '1000',
         totalFee: '6000',
       };
-      expect(getFeesBreakdown('TAKER', fees)).toEqual(expectedBreakdown);
+      expect(getFeesBreakdown('Taker', fees)).toEqual(expectedBreakdown);
     });
 
     it('should return correct fees breakdown for a maker', () => {
@@ -205,7 +239,7 @@ describe('FillsTable', () => {
         makerFee: '-1000',
         totalFee: '4000',
       };
-      expect(getFeesBreakdown('MAKER', fees)).toEqual(expectedBreakdown);
+      expect(getFeesBreakdown('Maker', fees)).toEqual(expectedBreakdown);
     });
   });
 });

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

@@ -26,8 +26,10 @@ import BigNumber from 'bignumber.js';
 import type { Trade } from './fills-data-provider';
 import type { FillFieldsFragment } from './__generated__/Fills';
 
-const TAKER = 'TAKER';
-const MAKER = 'MAKER';
+const TAKER = 'Taker';
+const MAKER = 'Maker';
+
+export type Role = typeof TAKER | typeof MAKER | '-';
 
 export type Props = (AgGridReactProps | AgReactUiProps) & {
   partyId: string;
@@ -180,24 +182,10 @@ const formatTotal = ({
 };
 
 const formatRole = (partyId: string) => {
-  return ({ value, data }: VegaValueFormatterParams<Trade, 'aggressor'>) => {
-    const taker = t('Taker');
-    const maker = t('Maker');
-    if (data?.buyer.id === partyId) {
-      if (value === Schema.Side.SIDE_BUY) {
-        return taker;
-      } else {
-        return maker;
-      }
-    } else if (data?.seller.id === partyId) {
-      if (value === Schema.Side.SIDE_SELL) {
-        return taker;
-      } else {
-        return maker;
-      }
-    } else {
-      return '-';
-    }
+  return ({ data }: VegaValueFormatterParams<Trade, 'aggressor'>) => {
+    if (!data) return '-';
+    const { role } = getRoleAndFees({ data, partyId });
+    return role;
   };
 };
 
@@ -222,6 +210,15 @@ const formatFee = (partyId: string) => {
   };
 };
 
+export const isEmptyFeeObj = (feeObj: Schema.TradeFee) => {
+  if (!feeObj) return true;
+  return (
+    feeObj.liquidityFee === '0' &&
+    feeObj.makerFee === '0' &&
+    feeObj.infrastructureFee === '0'
+  );
+};
+
 export const getRoleAndFees = ({
   data,
   partyId,
@@ -232,14 +229,30 @@ export const getRoleAndFees = ({
   >;
   partyId?: string;
 }) => {
-  let role;
+  let role: Role;
   let feesObj;
   if (data?.buyer.id === partyId) {
-    role = data.aggressor === Schema.Side.SIDE_BUY ? TAKER : MAKER;
-    feesObj = role === TAKER ? data?.buyerFee : data.sellerFee;
+    if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = TAKER;
+      feesObj = data?.buyerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = MAKER;
+      feesObj = data?.sellerFee;
+    } else {
+      role = '-';
+      feesObj = !isEmptyFeeObj(data?.buyerFee) ? data.buyerFee : data.sellerFee;
+    }
   } else if (data?.seller.id === partyId) {
-    role = data.aggressor === Schema.Side.SIDE_SELL ? TAKER : MAKER;
-    feesObj = role === TAKER ? data?.sellerFee : data.buyerFee;
+    if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = TAKER;
+      feesObj = data?.sellerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = MAKER;
+      feesObj = data?.buyerFee;
+    } else {
+      role = '-';
+      feesObj = !isEmptyFeeObj(data.sellerFee) ? data.sellerFee : data.buyerFee;
+    }
   } else {
     return { role: '-', feesObj: '-' };
   }
@@ -270,11 +283,6 @@ const FeesBreakdownTooltip = ({
       {role === MAKER && (
         <>
           <p className="mb-1">{t('The maker will receive the maker fee.')}</p>
-          <p className="mb-1">
-            {t(
-              'If the market is in monitoring auction the maker will pay half of the infrastructure and liquidity fees.'
-            )}
-          </p>
           <p className="mb-1">
             {t(
               'If the market is active the maker will pay zero infrastructure and liquidity fees.'
@@ -283,14 +291,14 @@ const FeesBreakdownTooltip = ({
         </>
       )}
       {role === TAKER && (
-        <>
-          <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
-          <p className="mb-1">
-            {t(
-              'If the market is in monitoring auction the taker will pay half of the infrastructure and liquidity fees.'
-            )}
-          </p>
-        </>
+        <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
+      )}
+      {role === '-' && (
+        <p className="mb-1">
+          {t(
+            'If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.'
+          )}
+        </p>
       )}
       <dl className="grid grid-cols-2 gap-x-1">
         <dt className="col-span-1">{t('Infrastructure fee')}</dt>
@@ -316,7 +324,7 @@ const FeesBreakdownTooltip = ({
 };
 
 export const getFeesBreakdown = (
-  role: string,
+  role: Role,
   feesObj: {
     __typename?: 'TradeFee' | undefined;
     makerFee: string;
@@ -328,6 +336,7 @@ export const getFeesBreakdown = (
     role === MAKER
       ? new BigNumber(feesObj.makerFee).times(-1).toString()
       : feesObj.makerFee;
+
   const infrastructureFee = feesObj.infrastructureFee;
   const liquidityFee = feesObj.liquidityFee;
 

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

@@ -38,10 +38,10 @@ export const TransferTooltipCellComponent = ({
   );
 };
 
-const defaultRangeFilter = { start: formatRFC3339(subDays(Date.now(), 7)) };
+const defaultValue = { start: formatRFC3339(subDays(Date.now(), 7)) };
 const dateRangeFilterParams = {
   maxNextDays: 0,
-  defaultRangeFilter,
+  defaultValue,
 };
 type LedgerEntryProps = TypedDataAgGrid<LedgerEntry>;
 

libs/orders/src/lib/components/order-data-provider/order-data-provider.ts

@@ -20,6 +20,7 @@ import type {
   OrdersQueryVariables,
 } from './__generated__/Orders';
 import { OrdersDocument, OrdersUpdateDocument } from './__generated__/Orders';
+import type { ApolloClient } from '@apollo/client';
 
 export type Order = Omit<OrderFieldsFragment, 'market'> & {
   market?: Market;
@@ -81,8 +82,31 @@ const getData = (
 ): Edge<OrderFieldsFragment>[] =>
   responseData?.party?.ordersConnection?.edges || [];
 
-const getDelta = (subscriptionData: OrdersUpdateSubscription) =>
-  subscriptionData.orders || [];
+const getDelta = (
+  subscriptionData: OrdersUpdateSubscription,
+  variables: OrdersQueryVariables,
+  client: ApolloClient<object>
+) => {
+  if (!subscriptionData.orders) {
+    return [];
+  }
+  subscriptionData.orders.forEach((order) => {
+    client.cache.modify({
+      id: client.cache.identify({
+        __typename: 'Order',
+        id: order.id,
+      }),
+      fields: {
+        price: () => order.price,
+        size: () => order.size,
+        remaining: () => order.remaining,
+        updatedAt: () => order.updatedAt,
+        status: () => order.status,
+      },
+    });
+  });
+  return subscriptionData.orders;
+};
 
 const getPageInfo = (responseData: OrdersQuery): PageInfo | null =>
   responseData.party?.ordersConnection?.pageInfo || null;
@@ -150,7 +174,7 @@ export const update = (
   });
 };
 
-export const ordersProvider = makeDataProvider<
+const ordersProvider = makeDataProvider<
   OrdersQuery,
   ReturnType<typeof getData>,
   OrdersUpdateSubscription,
@@ -165,11 +189,36 @@ export const ordersProvider = makeDataProvider<
   pagination: {
     getPageInfo,
     append,
-    first: 100,
+    first: 1000,
   },
   additionalContext: { isEnlargedTimeout: true },
 });
 
+export const activeOrdersProvider = makeDerivedDataProvider<
+  ReturnType<typeof getData>,
+  never,
+  { partyId: string; marketId?: string }
+>(
+  [
+    (callback, client, variables) =>
+      ordersProvider(callback, client, {
+        partyId: variables.partyId,
+        filter: {
+          status: [OrderStatus.STATUS_ACTIVE, OrderStatus.STATUS_PARKED],
+        },
+      }),
+  ],
+  (partsData, variables, prevData, parts, subscriptions) => {
+    if (!parts[0].isUpdate && subscriptions && subscriptions[0].load) {
+      subscriptions[0].load();
+    }
+    const orders = partsData[0] as ReturnType<typeof getData>;
+    return variables.marketId
+      ? orders.filter((edge) => variables.marketId === edge.node.market.id)
+      : orders;
+  }
+);
+
 export const ordersWithMarketProvider = makeDerivedDataProvider<
   (OrderEdge | null)[],
   Order[],
@@ -193,63 +242,20 @@ export const ordersWithMarketProvider = makeDerivedDataProvider<
   combineInsertionData<Order>
 );
 
-const hasActiveOrderProviderInternal = makeDataProvider<
-  OrdersQuery,
-  boolean,
-  OrdersUpdateSubscription,
-  ReturnType<typeof getDelta>,
-  OrdersQueryVariables
->({
-  query: OrdersDocument,
-  subscriptionQuery: OrdersUpdateDocument,
-  update: (
-    data: boolean | null,
-    delta: ReturnType<typeof getDelta>,
-    reload: () => void
-  ) => {
-    const orders = delta?.filter(
-      (order) => !(order.peggedOrder || order.liquidityProvisionId)
-    );
-    if (!orders?.length) {
-      return data;
-    }
-    const hasActiveOrders = orders.some(
-      (order) => order.status === OrderStatus.STATUS_ACTIVE
-    );
-    if (hasActiveOrders) {
-      return true;
-    } else if (data && !hasActiveOrders) {
-      reload();
-    }
-    return data;
-  },
-  getData: (responseData: OrdersQuery | null) => {
-    const hasActiveOrder = !!responseData?.party?.ordersConnection?.edges?.some(
-      (order) => !(order.node.peggedOrder || order.node.liquidityProvision)
-    );
-    return hasActiveOrder;
-  },
-  getDelta,
-});
-
 export const hasActiveOrderProvider = makeDerivedDataProvider<
   boolean,
   never,
   { partyId: string; marketId?: string }
->(
-  [
-    (callback, client, { partyId, marketId }) =>
-      hasActiveOrderProviderInternal(callback, client, {
-        marketIds: marketId ? [marketId] : undefined,
-        filter: {
-          status: [OrderStatus.STATUS_ACTIVE],
-          excludeLiquidity: true,
-        },
-        pagination: {
-          first: 1,
-        },
-        partyId,
-      } as OrdersQueryVariables),
-  ],
-  (parts) => parts[0]
-);
+>([activeOrdersProvider], (parts) => !!parts[0].length);
+
+export const hasAmendableOrderProvider = makeDerivedDataProvider<
+  boolean,
+  never,
+  { partyId: string; marketId?: string }
+>([activeOrdersProvider], (parts) => {
+  const activeOrders = parts[0] as ReturnType<typeof getData>;
+  const hasAmendableOrder = activeOrders.some(
+    (edge) => !(edge.node.liquidityProvision || edge.node.peggedOrder)
+  );
+  return hasAmendableOrder;
+});

libs/orders/src/lib/components/order-list-container.tsx

@@ -6,10 +6,12 @@ import { OrderListManager } from './order-list-manager';
 export const OrderListContainer = ({
   marketId,
   onMarketClick,
+  onOrderTypeClick,
   enforceBottomPlaceholder,
 }: {
   marketId?: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+  onOrderTypeClick?: (marketId: string, metaKey?: boolean) => void;
   enforceBottomPlaceholder?: boolean;
 }) => {
   const { pubKey, isReadOnly } = useVegaWallet();
@@ -23,6 +25,7 @@ export const OrderListContainer = ({
       partyId={pubKey}
       marketId={marketId}
       onMarketClick={onMarketClick}
+      onOrderTypeClick={onOrderTypeClick}
       isReadOnly={isReadOnly}
       enforceBottomPlaceholder={enforceBottomPlaceholder}
     />

libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx

@@ -8,7 +8,7 @@ import type { GridReadyEvent } from 'ag-grid-community';
 
 import { OrderListTable } from '../order-list/order-list';
 import { useOrderListData } from './use-order-list-data';
-import { useHasActiveOrder } from '../../order-hooks/use-has-active-order';
+import { useHasAmendableOrder } from '../../order-hooks/use-has-amendable-order';
 import type { Filter, Sort } from './use-order-list-data';
 import { useBottomPlaceholder } from '@vegaprotocol/react-helpers';
 import { OrderStatus } from '@vegaprotocol/types';
@@ -16,6 +16,7 @@ import {
   normalizeOrderAmendment,
   useVegaTransactionStore,
 } from '@vegaprotocol/wallet';
+import isEqual from 'lodash/isEqual';
 import type { OrderTxUpdateFieldsFragment } from '@vegaprotocol/wallet';
 import { OrderEditDialog } from '../order-list/order-edit-dialog';
 import type { Order, OrderEdge } from '../order-data-provider';
@@ -24,31 +25,23 @@ export interface OrderListManagerProps {
   partyId: string;
   marketId?: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+  onOrderTypeClick?: (marketId: string, metaKey?: boolean) => void;
   isReadOnly: boolean;
   enforceBottomPlaceholder?: boolean;
 }
 
-const CancelAllOrdersButton = ({
-  onClick,
-  marketId,
-}: {
-  onClick: (marketId?: string) => void;
-  marketId?: string;
-}) => {
-  const hasActiveOrder = useHasActiveOrder(marketId);
-  return hasActiveOrder ? (
-    <div className="dark:bg-black/75 bg-white/75 h-auto flex justify-end px-[11px] py-2 absolute bottom-0 right-3 rounded">
-      <Button
-        variant="primary"
-        size="sm"
-        onClick={() => onClick(marketId)}
-        data-testid="cancelAll"
-      >
-        {t('Cancel all')}
-      </Button>
-    </div>
-  ) : null;
-};
+const CancelAllOrdersButton = ({ onClick }: { onClick: () => void }) => (
+  <div className="dark:bg-black/75 bg-white/75 h-auto flex justify-end px-[11px] py-2 absolute bottom-0 right-3 rounded">
+    <Button
+      variant="primary"
+      size="sm"
+      onClick={onClick}
+      data-testid="cancelAll"
+    >
+      {t('Cancel all')}
+    </Button>
+  </div>
+);
 
 const initialFilter: Filter = {
   status: {
@@ -60,6 +53,7 @@ export const OrderListManager = ({
   partyId,
   marketId,
   onMarketClick,
+  onOrderTypeClick,
   isReadOnly,
   enforceBottomPlaceholder,
 }: OrderListManagerProps) => {
@@ -68,9 +62,10 @@ export const OrderListManager = ({
   const scrolledToTop = useRef(false);
   const [sort, setSort] = useState<Sort[] | undefined>();
   const [filter, setFilter] = useState<Filter | undefined>(initialFilter);
+  const filterRef = useRef(initialFilter);
   const [editOrder, setEditOrder] = useState<Order | null>(null);
   const create = useVegaTransactionStore((state) => state.create);
-  const hasActiveOrder = useHasActiveOrder(marketId);
+  const hasAmendableOrder = useHasAmendableOrder(marketId);
 
   const { data, error, loading, reload } = useOrderListData({
     partyId,
@@ -86,12 +81,16 @@ export const OrderListManager = ({
     ...bottomPlaceholderProps
   } = useBottomPlaceholder<Order>({
     gridRef,
-    disabled: !enforceBottomPlaceholder && !isReadOnly && !hasActiveOrder,
+    disabled: !enforceBottomPlaceholder && !isReadOnly && !hasAmendableOrder,
   });
 
   const onFilterChanged = useCallback(
     (event: FilterChangedEvent) => {
       const updatedFilter = event.api.getFilterModel();
+      if (isEqual(updatedFilter, filterRef.current)) {
+        return;
+      }
+      filterRef.current = updatedFilter;
       if (Object.keys(updatedFilter).length) {
         setFilter(updatedFilter);
       } else {
@@ -142,16 +141,13 @@ export const OrderListManager = ({
     setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
   }, [data]);
 
-  const cancelAll = useCallback(
-    (marketId?: string) => {
-      create({
-        orderCancellation: {
-          marketId,
-        },
-      });
-    },
-    [create]
-  );
+  const cancelAll = useCallback(() => {
+    create({
+      orderCancellation: {
+        marketId,
+      },
+    });
+  }, [create, marketId]);
   const extractedData =
     data && !loading
       ? data
@@ -171,6 +167,7 @@ export const OrderListManager = ({
           cancel={cancel}
           setEditOrder={setEditOrder}
           onMarketClick={onMarketClick}
+          onOrderTypeClick={onOrderTypeClick}
           isReadOnly={isReadOnly}
           blockLoadDebounceMillis={100}
           suppressLoadingOverlay
@@ -188,8 +185,8 @@ export const OrderListManager = ({
           />
         </div>
       </div>
-      {!isReadOnly && (
-        <CancelAllOrdersButton onClick={cancelAll} marketId={marketId} />
+      {!isReadOnly && hasAmendableOrder && (
+        <CancelAllOrdersButton onClick={cancelAll} />
       )}
       {editOrder && (
         <OrderEditDialog

libs/orders/src/lib/components/order-list-manager/use-order-list-data.ts

@@ -71,17 +71,27 @@ export const useOrderListData = ({
     // define variable as const to get type safety, using generic with useMemo resulted in lost type safety
     const allVars: OrdersQueryVariables & OrdersUpdateSubscriptionVariables = {
       partyId,
-      filter: {
-        dateRange: filter?.updatedAt?.value,
-        status: filter?.status?.value,
-        timeInForce: filter?.timeInForce?.value,
-        types: filter?.type?.value,
-      },
-      pagination: {
-        first: 1000,
-      },
     };
-
+    if (
+      filter?.updatedAt?.value ||
+      filter?.status?.value.length ||
+      filter?.timeInForce?.value.length ||
+      filter?.type?.value.length
+    ) {
+      allVars.filter = {};
+      if (filter?.updatedAt?.value) {
+        allVars.filter.dateRange = filter?.updatedAt?.value;
+      }
+      if (filter?.status?.value.length) {
+        allVars.filter.status = filter?.status?.value;
+      }
+      if (filter?.timeInForce?.value.length) {
+        allVars.filter.timeInForce = filter?.timeInForce?.value;
+      }
+      if (filter?.type?.value.length) {
+        allVars.filter.types = filter?.type?.value;
+      }
+    }
     return allVars;
   }, [partyId, filter]);
 

libs/orders/src/lib/components/order-list/order-list.tsx

@@ -16,6 +16,7 @@ import {
   negativeClassNames,
   positiveClassNames,
   MarketNameCell,
+  OrderTypeCell,
 } from '@vegaprotocol/datagrid';
 import type {
   TypedDataAgGrid,
@@ -31,12 +32,16 @@ export type OrderListTableProps = OrderListProps & {
   cancel: (order: Order) => void;
   setEditOrder: (order: Order) => void;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+  onOrderTypeClick?: (marketId: string, metaKey?: boolean) => void;
   isReadOnly: boolean;
 };
 
 export const OrderListTable = memo(
   forwardRef<AgGridReact, OrderListTableProps>(
-    ({ cancel, setEditOrder, onMarketClick, ...props }, ref) => {
+    (
+      { cancel, setEditOrder, onMarketClick, onOrderTypeClick, ...props },
+      ref
+    ) => {
       return (
         <AgGrid
           ref={ref}
@@ -51,7 +56,7 @@ export const OrderListTable = memo(
             height: '100%',
           }}
           getRowId={({ data }) => data.id}
-          components={{ MarketNameCell }}
+          components={{ MarketNameCell, OrderTypeCell }}
           {...props}
         >
           <AgGridColumn
@@ -103,17 +108,9 @@ export const OrderListTable = memo(
             filterParams={{
               set: Schema.OrderTypeMapping,
             }}
-            valueFormatter={({
-              data: order,
-              value,
-            }: VegaValueFormatterParams<Order, 'type'>) => {
-              if (!order) {
-                return undefined;
-              }
-              if (!value) return '-';
-              if (order?.peggedOrder) return t('Pegged');
-              if (order?.liquidityProvision) return t('Liquidity provision');
-              return Schema.OrderTypeMapping[value];
+            cellRenderer="OrderTypeCell"
+            cellRendererParams={{
+              onClick: onOrderTypeClick,
             }}
             minWidth={80}
           />

libs/orders/src/lib/order-hooks/index.ts

@@ -1,5 +1,4 @@
 export * from './__generated__/OrdersSubscription';
-export * from './use-has-active-order';
+export * from './use-has-amendable-order';
 export * from './use-order-update';
-export * from './use-pending-orders-volume';
 export * from './use-order-store';

libs/orders/src/lib/order-hooks/use-has-amendable-order.ts

@@ -1,17 +1,17 @@
 import { useCallback, useState } from 'react';
-import { hasActiveOrderProvider } from '../components/order-data-provider/';
+import { hasAmendableOrderProvider } from '../components/order-data-provider';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 
-export const useHasActiveOrder = (marketId?: string) => {
+export const useHasAmendableOrder = (marketId?: string) => {
   const { pubKey } = useVegaWallet();
-  const [hasActiveOrder, setHasActiveOrder] = useState(false);
+  const [hasAmendableOrder, setHasAmendableOrder] = useState(false);
   const update = useCallback(({ data }: { data: boolean | null }) => {
-    setHasActiveOrder(Boolean(data));
+    setHasAmendableOrder(Boolean(data));
     return true;
   }, []);
   useDataProvider({
-    dataProvider: hasActiveOrderProvider,
+    dataProvider: hasAmendableOrderProvider,
     update,
     variables: {
       partyId: pubKey || '',
@@ -20,5 +20,5 @@ export const useHasActiveOrder = (marketId?: string) => {
     skip: !pubKey,
   });
 
-  return hasActiveOrder;
+  return hasAmendableOrder;
 };

libs/orders/src/lib/order-hooks/use-pending-orders-volume.ts

@@ -1,74 +0,0 @@
-import { useState, useCallback } from 'react';
-import { OrderStatus, Side } from '@vegaprotocol/types';
-import { ordersProvider } from '../components/order-data-provider/order-data-provider';
-import type { OrderFieldsFragment } from '../components/order-data-provider/__generated__/Orders';
-import type { Edge } from '@vegaprotocol/utils';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
-
-const sumVolume = (orders: (Edge<OrderFieldsFragment> | null)[], side: Side) =>
-  orders
-    .reduce(
-      (sum, order) =>
-        order?.node.side === side
-          ? sum +
-            BigInt(
-              order?.node.status === OrderStatus.STATUS_PARTIALLY_FILLED
-                ? order?.node.remaining
-                : order?.node.size
-            )
-          : sum,
-      BigInt(0)
-    )
-    .toString();
-
-export const useActiveOrdersVolumeAndMargin = (
-  partyId: string | null | undefined,
-  marketId: string
-) => {
-  const [buyVolume, setBuyVolume] = useState<string | undefined>();
-  const [sellVolume, setSellVolume] = useState<string | undefined>();
-  const [buyInitialMargin, setBuyInitialMargin] = useState<
-    string | undefined
-  >();
-  const [sellInitialMargin, setSellInitialMargin] = useState<
-    string | undefined
-  >();
-  const update = useCallback(
-    ({ data }: { data: (Edge<OrderFieldsFragment> | null)[] | null }) => {
-      if (!data) {
-        setBuyVolume(undefined);
-        setSellVolume(undefined);
-        setBuyInitialMargin(undefined);
-        setSellInitialMargin(undefined);
-      } else {
-        setBuyVolume(sumVolume(data, Side.SIDE_BUY));
-        setSellVolume(sumVolume(data, Side.SIDE_SELL));
-      }
-      return true;
-    },
-    []
-  );
-  useDataProvider({
-    dataProvider: ordersProvider,
-    update,
-    variables: {
-      partyId: partyId || '',
-      marketIds: [marketId],
-      filter: {
-        status: [
-          OrderStatus.STATUS_ACTIVE,
-          OrderStatus.STATUS_PARTIALLY_FILLED,
-        ],
-      },
-    },
-    skip: !partyId,
-  });
-  return buyVolume || sellVolume
-    ? {
-        buyVolume,
-        sellVolume,
-        buyInitialMargin,
-        sellInitialMargin,
-      }
-    : undefined;
-};

libs/orders/src/lib/utils.spec.ts

@@ -0,0 +1,129 @@
+import { Intent } from '@vegaprotocol/ui-toolkit';
+import {
+  getOrderToastIntent,
+  getOrderToastTitle,
+  getRejectionReason,
+  timeInForceLabel,
+} from './utils';
+import * as Types from '@vegaprotocol/types';
+
+describe('getOrderToastTitle', () => {
+  it('should return the correct title', () => {
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_ACTIVE)).toBe(
+      'Order submitted'
+    );
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_FILLED)).toBe(
+      'Order filled'
+    );
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_PARTIALLY_FILLED)).toBe(
+      'Order partially filled'
+    );
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_PARKED)).toBe(
+      'Order parked'
+    );
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_STOPPED)).toBe(
+      'Order stopped'
+    );
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_CANCELLED)).toBe(
+      'Order cancelled'
+    );
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_EXPIRED)).toBe(
+      'Order expired'
+    );
+    expect(getOrderToastTitle(Types.OrderStatus.STATUS_REJECTED)).toBe(
+      'Order rejected'
+    );
+    expect(getOrderToastTitle(undefined)).toBe(undefined);
+  });
+});
+
+describe('getOrderToastIntent', () => {
+  it('should return the correct intent', () => {
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_PARKED)).toBe(
+      Intent.Warning
+    );
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_EXPIRED)).toBe(
+      Intent.Warning
+    );
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_PARTIALLY_FILLED)).toBe(
+      Intent.Warning
+    );
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_REJECTED)).toBe(
+      Intent.Danger
+    );
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_STOPPED)).toBe(
+      Intent.Danger
+    );
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_FILLED)).toBe(
+      Intent.Success
+    );
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_ACTIVE)).toBe(
+      Intent.Success
+    );
+    expect(getOrderToastIntent(Types.OrderStatus.STATUS_CANCELLED)).toBe(
+      Intent.Success
+    );
+    expect(getOrderToastIntent(undefined)).toBe(undefined);
+  });
+});
+
+describe('getRejectionReason', () => {
+  it('should return the correct rejection reason for insufficient asset balance', () => {
+    expect(
+      getRejectionReason({
+        rejectionReason:
+          Types.OrderRejectionReason.ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE,
+        status: Types.OrderStatus.STATUS_REJECTED,
+        id: '',
+        createdAt: undefined,
+        size: '',
+        price: '',
+        timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        side: Types.Side.SIDE_BUY,
+        marketId: '',
+      })
+    ).toBe('Insufficient asset balance');
+  });
+
+  it('should return the correct rejection reason when order is stopped', () => {
+    expect(
+      getRejectionReason({
+        rejectionReason: null,
+        status: Types.OrderStatus.STATUS_STOPPED,
+        id: '',
+        createdAt: undefined,
+        size: '',
+        price: '',
+        timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        side: Types.Side.SIDE_BUY,
+        marketId: '',
+      })
+    ).toBe(
+      'Your Fill or Kill (FOK) order was not filled and it has been stopped'
+    );
+  });
+});
+
+describe('timeInForceLabel', () => {
+  it('should return the correct label for time in force', () => {
+    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_FOK)).toBe(
+      `Fill or Kill (FOK)`
+    );
+    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GTC)).toBe(
+      `Good 'til Cancelled (GTC)`
+    );
+    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_IOC)).toBe(
+      `Immediate or Cancel (IOC)`
+    );
+    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GTT)).toBe(
+      `Good 'til Time (GTT)`
+    );
+    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GFA)).toBe(
+      `Good for Auction (GFA)`
+    );
+    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GFN)).toBe(
+      `Good for Normal (GFN)`
+    );
+    expect(timeInForceLabel('')).toBe('');
+  });
+});

libs/orders/src/lib/utils.ts

@@ -82,10 +82,10 @@ export const getOrderToastIntent = (
       return Intent.Warning;
     case Schema.OrderStatus.STATUS_REJECTED:
     case Schema.OrderStatus.STATUS_STOPPED:
-    case Schema.OrderStatus.STATUS_CANCELLED:
       return Intent.Danger;
     case Schema.OrderStatus.STATUS_FILLED:
     case Schema.OrderStatus.STATUS_ACTIVE:
+    case Schema.OrderStatus.STATUS_CANCELLED:
       return Intent.Success;
     default:
       return;

libs/positions/src/lib/positions-data-providers.ts

@@ -30,12 +30,12 @@ import {
 import { marginsDataProvider } from './margin-data-provider';
 import { calculateMargins } from './margin-calculator';
 import type { Edge } from '@vegaprotocol/utils';
-import { OrderStatus, Side } from '@vegaprotocol/types';
+import { Side } from '@vegaprotocol/types';
 import { marketInfoProvider } from '@vegaprotocol/market-info';
 import type { MarketInfoQuery } from '@vegaprotocol/market-info';
 import { marketDataProvider } from '@vegaprotocol/market-list';
 import type { MarketData } from '@vegaprotocol/market-list';
-import { ordersProvider } from '@vegaprotocol/orders';
+import { activeOrdersProvider } from '@vegaprotocol/orders';
 import type { OrderFieldsFragment } from '@vegaprotocol/orders';
 import type { PositionStatus } from '@vegaprotocol/types';
 
@@ -350,12 +350,9 @@ export const volumeAndMarginProvider = makeDerivedDataProvider<
 >(
   [
     (callback, client, { partyId, marketId }) =>
-      ordersProvider(callback, client, {
+      activeOrdersProvider(callback, client, {
         partyId,
-        marketIds: [marketId],
-        filter: {
-          status: [OrderStatus.STATUS_ACTIVE, OrderStatus.STATUS_PARKED],
-        },
+        marketId,
       }),
     (callback, client, variables) =>
       marketDataProvider(callback, client, { marketId: variables.marketId }),

libs/react-helpers/src/hooks/use-data-provider.ts

@@ -1,10 +1,10 @@
-import { useState, useEffect, useRef, useCallback } from 'react';
+import { useState, useEffect, useRef, useMemo, useCallback } from 'react';
 import throttle from 'lodash/throttle';
-import isEqual from 'lodash/isEqual';
+import isEqualWith from 'lodash/isEqualWith';
 import { useApolloClient } from '@apollo/client';
-import { usePrevious } from './use-previous';
 import type { OperationVariables } from '@apollo/client';
 import type { Subscribe, Load, UpdateCallback } from '@vegaprotocol/utils';
+import { variablesIsEqualCustomizer } from '@vegaprotocol/utils';
 
 export interface useDataProviderParams<
   Data,
@@ -62,13 +62,19 @@ export const useDataProvider = <
   const flushRef = useRef<(() => void) | undefined>(undefined);
   const reloadRef = useRef<((force?: boolean) => void) | undefined>(undefined);
   const loadRef = useRef<Load<Data> | undefined>(undefined);
-  const prevVariables = usePrevious(props.variables);
-  const [variables, setVariables] = useState(props.variables);
-  useEffect(() => {
-    if (!isEqual(prevVariables, props.variables)) {
-      setVariables(props.variables);
+  const variablesRef = useRef<Variables>(props.variables);
+  const variables = useMemo(() => {
+    if (
+      !isEqualWith(
+        variablesRef.current,
+        props.variables,
+        variablesIsEqualCustomizer
+      )
+    ) {
+      variablesRef.current = props.variables;
     }
-  }, [props.variables, prevVariables]);
+    return variablesRef.current;
+  }, [props.variables]);
   const flush = useCallback(() => {
     if (flushRef.current) {
       flushRef.current();

libs/types/src/__generated__/types.ts

@@ -796,6 +796,67 @@ export type ETHAddress = {
   address?: Maybe<Scalars['String']>;
 };
 
+/** List of all entities created by transaction hash */
+export type Entities = {
+  __typename?: 'Entities';
+  /** List of accounts created by the transaction hash */
+  accounts?: Maybe<Array<Maybe<AccountEvent>>>;
+  /** List of assets created by the transaction hash */
+  assets?: Maybe<Array<Maybe<Asset>>>;
+  /** List of balance changes created by the transaction hash */
+  balanceChanges?: Maybe<Array<Maybe<AccountBalance>>>;
+  /** List of delegations created by the transaction hash */
+  delegations?: Maybe<Array<Maybe<Delegation>>>;
+  /** List of deposits created by the transaction hash */
+  deposits?: Maybe<Array<Maybe<Deposit>>>;
+  /** List of ERC-20 multisig signer added bundles created by the transaction hash */
+  erc20MultiSigSignerAddedBundles?: Maybe<Array<Maybe<ERC20MultiSigSignerAddedBundle>>>;
+  /** List of ERC-20 multisig signer removed bundles created by the transaction hash */
+  erc20MultiSigSignerRemovedBundles?: Maybe<Array<Maybe<ERC20MultiSigSignerRemovedBundle>>>;
+  /** List of ethereum key rotations created by the transaction hash */
+  ethereumKeyRotations?: Maybe<Array<Maybe<EthereumKeyRotation>>>;
+  /** List of key rotations created by the transaction hash */
+  keyRotations?: Maybe<Array<Maybe<KeyRotation>>>;
+  /** List of ledger entries created by the transaction hash */
+  ledgerEntries?: Maybe<Array<Maybe<LedgerEntry>>>;
+  /** List of liquidity provisions created by the transaction hash */
+  liquidityProvisions?: Maybe<Array<Maybe<LiquidityProvision>>>;
+  /** List of margin levels created by the transaction hash */
+  marginLevels?: Maybe<Array<Maybe<MarginLevels>>>;
+  /** List of markets created by the transaction hash */
+  markets?: Maybe<Array<Maybe<Market>>>;
+  /** List of network parameters created by the transaction hash */
+  networkParameters?: Maybe<Array<Maybe<NetworkParameter>>>;
+  /** List of node signatures created by the transaction hash */
+  nodeSignatures?: Maybe<Array<Maybe<NodeSignature>>>;
+  /** List of nodes created by the transaction hash */
+  nodes?: Maybe<Array<Maybe<NodeBasic>>>;
+  /** List of oracle data created by the transaction hash */
+  oracleData?: Maybe<Array<Maybe<OracleData>>>;
+  /** List of oracle specs created by the transaction hash */
+  oracleSpecs?: Maybe<Array<Maybe<OracleSpec>>>;
+  /** List of orders created by the transaction hash */
+  orders?: Maybe<Array<Maybe<Order>>>;
+  /** List of parties created by the transaction hash */
+  parties?: Maybe<Array<Maybe<Party>>>;
+  /** List of positions created by the transaction hash */
+  positions?: Maybe<Array<Maybe<Position>>>;
+  /** List of proposals created by the transaction hash */
+  proposals?: Maybe<Array<Maybe<ProposalDetail>>>;
+  /** List of protocol upgrade proposals created by the transaction hash */
+  protocolUpgradeProposals?: Maybe<Array<Maybe<ProtocolUpgradeProposal>>>;
+  /** List of rewards created by the transaction hash */
+  rewards?: Maybe<Array<Maybe<Reward>>>;
+  /** List of trades created by the transaction hash */
+  trades?: Maybe<Array<Maybe<Trade>>>;
+  /** List of transfers created by the transaction hash */
+  transfers?: Maybe<Array<Maybe<Transfer>>>;
+  /** List of votes created by the transaction hash */
+  votes?: Maybe<Array<Maybe<Vote>>>;
+  /** List of withdrawals created by the transaction hash */
+  withdrawals?: Maybe<Array<Maybe<Withdrawal>>>;
+};
+
 /** Epoch describes a specific period of time in the Vega network */
 export type Epoch = {
   __typename?: 'Epoch';
@@ -988,6 +1049,15 @@ export type ExternalDataSourceSpec = {
   spec: DataSourceSpec;
 };
 
+/** An estimate of the fee to be paid for the order */
+export type FeeEstimate = {
+  __typename?: 'FeeEstimate';
+  /** The estimated fees if the order was to trade */
+  fees: TradeFee;
+  /** The total estimated amount of fees if the order was to trade */
+  totalFeeAmount: Scalars['String'];
+};
+
 /** The factors applied to calculate the fees */
 export type FeeFactors = {
   __typename?: 'FeeFactors';
@@ -1178,6 +1248,26 @@ export type LedgerEntryFilter = {
   TransferTypes?: InputMaybe<Array<InputMaybe<TransferType>>>;
 };
 
+/** Liquidation estimate for both worst and best case possible */
+export type LiquidationEstimate = {
+  __typename?: 'LiquidationEstimate';
+  /** Liquidation price estimate assuming no slippage */
+  bestCase: LiquidationPrice;
+  /** Liquidation price estimate assuming slippage cap is applied */
+  worstCase: LiquidationPrice;
+};
+
+/** Liquidation price estimate for either only the current open volume and position given some or all buy orders get filled, or position given some or all sell orders get filled */
+export type LiquidationPrice = {
+  __typename?: 'LiquidationPrice';
+  /** Liquidation price assuming buy orders start getting filled */
+  including_buy_orders: Scalars['String'];
+  /** Liquidation price assuming sell orders start getting filled */
+  including_sell_orders: Scalars['String'];
+  /** Liquidation price for current open volume ignoring any active orders */
+  open_volume_only: Scalars['String'];
+};
+
 /** Configuration of a market liquidity monitoring parameters */
 export type LiquidityMonitoringParameters = {
   __typename?: 'LiquidityMonitoringParameters';
@@ -1367,6 +1457,15 @@ export type MarginEdge = {
   node: MarginLevels;
 };
 
+/** Margin level estimate for both worst and best case possible */
+export type MarginEstimate = {
+  __typename?: 'MarginEstimate';
+  /** Margin level estimate assuming no slippage */
+  bestCase: MarginLevels;
+  /** Margin level estimate assuming slippage cap is applied */
+  worstCase: MarginLevels;
+};
+
 /** Margins for a given a party */
 export type MarginLevels = {
   __typename?: 'MarginLevels';
@@ -1377,7 +1476,7 @@ export type MarginLevels = {
    * the general account of the party for the given asset.
    */
   collateralReleaseLevel: Scalars['String'];
-  /** This is the minimum margin required for a party to place a new order on the network (unsigned integer) */
+  /** This is the minimum margin required for a party to place a new order on the network, expressed as unsigned integer */
   initialLevel: Scalars['String'];
   /** Minimal margin for the position to be maintained in the network (unsigned integer) */
   maintenanceLevel: Scalars['String'];
@@ -1385,7 +1484,7 @@ export type MarginLevels = {
   market: Market;
   /** The party for this margin */
   party: Party;
-  /** If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer) */
+  /** If the margin is between maintenance and search, the network will initiate a collateral search, expressed as unsigned integer */
   searchLevel: Scalars['String'];
   /** RFC3339Nano time from at which this margin level was relevant */
   timestamp: Scalars['Timestamp'];
@@ -1483,6 +1582,7 @@ export type Market = {
   state: MarketState;
   /** An instance of, or reference to, a tradable instrument. */
   tradableInstrument: TradableInstrument;
+  /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
   tradesConnection?: Maybe<TradeConnection>;
   /** Current mode of execution of the market */
   tradingMode: MarketTradingMode;
@@ -1894,6 +1994,28 @@ export type NodedelegationsConnectionArgs = {
   partyId?: InputMaybe<Scalars['ID']>;
 };
 
+export type NodeBasic = {
+  __typename?: 'NodeBasic';
+  /** The URL of an avatar */
+  avatarUrl?: Maybe<Scalars['String']>;
+  /** Ethereum public key of the node */
+  ethereumAddress: Scalars['String'];
+  /** The node URL, for example n01.vega.xyz */
+  id: Scalars['ID'];
+  /** URL that provides more information about the node */
+  infoUrl: Scalars['String'];
+  /** Country code for the location of the node */
+  location: Scalars['String'];
+  /** The name of the node operator */
+  name: Scalars['String'];
+  /** Public key of the node operator */
+  pubkey: Scalars['String'];
+  /** Validator status of the node */
+  status: NodeStatus;
+  /** Tendermint public key of the node */
+  tmPubkey: Scalars['String'];
+};
+
 /** Summary of data across all nodes */
 export type NodeData = {
   __typename?: 'NodeData';
@@ -2107,18 +2229,6 @@ export type ObservableMarketDepthUpdate = {
   sequenceNumber: Scalars['String'];
 };
 
-export type OffsetPagination = {
-  /**
-   * Descending reverses the order of the records returned
-   * default is true, if false the results will be returned in ascending order
-   */
-  descending: Scalars['Boolean'];
-  /** Limit the number of returned records to the value specified, default is 50 */
-  limit: Scalars['Int'];
-  /** Skip the number of records specified, default is 0 */
-  skip: Scalars['Int'];
-};
-
 /** The specific details for a one-off transfer */
 export type OneOffTransfer = {
   __typename?: 'OneOffTransfer';
@@ -2213,7 +2323,10 @@ export type Order = {
   status: OrderStatus;
   /** The timeInForce of order (determines how and if it executes, and whether it persists on the book) */
   timeInForce: OrderTimeInForce;
-  /** Trades relating to this order */
+  /**
+   * Trades relating to this order
+   * @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead
+   */
   tradesConnection?: Maybe<TradeConnection>;
   /** The order type */
   type?: Maybe<OrderType>;
@@ -2279,11 +2392,28 @@ export type OrderFilter = {
   /** Date range to retrieve orders from/to. Start and end time should be expressed as an integer value of nano-seconds past the Unix epoch */
   dateRange?: InputMaybe<DateRange>;
   excludeLiquidity?: InputMaybe<Scalars['Boolean']>;
+  /**
+   * If true, only orders that are live will be returned. Orders are live if they have STATUS_ACTIVE or STATUS_PARKED
+   * as per https://github.com/vegaprotocol/specs-internal/blob/master/protocol/0024-OSTA-order_status.md
+   */
+  liveOnly?: InputMaybe<Scalars['Boolean']>;
   status?: InputMaybe<Array<OrderStatus>>;
   timeInForce?: InputMaybe<Array<OrderTimeInForce>>;
   types?: InputMaybe<Array<OrderType>>;
 };
 
+/** Basic description of an order */
+export type OrderInfo = {
+  /** Boolean indicating a market order */
+  isMarketOrder: Scalars['Boolean'];
+  /** Price for the order */
+  price: Scalars['String'];
+  /** Number of units remaining of the total that have not yet been bought or sold (uint64) */
+  remaining: Scalars['String'];
+  /** Whether the order is to buy or sell */
+  side: Side;
+};
+
 /** Why the order was rejected by the core node */
 export enum OrderRejectionReason {
   /** Amending the order failed */
@@ -2304,6 +2434,8 @@ export enum OrderRejectionReason {
   ORDER_ERROR_CANNOT_HAVE_GTC_AND_EXPIRYAT = 'ORDER_ERROR_CANNOT_HAVE_GTC_AND_EXPIRYAT',
   /** Cannot send FOK orders during an auction */
   ORDER_ERROR_CANNOT_SEND_FOK_ORDER_DURING_AUCTION = 'ORDER_ERROR_CANNOT_SEND_FOK_ORDER_DURING_AUCTION',
+  /** Good for Auction order received during continuous trading */
+  ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING = 'ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING',
   /** Good for Normal order received during an auction */
   ORDER_ERROR_CANNOT_SEND_GFN_ORDER_DURING_AN_AUCTION = 'ORDER_ERROR_CANNOT_SEND_GFN_ORDER_DURING_AN_AUCTION',
   /** Cannot send IOC orders during an auction */
@@ -2312,8 +2444,8 @@ export enum OrderRejectionReason {
   ORDER_ERROR_EDIT_NOT_ALLOWED = 'ORDER_ERROR_EDIT_NOT_ALLOWED',
   /** Attempt to amend expiry time to a value before time order was created */
   ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT = 'ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT',
-  /** Good for Auction order received during continuous trading */
-  ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING = 'ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING',
+  /** Order was submitted with an incorrect or invalid market type */
+  ORDER_ERROR_INCORRECT_MARKET_TYPE = 'ORDER_ERROR_INCORRECT_MARKET_TYPE',
   /** Insufficient balance to submit the order (no deposit made) */
   ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE = 'ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE',
   /** Insufficient funds to pay fees */
@@ -2360,6 +2492,10 @@ export enum OrderRejectionReason {
   ORDER_ERROR_OFFSET_MUST_BE_GREATER_THAN_ZERO = 'ORDER_ERROR_OFFSET_MUST_BE_GREATER_THAN_ZERO',
   /** Order is out of sequence */
   ORDER_ERROR_OUT_OF_SEQUENCE = 'ORDER_ERROR_OUT_OF_SEQUENCE',
+  /** A post-only order would produce an aggressive trade and thus it has been rejected */
+  ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE = 'ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE',
+  /** A reduce-ony order would not reduce the party's position and thus it has been rejected */
+  ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE = 'ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE',
   /** Unable to remove the order */
   ORDER_ERROR_REMOVAL_FAILURE = 'ORDER_ERROR_REMOVAL_FAILURE',
   /** Order cannot be filled because it would require self trading */
@@ -2368,6 +2504,8 @@ export enum OrderRejectionReason {
   ORDER_ERROR_SELL_CANNOT_REFERENCE_BEST_BID_PRICE = 'ORDER_ERROR_SELL_CANNOT_REFERENCE_BEST_BID_PRICE',
   /** Time has failed us */
   ORDER_ERROR_TIME_FAILURE = 'ORDER_ERROR_TIME_FAILURE',
+  /** Unable to submit pegged order, temporarily too many pegged orders across all markets */
+  ORDER_ERROR_TOO_MANY_PEGGED_ORDERS = 'ORDER_ERROR_TOO_MANY_PEGGED_ORDERS',
   /** Unable to amend pegged order price */
   ORDER_ERROR_UNABLE_TO_AMEND_PRICE_ON_PEGGED_ORDER = 'ORDER_ERROR_UNABLE_TO_AMEND_PRICE_ON_PEGGED_ORDER',
   /** Unable to reprice a pegged order */
@@ -2526,6 +2664,7 @@ export type Party = {
   rewardsConnection?: Maybe<RewardsConnection>;
   /** The staking information for this Party */
   stakingSummary: StakingSummary;
+  /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
   tradesConnection?: Maybe<TradeConnection>;
   /** All transfers for a public key */
   transfersConnection?: Maybe<TransferConnection>;
@@ -2754,6 +2893,15 @@ export type PositionEdge = {
   node: Position;
 };
 
+/** Response for the estimate of the margin level and, if available, collateral was provided in the request, liqudation price for the specified position */
+export type PositionEstimate = {
+  __typename?: 'PositionEstimate';
+  /** Liquidation price range estimate for the specified position. Only populated if available collateral was specified in the request */
+  liquidation?: Maybe<LiquidationEstimate>;
+  /** Margin level range estimate for the specified position */
+  margin: MarginEstimate;
+};
+
 export type PositionResolution = {
   __typename?: 'PositionResolution';
   /** Number of parties closed out */
@@ -2770,6 +2918,8 @@ export type PositionResolution = {
 export enum PositionStatus {
   /** The position was distressed, and had to be closed out entirely - orders were removed from the book, and the open volume was closed out by the network */
   POSITION_STATUS_CLOSED_OUT = 'POSITION_STATUS_CLOSED_OUT',
+  /** The position was distressed, but could not be closed out - orders were removed from the book, and the open volume will be closed out once there is sufficient volume on the book */
+  POSITION_STATUS_DISTRESSED = 'POSITION_STATUS_DISTRESSED',
   /** The position was distressed, but removing open orders from the book brought the margin level back to a point where the open position could be maintained */
   POSITION_STATUS_ORDERS_CLOSED = 'POSITION_STATUS_ORDERS_CLOSED',
   /** The position is either healthy, or if closed out, was closed out normally */
@@ -2923,9 +3073,9 @@ export type Proposal = {
   reference: Scalars['String'];
   /** Why the proposal was rejected by the core */
   rejectionReason?: Maybe<ProposalRejectionReason>;
-  /** Required liquidity provider equity like share majority for this proposal to succeed */
+  /** Equity-like share required for a market amendment proposal to be enacted (if not met, the proposal will not be enacted), represented as a fraction that can be converted to a percentage */
   requiredLpMajority?: Maybe<Scalars['String']>;
-  /** Required liquidity provider equity like share participation for this proposal to succeed */
+  /** The market share of LPs' equity-like share that must take part in the market amendment vote for the proposal to pass. This means the votes of LPs that have submitted more liquidity to that market, or have been LPs from the start carry more weight. If it requires 50% of a market's equity-like share for a majority, and the proposal receives only YES votes but only LPs with 49% of the equity-like share voted, the proposal will not pass */
   requiredLpParticipation?: Maybe<Scalars['String']>;
   /** Required majority for this proposal to succeed */
   requiredMajority: Scalars['String'];
@@ -2941,6 +3091,36 @@ export type Proposal = {
 
 export type ProposalChange = NewAsset | NewFreeform | NewMarket | UpdateAsset | UpdateMarket | UpdateNetworkParameter;
 
+export type ProposalDetail = {
+  __typename?: 'ProposalDetail';
+  /** RFC3339Nano time and date when the proposal reached the Vega network */
+  datetime: Scalars['Timestamp'];
+  /** Error details of the rejectionReason */
+  errorDetails?: Maybe<Scalars['String']>;
+  /** Proposal ID that is provided by Vega once proposal reaches the network */
+  id?: Maybe<Scalars['ID']>;
+  /** Party that prepared the proposal */
+  party: Party;
+  /** Rationale behind the proposal */
+  rationale: ProposalRationale;
+  /** A UUID reference to aid tracking proposals on Vega */
+  reference: Scalars['String'];
+  /** Why the proposal was rejected by the core */
+  rejectionReason?: Maybe<ProposalRejectionReason>;
+  /** Equity-like share required for a market amendment proposal to be enacted (if not met, the proposal will not be enacted), represented as a fraction that can be converted to a percentage */
+  requiredLpMajority?: Maybe<Scalars['String']>;
+  /** The market share of LPs' equity-like share that must take part in the market amendment vote for the proposal to pass. This means the votes of LPs that have submitted more liquidity to that market, or have been LPs from the start carry more weight. If it requires 50% of a market's equity-like share for a majority, and the proposal receives only YES votes but only LPs with 49% of the equity-like share voted, the proposal will not pass */
+  requiredLpParticipation?: Maybe<Scalars['String']>;
+  /** Required majority for this proposal to succeed */
+  requiredMajority: Scalars['String'];
+  /** Required participation for this proposal to succeed */
+  requiredParticipation: Scalars['String'];
+  /** State of the proposal */
+  state: ProposalState;
+  /** Terms of the proposal */
+  terms: ProposalTerms;
+};
+
 /** Edge type containing the proposals and cursor information returned by a ProposalsConnection */
 export type ProposalEdge = {
   __typename?: 'ProposalEdge';
@@ -3234,6 +3414,8 @@ export type Query = {
   deposit?: Maybe<Deposit>;
   /** Fetch all deposits */
   deposits?: Maybe<DepositsConnection>;
+  /** Fetch all entities for a given transaction hash */
+  entities: Entities;
   /** Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch */
   epoch: Epoch;
   /** List reward summary per epoch by asset, market, reward type */
@@ -3249,15 +3431,17 @@ export type Query = {
   /** Find an erc20 withdrawal approval using its withdrawal ID */
   erc20WithdrawalApproval?: Maybe<Erc20WithdrawalApproval>;
   /** Return an estimation of the potential cost for a new order */
+  estimateFees: FeeEstimate;
+  /**
+   * Return an estimation of the potential cost for a new order
+   * @deprecated Use estimateFees and estimatePosition instead
+   */
   estimateOrder: OrderEstimate;
+  /** Return a margin range for the specified position and liquidation price range if available collateral is supplied */
+  estimatePosition?: Maybe<PositionEstimate>;
   /** Query for historic ethereum key rotations */
   ethereumKeyRotations: EthereumKeyRotationsConnection;
-  /**
-   * Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided, all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided.
-   * @deprecated Use getMarketDataHistoryConnectionByID instead
-   */
-  getMarketDataHistoryByID?: Maybe<Array<Maybe<MarketData>>>;
-  /** Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided. Pagination is provided using a cursor based pagination model */
+  /** Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided. */
   getMarketDataHistoryConnectionByID?: Maybe<MarketDataConnection>;
   /** Query for historic key rotations */
   keyRotationsConnection: KeyRotationConnection;
@@ -3315,6 +3499,8 @@ export type Query = {
   protocolUpgradeStatus?: Maybe<ProtocolUpgradeStatus>;
   /** Get statistics about the Vega node */
   statistics: Statistics;
+  /** Get a list of all trades and apply any given filters to the results */
+  trades?: Maybe<TradeConnection>;
   /** Get a list of all transfers for a public key */
   transfersConnection?: Maybe<TransferConnection>;
   /** Find a withdrawal using its ID */
@@ -3364,6 +3550,12 @@ export type QuerydepositsArgs = {
 };
 
 
+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QueryentitiesArgs = {
+  txHash: Scalars['String'];
+};
+
+
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QueryepochArgs = {
   id?: InputMaybe<Scalars['ID']>;
@@ -3413,6 +3605,19 @@ export type Queryerc20WithdrawalApprovalArgs = {
 };
 
 
+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QueryestimateFeesArgs = {
+  expiration?: InputMaybe<Scalars['Timestamp']>;
+  marketId: Scalars['ID'];
+  partyId: Scalars['ID'];
+  price?: InputMaybe<Scalars['String']>;
+  side: Side;
+  size: Scalars['String'];
+  timeInForce: OrderTimeInForce;
+  type: OrderType;
+};
+
+
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QueryestimateOrderArgs = {
   expiration?: InputMaybe<Scalars['Timestamp']>;
@@ -3427,19 +3632,17 @@ export type QueryestimateOrderArgs = {
 
 
 /** Queries allow a caller to read data and filter data via GraphQL. */
-export type QueryethereumKeyRotationsArgs = {
-  nodeId?: InputMaybe<Scalars['ID']>;
+export type QueryestimatePositionArgs = {
+  collateralAvailable?: InputMaybe<Scalars['String']>;
+  marketId: Scalars['ID'];
+  openVolume: Scalars['String'];
+  orders?: InputMaybe<Array<OrderInfo>>;
 };
 
 
 /** Queries allow a caller to read data and filter data via GraphQL. */
-export type QuerygetMarketDataHistoryByIDArgs = {
-  end?: InputMaybe<Scalars['Timestamp']>;
-  first?: InputMaybe<Scalars['Int']>;
-  id: Scalars['ID'];
-  last?: InputMaybe<Scalars['Int']>;
-  skip?: InputMaybe<Scalars['Int']>;
-  start?: InputMaybe<Scalars['Timestamp']>;
+export type QueryethereumKeyRotationsArgs = {
+  nodeId?: InputMaybe<Scalars['ID']>;
 };
 
 
@@ -3600,6 +3803,14 @@ export type QueryprotocolUpgradeProposalsArgs = {
 };
 
 
+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QuerytradesArgs = {
+  dateRange?: InputMaybe<DateRange>;
+  filter?: InputMaybe<TradesFilter>;
+  pagination?: InputMaybe<Pagination>;
+};
+
+
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QuerytransfersConnectionArgs = {
   direction?: InputMaybe<TransferDirection>;
@@ -3798,7 +4009,9 @@ export enum Side {
   /** The placer of the order is aiming to buy */
   SIDE_BUY = 'SIDE_BUY',
   /** The placer of the order is aiming to sell */
-  SIDE_SELL = 'SIDE_SELL'
+  SIDE_SELL = 'SIDE_SELL',
+  /** Unspecified is only used for trades at the end of an auction, where neither party acts as the aggressor. */
+  SIDE_UNSPECIFIED = 'SIDE_UNSPECIFIED'
 }
 
 /** Signer is the authorized signature used for the data. */
@@ -3978,8 +4191,6 @@ export type Subscription = {
   busEvents?: Maybe<Array<BusEvent>>;
   /** Subscribe to the candles updates */
   candles: Candle;
-  /** Subscribe to delegation data */
-  delegations: Delegation;
   /** Subscribe to liquidity provisioning data */
   liquidityProvisions?: Maybe<Array<LiquidityProvisionUpdate>>;
   /** Subscribe to the margin changes */
@@ -3996,10 +4207,13 @@ export type Subscription = {
   positions: Array<PositionUpdate>;
   /** Subscribe to proposals. Leave out all arguments to receive all proposals */
   proposals: Proposal;
-  /** Subscribe to reward details data */
-  rewards: Reward;
-  /** Subscribe to the trades updates */
+  /**
+   * Subscribe to the trades updates
+   * @deprecated Use tradesStream instead as it allows for filtering multiple markets and/or parties at once
+   */
   trades?: Maybe<Array<TradeUpdate>>;
+  /** Subscribe to the trades updates */
+  tradesStream?: Maybe<Array<TradeUpdate>>;
   /** Subscribe to votes, either by proposal ID or party ID */
   votes: ProposalVote;
 };
@@ -4030,13 +4244,6 @@ export type SubscriptioncandlesArgs = {
 };
 
 
-/** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptiondelegationsArgs = {
-  nodeId?: InputMaybe<Scalars['ID']>;
-  partyId?: InputMaybe<Scalars['ID']>;
-};
-
-
 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
 export type SubscriptionliquidityProvisionsArgs = {
   marketId?: InputMaybe<Scalars['ID']>;
@@ -4089,16 +4296,15 @@ export type SubscriptionproposalsArgs = {
 
 
 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptionrewardsArgs = {
-  assetId?: InputMaybe<Scalars['ID']>;
+export type SubscriptiontradesArgs = {
+  marketId?: InputMaybe<Scalars['ID']>;
   partyId?: InputMaybe<Scalars['ID']>;
 };
 
 
 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptiontradesArgs = {
-  marketId?: InputMaybe<Scalars['ID']>;
-  partyId?: InputMaybe<Scalars['ID']>;
+export type SubscriptiontradesStreamArgs = {
+  filter: TradesSubscriptionFilter;
 };
 
 
@@ -4251,6 +4457,19 @@ export type TradeUpdate = {
   type: TradeType;
 };
 
+/** Filter to apply to the trade connection query */
+export type TradesFilter = {
+  marketIds?: InputMaybe<Array<Scalars['ID']>>;
+  orderIds?: InputMaybe<Array<Scalars['ID']>>;
+  partyIds?: InputMaybe<Array<Scalars['ID']>>;
+};
+
+/** Filter to apply to the trade subscription request */
+export type TradesSubscriptionFilter = {
+  marketIds?: InputMaybe<Array<Scalars['ID']>>;
+  partyIds?: InputMaybe<Array<Scalars['ID']>>;
+};
+
 /** The result from processing a transaction */
 export type TransactionResult = {
   __typename?: 'TransactionResult';

libs/types/src/global-types-mappings.ts

@@ -172,7 +172,7 @@ export const OrderRejectionReasonMapping: {
     'Cannot send IOC order during auction',
   ORDER_ERROR_EDIT_NOT_ALLOWED: 'Edit not allowed',
   ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT: 'Expiry time before creation time',
-  ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING:
+  ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING:
     'Cannot send GFA order during continuous trading',
   ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE: 'Insufficient asset balance',
   ORDER_ERROR_INSUFFICIENT_FUNDS_TO_PAY_FEES: 'Insufficient funds to pay fees',
@@ -209,6 +209,11 @@ export const OrderRejectionReasonMapping: {
     'Unable to amend price on pegged order',
   ORDER_ERROR_UNABLE_TO_REPRICE_PEGGED_ORDER: 'Unable to reprice pegged order',
   ORDER_ERROR_WITHOUT_REFERENCE_PRICE: 'Without reference price',
+  ORDER_ERROR_INCORRECT_MARKET_TYPE: 'Incorrect market type',
+  ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE: 'Post only order would trade',
+  ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE:
+    'Reduce only order would not reduce',
+  ORDER_ERROR_TOO_MANY_PEGGED_ORDERS: 'Too many pegged orders',
 };
 
 /**
@@ -345,6 +350,7 @@ export const SideMapping: {
 } = {
   SIDE_BUY: 'Long',
   SIDE_SELL: 'Short',
+  SIDE_UNSPECIFIED: 'Unspecified',
 };
 
 /**
@@ -458,6 +464,7 @@ export const PositionStatusMapping: {
   POSITION_STATUS_CLOSED_OUT: 'Closed by network',
   POSITION_STATUS_ORDERS_CLOSED: 'Maintained by network',
   POSITION_STATUS_UNSPECIFIED: 'Normal',
+  POSITION_STATUS_DISTRESSED: 'Distressed',
 };
 
 export const ConditionOperatorMapping: { [C in ConditionOperator]: string } = {

libs/ui-toolkit/src/components/index.ts

@@ -25,6 +25,7 @@ export * from './nav-dropdown';
 export * from './nav';
 export * from './navigation';
 export * from './notification';
+export * from './pagination';
 export * from './popover';
 export * from './progress-bar';
 export * from './radio-group';

libs/ui-toolkit/src/components/notification/notification.tsx

@@ -70,6 +70,8 @@ export const Notification = ({
             'text-vega-green dark:text-vega-green': intent === Intent.Success,
             'text-yellow-600 dark:text-yellow': intent === Intent.Warning,
             'text-vega-pink': intent === Intent.Danger,
+            'mt-1': !!title,
+            'mt-[0.125rem]': !title,
           },
           'flex items-start mt-1'
         )}
@@ -78,11 +80,16 @@ export const Notification = ({
       </div>
       <div className="flex flex-col flex-grow items-start gap-1.5">
         {title && (
-          <div className="whitespace-nowrap overflow-hidden text-ellipsis uppercase leading-6">
+          <div
+            key="title"
+            className="whitespace-nowrap overflow-hidden text-ellipsis uppercase leading-6"
+          >
             {title}
           </div>
         )}
-        <div className="text-sm [word-break:break-word]">{message}</div>
+        <div key="message" className="text-sm [word-break:break-word]">
+          {message}
+        </div>
         {buttonProps && (
           <Button
             size={buttonProps.size || 'sm'}

libs/ui-toolkit/src/components/pagination/index.tsx

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

libs/ui-toolkit/src/components/pagination/pagination.stories.tsx

@@ -0,0 +1,28 @@
+import { useState } from 'react';
+import { Pagination } from './pagination';
+
+import type { ComponentStory, ComponentMeta } from '@storybook/react';
+export default {
+  title: 'Pagination',
+  component: Pagination,
+} as ComponentMeta<typeof Pagination>;
+
+const Template: ComponentStory<typeof Pagination> = (args) => {
+  const MAX_PAGE = 3;
+  const [page, setPage] = useState(1);
+
+  return (
+    <div>
+      <Pagination
+        hasPrevPage={page !== 1}
+        hasNextPage={page < MAX_PAGE}
+        onBack={() => setPage(Math.max(1, page - 1))}
+        onNext={() => setPage(Math.min(MAX_PAGE, page + 1))}
+      >
+        Page {page}
+      </Pagination>
+    </div>
+  );
+};
+
+export const Default = Template.bind({});

libs/ui-toolkit/src/components/pagination/pagination.tsx

@@ -0,0 +1,73 @@
+import type { ReactNode } from 'react';
+import { Button } from '../button';
+import { Icon } from '../icon';
+
+export type PaginationProps = {
+  hasPrevPage: boolean;
+  hasNextPage: boolean;
+  isLoading?: boolean;
+  children?: ReactNode;
+  onBack: () => void;
+  onNext: () => void;
+  onFirst?: () => void;
+  onLast?: () => void;
+};
+
+const buttonClass = 'rounded-full w-[34px] h-[34px]';
+
+export const Pagination = ({
+  hasPrevPage,
+  hasNextPage,
+  isLoading,
+  children,
+  onBack,
+  onNext,
+  onFirst,
+  onLast,
+}: PaginationProps) => {
+  return (
+    <div className={'flex gap-2 my-2 items-center justify-center'}>
+      {onFirst && (
+        <Button
+          size="sm"
+          data-testid="goto-first-page"
+          disabled={isLoading || !hasPrevPage}
+          className={buttonClass}
+          onClick={onFirst}
+        >
+          <Icon name="double-chevron-left" ariaLabel="Back" />
+        </Button>
+      )}
+      <Button
+        size="sm"
+        data-testid="goto-previous-page"
+        disabled={isLoading || !hasPrevPage}
+        className={buttonClass}
+        onClick={onBack}
+      >
+        <Icon name="chevron-left" ariaLabel="Back" />
+      </Button>
+      {children}
+      <Button
+        size="sm"
+        data-testid="goto-next-page"
+        disabled={isLoading || !hasNextPage}
+        className={buttonClass}
+        onClick={onNext}
+      >
+        <Icon name="chevron-right" ariaLabel="Next" />
+      </Button>
+      {onLast && (
+        <Button
+          size="sm"
+          data-testid="goto-last-page"
+          disabled={isLoading || !hasNextPage}
+          className={buttonClass}
+          onClick={onLast}
+        >
+          <Icon name="double-chevron-right" ariaLabel="Back" />
+        </Button>
+      )}
+    </div>
+  );
+};

libs/utils/src/lib/generic-data-provider.spec.ts

@@ -45,7 +45,7 @@ type CombinedData = {
 
 type SubscriptionData = QueryData;
 type Delta = Data;
-type Variables = { var: string };
+type Variables = { var: string; filter?: string[] };
 
 const update = jest.fn<
   ReturnType<Update<Data, Delta, Variables>>,
@@ -231,10 +231,14 @@ describe('data provider', () => {
     clientSubscribeSubscribe.mockClear();
   });
   it('memoize instance and unsubscribe if no subscribers', () => {
-    const subscription1 = subscribe(jest.fn(), client, variables);
-    const subscription2 = subscribe(jest.fn(), client, { ...variables });
-    // const subscription1 = subscribe(jest.fn(), client);
-    // const subscription2 = subscribe(jest.fn(), client);
+    const subscription1 = subscribe(jest.fn(), client, {
+      ...variables,
+      filter: ['1', '2'],
+    });
+    const subscription2 = subscribe(jest.fn(), client, {
+      ...variables,
+      filter: ['2', '1'],
+    });
     expect(clientSubscribeSubscribe.mock.calls.length).toEqual(1);
     subscription1.unsubscribe();
     expect(clientSubscribeUnsubscribe.mock.calls.length).toEqual(0);

libs/utils/src/lib/generic-data-provider.ts

@@ -10,7 +10,7 @@ import type {
 } from '@apollo/client';
 import type { GraphQLErrors } from '@apollo/client/errors';
 import type { Subscription } from 'zen-observable-ts';
-import isEqual from 'lodash/isEqual';
+import isEqualWith from 'lodash/isEqualWith';
 import { isNotFoundGraphQLError } from './apollo-client';
 import type * as Schema from '@vegaprotocol/types';
 interface UpdateData<Data, Delta> {
@@ -104,7 +104,11 @@ interface GetTotalCount<QueryData> {
 }
 
 interface GetDelta<SubscriptionData, Delta, Variables> {
-  (subscriptionData: SubscriptionData, variables?: Variables): Delta;
+  (
+    subscriptionData: SubscriptionData,
+    variables: Variables,
+    client: ApolloClient<object>
+  ): Delta;
 }
 
 export type Node = { id: string };
@@ -420,7 +424,7 @@ function makeDataProviderInternal<
     if (!subscriptionData || !getDelta || !update) {
       return;
     }
-    const delta = getDelta(subscriptionData, variables);
+    const delta = getDelta(subscriptionData, variables, client);
     if (loading) {
       updateQueue.push(delta);
     } else {
@@ -512,11 +516,26 @@ function makeDataProviderInternal<
   };
 }
 
+/**
+ * Compares two arrays assuming that they are sets of primitive values, used to compare gql query variables
+ */
+export const variablesIsEqualCustomizer: NonNullable<
+  Parameters<typeof isEqualWith>['2']
+> = (value, other) => {
+  if (Array.isArray(value) && Array.isArray(other)) {
+    return (
+      value.length === other.length &&
+      new Set([...value, ...other]).size === value.length
+    );
+  }
+  return undefined;
+};
+
 /**
  * Memoizes data provider instances using query variables as cache key
  *
  * @param fn
- * @returns subscibe function
+ * @returns subscribe function
  */
 const memoize = <
   Data,
@@ -530,7 +549,9 @@ const memoize = <
     variables?: Variables;
   }[] = [];
   return (variables?: Variables) => {
-    const cached = cache.find((c) => isEqual(c.variables, variables));
+    const cached = cache.find((c) =>
+      isEqualWith(c.variables, variables, variablesIsEqualCustomizer)
+    );
     if (cached) {
       return cached.subscribe;
     }
@@ -582,8 +603,10 @@ export function makeDataProvider<
   const getInstance = memoize<Data, Delta, Variables>(() =>
     makeDataProviderInternal(params)
   );
-  return (callback, client, variables) =>
-    getInstance(variables)(callback, client, variables);
+  return (callback, client, variables) => {
+    const instance = getInstance(variables)(callback, client, variables);
+    return instance;
+  };
 }
 
 /**
@@ -605,7 +628,9 @@ export type CombineDerivedData<
 > = (
   data: DerivedPart<Variables>['data'][],
   variables: Variables,
-  prevData: Data | null
+  prevData: Data | null,
+  parts: DerivedPart<Variables>[],
+  subscriptions?: ReturnType<DependencySubscribe<Variables>>[]
 ) => Data | null;
 
 export type CombineDerivedDelta<
@@ -687,7 +712,9 @@ function makeDerivedDataProviderInternal<
       ? combineData(
           parts.map((part) => part.data),
           variables,
-          data
+          data,
+          parts,
+          subscriptions
         )
       : data;
     if (

libs/withdraws/src/lib/withdraw-form.tsx

@@ -6,6 +6,7 @@ import {
   removeDecimal,
   required,
   isAssetTypeERC20,
+  formatNumber,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
@@ -14,12 +15,16 @@ import {
   FormGroup,
   Input,
   InputError,
+  Notification,
   RichSelect,
+  ExternalLink,
+  Intent,
 } from '@vegaprotocol/ui-toolkit';
 import { useWeb3React } from '@web3-react/core';
 import BigNumber from 'bignumber.js';
 import type { ButtonHTMLAttributes } from 'react';
 import type { ControllerRenderProps } from 'react-hook-form';
+import { formatDistanceToNow } from 'date-fns';
 import { useForm, Controller, useWatch } from 'react-hook-form';
 import type { WithdrawalArgs } from './use-create-withdraw';
 import { WithdrawLimits } from './withdraw-limits';
@@ -45,6 +50,47 @@ export interface WithdrawFormProps {
   submitWithdraw: (withdrawal: WithdrawalArgs) => void;
 }
 
+const WithdrawDelayNotification = ({
+  threshold,
+  delay,
+  symbol,
+  decimals,
+}: {
+  threshold: BigNumber;
+  delay: number | undefined;
+  symbol: string;
+  decimals: number;
+}) => {
+  const replacements = [
+    symbol,
+    delay ? formatDistanceToNow(Date.now() + delay * 1000) : ' ',
+  ];
+  return (
+    <Notification
+      intent={Intent.Warning}
+      testId={
+        threshold.isFinite()
+          ? 'amount-withdrawal-delay-notification'
+          : 'withdrawals-delay-notification'
+      }
+      message={[
+        !threshold.isFinite()
+          ? t('All %s withdrawals are subject to a %s delay.', replacements)
+          : t('Withdrawals of %s %s or more will be delayed for %s.', [
+              formatNumber(threshold, decimals),
+              ...replacements,
+            ]),
+        <ExternalLink
+          className="ml-1"
+          href="https://docs.vega.xyz/testnet/concepts/deposits-withdrawals#withdrawal-limits"
+        >
+          {t('Read more')}
+        </ExternalLink>,
+      ]}
+    />
+  );
+};
+
 export const WithdrawForm = ({
   assets,
   balance,
@@ -113,6 +159,12 @@ export const WithdrawForm = ({
     );
   };
 
+  const showWithdrawDelayNotification =
+    delay &&
+    selectedAsset &&
+    (!threshold.isFinite() ||
+      new BigNumber(amount).isGreaterThanOrEqualTo(threshold));
+
   return (
     <>
       <div className="mb-4 text-sm">
@@ -206,6 +258,16 @@ export const WithdrawForm = ({
               {t('Use maximum')}
             </UseButton>
           )}
+          {showWithdrawDelayNotification && (
+            <div className="mt-2">
+              <WithdrawDelayNotification
+                threshold={threshold}
+                symbol={selectedAsset.symbol}
+                decimals={selectedAsset.decimals}
+                delay={delay}
+              />
+            </div>
+          )}
         </FormGroup>
         <Button
           data-testid="submit-withdrawal"

libs/withdraws/src/lib/withdraw-limits.tsx

@@ -1,7 +1,12 @@
 import type { Asset } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { CompactNumber } from '@vegaprotocol/react-helpers';
-import { KeyValueTable, KeyValueTableRow } from '@vegaprotocol/ui-toolkit';
+import { WITHDRAW_THRESHOLD_TOOLTIP_TEXT } from '@vegaprotocol/assets';
+import {
+  KeyValueTable,
+  KeyValueTableRow,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
 import BigNumber from 'bignumber.js';
 import { formatDistanceToNow } from 'date-fns';
 
@@ -25,7 +30,13 @@ export const WithdrawLimits = ({
       ? formatDistanceToNow(Date.now() + delay * 1000)
       : t('None');
 
-  const limits = [
+  const limits: {
+    key: string;
+    label: string;
+    value: string | JSX.Element;
+    rawValue?: BigNumber;
+    tooltip?: string;
+  }[] = [
     {
       key: 'BALANCE_AVAILABLE',
       label: t('Balance available'),
@@ -36,24 +47,35 @@ export const WithdrawLimits = ({
         '-'
       ),
     },
-    {
+  ];
+  if (threshold.isFinite()) {
+    limits.push({
       key: 'WITHDRAWAL_THRESHOLD',
       label: t('Delayed withdrawal threshold'),
+      tooltip: WITHDRAW_THRESHOLD_TOOLTIP_TEXT,
       rawValue: threshold,
       value: <CompactNumber number={threshold} decimals={asset.decimals} />,
-    },
-    {
-      key: 'DELAY_TIME',
-      label: t('Delay time'),
-      value: delayTime,
-    },
-  ];
+    });
+  }
+  limits.push({
+    key: 'DELAY_TIME',
+    label: t('Delay time'),
+    value: delayTime,
+  });
 
   return (
     <KeyValueTable>
-      {limits.map(({ key, label, rawValue, value }) => (
+      {limits.map(({ key, label, rawValue, value, tooltip }) => (
         <KeyValueTableRow key={key}>
-          <div data-testid={`${key}_label`}>{label}</div>
+          <div data-testid={`${key}_label`}>
+            {tooltip ? (
+              <Tooltip description={tooltip}>
+                <span>{label}</span>
+              </Tooltip>
+            ) : (
+              label
+            )}
+          </div>
           <div
             data-testid={`${key}_value`}
             className="truncate"

libs/withdraws/src/lib/withdraw-manager.spec.tsx

@@ -12,15 +12,17 @@ jest.mock('@web3-react/core', () => ({
   useWeb3React: () => ({ account: ethereumAddress }),
 }));
 
+const withdrawAsset = {
+  asset,
+  balance: new BigNumber(1),
+  min: new BigNumber(0.0000001),
+  threshold: new BigNumber(1000),
+  delay: 10,
+  handleSelectAsset: jest.fn(),
+};
+
 jest.mock('./use-withdraw-asset', () => ({
-  useWithdrawAsset: () => ({
-    asset,
-    balance: new BigNumber(1),
-    min: new BigNumber(0.0000001),
-    threshold: new BigNumber(1000),
-    delay: 10,
-    handleSelectAsset: jest.fn(),
-  }),
+  useWithdrawAsset: () => withdrawAsset,
 }));
 
 jest.mock('@vegaprotocol/web3', () => ({
@@ -109,4 +111,25 @@ describe('WithdrawManager', () => {
     });
     fireEvent.submit(screen.getByTestId('withdraw-form'));
   };
+
+  it('shows withdraw delay notification if amount greater than threshold', async () => {
+    render(generateJsx(props));
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '1000' },
+    });
+    expect(
+      await screen.findByTestId('amount-withdrawal-delay-notification')
+    ).toBeInTheDocument();
+  });
+
+  it('shows withdraw delay notification if threshold is 0', async () => {
+    withdrawAsset.threshold = new BigNumber(Infinity);
+    render(generateJsx(props));
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '0.01' },
+    });
+    expect(
+      await screen.findByTestId('withdrawals-delay-notification')
+    ).toBeInTheDocument();
+  });
 });

package.json

@@ -70,7 +70,7 @@
     "react-hook-form": "^7.27.0",
     "react-i18next": "^11.11.4",
     "react-intersection-observer": "^9.2.2",
-    "react-markdown": "^8.0.5",
+    "react-markdown": "^8.0.6",
     "react-router-dom": "^6.9.0",
     "react-syntax-highlighter": "^15.4.5",
     "react-use-websocket": "^3.0.0",

yarn.lock

@@ -19541,10 +19541,10 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-markdown@^8.0.5:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.5.tgz#c9a70a33ca9aeeafb769c6582e7e38843b9d70ad"
-  integrity sha512-jGJolWWmOWAvzf+xMdB9zwStViODyyFQhNB/bwCerbBKmrTmgmA599CGiOlP58OId1IMoIRsA8UdI1Lod4zb5A==
+react-markdown@^8.0.6:
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.6.tgz#3e939018f8bfce800ffdf22cf50aba3cdded7ad1"
+  integrity sha512-KgPWsYgHuftdx510wwIzpwf+5js/iHqBR+fzxefv8Khk3mFbnioF1bmL2idHN3ler0LMQmICKeDrWnZrX9mtbQ==
   dependencies:
     "@types/hast" "^2.0.0"
     "@types/prop-types" "^15.0.0"