test: increase coverage for the remaining ACs

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

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

.github/workflows/lint_pr.yml

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

.github/workflows/publish-dist.yml

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

Dockerfile

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -88,10 +88,7 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
       .clear()
       .type('850')
       .next(`[data-testid="${formFieldError}"]`)
-      .should(
-        'have.text',
-        "You can't deposit more than you have in your Ethereum wallet, 800 tEURO"
-      );
+      .should('have.text', 'Insufficient amount in Ethereum wallet');
   });
 });
 

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

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

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

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

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

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

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

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

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

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

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.spec.tsx

@@ -23,44 +23,26 @@ const generateJsx = (context: VegaWalletContextShape) => {
   );
 };
 
-describe('VegaWalletConnectButton', () => {
-  it('should fire dialog when not connected', () => {
-    render(generateJsx({ pubKey: null } as VegaWalletContextShape));
+it('Not connected', () => {
+  render(generateJsx({ pubKey: null } as VegaWalletContextShape));
 
-    const button = screen.getByTestId('connect-vega-wallet');
-    expect(button).toHaveTextContent('Connect Vega wallet');
-    fireEvent.click(button);
-    expect(mockUpdateDialogOpen).toHaveBeenCalled();
-  });
+  const button = screen.getByTestId('connect-vega-wallet');
+  expect(button).toHaveTextContent('Connect Vega wallet');
+  fireEvent.click(button);
+  expect(mockUpdateDialogOpen).toHaveBeenCalled();
+});
 
-  it('should retrieve keys when connected', async () => {
-    const pubKey = { publicKey: '123456__123456', name: 'test' };
-    const pubKey2 = { publicKey: '123456__123457', name: 'test2' };
-    render(
-      generateJsx({
-        pubKey: pubKey.publicKey,
-        pubKeys: [pubKey],
-        fetchPubKeys: () => Promise.resolve([pubKey, pubKey2]),
-      } as VegaWalletContextShape)
-    );
-
-    const button = screen.getByTestId('manage-vega-wallet');
-    expect(button).toHaveTextContent(truncateByChars(pubKey.publicKey));
-    userEvent.click(button);
-    expect(mockUpdateDialogOpen).not.toHaveBeenCalled();
-  });
-
-  it('should fetch keys when connected', async () => {
-    const pubKey = { publicKey: '123456__123456', name: 'test' };
-    const context = {
+it('Connected', async () => {
+  const pubKey = { publicKey: '123456__123456', name: 'test' };
+  render(
+    generateJsx({
       pubKey: pubKey.publicKey,
       pubKeys: [pubKey],
-    } as VegaWalletContextShape;
-    render(generateJsx(context));
+    } as VegaWalletContextShape)
+  );
 
-    const button = screen.getByTestId('manage-vega-wallet');
-    expect(button).toHaveTextContent(truncateByChars(pubKey.publicKey));
-    userEvent.click(button);
-    expect(mockUpdateDialogOpen).not.toHaveBeenCalled();
-  });
+  const button = screen.getByTestId('manage-vega-wallet');
+  expect(button).toHaveTextContent(truncateByChars(pubKey.publicKey));
+  userEvent.click(button);
+  expect(mockUpdateDialogOpen).not.toHaveBeenCalled();
 });

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx

@@ -29,7 +29,7 @@ const MobileWalletButton = ({
   isConnected?: boolean;
   activeKey?: PubKey;
 }) => {
-  const { pubKeys, selectPubKey, disconnect, fetchPubKeys } = useVegaWallet();
+  const { pubKeys, selectPubKey, disconnect } = useVegaWallet();
   const openVegaWalletDialog = useVegaWalletDialogStore(
     (store) => store.openVegaWalletDialog
   );
@@ -46,12 +46,9 @@ const MobileWalletButton = ({
       openVegaWalletDialog();
       setDrawerOpen(false);
     } else {
-      if (fetchPubKeys) {
-        fetchPubKeys();
-      }
       setDrawerOpen(!drawerOpen);
     }
-  }, [drawerOpen, fetchPubKeys, isConnected, openVegaWalletDialog]);
+  }, [drawerOpen, isConnected, openVegaWalletDialog]);
 
   const iconClass = drawerOpen
     ? 'hidden'
@@ -148,14 +145,8 @@ export const VegaWalletConnectButton = () => {
     (store) => store.openVegaWalletDialog
   );
   const openTransferDialog = useTransferDialog((store) => store.open);
-  const {
-    pubKey,
-    pubKeys,
-    selectPubKey,
-    disconnect,
-    isReadOnly,
-    fetchPubKeys,
-  } = useVegaWallet();
+  const { pubKey, pubKeys, selectPubKey, disconnect, isReadOnly } =
+    useVegaWallet();
   const isConnected = pubKey !== null;
 
   const activeKey = useMemo(() => {
@@ -171,12 +162,7 @@ export const VegaWalletConnectButton = () => {
             trigger={
               <DropdownMenuTrigger
                 data-testid="manage-vega-wallet"
-                onClick={() => {
-                  if (fetchPubKeys) {
-                    fetchPubKeys();
-                  }
-                  setDropdownOpen(!dropdownOpen);
-                }}
+                onClick={() => setDropdownOpen((curr) => !curr)}
               >
                 {activeKey && (
                   <span className="uppercase">{activeKey.name}</span>

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

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

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

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

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

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

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

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

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

@@ -547,11 +547,7 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
 
   return (
     <>
-      <ToastHeading>
-        {tx.order?.status
-          ? getOrderToastTitle(tx.order.status)
-          : t('Confirmed')}
-      </ToastHeading>
+      <ToastHeading>{t('Confirmed')}</ToastHeading>
       <p>{t('Your transaction has been confirmed ')}</p>
       {tx.txHash && (
         <p className="break-all">
@@ -638,8 +634,25 @@ export const useVegaTransactionToasts = () => {
   );
 
   const fromVegaTransaction = (tx: VegaStoredTxState): Toast => {
+    let content: ToastContent;
     const closeAfter = isFinal(tx) ? CLOSE_AFTER : undefined;
-    const { intent, content } = getVegaTransactionContentIntent(tx);
+    if (tx.status === VegaTxStatus.Requested) {
+      content = <VegaTxRequestedToastContent tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Pending) {
+      content = <VegaTxPendingToastContentProps tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Complete) {
+      content = <VegaTxCompleteToastsContent tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Error) {
+      content = <VegaTxErrorToastContent tx={tx} />;
+    }
+
+    // Transaction can be successful but the order can be rejected by the network
+    const intent =
+      (tx.order && getOrderToastIntent(tx.order.status)) ||
+      intentMap[tx.status];
 
     return {
       id: `vega-${tx.id}`,
@@ -663,27 +676,3 @@ export const useVegaTransactionToasts = () => {
     }
   );
 };
-
-export const getVegaTransactionContentIntent = (tx: VegaStoredTxState) => {
-  let content: ToastContent;
-  if (tx.status === VegaTxStatus.Requested) {
-    content = <VegaTxRequestedToastContent tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Pending) {
-    content = <VegaTxPendingToastContentProps tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Complete) {
-    content = <VegaTxCompleteToastsContent tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Error) {
-    content = <VegaTxErrorToastContent tx={tx} />;
-  }
-
-  // Transaction can be successful but the order can be rejected by the network
-  const intent =
-    (tx.order &&
-      !isOrderAmendmentTransaction(tx.body) &&
-      getOrderToastIntent(tx.order.status)) ||
-    intentMap[tx.status];
-  return { intent, content };
-};

apps/trading/pages/_app.page.tsx

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

apps/trading/pages/client-router.tsx

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

apps/trading/pages/styles.css

@@ -63,7 +63,7 @@ html [data-theme='light'] {
   --pennant-color-sell-stroke: theme('colors.vega.pink.400');
 
   --pennant-color-volume-buy: theme('colors.vega.green.400');
-  --pennant-color-volume-sell: theme('colors.vega.pink.400');
+  --pennant-color-volume-sell: theme('colors.vega.pink.500');
 
   /* depth chart */
   --pennant-color-depth-buy-fill: theme('colors.vega.green.400');

docker-build.sh

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

docker/dist.Dockerfile

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

libs/assets/src/lib/Assets.graphql

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

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

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

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

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

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

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

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

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

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

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

libs/assets/src/lib/constants.ts

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

libs/assets/src/lib/index.ts

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

libs/datagrid/src/index.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

libs/deal-ticket/src/hooks/use-order-closeout.ts

@@ -0,0 +1,61 @@
+import { BigNumber } from 'bignumber.js';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { addDecimal } from '@vegaprotocol/utils';
+import * as Schema from '@vegaprotocol/types';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
+import {
+  useAccountBalance,
+  useMarketAccountBalance,
+} from '@vegaprotocol/accounts';
+import { useMarketMargin } from '@vegaprotocol/positions';
+import { useMarketPositions } from './use-market-positions';
+
+interface Props {
+  order: OrderSubmissionBody['orderSubmission'];
+  market: Market;
+  marketData: MarketData;
+}
+
+export const useOrderCloseOut = ({
+  order,
+  market,
+  marketData,
+}: Props): string | null => {
+  const { accountBalance, accountDecimals } = useAccountBalance(
+    market.tradableInstrument.instrument.product.settlementAsset.id
+  );
+  const { accountBalance: positionBalance, accountDecimals: positionDecimals } =
+    useMarketAccountBalance(market.id);
+  const maintenanceLevel = useMarketMargin(market.id);
+
+  const marginMaintenanceLevel = new BigNumber(
+    addDecimal(maintenanceLevel || 0, market.decimalPlaces)
+  );
+  const positionAccountBalance = new BigNumber(
+    addDecimal(positionBalance || 0, positionDecimals || 0)
+  );
+  const generalAccountBalance = new BigNumber(
+    addDecimal(accountBalance || 0, accountDecimals || 0)
+  );
+  const { openVolume } =
+    useMarketPositions({
+      marketId: market.id,
+    }) || {};
+
+  const volume = new BigNumber(
+    addDecimal(openVolume || '0', market.positionDecimalPlaces)
+  )[order.side === Schema.Side.SIDE_BUY ? 'plus' : 'minus'](order.size);
+  const price =
+    order.type === Schema.OrderType.TYPE_LIMIT && order.price
+      ? new BigNumber(order.price)
+      : new BigNumber(addDecimal(marketData.markPrice, market.decimalPlaces));
+  // regarding formula (marginMaintenanceLevel - positionAccountBalance - generalAccountBalance) / volume + markPrice
+  const marginDifference = marginMaintenanceLevel
+    .minus(positionAccountBalance)
+    .minus(generalAccountBalance);
+  const closeOut = marginDifference.div(volume).plus(price);
+  if (closeOut.isPositive()) {
+    return closeOut.toString();
+  }
+  return null;
+};

libs/deposits/src/lib/approve-notification.tsx

@@ -51,12 +51,11 @@ export const ApproveNotification = ({
         intent={intent}
         testId="approve-default"
         message={t(
-          'Before you can make a deposit of your chosen asset, %s, you need to approve its use in your Ethereum wallet',
-          selectedAsset?.symbol
+          `Before you can make a deposit of your chosen asset, ${selectedAsset?.symbol}, you need to approve its use in your Ethereum wallet`
         )}
         buttonProps={{
           size: 'sm',
-          text: t('Approve %s', selectedAsset?.symbol),
+          text: `Approve ${selectedAsset?.symbol}`,
           action: onApprove,
           dataTestId: 'approve-submit',
         }}
@@ -69,12 +68,13 @@ export const ApproveNotification = ({
         intent={intent}
         testId="reapprove-default"
         message={t(
-          'Approve again to deposit more than %s',
-          formatNumber(balances.allowance.toString())
+          `Approve again to deposit more than ${formatNumber(
+            balances.allowance.toString()
+          )}`
         )}
         buttonProps={{
           size: 'sm',
-          text: t('Approve %s', selectedAsset?.symbol),
+          text: `Approve ${selectedAsset?.symbol}`,
           action: onApprove,
           dataTestId: 'reapprove-submit',
         }}
@@ -157,8 +157,7 @@ const ApprovalTxFeedback = ({
           intent={Intent.Warning}
           testId="approve-requested"
           message={t(
-            'Go to your Ethereum wallet and approve the transaction to enable the use of %s',
-            selectedAsset?.symbol
+            `Go to your Ethereum wallet and approve the transaction to enable the use of ${selectedAsset?.symbol}`
           )}
         />
       </div>
@@ -175,8 +174,7 @@ const ApprovalTxFeedback = ({
             <>
               <p>
                 {t(
-                  'Your %s approval is being confirmed by the Ethereum network. When this is complete, you can continue your deposit',
-                  selectedAsset?.symbol
+                  `Your ${selectedAsset?.symbol} approval is being confirmed by the Ethereum network. When this is complete, you can continue your deposit`
                 )}{' '}
               </p>
               {txLink && <p>{txLink}</p>}
@@ -196,10 +194,13 @@ const ApprovalTxFeedback = ({
           message={
             <>
               <p>
-                {t('You approved deposits of up to %s %s.', [
-                  selectedAsset?.symbol,
-                  formatNumber(allowance?.toString() || 0),
-                ])}
+                {t(
+                  `You can now make deposits in ${
+                    selectedAsset?.symbol
+                  }, up to a maximum of ${formatNumber(
+                    allowance?.toString() || 0
+                  )}`
+                )}
               </p>
               {txLink && <p>{txLink}</p>}
             </>

libs/deposits/src/lib/deposit-form.spec.tsx

@@ -1,11 +1,4 @@
-import {
-  waitFor,
-  fireEvent,
-  render,
-  screen,
-  act,
-} from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { waitFor, fireEvent, render, screen } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
 import type { DepositFormProps } from './deposit-form';
 import { DepositForm } from './deposit-form';
@@ -148,14 +141,12 @@ describe('Deposit form', () => {
       fireEvent.submit(screen.getByTestId('deposit-form'));
 
       expect(
-        await screen.findByText(
-          "You can't deposit more than you have in your Ethereum wallet, 5"
-        )
+        await screen.findByText('Insufficient amount in Ethereum wallet')
       ).toBeInTheDocument();
     });
 
     it('fails when submitted amount is more than the maximum limit', async () => {
-      render(<DepositForm {...props} selectedAsset={asset} />);
+      render(<DepositForm {...props} />);
 
       const amountMoreThanLimit = '21';
       fireEvent.change(screen.getByLabelText('Amount'), {
@@ -164,9 +155,7 @@ describe('Deposit form', () => {
       fireEvent.submit(screen.getByTestId('deposit-form'));
 
       expect(
-        await screen.findByText(
-          "You can't deposit more than your remaining deposit allowance, 10 asset-symbol"
-        )
+        await screen.findByText('Amount is above lifetime deposit limit')
       ).toBeInTheDocument();
     });
 
@@ -190,9 +179,7 @@ describe('Deposit form', () => {
       fireEvent.submit(screen.getByTestId('deposit-form'));
 
       expect(
-        await screen.findByText(
-          "You can't deposit more than your approved deposit amount, 30"
-        )
+        await screen.findByText('Amount is above approved amount')
       ).toBeInTheDocument();
     });
 
@@ -296,6 +283,8 @@ describe('Deposit form', () => {
     expect(screen.getByTestId('BALANCE_AVAILABLE_value')).toHaveTextContent(
       '50'
     );
+    expect(screen.getByTestId('MAX_LIMIT_value')).toHaveTextContent('20');
+    expect(screen.getByTestId('DEPOSITED_value')).toHaveTextContent('10');
     expect(screen.getByTestId('REMAINING_value')).toHaveTextContent('10');
 
     fireEvent.change(screen.getByLabelText('Amount'), {
@@ -376,32 +365,4 @@ describe('Deposit form', () => {
       /this app only works on/i
     );
   });
-
-  it('Remaining deposit allowance tooltip should be rendered', async () => {
-    render(<DepositForm {...props} selectedAsset={asset} />);
-    await act(async () => {
-      await userEvent.hover(screen.getByText('Remaining deposit allowance'));
-    });
-    await waitFor(async () => {
-      await expect(
-        screen.getByRole('tooltip', {
-          name: /VEGA has a lifetime deposit limit of 20 asset-symbol per address/,
-        })
-      ).toBeInTheDocument();
-    });
-  });
-
-  it('Ethereum deposit cap tooltip should be rendered', async () => {
-    render(<DepositForm {...props} selectedAsset={asset} />);
-    await act(async () => {
-      await userEvent.hover(screen.getByText('Ethereum deposit cap'));
-    });
-    await waitFor(async () => {
-      await expect(
-        screen.getByRole('tooltip', {
-          name: /The deposit cap is set when you approve an asset for use with this app/,
-        })
-      ).toBeInTheDocument();
-    });
-  });
 });

libs/deposits/src/lib/deposit-form.tsx

@@ -8,7 +8,6 @@ import {
   maxSafe,
   addDecimal,
   isAssetTypeERC20,
-  formatNumber,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
@@ -100,7 +99,7 @@ export const DepositForm = ({
     defaultValues: {
       to: pubKey ? pubKey : undefined,
       asset: selectedAsset?.id,
-      amount: persistedDeposit?.amount,
+      amount: persistedDeposit.amount,
     },
   });
 
@@ -134,8 +133,11 @@ export const DepositForm = ({
     return _pubKeys ? _pubKeys.map((pk) => pk.publicKey) : [];
   }, [_pubKeys]);
 
-  const approved =
-    balances && balances.allowance.isGreaterThan(0) ? true : false;
+  const approved = balances
+    ? balances.allowance.isGreaterThan(0)
+      ? true
+      : false
+    : false;
 
   return (
     <form
@@ -192,44 +194,6 @@ export const DepositForm = ({
           <InputError intent="danger">{errors.from.message}</InputError>
         )}
       </FormGroup>
-      <FormGroup label={t('To (Vega key)')} labelFor="to">
-        <AddressField
-          pubKeys={pubKeys}
-          onChange={() => setValue('to', '')}
-          select={
-            <Select {...register('to')} id="to" defaultValue="">
-              <option value="" disabled>
-                {t('Please select')}
-              </option>
-              {pubKeys?.length &&
-                pubKeys.map((pk) => (
-                  <option key={pk} value={pk}>
-                    {pk}
-                  </option>
-                ))}
-            </Select>
-          }
-          input={
-            <Input
-              // eslint-disable-next-line jsx-a11y/no-autofocus
-              autoFocus={true} // focus input immediately after is shown
-              id="to"
-              type="text"
-              {...register('to', {
-                validate: {
-                  required,
-                  vegaPublicKey,
-                },
-              })}
-            />
-          }
-        />
-        {errors.to?.message && (
-          <InputError intent="danger" forInput="to">
-            {errors.to.message}
-          </InputError>
-        )}
-      </FormGroup>
       <FormGroup label={t('Asset')} labelFor="asset">
         <Controller
           control={control}
@@ -286,7 +250,45 @@ export const DepositForm = ({
         selectedAsset={selectedAsset}
         faucetTxId={faucetTxId}
       />
-      {approved && selectedAsset && balances && (
+      <FormGroup label={t('To (Vega key)')} labelFor="to">
+        <AddressField
+          pubKeys={pubKeys}
+          onChange={() => setValue('to', '')}
+          select={
+            <Select {...register('to')} id="to" defaultValue="">
+              <option value="" disabled={true}>
+                {t('Please select')}
+              </option>
+              {pubKeys?.length &&
+                pubKeys.map((pk) => (
+                  <option key={pk} value={pk}>
+                    {pk}
+                  </option>
+                ))}
+            </Select>
+          }
+          input={
+            <Input
+              // eslint-disable-next-line jsx-a11y/no-autofocus
+              autoFocus={true} // focus input immediately after is shown
+              id="to"
+              type="text"
+              {...register('to', {
+                validate: {
+                  required,
+                  vegaPublicKey,
+                },
+              })}
+            />
+          }
+        />
+        {errors.to?.message && (
+          <InputError intent="danger" forInput="to">
+            {errors.to.message}
+          </InputError>
+        )}
+      </FormGroup>
+      {selectedAsset && balances && (
         <div className="mb-6">
           <DepositLimits {...balances} asset={selectedAsset} />
         </div>
@@ -303,15 +305,8 @@ export const DepositForm = ({
                 minSafe: (value) => minSafe(new BigNumber(min))(value),
                 approved: (v) => {
                   const value = new BigNumber(v);
-                  const allowance = new BigNumber(balances?.allowance || 0);
-                  if (value.isGreaterThan(allowance)) {
-                    return t(
-                      "You can't deposit more than your approved deposit amount, %s %s",
-                      [
-                        formatNumber(allowance.toString()),
-                        selectedAsset?.symbol || ' ',
-                      ]
-                    );
+                  if (value.isGreaterThan(balances?.allowance || 0)) {
+                    return t('Amount is above approved amount');
                   }
                   return true;
                 },
@@ -327,24 +322,14 @@ export const DepositForm = ({
                   }
 
                   if (value.isGreaterThan(lifetimeLimit)) {
-                    return t(
-                      "You can't deposit more than your remaining deposit allowance, %s %s",
-                      [
-                        formatNumber(lifetimeLimit.toString()),
-                        selectedAsset?.symbol || ' ',
-                      ]
-                    );
+                    return t('Amount is above lifetime deposit limit');
                   }
                   return true;
                 },
                 balance: (v) => {
                   const value = new BigNumber(v);
-                  const balance = new BigNumber(balances?.balance || 0);
-                  if (value.isGreaterThan(balance)) {
-                    return t(
-                      "You can't deposit more than you have in your Ethereum wallet, %s %s",
-                      [formatNumber(balance), selectedAsset?.symbol || ' ']
-                    );
+                  if (value.isGreaterThan(balances?.balance || 0)) {
+                    return t('Insufficient amount in Ethereum wallet');
                   }
                   return true;
                 },
@@ -420,7 +405,7 @@ const FormButton = ({ approved, selectedAsset }: FormButtonProps) => {
         type="submit"
         data-testid="deposit-submit"
         variant={isActive ? 'primary' : 'default'}
-        fill
+        fill={true}
         disabled={invalidChain}
       >
         {t('Deposit')}

libs/deposits/src/lib/deposit-limits.tsx

@@ -1,13 +1,8 @@
 import type { Asset } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { CompactNumber } from '@vegaprotocol/react-helpers';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
+import { KeyValueTable, KeyValueTableRow } from '@vegaprotocol/ui-toolkit';
 import type BigNumber from 'bignumber.js';
-import { formatNumber } from '@vegaprotocol/utils';
 
 // Note: all of the values here are with correct asset's decimals
 // See `libs/deposits/src/lib/use-deposit-balances.ts`
@@ -38,35 +33,21 @@ export const DepositLimits = ({
         '-'
       ),
     },
+    {
+      key: 'MAX_LIMIT',
+      label: t('Lifetime deposit allowance'),
+      rawValue: max,
+      value: <CompactNumber number={max} decimals={asset.decimals} />,
+    },
+    {
+      key: 'DEPOSITED',
+      label: t('Deposited'),
+      rawValue: deposited,
+      value: <CompactNumber number={deposited} decimals={asset.decimals} />,
+    },
     {
       key: 'REMAINING',
-      label: (
-        <Tooltip
-          description={
-            <>
-              <p>
-                {t(
-                  'VEGA has a lifetime deposit limit of %s %s per address. This can be changed through governance',
-                  [formatNumber(max.toString()), asset.symbol]
-                )}
-              </p>
-              <p>
-                {t(
-                  'To date, %s %s has been deposited from this Ethereum address, so you can deposit up to %s %s more.',
-                  [
-                    formatNumber(deposited.toString()),
-                    asset.symbol,
-                    formatNumber(max.minus(deposited).toString()),
-                    asset.symbol,
-                  ]
-                )}
-              </p>
-            </>
-          }
-        >
-          <button type="button">{t('Remaining deposit allowance')}</button>
-        </Tooltip>
-      ),
+      label: t('Remaining'),
       rawValue: max.minus(deposited),
       value: (
         <CompactNumber
@@ -77,20 +58,7 @@ export const DepositLimits = ({
     },
     {
       key: 'ALLOWANCE',
-      label: (
-        <Tooltip
-          description={
-            <p>
-              {t(
-                'The deposit cap is set when you approve an asset for use with this app. To increase this cap, approve %s again and choose a higher cap. Check the documentation for your Ethereum wallet app for details.',
-                asset.symbol
-              )}
-            </p>
-          }
-        >
-          <button type="button">{t('Ethereum deposit cap')}</button>
-        </Tooltip>
-      ),
+      label: t('Approved'),
       rawValue: allowance,
       value: allowance ? (
         <CompactNumber number={allowance} decimals={asset.decimals} />

libs/deposits/src/lib/deposit-manager.tsx

@@ -70,8 +70,7 @@ export const DepositManager = ({
 
   const onAmountChange = useCallback(
     (amount: string) => {
-      persistentDeposit &&
-        savePersistentDeposit({ ...persistentDeposit, amount });
+      savePersistentDeposit({ ...persistentDeposit, amount });
     },
     [savePersistentDeposit, persistentDeposit]
   );

libs/deposits/src/lib/use-persistent-deposit.spec.ts

@@ -4,7 +4,7 @@ import { usePersistentDeposit } from './use-persistent-deposit';
 describe('usePersistenDeposit', () => {
   it('should return empty data', () => {
     const { result } = renderHook(() => usePersistentDeposit());
-    expect(result.current).toEqual([undefined, expect.any(Function)]);
+    expect(result.current).toEqual([{ assetId: '' }, expect.any(Function)]);
   });
   it('should return empty and properly saved data', async () => {
     const aId = 'test';

libs/deposits/src/lib/use-persistent-deposit.ts

@@ -32,14 +32,10 @@ const usePersistentDepositStore = create<{
 
 export const usePersistentDeposit = (
   assetId?: string
-): [PersistedDeposit | undefined, (entry: PersistedDeposit) => void] => {
+): [PersistedDeposit, (entry: PersistedDeposit) => void] => {
   const { deposits, lastVisited, saveValue } = usePersistentDepositStore();
   const discoveredData = useMemo(() => {
-    return assetId
-      ? deposits[assetId]
-        ? deposits[assetId]
-        : { assetId }
-      : lastVisited;
+    return deposits[assetId || ''] || lastVisited || { assetId: assetId || '' };
   }, [deposits, lastVisited, assetId]);
 
   return [discoveredData, saveValue];

libs/deposits/src/setup-tests.ts

@@ -1,4 +1 @@
 import '@testing-library/jest-dom';
-import ResizeObserver from 'resize-observer-polyfill';
-
-global.ResizeObserver = ResizeObserver;

libs/environment/src/components/node-switcher/row-data.spec.tsx

@@ -1,6 +1,6 @@
 import type { MockedResponse } from '@apollo/react-testing';
 import { MockedProvider } from '@apollo/react-testing';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import { RadioGroup } from '@vegaprotocol/ui-toolkit';
 import type {
   BlockTimeSubscription,
@@ -9,7 +9,6 @@ import type {
 import { BlockTimeDocument } from '../../utils/__generated__/Node';
 import { StatisticsDocument } from '../../utils/__generated__/Node';
 import type { RowDataProps } from './row-data';
-import { POLL_INTERVAL } from './row-data';
 import { BLOCK_THRESHOLD, RowData } from './row-data';
 import type { HeaderEntry } from '@vegaprotocol/apollo-client';
 import { useHeaderStore } from '@vegaprotocol/apollo-client';
@@ -26,7 +25,7 @@ const statsQueryMock: MockedResponse<StatisticsQuery> = {
   result: {
     data: {
       statistics: {
-        blockHeight: '1234', // the actual value used in the component is the value from the header store
+        blockHeight: '1234',
         vegaTime: new Date().toISOString(),
         chainId: 'test-chain-id',
       },
@@ -252,105 +251,4 @@ describe('RowData', () => {
 
     expect(mockOnBlockHeight).toHaveBeenCalledWith(blockHeight);
   });
-
-  it('should poll the query unless an errors is returned', async () => {
-    jest.useFakeTimers();
-    const createStatsQueryMock = (
-      blockHeight: string
-    ): MockedResponse<StatisticsQuery> => {
-      return {
-        request: {
-          query: StatisticsDocument,
-        },
-        result: {
-          data: {
-            statistics: {
-              blockHeight,
-              vegaTime: new Date().toISOString(),
-              chainId: 'test-chain-id',
-            },
-          },
-        },
-      };
-    };
-
-    const createFailedStatsQueryMock = (): MockedResponse<StatisticsQuery> => {
-      return {
-        request: {
-          query: StatisticsDocument,
-        },
-        result: {
-          data: undefined,
-        },
-        error: new Error('failed'),
-      };
-    };
-
-    mockHeaders(props.url);
-    const statsQueryMock1 = createStatsQueryMock('1234');
-    const statsQueryMock2 = createStatsQueryMock('1235');
-    const statsQueryMock3 = createFailedStatsQueryMock();
-    const statsQueryMock4 = createStatsQueryMock('1236');
-    render(
-      <MockedProvider
-        mocks={[
-          statsQueryMock1,
-          statsQueryMock2,
-          statsQueryMock3,
-          statsQueryMock4,
-          subMock,
-        ]}
-      >
-        <RadioGroup>
-          {/* Radio group required as radio is being render in isolation */}
-          <RowData {...props} />
-        </RadioGroup>
-      </MockedProvider>
-    );
-
-    expect(screen.getByTestId('block-height-cell')).toHaveTextContent(
-      'Checking'
-    );
-
-    // statsQueryMock1 should be rendered
-    await waitFor(() => {
-      const elem = screen.getByTestId('query-block-height');
-      expect(elem).toHaveAttribute('data-query-block-height', '1234');
-    });
-
-    await act(async () => {
-      jest.advanceTimersByTime(POLL_INTERVAL);
-    });
-
-    // statsQueryMock2 should be rendered
-    await waitFor(() => {
-      const elem = screen.getByTestId('query-block-height');
-      expect(elem).toHaveAttribute('data-query-block-height', '1235');
-    });
-
-    await act(async () => {
-      jest.advanceTimersByTime(POLL_INTERVAL);
-    });
-
-    // statsQueryMock3 should FAIL!
-    await waitFor(() => {
-      const elem = screen.getByTestId('query-block-height');
-      expect(elem).toHaveAttribute('data-query-block-height', 'failed');
-    });
-
-    // run the timer again, but statsQueryMock4's result should not be
-    // rendered even though its successful, because the poll
-    // should have been stopped
-    await act(async () => {
-      jest.advanceTimersByTime(POLL_INTERVAL);
-    });
-
-    // should still render the result of statsQueryMock3
-    await waitFor(() => {
-      const elem = screen.getByTestId('query-block-height');
-      expect(elem).toHaveAttribute('data-query-block-height', 'failed');
-    });
-
-    jest.useRealTimers();
-  });
 });

libs/environment/src/components/node-switcher/row-data.tsx

@@ -11,7 +11,7 @@ import {
 } from '../../utils/__generated__/Node';
 import { LayoutCell } from './layout-cell';
 
-export const POLL_INTERVAL = 1000;
+const POLL_INTERVAL = 1000;
 export const BLOCK_THRESHOLD = 3;
 
 export interface RowDataProps {
@@ -60,22 +60,18 @@ export const RowData = ({
 
   // handle polling
   useEffect(() => {
-    const handleStartPoll = () => {
-      if (error) return;
-      startPolling(POLL_INTERVAL);
-    };
+    const handleStartPoll = () => startPolling(POLL_INTERVAL);
     const handleStopPoll = () => stopPolling();
 
-    // start polling on mount, but only if there is no error
-    if (error) {
-      handleStopPoll();
-    } else {
-      handleStartPoll();
-    }
-
     window.addEventListener('blur', handleStopPoll);
     window.addEventListener('focus', handleStartPoll);
 
+    handleStartPoll();
+
+    if (error) {
+      stopPolling();
+    }
+
     return () => {
       window.removeEventListener('blur', handleStopPoll);
       window.removeEventListener('focus', handleStartPoll);
@@ -85,7 +81,6 @@ export const RowData = ({
   // measure response time
   useEffect(() => {
     if (!isValidUrl(url)) return;
-    if (typeof window.performance.getEntriesByName !== 'function') return; // protection for test environment
     // every time we get data measure response speed
     const requestUrl = new URL(url);
     const requests = window.performance.getEntriesByName(requestUrl.href);
@@ -182,14 +177,7 @@ export const RowData = ({
         hasError={getHasError()}
         dataTestId="block-height-cell"
       >
-        <span
-          data-testid="query-block-height"
-          data-query-block-height={
-            error ? 'failed' : data?.statistics.blockHeight
-          }
-        >
-          {getBlockDisplayValue(headers?.blockHeight, error)}
-        </span>
+        {getBlockDisplayValue(headers?.blockHeight, error)}
       </LayoutCell>
       <LayoutCell
         label={t('Subscription')}

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

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

libs/market-depth/src/lib/orderbook-manager.tsx

@@ -1,6 +1,8 @@
+import React from 'react';
 import throttle from 'lodash/throttle';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Orderbook } from './orderbook';
+import { addDecimal } from '@vegaprotocol/utils';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { marketDepthProvider } from './market-depth-provider';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
@@ -193,9 +195,10 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
         positionDecimalPlaces={market?.positionDecimalPlaces ?? 0}
         resolution={resolution}
         onResolutionChange={(resolution: number) => setResolution(resolution)}
-        onClick={(price: string) => {
+        onClick={(price?: string | number) => {
           if (price) {
-            updateOrder(marketId, { price });
+            const priceValue = addDecimal(price, market?.decimalPlaces ?? 0);
+            updateOrder(marketId, { price: priceValue });
           }
         }}
       />

libs/market-depth/src/lib/orderbook-row.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { addDecimal, addDecimalsFixedFormatNumber } from '@vegaprotocol/utils';
+import { addDecimalsFixedFormatNumber } from '@vegaprotocol/utils';
 import { PriceCell, VolCell, CumulativeVol } from '@vegaprotocol/datagrid';
 
 interface OrderbookRowProps {
@@ -15,7 +15,7 @@ interface OrderbookRowProps {
   price: string;
   relativeAsk?: number;
   relativeBid?: number;
-  onClick?: (price: string) => void;
+  onClick?: (price?: string | number) => void;
 }
 
 export const OrderbookRow = React.memo(
@@ -59,7 +59,7 @@ export const OrderbookRow = React.memo(
         <PriceCell
           testId={`price-${price}`}
           value={BigInt(price)}
-          onClick={() => onClick && onClick(addDecimal(price, decimalPlaces))}
+          onClick={() => onClick && onClick(price)}
           valueFormatted={addDecimalsFixedFormatNumber(price, decimalPlaces)}
         />
         <CumulativeVol

libs/market-depth/src/lib/orderbook.spec.tsx

@@ -20,7 +20,7 @@ describe('Orderbook', () => {
   const decimalPlaces = 3;
   it('should scroll to mid price on init', async () => {
     window.innerHeight = 11 * rowHeight;
-    render(
+    const result = render(
       <Orderbook
         decimalPlaces={decimalPlaces}
         positionDecimalPlaces={0}
@@ -30,7 +30,7 @@ describe('Orderbook', () => {
       />
     );
     await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
   });
 
   it('should keep mid price row in the middle', async () => {
@@ -45,7 +45,7 @@ describe('Orderbook', () => {
       />
     );
     await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
     result.rerender(
       <Orderbook
         decimalPlaces={decimalPlaces}
@@ -121,7 +121,7 @@ describe('Orderbook', () => {
       />
     );
     await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 0.01);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 0.01);
   });
 
   it('should get back to mid price on click', async () => {
@@ -143,7 +143,7 @@ describe('Orderbook', () => {
     expect(result.getByTestId('scroll').scrollTop).toBe(1);
     const scrollToMidPriceButton = result.getByTestId('scroll-to-midprice');
     fireEvent.click(scrollToMidPriceButton);
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 1);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 1);
   });
 
   it('should get back to mid price on resolution change', async () => {
@@ -158,12 +158,12 @@ describe('Orderbook', () => {
       />
     );
     await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    const scrollElement = screen.getByTestId('scroll');
+    const scrollElement = result.getByTestId('scroll');
     expect(scrollElement.scrollTop).toBe(91 * rowHeight);
     scrollElement.scrollTop = 1;
     fireEvent.scroll(scrollElement);
-    expect(screen.getByTestId('scroll').scrollTop).toBe(1);
-    const resolutionSelect = screen.getByTestId(
+    expect(result.getByTestId('scroll').scrollTop).toBe(1);
+    const resolutionSelect = result.getByTestId(
       'resolution'
     ) as HTMLSelectElement;
     fireEvent.change(resolutionSelect, { target: { value: '10' } });
@@ -181,47 +181,6 @@ describe('Orderbook', () => {
         onResolutionChange={onResolutionChange}
       />
     );
-    expect(screen.getByTestId('scroll').scrollTop).toBe(6 * rowHeight);
-  });
-
-  it('should format correctly the numbers on resolution change', async () => {
-    const onClickSpy = jest.fn();
-    const result = render(
-      <Orderbook
-        decimalPlaces={decimalPlaces}
-        positionDecimalPlaces={0}
-        onClick={onClickSpy}
-        fillGaps
-        {...generateMockData(params)}
-        onResolutionChange={onResolutionChange}
-      />
-    );
-    expect(
-      await screen.findByTestId(`bid-vol-${params.midPrice}`)
-    ).toBeInTheDocument();
-    // Before resolution change the price is 122.934
-    await fireEvent.click(await screen.getByTestId('price-122934'));
-    expect(onClickSpy).toBeCalledWith('122.934');
-    const resolutionSelect = screen.getByTestId(
-      'resolution'
-    ) as HTMLSelectElement;
-    await fireEvent.change(resolutionSelect, { target: { value: '10' } });
-    await result.rerender(
-      <Orderbook
-        decimalPlaces={decimalPlaces}
-        positionDecimalPlaces={0}
-        onClick={onClickSpy}
-        fillGaps
-        {...generateMockData({
-          ...params,
-          resolution: 10,
-        })}
-        onResolutionChange={onResolutionChange}
-      />
-    );
-    await fireEvent.click(await screen.getByTestId('price-12299'));
-    // After resolution change the price is 122.99
-    expect(onResolutionChange.mock.calls[0][0]).toBe(10);
-    expect(onClickSpy).toBeCalledWith('122.99');
+    expect(result.getByTestId('scroll').scrollTop).toBe(6 * rowHeight);
   });
 });

libs/market-depth/src/lib/orderbook.tsx

@@ -21,7 +21,7 @@ interface OrderbookProps extends OrderbookData {
   positionDecimalPlaces: number;
   resolution: number;
   onResolutionChange: (resolution: number) => void;
-  onClick?: (price: string) => void;
+  onClick?: (price?: string | number) => void;
   fillGaps?: boolean;
 }
 

libs/market-info/src/components/market-info/info-market.tsx

@@ -169,7 +169,7 @@ export const Info = ({ market, onSelect }: InfoProps) => {
         <LiquidityInfoPanel market={market}>
           <Link
             to={`/liquidity/${market.id}`}
-            onClick={(ev) => onSelect?.(market.id, ev.metaKey || ev.ctrlKey)}
+            onClick={(ev) => onSelect?.(market.id, ev.metaKey)}
             data-testid="view-liquidity-link"
           >
             <UILink>{t('View liquidity provision table')}</UILink>

libs/market-list/src/lib/components/markets-container/markets-container.tsx

@@ -47,8 +47,7 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
           }
           onSelect(
             (data as MarketMaybeWithData).id,
-            (event as unknown as MouseEvent)?.metaKey ||
-              (event as unknown as MouseEvent)?.ctrlKey
+            (event as unknown as MouseEvent)?.metaKey
           );
         }}
         onMarketClick={onSelect}

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

@@ -20,7 +20,6 @@ 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;
@@ -82,31 +81,8 @@ const getData = (
 ): Edge<OrderFieldsFragment>[] =>
   responseData?.party?.ordersConnection?.edges || [];
 
-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 getDelta = (subscriptionData: OrdersUpdateSubscription) =>
+  subscriptionData.orders || [];
 
 const getPageInfo = (responseData: OrdersQuery): PageInfo | null =>
   responseData.party?.ordersConnection?.pageInfo || null;
@@ -174,7 +150,7 @@ export const update = (
   });
 };
 
-const ordersProvider = makeDataProvider<
+export const ordersProvider = makeDataProvider<
   OrdersQuery,
   ReturnType<typeof getData>,
   OrdersUpdateSubscription,
@@ -189,36 +165,11 @@ const ordersProvider = makeDataProvider<
   pagination: {
     getPageInfo,
     append,
-    first: 1000,
+    first: 100,
   },
   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[],
@@ -242,20 +193,63 @@ 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 }
->([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;
-});
+>(
+  [
+    (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]
+);

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

@@ -6,12 +6,10 @@ 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();
@@ -25,7 +23,6 @@ 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 { useHasAmendableOrder } from '../../order-hooks/use-has-amendable-order';
+import { useHasActiveOrder } from '../../order-hooks/use-has-active-order';
 import type { Filter, Sort } from './use-order-list-data';
 import { useBottomPlaceholder } from '@vegaprotocol/react-helpers';
 import { OrderStatus } from '@vegaprotocol/types';
@@ -16,7 +16,6 @@ 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';
@@ -25,23 +24,31 @@ 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 }: { 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 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 initialFilter: Filter = {
   status: {
@@ -53,7 +60,6 @@ export const OrderListManager = ({
   partyId,
   marketId,
   onMarketClick,
-  onOrderTypeClick,
   isReadOnly,
   enforceBottomPlaceholder,
 }: OrderListManagerProps) => {
@@ -62,10 +68,9 @@ 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 hasAmendableOrder = useHasAmendableOrder(marketId);
+  const hasActiveOrder = useHasActiveOrder(marketId);
 
   const { data, error, loading, reload } = useOrderListData({
     partyId,
@@ -81,16 +86,12 @@ export const OrderListManager = ({
     ...bottomPlaceholderProps
   } = useBottomPlaceholder<Order>({
     gridRef,
-    disabled: !enforceBottomPlaceholder && !isReadOnly && !hasAmendableOrder,
+    disabled: !enforceBottomPlaceholder && !isReadOnly && !hasActiveOrder,
   });
 
   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 {
@@ -141,13 +142,16 @@ export const OrderListManager = ({
     setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
   }, [data]);
 
-  const cancelAll = useCallback(() => {
-    create({
-      orderCancellation: {
-        marketId,
-      },
-    });
-  }, [create, marketId]);
+  const cancelAll = useCallback(
+    (marketId?: string) => {
+      create({
+        orderCancellation: {
+          marketId,
+        },
+      });
+    },
+    [create]
+  );
   const extractedData =
     data && !loading
       ? data
@@ -167,7 +171,6 @@ export const OrderListManager = ({
           cancel={cancel}
           setEditOrder={setEditOrder}
           onMarketClick={onMarketClick}
-          onOrderTypeClick={onOrderTypeClick}
           isReadOnly={isReadOnly}
           blockLoadDebounceMillis={100}
           suppressLoadingOverlay
@@ -185,8 +188,8 @@ export const OrderListManager = ({
           />
         </div>
       </div>
-      {!isReadOnly && hasAmendableOrder && (
-        <CancelAllOrdersButton onClick={cancelAll} />
+      {!isReadOnly && (
+        <CancelAllOrdersButton onClick={cancelAll} marketId={marketId} />
       )}
       {editOrder && (
         <OrderEditDialog

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

@@ -71,27 +71,17 @@ 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,7 +16,6 @@ import {
   negativeClassNames,
   positiveClassNames,
   MarketNameCell,
-  OrderTypeCell,
 } from '@vegaprotocol/datagrid';
 import type {
   TypedDataAgGrid,
@@ -32,16 +31,12 @@ 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, onOrderTypeClick, ...props },
-      ref
-    ) => {
+    ({ cancel, setEditOrder, onMarketClick, ...props }, ref) => {
       return (
         <AgGrid
           ref={ref}
@@ -56,7 +51,7 @@ export const OrderListTable = memo(
             height: '100%',
           }}
           getRowId={({ data }) => data.id}
-          components={{ MarketNameCell, OrderTypeCell }}
+          components={{ MarketNameCell }}
           {...props}
         >
           <AgGridColumn
@@ -108,9 +103,17 @@ export const OrderListTable = memo(
             filterParams={{
               set: Schema.OrderTypeMapping,
             }}
-            cellRenderer="OrderTypeCell"
-            cellRendererParams={{
-              onClick: onOrderTypeClick,
+            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];
             }}
             minWidth={80}
           />

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

@@ -1,4 +1,5 @@
 export * from './__generated__/OrdersSubscription';
-export * from './use-has-amendable-order';
+export * from './use-has-active-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-active-order.ts

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