test: fix lint

test: merge
test: network switcher fix
2023-06-21 08:41:55 +02:00 · 2023-06-21 08:34:52 +02:00 · 2023-06-21 08:23:31 +02:00 · 2023-06-20 17:37:43 +02:00
51 changed files with 552 additions and 746 deletions
@@ -265,7 +265,7 @@ jobs:
          fi

      - name: Check out ipfs-redirect
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
        uses: actions/checkout@v3
        with:
          repository: 'vegaprotocol/ipfs-redirect'
@@ -273,12 +273,11 @@ jobs:
          fetch-depth: '0'
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

-      - name: Update interstitial page to point to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+      - name: Update console.vega.xyz DNS to redirect to the new console
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
        env:
          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
        run: |
-          # set CID
          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"
@@ -286,28 +285,75 @@ jobs:
          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)

+          ls -al ipfs-redirect
+
+          echo $new_hash > ipfs-redirect/cidv0.txt
+          echo $new_cid > ipfs-redirect/cidv1.txt
+
          (
            cd ipfs-redirect

-            # configure git
            git status
            cat .git/config
            git config --global user.email "vega-ci-bot@vega.xyz"
            git config --global user.name "vega-ci-bot"

-            # update CID files
-            if echo ${{ github.ref }} | grep -q main; then
-              echo $new_hash > cidv0-mainnet.txt
-              echo $new_cid > cidv1-mainnet.txt
-              git add cidv0-mainnet.txt cidv1-mainnet.txt
-            elif echo ${{ github.ref }} | grep -q release/testnet; then
-              echo $new_hash > cidv0-fairground.txt
-              echo $new_cid > cidv1-fairground.txt
-              git add cidv0-fairground.txt cidv1-fairground.txt
-            fi
-
-            # create commit
+            branch_name="update-hash-${{ github.ref }}"
+            git checkout -b "$branch_name"
            commit_msg="Automated hash update from ${{ github.ref }}"
+            git add cidv0.txt cidv1.txt
            git commit -m "$commit_msg"
-            git push -u origin "main"
+            git push -u origin "$branch_name"
+            pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
+            echo $pr_url
+            # once auto merge get's enabled on documentation repo let's do follow up
+            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}
@@ -14,16 +14,9 @@ import {
  submitUniqueRawProposal,
  voteForProposal,
 } from '../../../../governance-e2e/src/support/governance.functions';
-import {
-  ensureSpecifiedUnstakedTokensAreAssociated,
-  stakingPageAssociateTokens,
-  stakingPageDisassociateAllTokens,
-} from '../../../../governance-e2e/src/support/staking.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governance-e2e/src/support/staking.functions';
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
-import {
-  switchVegaWalletPubKey,
-  vegaWalletSetSpecifiedApprovalAmount,
-} from '../../support/wallet-functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../../../governance-e2e/src/support/wallet-teardown.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';

@@ -51,7 +44,7 @@ describe(
    before('connect wallets and set approval limit', function () {
      cy.visit('/');
      ethereumWalletConnect();
-      // cy.associateTokensToVegaWallet('1');
+      cy.associateTokensToVegaWallet('1');
    });

    beforeEach('visit proposals tab', function () {
@@ -304,33 +297,5 @@ describe(
            .and('be.visible');
        });
    });
-
-    it('Able to vote for proposal twice by switching public key', function () {
-      ensureSpecifiedUnstakedTokensAreAssociated('1');
-      createRawProposal();
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
-        voteForProposal('for');
-        cy.contains('You voted: For').should('be.visible');
-        ethereumWalletConnect();
-        switchVegaWalletPubKey();
-        stakingPageAssociateTokens('2');
-        navigateTo(navigation.proposals);
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
-        cy.getByTestId('you-voted').should('not.exist');
-        voteForProposal('against');
-        cy.contains('You voted: Against').should('be.visible');
-        switchVegaWalletPubKey();
-        cy.get(proposalVoteProgressForTokens).should('contain.text', '1.00');
-        // Checking vote status for different public keys is displayed correctly
-        cy.contains('You voted: For').should('be.visible');
-      });
-      switchVegaWalletPubKey();
-      stakingPageDisassociateAllTokens();
-    });
  }
 );
@@ -16,7 +16,7 @@ import {
 } from '../../support/proposal.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

 const proposalListItem = '[data-testid="proposals-list-item"]';
 const closedProposals = '[data-testid="closed-proposals"]';
@@ -89,14 +89,8 @@ context(
      });
      cy.get(proposalStatus).should('have.text', 'Open');
      voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout)
-        .should('have.text', 'Passed')
-        .then(() => {
-          cy.get(proposalStatus, proposalTimeout).should(
-            'have.text',
-            'Enacted'
-          );
-        });
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Passed');
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
      cy.get(votesTable).within(() => {
        cy.contains('Vote passed.').should('be.visible');
        cy.contains('Voting has ended.').should('be.visible');
@@ -32,7 +32,7 @@ import {
 import {
  vegaWalletSetSpecifiedApprovalAmount,
  vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';

@@ -130,7 +130,7 @@ context(
      createRawProposal();
    });

-    it('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
+    it.skip('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      enterUniqueFreeFormProposalBody('0.1', generateFreeFormProposalTitle());
      cy.get('input:invalid')
@@ -138,7 +138,7 @@ context(
        .should('equal', 'Value must be greater than or equal to 1.');
    });

-    it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
+    it.skip('Creating a proposal - proposal rejected - when closing time later than system default', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      enterUniqueFreeFormProposalBody(
        '100000',
@@ -8,7 +8,6 @@ import {
 } from '../../support/common.functions';
 import {
  getDownloadedProposalJsonPath,
-  getProposalFromTitle,
  submitUniqueRawProposal,
 } from '../../support/governance.functions';
 import {
@@ -24,11 +23,10 @@ import {
 } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
-  switchVegaWalletPubKey,
-  vegaWalletFaucetAssetsWithoutCheck,
  vegaWalletSetSpecifiedApprovalAmount,
  vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';

 const proposalListItem = '[data-testid="proposals-list-item"]';
 const openProposals = '[data-testid="open-proposals"]';
@@ -56,8 +54,7 @@ const feedbackError = '[data-testid="Error"]';
 const viewProposalBtn = 'view-proposal-btn';
 const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
-const proposalJsonToggle = 'proposal-json-toggle';
-const proposalJsonSection = 'proposal-json';
+const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const fUSDCId =
  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
@@ -188,7 +185,7 @@ context(
      cy.get(maxVoteDeadline).click();
      cy.get(enactmentDeadlineError).should(
        'have.text',
-        'The proposal will fail if enactment is earlier than the voting deadline'
+        'Proposal will fail if enactment is earlier than the voting deadline'
      );
      cy.get(proposalDownloadBtn)
        .should('be.visible')
@@ -212,7 +209,6 @@ context(
      'Able to submit valid new market proposal',
      { tags: '@smoke' },
      function () {
-        const proposalTitle = 'Test new market proposal';
        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
        cy.get(newProposalTitle).type('Test new market proposal');
        cy.get(newProposalDescription).type('E2E test for proposals');
@@ -234,23 +230,6 @@ context(
              submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
            });
          });
-        navigateTo(navigation.proposals);
-        getProposalFromTitle(proposalTitle).within(() =>
-          cy.getByTestId('view-proposal-btn').click()
-        );
-        cy.getByTestId('proposal-market-data').within(() => {
-          cy.getByTestId('proposal-market-data-toggle').click();
-          cy.contains('Key details').click();
-          getMarketProposalDetailsFromTable('Name').should(
-            'have.text',
-            'Token test market'
-          );
-          cy.contains('Settlement asset').click();
-          // Settlement asset symbol
-          cy.getByTestId('3_value').should('have.text', 'fBTC');
-          cy.contains('Oracle').click();
-          cy.getByTestId('oracle-spec-links').should('have.attr', 'href');
-        });
      }
    );

@@ -290,7 +269,8 @@ context(
    // Will fail if run after 'Able to submit update market proposal and vote for proposal'
    // 3002-PROP-022
    it('Unable to submit update market proposal without equity-like share in the market', function () {
-      switchVegaWalletPubKey();
+      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="select-keypair-button"]').eq(0).click(); // switch to second wallet pub key
      stakingPageAssociateTokens('1');
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
      cy.get(newProposalTitle).type('Test update market proposal - rejected');
@@ -320,7 +300,8 @@ context(
      closeDialog();
      ethereumWalletConnect();
      stakingPageDisassociateAllTokens();
-      switchVegaWalletPubKey();
+      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="select-keypair-button"]').eq(0).click();
    });

    // 3002-PROP-020
@@ -474,8 +455,8 @@ context(
        .within(() => {
          cy.getByTestId(viewProposalBtn).click();
        });
-      cy.getByTestId(proposalJsonToggle).click();
-      cy.getByTestId(proposalJsonSection).within(() => {
+      cy.getByTestId('proposal-terms-toggle').click();
+      cy.getByTestId(proposalTermsSection).within(() => {
        cy.contains('USDT Coin').should('be.visible');
        cy.contains('USDT').should('be.visible');
      });
@@ -521,11 +502,13 @@ context(
        .invoke('text')
        .should('not.be.empty');
      // 3001-VOTE-030 3001-VOTE-031
-      cy.getByTestId(proposalJsonToggle).click();
-      cy.getByTestId(proposalJsonSection).within(() => {
-        cy.contains(assetId).should('be.visible');
-        cy.contains('lifetimeLimit').should('be.visible');
-        cy.contains('10').should('be.visible');
+      cy.getByTestId('proposal-terms-toggle').click();
+      cy.getByTestId('proposal-terms').within(() => {
+        getProposalInformationFromTable('assetId').should('have.text', assetId);
+        getProposalInformationFromTable('lifetimeLimit').should(
+          'have.text',
+          '10'
+        );
      });
    });

@@ -623,13 +606,5 @@ context(
        });
      });
    }
-
-    function getMarketProposalDetailsFromTable(heading: string) {
-      return cy
-        .getByTestId('key-value-table-row')
-        .contains(heading)
-        .parent()
-        .siblings();
-    }
  }
 );
@@ -21,7 +21,7 @@ import {
 } from '../../support/governance.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

 const proposalListItem = 'proposals-list-item';
 const openProposals = '[data-testid="open-proposals"]';
@@ -14,7 +14,7 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
  depositAsset,
  vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';

 const vegaAssetAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de';
 const vegaWalletUnstakedBalance =
@@ -25,7 +25,7 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
  vegaWalletSetSpecifiedApprovalAmount,
  vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
 const stakeValidatorListTotalStake = 'total-stake';
 const stakeValidatorListTotalShare = 'total-stake-share';
 const stakeValidatorListStakePercentage = 'stake-percentage';
@@ -14,12 +14,11 @@ import {
 } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
-  switchVegaWalletPubKey,
  vegaWalletAssociate,
  vegaWalletDisassociate,
  vegaWalletSetSpecifiedApprovalAmount,
  vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';

 const ethWalletContainer = '[data-testid="ethereum-wallet"]';
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
@@ -302,7 +301,8 @@ context(
          Cypress.env('vegaWalletPublicKey')
        );

-        switchVegaWalletPubKey();
+        cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+        cy.get('[data-testid="select-keypair-button"]').eq(0).click();
        cy.get(connectedVegaKey).should(
          'have.text',
          Cypress.env('vegaWalletPublicKey2')
@@ -5,7 +5,7 @@ import {
  waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import { depositAsset } from '../../support/wallet-functions';
+import { depositAsset } from '../../support/wallet-teardown.functions';

 const withdraw = 'withdraw';
 const withdrawalForm = 'withdraw-form';
@@ -11,7 +11,7 @@ import {
  goToMakeNewProposal,
  governanceProposalType,
 } from '../../support/governance.functions';
-import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';

 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey2');
 const vegaPubkeyTruncated = Cypress.env('vegaWalletPublicKey2Short');
@@ -30,6 +30,7 @@ const normalisedVotingPowerToolTip =
  '[data-testid="normalised-voting-power-tooltip"]';
 const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
 const overstakedPenaltyToolTip = '[data-testid="overstaked-penalty-tooltip"]';
+const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
 const epochCountDown = '[data-testid="epoch-countdown"]';
 const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;

@@ -142,6 +143,9 @@ context('Validators Page - verify elements on page', function () {
        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 () {
@@ -1,9 +1,7 @@
 import { truncateByChars } from '@vegaprotocol/utils';
 import { waitForSpinner } from '../../support/common.functions';
-import {
-  vegaWalletFaucetAssetsWithoutCheck,
-  vegaWalletTeardown,
-} from '../../support/wallet-functions';
+import { vegaWalletTeardown } from '../../support/wallet-teardown.functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';

 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
@@ -282,6 +280,13 @@ context(
      // 2002-SINC-016
      describe('Vega wallet with assets', function () {
        const assets = [
+          {
+            id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
+            name: 'USDC (fake)',
+            symbol: 'fUSDC',
+            amount: '1000000',
+            expectedAmount: '10.00',
+          },
          {
            id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665',
            name: 'DAI (fake)',
@@ -303,13 +308,6 @@ context(
            amount: '800000',
            expectedAmount: '8.00',
          },
-          {
-            id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
-            name: 'USDC (fake)',
-            symbol: 'fUSDC',
-            amount: '1000000',
-            expectedAmount: '10.00',
-          },
        ];

        before('faucet assets to connected vega wallet', function () {
@@ -5,7 +5,8 @@ import './common.functions.ts';
 import './staking.functions.ts';
 import './governance.functions.ts';
 import './wallet-eth.functions.ts';
-import './wallet-functions.ts';
+import './wallet-teardown.functions.ts';
+import './wallet-vega.functions.ts';
 import './proposal.functions.ts';
 import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
@@ -1,5 +1,5 @@
 import { closeDialog } from './common.functions';
-import { vegaWalletTeardown } from './wallet-functions';
+import { vegaWalletTeardown } from './wallet-teardown.functions';

 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
@@ -173,27 +173,3 @@ export async function vegaWalletDisassociate(amount: string) {
  amount = amount + '0'.repeat(18);
  stakingBridgeContract.remove_stake(amount, vegaWalletPubKey);
 }
-
-export function vegaWalletFaucetAssetsWithoutCheck(
-  asset: string,
-  amount: string,
-  vegaWalletPublicKey: string
-) {
-  cy.highlight(`Topping up vega wallet with ${asset}, amount: ${amount}`);
-  cy.exec(
-    `curl -X POST -d '{"amount": "${amount}", "asset": "${asset}", "party": "${vegaWalletPublicKey}"}' http://localhost:1790/api/v1/mint`
-  )
-    .its('stdout')
-    .then((response) => {
-      assert.include(
-        response,
-        `"success":true`,
-        'Ensuring curl command was successfully undertaken'
-      );
-    });
-}
-
-export function switchVegaWalletPubKey() {
-  cy.get('[data-testid="manage-vega-wallet"]:visible').click();
-  cy.get('[data-testid="select-keypair-button"]').eq(0).click();
-}
@@ -0,0 +1,18 @@
+export function vegaWalletFaucetAssetsWithoutCheck(
+  asset: string,
+  amount: string,
+  vegaWalletPublicKey: string
+) {
+  cy.highlight(`Topping up vega wallet with ${asset}, amount: ${amount}`);
+  cy.exec(
+    `curl -X POST -d '{"amount": "${amount}", "asset": "${asset}", "party": "${vegaWalletPublicKey}"}' http://localhost:1790/api/v1/mint`
+  )
+    .its('stdout')
+    .then((response) => {
+      assert.include(
+        response,
+        `"success":true`,
+        'Ensuring curl command was successfully undertaken'
+      );
+    });
+}
@@ -786,7 +786,6 @@
  "performancePenalty": "Performance penalty",
  "overstaked": "Overstaked",
  "overstakedPenalty": "Overstaked penalty",
-  "multisigPenalty": "Multisig penalty",
  "homeProposalsIntro": "Decisions on the Vega network are on-chain, with tokenholders creating proposals that other tokenholders vote to approve or reject. Network upgrades are proposed and approved by validators.",
  "homeProposalsButtonText": "Browse, vote, and propose",
  "homeValidatorsIntro": "Vega runs on a delegated proof of stake blockchain, where validators earn fees for validating block transactions. Tokenholders can nominate validators by staking tokens to them.",
@@ -36,7 +36,6 @@ import {
  toBigNum,
 } from '@vegaprotocol/utils';
 import { VALIDATOR_LOGO_MAP } from './logo-map';
-import { getMultisigStatusInfo } from '../../../../lib/get-multisig-status-info';

 interface CanonisedConsensusNodeProps {
  id: string;
@@ -138,10 +137,6 @@ export const ConsensusValidatorsTable = ({
    [totalStake]
  );

-  const multisigStatus = previousEpochData
-    ? getMultisigStatusInfo(previousEpochData)
-    : undefined;
-
  const allNodesInPreviousEpoch = removePaginationWrapper(
    previousEpochData?.epoch.validatorsConnection?.edges
  );
@@ -228,8 +223,6 @@ export const ConsensusValidatorsTable = ({
            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
              ? formatNumberPercentage(new BigNumber(userStakeShare), 2)
              : undefined,
-            [ValidatorFields.MULTISIG_ERROR]:
-              multisigStatus?.showMultisigStatusError,
          };
        }
      );
@@ -339,7 +332,6 @@ export const ConsensusValidatorsTable = ({
    data,
    decimals,
    hideTopThird,
-    multisigStatus?.showMultisigStatusError,
    previousEpochData,
    thirdOfTotalStake,
    validatorsView,
@@ -39,7 +39,6 @@ export enum ValidatorFields {
  STAKED_BY_USER = 'stakedByUser',
  PENDING_USER_STAKE = 'pendingUserStake',
  USER_STAKE_SHARE = 'userStakeShare',
-  MULTISIG_ERROR = 'multisigError',
 }

 export const addUserDataToValidator = (
@@ -327,7 +326,6 @@ interface TotalPenaltiesRendererProps {
    overstakedAmount: string;
    overstakingPenalty: string;
    totalPenalties: string;
-    multisigError?: boolean;
  };
 }

@@ -346,11 +344,10 @@ export const TotalPenaltiesRenderer = ({
          <div data-testid="overstaked-penalty-tooltip">
            {t('overstakedPenalty')}: {data.overstakingPenalty}
          </div>
-          {data.multisigError && (
-            <div data-testid="multisig-error-tooltip">
-              {t('multisigPenalty')}: 100%
-            </div>
-          )}
+          <div data-testid="total-penalty-tooltip">
+            {t('totalPenalties')}:{' '}
+            <span className="font-bold">{data.totalPenalties}</span>
+          </div>
        </>
      }
    >
@@ -1,15 +0,0 @@
-describe('charts', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId('Depth').click();
-  });
-
-  it('can see market depth chart', () => {
-    // 6006-DEPC-001
-    cy.getByTestId('tab-depth').should('be.visible');
-    cy.get('.depth-chart-module_canvas__260De').should('be.visible');
-  });
-});
@@ -182,7 +182,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
      .contains('Liquidity monitoring parameters')
      .click();

-    validateMarketDataRow(0, 'Triggering Ratio', '0.7');
+    validateMarketDataRow(0, 'Triggering Ratio', '0');
    validateMarketDataRow(1, 'Time Window', '3,600');
    validateMarketDataRow(2, 'Scaling Factor', '10');
  });
@@ -81,7 +81,6 @@ describe('liquidity table - trading', { tags: '@smoke' }, () => {

    cy.get(rowSelector).first().find(colFee).should('have.text', '0.09%');

-    // 5002-LIQP-013
    cy.get(rowSelector)
      .first()
      .find(colAverageEntryValuation)
@@ -166,7 +165,7 @@ describe('liquidity table view', { tags: '@smoke' }, () => {
  });

  it('can see liquidity supplied', () => {
-    // 5002-LIQP-008
+    //// 5002-LIQP-008
    cy.getByTestId(marketSummaryBlock).within(() => {
      cy.getByTestId('liquidity-supplied').within(() => {
        cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
@@ -238,7 +237,6 @@ describe('liquidity table view', { tags: '@smoke' }, () => {
        .find(colFee)
        .should('have.text', '0.09%');

-      // 5002-LIQP-013
      cy.get(rowSelectorLiquidityActive)
        .first()
        .find(colAverageEntryValuation)
@@ -270,7 +268,7 @@ describe('liquidity table view', { tags: '@smoke' }, () => {
    });

    it('renders liquidity inactive table correctly', () => {
-      // 5002-LIQP-012
+      //// 5002-LIQP-012
      cy.getByTestId('Inactive').click();
      cy.get(rowSelectorLiquidityInactive)
        .first()
@@ -128,7 +128,6 @@ describe('accounts', { tags: '@smoke' }, () => {
          cy.wrap(btn).click();
        });
      }
-      cy.contains('Loading...').should('not.exist');
    });
    // 7001-COLL-010
    it('sorting by asset', () => {
@@ -147,17 +146,12 @@ describe('accounts', { tags: '@smoke' }, () => {
    it('sorting by total', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
-        '1,000.00002',
+        '1,000.00',
        '1,000.01',
        '1,000.00',
-        '1,000.00001',
-      ];
-      const marketsSortedAsc = [
        '1,000.00',
-        '1,000.00001',
-        '1,000.00002',
-        '1,000.01',
      ];
+      const marketsSortedAsc = ['1,000.00', '1,000.00', '1,000.00', '1,000.01'];
      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();

      checkSorting(
@@ -194,24 +188,19 @@ describe('accounts', { tags: '@smoke' }, () => {
      );
    });

-    it('sorting by available', () => {
+    it('sorting by total', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
-        '1,000.00002',
+        '1,000.00',
+        '1,000.01',
        '1,000.00',
        '1,000.00',
-        '1,000.00001',
-      ];
-      const marketsSortedAsc = [
-        '1,000.00',
-        '1,000.00',
-        '1,000.00001',
-        '1,000.00002',
      ];
+      const marketsSortedAsc = ['1,000.00', '1,000.00', '1,000.00', '1,000.01'];
      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();

      checkSorting(
-        'available',
+        'total',
        marketsSortedDefault,
        marketsSortedAsc,
        marketsSortedDesc
@@ -83,8 +83,6 @@ export const LiquidityContainer = ({

  const assetDecimalPlaces =
    market?.tradableInstrument.instrument.product.settlementAsset.decimals || 0;
-  const quantum =
-    market?.tradableInstrument.instrument.product.settlementAsset.quantum || 0;
  const symbol =
    market?.tradableInstrument.instrument.product.settlementAsset.symbol;

@@ -100,7 +98,6 @@ export const LiquidityContainer = ({
        rowData={data}
        symbol={symbol}
        assetDecimalPlaces={assetDecimalPlaces}
-        quantum={quantum}
        stakeToCcyVolume={stakeToCcyVolume}
        overlayNoRowsTemplate={error ? error.message : t('No data')}
      />
@@ -8,7 +8,7 @@ import {
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import type { CSSProperties } from 'react';
-import { useCallback, useState, useMemo } from 'react';
+import { useState } from 'react';
 import { Link } from 'react-router-dom';
 import { FixedSizeList } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
@@ -184,6 +184,7 @@ const MarketList = ({
  if (error) {
    return <div>{error.message}</div>;
  }
+
  return (
    <AutoSizer>
      {({ width, height }) => (
@@ -203,29 +204,6 @@ const MarketList = ({
  );
 };

-interface ListItemData {
-  data: MarketMaybeWithDataAndCandles[];
-  onSelect?: (marketId: string) => void;
-  currentMarketId?: string;
-}
-
-const ListItem = ({
-  index,
-  style,
-  data,
-}: {
-  index: number;
-  style: CSSProperties;
-  data: ListItemData;
-}) => (
-  <MarketSelectorItem
-    market={data.data[index]}
-    currentMarketId={data.currentMarketId}
-    style={style}
-    onSelect={data.onSelect}
-  />
-);
-
 const List = ({
  data,
  loading,
@@ -234,20 +212,28 @@ const List = ({
  onSelect,
  noItems,
  currentMarketId,
-}: ListItemData & {
+}: {
+  data: MarketMaybeWithDataAndCandles[];
  loading: boolean;
  width: number;
  height: number;
  noItems: string;
+  onSelect?: (marketId: string) => void;
+  currentMarketId?: string;
 }) => {
-  const itemKey = useCallback(
-    (index: number, data: ListItemData) => data.data[index].id,
-    []
-  );
-  const itemData = useMemo(
-    () => ({ data, onSelect, currentMarketId }),
-    [data, onSelect, currentMarketId]
-  );
+  const row = ({ index, style }: { index: number; style: CSSProperties }) => {
+    const market = data[index];
+
+    return (
+      <MarketSelectorItem
+        market={market}
+        currentMarketId={currentMarketId}
+        style={style}
+        onSelect={onSelect}
+      />
+    );
+  };
+
  if (!data || loading) {
    return (
      <div style={{ width, height }}>
@@ -273,13 +259,11 @@ const List = ({
    <FixedSizeList
      className="virtualized-list"
      itemCount={data.length}
-      itemData={itemData}
      itemSize={130}
-      itemKey={itemKey}
      width={width}
      height={height}
    >
-      {ListItem}
+      {row}
    </FixedSizeList>
  );
 };
@@ -49,7 +49,7 @@ const MarketBottomPanel = memo(
    const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'bottom' });
    const { screenSize } = useScreenDimensions();
    const onMarketClick = useMarketClickHandler(true);
-    const onOrderTypeClick = useMarketLiquidityClickHandler();
+    const onOrderTypeClick = useMarketLiquidityClickHandler(true);

    return 'xxxl' === screenSize ? (
      <ResizableGrid
@@ -39,7 +39,7 @@ export const TradePanels = ({
 }: TradePanelsProps) => {
  const [drawerOpen, setDrawerOpen] = useState(false);
  const onMarketClick = useMarketClickHandler(true);
-  const onOrderTypeClick = useMarketLiquidityClickHandler();
+  const onOrderTypeClick = useMarketLiquidityClickHandler(true);

  const [view, setView] = useState<TradingView>('candles');
  const renderView = () => {
@@ -34,7 +34,7 @@ export const Portfolio = () => {
  }, [updateTitle]);

  const onMarketClick = useMarketClickHandler(true);
-  const onOrderTypeClick = useMarketLiquidityClickHandler();
+  const onOrderTypeClick = useMarketLiquidityClickHandler(true);
  const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
  const wrapperClasses = 'h-full max-h-full flex flex-col';
  return (
@@ -125,19 +125,14 @@ export const MarketLiquiditySupplied = ({
        </KeyValueTableRow>
      </KeyValueTable>
      <br />
-      <div className="flex flex-col gap-2">
-        <Link
-          href={`/#/liquidity/${marketId}`}
-          data-testid="view-liquidity-link"
-        >
-          {t('View liquidity provision table')}
-        </Link>
-        {DocsLinks && (
-          <ExternalLink href={DocsLinks.LIQUIDITY} className="mt-2">
-            {t('Learn about providing liquidity')}
-          </ExternalLink>
-        )}
-      </div>
+      <Link href={`/#/liquidity/${marketId}`} data-testid="view-liquidity-link">
+        {t('View liquidity provision table')}
+      </Link>
+      {DocsLinks && (
+        <ExternalLink href={DocsLinks.LIQUIDITY} className="mt-2">
+          {t('Learn about providing liquidity')}
+        </ExternalLink>
+      )}
      {showMessage && (
        <p className="mt-4">
          {t(
@@ -20,8 +20,20 @@ export const useMarketClickHandler = (replace = false) => {
  );
 };

-export const useMarketLiquidityClickHandler = () => {
-  return useCallback((selectedId: string, metaKey?: boolean) => {
-    window.open(`/#/liquidity/${selectedId}`, metaKey ? '_blank' : '_self');
-  }, []);
+export const useMarketLiquidityClickHandler = (replace = false) => {
+  const navigate = useNavigate();
+  const { marketId } = useParams();
+  const { pathname } = useLocation();
+  const isLiquidityPage = pathname.match(/^\/liquidity\/(.+)/);
+  return useCallback(
+    (selectedId: string, metaKey?: boolean) => {
+      const link = Links[Routes.LIQUIDITY](selectedId);
+      if (metaKey) {
+        window.open(`/#${link}`, '_blank');
+      } else if (selectedId !== marketId || !isLiquidityPage) {
+        navigate(link, { replace });
+      }
+    },
+    [navigate, marketId, replace, isLiquidityPage]
+  );
 };
@@ -72,6 +72,7 @@ export const AccountBreakdownDialog = memo(
    onClose: () => void;
    onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  }) => {
+    console.log('render');
    return (
      <Dialog
        size="medium"
@@ -290,14 +290,6 @@ export const TransferFee = ({
  decimals?: number;
 }) => {
  if (!feeFactor || !amount || !transferAmount || !fee) return null;
-  if (
-    isNaN(Number(feeFactor)) ||
-    isNaN(Number(amount)) ||
-    isNaN(Number(transferAmount)) ||
-    isNaN(Number(fee))
-  ) {
-    return null;
-  }

  const totalValue = new BigNumber(transferAmount).plus(fee).toString();

@@ -1,11 +0,0 @@
-import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
-import { sendVegaTx } from './wallet-client';
-import { waitForProposal } from './propose-market';
-import { determineId } from '../utils';
-const vegaPubKey = Cypress.env('VEGA_PUBLIC_KEY');
-
-export async function submitProposal(proposalTx: ProposalSubmissionBody) {
-  cy.highlight('Submitting proposal');
-  const result = await sendVegaTx(vegaPubKey, proposalTx);
-  await waitForProposal(determineId(result.result.transaction.signature.value));
-}
@@ -1,6 +1,5 @@
-import { createWalletClient } from '../capsule/wallet-client';
+import { createWalletClient, sendVegaTx } from '../capsule/wallet-client';
 import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
-import { submitProposal } from '../capsule/submit-proposal';

 declare global {
  // eslint-disable-next-line @typescript-eslint/no-namespace
@@ -16,8 +15,11 @@ export const addVegaWalletSubmitProposal = () => {
  Cypress.Commands.add('VegaWalletSubmitProposal', (proposalTx) => {
    const vegaWalletUrl = Cypress.env('VEGA_WALLET_URL');
    const token = Cypress.env('VEGA_WALLET_API_TOKEN');
+    const vegaPubKey = Cypress.env('VEGA_PUBLIC_KEY');

    createWalletClient(vegaWalletUrl, token);
-    cy.wrap(submitProposal(proposalTx));
+
+    cy.highlight('Submitting proposal');
+    sendVegaTx(vegaPubKey, proposalTx);
  });
 };
@@ -44,35 +44,27 @@ export const checkSorting = (
  orderTabDesc: string[]
 ) => {
  checkSortChange(orderTabDefault, column);
-  cy.get('.ag-header-container')
-    .last()
-    .within(() => {
-      cy.get(`[col-id="${column}"]`).last().click();
-    });
+  cy.get('.ag-header-container').within(() => {
+    cy.get(`[col-id="${column}"]`).click();
+  });
  checkSortChange(orderTabAsc, column);
-  cy.get('.ag-header-container')
-    .last()
-    .within(() => {
-      cy.get(`[col-id="${column}"]`).click();
-    });
+  cy.get('.ag-header-container').within(() => {
+    cy.get(`[col-id="${column}"]`).click();
+  });
  checkSortChange(orderTabDesc, column);
-  cy.get('.ag-header-container')
-    .last()
-    .within(() => {
-      cy.get(`[col-id="${column}"]`).click();
-    });
+  cy.get('.ag-header-container').within(() => {
+    cy.get(`[col-id="${column}"]`).click();
+  });
 };

 const checkSortChange = (tabsArr: string[], column: string) => {
-  cy.get('.ag-center-cols-container')
-    .last()
-    .within(() => {
-      tabsArr.forEach((entry, i) => {
-        cy.get(`[row-index="${i}"]`).within(() => {
-          cy.get(`[col-id="${column}"]`).should('have.text', tabsArr[i]);
-        });
+  cy.get('.ag-center-cols-container').within(() => {
+    tabsArr.forEach((entry, i) => {
+      cy.get(`[row-index="${i}"]`).within(() => {
+        cy.get(`[col-id="${column}"]`).should('have.text', tabsArr[i]);
      });
    });
+  });
 };

 type Edges = { node: unknown }[];
@@ -113,7 +113,6 @@ export const DealTicketFeeDetails = ({
  const { settlementAsset: asset } =
    market.tradableInstrument.instrument.product;
  const { decimals: assetDecimals, quantum } = asset;
-  const marketDecimals = market.decimalPlaces;
  let marginRequiredBestCase: string | undefined = undefined;
  let marginRequiredWorstCase: string | undefined = undefined;
  if (marginEstimate) {
@@ -228,9 +227,6 @@ export const DealTicketFeeDetails = ({
      liquidationEstimateWorstCaseIncludingSellOrders
        ? liquidationEstimateWorstCaseIncludingBuyOrders
        : liquidationEstimateWorstCaseIncludingSellOrders;
-
-    // The estimate order query API gives us the liquidation price in formatted by asset decimals.
-    // We need to calculate it with asset decimals, but display it with market decimals precision until the API changes.
    liquidationPriceEstimate = formatRange(
      (liquidationEstimateBestCase < liquidationEstimateWorstCase
        ? liquidationEstimateBestCase
@@ -251,16 +247,14 @@ export const DealTicketFeeDetails = ({
    []
  );

-  const quoteName = market.tradableInstrument.instrument.product.quoteName;
-
  return (
    <div>
      <DealTicketFeeDetail
        label={t('Notional')}
-        value={formatValue(notionalSize, marketDecimals)}
-        formattedValue={formatValue(notionalSize, marketDecimals)}
-        symbol={quoteName}
-        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(quoteName)}
+        value={formatValue(notionalSize, assetDecimals)}
+        formattedValue={formatValue(notionalSize, assetDecimals, quantum)}
+        symbol={assetSymbol}
+        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(assetSymbol)}
      />
      <DealTicketFeeDetail
        label={t('Fees')}
@@ -341,9 +335,8 @@ export const DealTicketFeeDetails = ({
      {projectedMargin}
      <DealTicketFeeDetail
        label={t('Liquidation price estimate')}
-        value={liquidationPriceEstimate}
        formattedValue={liquidationPriceEstimate}
-        symbol={quoteName}
+        symbol={assetSymbol}
        labelDescription={LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT}
      />
      {partyId && (
@@ -124,7 +124,7 @@ export const DealTicket = ({
          normalizedOrder.size,
          market.positionDecimalPlaces
        ).multipliedBy(toBigNum(price, market.decimalPlaces)),
-        market.decimalPlaces
+        asset.decimals
      );
    }
    return null;
@@ -133,6 +133,7 @@ export const DealTicket = ({
    normalizedOrder?.size,
    market.decimalPlaces,
    market.positionDecimalPlaces,
+    asset.decimals,
  ]);

  const feeEstimate = useEstimateFees(
@@ -48,7 +48,7 @@ const mapFillUpdateToFill = (
      id: marketId,
    },
    buyer: { id: buyerId, __typename: 'Party' },
-    seller: { id: sellerId, __typename: 'Party' },
+    seller: { id: buyerId, __typename: 'Party' },
  };
 };

@@ -1,22 +1,20 @@
-import { forwardRef, useMemo } from 'react';
+import { forwardRef } from 'react';
 import {
  addDecimalsFormatNumber,
-  addDecimalsFormatNumberQuantum,
  formatNumberPercentage,
  getDateTimeFormat,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
+import type {
+  VegaValueFormatterParams,
+  TypedDataAgGrid,
+} from '@vegaprotocol/datagrid';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
-import type {
-  ColDef,
-  ITooltipParams,
-  ValueFormatterParams,
-} from 'ag-grid-community';
+import { AgGridColumn } from 'ag-grid-react';
+import type { ValueFormatterParams } from 'ag-grid-community';
 import BigNumber from 'bignumber.js';
-import type { LiquidityProvisionStatus } from '@vegaprotocol/types';
 import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types';
 import type { LiquidityProvisionData } from './liquidity-data-provider';

@@ -37,152 +35,21 @@ export interface LiquidityTableProps
  symbol?: string;
  assetDecimalPlaces?: number;
  stakeToCcyVolume: string | null;
-  quantum?: string | number;
 }

 export const LiquidityTable = forwardRef<AgGridReact, LiquidityTableProps>(
-  (
-    { symbol = '', assetDecimalPlaces, stakeToCcyVolume, quantum, ...props },
-    ref
-  ) => {
-    const colDefs = useMemo(() => {
-      const assetDecimalsFormatter = ({ value }: ITooltipParams) => {
-        if (!value) return '-';
-        return `${addDecimalsFormatNumber(value, assetDecimalPlaces ?? 0)}`;
-      };
-
-      const assetDecimalsQuantumFormatter = ({
-        value,
-      }: ValueFormatterParams) => {
-        if (!value) return '-';
-        return `${addDecimalsFormatNumberQuantum(
-          value,
-          assetDecimalPlaces ?? 0,
-          quantum ?? 0
-        )}`;
-      };
-
-      const stakeToCcyVolumeFormatter = ({ value }: ITooltipParams) => {
-        if (!value) return '-';
-        const newValue = new BigNumber(value)
-          .times(Number(stakeToCcyVolume) || 1)
-          .toString();
-        return `${addDecimalsFormatNumber(newValue, assetDecimalPlaces ?? 0)}`;
-      };
-
-      const stakeToCcyVolumeQuantumFormatter = ({
-        value,
-      }: ValueFormatterParams) => {
-        if (!value) return '-';
-        const newValue = new BigNumber(value)
-          .times(Number(stakeToCcyVolume) || 1)
-          .toString();
-        return `${addDecimalsFormatNumberQuantum(
-          newValue,
-          assetDecimalPlaces ?? 0,
-          quantum ?? 0
-        )}`;
-      };
-
-      const defs: ColDef[] = [
-        {
-          headerName: t('Party'),
-          field: 'party.id',
-          headerTooltip: t(
-            'The public key of the party making this commitment.'
-          ),
-        },
-        {
-          headerName: t(`Commitment (${symbol})`),
-          field: 'commitmentAmount',
-          type: 'rightAligned',
-          headerTooltip: t(
-            'The amount committed to the market by this liquidity provider.'
-          ),
-          valueFormatter: assetDecimalsQuantumFormatter,
-          tooltipValueGetter: assetDecimalsFormatter,
-        },
-        {
-          headerName: t(`Share`),
-          field: 'equityLikeShare',
-          type: 'rightAligned',
-          headerTooltip: t(
-            'The equity-like share of liquidity of the market used to determine allocation of LP fees. Calculated based on share of total liquidity, with a premium added for length of commitment.'
-          ),
-          valueFormatter: percentageFormatter,
-        },
-        {
-          headerName: t('Proposed fee'),
-          headerTooltip: t(
-            'The fee percentage (per trade) proposed by each liquidity provider.'
-          ),
-          field: 'fee',
-          type: 'rightAligned',
-          valueFormatter: percentageFormatter,
-        },
-        {
-          headerName: t('Market valuation at entry'),
-          field: 'averageEntryValuation',
-          type: 'rightAligned',
-          headerTooltip: t(
-            'The valuation of the market at the time the liquidity commitment was made. Commitments made at a lower valuation earlier in the lifetime of the market would be expected to have a higher equity-like share if the market has grown. If a commitment is amended, value will reflect the average of the market valuations across the lifetime of the commitment.'
-          ),
-          minWidth: 160,
-          valueFormatter: assetDecimalsQuantumFormatter,
-          tooltipValueGetter: assetDecimalsFormatter,
-        },
-        {
-          headerName: t('Obligation'),
-          field: 'commitmentAmount',
-          type: 'rightAligned',
-          headerTooltip: t(
-            `The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_volume network parameter to convert into units of liquidity volume. The obligation can be met by a combination of LP orders and limit orders on the order book.`
-          ),
-          valueFormatter: stakeToCcyVolumeQuantumFormatter,
-          tooltipValueGetter: stakeToCcyVolumeFormatter,
-        },
-        {
-          headerName: t('Supplied'),
-          field: 'balance',
-          type: 'rightAligned',
-          headerTooltip: t(
-            `The amount of liquidity volume supplied by the LP order in order to meet the obligation. If the obligation is already met in full by other limit orders from the same Vega key the LP order is not required and this value will be zero. Also note if the target stake for the market is less than the obligation the full value of the obligation may not be required.`
-          ),
-          valueFormatter: stakeToCcyVolumeQuantumFormatter,
-          tooltipValueGetter: stakeToCcyVolumeFormatter,
-        },
-        {
-          headerName: t('Status'),
-          headerTooltip: t('The current status of this liquidity provision.'),
-          field: 'status',
-          valueFormatter: ({ value }) => {
-            if (!value) return value;
-            return LiquidityProvisionStatusMapping[
-              value as LiquidityProvisionStatus
-            ];
-          },
-        },
-        {
-          headerName: t('Created'),
-          headerTooltip: t(
-            'The date and time this liquidity provision was created.'
-          ),
-          field: 'createdAt',
-          type: 'rightAligned',
-          valueFormatter: dateValueFormatter,
-        },
-        {
-          headerName: t('Updated'),
-          headerTooltip: t(
-            'The date and time this liquidity provision was last updated.'
-          ),
-          field: 'updatedAt',
-          type: 'rightAligned',
-          valueFormatter: dateValueFormatter,
-        },
-      ];
-      return defs;
-    }, [assetDecimalPlaces, quantum, stakeToCcyVolume, symbol]);
+  ({ symbol = '', assetDecimalPlaces, stakeToCcyVolume, ...props }, ref) => {
+    const assetDecimalsFormatter = ({ value }: ValueFormatterParams) => {
+      if (!value) return '-';
+      return `${addDecimalsFormatNumber(value, assetDecimalPlaces ?? 0, 5)}`;
+    };
+    const stakeToCcyVolumeFormatter = ({ value }: ValueFormatterParams) => {
+      if (!value) return '-';
+      const newValue = new BigNumber(value)
+        .times(Number(stakeToCcyVolume) || 1)
+        .toString();
+      return `${addDecimalsFormatNumber(newValue, assetDecimalPlaces ?? 0, 5)}`;
+    };

    return (
      <AgGrid
@@ -199,8 +66,99 @@ export const LiquidityTable = forwardRef<AgGridReact, LiquidityTableProps>(
        }}
        storeKey="liquidityProvisionTable"
        {...props}
-        columnDefs={colDefs}
-      ></AgGrid>
+      >
+        <AgGridColumn
+          headerName={t('Party')}
+          field="party.id"
+          headerTooltip={t(
+            'The public key of the party making this commitment.'
+          )}
+        />
+        <AgGridColumn
+          headerName={t(`Commitment (${symbol})`)}
+          field="commitmentAmount"
+          type="rightAligned"
+          headerTooltip={t(
+            'The amount committed to the market by this liquidity provider.'
+          )}
+          valueFormatter={assetDecimalsFormatter}
+        />
+        <AgGridColumn
+          headerName={t('Share')}
+          field="equityLikeShare"
+          type="rightAligned"
+          headerTooltip={t(
+            'The equity-like share of liquidity of the market used to determine allocation of LP fees. Calculated based on share of total liquidity, with a premium added for length of commitment.'
+          )}
+          valueFormatter={percentageFormatter}
+        />
+        <AgGridColumn
+          headerName={t('Proposed fee')}
+          headerTooltip={t(
+            'The fee percentage (per trade) proposed by each liquidity provider.'
+          )}
+          field="fee"
+          type="rightAligned"
+          valueFormatter={percentageFormatter}
+        />
+        <AgGridColumn
+          headerName={t('Market valuation at entry')}
+          field="averageEntryValuation"
+          type="rightAligned"
+          headerTooltip={t(
+            'The valuation of the market at the time the liquidity commitment was made. Commitments made at a lower valuation earlier in the lifetime of the market would be expected to have a higher equity-like share if the market has grown. If a commitment is amended, value will reflect the average of the market valuations across the lifetime of the commitment.'
+          )}
+          minWidth={160}
+          valueFormatter={assetDecimalsFormatter}
+        />
+        <AgGridColumn
+          headerName={t('Obligation')}
+          field="commitmentAmount"
+          type="rightAligned"
+          headerTooltip={t(
+            `The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_siskas network parameter to convert into units of liquidity volume. The obligation can be met by a combination of LP orders and limit orders on the order book.`
+          )}
+          valueFormatter={stakeToCcyVolumeFormatter}
+        />
+        <AgGridColumn
+          headerName={t('Supplied')}
+          headerTooltip={t(
+            `The amount of liquidity volume supplied by the LP order in order to meet the obligation. If the obligation is already met in full by other limit orders from the same Vega key the LP order is not required and this value will be zero. Also note if the target stake for the market is less than the obligation the full value of the obligation may not be required.`
+          )}
+          field="balance"
+          type="rightAligned"
+          valueFormatter={stakeToCcyVolumeFormatter}
+        />
+        <AgGridColumn
+          headerName={t('Status')}
+          headerTooltip={t('The current status of this liquidity provision.')}
+          field="status"
+          valueFormatter={({
+            value,
+          }: VegaValueFormatterParams<LiquidityProvisionData, 'status'>) => {
+            if (!value) return value;
+            return LiquidityProvisionStatusMapping[value];
+          }}
+        />
+        <AgGridColumn
+          headerName={t('Created')}
+          headerTooltip={t(
+            'The date and time this liquidity provision was created.'
+          )}
+          field="createdAt"
+          type="rightAligned"
+          valueFormatter={dateValueFormatter}
+        />
+        <AgGridColumn
+          headerName={t('Updated')}
+          headerTooltip={t(
+            'The last time this liquidity provision was updated.'
+          )}
+          field="updatedAt"
+          type="rightAligned"
+          valueFormatter={dateValueFormatter}
+        />
+      </AgGrid>
    );
  }
 );
@@ -1,5 +1,6 @@
 import {
  addDecimalsFormatNumber,
+  formatNumber,
  formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -46,10 +47,7 @@ const Row = ({
    if (asPercentage) {
      return formatNumberPercentage(new BigNumber(value).times(100));
    }
-    if (assetSymbol) {
-      return `${Number(value).toLocaleString()} ${assetSymbol}`;
-    }
-    return Number(value).toLocaleString();
+    return `${formatNumber(Number(value))} ${assetSymbol}`;
  };

  const formattedValue = getFormattedValue(value);
@@ -94,7 +94,7 @@ export const marketInfoQuery = (
      },
      lpPriceRange: '0.02',
      liquidityMonitoringParameters: {
-        triggeringRatio: '0.7',
+        triggeringRatio: '0',
        targetStakeParameters: {
          timeWindow: 3600,
          scalingFactor: 10,
@@ -2,13 +2,14 @@ import {
  addDecimalsFormatNumber,
  getDateTimeFormat,
  isNumeric,
-  toBigNum,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
+import { AgGridColumn } from 'ag-grid-react';
+import BigNumber from 'bignumber.js';
 import type { ForwardedRef } from 'react';
-import { memo, forwardRef, useMemo } from 'react';
+import { memo, forwardRef } from 'react';
 import {
  AgGridLazy as AgGrid,
  SetFilter,
@@ -23,13 +24,11 @@ import type {
  TypedDataAgGrid,
  VegaICellRendererParams,
  VegaValueFormatterParams,
-  VegaValueGetterParams,
 } from '@vegaprotocol/datagrid';
 import type { AgGridReact } from 'ag-grid-react';
 import type { Order } from '../order-data-provider';
 import { OrderActionsDropdown } from '../order-actions-dropdown';
 import { Filter } from '../order-list-manager';
-import type { ColDef } from 'ag-grid-community';

 export type OrderListTableProps = TypedDataAgGrid<Order> & {
  marketId?: string;
@@ -55,40 +54,49 @@ export const OrderListTable = memo<
        : filter === undefined || filter === Filter.Open
        ? true
        : false;
-      const columnDefs: ColDef[] = useMemo(
-        () => [
-          {
-            headerName: t('Market'),
-            field: 'market.tradableInstrument.instrument.code',
-            cellRenderer: 'MarketNameCell',
-            cellRendererParams: { idPath: 'market.id', onMarketClick },
-            minWidth: 150,
-          },
-          {
-            headerName: t('Size'),
-            field: 'size',
-            cellClass: 'font-mono text-right',
-            type: 'rightAligned',
-            cellClassRules: {
+
+      return (
+        <AgGrid
+          ref={ref}
+          defaultColDef={{
+            resizable: true,
+            sortable: true,
+            filterParams: { buttons: ['reset'] },
+          }}
+          style={{
+            width: '100%',
+            height: '100%',
+          }}
+          getRowId={({ data }) => data.id}
+          components={{ MarketNameCell, OrderTypeCell }}
+          {...props}
+        >
+          <AgGridColumn
+            headerName={t('Market')}
+            field="market.tradableInstrument.instrument.code"
+            cellRenderer="MarketNameCell"
+            cellRendererParams={{ idPath: 'market.id', onMarketClick }}
+            minWidth={150}
+          />
+          <AgGridColumn
+            headerName={t('Size')}
+            field="size"
+            cellClass="font-mono text-right"
+            type="rightAligned"
+            cellClassRules={{
              [positiveClassNames]: ({ data }: { data: Order }) =>
                data?.side === Schema.Side.SIDE_BUY,
              [negativeClassNames]: ({ data }: { data: Order }) =>
                data?.side === Schema.Side.SIDE_SELL,
-            },
-            valueGetter: ({ data }: VegaValueGetterParams<Order>) => {
-              return data?.size && data.market
-                ? toBigNum(data.size, data.market.positionDecimalPlaces ?? 0)
-                    .multipliedBy(data.side === Schema.Side.SIDE_SELL ? -1 : 1)
-                    .toNumber()
-                : undefined;
-            },
-            valueFormatter: ({
+            }}
+            valueFormatter={({
+              value,
              data,
            }: VegaValueFormatterParams<Order, 'size'>) => {
              if (!data) {
-                return '';
+                return undefined;
              }
-              if (!data?.market || !isNumeric(data.size)) {
+              if (!data?.market || !isNumeric(value)) {
                return '-';
              }
              const prefix = data
@@ -99,33 +107,33 @@ export const OrderListTable = memo<
              return (
                prefix +
                addDecimalsFormatNumber(
-                  data.size,
+                  value,
                  data.market.positionDecimalPlaces
                )
              );
-            },
-            minWidth: 80,
-          },
-          {
-            field: 'type',
-            filter: SetFilter,
-            filterParams: {
+            }}
+            minWidth={80}
+          />
+          <AgGridColumn
+            field="type"
+            filter={SetFilter}
+            filterParams={{
              set: Schema.OrderTypeMapping,
-            },
-            cellRenderer: 'OrderTypeCell',
-            cellRendererParams: {
+            }}
+            cellRenderer="OrderTypeCell"
+            cellRendererParams={{
              onClick: onOrderTypeClick,
-            },
-            minWidth: 80,
-          },
-          {
-            field: 'status',
-            filter: SetFilter,
-            filterParams: {
+            }}
+            minWidth={80}
+          />
+          <AgGridColumn
+            field="status"
+            filter={SetFilter}
+            filterParams={{
              set: Schema.OrderStatusMapping,
              readonly: filter !== undefined,
-            },
-            valueFormatter: ({
+            }}
+            valueFormatter={({
              value,
              data,
            }: VegaValueFormatterParams<Order, 'status'>) => {
@@ -137,8 +145,8 @@ export const OrderListTable = memo<
                }`;
              }
              return value ? Schema.OrderStatusMapping[value] : '';
-            },
-            cellRenderer: ({
+            }}
+            cellRenderer={({
              valueFormatted,
              data,
            }: {
@@ -148,51 +156,45 @@ export const OrderListTable = memo<
              <span data-testid={`order-status-${data?.id}`}>
                {valueFormatted}
              </span>
-            ),
-            minWidth: 100,
-          },
-          {
-            headerName: t('Filled'),
-            field: 'remaining',
-            cellClass: 'font-mono text-right',
-            type: 'rightAligned',
-            valueGetter: ({ data }: VegaValueGetterParams<Order>) => {
-              return data?.size && data.market
-                ? toBigNum(
-                    (BigInt(data.size) - BigInt(data.remaining)).toString(),
-                    data.market.positionDecimalPlaces ?? 0
-                  ).toNumber()
-                : undefined;
-            },
-            valueFormatter: ({
+            )}
+            minWidth={100}
+          />
+          <AgGridColumn
+            headerName={t('Filled')}
+            field="remaining"
+            cellClass="font-mono text-right"
+            type="rightAligned"
+            valueFormatter={({
              data,
              value,
-            }: VegaValueFormatterParams<Order, 'remaining'>): string => {
+            }: VegaValueFormatterParams<Order, 'remaining'>) => {
              if (!data) {
-                return '';
+                return undefined;
              }
              if (!data?.market || !isNumeric(value) || !isNumeric(data.size)) {
                return '-';
              }
-              const { positionDecimalPlaces } = data.market;
-              const filled = BigInt(data.size) - BigInt(data.remaining);
+              const dps = data.market.positionDecimalPlaces;
+              const size = new BigNumber(data.size);
+              const remaining = new BigNumber(value);
+              const fills = size.minus(remaining);
              return `${addDecimalsFormatNumber(
-                filled.toString(),
-                positionDecimalPlaces
-              )}/${addDecimalsFormatNumber(data.size, positionDecimalPlaces)}`;
-            },
-            minWidth: 100,
-          },
-          {
-            field: 'price',
-            type: 'rightAligned',
-            cellClass: 'font-mono text-right',
-            valueFormatter: ({
+                fills.toString(),
+                dps
+              )}/${addDecimalsFormatNumber(size.toString(), dps)}`;
+            }}
+            minWidth={100}
+          />
+          <AgGridColumn
+            field="price"
+            type="rightAligned"
+            cellClass="font-mono text-right"
+            valueFormatter={({
              value,
              data,
            }: VegaValueFormatterParams<Order, 'price'>) => {
              if (!data) {
-                return '';
+                return undefined;
              }
              if (
                !data?.market ||
@@ -202,16 +204,16 @@ export const OrderListTable = memo<
                return '-';
              }
              return addDecimalsFormatNumber(value, data.market.decimalPlaces);
-            },
-            minWidth: 100,
-          },
-          {
-            field: 'timeInForce',
-            filter: SetFilter,
-            filterParams: {
+            }}
+            minWidth={100}
+          />
+          <AgGridColumn
+            field="timeInForce"
+            filter={SetFilter}
+            filterParams={{
              set: Schema.OrderTimeInForceMapping,
-            },
-            valueFormatter: ({
+            }}
+            valueFormatter={({
              value,
              data,
            }: VegaValueFormatterParams<Order, 'timeInForce'>) => {
@@ -233,13 +235,13 @@ export const OrderListTable = memo<
              }${data?.reduceOnly ? t('. Reduce only') : ''}`;

              return label;
-            },
-            minWidth: 150,
-          },
-          {
-            field: 'createdAt',
-            filter: DateRangeFilter,
-            cellRenderer: ({
+            }}
+            minWidth={150}
+          />
+          <AgGridColumn
+            field="createdAt"
+            filter={DateRangeFilter}
+            cellRenderer={({
              value,
            }: VegaICellRendererParams<Order, 'createdAt'>) => {
              return (
@@ -247,12 +249,12 @@ export const OrderListTable = memo<
                  {value ? getDateTimeFormat().format(new Date(value)) : value}
                </span>
              );
-            },
-            minWidth: 150,
-          },
-          {
-            field: 'updatedAt',
-            cellRenderer: ({
+            }}
+            minWidth={150}
+          />
+          <AgGridColumn
+            field="updatedAt"
+            cellRenderer={({
              data,
              value,
            }: VegaICellRendererParams<Order, 'updatedAt'>) => {
@@ -264,15 +266,15 @@ export const OrderListTable = memo<
                  {value ? getDateTimeFormat().format(new Date(value)) : '-'}
                </span>
              );
-            },
-            minWidth: 150,
-          },
-          {
-            colId: 'amend',
-            ...COL_DEFS.actions,
-            minWidth: showAllActions ? 120 : COL_DEFS.actions.minWidth,
-            maxWidth: showAllActions ? 120 : COL_DEFS.actions.minWidth,
-            cellRenderer: ({ data }: { data?: Order }) => {
+            }}
+            minWidth={150}
+          />
+          <AgGridColumn
+            colId="amend"
+            {...COL_DEFS.actions}
+            minWidth={showAllActions ? 120 : COL_DEFS.actions.minWidth}
+            maxWidth={showAllActions ? 120 : COL_DEFS.actions.minWidth}
+            cellRenderer={({ data }: { data?: Order }) => {
              if (!data) return null;

              return (
@@ -296,37 +298,9 @@ export const OrderListTable = memo<
                  <OrderActionsDropdown id={data?.id} />
                </div>
              );
-            },
-          },
-        ],
-        [
-          filter,
-          onCancel,
-          onEdit,
-          onMarketClick,
-          onOrderTypeClick,
-          props.isReadOnly,
-          showAllActions,
-        ]
-      );
-
-      return (
-        <AgGrid
-          ref={ref}
-          defaultColDef={{
-            resizable: true,
-            sortable: true,
-            filterParams: { buttons: ['reset'] },
-          }}
-          columnDefs={columnDefs}
-          style={{
-            width: '100%',
-            height: '100%',
-          }}
-          getRowId={({ data }) => data.id}
-          components={{ MarketNameCell, OrderTypeCell }}
-          {...props}
-        />
+            }}
+          />
+        </AgGrid>
      );
    }
  )
@@ -1,4 +1,4 @@
 {
  "name": "@vegaprotocol/ui-toolkit",
-  "version": "0.12.5"
+  "version": "0.12.3"
 }
@@ -1,6 +1,6 @@
 import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
 import classNames from 'classnames';
-import type { ComponentProps, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import { forwardRef } from 'react';
 import { VegaIcon, VegaIconNames } from '../icon';
 import { Icon } from '../icon';
@@ -164,9 +164,10 @@ export const DropdownMenuSeparator = forwardRef<
 /**
 * Container element for submenus
 */
-export const DropdownMenuSub = (
-  subProps: ComponentProps<typeof DropdownMenuPrimitive.Sub>
-) => <DropdownMenuPrimitive.Sub {...subProps} />;
+export const DropdownMenuSub = forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Sub>,
+  React.ComponentProps<typeof DropdownMenuPrimitive.Sub>
+>(({ ...subProps }) => <DropdownMenuPrimitive.Sub {...subProps} />);

 /**
 * Container within a DropdownMenuSub specifically for the content
@@ -200,9 +201,10 @@ export const DropdownMenuSubTrigger = forwardRef<
 * Portal to ensure menu portions are rendered outwith where they appear in the
 * DOM.
 */
-export const DropdownMenuPortal = (
-  portalProps: ComponentProps<typeof DropdownMenuPrimitive.Portal>
-) => <DropdownMenuPrimitive.Portal {...portalProps} />;
+export const DropdownMenuPortal = forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Portal>,
+  React.ComponentProps<typeof DropdownMenuPrimitive.Portal>
+>(({ ...portalProps }) => <DropdownMenuPrimitive.Portal {...portalProps} />);

 /**
 * Wraps a regular DropdownMenuItem with copy to clip board functionality
@@ -1,8 +1,5 @@
 import classNames from 'classnames';
-import {
-  addDecimalsFormatNumber,
-  formatNumberPercentage,
-} from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { BigNumber } from 'bignumber.js';
 import { getIntentBackground, Intent } from '../../utils/intent';
@@ -77,17 +74,13 @@ const Level = ({
    .multipliedBy(100)
    .toNumber();

-  const formattedFee = fee
-    ? formatNumberPercentage(new BigNumber(fee).times(100), 2)
-    : '-';
-
  const tooltipContent = (
-    <div className="text-vega-dark-100 dark:text-vega-light-200">
+    <>
      <div className="mt-1.5 inline-flex">
        <Indicator variant={intent} />
      </div>
      <span>
-        {formattedFee} {t('Fee')}
+        {fee}% {t('Fee')}
      </span>
      <div className="flex  flex-col">
        <span>
@@ -95,7 +88,7 @@ const Level = ({
          {addDecimalsFormatNumber(commitmentAmount, decimals)}
        </span>
      </div>
-    </div>
+    </>
  );

  return (
@@ -186,7 +179,7 @@ export const HealthBar = ({
                  opacity={opacity}
                  fee={fee}
                  prevLevel={prevLevel}
-                  decimals={decimals}
+                  decimals={0}
                  intent={intent}
                  key={'healthbar-segment-' + index}
                />
@@ -10,7 +10,7 @@ import {
 import type { ITooltipParams } from 'ag-grid-community';

 const tooltipContentClasses =
-  'max-w-sm bg-vega-light-100 dark:bg-vega-dark-100 border border-vega-light-200 dark:border-vega-dark-200 px-2 py-1 z-20 rounded text-xs text-black dark:text-white break-word';
+  'max-w-sm bg-vega-light-100 dark:bg-vega-dark-100 border border-vega-light-200 dark:border-vega-dark-200 px-2 py-1 z-20 rounded text-xs break-word';
 export interface TooltipProps {
  children: React.ReactElement;
  description?: string | ReactNode;
@@ -1,5 +1,5 @@
 {
  "name": "@vegaprotocol/utils",
-  "version": "0.0.5",
+  "version": "0.0.4",
  "type": "commonjs"
 }
@@ -29,21 +29,14 @@ describe('number utils', () => {
    { v: new BigNumber(123000), d: 3, o: '123.00', q: 0.1 },
    { v: new BigNumber(123000), d: 1, o: '12,300.00', q: 0.1 },
    { v: new BigNumber(123001000), d: 2, o: '1,230,010.00', q: 0.1 },
-    { v: new BigNumber(123001), d: 2, o: '1,230.01', q: 100 },
+    { v: new BigNumber(123001), d: 2, o: '1,230', q: 100 },
    { v: new BigNumber(123001), d: 2, o: '1,230.01', q: 0.1 },
-    { v: new BigNumber(123001), d: 2, o: '1,230.01', q: 1 },
    {
      v: BigNumber('123456789123456789'),
      d: 10,
-      o: '12,345,678.91234568',
+      o: '12,345,678.9123457',
      q: '0.00003846',
    },
-    {
-      v: BigNumber('123456789123456789'),
-      d: 10,
-      o: '12,345,678.91234568',
-      q: '1',
-    },
  ])(
    'formats with addDecimalsFormatNumberQuantum given number correctly',
    ({ v, d, o, q }) => {
@@ -77,80 +70,80 @@ describe('number utils', () => {
  ])('formats given number correctly', ({ v, d, o }) => {
    expect(formatNumberPercentage(v, d)).toStrictEqual(o);
  });
+});

-  describe('toNumberParts', () => {
-    it.each([
-      { v: null, d: 3, o: ['0', '000'] },
-      { v: undefined, d: 3, o: ['0', '000'] },
-      { v: new BigNumber(123), d: 3, o: ['123', '00'] },
-      { v: new BigNumber(123.123), d: 3, o: ['123', '123'] },
-      { v: new BigNumber(123.123), d: 6, o: ['123', '123'] },
-      { v: new BigNumber(123.123), d: 0, o: ['123', ''] },
-      { v: new BigNumber(123), d: undefined, o: ['123', '00'] },
-      {
-        v: new BigNumber(30000),
-        d: undefined,
-        o: ['30,000', '00'],
-      },
-    ])('returns correct tuple given the different arguments', ({ v, d, o }) => {
-      expect(toNumberParts(v, d)).toStrictEqual(o);
-    });
+describe('toNumberParts', () => {
+  it.each([
+    { v: null, d: 3, o: ['0', '000'] },
+    { v: undefined, d: 3, o: ['0', '000'] },
+    { v: new BigNumber(123), d: 3, o: ['123', '00'] },
+    { v: new BigNumber(123.123), d: 3, o: ['123', '123'] },
+    { v: new BigNumber(123.123), d: 6, o: ['123', '123'] },
+    { v: new BigNumber(123.123), d: 0, o: ['123', ''] },
+    { v: new BigNumber(123), d: undefined, o: ['123', '00'] },
+    {
+      v: new BigNumber(30000),
+      d: undefined,
+      o: ['30,000', '00'],
+    },
+  ])('returns correct tuple given the different arguments', ({ v, d, o }) => {
+    expect(toNumberParts(v, d)).toStrictEqual(o);
  });
+});

-  describe('isNumeric', () => {
-    it.each([
-      { i: null, o: false },
-      { i: undefined, o: false },
-      { i: 1, o: true },
-      { i: '1', o: true },
-      { i: '-1', o: true },
-      { i: 0.1, o: true },
-      { i: '.1', o: true },
-      { i: '-.1', o: true },
-      { i: 123, o: true },
-      { i: -123, o: true },
-      { i: '123', o: true },
-      { i: '123.01', o: true },
-      { i: '-123.01', o: true },
-      { i: '--123.01', o: false },
-      { i: '123.', o: false },
-      { i: '123.1.1', o: false },
-      { i: BigInt(123), o: true },
-      { i: BigInt(-1), o: true },
-      { i: new BigNumber(123), o: true },
-      { i: new BigNumber(123.123), o: true },
-      { i: new BigNumber(123.123).toString(), o: true },
-      { i: new BigNumber(123), o: true },
-      { i: Infinity, o: false },
-      { i: NaN, o: false },
-    ])(
-      'returns correct results',
-      ({
-        i,
-        o,
-      }: {
-        i: number | string | undefined | null | BigNumber | bigint;
-        o: boolean;
-      }) => {
-        expect(isNumeric(i)).toStrictEqual(o);
-      }
-    );
-  });
+describe('isNumeric', () => {
+  it.each([
+    { i: null, o: false },
+    { i: undefined, o: false },
+    { i: 1, o: true },
+    { i: '1', o: true },
+    { i: '-1', o: true },
+    { i: 0.1, o: true },
+    { i: '.1', o: true },
+    { i: '-.1', o: true },
+    { i: 123, o: true },
+    { i: -123, o: true },
+    { i: '123', o: true },
+    { i: '123.01', o: true },
+    { i: '-123.01', o: true },
+    { i: '--123.01', o: false },
+    { i: '123.', o: false },
+    { i: '123.1.1', o: false },
+    { i: BigInt(123), o: true },
+    { i: BigInt(-1), o: true },
+    { i: new BigNumber(123), o: true },
+    { i: new BigNumber(123.123), o: true },
+    { i: new BigNumber(123.123).toString(), o: true },
+    { i: new BigNumber(123), o: true },
+    { i: Infinity, o: false },
+    { i: NaN, o: false },
+  ])(
+    'returns correct results',
+    ({
+      i,
+      o,
+    }: {
+      i: number | string | undefined | null | BigNumber | bigint;
+      o: boolean;
+    }) => {
+      expect(isNumeric(i)).toStrictEqual(o);
+    }
+  );
+});

-  describe('toDecimal', () => {
-    it.each([
-      { v: 0, o: '1' },
-      { v: 1, o: '0.1' },
-      { v: 2, o: '0.01' },
-      { v: 3, o: '0.001' },
-      { v: 4, o: '0.0001' },
-      { v: 5, o: '0.00001' },
-      { v: 6, o: '0.000001' },
-      { v: 7, o: '0.0000001' },
-      { v: 8, o: '0.00000001' },
-      { v: 9, o: '0.000000001' },
-    ])('formats with toNumber given number correctly', ({ v, o }) => {
-      expect(toDecimal(v)).toStrictEqual(o);
-    });
+describe('toDecimal', () => {
+  it.each([
+    { v: 0, o: '1' },
+    { v: 1, o: '0.1' },
+    { v: 2, o: '0.01' },
+    { v: 3, o: '0.001' },
+    { v: 4, o: '0.0001' },
+    { v: 5, o: '0.00001' },
+    { v: 6, o: '0.000001' },
+    { v: 7, o: '0.0000001' },
+    { v: 8, o: '0.00000001' },
+    { v: 9, o: '0.000000001' },
+  ])('formats with toNumber given number correctly', ({ v, o }) => {
+    expect(toDecimal(v)).toStrictEqual(o);
  });
 });
@@ -98,8 +98,7 @@ export const addDecimalsFormatNumberQuantum = (
  if (isNaN(Number(quantum))) {
    return addDecimalsFormatNumber(rawValue, decimalPlaces);
  }
-  const quantumValue = addDecimal(quantum, decimalPlaces);
-  const numberDP = Math.max(0, Math.log10(100 / Number(quantumValue)));
+  const numberDP = Math.max(0, Math.log10(100 / Number(quantum)));
  return addDecimalsFormatNumber(rawValue, decimalPlaces, Math.ceil(numberDP));
 };

@@ -21,12 +21,12 @@ describe('formatValue', () => {
    { v: 123000, d: 3, o: '123.00', q: '0.1' },
    { v: 123000, d: 1, o: '12,300.00', q: '0.1' },
    { v: 123001000, d: 2, o: '1,230,010.00', q: '0.1' },
-    { v: 123001, d: 2, o: '1,230.01', q: '100' },
+    { v: 123001, d: 2, o: '1,230', q: '100' },
    { v: 123001, d: 2, o: '1,230.01', q: '0.1' },
    {
      v: '123456789123456789',
      d: 10,
-      o: '12,345,678.91234568',
+      o: '12,345,678.9123457',
      q: '0.00003846',
    },
  ])(
@@ -38,13 +38,7 @@ describe('formatValue', () => {
 });
 describe('formatRange', () => {
  it.each([
-    {
-      min: 123000,
-      max: 12300011111,
-      d: 5,
-      o: '1.23 - 123,000.11111',
-      q: '0.1',
-    },
+    { min: 123000, max: 12300011111, d: 5, o: '1.23 - 123,000.111', q: '0.1' },
    {
      min: 123000,
      max: 12300011111,
@@ -63,7 +57,7 @@ describe('formatRange', () => {
      min: 123001000,
      max: 12300011111,
      d: 2,
-      o: '1,230,010.00 - 123,000,111.11',
+      o: '1,230,010 - 123,000,111',
      q: '100',
    },
  ])(
Author	SHA1	Message	Date
Dariusz Majcherczyk	03d82aac62	test: fix lint	2023-06-21 08:41:55 +02:00
Dariusz Majcherczyk	2db0aae974	test: merge	2023-06-21 08:34:52 +02:00
Dariusz Majcherczyk	f10e616d5b	test: network switcher fix	2023-06-21 08:23:31 +02:00
Dariusz Majcherczyk	ff14d7c8dd	test: cover post and reduce only ACs	2023-06-20 17:37:43 +02:00