chore: use shorthand version for merging object

.github/workflows/publish-dist.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Log in to the Container registry (docker hub)
         uses: docker/login-action@v2
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
         with:
           # registry: registry.hub.docker.com
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -173,7 +173,7 @@ jobs:
         uses: docker/build-push-action@v3
         continue-on-error: true
         id: dockerhub-push
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -183,7 +183,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:mainnet
 
       - name: Publish dist as docker image (ghcr - retry)
         uses: docker/build-push-action@v3
@@ -210,13 +210,13 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:mainnet
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master
         # s3 releases are not happening for trading on mainnet - it's IPFS
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
+        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !endsWith(github.ref, 'main') ) ) }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -235,34 +235,19 @@ jobs:
 
       - name: Trigger fleek deployment
         # release to ipfs happens only on mainnet (represented by main branch) for trading
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
         run: |
-          if echo ${{ github.ref }} | grep -q main; then
-            # display info about app
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-              https://api.fleek.co/graphql
+          # display info about app
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
+            https://api.fleek.co/graphql
 
-            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-              https://api.fleek.co/graphql
-
-          elif echo ${{ github.ref }} | grep -q release/testnet; then
-            # display info about app
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "query{getSiteById(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id latestDeploy{id status}}}"}' \
-              https://api.fleek.co/graphql
-
-            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "mutation{triggerDeploy(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id status}}"}' \
-              https://api.fleek.co/graphql
-          fi
+          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+            https://api.fleek.co/graphql
 
       - name: Check out ipfs-redirect
         if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
@@ -310,50 +295,3 @@ jobs:
             sleep 5
             gh pr merge "${pr_url}" --delete-branch --squash --admin
           )
-
-      - name: Update console.fairground.wtf DNS to redirect to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'testnet') }}
-        run: |
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-
-          # Generate console URL
-
-          new_console_url_type=ipfs
-          # new_console_url_type=ipns
-
-          new_console_url_domain=cf-ipfs.com
-          # new_console_url_domain=dweb.link
-
-          new_console_url="http://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
-          echo "new_console_url=${new_console_url}"
-
-          # Update record in DNSimple
-          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-          dnsimple_account_id=84895
-          dnsimple_zone_name=fairground.wtf
-          dnsimple_record_id=45300615
-          # see: https://dnsimple.com/a/84895/domains/fairground.wtf/records/45300615/edit
-          curl --fail -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-                -H 'Accept: application/json' \
-                -H 'Content-Type: application/json' \
-                -X PATCH \
-                -d "{
-                      \"content\": \"${new_console_url}\"
-                }" \
-                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
-
-          # trading.fairground.wtf
-          dnsimple_record_id=45302531
-          curl --fail -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-                -H 'Accept: application/json' \
-                -H 'Content-Type: application/json' \
-                -X PATCH \
-                -d "{
-                      \"content\": \"${new_console_url}\"
-                }" \
-                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}

apps/explorer/src/app/components/markets/markets-table.tsx

@@ -77,7 +77,7 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
         hide={window.innerWidth <= BREAKPOINT_MD}
         valueGetter={({
           data,
-        }: VegaValueGetterParams<MarketFieldsFragment>) => {
+        }: VegaValueGetterParams<MarketFieldsFragment, 'state'>) => {
           return data?.state ? MarketStateMapping[data?.state] : '-';
         }}
       />

apps/governance-e2e/cypress.config.js

@@ -49,7 +49,7 @@ module.exports = defineConfig({
     vegaTokenContractAddress: '0xF41bD86d462D36b997C0bbb4D97a0a3382f205B7',
     vegaTokenAddress: '0x67175Da1D5e966e40D11c4B2519392B2058373de',
     txTimeout: { timeout: 70000 },
-    epochTimeout: { timeout: 10000 },
+    epochTimeout: { timeout: 6000 },
     blockConfirmations: 3,
     grepTags: '@regression @smoke @slow',
     grepFilterSpecs: true,

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

@@ -205,33 +205,29 @@ context(
     });
 
     // 3003-PMAN-001
-    it(
-      'Able to submit valid new market proposal',
-      { tags: '@smoke' },
-      function () {
-        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-        cy.get(newProposalTitle).type('Test new market proposal');
-        cy.get(newProposalDescription).type('E2E test for proposals');
-        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
-          const newMarketPayload = JSON.stringify(newMarketProposal);
-          cy.get(newProposalTerms).type(newMarketPayload, {
-            parseSpecialCharSequences: false,
-            delay: 2,
+    it('Able to submit valid new market proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+      cy.get(newProposalTitle).type('Test new market proposal');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
+        const newMarketPayload = JSON.stringify(newMarketProposal);
+        cy.get(newProposalTerms).type(newMarketPayload, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-new-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
           });
         });
-        cy.get(proposalDownloadBtn)
-          .should('be.visible')
-          .click()
-          .then(() => {
-            cy.wrap(
-              getDownloadedProposalJsonPath('vega-new-market-proposal-')
-            ).then((filePath) => {
-              goToMakeNewProposal(governanceProposalType.RAW);
-              submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
-            });
-          });
-      }
-    );
+    });
 
     it('Unable to submit new market proposal with missing/invalid fields', function () {
       const errorMsg =

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

@@ -54,7 +54,7 @@ context(
   'Staking Tab - with eth and vega wallets connected',
   { tags: '@slow' },
   function () {
-    // 1002-STKE-002, 1002-STKE-032
+    // 2001-STKE-002, 2001-STKE-032
     before('visit staking tab and connect vega wallet', function () {
       cy.visit('/');
       ethereumWalletConnect();
@@ -63,7 +63,7 @@ context(
       vegaWalletSetSpecifiedApprovalAmount('1000');
     });
 
-    describe('Eth wallet - contains VEGA tokens', function () {
+    describe.skip('Eth wallet - contains VEGA tokens', function () {
       beforeEach(
         'teardown wallet & drill into a specific validator',
         function () {
@@ -77,41 +77,25 @@ context(
         }
       );
 
-      // 1002-STKE-035 1002-STKE-036
-      it('Unable to stake against a validator with less than minimum and more than associated amount', function () {
-        ensureSpecifiedUnstakedTokensAreAssociated('3');
-        verifyUnstakedBalance(3.0);
-        verifyEthWalletTotalAssociatedBalance('3.0');
-        verifyEthWalletAssociatedBalance('3.0');
-        cy.get('button').contains('Select a validator to nominate').click();
-        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeAddStakeRadioButton, epochTimeout).click({
-          force: true,
-        });
-        cy.getByTestId(stakeTokenAmountInputBox).type('0.001');
-        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
-        cy.getByTestId(stakeTokenAmountInputBox).clear().type('4');
-        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
-      });
       it('Able to stake against a validator - using vega from wallet', function () {
         ensureSpecifiedUnstakedTokensAreAssociated('3');
         verifyUnstakedBalance(3.0);
         verifyEthWalletTotalAssociatedBalance('3.0');
         verifyEthWalletAssociatedBalance('3.0');
         cy.get('button').contains('Select a validator to nominate').click();
-        // 1002-STKE-031
+        // 2001-STKE-031
         clickOnValidatorFromList(0);
-        // 1002-STKE-033, 1002-STKE-034, 1002-STKE-037
+        // 2001-STKE-033, 2001-STKE-034, 2001-STKE-037
         stakingValidatorPageAddStake('2');
         verifyUnstakedBalance(1.0);
-        // 1002-STKE-039
+        // 2001-STKE-039
         verifyStakedBalance(2.0);
-        verifyNextEpochValue(2.0); // 1002-STKE-016 1002-STKE-038
-        verifyThisEpochValue(2.0); // 1002-STKE-013
+        verifyNextEpochValue(2.0); // 2001-STKE-016 2001-STKE-038
+        verifyThisEpochValue(2.0); // 2001-STKE-013
         closeStakingDialog();
         navigateTo(navigation.validators);
 
-        // 2002-SINC-007 1002-STKE-015 1002-STKE-017 1002-STKE-052
+        // 2002-SINC-007
         validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
       });
 
@@ -234,7 +218,7 @@ context(
           });
       });
 
-      // 1002-STKE-041 1002-STKE-053
+      // 2001-STKE-041
       it(
         'Able to remove part of a stake against a validator',
         { tags: '@smoke' },
@@ -247,11 +231,11 @@ context(
           verifyUnstakedBalance(1.0);
           closeStakingDialog();
           navigateTo(navigation.validators);
-          // 1002-STKE-040
+          // 2001-STKE-040
           clickOnValidatorFromList(0);
-          // 1002-STKE-044, 1002-STKE-048
+          // 2001-STKE-044, 2001-STKE-048
           stakingValidatorPageRemoveStake('1');
-          // 1002-STKE-049
+          // 2001-STKE-049
           verifyNextEpochValue(2.0);
           verifyUnstakedBalance(2.0);
           verifyStakedBalance(2.0);
@@ -271,7 +255,7 @@ context(
         }
       );
 
-      // 1002-STKE-045
+      // 2001-STKE-045
       it('Able to remove a full stake against a validator', function () {
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
@@ -319,7 +303,6 @@ context(
           .and('be.visible');
       });
 
-      // 1002-STKE-046 1002-STKE-047
       it('Unable to remove a stake greater than staked amount next epoch for a validator', function () {
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
@@ -422,7 +405,7 @@ context(
       });
 
       it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -436,7 +419,7 @@ context(
       });
 
       it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('3', { type: 'contract' });
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -450,7 +433,7 @@ context(
       });
 
       it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('3', { type: 'wallet' });
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -464,7 +447,7 @@ context(
       });
 
       it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('6');
         verifyUnstakedBalance(6.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -517,7 +500,7 @@ context(
       }
 
       function verifyThisEpochValue(amount: number) {
-        cy.getByTestId('stake-this-epoch', epochTimeout) // 1002-STKE-013
+        cy.getByTestId('stake-this-epoch', epochTimeout) // 2001-STKE-013
           .contains(amount, epochTimeout)
           .should('be.visible');
       }

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

@@ -64,38 +64,31 @@ context(
         }
       );
 
-      it(
-        'Able to associate tokens - from wallet',
-        { tags: '@smoke' },
-        function () {
-          //1004-ASSO-003
-          //1004-ASSO-005
-          //1004-ASSO-009
-          //1004-ASSO-030
-          //1004-ASSO-012
-          //1004-ASSO-013
-          //1004-ASSO-014
-          //1004-ASSO-015
-          //1004-ASSO-030
-          //0005-ETXN-006
-          //0005-ETXN-003
-          //0005-ETXN-005
-          stakingPageAssociateTokens('2', { skipConfirmation: true });
-          validateWalletCurrency('Associated', '0.00');
-          validateWalletCurrency('Pending association', '2.00');
-          validateWalletCurrency('Total associated after pending', '2.00');
-          // 0005-ETXN-002
-          verifyEthWalletAssociatedBalance('2.0');
-          verifyEthWalletTotalAssociatedBalance('2.0');
-          cy.get(vegaWallet).within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
-          cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
-        }
-      );
+      it('Able to associate tokens - from wallet', function () {
+        //1004-ASSO-003
+        //1004-ASSO-005
+        //1004-ASSO-009
+        //1004-ASSO-030
+        //1004-ASSO-012
+        //1004-ASSO-013
+        //1004-ASSO-014
+        //1004-ASSO-015
+        //1004-ASSO-030
+        //0005-ETXN-006
+        //0005-ETXN-003
+        //0005-ETXN-005
+        stakingPageAssociateTokens('2', { skipConfirmation: true });
+        validateWalletCurrency('Associated', '0.00');
+        validateWalletCurrency('Pending association', '2.00');
+        validateWalletCurrency('Total associated after pending', '2.00');
+        // 0005-ETXN-002
+        verifyEthWalletAssociatedBalance('2.0');
+        verifyEthWalletTotalAssociatedBalance('2.0');
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
+        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
+      });
 
       it('Able to disassociate all associated tokens - manually', function () {
         // 1004-ASSO-025

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

@@ -55,10 +55,6 @@ context(
       navigateTo(navigation.withdraw);
       cy.connectVegaWallet();
       ethereumWalletConnect();
-      cy.getByTestId('currency-title', txTimeout).should(
-        'contain.text',
-        usdtName
-      );
     });
 
     it('Able to open withdrawal form with vega wallet connected', function () {
@@ -96,75 +92,71 @@ context(
       });
     });
 
-    it(
-      'Able to withdraw asset: -eth wallet connected -withdraw funds button',
-      { tags: '@smoke' },
-      function () {
-        // fill in withdrawal form
-        cy.getByTestId(withdraw).should('be.visible').click();
-        cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-          cy.getByTestId('select-asset').click();
-          cy.get('select')
-            .select(usdtSelectValue, { force: true })
-            .should('have.value', usdtSelectValue);
-          cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-          cy.getByTestId(withdrawalThreshold).should(
-            'have.text',
-            '100,000.00000T'
+    it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
+      // fill in withdrawal form
+      cy.getByTestId(withdraw).should('be.visible').click();
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+        cy.getByTestId('select-asset').click();
+        cy.get('select')
+          .select(usdtSelectValue, { force: true })
+          .should('have.value', usdtSelectValue);
+        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+        cy.getByTestId(withdrawalThreshold).should(
+          'have.text',
+          '100,000.00000T'
+        );
+        cy.getByTestId(delayTime).should('have.text', 'None');
+        cy.getByTestId(amountInput).click().type('120');
+        cy.getByTestId(submitWithdrawalButton).click();
+      });
+      // assert withdrawal request
+      cy.getByTestId(toast)
+        .first(txTimeout)
+        .should('contain.text', 'Funds unlocked')
+        .within(() => {
+          cy.getByTestId('external-link').should('exist');
+          cy.getByTestId(toastPanel).should(
+            'contain.text',
+            'Withdraw 120.00 tUSDC'
           );
-          cy.getByTestId(delayTime).should('have.text', 'None');
-          cy.getByTestId(amountInput).click().type('120');
-          cy.getByTestId(submitWithdrawalButton).click();
+          cy.getByTestId(toastCompleteWithdrawal).click();
+          cy.getByTestId(toastClose).click();
         });
-        // assert withdrawal request
-        cy.getByTestId(toast)
-          .first(txTimeout)
-          .should('contain.text', 'Funds unlocked')
-          .within(() => {
-            cy.getByTestId('external-link').should('exist');
-            cy.getByTestId(toastPanel).should(
-              'contain.text',
-              'Withdraw 120.00 tUSDC'
-            );
-            cy.getByTestId(toastCompleteWithdrawal).click();
-            cy.getByTestId(toastClose).click();
-          });
-        // withdrawal complete
-        cy.getByTestId(toast)
-          .first(txTimeout)
-          .should('contain.text', 'The withdrawal has been approved.')
-          .within(() => {
-            cy.getByTestId(toastPanel).should(
-              'contain.text',
-              'Withdraw 120.00 tUSDC'
-            );
-          });
-        cy.getByTestId(toast)
-          .last(txTimeout)
-          .should('contain.text', 'Transaction confirmed')
-          .within(() => {
-            cy.getByTestId('external-link').should('exist');
-          });
-        // withdrawal history for complete withdrawal displayed
-        cy.get(tableWithdrawnStatus)
-          .eq(1, txTimeout)
-          .should('have.text', 'Completed')
-          .parent()
-          .within(() => {
-            cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-            cy.get(tableAmount).should('have.text', '120.00');
-            cy.get(tableReceiverAddress)
-              .find('a')
-              .should('have.attr', 'href')
-              .and('contain', 'https://sepolia.etherscan.io/address/');
-            cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
-            cy.get(tableTxHash)
-              .find('a')
-              .should('have.attr', 'href')
-              .and('contain', 'https://sepolia.etherscan.io/tx/');
-          });
-      }
-    );
+      // withdrawal complete
+      cy.getByTestId(toast)
+        .first(txTimeout)
+        .should('contain.text', 'The withdrawal has been approved.')
+        .within(() => {
+          cy.getByTestId(toastPanel).should(
+            'contain.text',
+            'Withdraw 120.00 tUSDC'
+          );
+        });
+      cy.getByTestId(toast)
+        .last(txTimeout)
+        .should('contain.text', 'Transaction confirmed')
+        .within(() => {
+          cy.getByTestId('external-link').should('exist');
+        });
+      // withdrawal history for complete withdrawal displayed
+      cy.get(tableWithdrawnStatus)
+        .eq(1, txTimeout)
+        .should('have.text', 'Completed')
+        .parent()
+        .within(() => {
+          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+          cy.get(tableAmount).should('have.text', '120.00');
+          cy.get(tableReceiverAddress)
+            .find('a')
+            .should('have.attr', 'href')
+            .and('contain', 'https://sepolia.etherscan.io/address/');
+          cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
+          cy.get(tableTxHash)
+            .find('a')
+            .should('have.attr', 'href')
+            .and('contain', 'https://sepolia.etherscan.io/tx/');
+        });
+    });
 
     it('Able to withdraw asset: -eth wallet not connected', function () {
       const ethWalletAddress = Cypress.env('ethWalletPublicKey');

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

@@ -5,10 +5,7 @@ import {
   verifyPageHeader,
   verifyTabHighlighted,
 } from '../../support/common.functions';
-import {
-  clickOnValidatorFromList,
-  waitForBeginningOfEpoch,
-} from '../../support/staking.functions';
+import { clickOnValidatorFromList } from '../../support/staking.functions';
 
 const guideLink = '[data-testid="staking-guide-link"]';
 const validatorTitle = '[data-testid="validator-node-title"]';
@@ -40,213 +37,206 @@ context('Validators Page - verify elements on page', function () {
   });
 
   describe('with wallets disconnected', { tags: '@smoke' }, function () {
-    it('Should have validators tab highlighted', function () {
-      verifyTabHighlighted(navigation.validators);
+    describe('description section', function () {
+      it('Should have validators tab highlighted', function () {
+        verifyTabHighlighted(navigation.validators);
+      });
+
+      it('Should have validators ON VEGA header visible', function () {
+        verifyPageHeader('Validators');
+      });
+
+      it('Should have Staking Guide link visible', function () {
+        // 2001-STKE-003
+        cy.get(guideLink)
+          .should('be.visible')
+          .and('have.text', 'Read more about staking on Vega')
+          .and(
+            'have.attr',
+            'href',
+            'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
+          );
+      });
     });
-
-    it('Should have validators ON VEGA header visible', function () {
-      verifyPageHeader('Validators');
-    });
-
-    it('Should have Staking Guide link visible', function () {
-      // 1002-STKE-003
-      cy.get(guideLink)
-        .should('be.visible')
-        .and('have.text', 'Read more about staking on Vega')
-        .and(
-          'have.attr',
-          'href',
-          'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
-        );
-    });
-
-    // 1002-STKE-032
-    it('Should have button to connect vega wallet in validator page', function () {
-      clickOnValidatorFromList(0);
-      cy.getByTestId('connect-to-vega-wallet-btn').should('be.visible');
-      cy.visit('/validators');
-    });
-  });
-  // 1002-STKE-020 1002-STKE-021 1002-STKE-022 1002-STKE-023 1002-STKE-024
-  describe(
-    'Should be able to see validator list from the staking page',
-    { tags: '@regression' },
-    function () {
-      // 1002-STKE-050
-      it('Should be able to see validator names', function () {
-        cy.get('[col-id="validator"] > div > span')
-          .should('have.length.at.least', 1)
-          .each(($name) => {
-            cy.wrap($name).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake', function () {
-        cy.getByTestId('total-stake')
-          .should('have.length.at.least', 1)
-          .each(($stake) => {
-            cy.wrap($stake).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('total-stake').first().realHover();
-
-        cy.get(stakedByOperatorToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by operator: 3,000.00');
-        cy.get(stakedByDelegatesToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by delegates: 0.00');
-        cy.get(totalStakedToolTip)
-          .invoke('text')
-          .should('contain', 'Total stake: 3,000.00');
-      });
-
-      it('Should be able to see validator normalised voting power', function () {
-        cy.getByTestId('normalised-voting-power')
-          .should('have.length.at.least', 1)
-          .each(($vPower) => {
-            cy.wrap($vPower).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator normalised voting power tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('normalised-voting-power').first().realHover();
-
-        cy.get(unnormalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Unnormalised voting power: 20.00%');
-        cy.get(normalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Normalised voting power: 50.00%');
-      });
-
-      // 2002-SINC-018
-      it('Should be able to see validator total penalties', function () {
-        cy.getByTestId('total-penalty')
-          .should('have.length.at.least', 1)
-          .each(($penalties) => {
-            cy.wrap($penalties).should('contain.text', '0%');
-          });
-      });
-
-      it('Should be able to see validator penalties tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('total-penalty').realHover();
-
-        cy.get(performancePenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Performance penalty: 0.00%');
-        cy.get(overstakedPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
-        cy.get(totalPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Total penalties: 60.00%');
-      });
-
-      it('Should be able to see validator pending stake', function () {
-        cy.getByTestId('total-pending-stake')
-          .should('have.length.at.least', 1)
-          .each(($pendingStake) => {
-            cy.wrap($pendingStake).should('contain.text', '0.00');
-          });
-      });
-    }
-  );
-
-  // 1002-STKE-050
-  describe(
-    'Should be able to see static information about a validator',
-    { tags: '@smoke' },
-    function () {
-      before('connect wallets and click on validator', function () {
-        cy.connectVegaWallet();
-        clickOnValidatorFromList(0);
-      });
-
-      // 1002-STKE-006
-      it('Should be able to see validator name', function () {
-        cy.get(validatorTitle).should('not.be.empty');
-      });
-
-      // 1002-STKE-007
-      it('Should be able to see validator id', function () {
-        cy.get(validatorId).should('not.be.empty');
-      });
-
-      // 1002-STKE-008
-      it('Should be able to see validator public key', function () {
-        cy.get(validatorPubKey).should('not.be.empty');
-      });
-
-      // 1002-STKE-010
-      it('Should be able to see Ethereum address', function () {
-        cy.get(ethAddressLink).should('not.be.empty').and('have.attr', 'href');
-      });
-      // TODO validators missing url for more information about them 1002-STKE-09
-
-      it('Should be able to see validator status', function () {
-        cy.get(validatorStatus).should('have.text', 'Consensus');
-      });
-
-      // 1002-STKE-012
-      it('Should be able to see total stake', function () {
-        cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see pending stake', function () {
-        cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by operator', function () {
-        cy.get(stakedByOperator)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by delegates', function () {
-        cy.get(stakedByDelegates)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      // 1002-STKE-051
-      it('Should be able to see stake share in percentage', function () {
-        cy.get(stakeShare)
-          .invoke('text')
-          .then(($stakePercentage) => {
-            // The pattern must start at a word boundary (\b).
-            // The pattern cannot be immediately preceded by a dot ((?<!\.)).
-            // The pattern can be one of the following:
-            // A percentage value of zero (0%), or
-            // A non-zero percentage value that can be:
-            // A single digit (\d) between 0 and 9, or
-            // A two-digit number between 0 and 99 (\d{1,2}), or
-            // The number 100.
-            // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
-            // The pattern must end with a percentage sign (%).
-
-            cy.wrap($stakePercentage).should(
-              'match',
-              /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
-            );
-          });
-      });
-
-      // 1002-STKE-011 2002-SINC-001 2002-SINC-002
-      it('Should be able to see epoch information', function () {
-        const epochTitle = 'h3';
-        const nextEpochInfo = 'p';
-
-        cy.get(epochCountDown).within(() => {
-          cy.get(epochTitle).should('not.be.empty');
-          cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+    describe(
+      'Should be able to see validator list from the staking page',
+      { tags: '@regression' },
+      function () {
+        // 2001-STKE-050
+        it('Should be able to see validator names', function () {
+          cy.get('[col-id="validator"] > div > span')
+            .should('have.length.at.least', 1)
+            .each(($name) => {
+              cy.wrap($name).should('not.be.empty');
+            });
         });
-      });
-    }
-  );
+
+        it('Should be able to see validator stake', function () {
+          cy.getByTestId('total-stake')
+            .should('have.length.at.least', 1)
+            .each(($stake) => {
+              cy.wrap($stake).should('not.be.empty');
+            });
+        });
+
+        it('Should be able to see validator stake tooltip', function () {
+          cy.getByTestId('total-stake').first().realHover();
+
+          cy.get(stakedByOperatorToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by operator: 3,000.00');
+          cy.get(stakedByDelegatesToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by delegates: 0.00');
+          cy.get(totalStakedToolTip)
+            .invoke('text')
+            .should('contain', 'Total stake: 3,000.00');
+        });
+
+        it('Should be able to see validator normalised voting power', function () {
+          cy.getByTestId('normalised-voting-power')
+            .should('have.length.at.least', 1)
+            .each(($vPower) => {
+              cy.wrap($vPower).should('not.be.empty');
+            });
+        });
+
+        it('Should be able to see validator normalised voting power tooltip', function () {
+          cy.getByTestId('normalised-voting-power').first().realHover();
+
+          cy.get(unnormalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Unnormalised voting power: 20.00%');
+          cy.get(normalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Normalised voting power: 50.00%');
+        });
+
+        // 2002-SINC-018
+        it('Should be able to see validator total penalties', function () {
+          cy.getByTestId('total-penalty')
+            .should('have.length.at.least', 1)
+            .each(($penalties) => {
+              cy.wrap($penalties).should('contain.text', '0%');
+            });
+        });
+
+        it('Should be able to see validator penalties tooltip', function () {
+          cy.getByTestId('total-penalty').realHover();
+
+          cy.get(performancePenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Performance penalty: 0.00%');
+          cy.get(overstakedPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
+          cy.get(totalPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Total penalties: 60.00%');
+        });
+
+        it('Should be able to see validator pending stake', function () {
+          cy.getByTestId('total-pending-stake')
+            .should('have.length.at.least', 1)
+            .each(($pendingStake) => {
+              cy.wrap($pendingStake).should('contain.text', '0.00');
+            });
+        });
+      }
+    );
+
+    // 2001-STKE-050
+    describe(
+      'Should be able to see static information about a validator',
+      { tags: '@smoke' },
+      function () {
+        before('connect wallets and click on validator', function () {
+          cy.connectVegaWallet();
+          clickOnValidatorFromList(0);
+        });
+
+        // 2001-STKE-006
+        it('Should be able to see validator name', function () {
+          cy.get(validatorTitle).should('not.be.empty');
+        });
+
+        // 2001-STKE-007
+        it('Should be able to see validator id', function () {
+          cy.get(validatorId).should('not.be.empty');
+        });
+
+        // 2001-STKE-008
+        it('Should be able to see validator public key', function () {
+          cy.get(validatorPubKey).should('not.be.empty');
+        });
+
+        // 2001-STKE-010
+        it('Should be able to see Ethereum address', function () {
+          cy.get(ethAddressLink)
+            .should('not.be.empty')
+            .and('have.attr', 'href');
+        });
+        // TODO validators missing url for more information about them 2001-STKE-09
+
+        it('Should be able to see validator status', function () {
+          cy.get(validatorStatus).should('have.text', 'Consensus');
+        });
+
+        // 2001-STKE-012
+        it('Should be able to see total stake', function () {
+          cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see pending stake', function () {
+          cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by operator', function () {
+          cy.get(stakedByOperator)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by delegates', function () {
+          cy.get(stakedByDelegates)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        // 2001-STKE-051
+        it('Should be able to see stake share in percentage', function () {
+          cy.get(stakeShare)
+            .invoke('text')
+            .then(($stakePercentage) => {
+              // The pattern must start at a word boundary (\b).
+              // The pattern cannot be immediately preceded by a dot ((?<!\.)).
+              // The pattern can be one of the following:
+              // A percentage value of zero (0%), or
+              // A non-zero percentage value that can be:
+              // A single digit (\d) between 0 and 9, or
+              // A two-digit number between 0 and 99 (\d{1,2}), or
+              // The number 100.
+              // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
+              // The pattern must end with a percentage sign (%).
+
+              cy.wrap($stakePercentage).should(
+                'match',
+                /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
+              );
+            });
+        });
+
+        // 2001-STKE-011 2002-SINC-001 2002-SINC-002
+        it('Should be able to see epoch information', function () {
+          const epochTitle = 'h3';
+          const nextEpochInfo = 'p';
+
+          cy.get(epochCountDown).within(() => {
+            cy.get(epochTitle).should('not.be.empty');
+            cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+          });
+        });
+      }
+    );
+  });
 });

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -337,7 +337,6 @@ context(
                 .parent()
                 .siblings()
                 .invoke('text')
-                .should('have.length.at.least', 4)
                 .then(parseFloat)
                 .should('be.gte', parseFloat(expectedAmount));
 

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

@@ -596,8 +596,6 @@
   "noPercentage": "No percentage",
   "proposalJson": "Full proposal JSON",
   "proposalDetails": "Proposal details",
-  "marketSpecification": "Market specification",
-  "viewMarketJson": "View market JSON",
   "proposalDescription": "Description",
   "currentlySetTo": "Currently expected to ",
   "currently": "currently",
@@ -731,11 +729,7 @@
   "ThisWillSetValidationDeadlineTo": "This will set the validation deadline to",
   "Hours": "hours",
   "ThisWillAdd2MinutesToAllowTimeToConfirmInWallet": "Note: 2 minutes of extra time are added when you choose the minimum value. This gives you time to confirm the proposal in your wallet.",
-  "ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline": "The proposal will fail if enactment is earlier than the voting deadline",
-  "ProposalWillFailIfEnactmentIsBelowTheMinimumDeadline": "The proposal will fail if enactment deadline is below the minimum",
-  "ProposalWillFailIfVotingIsBelowTheMinimumDeadline": "The proposal will fail if voting deadline is below the minimum",
-  "ProposalWillFailIfEnactmentIsAboveTheMaximumDeadline": "The proposal will fail if enactment deadline is above the maximum",
-  "ProposalWillFailIfVotingIsAboveTheMaximumDeadline": "The proposal will fail if voting deadline is above the maximum",
+  "ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline": "Proposal will fail if enactment is earlier than the voting deadline",
   "SelectAMarketToChange": "Select a market to change",
   "MarketName": "Market name",
   "MarketCode": "Market code",

apps/governance/src/lib/collapsible-toggle-styles.ts

@@ -1,6 +0,0 @@
-import classnames from 'classnames';
-
-export const collapsibleToggleStyles = (toggleState: boolean) =>
-  classnames('mb-4 transition-transform ease-in-out duration-300', {
-    'rotate-180': toggleState,
-  });

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

@@ -1,9 +1,9 @@
 import ReactMarkdown from 'react-markdown';
+import classnames from 'classnames';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';
 
 export const ProposalDescription = ({
   description,
@@ -12,6 +12,9 @@ export const ProposalDescription = ({
 }) => {
   const { t } = useTranslation();
   const [showDescription, setShowDescription] = useState(false);
+  const showDescriptionIconClasses = classnames('mb-4', {
+    'rotate-180': showDescription,
+  });
 
   return (
     <section data-testid="proposal-description">
@@ -21,7 +24,7 @@ export const ProposalDescription = ({
       >
         <div className="flex items-center gap-3">
           <SubHeading title={t('proposalDescription')} />
-          <div className={collapsibleToggleStyles(showDescription)}>
+          <div className={showDescriptionIconClasses}>
             <Icon name="chevron-down" size={8} />
           </div>
         </div>

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

@@ -1,8 +1,8 @@
+import classnames from 'classnames';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Icon, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
@@ -13,6 +13,9 @@ export const ProposalJson = ({
 }) => {
   const { t } = useTranslation();
   const [showDetails, setShowDetails] = useState(false);
+  const showDetailsIconClasses = classnames('mb-4', {
+    'rotate-180': showDetails,
+  });
 
   return (
     <section data-testid="proposal-json">
@@ -22,7 +25,7 @@ export const ProposalJson = ({
       >
         <div className="flex items-center gap-3">
           <SubHeading title={t('proposalJson')} />
-          <div className={collapsibleToggleStyles(showDetails)}>
+          <div className={showDetailsIconClasses}>
             <Icon name="chevron-down" size={8} />
           </div>
         </div>

apps/governance/src/routes/proposals/components/proposal-market-data/index.tsx

@@ -1 +0,0 @@
-export * from './proposal-market-data';

apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx

@@ -1,222 +0,0 @@
-import isEqual from 'lodash/isEqual';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  InstrumentInfoPanel,
-  KeyDetailsInfoPanel,
-  LiquidityMonitoringParametersInfoPanel,
-  LiquidityPriceRangeInfoPanel,
-  MetadataInfoPanel,
-  OracleInfoPanel,
-  PriceMonitoringBoundsInfoPanel,
-  RiskFactorsInfoPanel,
-  RiskModelInfoPanel,
-  RiskParametersInfoPanel,
-  SettlementAssetInfoPanel,
-} from '@vegaprotocol/markets';
-import {
-  Accordion,
-  AccordionItem,
-  Button,
-  CopyWithTooltip,
-  Dialog,
-  Icon,
-  SyntaxHighlighter,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
-import type { DataSourceDefinition } from '@vegaprotocol/types';
-import { create } from 'zustand';
-
-type MarketDataDialogState = {
-  isOpen: boolean;
-  open: () => void;
-  close: () => void;
-};
-
-export const useMarketDataDialogStore = create<MarketDataDialogState>(
-  (set) => ({
-    isOpen: false,
-    open: () => set({ isOpen: true }),
-    close: () => set({ isOpen: false }),
-  })
-);
-
-export const ProposalMarketData = ({
-  marketData,
-}: {
-  marketData: MarketInfoWithData;
-}) => {
-  const { t } = useTranslation();
-  const { isOpen, open, close } = useMarketDataDialogStore();
-  const [showDetails, setShowDetails] = useState(false);
-
-  if (!marketData) {
-    return null;
-  }
-
-  const settlementData = marketData.tradableInstrument.instrument.product
-    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
-  const terminationData = marketData.tradableInstrument.instrument.product
-    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
-
-  const getSigners = (data: DataSourceDefinition) => {
-    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
-      const signers = data.sourceType.sourceType.signers || [];
-
-      return signers.map(({ signer }) => {
-        return (
-          (signer.__typename === 'ETHAddress' && signer.address) ||
-          (signer.__typename === 'PubKey' && signer.key)
-        );
-      });
-    }
-    return [];
-  };
-
-  return (
-    <section className="relative" data-testid="proposal-market-data">
-      <button
-        onClick={() => setShowDetails(!showDetails)}
-        data-testid="proposal-market-data-toggle"
-      >
-        <div className="flex items-center gap-3">
-          <SubHeading title={t('marketSpecification')} />
-          <div className={collapsibleToggleStyles(showDetails)}>
-            <Icon name="chevron-down" size={8} />
-          </div>
-        </div>
-      </button>
-
-      {showDetails && (
-        <>
-          <div className="float-right">
-            <Button onClick={open} data-testid="view-market-json">
-              {t('viewMarketJson')}
-            </Button>
-          </div>
-          <div className="mb-10">
-            <Accordion>
-              <AccordionItem
-                itemId="key-details"
-                title={t('Key details')}
-                content={<KeyDetailsInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="instrument"
-                title={t('Instrument')}
-                content={<InstrumentInfoPanel market={marketData} />}
-              />
-              {isEqual(
-                getSigners(settlementData),
-                getSigners(terminationData)
-              ) ? (
-                <AccordionItem
-                  itemId="oracles"
-                  title={t('Oracle')}
-                  content={
-                    <OracleInfoPanel
-                      market={marketData}
-                      type="settlementData"
-                    />
-                  }
-                />
-              ) : (
-                <>
-                  <AccordionItem
-                    itemId="settlement-oracle"
-                    title={t('Settlement Oracle')}
-                    content={
-                      <OracleInfoPanel
-                        market={marketData}
-                        type="settlementData"
-                      />
-                    }
-                  />
-
-                  <AccordionItem
-                    itemId="termination-oracle"
-                    title={t('Termination Oracle')}
-                    content={
-                      <OracleInfoPanel market={marketData} type="termination" />
-                    }
-                  />
-                </>
-              )}
-              <AccordionItem
-                itemId="settlement-asset"
-                title={t('Settlement asset')}
-                content={<SettlementAssetInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="metadata"
-                title={t('Metadata')}
-                content={<MetadataInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="risk-model"
-                title={t('Risk model')}
-                content={<RiskModelInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="risk-parameters"
-                title={t('Risk parameters')}
-                content={<RiskParametersInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="risk-factors"
-                title={t('Risk factors')}
-                content={<RiskFactorsInfoPanel market={marketData} />}
-              />
-              {(
-                marketData.priceMonitoringSettings?.parameters?.triggers || []
-              ).map((_, triggerIndex) => (
-                <AccordionItem
-                  itemId={`trigger-${triggerIndex}`}
-                  title={t(`Price monitoring bounds ${triggerIndex + 1}`)}
-                  content={
-                    <PriceMonitoringBoundsInfoPanel
-                      market={marketData}
-                      triggerIndex={triggerIndex}
-                    />
-                  }
-                />
-              ))}
-              <AccordionItem
-                itemId="liqudity-monitoring-parameters"
-                title={t('Liquidity monitoring parameters')}
-                content={
-                  <LiquidityMonitoringParametersInfoPanel market={marketData} />
-                }
-              />
-              <AccordionItem
-                itemId="liquidity-price-range"
-                title={t('Liquidity price range')}
-                content={<LiquidityPriceRangeInfoPanel market={marketData} />}
-              />
-            </Accordion>
-          </div>
-        </>
-      )}
-
-      <Dialog
-        title={marketData.tradableInstrument.instrument.code}
-        open={isOpen}
-        onChange={(isOpen) => (isOpen ? open() : close())}
-        size="medium"
-        dataTestId="market-json-dialog"
-      >
-        <CopyWithTooltip text={JSON.stringify(marketData)}>
-          <button className="bg-vega-dark-100 rounded-sm py-2 px-3 mb-4 text-white">
-            <span>
-              <Icon name="duplicate" />
-            </span>
-            <span className="ml-2">Copy</span>
-          </button>
-        </CopyWithTooltip>
-        <SyntaxHighlighter data={marketData} />
-      </Dialog>
-    </section>
-  );
-};

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

@@ -1,3 +1,4 @@
+import classnames from 'classnames';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
@@ -12,7 +13,6 @@ import { SubHeading } from '../../../../components/heading';
 import { useVoteInformation } from '../../hooks';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { ProposalType } from '../proposal/proposal';
-import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
@@ -57,6 +57,10 @@ export const ProposalVotesTable = ({
     ? t('byTokenVote')
     : t('byLiquidityVote');
 
+  const showDetailsIconClasses = classnames('mb-4', {
+    'rotate-180': showDetails,
+  });
+
   return (
     <>
       <button
@@ -65,7 +69,7 @@ export const ProposalVotesTable = ({
       >
         <div className="flex items-center gap-3">
           <SubHeading title={t('voteBreakdown')} />
-          <div className={collapsibleToggleStyles(showDetails)}>
+          <div className={showDetailsIconClasses}>
             <Icon name="chevron-down" size={8} />
           </div>
         </div>

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

@@ -29,6 +29,9 @@ jest.mock('../proposal-change-table', () => ({
 jest.mock('../proposal-json', () => ({
   ProposalJson: () => <div data-testid="proposal-json"></div>,
 }));
+jest.mock('../proposal-terms/proposal-terms', () => ({
+  ProposalTerms: () => <div data-testid="proposal-terms"></div>,
+}));
 jest.mock('../proposal-votes-table', () => ({
   ProposalVotesTable: () => <div data-testid="proposal-votes-table"></div>,
 }));
@@ -71,6 +74,7 @@ it('renders each section', async () => {
   expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
+  expect(screen.getByTestId('proposal-terms')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-votes-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-vote-details')).toBeInTheDocument();
   expect(screen.queryByTestId('proposal-list-asset')).not.toBeInTheDocument();

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

@@ -1,22 +1,22 @@
-import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
 import {
   NetworkParams,
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { AsyncRenderer, Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { ProposalDescription } from '../proposal-description';
 import { ProposalChangeTable } from '../proposal-change-table';
 import { ProposalJson } from '../proposal-json';
+import { ProposalTerms } from '../proposal-terms';
 import { ProposalVotesTable } from '../proposal-votes-table';
 import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
+import { Link } from 'react-router-dom';
 import Routes from '../../../routes';
-import { ProposalMarketData } from '../proposal-market-data';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export enum ProposalType {
   PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -28,16 +28,11 @@ export enum ProposalType {
 }
 export interface ProposalProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  newMarketData?: MarketInfoWithData | null;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   restData: any;
 }
 
-export const Proposal = ({
-  proposal,
-  restData,
-  newMarketData,
-}: ProposalProps) => {
+export const Proposal = ({ proposal, restData }: ProposalProps) => {
   const { t } = useTranslation();
   const { params, loading, error } = useNetworkParams([
     NetworkParams.governance_proposal_market_minVoterBalance,
@@ -102,58 +97,51 @@ export const Proposal = ({
         </div>
         <ProposalHeader proposal={proposal} isListItem={false} />
 
-        <div id="details">
-          <div className="my-10">
-            <ProposalChangeTable proposal={proposal} />
-          </div>
+        <div className="my-10">
+          <ProposalChangeTable proposal={proposal} />
+        </div>
 
-          {proposal.terms.change.__typename === 'NewAsset' &&
-          proposal.terms.change.source.__typename === 'ERC20' &&
-          proposal.id ? (
-            <ListAsset
-              assetId={proposal.id}
-              withdrawalThreshold={
-                proposal.terms.change.source.withdrawThreshold
-              }
-              lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
-            />
-          ) : null}
+        {proposal.terms.change.__typename === 'NewAsset' &&
+        proposal.terms.change.source.__typename === 'ERC20' &&
+        proposal.id ? (
+          <ListAsset
+            assetId={proposal.id}
+            withdrawalThreshold={proposal.terms.change.source.withdrawThreshold}
+            lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
+          />
+        ) : null}
 
-          <div className="mb-4">
-            <ProposalDescription description={proposal.rationale.description} />
-          </div>
+        <div className="mb-4">
+          <ProposalDescription description={proposal.rationale.description} />
+        </div>
 
-          {newMarketData && (
+        {proposal.terms.change.__typename !== 'NewMarket' &&
+          proposal.terms.change.__typename !== 'UpdateMarket' &&
+          proposal.terms.change.__typename !== 'NewFreeform' && (
             <div className="mb-4">
-              <ProposalMarketData marketData={newMarketData} />
+              <ProposalTerms data={proposal.terms} />
             </div>
           )}
 
-          <div className="mb-6">
-            <ProposalJson proposal={restData?.data?.proposal} />
-          </div>
+        <div className="mb-6">
+          <ProposalJson proposal={restData?.data?.proposal} />
         </div>
 
-        <div id="voting">
-          <div className="mb-10">
-            <RoundedWrapper paddingBottom={true}>
-              <VoteDetails
-                proposal={proposal}
-                proposalType={proposalType}
-                minVoterBalance={minVoterBalance}
-                spamProtectionMinTokens={
-                  params?.spam_protection_voting_min_tokens
-                }
-              />
-            </RoundedWrapper>
-          </div>
-
-          <div className="mb-4">
-            <ProposalVotesTable
+        <div className="mb-10">
+          <RoundedWrapper paddingBottom={true}>
+            <VoteDetails
               proposal={proposal}
               proposalType={proposalType}
+              minVoterBalance={minVoterBalance}
+              spamProtectionMinTokens={
+                params?.spam_protection_voting_min_tokens
+              }
             />
-          </div>
+          </RoundedWrapper>
+        </div>
+
+        <div className="mb-4">
+          <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
         </div>
       </section>
     </AsyncRenderer>

apps/governance/src/routes/proposals/components/propose/proposal-form-vote-and-enactment-deadline.spec.tsx

@@ -224,47 +224,7 @@ describe('Proposal form vote, validation and enactment deadline', () => {
     expect(
       screen.getByTestId('enactment-before-voting-deadline')
     ).toHaveTextContent(
-      'The proposal will fail if enactment is earlier than the voting deadline'
-    );
-  });
-
-  it('displays error text if the vote deadline is set earlier than the minimum allowed', () => {
-    renderComponent();
-    const voteDeadlineInput = screen.getByTestId('proposal-vote-deadline');
-    fireEvent.change(voteDeadlineInput, { target: { value: 0.01 } });
-    expect(screen.getByTestId('voting-less-than-min')).toHaveTextContent(
-      'The proposal will fail if voting deadline is below the minimum'
-    );
-  });
-
-  it('displays error text if the vote deadline is set later than the maximum allowed', () => {
-    renderComponent();
-    const voteDeadlineInput = screen.getByTestId('proposal-vote-deadline');
-    fireEvent.change(voteDeadlineInput, { target: { value: 100000 } });
-    expect(screen.getByTestId('voting-greater-than-max')).toHaveTextContent(
-      'The proposal will fail if voting deadline is above the maximum'
-    );
-  });
-
-  it('displays error text if the enactment deadline is set earlier than the minimum allowed', () => {
-    renderComponent();
-    const enactmentDeadlineInput = screen.getByTestId(
-      'proposal-enactment-deadline'
-    );
-    fireEvent.change(enactmentDeadlineInput, { target: { value: 0.01 } });
-    expect(screen.getByTestId('enactment-less-than-min')).toHaveTextContent(
-      'The proposal will fail if enactment deadline is below the minimum'
-    );
-  });
-
-  it('displays error text if the enactment deadline is set later than the maximum allowed', () => {
-    renderComponent();
-    const enactmentDeadlineInput = screen.getByTestId(
-      'proposal-enactment-deadline'
-    );
-    fireEvent.change(enactmentDeadlineInput, { target: { value: 100000 } });
-    expect(screen.getByTestId('enactment-greater-than-max')).toHaveTextContent(
-      'The proposal will fail if enactment deadline is above the maximum'
+      'Proposal will fail if enactment is earlier than the voting deadline'
     );
   });
 });

apps/governance/src/routes/proposals/components/propose/proposal-form-vote-and-enactment-deadline.tsx

@@ -220,41 +220,21 @@ const EnactmentForm = ({
           <span data-testid="enactment-date" className="pl-2">
             {getDateTimeFormat().format(deadlineDates.enactment)}
           </span>
-          {deadlines.enactment && (
-            <>
-              {deadlines.enactment === minEnactmentHours && (
-                <span
-                  data-testid="enactment-2-mins-extra"
-                  className="block mt-4 font-light"
-                >
-                  {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
-                </span>
-              )}
-              {deadlines.enactment < deadlines.vote && (
-                <span
-                  data-testid="enactment-before-voting-deadline"
-                  className="block mt-4 text-vega-pink"
-                >
-                  {t('ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline')}
-                </span>
-              )}
-              {deadlines.enactment < minEnactmentHours && (
-                <span
-                  data-testid="enactment-less-than-min"
-                  className="block mt-4 text-vega-pink"
-                >
-                  {t('ProposalWillFailIfEnactmentIsBelowTheMinimumDeadline')}
-                </span>
-              )}
-              {deadlines.enactment > maxEnactmentHours && (
-                <span
-                  data-testid="enactment-greater-than-max"
-                  className="block mt-4 text-vega-pink"
-                >
-                  {t('ProposalWillFailIfEnactmentIsAboveTheMaximumDeadline')}
-                </span>
-              )}
-            </>
+          {deadlines.enactment === minEnactmentHours && (
+            <span
+              data-testid="enactment-2-mins-extra"
+              className="block mt-4 font-light"
+            >
+              {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
+            </span>
+          )}
+          {deadlines.enactment && deadlines.enactment < deadlines.vote && (
+            <span
+              data-testid="enactment-before-voting-deadline"
+              className="block mt-4 text-vega-pink"
+            >
+              {t('ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline')}
+            </span>
           )}
         </p>
       )}
@@ -520,33 +500,13 @@ export function ProposalFormVoteAndEnactmentDeadline({
             <span data-testid="voting-date" className="pl-2">
               {getDateTimeFormat().format(deadlineDates.vote)}
             </span>
-            {deadlines.vote && (
-              <>
-                {deadlines.vote === minVoteHours && (
-                  <span
-                    data-testid="voting-2-mins-extra"
-                    className="block mt-4 font-light"
-                  >
-                    {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
-                  </span>
-                )}
-                {deadlines.vote < minVoteHours && (
-                  <span
-                    data-testid="voting-less-than-min"
-                    className="block mt-4 text-vega-pink"
-                  >
-                    {t('ProposalWillFailIfVotingIsBelowTheMinimumDeadline')}
-                  </span>
-                )}
-                {deadlines.vote > maxVoteHours && (
-                  <span
-                    data-testid="voting-greater-than-max"
-                    className="block mt-4 text-vega-pink"
-                  >
-                    {t('ProposalWillFailIfVotingIsAboveTheMaximumDeadline')}
-                  </span>
-                )}
-              </>
+            {deadlines.vote === minVoteHours && (
+              <span
+                data-testid="voting-2-mins-extra"
+                className="block mt-4 font-light"
+              >
+                {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
+              </span>
             )}
           </p>
         )}

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

@@ -1,10 +1,11 @@
 import { captureMessage } from '@sentry/minimal';
+
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { VoteValue } from '@vegaprotocol/types';
 import { useEffect, useState } from 'react';
 import { useUserVoteQuery } from './__generated__/Vote';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
 import type { FinalizedVote } from '@vegaprotocol/proposals';
+import { removePaginationWrapper } from '@vegaprotocol/utils';
 
 export enum VoteState {
   NotCast = 'NotCast',
@@ -44,23 +45,21 @@ export function useUserVote(
   );
 
   useEffect(() => {
-    if (finalizedVote?.vote.value && finalizedVote.pubKey === pubKey) {
+    if (finalizedVote?.vote.value) {
       setUserVote(finalizedVote);
-    } else if (data?.party?.votesConnection?.edges && pubKey) {
-      const vote = removePaginationWrapper(
-        data?.party?.votesConnection?.edges
-      ).find(({ proposalId: pId }) => proposalId === pId);
-
-      if (vote) {
-        setUserVote({ ...vote, pubKey });
-      }
+    } else if (data?.party?.votesConnection?.edges) {
+      // This sets the vote (if any) when the user first loads the page
+      setUserVote(
+        removePaginationWrapper(data?.party?.votesConnection?.edges).find(
+          ({ proposalId: pId }) => proposalId === pId
+        )
+      );
     }
   }, [
     finalizedVote?.vote.value,
     data?.party?.votesConnection?.edges,
     finalizedVote,
     proposalId,
-    pubKey,
   ]);
 
   // If user vote changes update the vote state
@@ -95,8 +94,6 @@ export function useUserVote(
   return {
     voteState,
     userVote,
-    voteDatetime: userVote?.vote?.datetime
-      ? new Date(userVote.vote.datetime)
-      : null,
+    voteDatetime: userVote ? new Date(userVote.vote.datetime) : null,
   };
 }

apps/governance/src/routes/proposals/proposal/proposal-container.tsx

@@ -7,8 +7,6 @@ import { ProposalNotFound } from '../components/proposal-not-found';
 import { useProposalQuery } from './__generated__/Proposal';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { ENV } from '../../../config';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 
 export const ProposalContainer = () => {
   const params = useParams<{ proposalId: string }>();
@@ -22,36 +20,15 @@ export const ProposalContainer = () => {
     skip: !params.proposalId,
   });
 
-  const {
-    data: newMarketData,
-    loading: newMarketLoading,
-    error: newMarketError,
-  } = useDataProvider({
-    dataProvider: marketInfoWithDataProvider,
-    skipUpdates: true,
-    variables: {
-      marketId: data?.proposal?.id || '',
-      skip: !data?.proposal?.id,
-    },
-  });
-
   useEffect(() => {
-    const interval = setInterval(refetch, 2000);
+    const interval = setInterval(refetch, 1000);
     return () => clearInterval(interval);
   }, [refetch]);
 
   return (
-    <AsyncRenderer
-      loading={loading || newMarketLoading}
-      error={error || newMarketError}
-      data={newMarketData ? { newMarketData, data } : data}
-    >
+    <AsyncRenderer loading={loading} error={error} data={data}>
       {data?.proposal ? (
-        <Proposal
-          proposal={data.proposal}
-          restData={restData}
-          newMarketData={newMarketData}
-        />
+        <Proposal proposal={data.proposal} restData={restData} />
       ) : (
         <ProposalNotFound />
       )}

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

@@ -48,22 +48,15 @@ export const EpochIndividualRewards = ({
     return removePaginationWrapper(data.party.rewardsConnection.edges);
   }, [data]);
 
-  const epochRewardSummaries = useMemo(() => {
-    if (!data?.epochRewardSummaries) return [];
-
-    return removePaginationWrapper(data.epochRewardSummaries.edges);
-  }, [data]);
-
   const epochIndividualRewardSummaries = useMemo(() => {
     if (!data?.party) return [];
     return generateEpochIndividualRewardsList({
       rewards,
       epochId,
-      epochRewardSummaries,
       page,
       size: EPOCHS_PAGE_SIZE,
     });
-  }, [data?.party, epochId, epochRewardSummaries, page, rewards]);
+  }, [data?.party, epochId, page, rewards]);
 
   const refetchData = useCallback(
     async (toPage?: number) => {

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

@@ -65,11 +65,7 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('should return an empty array if no rewards are provided', () => {
     expect(
-      generateEpochIndividualRewardsList({
-        rewards: [],
-        epochId: 1,
-        epochRewardSummaries: [],
-      })
+      generateEpochIndividualRewardsList({ rewards: [], epochId: 1 })
     ).toEqual([
       {
         epoch: 1,
@@ -82,7 +78,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const result = generateEpochIndividualRewardsList({
       rewards: [rewardWrongType],
       epochId: 1,
-      epochRewardSummaries: [],
     });
 
     expect(result).toEqual([
@@ -97,15 +92,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const result = generateEpochIndividualRewardsList({
       rewards: [reward1],
       epochId: 1,
-      epochRewardSummaries: [
-        {
-          __typename: 'EpochRewardSummary',
-          epoch: 1,
-          assetId: 'usd',
-          amount: '100000',
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-        },
-      ],
     });
 
     expect(result[0]).toEqual({
@@ -148,11 +134,7 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('should return an array sorted by epoch descending', () => {
     const rewards = [reward1, reward2, reward3, reward4];
-    const result1 = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 2,
-      epochRewardSummaries: [],
-    });
+    const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
 
     expect(result1[0].epoch).toEqual(2);
     expect(result1[1].epoch).toEqual(1);
@@ -161,7 +143,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const result2 = generateEpochIndividualRewardsList({
       rewards: reorderedRewards,
       epochId: 2,
-      epochRewardSummaries: [],
     });
 
     expect(result2[0].epoch).toEqual(2);
@@ -170,11 +151,7 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('correctly calculates the total value of rewards for an asset', () => {
     const rewards = [reward1, reward4];
-    const result = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 1,
-      epochRewardSummaries: [],
-    });
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 1 });
 
     expect(result[0].rewards[0].totalAmount).toEqual('200');
   });
@@ -182,11 +159,7 @@ 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,
-      epochRewardSummaries: [],
-    });
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
 
     expect(result).toEqual([
       {
@@ -300,7 +273,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const resultPageOne = generateEpochIndividualRewardsList({
       rewards,
       epochId: 3,
-      epochRewardSummaries: [],
       page: 1,
       size: 2,
     });
@@ -414,7 +386,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const resultPageTwo = generateEpochIndividualRewardsList({
       rewards,
       epochId: 3,
-      epochRewardSummaries: [],
       page: 2,
       size: 2,
     });
@@ -458,69 +429,4 @@ describe('generateEpochIndividualRewardsList', () => {
       },
     ]);
   });
-
-  it('correctly calculates the percentage of two or more rewards by referencing the total rewards amount', () => {
-    const result = generateEpochIndividualRewardsList({
-      rewards: [
-        // reward1 is 100 usd, which is 10% of the total rewards amount
-        reward1,
-        {
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-          amount: '200',
-          percentageOfTotal: '0.2',
-          receivedAt: new Date(),
-          asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
-          party: { id: 'blah' },
-          epoch: { id: '1' },
-        },
-      ],
-      epochId: 1,
-      epochRewardSummaries: [
-        {
-          __typename: 'EpochRewardSummary',
-          epoch: 1,
-          assetId: 'usd',
-          amount: '1000',
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-        },
-      ],
-    });
-
-    expect(result[0]).toEqual({
-      epoch: 1,
-      rewards: [
-        {
-          asset: 'USD',
-          decimals: 6,
-          totalAmount: '300',
-          rewardTypes: {
-            [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-              amount: '300',
-              percentageOfTotal: '30',
-            },
-            [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',
-            },
-          },
-        },
-      ],
-    });
-  });
 });

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

@@ -1,9 +1,6 @@
 import { BigNumber } from '../../../lib/bignumber';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
-import type {
-  EpochRewardSummaryFieldsFragment,
-  RewardFieldsFragment,
-} from '../home/__generated__/Rewards';
+import type { RewardFieldsFragment } from '../home/__generated__/Rewards';
 import type { AccountType } from '@vegaprotocol/types';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';
 
@@ -35,13 +32,11 @@ const emptyRowAccountTypes = accountTypes.map((type) => [
 export const generateEpochIndividualRewardsList = ({
   rewards,
   epochId,
-  epochRewardSummaries,
   page = 1,
   size = 10,
 }: {
   rewards: RewardFieldsFragment[];
   epochId: number;
-  epochRewardSummaries: EpochRewardSummaryFieldsFragment[];
   page?: number;
   size?: number;
 }) => {
@@ -59,7 +54,6 @@ export const generateEpochIndividualRewardsList = ({
   const epochIndividualRewards = rewards.reduce((acc, reward) => {
     const epochId = reward.epoch.id;
     const assetName = reward.asset.name;
-    const assetId = reward.asset.id;
     const assetDecimals = reward.asset.decimals;
     const rewardType = reward.rewardType;
     const amount = reward.amount;
@@ -76,14 +70,6 @@ export const generateEpochIndividualRewardsList = ({
 
     const epoch = acc.get(epochId);
 
-    // matchingTotalReward is the total awarded for all users for the reward type in the epoch of the asset
-    const matchingTotalRewardAmount = epochRewardSummaries.find(
-      (summary) =>
-        summary.epoch === Number(epochId) &&
-        summary.assetId === assetId &&
-        summary.rewardType === rewardType
-    )?.amount;
-
     let asset = epoch?.rewards.find((r) => r.asset === assetName);
 
     if (!asset) {
@@ -100,24 +86,22 @@ export const generateEpochIndividualRewardsList = ({
       asset.rewardTypes[rewardType] = { amount, percentageOfTotal };
     } else {
       const previousAmount = asset.rewardTypes[rewardType]?.amount;
-      const newAmount = previousAmount
-        ? new BigNumber(previousAmount).plus(amount).toString()
-        : amount;
+      const previousPercentageOfTotal =
+        asset.rewardTypes[rewardType]?.percentageOfTotal;
 
       asset.rewardTypes[rewardType] = {
-        amount: newAmount,
-        percentageOfTotal: matchingTotalRewardAmount
-          ? new BigNumber(newAmount)
-              .dividedBy(matchingTotalRewardAmount)
-              .multipliedBy(100)
+        amount: previousAmount
+          ? new BigNumber(previousAmount).plus(amount).toString()
+          : amount,
+        percentageOfTotal: previousPercentageOfTotal
+          ? new BigNumber(previousPercentageOfTotal)
+              .plus(percentageOfTotal)
               .toString()
-          : // this should never be reached, if there's an individual reward there should
-            // always be a reward total from the api too, but set it as a fallback just in case
-            percentageOfTotal,
+          : percentageOfTotal,
       };
     }
 
-    // totalAmount is the sum of all individual rewardTypes amounts
+    // totalAmount is the sum of all rewardTypes amounts
     asset.totalAmount = Object.values(asset.rewardTypes).reduce(
       (sum, rewardType) => {
         return new BigNumber(sum).plus(rewardType.amount).toString();

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

@@ -22,13 +22,6 @@ fragment DelegationFields on Delegation {
   epoch
 }
 
-fragment EpochRewardSummaryFields on EpochRewardSummary {
-  epoch
-  assetId
-  amount
-  rewardType
-}
-
 query Rewards(
   $partyId: ID!
   $fromEpoch: Int
@@ -57,16 +50,13 @@ query Rewards(
       }
     }
   }
-  epochRewardSummaries(
-    filter: { fromEpoch: $fromEpoch, toEpoch: $toEpoch }
-    pagination: $rewardsPagination
-  ) {
-    edges {
-      node {
-        ...EpochRewardSummaryFields
-      }
-    }
-  }
+}
+
+fragment EpochRewardSummaryFields on EpochRewardSummary {
+  epoch
+  assetId
+  amount
+  rewardType
 }
 
 query EpochAssetsRewards(

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

@@ -7,8 +7,6 @@ export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.Ac
 
 export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number };
 
-export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
-
 export type RewardsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
   fromEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
@@ -18,7 +16,9 @@ export type RewardsQueryVariables = Types.Exact<{
 }>;
 
 
-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, decimals: number }, 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, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | 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, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null };
+
+export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
 
 export type EpochAssetsRewardsQueryVariables = Types.Exact<{
   epochRewardSummariesFilter?: Types.InputMaybe<Types.RewardSummaryFilter>;
@@ -102,20 +102,9 @@ export const RewardsDocument = gql`
       }
     }
   }
-  epochRewardSummaries(
-    filter: {fromEpoch: $fromEpoch, toEpoch: $toEpoch}
-    pagination: $rewardsPagination
-  ) {
-    edges {
-      node {
-        ...EpochRewardSummaryFields
-      }
-    }
-  }
 }
     ${RewardFieldsFragmentDoc}
-${DelegationFieldsFragmentDoc}
-${EpochRewardSummaryFieldsFragmentDoc}`;
+${DelegationFieldsFragmentDoc}`;
 
 /**
  * __useRewardsQuery__

apps/trading-e2e/src/integration/home-node-network.cy.ts

@@ -1,8 +1,10 @@
 const dialogContent = 'dialog-content';
 const nodeHealth = 'node-health';
+const statusIncidentsLink = 'footer [data-testid=external-link]';
 
 describe('home', { tags: '@regression' }, () => {
   before(() => {
+    cy.clearAllLocalStorage();
     cy.mockTradingPage();
     cy.mockSubscription();
     cy.visit('/');
@@ -74,14 +76,23 @@ describe('home', { tags: '@regression' }, () => {
       cy.visit('/');
     });
 
+    // 0006-NETW-002
+    // 0006-NETW-003
+    // 0006-NETW-011
     it('switch to fairground network and check status & incidents link', () => {
-      // 0006-NETW-002
-      // 0006-NETW-003
       cy.getByTestId('navigation')
         .find('[data-testid="network-switcher"]')
-        .should('have.text', 'Custom')
         .click();
-      cy.getByTestId('network-item').contains('Fairground testnet');
+      cy.getByTestId('network-item').contains('Fairground testnet').click();
+      cy.get('[aria-haspopup="menu"]').should('contain.text', 'Fairground');
+      cy.url().should('include', 'fairground.wtf');
+      cy.contains('Continue').click();
+      cy.get(statusIncidentsLink)
+        .children('span')
+        .should('have.text', 'Mainnet status & incidents');
+      cy.get(statusIncidentsLink)
+        .should('have.attr', 'href')
+        .and('contain', 'https://blog.vega.xyz/tagged/vega-incident-reports');
     });
   });
 });

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

@@ -109,7 +109,7 @@ describe('accounts', { tags: '@smoke' }, () => {
   it('should open usage breakdown dialog when clicked on used', () => {
     // 7001-COLL-009
     cy.get('[col-id="used"]').contains('1.01').click();
-    const headers = ['Market', 'Account type', 'Balance', 'Margin health'];
+    const headers = ['Market', 'Account type', 'Balance'];
     cy.getByTestId('usage-breakdown').within(($headers) => {
       cy.wrap($headers)
         .get('.ag-header-cell-text')

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

@@ -81,7 +81,7 @@ describe(
           cy.visit('/#/markets/market-0');
         });
         it('must display that market is not accepting orders', function () {
-          cy.getByTestId('deal-ticket-error-message-summary').should(
+          cy.getByTestId('dealticket-error-message-summary').should(
             'have.text',
             `This market is ${marketState
               .split('_')

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

@@ -45,7 +45,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
 
       cy.getByTestId(placeOrderBtn).click();
 
-      cy.getByTestId('deal-ticket-error-message-expiry').should(
+      cy.getByTestId('dealticket-error-message-expiry').should(
         'have.text',
         'The expiry date that you have entered appears to be in the past'
       );
@@ -57,7 +57,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
       cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
       cy.getByTestId(orderSizeField).clear().type('1');
       cy.getByTestId(orderPriceField).clear().type('1.123456');
-      cy.getByTestId('deal-ticket-error-message-price-limit').should(
+      cy.getByTestId('dealticket-error-message-price-limit').should(
         'have.text',
         'Price accepts up to 5 decimal places'
       );
@@ -79,7 +79,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
       cy.getByTestId(orderSizeField).clear().type('1.234');
       // 7002-SORD-060
       cy.getByTestId(placeOrderBtn).should('be.enabled');
-      cy.getByTestId('deal-ticket-error-message-size-market').should(
+      cy.getByTestId('dealticket-error-message-size-market').should(
         'have.text',
         'Size must be whole numbers for this market'
       );
@@ -88,7 +88,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
     it('must warn if order size is set to 0', function () {
       cy.getByTestId(orderSizeField).clear().type('0');
       cy.getByTestId(placeOrderBtn).should('be.enabled');
-      cy.getByTestId('deal-ticket-error-message-size-market').should(
+      cy.getByTestId('dealticket-error-message-size-market').should(
         'have.text',
         'Size cannot be lower than 1'
       );
@@ -96,29 +96,15 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
 
     it('must have total margin available', () => {
       // 7001-COLL-011
-      cy.getByTestId('deal-ticket-fee-total-margin-available').within(() => {
-        cy.get('[data-state="closed"]').should(
-          'have.text',
-          'Total margin available100.01 tDAI'
-        );
-      });
-    });
-
-    it('must have current margin allocation', () => {
-      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
-        cy.get('[data-state="closed"]:first').should(
-          'have.text',
-          'Current margin allocation'
-        );
-      });
-    });
-
-    it('should open usage breakdown dialog when clicked on current margin allocation', () => {
-      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
-        cy.get('button').click();
-      });
-      cy.getByTestId('usage-breakdown').should('exist');
-      cy.getByTestId('dialog-close').click();
+      cy.getByTestId('tab-ticket')
+        .find('.text-xs')
+        .eq(5)
+        .within(() => {
+          cy.get('[data-state="closed"]').should(
+            'have.text',
+            'Total margin available' + '100.01 tDAI'
+          );
+        });
     });
   });
 });

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

@@ -1,10 +1,6 @@
 import * as Schema from '@vegaprotocol/types';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import {
-  accountsQuery,
-  amendGeneralAccountBalance,
-  amendMarginAccountBalance,
-} from '@vegaprotocol/mock';
+import { accountsQuery, amendGeneralAccountBalance } from '@vegaprotocol/mock';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';
 
@@ -16,9 +12,8 @@ describe(
       beforeEach(() => {
         cy.setVegaWallet();
         cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '0');
+        const accounts = accountsQuery();
+        amendGeneralAccountBalance(accounts, 'market-0', '0');
         cy.mockGQL((req) => {
           aliasGQLQuery(req, 'Accounts', accounts);
         });
@@ -28,15 +23,10 @@ describe(
       });
 
       it('should show an error if your balance is zero', () => {
-        const accounts = accountsQuery();
-        amendMarginAccountBalance(accounts, 'market-0', '0');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
         // 7002-SORD-060
         cy.getByTestId('place-order').should('be.enabled');
         // 7002-SORD-003
-        cy.getByTestId('deal-ticket-error-message-zero-balance').should(
+        cy.getByTestId('dealticket-error-message-zero-balance').should(
           'have.text',
           'You need ' +
             'tDAI' +
@@ -50,9 +40,8 @@ describe(
       beforeEach(() => {
         cy.setVegaWallet();
         cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '1');
+        const accounts = accountsQuery();
+        amendGeneralAccountBalance(accounts, 'market-0', '1');
         cy.mockGQL((req) => {
           aliasGQLQuery(req, 'Accounts', accounts);
         });
@@ -65,11 +54,11 @@ describe(
         // 7002-SORD-003
 
         // warning should show immediately
-        cy.getByTestId('deal-ticket-warning-margin').should(
+        cy.getByTestId('dealticket-warning-margin').should(
           'contain.text',
           'You may not have enough margin available to open this position'
         );
-        cy.getByTestId('deal-ticket-warning-margin').should(
+        cy.getByTestId('dealticket-warning-margin').should(
           'contain.text',
           'You may not have enough margin available to open this position. 5.00 tDAI is currently required. You have only 0.01001 tDAI available.'
         );

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

@@ -37,7 +37,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
     // 7002-SORD-060
     cy.getByTestId(placeOrderBtn).should('be.enabled');
     cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId('deal-ticket-error-message-type').should(
+    cy.getByTestId('dealticket-error-message-type').should(
       'have.text',
       'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
     );
@@ -48,7 +48,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
     cy.getByTestId(orderPriceField).clear().type('0.1');
     cy.getByTestId(orderSizeField).clear().type('1');
     cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId('deal-ticket-warning-auction').should(
+    cy.getByTestId('dealticket-warning-auction').should(
       'have.text',
       'Any orders placed now will not trade until the auction ends'
     );
@@ -60,7 +60,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
       TIFlist.filter((item) => item.code === 'FOK')[0].value
     );
     cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId('deal-ticket-error-message-tif').should(
+    cy.getByTestId('dealticket-error-message-tif').should(
       'have.text',
       'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
     );

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

@@ -5,10 +5,6 @@ import {
   toggleMarket,
 } from '../support/deal-ticket';
 
-const tooltipContent = 'tooltip-content';
-const reduceOnly = 'reduce-only';
-const postOnly = 'post-only';
-
 describe('time in force validation', { tags: '@smoke' }, () => {
   before(() => {
     cy.setVegaWallet();
@@ -126,18 +122,13 @@ describe('time in force validation', { tags: '@smoke' }, () => {
       // 7002-SORD-026
 
       it(`post and reduce order market for ${tif.code}`, function () {
-        // 7003-SORD-054
-        // 7003-SORD-055
-        // 7003-SORD-056
-        // 7003-SORD-057
-
         cy.getByTestId(orderTIFDropDown).select(tif.value);
         cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
           'have.text',
           tif.text
         );
-        cy.getByTestId(postOnly).should('be.disabled');
-        cy.getByTestId(reduceOnly).should('be.enabled');
+        cy.getByTestId('post-only').should('be.disabled');
+        cy.getByTestId('reduce-only').should('be.enabled');
       });
     });
   });
@@ -153,33 +144,14 @@ describe('time in force validation', { tags: '@smoke' }, () => {
 
     validTIFLimit.forEach((tif) => {
       it(`post and reduce order for limit ${tif.code}`, function () {
-        // 7003-SORD-054
-        // 7003-SORD-055
-        // 7003-SORD-056
-        // 7003-SORD-057
         cy.getByTestId(orderTIFDropDown).select(tif.value);
         cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
           'have.text',
           tif.text
         );
-        cy.getByTestId(postOnly).should('be.enabled');
-        cy.getByTestId(reduceOnly).should('be.disabled');
+        cy.getByTestId('post-only').should('be.enabled');
+        cy.getByTestId('reduce-only').should('be.disabled');
       });
     });
-    it(`can see explanation of what post only and reduce only is/does`, function () {
-      // 7003-SORD-058
-      cy.get('[for="post-only"]').should('have.text', 'Post only').realHover();
-      cy.getByTestId(tooltipContent).should(
-        'contain.text',
-        `"Post only" will ensure the order is not filled immediately but is placed on the order book as a passive order. When the order is processed it is either stopped (if it would not be filled immediately), or placed in the order book as a passive order until the price taker matches with it.`
-      );
-      cy.get('[for="reduce-only"]')
-        .should('have.text', 'Reduce only')
-        .realHover();
-      cy.getByTestId(tooltipContent).should(
-        'contain.text',
-        `"Reduce only" can be used only with non-persistent orders, such as "Fill or Kill" or "Immediate or Cancel".`
-      );
-    });
   });
 });

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

@@ -1,79 +1,32 @@
-const colHeader = '.ag-header-cell-text';
-const colIdPrice = '[col-id=price]';
-const colIdSize = '[col-id=size]';
-const colIdCreatedAt = '[col-id=createdAt]';
-const tradesTab = 'Trades';
-const tradesTable = 'tab-trades';
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockSubscription();
+  cy.visit('/#/markets/market-0');
+});
 
 describe('trades', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-  });
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.getByTestId(tradesTab).click();
-  });
+  const colIdPrice = 'price';
+  const colIdSize = 'size';
+  const colIdCreatedAt = 'createdAt';
 
-  it('show trades', () => {
-    // 6005-THIS-001
-    // 6005-THIS-002
-    cy.getByTestId(tradesTab).should('be.visible');
-    cy.getByTestId(tradesTable).should('be.visible');
-    cy.getByTestId(tradesTable).should('not.be.empty');
-  });
+  it('renders trades', () => {
+    cy.getByTestId('Trades').click();
+    cy.getByTestId('tab-trades').should('be.visible');
 
-  it('show trades prices', () => {
-    // 6005-THIS-003
-    cy.get(`${colIdPrice} ${colHeader}`).first().should('have.text', 'Price');
-    cy.get(colIdPrice).each(($tradePrice) => {
+    cy.get(`[col-id=${colIdPrice}]`).each(($tradePrice) => {
       cy.wrap($tradePrice).invoke('text').should('not.be.empty');
     });
-  });
-
-  it('show trades sizes', () => {
-    // 6005-THIS-004
-    cy.get(`${colIdSize} ${colHeader}`).first().should('have.text', 'Size');
-    cy.get(colIdSize).each(($tradeSize) => {
+    cy.get(`[col-id=${colIdSize}]`).each(($tradeSize) => {
       cy.wrap($tradeSize).invoke('text').should('not.be.empty');
     });
-  });
 
-  it('show trades date and time', () => {
-    // 6005-THIS-005
-    cy.get(`${colIdCreatedAt} ${colHeader}`).should('have.text', 'Created at');
     const dateTimeRegex =
       /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
-    cy.get(colIdCreatedAt).each(($tradeDateTime, index) => {
+    cy.get(`[col-id=${colIdCreatedAt}]`).each(($tradeDateTime, index) => {
       if (index != 0) {
         //ignore header
         cy.wrap($tradeDateTime).invoke('text').should('match', dateTimeRegex);
       }
     });
   });
-
-  it('trades are sorted descending by datetime', () => {
-    // 6005-THIS-006
-    const dateTimes: Date[] = [];
-    cy.get(colIdCreatedAt)
-      .each(($tradeDateTime, index) => {
-        if (index != 0) {
-          //ignore header
-          dateTimes.push(new Date($tradeDateTime.text()));
-        }
-      })
-      .then(() => {
-        expect(dateTimes).to.deep.equal(
-          dateTimes.sort((a, b) => b.getTime() - a.getTime())
-        );
-      });
-  });
-
-  it('copy price to deal ticket form', () => {
-    // 6005-THIS-007
-    cy.get(colIdPrice).last().click();
-    cy.getByTestId('order-price').should('have.value', '171.16898');
-  });
 });

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

@@ -143,7 +143,6 @@ const MarketBottomPanel = memo(
                 <VegaWalletContainer>
                   <TradingViews.collateral.component
                     pinnedAsset={pinnedAsset}
-                    onMarketClick={onMarketClick}
                     hideButtons
                     storeKey="marketCollateral"
                   />
@@ -224,7 +223,6 @@ const MarketBottomPanel = memo(
             <VegaWalletContainer>
               <TradingViews.collateral.component
                 pinnedAsset={pinnedAsset}
-                onMarketClick={onMarketClick}
                 hideButtons
                 storeKey="marketCollateral"
               />
@@ -250,7 +248,6 @@ const MainGrid = memo(
     const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
       id: 'middle-1',
     });
-    const onMarketClick = useMarketClickHandler(true);
 
     return (
       <ResizableGrid vertical onChange={handleOnLayoutChange}>
@@ -269,7 +266,6 @@ const MainGrid = memo(
                   <Tab id="ticket" name={t('Ticket')}>
                     <TradingViews.ticket.component
                       marketId={marketId}
-                      onMarketClick={onMarketClick}
                       onClickCollateral={() => navigate('/portfolio')}
                     />
                   </Tab>

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

@@ -22,7 +22,7 @@ export const DepositsContainer = () => {
     <div className="h-full">
       <div className="h-full relative">
         <DepositsTable
-          rowData={data}
+          rowData={data || []}
           ref={gridRef}
           {...bottomPlaceholderProps}
           overlayNoRowsTemplate={error ? error.message : t('No deposits')}

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

@@ -92,10 +92,7 @@ export const Portfolio = () => {
             <Tabs storageKey="console-portfolio-bottom">
               <Tab id="collateral" name={t('Collateral')}>
                 <VegaWalletContainer>
-                  <AccountsContainer
-                    storeKey="portfolioCollateral"
-                    onMarketClick={onMarketClick}
-                  />
+                  <AccountsContainer storeKey="portfolioCollateral" />
                 </VegaWalletContainer>
               </Tab>
               <Tab id="deposits" name={t('Deposits')}>

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

@@ -13,12 +13,10 @@ export const AccountsContainer = ({
   pinnedAsset,
   hideButtons,
   storeKey,
-  onMarketClick,
 }: {
   pinnedAsset?: PinnedAsset;
   hideButtons?: boolean;
   storeKey?: string;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
   const { pubKey, isReadOnly } = useVegaWallet();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -48,7 +46,6 @@ export const AccountsContainer = ({
         onClickAsset={onClickAsset}
         onClickWithdraw={openWithdrawalDialog}
         onClickDeposit={openDepositDialog}
-        onMarketClick={onMarketClick}
         isReadOnly={isReadOnly}
         pinnedAsset={pinnedAsset}
         storeKey={storeKey}

libs/accounts/src/lib/Margins.graphql

@@ -1,38 +0,0 @@
-fragment MarginFields on MarginLevels {
-  maintenanceLevel
-  searchLevel
-  initialLevel
-  collateralReleaseLevel
-  asset {
-    id
-  }
-  market {
-    id
-  }
-}
-
-query Margins($partyId: ID!) {
-  party(id: $partyId) {
-    id
-    marginsConnection {
-      edges {
-        node {
-          ...MarginFields
-        }
-      }
-    }
-  }
-}
-
-subscription MarginsSubscription($partyId: ID!) {
-  margins(partyId: $partyId) {
-    marketId
-    asset
-    partyId
-    maintenanceLevel
-    searchLevel
-    initialLevel
-    collateralReleaseLevel
-    timestamp
-  }
-}

libs/accounts/src/lib/__generated__/Margins.ts

@@ -1,114 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type MarginFieldsFragment = { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } };
-
-export type MarginsQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type MarginsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, marginsConnection?: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };
-
-export type MarginsSubscriptionSubscriptionVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type MarginsSubscriptionSubscription = { __typename?: 'Subscription', margins: { __typename?: 'MarginLevelsUpdate', marketId: string, asset: string, partyId: string, maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, timestamp: any } };
-
-export const MarginFieldsFragmentDoc = gql`
-    fragment MarginFields on MarginLevels {
-  maintenanceLevel
-  searchLevel
-  initialLevel
-  collateralReleaseLevel
-  asset {
-    id
-  }
-  market {
-    id
-  }
-}
-    `;
-export const MarginsDocument = gql`
-    query Margins($partyId: ID!) {
-  party(id: $partyId) {
-    id
-    marginsConnection {
-      edges {
-        node {
-          ...MarginFields
-        }
-      }
-    }
-  }
-}
-    ${MarginFieldsFragmentDoc}`;
-
-/**
- * __useMarginsQuery__
- *
- * To run a query within a React component, call `useMarginsQuery` and pass it any options that fit your needs.
- * When your component renders, `useMarginsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useMarginsQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useMarginsQuery(baseOptions: Apollo.QueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
-      }
-export function useMarginsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
-        }
-export type MarginsQueryHookResult = ReturnType<typeof useMarginsQuery>;
-export type MarginsLazyQueryHookResult = ReturnType<typeof useMarginsLazyQuery>;
-export type MarginsQueryResult = Apollo.QueryResult<MarginsQuery, MarginsQueryVariables>;
-export const MarginsSubscriptionDocument = gql`
-    subscription MarginsSubscription($partyId: ID!) {
-  margins(partyId: $partyId) {
-    marketId
-    asset
-    partyId
-    maintenanceLevel
-    searchLevel
-    initialLevel
-    collateralReleaseLevel
-    timestamp
-  }
-}
-    `;
-
-/**
- * __useMarginsSubscriptionSubscription__
- *
- * To run a query within a React component, call `useMarginsSubscriptionSubscription` and pass it any options that fit your needs.
- * When your component renders, `useMarginsSubscriptionSubscription` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the subscription, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useMarginsSubscriptionSubscription({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useMarginsSubscriptionSubscription(baseOptions: Apollo.SubscriptionHookOptions<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useSubscription<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>(MarginsSubscriptionDocument, options);
-      }
-export type MarginsSubscriptionSubscriptionHookResult = ReturnType<typeof useMarginsSubscriptionSubscription>;
-export type MarginsSubscriptionSubscriptionResult = Apollo.SubscriptionResult<MarginsSubscriptionSubscription>;

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

@@ -1,4 +1,4 @@
-import { useRef, memo, useState, useCallback } from 'react';
+import { useRef, memo, useState } from 'react';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
@@ -15,25 +15,14 @@ import BreakdownTable from './breakdown-table';
 const AccountBreakdown = ({
   assetId,
   partyId,
-  onMarketClick,
 }: {
   assetId: string;
   partyId: string;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
-  const gridRef = useRef<AgGridReact>(null);
   const { data } = useDataProvider({
     dataProvider: aggregatedAccountDataProvider,
     variables: { partyId, assetId },
-    update: ({ data }) => {
-      if (gridRef.current?.api && data?.breakdown) {
-        gridRef.current?.api.setRowData(data?.breakdown);
-        return true;
-      }
-      return false;
-    },
   });
-
   return (
     <div
       className="h-[35vh] w-full m-auto flex flex-col"
@@ -50,57 +39,16 @@ const AccountBreakdown = ({
           ])}
         </p>
       )}
-      <BreakdownTable
-        ref={gridRef}
-        data={data?.breakdown || null}
-        domLayout="autoHeight"
-        onMarketClick={onMarketClick}
-      />
+      <BreakdownTable data={data?.breakdown || null} domLayout="autoHeight" />
     </div>
   );
 };
 
-export const AccountBreakdownDialog = memo(
-  ({
-    assetId,
-    partyId,
-    onClose,
-    onMarketClick,
-  }: {
-    assetId?: string;
-    partyId: string;
-    onClose: () => void;
-    onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  }) => {
-    console.log('render');
-    return (
-      <Dialog
-        size="medium"
-        open={Boolean(assetId)}
-        onChange={(isOpen) => {
-          if (!isOpen) {
-            onClose();
-          }
-        }}
-      >
-        {assetId && (
-          <AccountBreakdown
-            assetId={assetId}
-            partyId={partyId}
-            onMarketClick={onMarketClick}
-          />
-        )}
-      </Dialog>
-    );
-  }
-);
-
 interface AccountManagerProps {
   partyId: string;
   onClickAsset: (assetId: string) => void;
   onClickWithdraw?: (assetId?: string) => void;
   onClickDeposit?: (assetId?: string) => void;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   isReadOnly: boolean;
   pinnedAsset?: PinnedAsset;
   storeKey?: string;
@@ -114,7 +62,6 @@ export const AccountManager = ({
   isReadOnly,
   pinnedAsset,
   storeKey,
-  onMarketClick,
 }: AccountManagerProps) => {
   const gridRef = useRef<AgGridReact | null>(null);
   const [breakdownAssetId, setBreakdownAssetId] = useState<string>();
@@ -124,16 +71,6 @@ export const AccountManager = ({
     variables: { partyId },
   });
 
-  const onMarketClickInternal = useCallback(
-    (...args: Parameters<NonNullable<typeof onMarketClick>>) => {
-      setBreakdownAssetId(undefined);
-      if (onMarketClick) {
-        onMarketClick(...args);
-      }
-    },
-    [onMarketClick]
-  );
-
   return (
     <div className="relative h-full">
       <AccountTable
@@ -148,12 +85,19 @@ export const AccountManager = ({
         storeKey={storeKey}
         overlayNoRowsTemplate={error ? error.message : t('No accounts')}
       />
-      <AccountBreakdownDialog
-        assetId={breakdownAssetId}
-        partyId={partyId}
-        onClose={useCallback(() => setBreakdownAssetId(undefined), [])}
-        onMarketClick={onMarketClick ? onMarketClickInternal : undefined}
-      />
+      <Dialog
+        size="medium"
+        open={Boolean(breakdownAssetId)}
+        onChange={(isOpen) => {
+          if (!isOpen) {
+            setBreakdownAssetId(undefined);
+          }
+        }}
+      >
+        {breakdownAssetId && (
+          <AccountBreakdown assetId={breakdownAssetId} partyId={partyId} />
+        )}
+      </Dialog>
     </div>
   );
 };

libs/accounts/src/lib/accounts.mock.ts

@@ -151,53 +151,19 @@ export const amendGeneralAccountBalance = (
   marketId: string,
   balance: string
 ) => {
-  if (!accounts.party?.accountsConnection?.edges) {
-    return accounts;
-  }
-  const marginAccount = accounts.party?.accountsConnection?.edges?.find(
-    (edge) => edge?.node.market?.id === marketId
-  );
-  if (marginAccount) {
-    const edges = accounts.party.accountsConnection.edges.map((edge) =>
-      edge?.node.asset.id === marginAccount.node.asset.id && !edge?.node.market
-        ? { ...edge, node: { ...edge.node, balance } }
-        : edge
+  if (accounts.party?.accountsConnection?.edges) {
+    const marginAccount = accounts.party.accountsConnection.edges.find(
+      (edge) => edge?.node.market?.id === marketId
     );
-    return {
-      ...accounts,
-      party: {
-        ...accounts.party,
-        accountsConnection: {
-          ...accounts.party.accountsConnection,
-          edges,
-        },
-      },
-    };
+    if (marginAccount) {
+      const generalAccount = accounts.party.accountsConnection.edges.find(
+        (edge) =>
+          edge?.node.asset.id === marginAccount.node.asset.id &&
+          !edge?.node.market
+      );
+      if (generalAccount) {
+        generalAccount.node.balance = balance;
+      }
+    }
   }
-  return accounts;
-};
-
-export const amendMarginAccountBalance = (
-  accounts: AccountsQuery,
-  marketId: string,
-  balance: string
-) => {
-  if (!accounts.party?.accountsConnection?.edges) {
-    return accounts;
-  }
-  const edges = accounts.party?.accountsConnection?.edges?.map((edge) =>
-    edge?.node.market?.id === marketId
-      ? { ...edge, node: { ...edge?.node, balance } }
-      : edge
-  );
-  return {
-    ...accounts,
-    party: {
-      ...accounts.party,
-      accountsConnection: {
-        ...accounts.party.accountsConnection,
-        edges,
-      },
-    },
-  };
 };

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

@@ -4,14 +4,6 @@ import * as Types from '@vegaprotocol/types';
 import type { AccountFields } from './accounts-data-provider';
 import { getAccountData } from './accounts-data-provider';
 
-const marginHealthChartTestId = 'margin-health-chart';
-
-jest.mock('./margin-health-chart', () => ({
-  MarginHealthChart: () => {
-    return <div data-testid={marginHealthChartTestId}></div>;
-  },
-}));
-
 const singleRow = {
   __typename: 'AccountBalance',
   type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
@@ -45,10 +37,10 @@ describe('BreakdownTable', () => {
       render(<BreakdownTable data={singleRowData} />);
     });
     const headers = await screen.findAllByRole('columnheader');
-    expect(headers).toHaveLength(4);
+    expect(headers).toHaveLength(3);
     expect(
       headers.map((h) => h.querySelector('[ref="eText"]')?.textContent?.trim())
-    ).toEqual(['Market', 'Account type', 'Balance', 'Margin health']);
+    ).toEqual(['Market', 'Account type', 'Balance']);
   });
 
   it('should apply correct formatting', async () => {
@@ -63,27 +55,9 @@ describe('BreakdownTable', () => {
       '1,256.00',
       '1,256.00',
     ];
-    cells.slice(0, -1).forEach((cell, i) => {
+    cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);
     });
-    expect(screen.getByTestId(marginHealthChartTestId)).toBeInTheDocument();
-  });
-
-  it('displays margin health chart only for margin account', async () => {
-    await act(async () => {
-      render(
-        <BreakdownTable
-          data={[
-            {
-              ...singleRow,
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              market: null,
-            },
-          ]}
-        />
-      );
-    });
-    expect(screen.queryByTestId(marginHealthChartTestId)).toBeNull();
   });
 
   it('should get correct account data', () => {

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

@@ -9,20 +9,16 @@ import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { AccountFields } from './accounts-data-provider';
 import { AccountTypeMapping } from '@vegaprotocol/types';
 import type {
-  VegaValueFormatterParams,
   VegaICellRendererParams,
+  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { ProgressBarCell } from '@vegaprotocol/datagrid';
 import { AgGridLazy as AgGrid, PriceCell } from '@vegaprotocol/datagrid';
 import type { ColDef } from 'ag-grid-community';
 import { accountValuesComparator } from './accounts-table';
-import { MarginHealthChart } from './margin-health-chart';
-import { MarketNameCell } from '@vegaprotocol/datagrid';
-import { AccountType } from '@vegaprotocol/types';
 
 interface BreakdownTableProps extends AgGridReactProps {
   data: AccountFields[] | null;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }
 
 const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
@@ -94,24 +90,6 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
           },
           comparator: accountValuesComparator,
         },
-        {
-          headerName: t('Margin health'),
-          field: 'market.id',
-          flex: 2,
-          maxWidth: 500,
-          sortable: false,
-          cellRenderer: ({
-            data,
-          }: VegaICellRendererParams<AccountFields, 'market.id'>) =>
-            data?.market?.id &&
-            data.type === AccountType['ACCOUNT_TYPE_MARGIN'] &&
-            data?.asset.id ? (
-              <MarginHealthChart
-                marketId={data.market.id}
-                assetId={data.asset.id}
-              />
-            ) : null,
-        },
       ];
       return defs;
     }, []);
@@ -126,7 +104,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
         }
         ref={ref}
         rowHeight={34}
-        components={{ PriceCell, MarketNameCell, ProgressBarCell }}
+        components={{ PriceCell }}
         tooltipShowDelay={500}
         defaultColDef={{
           flex: 1,

libs/accounts/src/lib/index.ts

@@ -8,6 +8,3 @@ export * from './use-account-balance';
 export * from './get-settlement-account';
 export * from './use-market-account-balance';
 export * from './transfer-dialog';
-export * from './__generated__/Margins';
-export { MarginHealthChart } from './margin-health-chart';
-export * from './margin-data-provider';

libs/accounts/src/lib/margin-health-chart.tsx

@@ -1,242 +0,0 @@
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { Tooltip, ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketMarginDataProvider } from './margin-data-provider';
-import { useAssetsMapProvider } from '@vegaprotocol/assets';
-import { t } from '@vegaprotocol/i18n';
-import { useAccountBalance } from './use-account-balance';
-import { useMarketAccountBalance } from './use-market-account-balance';
-
-const MarginHealthChartTooltipRow = ({
-  label,
-  value,
-  decimals,
-  href,
-}: {
-  label: string;
-  value: string;
-  decimals: number;
-  href?: string;
-}) => (
-  <>
-    <div
-      className="float-left clear-left"
-      key="label"
-      data-testid="margin-health-tooltip-label"
-    >
-      {href ? (
-        <ExternalLink href={href} target="_blank">
-          {label}
-        </ExternalLink>
-      ) : (
-        label
-      )}
-    </div>
-    <div
-      className="float-right"
-      key="value"
-      data-testid="margin-health-tooltip-value"
-    >
-      {addDecimalsFormatNumber(value, decimals)}
-    </div>
-  </>
-);
-
-export const MarginHealthChartTooltip = ({
-  maintenanceLevel,
-  searchLevel,
-  initialLevel,
-  collateralReleaseLevel,
-  decimals,
-  marginAccountBalance,
-}: {
-  maintenanceLevel: string;
-  searchLevel: string;
-  initialLevel: string;
-  collateralReleaseLevel: string;
-  decimals: number;
-  marginAccountBalance?: string;
-}) => {
-  const tooltipContent = [
-    <MarginHealthChartTooltipRow
-      key={'maintenance'}
-      label={t('maintenance level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-maintenance"
-      value={maintenanceLevel}
-      decimals={decimals}
-    />,
-    <MarginHealthChartTooltipRow
-      key={'search'}
-      label={t('search level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-searching-for-collateral"
-      value={searchLevel}
-      decimals={decimals}
-    />,
-    <MarginHealthChartTooltipRow
-      key={'initial'}
-      label={t('initial level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-initial"
-      value={initialLevel}
-      decimals={decimals}
-    />,
-    <MarginHealthChartTooltipRow
-      key={'release'}
-      label={t('release level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-releasing-collateral"
-      value={collateralReleaseLevel}
-      decimals={decimals}
-    />,
-  ];
-
-  if (marginAccountBalance) {
-    const balance = (
-      <MarginHealthChartTooltipRow
-        key={'balance'}
-        label={t('balance')}
-        value={marginAccountBalance}
-        decimals={decimals}
-      />
-    );
-    if (BigInt(marginAccountBalance) < BigInt(searchLevel)) {
-      tooltipContent.splice(1, 0, balance);
-    } else if (BigInt(marginAccountBalance) < BigInt(initialLevel)) {
-      tooltipContent.splice(2, 0, balance);
-    } else if (BigInt(marginAccountBalance) < BigInt(collateralReleaseLevel)) {
-      tooltipContent.splice(3, 0, balance);
-    } else {
-      tooltipContent.push(balance);
-    }
-  }
-  return (
-    <div className="overflow-hidden" data-testid="margin-health-tooltip">
-      {tooltipContent}
-    </div>
-  );
-};
-
-export const MarginHealthChart = ({
-  marketId,
-  assetId,
-}: {
-  marketId: string;
-  assetId: string;
-}) => {
-  const { data: assetsMap } = useAssetsMapProvider();
-  const { pubKey: partyId } = useVegaWallet();
-  const { data } = useDataProvider({
-    dataProvider: marketMarginDataProvider,
-    variables: { marketId, partyId: partyId ?? '' },
-    skip: !partyId,
-  });
-  const { accountBalance: rawGeneralAccountBalance } =
-    useAccountBalance(assetId);
-  const { accountBalance: rawMarginAccountBalance } =
-    useMarketAccountBalance(marketId);
-  const asset = assetsMap && assetsMap[assetId];
-  if (!data || !asset) {
-    return null;
-  }
-  const { decimals } = asset;
-
-  const collateralReleaseLevel = Number(data.collateralReleaseLevel);
-  const initialLevel = Number(data.initialLevel);
-  const maintenanceLevel = Number(data.maintenanceLevel);
-  const searchLevel = Number(data.searchLevel);
-  const marginAccountBalance = Number(rawMarginAccountBalance);
-  const generalAccountBalance = Number(rawGeneralAccountBalance);
-  const max = Math.max(
-    marginAccountBalance + generalAccountBalance,
-    collateralReleaseLevel
-  );
-
-  const red = maintenanceLevel / max;
-  const orange = (searchLevel - maintenanceLevel) / max;
-  const yellow = ((searchLevel + initialLevel) / 2 - searchLevel) / max;
-  const green = (collateralReleaseLevel - initialLevel) / max + yellow;
-  const balanceMarker = marginAccountBalance / max;
-
-  const tooltip = (
-    <MarginHealthChartTooltip
-      maintenanceLevel={data.maintenanceLevel}
-      searchLevel={data.searchLevel}
-      initialLevel={data.initialLevel}
-      collateralReleaseLevel={data.collateralReleaseLevel}
-      marginAccountBalance={rawMarginAccountBalance}
-      decimals={decimals}
-    />
-  );
-
-  return (
-    <div data-testid="margin-health-chart">
-      {addDecimalsFormatNumber(
-        (BigInt(marginAccountBalance) - BigInt(maintenanceLevel)).toString(),
-        decimals
-      )}{' '}
-      {t('above')}{' '}
-      <ExternalLink href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-maintenance">
-        {t('maintenance level')}
-      </ExternalLink>
-      <Tooltip description={tooltip}>
-        <div
-          data-testid="margin-health-chart-track"
-          className="relative bg-vega-green-650"
-          style={{
-            height: '6px',
-            marginBottom: '1px',
-            display: 'flex',
-          }}
-        >
-          <div
-            data-testid="margin-health-chart-red"
-            className="bg-vega-pink-550"
-            style={{
-              height: '100%',
-              width: `${red * 100}%`,
-            }}
-          ></div>
-          <div
-            data-testid="margin-health-chart-orange"
-            className="bg-vega-orange"
-            style={{
-              height: '100%',
-              width: `${orange * 100}%`,
-            }}
-          ></div>
-          <div
-            data-testid="margin-health-chart-yellow"
-            className="bg-vega-yellow"
-            style={{
-              height: '100%',
-              width: `${yellow * 100}%`,
-            }}
-          ></div>
-          <div
-            data-testid="margin-health-chart-green"
-            className="bg-vega-green-600"
-            style={{
-              height: '100%',
-              width: `${green * 100}%`,
-            }}
-          ></div>
-          {balanceMarker > 0 && balanceMarker < 100 && (
-            <div
-              data-testid="margin-health-chart-balance"
-              className="absolute bg-vega-blue"
-              style={{
-                height: '8px',
-                width: '8px',
-                top: '-1px',
-                transform: 'translate(-4px, 0px)',
-                borderRadius: '50%',
-                border: '1px solid white',
-                backgroundColor: 'blue',
-                left: `${balanceMarker * 100}%`,
-              }}
-            ></div>
-          )}
-        </div>
-      </Tooltip>
-    </div>
-  );
-};

libs/accounts/src/lib/margin-heath-chart.spec.tsx

@@ -1,154 +0,0 @@
-import {
-  MarginHealthChart,
-  MarginHealthChartTooltip,
-} from './margin-health-chart';
-import { act, render, screen } from '@testing-library/react';
-import type { MarginFieldsFragment } from './__generated__/Margins';
-import type { AssetFieldsFragment } from '@vegaprotocol/assets';
-
-const asset: AssetFieldsFragment = {
-  id: 'assetId',
-  decimals: 2,
-} as AssetFieldsFragment;
-const margins: MarginFieldsFragment = {
-  asset: {
-    id: 'assetId',
-  },
-  collateralReleaseLevel: '1000',
-  initialLevel: '800',
-  searchLevel: '600',
-  maintenanceLevel: '400',
-  market: {
-    id: 'marketId',
-  },
-};
-
-const getMargins = jest.fn(() => margins);
-const getBalance = jest.fn(() => '0');
-
-jest.mock('./margin-data-provider', () => ({}));
-
-jest.mock('@vegaprotocol/assets', () => ({
-  useAssetsMapProvider: () => {
-    return {
-      data: {
-        assetId: asset,
-      },
-    };
-  },
-}));
-
-jest.mock('@vegaprotocol/wallet', () => ({
-  useVegaWallet: () => {
-    return {
-      pubKey: 'partyId',
-    };
-  },
-}));
-
-jest.mock('@vegaprotocol/data-provider', () => ({
-  useDataProvider: () => {
-    return {
-      data: getMargins(),
-    };
-  },
-}));
-
-jest.mock('./use-account-balance', () => ({
-  useAccountBalance: () => {
-    return {
-      accountBalance: getBalance(),
-    };
-  },
-}));
-
-jest.mock('./use-market-account-balance', () => ({
-  useMarketAccountBalance: () => {
-    return {
-      accountBalance: '700',
-    };
-  },
-}));
-
-describe('MarginHealthChart', () => {
-  it('should render correct values', async () => {
-    render(<MarginHealthChart marketId="marketId" assetId="assetId" />);
-    const chart = screen.getByTestId('margin-health-chart');
-    expect(chart).toHaveTextContent('3.00 above maintenance level');
-    const red = screen.getByTestId('margin-health-chart-red');
-    const orange = screen.getByTestId('margin-health-chart-orange');
-    const yellow = screen.getByTestId('margin-health-chart-yellow');
-    const green = screen.getByTestId('margin-health-chart-green');
-    const balance = screen.getByTestId('margin-health-chart-balance');
-    expect(parseInt(red.style.width)).toBe(40);
-    expect(parseInt(orange.style.width)).toBe(20);
-    expect(parseInt(yellow.style.width)).toBe(10);
-    expect(parseInt(green.style.width)).toBe(30);
-    expect(parseInt(balance.style.left)).toBe(70);
-  });
-
-  it('should use correct scale', async () => {
-    getBalance.mockReturnValueOnce('1300');
-    await act(async () => {
-      render(<MarginHealthChart marketId="marketId" assetId="assetId" />);
-    });
-    await screen.findByTestId('margin-health-chart');
-    const red = screen.getByTestId('margin-health-chart-red');
-    expect(parseInt(red.style.width)).toBe(20);
-  });
-});
-
-describe('MarginHealthChartTooltip', () => {
-  it('renders correct values and labels', async () => {
-    await act(async () => {
-      render(
-        <MarginHealthChartTooltip
-          {...margins}
-          decimals={asset.decimals}
-          marginAccountBalance="500"
-        />
-      );
-    });
-    const labels = await screen.findAllByTestId('margin-health-tooltip-label');
-    const expectedLabels = [
-      'maintenance level',
-      'balance',
-      'search level',
-      'initial level',
-      'release level',
-    ];
-    labels.forEach((value, i) => {
-      expect(value).toHaveTextContent(expectedLabels[i]);
-    });
-    const values = await screen.findAllByTestId('margin-health-tooltip-value');
-    const expectedValues = ['4.00', '5.00', '6.00', '8.00', '10.00'];
-    values.forEach((value, i) => {
-      expect(value).toHaveTextContent(expectedValues[i]);
-    });
-  });
-
-  it('renders balance in correct place', async () => {
-    const { rerender } = render(
-      <MarginHealthChartTooltip
-        {...margins}
-        decimals={asset.decimals}
-        marginAccountBalance="700"
-      />
-    );
-
-    let values = await screen.findAllByTestId('margin-health-tooltip-value');
-    expect(values[2]).toHaveTextContent('7.00');
-
-    rerender(
-      <MarginHealthChartTooltip
-        {...margins}
-        decimals={asset.decimals}
-        marginAccountBalance="900"
-      />
-    );
-
-    values = await screen.findAllByTestId('margin-health-tooltip-value');
-    expect(values.length).toBe(5);
-    expect(values[3]).toHaveTextContent('9.00');
-  });
-});

libs/accounts/src/lib/use-account-balance.tsx

@@ -23,6 +23,7 @@ export const useAccountBalance = (assetId?: string) => {
     },
     [assetId]
   );
+
   useDataProvider({
     dataProvider: accountsDataProvider,
     variables,

libs/accounts/src/lib/use-market-account-balance.tsx

@@ -22,6 +22,7 @@ export const useMarketAccountBalance = (marketId: string) => {
     },
     [marketId]
   );
+
   useDataProvider({
     dataProvider: accountsDataProvider,
     variables: { partyId: pubKey || '' },

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

@@ -1,4 +1,4 @@
-import type { MouseEvent, ReactNode } from 'react';
+import type { MouseEvent } from 'react';
 import { useCallback } from 'react';
 import get from 'lodash/get';
 
@@ -7,7 +7,6 @@ interface MarketNameCellProps {
   data?: { id?: string; marketId?: string; market?: { id: string } };
   idPath?: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  defaultValue?: ReactNode;
 }
 
 export const MarketNameCell = ({
@@ -27,13 +26,10 @@ export const MarketNameCell = ({
     },
     [id, onMarketClick]
   );
-  if (!value || !data) return null;
-  return onMarketClick ? (
+  if (!data) return null;
+  return (
     <button onClick={handleOnClick} tabIndex={0}>
       {value}
     </button>
-  ) : (
-    // eslint-disable-next-line react/jsx-no-useless-fragment
-    <>{value}</>
   );
 };

libs/datagrid/src/lib/type-helpers.ts

@@ -24,13 +24,11 @@ export type VegaValueFormatterParams<TRow, TField extends Field> = RowHelper<
   TField
 >;
 
-export type VegaValueGetterParams<TRow> = Omit<
+export type VegaValueGetterParams<TRow, TField extends Field> = RowHelper<
   ValueGetterParams,
-  'data' | 'node'
-> & {
-  data?: TRow;
-  node: (Omit<RowNode, 'data'> & { data?: TRow }) | null;
-};
+  TRow,
+  TField
+>;
 
 export type VegaICellRendererParams<TRow, TField extends Field = string> = Omit<
   RowHelper<ICellRendererParams, TRow, TField>,

libs/deal-ticket/src/components/deal-ticket-validation/margin-warning.tsx

@@ -18,7 +18,7 @@ export const MarginWarning = ({ margin, balance, asset }: Props) => {
   return (
     <Notification
       intent={Intent.Warning}
-      testId="deal-ticket-warning-margin"
+      testId="dealticket-warning-margin"
       message={`You may not have enough margin available to open this position. ${addDecimalsFormatNumber(
         margin,
         asset.decimals

libs/deal-ticket/src/components/deal-ticket-validation/zero-balance-error.tsx

@@ -18,7 +18,7 @@ export const ZeroBalanceError = ({
   return (
     <Notification
       intent={Intent.Warning}
-      testId="deal-ticket-error-message-zero-balance"
+      testId="dealticket-error-message-zero-balance"
       message={
         <>
           {t(

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

@@ -7,13 +7,11 @@ import { DealTicket } from './deal-ticket';
 
 export interface DealTicketContainerProps {
   marketId: string;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   onClickCollateral?: () => void;
 }
 
 export const DealTicketContainer = ({
   marketId,
-  onMarketClick,
   onClickCollateral,
 }: DealTicketContainerProps) => {
   const {
@@ -49,7 +47,6 @@ export const DealTicketContainer = ({
           marketData={marketData}
           submit={(orderSubmission) => create({ orderSubmission })}
           onClickCollateral={onClickCollateral}
-          onMarketClick={onMarketClick}
         />
       ) : (
         <Splash>

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

@@ -1,40 +1,14 @@
-import { useCallback, useState } from 'react';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import classnames from 'classnames';
 import type { ReactNode } from 'react';
-import { t } from '@vegaprotocol/i18n';
-import { FeesBreakdown } from '@vegaprotocol/markets';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { getFeeDetailsValues } from '../../hooks/use-fee-deal-ticket-details';
+import type { FeeDetails } from '../../hooks/use-fee-deal-ticket-details';
 
-import type { Market } from '@vegaprotocol/markets';
-import type { EstimatePositionQuery } from '@vegaprotocol/positions';
-import type { EstimateFeesQuery } from '../../hooks/__generated__/EstimateOrder';
-import { AccountBreakdownDialog } from '@vegaprotocol/accounts';
-
-import { formatRange, formatValue } from '@vegaprotocol/utils';
-import { marketMarginDataProvider } from '@vegaprotocol/accounts';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-
-import {
-  NOTIONAL_SIZE_TOOLTIP_TEXT,
-  MARGIN_DIFF_TOOLTIP_TEXT,
-  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
-  TOTAL_MARGIN_AVAILABLE,
-  LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT,
-  EST_TOTAL_MARGIN_TOOLTIP_TEXT,
-  MARGIN_ACCOUNT_TOOLTIP_TEXT,
-} from '../../constants';
-
-const emptyValue = '-';
-
-export interface DealTicketFeeDetailPros {
+export interface DealTicketFeeDetailProps {
   label: string;
-  value?: string | null | undefined;
-  symbol: string;
-  indent?: boolean | undefined;
-  labelDescription?: ReactNode;
-  formattedValue?: string;
-  onClick?: () => void;
+  value?: string | number | null;
+  labelDescription?: string | ReactNode;
+  symbol?: string;
 }
 
 export const DealTicketFeeDetail = ({
@@ -42,310 +16,51 @@ export const DealTicketFeeDetail = ({
   value,
   labelDescription,
   symbol,
-  indent,
-  onClick,
-  formattedValue,
-}: DealTicketFeeDetailPros) => {
-  const displayValue = `${formattedValue ?? '-'} ${symbol || ''}`;
-  const valueElement = onClick ? (
-    <button
-      onClick={onClick}
-      className="text-neutral-500 dark:text-neutral-300"
-    >
-      {displayValue}
-    </button>
-  ) : (
-    <div className="text-neutral-500 dark:text-neutral-300">{displayValue}</div>
-  );
-  return (
-    <div
-      data-testid={
-        'deal-ticket-fee-' + label.toLocaleLowerCase().replace(/\s/g, '-')
-      }
-      key={typeof label === 'string' ? label : 'value-dropdown'}
-      className={classnames(
-        'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',
-        { 'ml-2': indent }
-      )}
-    >
+}: DealTicketFeeDetailProps) => (
+  <div className="text-xs mt-2 flex justify-between items-center gap-4 flex-wrap">
+    <div>
       <Tooltip description={labelDescription}>
         <div>{label}</div>
       </Tooltip>
-      <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
-        {valueElement}
-      </Tooltip>
     </div>
-  );
-};
-
-export interface DealTicketFeeDetailsProps {
-  generalAccountBalance?: string;
-  marginAccountBalance?: string;
-  market: Market;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  assetSymbol: string;
-  notionalSize: string | null;
-  feeEstimate: EstimateFeesQuery['estimateFees'] | undefined;
-  positionEstimate: EstimatePositionQuery['estimatePosition'];
-}
-
-export const DealTicketFeeDetails = ({
-  marginAccountBalance,
-  generalAccountBalance,
-  assetSymbol,
-  feeEstimate,
-  market,
-  onMarketClick,
-  notionalSize,
-  positionEstimate,
-}: DealTicketFeeDetailsProps) => {
-  const [breakdownDialog, setBreakdownDialog] = useState(false);
-  const { pubKey: partyId } = useVegaWallet();
-  const { data: currentMargins } = useDataProvider({
-    dataProvider: marketMarginDataProvider,
-    variables: { marketId: market.id, partyId: partyId || '' },
-    skip: !partyId,
-  });
-  const liquidationEstimate = positionEstimate?.liquidation;
-  const marginEstimate = positionEstimate?.margin;
-  const totalBalance =
-    BigInt(generalAccountBalance || '0') + BigInt(marginAccountBalance || '0');
-  const { settlementAsset: asset } =
-    market.tradableInstrument.instrument.product;
-  const { decimals: assetDecimals, quantum } = asset;
-  let marginRequiredBestCase: string | undefined = undefined;
-  let marginRequiredWorstCase: string | undefined = undefined;
-  if (marginEstimate) {
-    if (currentMargins) {
-      marginRequiredBestCase = (
-        BigInt(marginEstimate.bestCase.initialLevel) -
-        BigInt(currentMargins.initialLevel)
-      ).toString();
-      if (marginRequiredBestCase.startsWith('-')) {
-        marginRequiredBestCase = '0';
-      }
-      marginRequiredWorstCase = (
-        BigInt(marginEstimate.worstCase.initialLevel) -
-        BigInt(currentMargins.initialLevel)
-      ).toString();
-      if (marginRequiredWorstCase.startsWith('-')) {
-        marginRequiredWorstCase = '0';
-      }
-    } else {
-      marginRequiredBestCase = marginEstimate.bestCase.initialLevel;
-      marginRequiredWorstCase = marginEstimate.worstCase.initialLevel;
-    }
-  }
-
-  const totalMarginAvailable = (
-    currentMargins
-      ? totalBalance - BigInt(currentMargins.maintenanceLevel)
-      : totalBalance
-  ).toString();
-
-  let deductionFromCollateral = null;
-  let projectedMargin = null;
-  if (marginAccountBalance) {
-    const deductionFromCollateralBestCase =
-      BigInt(marginEstimate?.bestCase.initialLevel ?? 0) -
-      BigInt(marginAccountBalance);
-
-    const deductionFromCollateralWorstCase =
-      BigInt(marginEstimate?.worstCase.initialLevel ?? 0) -
-      BigInt(marginAccountBalance);
-
-    deductionFromCollateral = (
-      <DealTicketFeeDetail
-        indent
-        label={t('Deduction from collateral')}
-        value={formatRange(
-          deductionFromCollateralBestCase > 0
-            ? deductionFromCollateralBestCase.toString()
-            : '0',
-          deductionFromCollateralWorstCase > 0
-            ? deductionFromCollateralWorstCase.toString()
-            : '0',
-          assetDecimals
-        )}
-        formattedValue={formatRange(
-          deductionFromCollateralBestCase > 0
-            ? deductionFromCollateralBestCase.toString()
-            : '0',
-          deductionFromCollateralWorstCase > 0
-            ? deductionFromCollateralWorstCase.toString()
-            : '0',
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-        labelDescription={DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT(assetSymbol)}
-      />
-    );
-    projectedMargin = (
-      <DealTicketFeeDetail
-        label={t('Projected margin')}
-        value={formatRange(
-          marginEstimate?.bestCase.initialLevel,
-          marginEstimate?.worstCase.initialLevel,
-          assetDecimals
-        )}
-        formattedValue={formatRange(
-          marginEstimate?.bestCase.initialLevel,
-          marginEstimate?.worstCase.initialLevel,
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-        labelDescription={EST_TOTAL_MARGIN_TOOLTIP_TEXT}
-      />
-    );
-  }
-
-  let liquidationPriceEstimate = emptyValue;
-
-  if (liquidationEstimate) {
-    const liquidationEstimateBestCaseIncludingBuyOrders = BigInt(
-      liquidationEstimate.bestCase.including_buy_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateBestCaseIncludingSellOrders = BigInt(
-      liquidationEstimate.bestCase.including_sell_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateBestCase =
-      liquidationEstimateBestCaseIncludingBuyOrders >
-      liquidationEstimateBestCaseIncludingSellOrders
-        ? liquidationEstimateBestCaseIncludingBuyOrders
-        : liquidationEstimateBestCaseIncludingSellOrders;
-
-    const liquidationEstimateWorstCaseIncludingBuyOrders = BigInt(
-      liquidationEstimate.worstCase.including_buy_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateWorstCaseIncludingSellOrders = BigInt(
-      liquidationEstimate.worstCase.including_sell_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateWorstCase =
-      liquidationEstimateWorstCaseIncludingBuyOrders >
-      liquidationEstimateWorstCaseIncludingSellOrders
-        ? liquidationEstimateWorstCaseIncludingBuyOrders
-        : liquidationEstimateWorstCaseIncludingSellOrders;
-    liquidationPriceEstimate = formatRange(
-      (liquidationEstimateBestCase < liquidationEstimateWorstCase
-        ? liquidationEstimateBestCase
-        : liquidationEstimateWorstCase
-      ).toString(),
-      (liquidationEstimateBestCase > liquidationEstimateWorstCase
-        ? liquidationEstimateBestCase
-        : liquidationEstimateWorstCase
-      ).toString(),
-      assetDecimals,
-      undefined,
-      market.decimalPlaces
-    );
-  }
-
-  const onAccountBreakdownDialogClose = useCallback(
-    () => setBreakdownDialog(false),
-    []
-  );
+    <div className="text-neutral-500 dark:text-neutral-300">{`${value ?? '-'} ${
+      symbol || ''
+    }`}</div>
+  </div>
+);
 
+export const DealTicketFeeDetails = (props: FeeDetails) => {
+  const details = getFeeDetailsValues(props);
   return (
     <div>
-      <DealTicketFeeDetail
-        label={t('Notional')}
-        value={formatValue(notionalSize, assetDecimals)}
-        formattedValue={formatValue(notionalSize, assetDecimals, quantum)}
-        symbol={assetSymbol}
-        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(assetSymbol)}
-      />
-      <DealTicketFeeDetail
-        label={t('Fees')}
-        value={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`
-        }
-        formattedValue={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`
-        }
-        labelDescription={
-          <>
-            <span>
-              {t(
-                `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
-              )}
-            </span>
-            <FeesBreakdown
-              fees={feeEstimate?.fees}
-              feeFactors={market.fees.factors}
-              symbol={assetSymbol}
-              decimals={assetDecimals}
-            />
-          </>
-        }
-        symbol={assetSymbol}
-      />
-      <DealTicketFeeDetail
-        label={t('Margin required')}
-        value={formatRange(
-          marginRequiredBestCase,
-          marginRequiredWorstCase,
-          assetDecimals
-        )}
-        formattedValue={formatRange(
-          marginRequiredBestCase,
-          marginRequiredWorstCase,
-          assetDecimals,
-          quantum
-        )}
-        labelDescription={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}
-        symbol={assetSymbol}
-      />
-      <DealTicketFeeDetail
-        label={t('Total margin available')}
-        indent
-        value={formatValue(totalMarginAvailable, assetDecimals)}
-        formattedValue={formatValue(
-          totalMarginAvailable,
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-        labelDescription={TOTAL_MARGIN_AVAILABLE(
-          formatValue(generalAccountBalance, assetDecimals, quantum),
-          formatValue(marginAccountBalance, assetDecimals, quantum),
-          formatValue(currentMargins?.maintenanceLevel, assetDecimals, quantum),
-          assetSymbol
-        )}
-      />
-      {deductionFromCollateral}
-      <DealTicketFeeDetail
-        label={t('Current margin allocation')}
-        indent
-        onClick={
-          generalAccountBalance ? () => setBreakdownDialog(true) : undefined
-        }
-        value={formatValue(marginAccountBalance, assetDecimals)}
-        symbol={assetSymbol}
-        labelDescription={MARGIN_ACCOUNT_TOOLTIP_TEXT}
-        formattedValue={formatValue(
-          marginAccountBalance,
-          assetDecimals,
-          quantum
-        )}
-      />
-      {projectedMargin}
-      <DealTicketFeeDetail
-        label={t('Liquidation price estimate')}
-        formattedValue={liquidationPriceEstimate}
-        symbol={assetSymbol}
-        labelDescription={LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT}
-      />
-      {partyId && (
-        <AccountBreakdownDialog
-          assetId={breakdownDialog ? asset.id : undefined}
-          partyId={partyId}
-          onMarketClick={onMarketClick}
-          onClose={onAccountBreakdownDialogClose}
-        />
+      {details.map(
+        ({
+          label,
+          value,
+          labelDescription,
+          symbol,
+          indent,
+          formattedValue,
+        }) => (
+          <div
+            key={typeof label === 'string' ? label : 'value-dropdown'}
+            className={classnames(
+              'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',
+              { 'ml-2': indent }
+            )}
+          >
+            <div>
+              <Tooltip description={labelDescription}>
+                <div>{label}</div>
+              </Tooltip>
+            </div>
+            <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
+              <div className="text-neutral-500 dark:text-neutral-300">{`${
+                formattedValue ?? '-'
+              } ${symbol || ''}`}</div>
+            </Tooltip>
+          </div>
+        )
       )}
     </div>
   );

libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx

@@ -25,7 +25,7 @@ export const DealTicketLimitAmount = ({
   const renderError = () => {
     if (sizeError) {
       return (
-        <InputError testId="deal-ticket-error-message-size-limit">
+        <InputError testId="dealticket-error-message-size-limit">
           {sizeError}
         </InputError>
       );
@@ -33,7 +33,7 @@ export const DealTicketLimitAmount = ({
 
     if (priceError) {
       return (
-        <InputError testId="deal-ticket-error-message-price-limit">
+        <InputError testId="dealticket-error-message-price-limit">
           {priceError}
         </InputError>
       );

libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx

@@ -90,7 +90,7 @@ export const DealTicketMarketAmount = ({
       {sizeError && (
         <InputError
           intent="danger"
-          testId="deal-ticket-error-message-size-market"
+          testId="dealticket-error-message-size-market"
         >
           {sizeError}
         </InputError>

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

@@ -31,7 +31,7 @@ import {
 } from '@vegaprotocol/positions';
 import { toBigNum, removeDecimal } from '@vegaprotocol/utils';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
-import { useEstimateFees } from '../../hooks/use-estimate-fees';
+import { useEstimateFees } from '../../hooks/use-fee-deal-ticket-details';
 import { getDerivedPrice } from '../../utils/get-price';
 import type { OrderInfo } from '@vegaprotocol/types';
 
@@ -55,17 +55,17 @@ import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import { useOrderForm } from '../../hooks/use-order-form';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 
+import { marketMarginDataProvider } from '@vegaprotocol/positions';
+
 export interface DealTicketProps {
   market: Market;
   marketData: MarketData;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   submit: (order: OrderSubmission) => void;
   onClickCollateral?: () => void;
 }
 
 export const DealTicket = ({
   market,
-  onMarketClick,
   marketData,
   submit,
   onClickCollateral,
@@ -176,6 +176,12 @@ export const DealTicket = ({
   const assetSymbol =
     market.tradableInstrument.instrument.product.settlementAsset.symbol;
 
+  const { data: currentMargins } = useDataProvider({
+    dataProvider: marketMarginDataProvider,
+    variables: { marketId: market.id, partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+
   useEffect(() => {
     if (!pubKey) {
       setError('summary', {
@@ -194,8 +200,7 @@ export const DealTicket = ({
       return;
     }
 
-    const hasNoBalance =
-      !BigInt(generalAccountBalance) && !BigInt(marginAccountBalance);
+    const hasNoBalance = !BigInt(generalAccountBalance);
     if (hasNoBalance) {
       setError('summary', {
         message: SummaryValidationType.NoCollateral,
@@ -219,7 +224,6 @@ export const DealTicket = ({
     marketState,
     marketTradingMode,
     generalAccountBalance,
-    marginAccountBalance,
     pubKey,
     setError,
     clearErrors,
@@ -483,7 +487,6 @@ export const DealTicket = ({
           }
         />
         <DealTicketFeeDetails
-          onMarketClick={onMarketClick}
           feeEstimate={feeEstimate}
           notionalSize={notionalSize}
           assetSymbol={assetSymbol}
@@ -491,6 +494,8 @@ export const DealTicket = ({
           generalAccountBalance={generalAccountBalance}
           positionEstimate={positionEstimate?.estimatePosition}
           market={market}
+          currentInitialMargin={currentMargins?.initialLevel}
+          currentMaintenanceMargin={currentMargins?.maintenanceLevel}
         />
       </form>
     </TinyScroll>
@@ -531,7 +536,7 @@ const SummaryMessage = memo(
     if (isReadOnly) {
       return (
         <div className="mb-2">
-          <InputError testId="deal-ticket-error-message-summary">
+          <InputError testId="dealticket-error-message-summary">
             {
               'You need to connect your own wallet to start trading on this market'
             }
@@ -580,7 +585,7 @@ const SummaryMessage = memo(
     if (errorMessage) {
       return (
         <div className="mb-2">
-          <InputError testId="deal-ticket-error-message-summary">
+          <InputError testId="dealticket-error-message-summary">
             {errorMessage}
           </InputError>
         </div>
@@ -608,7 +613,7 @@ const SummaryMessage = memo(
         <div className="mb-2">
           <Notification
             intent={Intent.Warning}
-            testId={'deal-ticket-warning-auction'}
+            testId={'dealticket-warning-auction'}
             message={t(
               'Any orders placed now will not trade until the auction ends'
             )}

libs/deal-ticket/src/components/deal-ticket/expiry-selector.tsx

@@ -31,7 +31,7 @@ export const ExpirySelector = ({
         min={minDate}
       />
       {errorMessage && (
-        <InputError testId="deal-ticket-error-message-expiry">
+        <InputError testId="dealticket-error-message-expiry">
           {errorMessage}
         </InputError>
       )}

libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx

@@ -108,7 +108,7 @@ export const TimeInForceSelector = ({
         ))}
       </Select>
       {errorMessage && (
-        <InputError testId="deal-ticket-error-message-tif">
+        <InputError testId="dealticket-error-message-tif">
           {renderError(errorMessage)}
         </InputError>
       )}

libs/deal-ticket/src/components/deal-ticket/type-selector.tsx

@@ -83,7 +83,7 @@ export const TypeSelector = ({
         onChange={(e) => onSelect(e.target.value as Schema.OrderType)}
       />
       {errorMessage && (
-        <InputError testId="deal-ticket-error-message-type">
+        <InputError testId="dealticket-error-message-type">
           {renderError(errorMessage as MarketModeValidationType)}
         </InputError>
       )}

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

@@ -1,2 +1,2 @@
 export * from './__generated__/EstimateOrder';
-export * from './use-estimate-fees';
+export * from './use-fee-deal-ticket-details';

libs/deal-ticket/src/hooks/use-estimate-fees.tsx

@@ -1,25 +0,0 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
-
-import { useEstimateFeesQuery } from './__generated__/EstimateOrder';
-
-export const useEstimateFees = (
-  order?: OrderSubmissionBody['orderSubmission']
-) => {
-  const { pubKey } = useVegaWallet();
-
-  const { data } = useEstimateFeesQuery({
-    variables: order && {
-      marketId: order.marketId,
-      partyId: pubKey || '',
-      price: order.price,
-      size: order.size,
-      side: order.side,
-      timeInForce: order.timeInForce,
-      type: order.type,
-    },
-    fetchPolicy: 'no-cache',
-    skip: !pubKey || !order?.size || !order?.price,
-  });
-  return data?.estimateFees;
-};

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

@@ -1,6 +1,6 @@
-import { formatRange, formatValue } from './range';
+import { formatRange, formatValue } from './use-fee-deal-ticket-details';
 
-describe('formatValue', () => {
+describe('useFeeDealTicketDetails', () => {
   it.each([
     { v: 123000, d: 5, o: '1.23' },
     { v: 123000, d: 3, o: '123.00' },
@@ -35,8 +35,7 @@ describe('formatValue', () => {
       expect(formatValue(v.toString(), d, q)).toStrictEqual(o);
     }
   );
-});
-describe('formatRange', () => {
+
   it.each([
     { min: 123000, max: 12300011111, d: 5, o: '1.23 - 123,000.111', q: '0.1' },
     {

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

@@ -0,0 +1,327 @@
+import { FeesBreakdown } from '@vegaprotocol/markets';
+import {
+  addDecimalsFormatNumber,
+  addDecimalsFormatNumberQuantum,
+  isNumeric,
+} from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import type { Market } from '@vegaprotocol/markets';
+import type { EstimatePositionQuery } from '@vegaprotocol/positions';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import {
+  EST_TOTAL_MARGIN_TOOLTIP_TEXT,
+  NOTIONAL_SIZE_TOOLTIP_TEXT,
+  MARGIN_ACCOUNT_TOOLTIP_TEXT,
+  MARGIN_DIFF_TOOLTIP_TEXT,
+  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
+  TOTAL_MARGIN_AVAILABLE,
+  LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT,
+} from '../constants';
+
+import { useEstimateFeesQuery } from './__generated__/EstimateOrder';
+import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
+
+export const useEstimateFees = (
+  order?: OrderSubmissionBody['orderSubmission']
+) => {
+  const { pubKey } = useVegaWallet();
+
+  const { data } = useEstimateFeesQuery({
+    variables: order && {
+      marketId: order.marketId,
+      partyId: pubKey || '',
+      price: order.price,
+      size: order.size,
+      side: order.side,
+      timeInForce: order.timeInForce,
+      type: order.type,
+    },
+    skip: !pubKey || !order?.size || !order?.price,
+    fetchPolicy: 'no-cache',
+  });
+  return data?.estimateFees;
+};
+
+export interface FeeDetails {
+  generalAccountBalance?: string;
+  marginAccountBalance?: string;
+  market: Market;
+  assetSymbol: string;
+  notionalSize: string | null;
+  feeEstimate: EstimateFeesQuery['estimateFees'] | undefined;
+  currentInitialMargin?: string;
+  currentMaintenanceMargin?: string;
+  positionEstimate: EstimatePositionQuery['estimatePosition'];
+}
+
+const emptyValue = '-';
+
+export const formatValue = (
+  value: string | number | null | undefined,
+  formatDecimals: number,
+  quantum?: string
+): string => {
+  if (!isNumeric(value)) return emptyValue;
+  if (!quantum) return addDecimalsFormatNumber(value, formatDecimals);
+  return addDecimalsFormatNumberQuantum(value, formatDecimals, quantum);
+};
+
+export const formatRange = (
+  min: string | number | null | undefined,
+  max: string | number | null | undefined,
+  formatDecimals: number,
+  quantum?: string
+) => {
+  const minFormatted = formatValue(min, formatDecimals, quantum);
+  const maxFormatted = formatValue(max, formatDecimals, quantum);
+  if (minFormatted !== maxFormatted) {
+    return `${minFormatted} - ${maxFormatted}`;
+  }
+  if (minFormatted !== emptyValue) {
+    return minFormatted;
+  }
+  return maxFormatted;
+};
+
+export const getFeeDetailsValues = ({
+  marginAccountBalance,
+  generalAccountBalance,
+  assetSymbol,
+  feeEstimate,
+  market,
+  notionalSize,
+  currentInitialMargin,
+  currentMaintenanceMargin,
+  positionEstimate,
+}: FeeDetails) => {
+  const liquidationEstimate = positionEstimate?.liquidation;
+  const marginEstimate = positionEstimate?.margin;
+  const totalBalance =
+    BigInt(generalAccountBalance || '0') + BigInt(marginAccountBalance || '0');
+  const assetDecimals =
+    market.tradableInstrument.instrument.product.settlementAsset.decimals;
+  const quantum =
+    market.tradableInstrument.instrument.product.settlementAsset.quantum;
+  const details: {
+    label: string;
+    value?: string | null;
+    formattedValue?: string | null;
+    symbol: string;
+    indent?: boolean;
+    labelDescription?: React.ReactNode;
+  }[] = [
+    {
+      label: t('Notional'),
+      value: formatValue(notionalSize, assetDecimals),
+      formattedValue: formatValue(notionalSize, assetDecimals, quantum),
+      symbol: assetSymbol,
+      labelDescription: NOTIONAL_SIZE_TOOLTIP_TEXT(assetSymbol),
+    },
+    {
+      label: t('Fees'),
+      value:
+        feeEstimate?.totalFeeAmount &&
+        `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`,
+      formattedValue:
+        feeEstimate?.totalFeeAmount &&
+        `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`,
+      labelDescription: (
+        <>
+          <span>
+            {t(
+              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
+            )}
+          </span>
+          <FeesBreakdown
+            fees={feeEstimate?.fees}
+            feeFactors={market.fees.factors}
+            symbol={assetSymbol}
+            decimals={assetDecimals}
+          />
+        </>
+      ),
+      symbol: assetSymbol,
+    },
+  ];
+  let marginRequiredBestCase: string | undefined = undefined;
+  let marginRequiredWorstCase: string | undefined = undefined;
+  if (marginEstimate) {
+    if (currentInitialMargin) {
+      marginRequiredBestCase = (
+        BigInt(marginEstimate.bestCase.initialLevel) -
+        BigInt(currentInitialMargin)
+      ).toString();
+      if (marginRequiredBestCase.startsWith('-')) {
+        marginRequiredBestCase = '0';
+      }
+      marginRequiredWorstCase = (
+        BigInt(marginEstimate.worstCase.initialLevel) -
+        BigInt(currentInitialMargin)
+      ).toString();
+      if (marginRequiredWorstCase.startsWith('-')) {
+        marginRequiredWorstCase = '0';
+      }
+    } else {
+      marginRequiredBestCase = marginEstimate.bestCase.initialLevel;
+      marginRequiredWorstCase = marginEstimate.worstCase.initialLevel;
+    }
+  }
+  details.push({
+    label: t('Margin required'),
+    formattedValue: formatRange(
+      marginRequiredBestCase,
+      marginRequiredWorstCase,
+      assetDecimals,
+      quantum
+    ),
+    value: formatRange(
+      marginRequiredBestCase,
+      marginRequiredWorstCase,
+      assetDecimals
+    ),
+    symbol: assetSymbol,
+    labelDescription: MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol),
+  });
+
+  const totalMarginAvailable = (
+    currentMaintenanceMargin
+      ? totalBalance - BigInt(currentMaintenanceMargin)
+      : totalBalance
+  ).toString();
+
+  details.push({
+    indent: true,
+    label: t('Total margin available'),
+    formattedValue: formatValue(totalMarginAvailable, assetDecimals, quantum),
+    value: formatValue(totalMarginAvailable, assetDecimals),
+    symbol: assetSymbol,
+    labelDescription: TOTAL_MARGIN_AVAILABLE(
+      formatValue(generalAccountBalance, assetDecimals, quantum),
+      formatValue(marginAccountBalance, assetDecimals, quantum),
+      formatValue(currentMaintenanceMargin, assetDecimals, quantum),
+      assetSymbol
+    ),
+  });
+
+  if (marginAccountBalance) {
+    const deductionFromCollateralBestCase =
+      BigInt(marginEstimate?.bestCase.initialLevel ?? 0) -
+      BigInt(marginAccountBalance);
+
+    const deductionFromCollateralWorstCase =
+      BigInt(marginEstimate?.worstCase.initialLevel ?? 0) -
+      BigInt(marginAccountBalance);
+
+    details.push({
+      indent: true,
+      label: t('Deduction from collateral'),
+      value: formatRange(
+        deductionFromCollateralBestCase > 0
+          ? deductionFromCollateralBestCase.toString()
+          : '0',
+        deductionFromCollateralWorstCase > 0
+          ? deductionFromCollateralWorstCase.toString()
+          : '0',
+        assetDecimals
+      ),
+      formattedValue: formatRange(
+        deductionFromCollateralBestCase > 0
+          ? deductionFromCollateralBestCase.toString()
+          : '0',
+        deductionFromCollateralWorstCase > 0
+          ? deductionFromCollateralWorstCase.toString()
+          : '0',
+        assetDecimals,
+        quantum
+      ),
+      symbol: assetSymbol,
+      labelDescription: DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT(assetSymbol),
+    });
+
+    details.push({
+      label: t('Projected margin'),
+      value: formatRange(
+        marginEstimate?.bestCase.initialLevel,
+        marginEstimate?.worstCase.initialLevel,
+        assetDecimals
+      ),
+      formattedValue: formatRange(
+        marginEstimate?.bestCase.initialLevel,
+        marginEstimate?.worstCase.initialLevel,
+        assetDecimals,
+        quantum
+      ),
+      symbol: assetSymbol,
+      labelDescription: EST_TOTAL_MARGIN_TOOLTIP_TEXT,
+    });
+  }
+  details.push({
+    label: t('Current margin allocation'),
+    value: formatValue(marginAccountBalance, assetDecimals),
+    symbol: assetSymbol,
+    labelDescription: MARGIN_ACCOUNT_TOOLTIP_TEXT,
+    formattedValue: formatValue(marginAccountBalance, assetDecimals, quantum),
+  });
+
+  let liquidationPriceEstimate = emptyValue;
+  let liquidationPriceEstimateFormatted;
+
+  if (liquidationEstimate) {
+    const liquidationEstimateBestCaseIncludingBuyOrders = BigInt(
+      liquidationEstimate.bestCase.including_buy_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateBestCaseIncludingSellOrders = BigInt(
+      liquidationEstimate.bestCase.including_sell_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateBestCase =
+      liquidationEstimateBestCaseIncludingBuyOrders >
+      liquidationEstimateBestCaseIncludingSellOrders
+        ? liquidationEstimateBestCaseIncludingBuyOrders
+        : liquidationEstimateBestCaseIncludingSellOrders;
+
+    const liquidationEstimateWorstCaseIncludingBuyOrders = BigInt(
+      liquidationEstimate.worstCase.including_buy_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateWorstCaseIncludingSellOrders = BigInt(
+      liquidationEstimate.worstCase.including_sell_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateWorstCase =
+      liquidationEstimateWorstCaseIncludingBuyOrders >
+      liquidationEstimateWorstCaseIncludingSellOrders
+        ? liquidationEstimateWorstCaseIncludingBuyOrders
+        : liquidationEstimateWorstCaseIncludingSellOrders;
+    liquidationPriceEstimate = formatRange(
+      (liquidationEstimateBestCase < liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      (liquidationEstimateBestCase > liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      assetDecimals
+    );
+    liquidationPriceEstimateFormatted = formatRange(
+      (liquidationEstimateBestCase < liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      (liquidationEstimateBestCase > liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      assetDecimals,
+      quantum
+    );
+  }
+
+  details.push({
+    label: t('Liquidation price estimate'),
+    value: liquidationPriceEstimate,
+    formattedValue: liquidationPriceEstimateFormatted,
+    symbol: assetSymbol,
+    labelDescription: LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT,
+  });
+  return details;
+};

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

@@ -6,6 +6,7 @@ import {
   truncateByChars,
   isNumeric,
 } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
@@ -24,6 +25,7 @@ export const DepositsTable = forwardRef<
   return (
     <AgGrid
       ref={ref}
+      overlayNoRowsTemplate={t('No deposits')}
       defaultColDef={{ resizable: true }}
       style={{ width: '100%', height: '100%' }}
       suppressCellFocus={true}

libs/markets/src/lib/components/markets-container/use-column-defs.tsx

@@ -76,7 +76,9 @@ export const useColumnDefs = ({ onMarketClick }: Props) => {
         type: 'rightAligned',
         cellRenderer: 'PriceFlashCell',
         filter: 'agNumberColumnFilter',
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
+        valueGetter: ({
+          data,
+        }: VegaValueGetterParams<MarketMaybeWithData, 'data.bestBidPrice'>) => {
           return data?.data?.bestBidPrice === undefined
             ? undefined
             : toBigNum(data?.data?.bestBidPrice, data.decimalPlaces).toNumber();
@@ -100,7 +102,12 @@ export const useColumnDefs = ({ onMarketClick }: Props) => {
         type: 'rightAligned',
         cellRenderer: 'PriceFlashCell',
         filter: 'agNumberColumnFilter',
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
+        valueGetter: ({
+          data,
+        }: VegaValueGetterParams<
+          MarketMaybeWithData,
+          'data.bestOfferPrice'
+        >) => {
           return data?.data?.bestOfferPrice === undefined
             ? undefined
             : toBigNum(
@@ -127,7 +134,9 @@ export const useColumnDefs = ({ onMarketClick }: Props) => {
         type: 'rightAligned',
         cellRenderer: 'PriceFlashCell',
         filter: 'agNumberColumnFilter',
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
+        valueGetter: ({
+          data,
+        }: VegaValueGetterParams<MarketMaybeWithData, 'data.markPrice'>) => {
           return data?.data?.markPrice === undefined
             ? undefined
             : toBigNum(data?.data?.markPrice, data.decimalPlaces).toNumber();

libs/positions/src/index.ts

@@ -1,6 +1,7 @@
 export * from './lib/__generated__/Positions';
 export * from './lib/positions-container';
 export * from './lib/positions-data-providers';
+export * from './lib/margin-data-provider';
 export * from './lib/positions-table';
 export * from './lib/use-market-margin';
 export * from './lib/use-open-volume';

libs/positions/src/lib/Positions.graphql

@@ -38,6 +38,45 @@ subscription PositionsSubscription($partyId: ID!) {
   }
 }
 
+fragment MarginFields on MarginLevels {
+  maintenanceLevel
+  searchLevel
+  initialLevel
+  collateralReleaseLevel
+  asset {
+    id
+  }
+  market {
+    id
+  }
+}
+
+query Margins($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    marginsConnection {
+      edges {
+        node {
+          ...MarginFields
+        }
+      }
+    }
+  }
+}
+
+subscription MarginsSubscription($partyId: ID!) {
+  margins(partyId: $partyId) {
+    marketId
+    asset
+    partyId
+    maintenanceLevel
+    searchLevel
+    initialLevel
+    collateralReleaseLevel
+    timestamp
+  }
+}
+
 query EstimatePosition(
   $marketId: ID!
   $openVolume: String!

libs/positions/src/lib/__generated__/Positions.ts

@@ -19,6 +19,22 @@ export type PositionsSubscriptionSubscriptionVariables = Types.Exact<{
 
 export type PositionsSubscriptionSubscription = { __typename?: 'Subscription', positions: Array<{ __typename?: 'PositionUpdate', realisedPNL: string, openVolume: string, unrealisedPNL: string, averageEntryPrice: string, updatedAt?: any | null, marketId: string, lossSocializationAmount: string, positionStatus: Types.PositionStatus, partyId: string }> };
 
+export type MarginFieldsFragment = { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } };
+
+export type MarginsQueryVariables = Types.Exact<{
+  partyId: Types.Scalars['ID'];
+}>;
+
+
+export type MarginsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, marginsConnection?: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };
+
+export type MarginsSubscriptionSubscriptionVariables = Types.Exact<{
+  partyId: Types.Scalars['ID'];
+}>;
+
+
+export type MarginsSubscriptionSubscription = { __typename?: 'Subscription', margins: { __typename?: 'MarginLevelsUpdate', marketId: string, asset: string, partyId: string, maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, timestamp: any } };
+
 export type EstimatePositionQueryVariables = Types.Exact<{
   marketId: Types.Scalars['ID'];
   openVolume: Types.Scalars['String'];
@@ -46,6 +62,20 @@ export const PositionFieldsFragmentDoc = gql`
   }
 }
     `;
+export const MarginFieldsFragmentDoc = gql`
+    fragment MarginFields on MarginLevels {
+  maintenanceLevel
+  searchLevel
+  initialLevel
+  collateralReleaseLevel
+  asset {
+    id
+  }
+  market {
+    id
+  }
+}
+    `;
 export const PositionsDocument = gql`
     query Positions($partyIds: [ID!]!) {
   positions(filter: {partyIds: $partyIds}) {
@@ -123,6 +153,85 @@ export function usePositionsSubscriptionSubscription(baseOptions: Apollo.Subscri
       }
 export type PositionsSubscriptionSubscriptionHookResult = ReturnType<typeof usePositionsSubscriptionSubscription>;
 export type PositionsSubscriptionSubscriptionResult = Apollo.SubscriptionResult<PositionsSubscriptionSubscription>;
+export const MarginsDocument = gql`
+    query Margins($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    marginsConnection {
+      edges {
+        node {
+          ...MarginFields
+        }
+      }
+    }
+  }
+}
+    ${MarginFieldsFragmentDoc}`;
+
+/**
+ * __useMarginsQuery__
+ *
+ * To run a query within a React component, call `useMarginsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useMarginsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useMarginsQuery({
+ *   variables: {
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function useMarginsQuery(baseOptions: Apollo.QueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
+      }
+export function useMarginsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
+        }
+export type MarginsQueryHookResult = ReturnType<typeof useMarginsQuery>;
+export type MarginsLazyQueryHookResult = ReturnType<typeof useMarginsLazyQuery>;
+export type MarginsQueryResult = Apollo.QueryResult<MarginsQuery, MarginsQueryVariables>;
+export const MarginsSubscriptionDocument = gql`
+    subscription MarginsSubscription($partyId: ID!) {
+  margins(partyId: $partyId) {
+    marketId
+    asset
+    partyId
+    maintenanceLevel
+    searchLevel
+    initialLevel
+    collateralReleaseLevel
+    timestamp
+  }
+}
+    `;
+
+/**
+ * __useMarginsSubscriptionSubscription__
+ *
+ * To run a query within a React component, call `useMarginsSubscriptionSubscription` and pass it any options that fit your needs.
+ * When your component renders, `useMarginsSubscriptionSubscription` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the subscription, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useMarginsSubscriptionSubscription({
+ *   variables: {
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function useMarginsSubscriptionSubscription(baseOptions: Apollo.SubscriptionHookOptions<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useSubscription<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>(MarginsSubscriptionDocument, options);
+      }
+export type MarginsSubscriptionSubscriptionHookResult = ReturnType<typeof useMarginsSubscriptionSubscription>;
+export type MarginsSubscriptionSubscriptionResult = Apollo.SubscriptionResult<MarginsSubscriptionSubscription>;
 export const EstimatePositionDocument = gql`
     query EstimatePosition($marketId: ID!, $openVolume: String!, $orders: [OrderInfo!], $collateralAvailable: String) {
   estimatePosition(

libs/positions/src/lib/liquidation-price.tsx

@@ -1,60 +0,0 @@
-import { useEstimatePositionQuery } from './__generated__/Positions';
-import { formatRange } from '@vegaprotocol/utils';
-
-export const LiquidationPrice = ({
-  marketId,
-  openVolume,
-  collateralAvailable,
-  decimalPlaces,
-  formatDecimals,
-}: {
-  marketId: string;
-  openVolume: string;
-  collateralAvailable: string;
-  decimalPlaces: number;
-  formatDecimals: number;
-}) => {
-  const { data: currentData, previousData } = useEstimatePositionQuery({
-    variables: {
-      marketId,
-      openVolume,
-      collateralAvailable,
-    },
-    fetchPolicy: 'no-cache',
-    skip: !openVolume || openVolume === '0',
-  });
-  const data = currentData || previousData;
-  let value = '-';
-
-  if (data) {
-    const bestCase =
-      data.estimatePosition?.liquidation?.bestCase.open_volume_only.replace(
-        /\..*/,
-        ''
-      );
-    const worstCase =
-      data.estimatePosition?.liquidation?.worstCase.open_volume_only.replace(
-        /\..*/,
-        ''
-      );
-    value =
-      bestCase && worstCase && BigInt(bestCase) < BigInt(worstCase)
-        ? formatRange(
-            bestCase,
-            worstCase,
-            decimalPlaces,
-            undefined,
-            formatDecimals,
-            value
-          )
-        : formatRange(
-            worstCase,
-            bestCase,
-            decimalPlaces,
-            undefined,
-            formatDecimals,
-            value
-          );
-  }
-  return <span data-testid="liquidation-price">{value}</span>;
-};

libs/positions/src/lib/margin-data-provider.ts

@@ -7,13 +7,13 @@ import {
 import {
   MarginsSubscriptionDocument,
   MarginsDocument,
-} from './__generated__/Margins';
+} from './__generated__/Positions';
 import type {
   MarginsQuery,
   MarginFieldsFragment,
   MarginsSubscriptionSubscription,
   MarginsQueryVariables,
-} from './__generated__/Margins';
+} from './__generated__/Positions';
 
 const update = (
   data: MarginFieldsFragment[] | null,

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

@@ -34,7 +34,6 @@ export interface Position {
   averageEntryPrice: string;
   currentLeverage: number | undefined;
   decimals: number;
-  quantum: string;
   lossSocializationAmount: string;
   marginAccountBalance: string;
   marketDecimalPlaces: number;
@@ -74,7 +73,6 @@ export const getMetrics = (
       decimals,
       id: assetId,
       symbol: assetSymbol,
-      quantum,
     } = market.tradableInstrument.instrument.product.settlementAsset;
     const generalAccount = accounts?.find(
       (account) =>
@@ -116,7 +114,6 @@ export const getMetrics = (
       averageEntryPrice: position.averageEntryPrice,
       currentLeverage: currentLeverage ? currentLeverage.toNumber() : undefined,
       decimals,
-      quantum,
       lossSocializationAmount: position.lossSocializationAmount || '0',
       marginAccountBalance: marginAccount?.balance ?? '0',
       marketDecimalPlaces,

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

@@ -7,12 +7,6 @@ import * as Schema from '@vegaprotocol/types';
 import { PositionStatus, PositionStatusMapping } from '@vegaprotocol/types';
 import type { ICellRendererParams } from 'ag-grid-community';
 
-jest.mock('./liquidation-price', () => ({
-  LiquidationPrice: () => (
-    <span data-testid="liquidation-price">liquidation price</span>
-  ),
-}));
-
 const singleRow: Position = {
   partyId: 'partyId',
   assetId: 'asset-id',
@@ -20,7 +14,6 @@ const singleRow: Position = {
   averageEntryPrice: '133',
   currentLeverage: 1.1,
   decimals: 2,
-  quantum: '0.1',
   lossSocializationAmount: '0',
   marginAccountBalance: '12345600',
   marketDecimalPlaces: 1,
@@ -55,7 +48,7 @@ it('render correct columns', async () => {
   });
 
   const headers = screen.getAllByRole('columnheader');
-  expect(headers).toHaveLength(12);
+  expect(headers).toHaveLength(11);
   expect(
     headers.map((h) => h.querySelector('[ref="eText"]')?.textContent?.trim())
   ).toEqual([
@@ -63,7 +56,6 @@ it('render correct columns', async () => {
     'Notional',
     'Open volume',
     'Mark price',
-    'Liquidation price',
     'Settlement asset',
     'Entry price',
     'Leverage',
@@ -151,20 +143,12 @@ it('displays mark price', async () => {
   expect(cells[3].textContent).toEqual('-');
 });
 
-it('displays liquidation price', async () => {
-  await act(async () => {
-    render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
-  });
-  const cells = screen.getAllByRole('gridcell');
-  expect(cells[4].textContent).toEqual('liquidation price');
-});
-
 it('displays leverage', async () => {
   await act(async () => {
     render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
   });
   const cells = screen.getAllByRole('gridcell');
-  expect(cells[7].textContent).toEqual('1.1');
+  expect(cells[6].textContent).toEqual('1.1');
 });
 
 it('displays allocated margin', async () => {
@@ -172,7 +156,7 @@ it('displays allocated margin', async () => {
     render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
   });
   const cells = screen.getAllByRole('gridcell');
-  const cell = cells[8];
+  const cell = cells[7];
   expect(cell.textContent).toEqual('123,456.00');
 });
 
@@ -181,7 +165,7 @@ it('displays realised and unrealised PNL', async () => {
     render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
   });
   const cells = screen.getAllByRole('gridcell');
-  expect(cells[10].textContent).toEqual('4.56');
+  expect(cells[9].textContent).toEqual('4.56');
 });
 
 it('displays close button', async () => {
@@ -198,7 +182,7 @@ it('displays close button', async () => {
     );
   });
   const cells = screen.getAllByRole('gridcell');
-  expect(cells[12].textContent).toEqual('Close');
+  expect(cells[11].textContent).toEqual('Close');
 });
 
 it('do not display close button if openVolume is zero', async () => {
@@ -214,7 +198,7 @@ it('do not display close button if openVolume is zero', async () => {
     );
   });
   const cells = screen.getAllByRole('gridcell');
-  expect(cells[12].textContent).toEqual('');
+  expect(cells[11].textContent).toEqual('');
 });
 
 describe('PNLCell', () => {

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

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
-import { forwardRef, useMemo } from 'react';
+import { forwardRef } from 'react';
 import type { CSSProperties, ReactNode } from 'react';
-import type { ColDef } from 'ag-grid-community';
+import type { CellRendererSelectorResult } from 'ag-grid-community';
 import type {
   VegaValueFormatterParams,
   VegaValueGetterParams,
@@ -33,6 +33,7 @@ import {
   addDecimalsFormatNumber,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import { AgGridColumn } from 'ag-grid-react';
 import type { AgGridReact } from 'ag-grid-react';
 import type { Position } from './positions-data-providers';
 import * as Schema from '@vegaprotocol/types';
@@ -42,7 +43,6 @@ import { DocsLinks } from '@vegaprotocol/environment';
 import { PositionTableActions } from './position-actions-dropdown';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { LiquidationPrice } from './liquidation-price';
 
 interface Props extends TypedDataAgGrid<Position> {
   onClose?: (data: Position) => void;
@@ -121,344 +121,333 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
           MarketNameCell,
         }}
         {...props}
-        columnDefs={useMemo<ColDef[]>(() => {
-          const columnDefs: (ColDef | null)[] = [
-            multipleKeys
-              ? {
-                  headerName: t('Vega key'),
-                  field: 'partyId',
-                  valueGetter: ({ data }: VegaValueGetterParams<Position>) =>
-                    (data?.partyId &&
-                      pubKeys &&
-                      pubKeys.find((key) => key.publicKey === data.partyId)
-                        ?.name) ||
-                    data?.partyId,
-                  minWidth: 190,
-                }
-              : null,
-            {
-              headerName: t('Market'),
-              field: 'marketName',
-              cellRenderer: 'MarketNameCell',
-              cellRendererParams: { idPath: 'marketId', onMarketClick },
-              minWidth: 190,
-            },
-            {
-              headerName: t('Notional'),
-              headerTooltip: t('Mark price x open volume.'),
-              field: 'notional',
-              type: 'rightAligned',
-              cellClass: 'font-mono text-right',
-              filter: 'agNumberColumnFilter',
-              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                return !data?.notional
-                  ? undefined
-                  : toBigNum(
-                      data.notional,
-                      data.marketDecimalPlaces
-                    ).toNumber();
-              },
-              valueFormatter: ({
-                data,
-              }: VegaValueFormatterParams<Position, 'notional'>) => {
-                return !data || !data.notional
-                  ? '-'
-                  : addDecimalsFormatNumber(
-                      data.notional,
-                      data.marketDecimalPlaces
-                    );
-              },
-              minWidth: 80,
-            },
-            {
-              headerName: t('Open volume'),
-              field: 'openVolume',
-              type: 'rightAligned',
-              cellClass: 'font-mono text-right',
-              cellClassRules: signedNumberCssClassRules,
-              filter: 'agNumberColumnFilter',
-              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                return data?.openVolume === undefined
-                  ? undefined
-                  : toBigNum(
-                      data?.openVolume,
-                      data.positionDecimalPlaces
-                    ).toNumber();
-              },
-              valueFormatter: ({
-                data,
-              }: VegaValueFormatterParams<Position, 'openVolume'>): string => {
-                return data?.openVolume === undefined
-                  ? ''
-                  : volumePrefix(
-                      addDecimalsFormatNumber(
-                        data.openVolume,
-                        data.positionDecimalPlaces
-                      )
-                    );
-              },
-              cellRenderer: OpenVolumeCell,
-              minWidth: 100,
-            },
-            {
-              headerName: t('Mark price'),
-              field: 'markPrice',
-              type: 'rightAligned',
-              cellRenderer: PriceFlashCell,
-              filter: 'agNumberColumnFilter',
-              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                return !data ||
-                  !data.markPrice ||
-                  data.marketTradingMode ===
-                    Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
-                  ? undefined
-                  : toBigNum(
-                      data.markPrice,
-                      data.marketDecimalPlaces
-                    ).toNumber();
-              },
-              valueFormatter: ({
-                data,
-              }: VegaValueFormatterParams<Position, 'markPrice'>) => {
-                if (!data) {
-                  return '';
-                }
-                if (
-                  !data.markPrice ||
-                  data.marketTradingMode ===
-                    Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
-                ) {
-                  return '-';
-                }
-                return addDecimalsFormatNumber(
-                  data.markPrice,
+      >
+        {multipleKeys ? (
+          <AgGridColumn
+            headerName={t('Vega key')}
+            field="partyId"
+            valueGetter={({
+              data,
+            }: VegaValueGetterParams<Position, 'partyId'>) =>
+              (data?.partyId &&
+                pubKeys &&
+                pubKeys.find((key) => key.publicKey === data.partyId)?.name) ||
+              data?.partyId
+            }
+            minWidth={190}
+          />
+        ) : null}
+        <AgGridColumn
+          headerName={t('Market')}
+          field="marketName"
+          cellRenderer="MarketNameCell"
+          cellRendererParams={{ idPath: 'marketId', onMarketClick }}
+          minWidth={190}
+        />
+        <AgGridColumn
+          headerName={t('Notional')}
+          headerTooltip={t('Mark price x open volume.')}
+          field="notional"
+          type="rightAligned"
+          cellClass="font-mono text-right"
+          filter="agNumberColumnFilter"
+          valueGetter={({
+            data,
+          }: VegaValueGetterParams<Position, 'notional'>) => {
+            return !data?.notional
+              ? undefined
+              : toBigNum(data.notional, data.marketDecimalPlaces).toNumber();
+          }}
+          valueFormatter={({
+            data,
+          }: VegaValueFormatterParams<Position, 'notional'>) => {
+            return !data || !data.notional
+              ? '-'
+              : addDecimalsFormatNumber(
+                  data.notional,
                   data.marketDecimalPlaces
                 );
-              },
-              minWidth: 100,
-            },
-            {
-              headerName: t('Liquidation price'),
-              colId: 'liquidationPrice',
-              type: 'rightAligned',
-              cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
-                if (!data) return null;
-                return (
-                  <LiquidationPrice
-                    marketId={data.marketId}
-                    openVolume={data.openVolume}
-                    collateralAvailable={data.totalBalance}
-                    decimalPlaces={data.decimals}
-                    formatDecimals={data.marketDecimalPlaces}
-                  />
+          }}
+          minWidth={80}
+        />
+        <AgGridColumn
+          headerName={t('Open volume')}
+          field="openVolume"
+          type="rightAligned"
+          cellClass="font-mono text-right"
+          cellClassRules={signedNumberCssClassRules}
+          filter="agNumberColumnFilter"
+          valueGetter={({
+            data,
+          }: VegaValueGetterParams<Position, 'openVolume'>) => {
+            return data?.openVolume === undefined
+              ? undefined
+              : toBigNum(
+                  data?.openVolume,
+                  data.positionDecimalPlaces
+                ).toNumber();
+          }}
+          valueFormatter={({
+            data,
+          }: VegaValueFormatterParams<Position, 'openVolume'>):
+            | string
+            | undefined => {
+            return data?.openVolume === undefined
+              ? undefined
+              : volumePrefix(
+                  addDecimalsFormatNumber(
+                    data.openVolume,
+                    data.positionDecimalPlaces
+                  )
                 );
-              },
-            },
-            {
-              headerName: t('Settlement asset'),
-              field: 'assetSymbol',
-              colId: 'asset',
-              minWidth: 100,
-              cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
-                if (!data) return null;
-                return (
-                  <ButtonLink
-                    onClick={(e) => {
-                      openAssetDetailsDialog(
-                        data.assetId,
-                        e.target as HTMLElement
-                      );
-                    }}
-                  >
-                    {data?.assetSymbol}
-                  </ButtonLink>
-                );
-              },
-            },
-            {
-              headerName: t('Entry price'),
-              field: 'averageEntryPrice',
-              type: 'rightAligned',
-              cellRenderer: PriceFlashCell,
-              filter: 'agNumberColumnFilter',
-              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                return data?.markPrice === undefined || !data
-                  ? undefined
-                  : toBigNum(
-                      data.averageEntryPrice,
-                      data.marketDecimalPlaces
-                    ).toNumber();
-              },
-              valueFormatter: ({
-                data,
-              }: VegaValueFormatterParams<
-                Position,
-                'averageEntryPrice'
-              >): string => {
-                if (!data) {
-                  return '';
-                }
-                return addDecimalsFormatNumber(
+          }}
+          cellRenderer={OpenVolumeCell}
+          minWidth={100}
+        />
+        <AgGridColumn
+          headerName={t('Mark price')}
+          field="markPrice"
+          type="rightAligned"
+          cellRendererSelector={(): CellRendererSelectorResult => {
+            return {
+              component: PriceFlashCell,
+            };
+          }}
+          filter="agNumberColumnFilter"
+          valueGetter={({
+            data,
+          }: VegaValueGetterParams<Position, 'markPrice'>) => {
+            return !data ||
+              !data.markPrice ||
+              data.marketTradingMode ===
+                Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+              ? undefined
+              : toBigNum(data.markPrice, data.marketDecimalPlaces).toNumber();
+          }}
+          valueFormatter={({
+            data,
+          }: VegaValueFormatterParams<Position, 'markPrice'>) => {
+            if (!data) {
+              return undefined;
+            }
+            if (
+              !data.markPrice ||
+              data.marketTradingMode ===
+                Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+            ) {
+              return '-';
+            }
+            return addDecimalsFormatNumber(
+              data.markPrice,
+              data.marketDecimalPlaces
+            );
+          }}
+          minWidth={100}
+        />
+        <AgGridColumn
+          headerName={t('Settlement asset')}
+          field="assetSymbol"
+          colId="asset"
+          minWidth={100}
+          cellRenderer={({ data }: VegaICellRendererParams<Position>) => {
+            if (!data) return null;
+            return (
+              <ButtonLink
+                onClick={(e) => {
+                  openAssetDetailsDialog(data.assetId, e.target as HTMLElement);
+                }}
+              >
+                {data?.assetSymbol}
+              </ButtonLink>
+            );
+          }}
+        />
+        <AgGridColumn
+          headerName={t('Entry price')}
+          field="averageEntryPrice"
+          type="rightAligned"
+          cellRendererSelector={(): CellRendererSelectorResult => {
+            return {
+              component: PriceFlashCell,
+            };
+          }}
+          filter="agNumberColumnFilter"
+          valueGetter={({
+            data,
+          }: VegaValueGetterParams<Position, 'averageEntryPrice'>) => {
+            return data?.markPrice === undefined || !data
+              ? undefined
+              : toBigNum(
                   data.averageEntryPrice,
                   data.marketDecimalPlaces
-                );
-              },
-              minWidth: 100,
-            },
-            multipleKeys
-              ? null
-              : {
-                  headerName: t('Leverage'),
-                  field: 'currentLeverage',
-                  type: 'rightAligned',
-                  filter: 'agNumberColumnFilter',
-                  cellRenderer: PriceFlashCell,
-                  valueFormatter: ({
-                    value,
-                  }: VegaValueFormatterParams<Position, 'currentLeverage'>) =>
-                    value === undefined
-                      ? ''
-                      : formatNumber(value.toString(), 1),
-                  minWidth: 100,
-                },
-            multipleKeys
-              ? null
-              : {
-                  headerName: t('Margin allocated'),
-                  field: 'marginAccountBalance',
-                  type: 'rightAligned',
-                  filter: 'agNumberColumnFilter',
-                  cellRenderer: PriceFlashCell,
-                  valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                    return !data
-                      ? undefined
-                      : toBigNum(
-                          data.marginAccountBalance,
-                          data.decimals
-                        ).toNumber();
-                  },
-                  valueFormatter: ({
-                    data,
-                  }: VegaValueFormatterParams<
-                    Position,
-                    'marginAccountBalance'
-                  >): string => {
-                    if (!data) {
-                      return '';
-                    }
-                    return addDecimalsFormatNumber(
-                      data.marginAccountBalance,
-                      data.decimals
-                    );
-                  },
-                  minWidth: 100,
-                },
-            {
-              headerName: t('Realised PNL'),
-              field: 'realisedPNL',
-              type: 'rightAligned',
-              cellClassRules: signedNumberCssClassRules,
-              cellClass: 'font-mono text-right',
-              filter: 'agNumberColumnFilter',
-              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                return !data
-                  ? undefined
-                  : toBigNum(data.realisedPNL, data.decimals).toNumber();
-              },
-              valueFormatter: ({
-                data,
-              }: VegaValueFormatterParams<Position, 'realisedPNL'>) => {
-                return !data
-                  ? ''
-                  : addDecimalsFormatNumber(data.realisedPNL, data.decimals);
-              },
-              headerTooltip: t(
-                'Profit or loss is realised whenever your position is reduced to zero and the margin is released back to your collateral balance. P&L excludes any fees paid.'
-              ),
-              cellRenderer: PNLCell,
-              minWidth: 100,
-            },
-            {
-              headerName: t('Unrealised PNL'),
-              field: 'unrealisedPNL',
-              type: 'rightAligned',
-              cellClassRules: signedNumberCssClassRules,
-              cellClass: 'font-mono text-right',
-              filter: 'agNumberColumnFilter',
-              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                return !data
-                  ? undefined
-                  : toBigNum(data.unrealisedPNL, data.decimals).toNumber();
-              },
-              valueFormatter: ({
-                data,
-              }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
-                !data
-                  ? ''
-                  : addDecimalsFormatNumber(data.unrealisedPNL, data.decimals),
-              headerTooltip: t(
-                'Unrealised profit is the current profit on your open position. Margin is still allocated to your position.'
-              ),
-              cellRenderer: PNLCell,
-              minWidth: 100,
-            },
-            {
-              headerName: t('Updated'),
-              field: 'updatedAt',
-              type: 'rightAligned',
-              filter: DateRangeFilter,
-              valueFormatter: ({
-                value,
-              }: VegaValueFormatterParams<Position, 'updatedAt'>) => {
-                if (!value) {
-                  return '';
-                }
-                return getDateTimeFormat().format(new Date(value));
-              },
-              minWidth: 150,
-            },
-            onClose && !isReadOnly
-              ? {
-                  ...COL_DEFS.actions,
-                  cellRenderer: ({
-                    data,
-                  }: VegaICellRendererParams<Position>) => {
-                    return (
-                      <div className="flex gap-2 items-center justify-end">
-                        {data?.openVolume &&
-                        data?.openVolume !== '0' &&
-                        data.partyId === pubKey ? (
-                          <ButtonLink
-                            data-testid="close-position"
-                            onClick={() => data && onClose(data)}
-                          >
-                            {t('Close')}
-                          </ButtonLink>
-                        ) : null}
-                        {data?.assetId && (
-                          <PositionTableActions assetId={data?.assetId} />
-                        )}
-                      </div>
-                    );
-                  },
-                  minWidth: 90,
-                  maxWidth: 90,
-                }
-              : null,
-          ];
-          return columnDefs.filter<ColDef>(
-            (colDef: ColDef | null): colDef is ColDef => colDef !== null
-          );
-        }, [
-          isReadOnly,
-          multipleKeys,
-          onClose,
-          onMarketClick,
-          openAssetDetailsDialog,
-          pubKey,
-          pubKeys,
-        ])}
-      />
+                ).toNumber();
+          }}
+          valueFormatter={({
+            data,
+          }: VegaValueFormatterParams<Position, 'averageEntryPrice'>):
+            | string
+            | undefined => {
+            if (!data) {
+              return undefined;
+            }
+            return addDecimalsFormatNumber(
+              data.averageEntryPrice,
+              data.marketDecimalPlaces
+            );
+          }}
+          minWidth={100}
+        />
+        {multipleKeys ? null : (
+          <AgGridColumn
+            headerName={t('Leverage')}
+            field="currentLeverage"
+            type="rightAligned"
+            filter="agNumberColumnFilter"
+            cellRendererSelector={(): CellRendererSelectorResult => {
+              return {
+                component: PriceFlashCell,
+              };
+            }}
+            valueFormatter={({
+              value,
+            }: VegaValueFormatterParams<Position, 'currentLeverage'>) =>
+              value === undefined
+                ? undefined
+                : formatNumber(value.toString(), 1)
+            }
+            minWidth={100}
+          />
+        )}
+        {multipleKeys ? null : (
+          <AgGridColumn
+            headerName={t('Margin allocated')}
+            field="marginAccountBalance"
+            type="rightAligned"
+            filter="agNumberColumnFilter"
+            cellRendererSelector={(): CellRendererSelectorResult => {
+              return {
+                component: PriceFlashCell,
+              };
+            }}
+            valueGetter={({
+              data,
+            }: VegaValueGetterParams<Position, 'marginAccountBalance'>) => {
+              return !data
+                ? undefined
+                : toBigNum(data.marginAccountBalance, data.decimals).toNumber();
+            }}
+            valueFormatter={({
+              data,
+            }: VegaValueFormatterParams<Position, 'marginAccountBalance'>):
+              | string
+              | undefined => {
+              if (!data) {
+                return undefined;
+              }
+              return addDecimalsFormatNumber(
+                data.marginAccountBalance,
+                data.decimals
+              );
+            }}
+            minWidth={100}
+          />
+        )}
+        <AgGridColumn
+          headerName={t('Realised PNL')}
+          field="realisedPNL"
+          type="rightAligned"
+          cellClassRules={signedNumberCssClassRules}
+          cellClass="font-mono text-right"
+          filter="agNumberColumnFilter"
+          valueGetter={({
+            data,
+          }: VegaValueGetterParams<Position, 'realisedPNL'>) => {
+            return !data
+              ? undefined
+              : toBigNum(data.realisedPNL, data.decimals).toNumber();
+          }}
+          valueFormatter={({
+            data,
+          }: VegaValueFormatterParams<Position, 'realisedPNL'>) => {
+            return !data
+              ? undefined
+              : addDecimalsFormatNumber(data.realisedPNL, data.decimals);
+          }}
+          headerTooltip={t(
+            'Profit or loss is realised whenever your position is reduced to zero and the margin is released back to your collateral balance. P&L excludes any fees paid.'
+          )}
+          cellRenderer={PNLCell}
+          minWidth={100}
+        />
+        <AgGridColumn
+          headerName={t('Unrealised PNL')}
+          field="unrealisedPNL"
+          type="rightAligned"
+          cellClassRules={signedNumberCssClassRules}
+          cellClass="font-mono text-right"
+          filter="agNumberColumnFilter"
+          valueGetter={({
+            data,
+          }: VegaValueGetterParams<Position, 'unrealisedPNL'>) => {
+            return !data
+              ? undefined
+              : toBigNum(data.unrealisedPNL, data.decimals).toNumber();
+          }}
+          valueFormatter={({
+            data,
+          }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
+            !data
+              ? undefined
+              : addDecimalsFormatNumber(data.unrealisedPNL, data.decimals)
+          }
+          headerTooltip={t(
+            'Unrealised profit is the current profit on your open position. Margin is still allocated to your position.'
+          )}
+          cellRenderer={PNLCell}
+          minWidth={100}
+        />
+        <AgGridColumn
+          headerName={t('Updated')}
+          field="updatedAt"
+          type="rightAligned"
+          filter={DateRangeFilter}
+          valueFormatter={({
+            value,
+          }: VegaValueFormatterParams<Position, 'updatedAt'>) => {
+            if (!value) {
+              return value;
+            }
+            return getDateTimeFormat().format(new Date(value));
+          }}
+          minWidth={150}
+        />
+        {onClose && !isReadOnly ? (
+          <AgGridColumn
+            {...COL_DEFS.actions}
+            cellRenderer={({ data }: VegaICellRendererParams<Position>) => {
+              return (
+                <div className="flex gap-2 items-center justify-end">
+                  {data?.openVolume &&
+                  data?.openVolume !== '0' &&
+                  data.partyId === pubKey ? (
+                    <ButtonLink
+                      data-testid="close-position"
+                      onClick={() => data && onClose(data)}
+                    >
+                      {t('Close')}
+                    </ButtonLink>
+                  ) : null}
+                  {data?.assetId && (
+                    <PositionTableActions assetId={data?.assetId} />
+                  )}
+                </div>
+              );
+            }}
+            minWidth={90}
+            maxWidth={90}
+          />
+        ) : null}
+      </AgGrid>
     );
   }
 );

libs/positions/src/lib/positions.mock.ts

@@ -4,12 +4,9 @@ import type { PartialDeep } from 'type-fest';
 import type {
   PositionsQuery,
   PositionFieldsFragment,
-} from './__generated__/Positions';
-
-import type {
   MarginsQuery,
   MarginFieldsFragment,
-} from '@vegaprotocol/accounts';
+} from './__generated__/Positions';
 
 export const positionsQuery = (
   override?: PartialDeep<PositionsQuery>

libs/positions/src/lib/use-market-margin.tsx

@@ -1,8 +1,8 @@
 import { useCallback, useState } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marginsDataProvider } from '@vegaprotocol/accounts';
-import type { MarginFieldsFragment } from '@vegaprotocol/accounts';
+import { marginsDataProvider } from './margin-data-provider';
+import type { MarginFieldsFragment } from './__generated__/Positions';
 
 export const useMarketMargin = (marketId: string) => {
   const { pubKey } = useVegaWallet();

libs/proposals/src/lib/voting-hooks/index.ts

@@ -1,2 +1 @@
 export * from './use-vote-submit';
-export * from './__generated__/VoteSubsciption';

libs/proposals/src/lib/voting-hooks/use-vote-submit.ts

@@ -5,16 +5,15 @@ import { useVoteEvent } from './use-vote-event';
 import type { VoteValue } from '@vegaprotocol/types';
 import type { VoteEventFieldsFragment } from './__generated__/VoteSubsciption';
 
-export type FinalizedVote = VoteEventFieldsFragment & { pubKey: string };
+export type FinalizedVote = VoteEventFieldsFragment;
 
 export const useVoteSubmit = () => {
   const { pubKey } = useVegaWallet();
   const { send, transaction, setComplete, Dialog } = useVegaTransaction();
   const waitForVoteEvent = useVoteEvent(transaction);
 
-  const [finalizedVote, setFinalizedVote] = useState<FinalizedVote | null>(
-    null
-  );
+  const [finalizedVote, setFinalizedVote] =
+    useState<VoteEventFieldsFragment | null>(null);
 
   const submit = useCallback(
     async (voteValue: VoteValue, proposalId: string | null) => {
@@ -34,7 +33,7 @@ export const useVoteSubmit = () => {
 
         if (res) {
           waitForVoteEvent(proposalId, pubKey, (v) => {
-            setFinalizedVote({ ...v, pubKey });
+            setFinalizedVote(v);
             setComplete();
           });
         }

libs/trades/src/lib/trades.mock.ts

@@ -53,10 +53,10 @@ export const tradesUpdateSubscription = (
 
 const trades: TradeFieldsFragment[] = [
   {
-    id: 'FFFFAD1BF47AA2853E5C375B6B3A62375F62D5B10807583D32EF3119CC455CD1',
-    price: '17106734',
-    size: '18',
-    createdAt: '2022-04-07T17:56:47.997938583Z',
+    id: 'FFFFBC80005C517A10ACF481F7E6893769471098E696D0CC407F18134044CB16',
+    price: '17116898',
+    size: '24',
+    createdAt: '2022-04-06T16:19:42.692598951Z',
     aggressor: Side.SIDE_BUY,
     market: {
       id: 'market-0',
@@ -77,10 +77,10 @@ const trades: TradeFieldsFragment[] = [
     __typename: 'Trade',
   },
   {
-    id: 'FFFFBC80005C517A10ACF481F7E6893769471098E696D0CC407F18134044CB16',
-    price: '17116898',
-    size: '24',
-    createdAt: '2022-04-06T16:19:42.692598951Z',
+    id: 'FFFFAD1BF47AA2853E5C375B6B3A62375F62D5B10807583D32EF3119CC455CD1',
+    price: '17106734',
+    size: '18',
+    createdAt: '2022-04-07T17:56:47.997938583Z',
     aggressor: Side.SIDE_BUY,
     market: {
       id: 'market-0',

libs/utils/src/lib/format/index.ts

@@ -1,5 +1,4 @@
 export * from './date';
 export * from './number';
-export * from './range';
 export * from './size';
 export * from './strings';

libs/utils/src/lib/format/range.ts

@@ -1,38 +0,0 @@
-import {
-  addDecimalsFormatNumber,
-  addDecimalsFormatNumberQuantum,
-  isNumeric,
-} from './number';
-
-export const formatValue = (
-  value: string | number | null | undefined,
-  decimalPlaces: number,
-  quantum?: string,
-  formatDecimals?: number,
-  emptyValue = '-'
-): string => {
-  if (!isNumeric(value)) return emptyValue;
-  if (!quantum) {
-    return addDecimalsFormatNumber(value, decimalPlaces, formatDecimals);
-  }
-  return addDecimalsFormatNumberQuantum(value, decimalPlaces, quantum);
-};
-
-export const formatRange = (
-  min: string | number | null | undefined,
-  max: string | number | null | undefined,
-  decimalPlaces: number,
-  quantum?: string,
-  formatDecimals?: number,
-  emptyValue = '-'
-) => {
-  const minFormatted = formatValue(min, decimalPlaces, quantum, formatDecimals);
-  const maxFormatted = formatValue(max, decimalPlaces, quantum, formatDecimals);
-  if (minFormatted !== maxFormatted) {
-    return `${minFormatted} - ${maxFormatted}`;
-  }
-  if (minFormatted !== emptyValue) {
-    return minFormatted;
-  }
-  return maxFormatted;
-};