chore: fix bad grammar in comment

chore: actually use poll interval in test
chore: prevent polling if node switcher query fails
2023-04-10 10:46:14 -07:00 · 2023-04-10 10:45:45 -07:00 · 2023-04-10 09:49:58 -07:00
75 changed files with 1113 additions and 1525 deletions
@@ -4,54 +4,14 @@ on:
  push:
    branches:
      - release/*
-      - develop
  pull_request:
    types:
      - opened
-      - ready_for_review
      - reopened
-      - edited
      - synchronize
+      - ready_for_review
 jobs:
-  node-modules:
-    runs-on: ubuntu-22.04
-    name: 'Cache yarn modules'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Cache node modules
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-          # comment out "resotre-keys" if you need to rebuild yarn from 0
-          restore-keys: |
-            ${{ runner.os }}-cache-node-modules-
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: steps.cache.outputs.cache-hit != 'true'
-        with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
-
-      - name: yarn install
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --pure-lockfile
-
-  lint-pr-title:
-    needs: node-modules
-    if: ${{ github.event_name == 'pull_request' }}
-    name: Verify PR title
-    uses: ./.github/workflows/lint-pr.yml
-    secrets: inherit
-
  lint-test-build:
-    timeout-minutes: 20
-    needs: node-modules
    runs-on: ubuntu-22.04
    name: '(CI) lint + unit test + build'
    steps:
@@ -67,11 +27,8 @@ jobs:
          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
          cache: yarn

-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile

      - name: Derive appropriate SHAs for base and head for `nx affected` commands
        uses: nrwl/nx-set-shas@v3
@@ -91,7 +48,7 @@ jobs:
        run: yarn nx affected:test

      - name: Build affected
-        run: yarn nx affected:build || (yarn install && yarn nx affected:build)
+        run: yarn nx affected:build

      # See affected apps
      - name: See affected apps
@@ -138,43 +95,6 @@ jobs:
    with:
      projects: ${{ needs.lint-test-build.outputs.projects }}

-  dist-check:
-    runs-on: ubuntu-latest
-    needs: publish-dist
-    if: ${{ github.event_name == 'pull_request' }}
-    name: '(CD) comment preview links'
-    steps:
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body-includes: Previews
-
-      - name: Inject slug/short variables
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: rlespinasse/github-slug-action@v4
-        with:
-          prefix: CI_
-
-      - name: Create comment
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Previews
-            - explorer https://explorer.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - trading https://trading.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - governance https://governance.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-
-  cypress-check:
-    name: '(CI) cypress - check'
-    runs-on: ubuntu-latest
-    needs: cypress
-    steps:
-      - run: echo Done!
-
  # Report single result at the end, to avoid mess with required checks in PR
  cypress-result:
    if: ${{ always() }}
@@ -2,11 +2,15 @@
 name: Verify PR title

 on:
-  workflow_call:
-
+  pull_request:
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - edited
+      - synchronize
 jobs:
  lint_pr:
-    timeout-minutes: 10
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
@@ -19,11 +23,8 @@ jobs:
          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
          cache: yarn

-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile

      - name: Check PR title
        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -15,7 +15,6 @@ jobs:
        app: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.app }}
    runs-on: ubuntu-22.04
-    timeout-minutes: 20
    steps:
      - name: Check out code
        uses: actions/checkout@v3
@@ -37,131 +36,66 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
      # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Define variables
+      - name: Check node version
+        id: tags
        run: |
-          envName=''
-          dockerfile="dist.Dockerfile"
-          if [[ "${{ github.event_name }}" = "push" ]]; then
-            domain="vega.rocks"
-            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
-                domain="vega.community"
-                if [[ "${{ matrix.app }}" = "trading" ]]; then
-                  dockerfile="ipfs.Dockerfile"
-                fi
-              fi
-            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet3"
-            fi
-            bucketName="${{ matrix.app }}.${envName}.${domain}"
-            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
-          fi
          nodeVersion=$(cat .nvmrc | head -n 1)
-          echo ENV_NAME=${envName} >> $GITHUB_ENV
-          echo NODE_VERSION=${nodeVersion} >> $GITHUB_ENV
-          echo DOCKERFILE=docker/${dockerfile} >> $GITHUB_ENV
+          echo ::set-output name=nodeVersion::${nodeVersion}

-      - name: Build local dist
-        if: ${{ env.DOCKERFILE != 'docker/ipfs.Dockerfile' }}
-        run: |
-          flags=""
-          if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            if [[ "${{ env.ENV_NAME }}" != "ops-vega" ]]; then
-              flags="--env=${{ env.ENV_NAME }}"
-            fi
+          if [[ "${{ github.event_name }}" = "push" ]]; then
+            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+            bucketName="${{ github.event.repository.name }}-$envName"
+            echo ::set-output name=bucketName::${bucketName}
+            echo ::set-output name=envName::${envName}
          fi

-          if [ "${{ matrix.app }}" = "trading" ]; then
-            yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
-            DIST_LOCATION=dist/apps/trading/exported
-          else
-            yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
-            DIST_LOCATION=dist/apps/${{ matrix.app }}
-          fi
-          mv $DIST_LOCATION dist-result
-          tree dist-result
-
      - name: Build and export to local Docker
        id: docker_build
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
        uses: docker/build-push-action@v3
        with:
-          context: .
-          file: ${{ env.DOCKERFILE }}
          load: true
          build-args: |
            APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
-            ENV_NAME=${{ env.ENV_NAME }}
+            NODE_VERSION=${{ steps.tags.outputs.nodeVersion }}
+            ENV_NAME=${{ steps.tags.outputs.envName || '' }}
          tags: |
            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local

-      - name: Image digest
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
-        run: echo ${{ steps.docker_build.outputs.digest }}
-
      - name: Sanity check docker image
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
        run: |
          echo "Check ipfs-hash"
-          if [[ "${{ env.DOCKERFILE }}" = "docker/ipfs.Dockerfile" ]];  then
-            docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          fi
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat ipfs-hash

          echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree .'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local ls -lah

-      - name: Copy dist to local filesystem
-        if: ${{ env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' }}
-        run: |
+          echo "Copy dist to local filesystem"
          docker create --name=dist ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
          docker cp dist:/usr/share/nginx/html dist

-          echo "check local dist files"
-          tree dist/html
-          mv dist/html dist-result
+          echo "Check local dist"
+          ls -al dist

      - name: Publish dist as docker image
        uses: docker/build-push-action@v3
        if: ${{ github.event_name == 'pull_request' }}
        with:
-          context: .
-          file: ${{ env.DOCKERFILE }}
          push: true
          build-args: |
            APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
-            ENV_NAME=${{ env.ENV_NAME }}
+            NODE_VERSION=${{ steps.tags.outputs.nodeVersion }}
          tags: |
            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}

-      # bucket creation in github.com/vegaprotocol/terraform//frontend
-      - name: Publish dist to s3
-        uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' }}
-        with:
-          args: --acl private --follow-symlinks --delete
-        env:
-          AWS_S3_BUCKET: ${{ env.BUCKET_NAME }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: 'eu-west-1'
-          SOURCE_DIR: 'dist-result'
+      # - uses: shallwefootball/s3-upload-action@master
+      #   if: ${{ github.event_name == 'push' }}
+      #   name: Upload dist S3
+      #   with:
+      #     aws_key_id: ${{ secrets.AWS_KEY_ID }}
+      #     aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+      #     aws_bucket: ${{ steps.tags.outputs.bucketName }}
+      #     source_dir: 'dist'

      - name: Add preview label
        uses: actions-ecosystem/action-add-labels@v1
@@ -169,3 +103,6 @@ jobs:
        with:
          labels: ${{ matrix.app }}-preview
          number: ${{ github.event.number }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
@@ -13,7 +13,7 @@ RUN apk add --update --no-cache \
 COPY . ./
 RUN yarn --network-timeout 100000 --pure-lockfile
 # work around for different build process in trading
-RUN sh docker/docker-build.sh
+RUN sh ./docker-build.sh

 # Server environment
 # if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
@@ -23,7 +23,6 @@ FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a
 EXPOSE 80
 # Copy dist
 WORKDIR /usr/share/nginx/html
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY --from=build /app/dist/apps/${APP}/* /usr/share/nginx/html
-RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > /ipfs-hash; apk del go-ipfs
+COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/dist/apps/${APP} /usr/share/nginx/html
+RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > ipfs-hash; apk del go-ipfs
@@ -10,7 +10,7 @@ export const Footer = () => {
  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
  const { screenSize } = useScreenDimensions();
  const showFullFeedbackLabel = useMemo(
-    () => ['md', 'lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
+    () => ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
    [screenSize]
  );

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

    beforeEach('visit proposals tab', function () {
@@ -214,7 +213,6 @@ describe(

    // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060
    it('Newly created proposal details - ability to increase associated tokens - by voting again after association', function () {
-      vegaWalletSetSpecifiedApprovalAmount('1000');
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getSubmittedProposalFromProposalList(rawProposal.rationale.title)
@@ -13,6 +13,7 @@ import {
  createUpdateNetworkProposalTxBody,
  createFreeFormProposalTxBody,
 } from '../../support/proposal.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

@@ -32,6 +33,10 @@ context(
    before('Connect wallets and set approval', function () {
      cy.visit('/');
      vegaWalletSetSpecifiedApprovalAmount('1000');
+      cy.connectVegaWallet();
+      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      cy.clearLocalStorage();
    });

    beforeEach('visit proposals', function () {
@@ -109,7 +114,7 @@ context(
      navigateTo(navigation.proposals);
      cy.reload();
      waitForSpinner();
-      cy.get(openProposals, { timeout: 6000 }).within(() => {
+      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
@@ -232,7 +232,7 @@ context(

    it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
      const errorMsg =
-        'Invalid params: the transaction does not use a valid Vega command: unknown field "unexpected" in vega.commands.v1.ProposalSubmission';
+        'Invalid params: the transaction does not use a valid Vega command: unknown field unexpected" in vega.commands.v1.ProposalSubmission';

      // 3001-VOTE-038 3002-PROP-013 3002-PROP-014
      goToMakeNewProposal(governanceProposalType.RAW);
@@ -313,7 +313,7 @@ context(

    it('Unable to vote on a proposal - when vega wallet disconnected - option to connect from within', function () {
      createRawProposal();
-      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="manage-vega-wallet"]').click();
      cy.get('[data-testid="disconnect"]').click();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getSubmittedProposalFromProposalList(
@@ -218,7 +218,7 @@ context(

    it('Unable to submit new market proposal with missing/invalid fields', function () {
      const errorMsg =
-        'Invalid params: the transaction does not use a valid Vega command: unknown field "invalid" in vega.NewMarket';
+        'Invalid params: the transaction is not a valid Vega command: unknown field "filters" in vega.DataSourceDefinition';

      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
      cy.get(newProposalSubmitButton).should('be.visible').click();
@@ -436,7 +436,7 @@ context(
      });
    });

-    it('Able to submit update asset proposal using max deadline', function () {
+    it.only('Able to submit update asset proposal using max deadline', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      enterUpdateAssetProposalDetails();
      cy.get(maxVoteDeadline).click();
@@ -25,11 +25,11 @@ const vegaWalletUnstakedBalance =
  '[data-testid="vega-wallet-balance-unstaked"]';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
-const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
+const ethWalletAssociateButton = '[data-testid="associate-btn"]';
 const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
-const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
+const ethWalletDissociateButton = '[href="/token/disassociate"]';
 const vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
 const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
 const connectedVegaKey = '[data-testid="connected-vega-key"]';
@@ -78,12 +78,12 @@ context(

        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);

        // 0005-ETXN-002
        verifyEthWalletAssociatedBalance('2.0');
@@ -111,12 +111,12 @@ context(
        stakingPageDisassociateTokens('2');
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
          'not.exist'
        );
@@ -192,12 +192,12 @@ context(

        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        verifyEthWalletAssociatedBalance('2.0');
        verifyEthWalletTotalAssociatedBalance('2.0');
        cy.get(vegaWallet).within(() => {
@@ -210,12 +210,12 @@ context(
        });
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '1.00');
        validateWalletCurrency('Total associated after pending', '1.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        verifyEthWalletAssociatedBalance('1.0');
        verifyEthWalletTotalAssociatedBalance('1.0');
      });
@@ -266,7 +266,7 @@ context(
        // 1004-ASSO-008
        // 1004-ASSO-010
        // No warning visible as described in AC, but the button is disabled
-        cy.get(ethWalletAssociateButton).click();
+        cy.get(ethWalletAssociateButton).first().click();
        cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
        cy.get(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
        cy.get(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
@@ -278,12 +278,12 @@ context(
        vegaWalletAssociate('2');
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        validateWalletCurrency('Associated', '2.00');
      });

@@ -294,24 +294,24 @@ context(
        });
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        validateWalletCurrency('Associated', '0.00');
      });

      it('Able to associate tokens to different public key of connected vega wallet', function () {
-        cy.get(ethWalletAssociateButton).click();
+        cy.get(ethWalletAssociateButton).first().click();
        cy.get(associateWalletRadioButton).click();
        cy.get(connectedVegaKey).should(
          'have.text',
          Cypress.env('vegaWalletPublicKey')
        );

-        cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+        cy.get('[data-testid="manage-vega-wallet"]').click();
        cy.get('[data-testid="select-keypair-button"]').eq(0).click();
        cy.get(connectedVegaKey).should(
          'have.text',
@@ -166,7 +166,6 @@ export function goToMakeNewProposal(proposalType: string) {
  navigateTo(navigation.proposals);
  cy.get(newProposalButton).should('be.visible').click();
  cy.url().should('include', '/proposals/propose');
-  cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
  cy.get('li').should('contain.text', proposalType).and('be.visible');
  cy.get('li').contains(proposalType).click();
 }
@@ -8,7 +8,6 @@ import {
 } from '@vegaprotocol/smart-contracts';
 import { ethers, Wallet } from 'ethers';

-const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
 const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
@@ -60,7 +59,7 @@ export async function faucetAsset(assetEthAddress: string) {
 }

 export async function vegaWalletTeardown() {
-  cy.get(associatedAmountInWallet)
+  cy.get('[data-testid="associated-amount"]')
    .should('be.visible')
    .invoke('text')
    .then((associatedAmount) => {
@@ -69,12 +68,12 @@ export async function vegaWalletTeardown() {
          $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
          associatedAmount != '0.00'
        ) {
-          vegaWalletTeardownStaking(stakingBridgeContract);
          vegaWalletTeardownVesting(vestingContract);
+          vegaWalletTeardownStaking(stakingBridgeContract);
        }
      });
      cy.get(vegaWalletContainer).within(() => {
-        cy.get(associatedAmountInWallet, {
+        cy.getByTestId('associated-amount', {
          timeout: transactionTimeout,
        }).contains('0.00', {
          timeout: transactionTimeout,
@@ -91,7 +90,7 @@ export async function vegaWalletSetSpecifiedApprovalAmount(
  await promiseWithTimeout(
    token.approve(
      ethStakingBridgeContractAddress,
-      resetAmount + '0'.repeat(18)
+      resetAmount.concat('000000000000000000')
    ),
    10 * 60 * 1000,
    'set approval amount'
@@ -105,23 +104,12 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
-        () => {
-          cy.get(associatedAmountInWallet)
-            .invoke('text')
-            .then(($walletAmount) => {
-              cy.wrap(
-                stakingBridgeContract.remove_stake(
-                  String(stakeBalance),
-                  vegaWalletPubKey
-                ),
-                { timeout: transactionTimeout, log: false }
-              );
-              cy.get(associatedAmountInWallet, {
-                timeout: transactionTimeout,
-              }).should('not.have.text', $walletAmount);
-            });
-        }
+      cy.wrap(
+        stakingBridgeContract.remove_stake(
+          String(stakeBalance),
+          vegaWalletPubKey
+        ),
+        { timeout: transactionTimeout, log: false }
      );
    }
  });
@@ -136,6 +124,7 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
    if (Number(vestingAmount) != 0) {
      // Wait needed to allow time for ganache to process tx for stakingBridgeContract.remove_stake
      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(1000);
      cy.wrap(
        vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
        { timeout: transactionTimeout, log: false }
@@ -443,8 +443,8 @@
  "rewardType": "Reward type",
  "rewardsAndFeesReceived": "Rewards and fees received",
  "ThisDoesNotIncludeFeesReceivedForMakersOrLiquidityProviders": "This does not include fees received for makers or liquidity providers",
-  "totalDistributed": "Total distributed",
-  "earnedByMe": "Earned by me",
+  "totalDistributed": "TOTAL DISTRIBUTED",
+  "earnedByMe": "EARNED BY ME",
  "noRewardsHaveBeenDistributedYet": "NO REWARDS HAVE BEEN DISTRIBUTED YET",
  "rewardsColAssetHeader": "ASSET",
  "rewardsColStakingHeader": "STAKING",
@@ -114,7 +114,7 @@ export const RewardsPage = () => {
              </p>
            </div>

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

  it('approved amount is less than deposit', function () {
    // 1001-DEPO-006
-    // 1001-DEPO-007
    cy.getByTestId(depositsTab).click();
    cy.getByTestId('deposit-button').click();
    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
@@ -431,8 +430,8 @@ describe('capsule', { tags: '@slow' }, () => {
  });

  it('withdraw - delay verification', function () {
+    // 1001-DEPO-007
    // 1001-DEPO-024
-    // 1002-WITH-007

    cy.visit('/#/portfolio');
    cy.get('main[data-testid="/portfolio"]').should('exist');
@@ -76,7 +76,6 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
  });

  it('insufficient funds', () => {
-    // 1001-DEPO-004
    mockWeb3DepositCalls({
      allowance: '1000',
      depositLifetimeLimit: '1000',
@@ -41,12 +41,6 @@ describe('accounts', { tags: '@smoke' }, () => {
      .should('have.text', '100,001.01');
  });

-  it('asset detail should be properly rendered', () => {
-    cy.getByTestId('Collateral').click();
-    cy.getByTestId('asset').contains('tEURO').click();
-    cy.get('[data-testid$="_label"]').should('have.length', 16);
-  });
-
  describe('sorting by ag-grid columns should work well', () => {
    it('sorting by asset', () => {
      cy.getByTestId('Collateral').click();
@@ -514,8 +514,6 @@ describe('account validation', { tags: '@regression' }, () => {
    it('must show error returned by wallet ', () => {
      // 0003-WTXN-009
      // 0003-WTXN-011
-      // 0002-WCON-016
-      // 0003-WTXN-008

      //trigger error from the wallet
      cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
@@ -539,8 +537,6 @@ describe('account validation', { tags: '@regression' }, () => {
        'contain.text',
        'The connection to your Vega Wallet has been lost.'
      );
-      cy.getByTestId('connect-vega-wallet').click();
-      cy.getByTestId('dialog-content').should('be.visible');
    });

    it('must see that the order was rejected by the connected wallet', () => {
@@ -28,7 +28,7 @@ describe('time in force default values', () => {
  });

  it('must have market order set up to IOC by default', function () {
-    // 7002-SORD-030
+    // 7002-SORD-031
    cy.getByTestId(toggleMarket).click();
    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
      'have.text',
@@ -117,7 +117,6 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
    // 0002-WCON-002
    // 0002-WCON-005
    // 0002-WCON-007
-    // 0002-WCON-009

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

    mockConnectWalletWithUserError();
    cy.getByTestId(connectVegaBtn).click();
@@ -185,7 +185,7 @@ export const columns = (
          onClick={(e) => {
            e.preventDefault();
            e.stopPropagation();
-            onSelect(market.id, e.metaKey || e.ctrlKey);
+            onSelect(market.id, e.metaKey);
          }}
        >
          <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -366,7 +366,7 @@ export const columnsPositionMarkets = (
          onClick={(e) => {
            e.preventDefault();
            e.stopPropagation();
-            onSelect(market.id, e.metaKey || e.ctrlKey);
+            onSelect(market.id, e.metaKey);
          }}
        >
          <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -44,7 +44,7 @@ export const SelectMarketTableRow = ({
    <tr
      className={`hover:bg-neutral-200 dark:hover:bg-neutral-700 cursor-pointer relative h-[34px]`}
      onClick={(ev) => {
-        onSelect(marketId, ev.metaKey || ev.ctrlKey);
+        onSelect(marketId, ev.metaKey);
      }}
      data-testid={`market-link-${marketId}`}
    >
@@ -8,10 +8,6 @@ import type {
  MarketData,
 } from '@vegaprotocol/market-list';
 import { SelectMarketLandingTable } from './welcome-landing-dialog';
-const mockMarketClickHandler = jest.fn();
-jest.mock('../../lib/hooks/use-market-click-handler', () => ({
-  useMarketClickHandler: () => mockMarketClickHandler,
-}));

 type Market = MarketMaybeWithCandles & MarketMaybeWithData;
 type PartialMarket = Partial<
@@ -178,25 +174,4 @@ describe('WelcomeLandingDialog', () => {
    fireEvent.click(screen.getAllByTestId(`market-link-2`)[0]);
    expect(onClose).toHaveBeenCalled();
  });
-
-  it('should not call onClose when metaKey is held', () => {
-    const onClose = jest.fn();
-
-    render(
-      <MemoryRouter>
-        <SelectMarketLandingTable
-          markets={[MARKET_A as Market, MARKET_B as Market]}
-          onClose={onClose}
-        />
-      </MemoryRouter>,
-      { wrapper: MockedProvider }
-    );
-    fireEvent.click(screen.getAllByTestId(`market-link-1`)[0], {
-      metaKey: true,
-    });
-    expect(mockMarketClickHandler).toHaveBeenCalled();
-    expect(onClose).not.toHaveBeenCalled();
-    fireEvent.click(screen.getAllByTestId(`market-link-1`)[0]);
-    expect(onClose).toHaveBeenCalled();
-  });
 });
@@ -12,10 +12,9 @@ import {
  SelectMarketTableRow,
 } from '../select-market';
 import { WelcomeDialogHeader } from './welcome-dialog-header';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import { ProposedMarkets } from './proposed-markets';
 import { Links, Routes } from '../../pages/client-router';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 export const SelectMarketLandingTable = ({
  markets,
@@ -24,14 +23,24 @@ export const SelectMarketLandingTable = ({
  markets: MarketMaybeWithDataAndCandles[] | null;
  onClose: () => void;
 }) => {
-  const onSelect = useMarketClickHandler();
-  const onSelectMarket = useCallback(
-    (id: string, metaKey?: boolean) => {
-      onSelect(id, metaKey);
-      if (!metaKey) {
-        onClose();
+  const params = useParams();
+  const navigate = useNavigate();
+  const marketId = params.marketId;
+
+  const onSelect = useCallback(
+    (id: string) => {
+      if (id && id !== marketId) {
+        navigate(Links[Routes.MARKET](id));
      }
    },
+    [marketId, navigate]
+  );
+
+  const onSelectMarket = useCallback(
+    (id: string) => {
+      onSelect(id);
+      onClose();
+    },
    [onSelect, onClose]
  );
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -64,7 +73,7 @@ export const SelectMarketLandingTable = ({
                key={i}
                detailed={false}
                onSelect={onSelectMarket}
-                columns={columns(market, onSelectMarket, onCellClick)}
+                columns={columns(market, onSelect, onCellClick)}
              />
            ))}
          </tbody>
@@ -7,11 +7,7 @@ import {
 } from '@vegaprotocol/types';
 import type { VegaStoredTxState } from '@vegaprotocol/wallet';
 import { VegaTxStatus } from '@vegaprotocol/wallet';
-import {
-  VegaTransactionDetails,
-  getVegaTransactionContentIntent,
-} from './use-vega-transaction-toasts';
-import { Intent } from '@vegaprotocol/ui-toolkit';
+import { VegaTransactionDetails } from './use-vega-transaction-toasts';

 jest.mock('@vegaprotocol/assets', () => {
  const A1 = {
@@ -282,27 +278,3 @@ describe('VegaTransactionDetails', () => {
    expect(queryByTestId('toast-panel')?.textContent).toEqual(details);
  });
 });
-
-describe('getVegaTransactionContentIntent', () => {
-  it('returns the correct intent for a transaction', () => {
-    expect(getVegaTransactionContentIntent(withdraw).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(submitOrder).intent).toBe(
-      Intent.Success
-    );
-    expect(getVegaTransactionContentIntent(editOrder).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(cancelOrder).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(cancelAll).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(closePosition).intent).toBe(
-      Intent.Primary
-    );
-    expect(getVegaTransactionContentIntent(batch).intent).toBe(Intent.Primary);
-  });
-});
@@ -547,11 +547,7 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {

  return (
    <>
-      <ToastHeading>
-        {tx.order?.status
-          ? getOrderToastTitle(tx.order.status)
-          : t('Confirmed')}
-      </ToastHeading>
+      <ToastHeading>{t('Confirmed')}</ToastHeading>
      <p>{t('Your transaction has been confirmed ')}</p>
      {tx.txHash && (
        <p className="break-all">
@@ -638,8 +634,25 @@ export const useVegaTransactionToasts = () => {
  );

  const fromVegaTransaction = (tx: VegaStoredTxState): Toast => {
+    let content: ToastContent;
    const closeAfter = isFinal(tx) ? CLOSE_AFTER : undefined;
-    const { intent, content } = getVegaTransactionContentIntent(tx);
+    if (tx.status === VegaTxStatus.Requested) {
+      content = <VegaTxRequestedToastContent tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Pending) {
+      content = <VegaTxPendingToastContentProps tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Complete) {
+      content = <VegaTxCompleteToastsContent tx={tx} />;
+    }
+    if (tx.status === VegaTxStatus.Error) {
+      content = <VegaTxErrorToastContent tx={tx} />;
+    }
+
+    // Transaction can be successful but the order can be rejected by the network
+    const intent =
+      (tx.order && getOrderToastIntent(tx.order.status)) ||
+      intentMap[tx.status];

    return {
      id: `vega-${tx.id}`,
@@ -663,27 +676,3 @@ export const useVegaTransactionToasts = () => {
    }
  );
 };
-
-export const getVegaTransactionContentIntent = (tx: VegaStoredTxState) => {
-  let content: ToastContent;
-  if (tx.status === VegaTxStatus.Requested) {
-    content = <VegaTxRequestedToastContent tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Pending) {
-    content = <VegaTxPendingToastContentProps tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Complete) {
-    content = <VegaTxCompleteToastsContent tx={tx} />;
-  }
-  if (tx.status === VegaTxStatus.Error) {
-    content = <VegaTxErrorToastContent tx={tx} />;
-  }
-
-  // Transaction can be successful but the order can be rejected by the network
-  const intent =
-    (tx.order &&
-      !isOrderAmendmentTransaction(tx.body) &&
-      getOrderToastIntent(tx.order.status)) ||
-    intentMap[tx.status];
-  return { intent, content };
-};
@@ -63,7 +63,7 @@ html [data-theme='light'] {
  --pennant-color-sell-stroke: theme('colors.vega.pink.400');

  --pennant-color-volume-buy: theme('colors.vega.green.400');
-  --pennant-color-volume-sell: theme('colors.vega.pink.400');
+  --pennant-color-volume-sell: theme('colors.vega.pink.500');

  /* depth chart */
  --pennant-color-depth-buy-fill: theme('colors.vega.green.400');
@@ -5,9 +5,7 @@ export PATH="/app/node_modules/.bin:$PATH"
 flags="--network-timeout 100000 --pure-lockfile"

 if [[ ! -z "${ENV_NAME}" ]]; then
-  if [[ "${ENV_NAME}" != "ops-vega" ]]; then
-    flags="--env=${ENV_NAME} $flags"
-  fi
+  flags="--env=${ENV_NAME} $flags"
 fi

 if [ "${APP}" = "trading" ]; then
@@ -18,3 +16,7 @@ if [ "${APP}" = "trading" ]; then
 else
  yarn nx build ${APP} $flags
 fi
+
+env_vars_file="/app/dist/apps/${APP}/.env"
+# make sure there are no exposed .env files
+rm $env_vars_file || echo "No env vars file"
@@ -1,6 +0,0 @@
-FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
-EXPOSE 80
-WORKDIR /usr/share/nginx/html
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY ./dist-result/ /usr/share/nginx/html/
@@ -1,25 +1,8 @@
-fragment AssetListFields on Asset {
-  id
-  name
-  symbol
-  decimals
-  quantum
-  source {
-    __typename
-    ... on ERC20 {
-      contractAddress
-      lifetimeLimit
-      withdrawThreshold
-    }
-  }
-  status
-}
-
 query Assets {
  assetsConnection {
    edges {
      node {
-        ...AssetListFields
+        ...AssetFields
      }
    }
  }
@@ -1,44 +1,26 @@
 import * as Types from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
+import { AssetFieldsFragmentDoc } from './Asset';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type AssetListFieldsFragment = { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } };
-
 export type AssetsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type AssetsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } } } | null> | null } | null };
+export type AssetsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string }, infrastructureFeeAccount?: { __typename?: 'AccountBalance', balance: string } | null, globalRewardPoolAccount?: { __typename?: 'AccountBalance', balance: string } | null, takerFeeRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null, makerFeeRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null, lpFeeRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null, marketProposerRewardAccount?: { __typename?: 'AccountBalance', balance: string } | null } } | null> | null } | null };
+

-export const AssetListFieldsFragmentDoc = gql`
-    fragment AssetListFields on Asset {
-  id
-  name
-  symbol
-  decimals
-  quantum
-  source {
-    __typename
-    ... on ERC20 {
-      contractAddress
-      lifetimeLimit
-      withdrawThreshold
-    }
-  }
-  status
-}
-    `;
 export const AssetsDocument = gql`
    query Assets {
  assetsConnection {
    edges {
      node {
-        ...AssetListFields
+        ...AssetFields
      }
    }
  }
 }
-    ${AssetListFieldsFragmentDoc}`;
+    ${AssetFieldsFragmentDoc}`;

 /**
 * __useAssetsQuery__
@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react';
 import * as Schema from '@vegaprotocol/types';
 import { AssetDetailsDialog } from './asset-details-dialog';
 import { AssetDetail, testId } from './asset-details-table';
-import { AssetDocument } from './__generated__/Asset';
+import { AssetsDocument } from './__generated__/Assets';
 import { generateBuiltinAsset, generateERC20Asset } from './test-helpers';

 const mockedData = {
@@ -39,17 +39,15 @@ const mockedData = {
  },
 };

-const mocks = mockedData.data.assetsConnection.edges.map((mock) => ({
-  request: {
-    query: AssetDocument,
-    variables: { assetId: mock.node.id },
-  },
-  result: {
-    data: {
-      assetsConnection: { edges: [mock] },
+const mocks = [
+  {
+    request: {
+      query: AssetsDocument,
+      variables: {},
    },
+    result: mockedData,
  },
-}));
+];

 const WrappedAssetDetailsDialog = ({ assetId }: { assetId: string }) => (
  <MockedProvider mocks={mocks}>
@@ -1,4 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
+import { useAssetsDataProvider } from './assets-data-provider';
 import {
  Button,
  Dialog,
@@ -9,7 +10,6 @@ import {
 import { create } from 'zustand';
 import { AssetDetailsTable } from './asset-details-table';
 import { AssetProposalNotification } from '@vegaprotocol/proposals';
-import { useAssetDataProvider } from './asset-data-provider';

 export type AssetDetailsDialogStore = {
  isOpen: boolean;
@@ -55,8 +55,9 @@ export const AssetDetailsDialog = ({
  onChange,
  asJson = false,
 }: AssetDetailsDialogProps) => {
-  const { data: asset } = useAssetDataProvider(assetId);
+  const { data } = useAssetsDataProvider();

+  const asset = data?.find((a) => a.id === assetId);
  const assetSymbol = asset?.symbol || '';

  const content = asset ? (
@@ -11,7 +11,6 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
 import type { Asset } from './asset-data-provider';
-import { WITHDRAW_THRESHOLD_TOOLTIP_TEXT } from './constants';

 type Rows = {
  key: AssetDetail;
@@ -122,7 +121,9 @@ export const rows: Rows = [
  {
    key: AssetDetail.WITHDRAWAL_THRESHOLD,
    label: t('Withdrawal threshold'),
-    tooltip: WITHDRAW_THRESHOLD_TOOLTIP_TEXT,
+    tooltip: t(
+      'The maximum you can withdraw instantly. There’s no limit on the size of a withdrawal, but all withdrawals over the threshold will have a delay time added to them'
+    ),
    value: (asset) =>
      num(asset, (asset.source as Schema.ERC20).withdrawThreshold),
  },
@@ -1,10 +1,8 @@
 import merge from 'lodash/merge';
-import type {
-  AssetsQuery,
-  AssetListFieldsFragment,
-} from './__generated__/Assets';
+import type { AssetsQuery } from './__generated__/Assets';
 import * as Types from '@vegaprotocol/types';
 import type { PartialDeep } from 'type-fest';
+import type { AssetFieldsFragment } from './__generated__/Asset';

 export const assetsQuery = (
  override?: PartialDeep<AssetsQuery>
@@ -20,7 +18,7 @@ export const assetsQuery = (
  return merge(defaultAssets, override);
 };

-const assetFields: AssetListFieldsFragment[] = [
+const assetFields: AssetFieldsFragment[] = [
  {
    __typename: 'Asset',
    id: 'asset-id',
@@ -35,6 +33,30 @@ const assetFields: AssetListFieldsFragment[] = [
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
  },
  {
    __typename: 'Asset',
@@ -50,6 +72,30 @@ const assetFields: AssetListFieldsFragment[] = [
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
  },
  {
    __typename: 'Asset',
@@ -58,10 +104,20 @@ const assetFields: AssetListFieldsFragment[] = [
    decimals: 5,
    name: 'Asto',
    source: {
+      maxFaucetAmountMint: '5000000000',
      __typename: 'BuiltinAsset',
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '0',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: null,
+    takerFeeRewardAccount: null,
+    makerFeeRewardAccount: null,
+    lpFeeRewardAccount: null,
+    marketProposerRewardAccount: null,
  },
  {
    __typename: 'Asset',
@@ -70,10 +126,20 @@ const assetFields: AssetListFieldsFragment[] = [
    decimals: 5,
    name: 'tBTC TEST',
    source: {
+      maxFaucetAmountMint: '5000000000',
      __typename: 'BuiltinAsset',
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
+    infrastructureFeeAccount: {
+      balance: '0',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: null,
+    takerFeeRewardAccount: null,
+    makerFeeRewardAccount: null,
+    lpFeeRewardAccount: null,
+    marketProposerRewardAccount: null,
  },
  // NOTE: These assets ids and contract addresses are real assets on Sepolia, this is needed
  // because we don't currently mock our seplia infura provider. If we change network these will
@@ -92,6 +158,30 @@ const assetFields: AssetListFieldsFragment[] = [
      __typename: 'ERC20',
    },
    quantum: '1',
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
  },
  {
    __typename: 'Asset',
@@ -107,5 +197,29 @@ const assetFields: AssetListFieldsFragment[] = [
      __typename: 'ERC20',
    },
    quantum: '1',
+    infrastructureFeeAccount: {
+      balance: '1',
+      __typename: 'AccountBalance',
+    },
+    globalRewardPoolAccount: {
+      balance: '2',
+      __typename: 'AccountBalance',
+    },
+    takerFeeRewardAccount: {
+      balance: '3',
+      __typename: 'AccountBalance',
+    },
+    makerFeeRewardAccount: {
+      balance: '4',
+      __typename: 'AccountBalance',
+    },
+    lpFeeRewardAccount: {
+      balance: '5',
+      __typename: 'AccountBalance',
+    },
+    marketProposerRewardAccount: {
+      balance: '6',
+      __typename: 'AccountBalance',
+    },
  },
 ];
@@ -1,4 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-export const WITHDRAW_THRESHOLD_TOOLTIP_TEXT = t(
-  "The maximum you can withdraw instantly. There's no limit on the size of a withdrawal, but all withdrawals over the threshold will have a delay time added to them"
-);
@@ -5,4 +5,3 @@ export * from './assets-data-provider';
 export * from './asset-details-dialog';
 export * from './asset-details-table';
 export * from './asset-option';
-export * from './constants';
@@ -21,7 +21,7 @@ export const MarketNameCell = ({
      ev.preventDefault();
      ev.stopPropagation();
      if (onMarketClick) {
-        onMarketClick(id, ev.metaKey || ev.ctrlKey);
+        onMarketClick(id, ev.metaKey);
      }
    },
    [id, onMarketClick]
@@ -78,9 +78,7 @@ export const compileGridData = (
      label: (
        <Link
          to={`/liquidity/${market.id}`}
-          onClick={(ev) =>
-            onSelect && onSelect(market.id, ev.metaKey || ev.ctrlKey)
-          }
+          onClick={(ev) => onSelect && onSelect(market.id, ev.metaKey)}
        >
          <UILink>{t('Current liquidity')}</UILink>
        </Link>
@@ -1,2 +1,6 @@
 export * from './__generated__/EstimateOrder';
+export * from './use-calculate-slippage';
 export * from './use-fee-deal-ticket-details';
+export * from './use-market-positions';
+export * from './use-maximum-position-size';
+export * from './use-order-closeout';
@@ -0,0 +1,144 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { renderHook } from '@testing-library/react';
+import * as Schema from '@vegaprotocol/types';
+import type { Market } from '@vegaprotocol/market-list';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { useCalculateSlippage } from './use-calculate-slippage';
+
+const mockData = {
+  decimalPlaces: 0,
+  positionDecimalPlaces: 0,
+  depth: {
+    buy: [
+      {
+        price: '5',
+        volume: '2',
+      },
+      {
+        price: '4',
+        volume: '3',
+      },
+      {
+        price: '3',
+        volume: '2',
+      },
+      {
+        price: '2',
+        volume: '1',
+      },
+      {
+        price: '1',
+        volume: '1',
+      },
+    ],
+    sell: [
+      {
+        price: '6',
+        volume: '1',
+      },
+      {
+        price: '7',
+        volume: '3',
+      },
+      {
+        price: '8',
+        volume: '2',
+      },
+      {
+        price: '9',
+        volume: '1',
+      },
+      {
+        price: '10',
+        volume: '2',
+      },
+    ],
+  },
+};
+
+let mockOrderBookData = {
+  data: mockData,
+};
+
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
+  useDataProvider: jest.fn(() => ({
+    data: {
+      marketsConnection: [],
+    },
+  })),
+  useThrottledDataProvider: jest.fn(() => mockOrderBookData),
+}));
+
+describe('useCalculateSlippage Hook', () => {
+  describe('calculate proper result', () => {
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+    const market = {
+      id: 'marketId',
+      decimalPlaces: 0,
+      positionDecimalPlaces: 0,
+    } as Market;
+
+    it('long order', () => {
+      const { result } = renderHook(
+        () =>
+          useCalculateSlippage({
+            market,
+            order: {
+              size: '10',
+              side: Schema.Side.SIDE_BUY,
+            } as OrderSubmissionBody['orderSubmission'],
+          }),
+        {
+          wrapper: MockedProvider,
+        }
+      );
+      expect(result.current).toEqual('33.33');
+    });
+
+    it('short order', () => {
+      const { result } = renderHook(
+        () =>
+          useCalculateSlippage({
+            market,
+            order: {
+              size: '10',
+              side: Schema.Side.SIDE_SELL,
+            } as OrderSubmissionBody['orderSubmission'],
+          }),
+        {
+          wrapper: MockedProvider,
+        }
+      );
+      expect(result.current).toEqual('31.11');
+    });
+
+    it('when no order book result should be null', () => {
+      mockOrderBookData = {
+        data: {
+          ...mockData,
+          depth: {
+            ...mockData.depth,
+            buy: [],
+          },
+        },
+      };
+      const { result } = renderHook(
+        () =>
+          useCalculateSlippage({
+            market,
+            order: {
+              size: '10',
+              side: Schema.Side.SIDE_SELL,
+            } as OrderSubmissionBody['orderSubmission'],
+          }),
+        {
+          wrapper: MockedProvider,
+        }
+      );
+      expect(result.current).toBeNull();
+    });
+  });
+});
@@ -0,0 +1,63 @@
+import { marketDepthProvider } from '@vegaprotocol/market-depth';
+import * as Schema from '@vegaprotocol/types';
+import type { Market } from '@vegaprotocol/market-list';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { BigNumber } from 'bignumber.js';
+import { formatNumber, toBigNum } from '@vegaprotocol/utils';
+import { useThrottledDataProvider } from '@vegaprotocol/react-helpers';
+
+interface Props {
+  market: Market;
+  order: OrderSubmissionBody['orderSubmission'];
+}
+
+export const useCalculateSlippage = ({ market, order }: Props) => {
+  const { data } = useThrottledDataProvider(
+    {
+      dataProvider: marketDepthProvider,
+      variables: { marketId: market.id },
+    },
+    1000
+  );
+  const volPriceArr =
+    data?.depth[order.side === Schema.Side.SIDE_BUY ? 'sell' : 'buy'] || [];
+  if (volPriceArr.length && market) {
+    const decimals = market.decimalPlaces ?? 0;
+    const positionDecimals = market.positionDecimalPlaces ?? 0;
+    const bestPrice = toBigNum(volPriceArr[0].price, decimals);
+    const { size } = order;
+    let descSize = new BigNumber(size);
+    let i = 0;
+    const volPricePairs: Array<[BigNumber, BigNumber]> = [];
+    while (!descSize.isZero() && i < volPriceArr.length) {
+      const price = toBigNum(volPriceArr[i].price, decimals);
+      const amount = BigNumber.min(
+        descSize,
+        toBigNum(volPriceArr[i].volume, positionDecimals)
+      );
+      volPricePairs.push([price, amount]);
+      descSize = BigNumber.max(0, descSize.minus(amount));
+      i++;
+    }
+    if (volPricePairs.length) {
+      const volWeightAvPricePair = volPricePairs.reduce(
+        (agg, item) => {
+          agg[0] = agg[0].plus(item[0].multipliedBy(item[1]));
+          agg[1] = agg[1].plus(item[1]);
+          return agg;
+        },
+        [new BigNumber(0), new BigNumber(0)]
+      );
+      const volWeightAvPrice = volWeightAvPricePair[0].dividedBy(
+        volWeightAvPricePair[1]
+      );
+      const slippage = volWeightAvPrice
+        .minus(bestPrice)
+        .absoluteValue()
+        .dividedBy(bestPrice)
+        .multipliedBy(100);
+      return formatNumber(slippage, 2);
+    }
+  }
+  return null;
+};
@@ -18,6 +18,7 @@ import {
  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
  TOTAL_MARGIN_AVAILABLE,
 } from '../constants';
+import { useOrderCloseOut } from './use-order-closeout';
 import { useMarketAccountBalance } from '@vegaprotocol/accounts';
 import { getDerivedPrice } from '../utils/get-price';
 import { useEstimateOrderQuery } from './__generated__/EstimateOrder';
@@ -48,6 +49,12 @@ export const useFeeDealTicketDetails = (
    skip: !pubKey || !market || !order.size || !price,
  });

+  const estCloseOut = useOrderCloseOut({
+    order,
+    market,
+    marketData,
+  });
+
  const notionalSize = useMemo(() => {
    if (price && order.size) {
      return toBigNum(order.size, market.positionDecimalPlaces)
@@ -67,8 +74,16 @@ export const useFeeDealTicketDetails = (
      notionalSize,
      accountBalance,
      estimateOrder: estMargin?.estimateOrder,
+      estCloseOut,
    };
-  }, [market, assetSymbol, notionalSize, accountBalance, estMargin]);
+  }, [
+    market,
+    assetSymbol,
+    notionalSize,
+    accountBalance,
+    estMargin,
+    estCloseOut,
+  ]);
 };

 export interface FeeDetails {
@@ -77,6 +92,7 @@ export interface FeeDetails {
  market: Market;
  assetSymbol: string;
  notionalSize: string | null;
+  estCloseOut: string | null;
  estimateOrder: EstimateOrderQuery['estimateOrder'] | undefined;
  estimatedInitialMargin: string;
  estimatedTotalInitialMargin: string;
@@ -0,0 +1,53 @@
+import { renderHook } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import { useMarketPositions } from './use-market-positions';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));
+let mockMarketAccountBalance: {
+  accountBalance: string;
+  accountDecimals: number | null;
+} = { accountBalance: '50001000000', accountDecimals: 5 };
+jest.mock('@vegaprotocol/accounts', () => ({
+  ...jest.requireActual('@vegaprotocol/accounts'),
+  useMarketAccountBalance: jest.fn(() => mockMarketAccountBalance),
+}));
+
+jest.mock('@vegaprotocol/positions', () => ({
+  ...jest.requireActual('@vegaprotocol/positions'),
+  useMarketPositionOpenVolume: jest.fn(() => '100002'),
+}));
+
+describe('useOrderPosition Hook', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should return proper positive value', () => {
+    const { result } = renderHook(
+      () => useMarketPositions({ marketId: 'marketId' }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current?.openVolume).toEqual('100002');
+    expect(result.current?.balance).toEqual('50001000000');
+  });
+
+  it('if balance equal 0 return null', () => {
+    mockMarketAccountBalance = { accountBalance: '0', accountDecimals: 5 };
+    const { result } = renderHook(
+      () => useMarketPositions({ marketId: 'marketId' }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBeNull();
+  });
+
+  it('if no markets return null', () => {
+    mockMarketAccountBalance = { accountBalance: '', accountDecimals: null };
+    const { result } = renderHook(
+      () => useMarketPositions({ marketId: 'marketId' }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBeNull();
+  });
+});
@@ -0,0 +1,34 @@
+import { useMemo } from 'react';
+import { BigNumber } from 'bignumber.js';
+import { useMarketAccountBalance } from '@vegaprotocol/accounts';
+import { useMarketPositionOpenVolume } from '@vegaprotocol/positions';
+
+interface Props {
+  marketId: string;
+}
+
+export type PositionMargin = {
+  openVolume: string;
+  balance: string;
+  balanceDecimals?: number;
+} | null;
+
+export const useMarketPositions = ({ marketId }: Props): PositionMargin => {
+  const { accountBalance, accountDecimals } = useMarketAccountBalance(marketId);
+  const openVolume = useMarketPositionOpenVolume(marketId);
+
+  return useMemo(() => {
+    if (accountBalance && accountDecimals) {
+      const balance = new BigNumber(accountBalance);
+      const volume = new BigNumber(openVolume);
+      if (!balance.isZero() && !volume.isZero()) {
+        return {
+          balance: accountBalance,
+          balanceDecimals: accountDecimals,
+          openVolume,
+        };
+      }
+    }
+    return null;
+  }, [accountBalance, accountDecimals, openVolume]);
+};
@@ -0,0 +1,120 @@
+import { renderHook } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import * as Schema from '@vegaprotocol/types';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import type { PositionMargin } from './use-market-positions';
+import { useMaximumPositionSize } from './use-maximum-position-size';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));
+
+let mockAccountBalance: {
+  accountBalance: string;
+  accountDecimals: number | null;
+} = { accountBalance: '200000', accountDecimals: 5 };
+jest.mock('@vegaprotocol/accounts', () => ({
+  ...jest.requireActual('@vegaprotocol/accounts'),
+  useAccountBalance: jest.fn(() => mockAccountBalance),
+}));
+
+const defaultMockMarketPositions = {
+  openVolume: '1',
+  balance: '100000',
+};
+
+let mockMarketPositions: PositionMargin | null = defaultMockMarketPositions;
+
+const mockOrder: OrderSubmissionBody['orderSubmission'] = {
+  type: Schema.OrderType.TYPE_MARKET,
+  size: '1',
+  side: Schema.Side.SIDE_BUY,
+  timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+  marketId: 'market-id',
+};
+
+jest.mock('./use-market-positions', () => ({
+  useMarketPositions: ({
+    marketId,
+    partyId,
+  }: {
+    marketId: string;
+    partyId: string;
+  }) => mockMarketPositions,
+}));
+
+describe('useMaximumPositionSize', () => {
+  it('should return correct size when no open positions', () => {
+    mockMarketPositions = null;
+    const price = '50';
+    const expected = 4000;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+
+  it('should return correct size when open positions and same side', () => {
+    const price = '50';
+    mockMarketPositions = defaultMockMarketPositions;
+    const expected = 3999;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+
+  it('should return correct size when open positions and opposite side', () => {
+    const price = '50';
+    mockOrder.side = Schema.Side.SIDE_SELL;
+    mockMarketPositions = defaultMockMarketPositions;
+    const expected = 4001;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+
+  it('should return zero if no account balance', () => {
+    mockAccountBalance = {
+      accountBalance: '0',
+      accountDecimals: 5,
+    };
+    const price = '50';
+    mockMarketPositions = defaultMockMarketPositions;
+    const expected = 0;
+    const { result } = renderHook(
+      () =>
+        useMaximumPositionSize({
+          marketId: '',
+          price,
+          settlementAssetId: '',
+          order: mockOrder,
+        }),
+      { wrapper: MockedProvider }
+    );
+    expect(result.current).toBe(expected);
+  });
+});
@@ -0,0 +1,46 @@
+import * as Schema from '@vegaprotocol/types';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { useAccountBalance } from '@vegaprotocol/accounts';
+import { BigNumber } from 'bignumber.js';
+import { useMarketPositions } from './use-market-positions';
+
+interface Props {
+  marketId: string;
+  price?: string;
+  settlementAssetId: string;
+  order: OrderSubmissionBody['orderSubmission'];
+}
+
+const getSize = (balance: string, price: string) =>
+  new BigNumber(balance).dividedBy(new BigNumber(price));
+
+export const useMaximumPositionSize = ({
+  marketId,
+  price,
+  settlementAssetId,
+  order,
+}: Props): number => {
+  const { accountBalance } = useAccountBalance(settlementAssetId) || {};
+  const marketPositions = useMarketPositions({ marketId: marketId });
+  if (!accountBalance || new BigNumber(accountBalance || 0).isZero()) {
+    return 0;
+  }
+
+  const size = getSize(accountBalance, price || '');
+
+  if (!marketPositions) {
+    return size.toNumber() || 0;
+  }
+
+  const isSameSide =
+    (new BigNumber(marketPositions.openVolume).isPositive() &&
+      order.side === Schema.Side.SIDE_BUY) ||
+    (new BigNumber(marketPositions.openVolume).isNegative() &&
+      order.side === Schema.Side.SIDE_SELL);
+
+  const adjustedForVolume = new BigNumber(size)[isSameSide ? 'minus' : 'plus'](
+    marketPositions.openVolume
+  );
+
+  return adjustedForVolume.isNegative() ? 0 : adjustedForVolume.toNumber();
+};
@@ -0,0 +1,117 @@
+import { renderHook } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
+import { useOrderCloseOut } from './use-order-closeout';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));
+let mockMarketMargin: string | undefined = undefined;
+jest.mock('@vegaprotocol/positions', () => ({
+  ...jest.requireActual('@vegaprotocol/positions'),
+  useMarketMargin: () => mockMarketMargin,
+}));
+
+describe('useOrderCloseOut', () => {
+  const order = { size: '2', side: 'SIDE_BUY' };
+  const market = {
+    decimalPlaces: 5,
+    tradableInstrument: {
+      instrument: {
+        product: {
+          settlementAsset: {
+            id: 'assetId',
+          },
+        },
+      },
+    },
+  } as unknown as Market;
+
+  const marketData = {
+    markPrice: 100000,
+  } as unknown as MarketData;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return proper null value', () => {
+    mockMarketMargin = '-1';
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: order as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData: {
+            markPrice: '0',
+          } as MarketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual(null);
+  });
+
+  it('should return proper sell value', () => {
+    mockMarketMargin = '0';
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: {
+            ...order,
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual('1');
+  });
+
+  it('should return proper sell value on limit order', () => {
+    mockMarketMargin = '0';
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: {
+            ...order,
+            price: '1000000',
+            type: 'TYPE_LIMIT',
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual('1000000');
+  });
+
+  it('should return proper empty value', () => {
+    const { result } = renderHook(
+      () =>
+        useOrderCloseOut({
+          order: {
+            ...order,
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
+          market,
+          marketData: {
+            markPrice: '0',
+          } as MarketData,
+        }),
+      {
+        wrapper: MockedProvider,
+      }
+    );
+    expect(result.current).toEqual('0');
+  });
+});
@@ -0,0 +1,61 @@
+import { BigNumber } from 'bignumber.js';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import { addDecimal } from '@vegaprotocol/utils';
+import * as Schema from '@vegaprotocol/types';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
+import {
+  useAccountBalance,
+  useMarketAccountBalance,
+} from '@vegaprotocol/accounts';
+import { useMarketMargin } from '@vegaprotocol/positions';
+import { useMarketPositions } from './use-market-positions';
+
+interface Props {
+  order: OrderSubmissionBody['orderSubmission'];
+  market: Market;
+  marketData: MarketData;
+}
+
+export const useOrderCloseOut = ({
+  order,
+  market,
+  marketData,
+}: Props): string | null => {
+  const { accountBalance, accountDecimals } = useAccountBalance(
+    market.tradableInstrument.instrument.product.settlementAsset.id
+  );
+  const { accountBalance: positionBalance, accountDecimals: positionDecimals } =
+    useMarketAccountBalance(market.id);
+  const maintenanceLevel = useMarketMargin(market.id);
+
+  const marginMaintenanceLevel = new BigNumber(
+    addDecimal(maintenanceLevel || 0, market.decimalPlaces)
+  );
+  const positionAccountBalance = new BigNumber(
+    addDecimal(positionBalance || 0, positionDecimals || 0)
+  );
+  const generalAccountBalance = new BigNumber(
+    addDecimal(accountBalance || 0, accountDecimals || 0)
+  );
+  const { openVolume } =
+    useMarketPositions({
+      marketId: market.id,
+    }) || {};
+
+  const volume = new BigNumber(
+    addDecimal(openVolume || '0', market.positionDecimalPlaces)
+  )[order.side === Schema.Side.SIDE_BUY ? 'plus' : 'minus'](order.size);
+  const price =
+    order.type === Schema.OrderType.TYPE_LIMIT && order.price
+      ? new BigNumber(order.price)
+      : new BigNumber(addDecimal(marketData.markPrice, market.decimalPlaces));
+  // regarding formula (marginMaintenanceLevel - positionAccountBalance - generalAccountBalance) / volume + markPrice
+  const marginDifference = marginMaintenanceLevel
+    .minus(positionAccountBalance)
+    .minus(generalAccountBalance);
+  const closeOut = marginDifference.div(volume).plus(price);
+  if (closeOut.isPositive()) {
+    return closeOut.toString();
+  }
+  return null;
+};
@@ -100,7 +100,7 @@ export const DepositForm = ({
    defaultValues: {
      to: pubKey ? pubKey : undefined,
      asset: selectedAsset?.id,
-      amount: persistedDeposit?.amount,
+      amount: persistedDeposit.amount,
    },
  });

@@ -70,8 +70,7 @@ export const DepositManager = ({

  const onAmountChange = useCallback(
    (amount: string) => {
-      persistentDeposit &&
-        savePersistentDeposit({ ...persistentDeposit, amount });
+      savePersistentDeposit({ ...persistentDeposit, amount });
    },
    [savePersistentDeposit, persistentDeposit]
  );
@@ -4,7 +4,7 @@ import { usePersistentDeposit } from './use-persistent-deposit';
 describe('usePersistenDeposit', () => {
  it('should return empty data', () => {
    const { result } = renderHook(() => usePersistentDeposit());
-    expect(result.current).toEqual([undefined, expect.any(Function)]);
+    expect(result.current).toEqual([{ assetId: '' }, expect.any(Function)]);
  });
  it('should return empty and properly saved data', async () => {
    const aId = 'test';
@@ -32,14 +32,10 @@ const usePersistentDepositStore = create<{

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

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

 interface OrderbookRowProps {
@@ -15,7 +15,7 @@ interface OrderbookRowProps {
  price: string;
  relativeAsk?: number;
  relativeBid?: number;
-  onClick?: (price: string) => void;
+  onClick?: (price?: string | number) => void;
 }

 export const OrderbookRow = React.memo(
@@ -59,7 +59,7 @@ export const OrderbookRow = React.memo(
        <PriceCell
          testId={`price-${price}`}
          value={BigInt(price)}
-          onClick={() => onClick && onClick(addDecimal(price, decimalPlaces))}
+          onClick={() => onClick && onClick(price)}
          valueFormatted={addDecimalsFixedFormatNumber(price, decimalPlaces)}
        />
        <CumulativeVol
@@ -20,7 +20,7 @@ describe('Orderbook', () => {
  const decimalPlaces = 3;
  it('should scroll to mid price on init', async () => {
    window.innerHeight = 11 * rowHeight;
-    render(
+    const result = render(
      <Orderbook
        decimalPlaces={decimalPlaces}
        positionDecimalPlaces={0}
@@ -30,7 +30,7 @@ describe('Orderbook', () => {
      />
    );
    await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
  });

  it('should keep mid price row in the middle', async () => {
@@ -45,7 +45,7 @@ describe('Orderbook', () => {
      />
    );
    await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight);
    result.rerender(
      <Orderbook
        decimalPlaces={decimalPlaces}
@@ -121,7 +121,7 @@ describe('Orderbook', () => {
      />
    );
    await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 0.01);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 0.01);
  });

  it('should get back to mid price on click', async () => {
@@ -143,7 +143,7 @@ describe('Orderbook', () => {
    expect(result.getByTestId('scroll').scrollTop).toBe(1);
    const scrollToMidPriceButton = result.getByTestId('scroll-to-midprice');
    fireEvent.click(scrollToMidPriceButton);
-    expect(screen.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 1);
+    expect(result.getByTestId('scroll').scrollTop).toBe(91 * rowHeight + 1);
  });

  it('should get back to mid price on resolution change', async () => {
@@ -158,12 +158,12 @@ describe('Orderbook', () => {
      />
    );
    await waitFor(() => screen.getByTestId(`bid-vol-${params.midPrice}`));
-    const scrollElement = screen.getByTestId('scroll');
+    const scrollElement = result.getByTestId('scroll');
    expect(scrollElement.scrollTop).toBe(91 * rowHeight);
    scrollElement.scrollTop = 1;
    fireEvent.scroll(scrollElement);
-    expect(screen.getByTestId('scroll').scrollTop).toBe(1);
-    const resolutionSelect = screen.getByTestId(
+    expect(result.getByTestId('scroll').scrollTop).toBe(1);
+    const resolutionSelect = result.getByTestId(
      'resolution'
    ) as HTMLSelectElement;
    fireEvent.change(resolutionSelect, { target: { value: '10' } });
@@ -181,47 +181,6 @@ describe('Orderbook', () => {
        onResolutionChange={onResolutionChange}
      />
    );
-    expect(screen.getByTestId('scroll').scrollTop).toBe(6 * rowHeight);
-  });
-
-  it('should format correctly the numbers on resolution change', async () => {
-    const onClickSpy = jest.fn();
-    const result = render(
-      <Orderbook
-        decimalPlaces={decimalPlaces}
-        positionDecimalPlaces={0}
-        onClick={onClickSpy}
-        fillGaps
-        {...generateMockData(params)}
-        onResolutionChange={onResolutionChange}
-      />
-    );
-    expect(
-      await screen.findByTestId(`bid-vol-${params.midPrice}`)
-    ).toBeInTheDocument();
-    // Before resolution change the price is 122.934
-    await fireEvent.click(await screen.getByTestId('price-122934'));
-    expect(onClickSpy).toBeCalledWith('122.934');
-    const resolutionSelect = screen.getByTestId(
-      'resolution'
-    ) as HTMLSelectElement;
-    await fireEvent.change(resolutionSelect, { target: { value: '10' } });
-    await result.rerender(
-      <Orderbook
-        decimalPlaces={decimalPlaces}
-        positionDecimalPlaces={0}
-        onClick={onClickSpy}
-        fillGaps
-        {...generateMockData({
-          ...params,
-          resolution: 10,
-        })}
-        onResolutionChange={onResolutionChange}
-      />
-    );
-    await fireEvent.click(await screen.getByTestId('price-12299'));
-    // After resolution change the price is 122.99
-    expect(onResolutionChange.mock.calls[0][0]).toBe(10);
-    expect(onClickSpy).toBeCalledWith('122.99');
+    expect(result.getByTestId('scroll').scrollTop).toBe(6 * rowHeight);
  });
 });
@@ -21,7 +21,7 @@ interface OrderbookProps extends OrderbookData {
  positionDecimalPlaces: number;
  resolution: number;
  onResolutionChange: (resolution: number) => void;
-  onClick?: (price: string) => void;
+  onClick?: (price?: string | number) => void;
  fillGaps?: boolean;
 }

@@ -169,7 +169,7 @@ export const Info = ({ market, onSelect }: InfoProps) => {
        <LiquidityInfoPanel market={market}>
          <Link
            to={`/liquidity/${market.id}`}
-            onClick={(ev) => onSelect?.(market.id, ev.metaKey || ev.ctrlKey)}
+            onClick={(ev) => onSelect?.(market.id, ev.metaKey)}
            data-testid="view-liquidity-link"
          >
            <UILink>{t('View liquidity provision table')}</UILink>
@@ -47,8 +47,7 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
          }
          onSelect(
            (data as MarketMaybeWithData).id,
-            (event as unknown as MouseEvent)?.metaKey ||
-              (event as unknown as MouseEvent)?.ctrlKey
+            (event as unknown as MouseEvent)?.metaKey
          );
        }}
        onMarketClick={onSelect}
@@ -20,7 +20,6 @@ import type {
  OrdersQueryVariables,
 } from './__generated__/Orders';
 import { OrdersDocument, OrdersUpdateDocument } from './__generated__/Orders';
-import type { ApolloClient } from '@apollo/client';

 export type Order = Omit<OrderFieldsFragment, 'market'> & {
  market?: Market;
@@ -82,31 +81,8 @@ const getData = (
 ): Edge<OrderFieldsFragment>[] =>
  responseData?.party?.ordersConnection?.edges || [];

-const getDelta = (
-  subscriptionData: OrdersUpdateSubscription,
-  variables: OrdersQueryVariables,
-  client: ApolloClient<object>
-) => {
-  if (!subscriptionData.orders) {
-    return [];
-  }
-  subscriptionData.orders.forEach((order) => {
-    client.cache.modify({
-      id: client.cache.identify({
-        __typename: 'Order',
-        id: order.id,
-      }),
-      fields: {
-        price: () => order.price,
-        size: () => order.size,
-        remaining: () => order.remaining,
-        updatedAt: () => order.updatedAt,
-        status: () => order.status,
-      },
-    });
-  });
-  return subscriptionData.orders;
-};
+const getDelta = (subscriptionData: OrdersUpdateSubscription) =>
+  subscriptionData.orders || [];

 const getPageInfo = (responseData: OrdersQuery): PageInfo | null =>
  responseData.party?.ordersConnection?.pageInfo || null;
@@ -1,129 +0,0 @@
-import { Intent } from '@vegaprotocol/ui-toolkit';
-import {
-  getOrderToastIntent,
-  getOrderToastTitle,
-  getRejectionReason,
-  timeInForceLabel,
-} from './utils';
-import * as Types from '@vegaprotocol/types';
-
-describe('getOrderToastTitle', () => {
-  it('should return the correct title', () => {
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_ACTIVE)).toBe(
-      'Order submitted'
-    );
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_FILLED)).toBe(
-      'Order filled'
-    );
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_PARTIALLY_FILLED)).toBe(
-      'Order partially filled'
-    );
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_PARKED)).toBe(
-      'Order parked'
-    );
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_STOPPED)).toBe(
-      'Order stopped'
-    );
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_CANCELLED)).toBe(
-      'Order cancelled'
-    );
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_EXPIRED)).toBe(
-      'Order expired'
-    );
-    expect(getOrderToastTitle(Types.OrderStatus.STATUS_REJECTED)).toBe(
-      'Order rejected'
-    );
-    expect(getOrderToastTitle(undefined)).toBe(undefined);
-  });
-});
-
-describe('getOrderToastIntent', () => {
-  it('should return the correct intent', () => {
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_PARKED)).toBe(
-      Intent.Warning
-    );
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_EXPIRED)).toBe(
-      Intent.Warning
-    );
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_PARTIALLY_FILLED)).toBe(
-      Intent.Warning
-    );
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_REJECTED)).toBe(
-      Intent.Danger
-    );
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_STOPPED)).toBe(
-      Intent.Danger
-    );
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_FILLED)).toBe(
-      Intent.Success
-    );
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_ACTIVE)).toBe(
-      Intent.Success
-    );
-    expect(getOrderToastIntent(Types.OrderStatus.STATUS_CANCELLED)).toBe(
-      Intent.Success
-    );
-    expect(getOrderToastIntent(undefined)).toBe(undefined);
-  });
-});
-
-describe('getRejectionReason', () => {
-  it('should return the correct rejection reason for insufficient asset balance', () => {
-    expect(
-      getRejectionReason({
-        rejectionReason:
-          Types.OrderRejectionReason.ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE,
-        status: Types.OrderStatus.STATUS_REJECTED,
-        id: '',
-        createdAt: undefined,
-        size: '',
-        price: '',
-        timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        side: Types.Side.SIDE_BUY,
-        marketId: '',
-      })
-    ).toBe('Insufficient asset balance');
-  });
-
-  it('should return the correct rejection reason when order is stopped', () => {
-    expect(
-      getRejectionReason({
-        rejectionReason: null,
-        status: Types.OrderStatus.STATUS_STOPPED,
-        id: '',
-        createdAt: undefined,
-        size: '',
-        price: '',
-        timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        side: Types.Side.SIDE_BUY,
-        marketId: '',
-      })
-    ).toBe(
-      'Your Fill or Kill (FOK) order was not filled and it has been stopped'
-    );
-  });
-});
-
-describe('timeInForceLabel', () => {
-  it('should return the correct label for time in force', () => {
-    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_FOK)).toBe(
-      `Fill or Kill (FOK)`
-    );
-    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GTC)).toBe(
-      `Good 'til Cancelled (GTC)`
-    );
-    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_IOC)).toBe(
-      `Immediate or Cancel (IOC)`
-    );
-    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GTT)).toBe(
-      `Good 'til Time (GTT)`
-    );
-    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GFA)).toBe(
-      `Good for Auction (GFA)`
-    );
-    expect(timeInForceLabel(Types.OrderTimeInForce.TIME_IN_FORCE_GFN)).toBe(
-      `Good for Normal (GFN)`
-    );
-    expect(timeInForceLabel('')).toBe('');
-  });
-});
@@ -82,10 +82,10 @@ export const getOrderToastIntent = (
      return Intent.Warning;
    case Schema.OrderStatus.STATUS_REJECTED:
    case Schema.OrderStatus.STATUS_STOPPED:
+    case Schema.OrderStatus.STATUS_CANCELLED:
      return Intent.Danger;
    case Schema.OrderStatus.STATUS_FILLED:
    case Schema.OrderStatus.STATUS_ACTIVE:
-    case Schema.OrderStatus.STATUS_CANCELLED:
      return Intent.Success;
    default:
      return;
@@ -5,5 +5,6 @@ export * from './lib/margin-data-provider';
 export * from './lib/margin-calculator';
 export * from './lib/positions-table';
 export * from './lib/use-market-margin';
+export * from './lib/use-market-position-open-volume';
 export * from './lib/use-open-volume';
 export * from './lib/use-positions-data';
@@ -354,7 +354,10 @@ export const volumeAndMarginProvider = makeDerivedDataProvider<
        partyId,
        marketIds: [marketId],
        filter: {
-          status: [OrderStatus.STATUS_ACTIVE, OrderStatus.STATUS_PARKED],
+          status: [
+            OrderStatus.STATUS_ACTIVE,
+            OrderStatus.STATUS_PARTIALLY_FILLED,
+          ],
        },
      }),
    (callback, client, variables) =>
@@ -0,0 +1,29 @@
+import { useCallback, useState } from 'react';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { positionsDataProvider } from './positions-data-providers';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
+import type { PositionFieldsFragment } from './__generated__/Positions';
+
+export const useMarketPositionOpenVolume = (marketId: string) => {
+  const { pubKey } = useVegaWallet();
+  const [openVolume, setOpenVolume] = useState<string>('');
+  const update = useCallback(
+    ({ data }: { data: PositionFieldsFragment[] | null }) => {
+      const position = data?.find((node) => node.market.id === marketId);
+      if (position?.openVolume) {
+        setOpenVolume(position?.openVolume || '');
+      }
+      return true;
+    },
+    [setOpenVolume, marketId]
+  );
+
+  useDataProvider({
+    dataProvider: positionsDataProvider,
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey || !marketId,
+    update,
+  });
+
+  return openVolume;
+};
@@ -70,8 +70,6 @@ export const Notification = ({
            'text-vega-green dark:text-vega-green': intent === Intent.Success,
            'text-yellow-600 dark:text-yellow': intent === Intent.Warning,
            'text-vega-pink': intent === Intent.Danger,
-            'mt-1': !!title,
-            'mt-[0.125rem]': !title,
          },
          'flex items-start mt-1'
        )}
@@ -80,16 +78,11 @@ export const Notification = ({
      </div>
      <div className="flex flex-col flex-grow items-start gap-1.5">
        {title && (
-          <div
-            key="title"
-            className="whitespace-nowrap overflow-hidden text-ellipsis uppercase leading-6"
-          >
+          <div className="whitespace-nowrap overflow-hidden text-ellipsis uppercase leading-6">
            {title}
          </div>
        )}
-        <div key="message" className="text-sm [word-break:break-word]">
-          {message}
-        </div>
+        <div className="text-sm [word-break:break-word]">{message}</div>
        {buttonProps && (
          <Button
            size={buttonProps.size || 'sm'}
@@ -104,11 +104,7 @@ interface GetTotalCount<QueryData> {
 }

 interface GetDelta<SubscriptionData, Delta, Variables> {
-  (
-    subscriptionData: SubscriptionData,
-    variables: Variables,
-    client: ApolloClient<object>
-  ): Delta;
+  (subscriptionData: SubscriptionData, variables?: Variables): Delta;
 }

 export type Node = { id: string };
@@ -424,7 +420,7 @@ function makeDataProviderInternal<
    if (!subscriptionData || !getDelta || !update) {
      return;
    }
-    const delta = getDelta(subscriptionData, variables, client);
+    const delta = getDelta(subscriptionData, variables);
    if (loading) {
      updateQueue.push(delta);
    } else {
@@ -6,7 +6,6 @@ import {
  removeDecimal,
  required,
  isAssetTypeERC20,
-  formatNumber,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
@@ -15,16 +14,12 @@ import {
  FormGroup,
  Input,
  InputError,
-  Notification,
  RichSelect,
-  ExternalLink,
-  Intent,
 } from '@vegaprotocol/ui-toolkit';
 import { useWeb3React } from '@web3-react/core';
 import BigNumber from 'bignumber.js';
 import type { ButtonHTMLAttributes } from 'react';
 import type { ControllerRenderProps } from 'react-hook-form';
-import { formatDistanceToNow } from 'date-fns';
 import { useForm, Controller, useWatch } from 'react-hook-form';
 import type { WithdrawalArgs } from './use-create-withdraw';
 import { WithdrawLimits } from './withdraw-limits';
@@ -50,47 +45,6 @@ export interface WithdrawFormProps {
  submitWithdraw: (withdrawal: WithdrawalArgs) => void;
 }

-const WithdrawDelayNotification = ({
-  threshold,
-  delay,
-  symbol,
-  decimals,
-}: {
-  threshold: BigNumber;
-  delay: number | undefined;
-  symbol: string;
-  decimals: number;
-}) => {
-  const replacements = [
-    symbol,
-    delay ? formatDistanceToNow(Date.now() + delay * 1000) : ' ',
-  ];
-  return (
-    <Notification
-      intent={Intent.Warning}
-      testId={
-        threshold.isFinite()
-          ? 'amount-withdrawal-delay-notification'
-          : 'withdrawals-delay-notification'
-      }
-      message={[
-        !threshold.isFinite()
-          ? t('All %s withdrawals are subject to a %s delay.', replacements)
-          : t('Withdrawals of %s %s or more will be delayed for %s.', [
-              formatNumber(threshold, decimals),
-              ...replacements,
-            ]),
-        <ExternalLink
-          className="ml-1"
-          href="https://docs.vega.xyz/testnet/concepts/deposits-withdrawals#withdrawal-limits"
-        >
-          {t('Read more')}
-        </ExternalLink>,
-      ]}
-    />
-  );
-};
-
 export const WithdrawForm = ({
  assets,
  balance,
@@ -159,12 +113,6 @@ export const WithdrawForm = ({
    );
  };

-  const showWithdrawDelayNotification =
-    delay &&
-    selectedAsset &&
-    (!threshold.isFinite() ||
-      new BigNumber(amount).isGreaterThanOrEqualTo(threshold));
-
  return (
    <>
      <div className="mb-4 text-sm">
@@ -258,16 +206,6 @@ export const WithdrawForm = ({
              {t('Use maximum')}
            </UseButton>
          )}
-          {showWithdrawDelayNotification && (
-            <div className="mt-2">
-              <WithdrawDelayNotification
-                threshold={threshold}
-                symbol={selectedAsset.symbol}
-                decimals={selectedAsset.decimals}
-                delay={delay}
-              />
-            </div>
-          )}
        </FormGroup>
        <Button
          data-testid="submit-withdrawal"
@@ -1,12 +1,7 @@
 import type { Asset } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { CompactNumber } from '@vegaprotocol/react-helpers';
-import { WITHDRAW_THRESHOLD_TOOLTIP_TEXT } from '@vegaprotocol/assets';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
+import { KeyValueTable, KeyValueTableRow } from '@vegaprotocol/ui-toolkit';
 import BigNumber from 'bignumber.js';
 import { formatDistanceToNow } from 'date-fns';

@@ -30,13 +25,7 @@ export const WithdrawLimits = ({
      ? formatDistanceToNow(Date.now() + delay * 1000)
      : t('None');

-  const limits: {
-    key: string;
-    label: string;
-    value: string | JSX.Element;
-    rawValue?: BigNumber;
-    tooltip?: string;
-  }[] = [
+  const limits = [
    {
      key: 'BALANCE_AVAILABLE',
      label: t('Balance available'),
@@ -47,35 +36,24 @@ export const WithdrawLimits = ({
        '-'
      ),
    },
-  ];
-  if (threshold.isFinite()) {
-    limits.push({
+    {
      key: 'WITHDRAWAL_THRESHOLD',
      label: t('Delayed withdrawal threshold'),
-      tooltip: WITHDRAW_THRESHOLD_TOOLTIP_TEXT,
      rawValue: threshold,
      value: <CompactNumber number={threshold} decimals={asset.decimals} />,
-    });
-  }
-  limits.push({
-    key: 'DELAY_TIME',
-    label: t('Delay time'),
-    value: delayTime,
-  });
+    },
+    {
+      key: 'DELAY_TIME',
+      label: t('Delay time'),
+      value: delayTime,
+    },
+  ];

  return (
    <KeyValueTable>
-      {limits.map(({ key, label, rawValue, value, tooltip }) => (
+      {limits.map(({ key, label, rawValue, value }) => (
        <KeyValueTableRow key={key}>
-          <div data-testid={`${key}_label`}>
-            {tooltip ? (
-              <Tooltip description={tooltip}>
-                <span>{label}</span>
-              </Tooltip>
-            ) : (
-              label
-            )}
-          </div>
+          <div data-testid={`${key}_label`}>{label}</div>
          <div
            data-testid={`${key}_value`}
            className="truncate"
@@ -12,17 +12,15 @@ jest.mock('@web3-react/core', () => ({
  useWeb3React: () => ({ account: ethereumAddress }),
 }));

-const withdrawAsset = {
-  asset,
-  balance: new BigNumber(1),
-  min: new BigNumber(0.0000001),
-  threshold: new BigNumber(1000),
-  delay: 10,
-  handleSelectAsset: jest.fn(),
-};
-
 jest.mock('./use-withdraw-asset', () => ({
-  useWithdrawAsset: () => withdrawAsset,
+  useWithdrawAsset: () => ({
+    asset,
+    balance: new BigNumber(1),
+    min: new BigNumber(0.0000001),
+    threshold: new BigNumber(1000),
+    delay: 10,
+    handleSelectAsset: jest.fn(),
+  }),
 }));

 jest.mock('@vegaprotocol/web3', () => ({
@@ -111,25 +109,4 @@ describe('WithdrawManager', () => {
    });
    fireEvent.submit(screen.getByTestId('withdraw-form'));
  };
-
-  it('shows withdraw delay notification if amount greater than threshold', async () => {
-    render(generateJsx(props));
-    fireEvent.change(screen.getByLabelText('Amount'), {
-      target: { value: '1000' },
-    });
-    expect(
-      await screen.findByTestId('amount-withdrawal-delay-notification')
-    ).toBeInTheDocument();
-  });
-
-  it('shows withdraw delay notification if threshold is 0', async () => {
-    withdrawAsset.threshold = new BigNumber(Infinity);
-    render(generateJsx(props));
-    fireEvent.change(screen.getByLabelText('Amount'), {
-      target: { value: '0.01' },
-    });
-    expect(
-      await screen.findByTestId('withdrawals-delay-notification')
-    ).toBeInTheDocument();
-  });
 });
@@ -70,7 +70,7 @@
    "react-hook-form": "^7.27.0",
    "react-i18next": "^11.11.4",
    "react-intersection-observer": "^9.2.2",
-    "react-markdown": "^8.0.6",
+    "react-markdown": "^8.0.5",
    "react-router-dom": "^6.9.0",
    "react-syntax-highlighter": "^15.4.5",
    "react-use-websocket": "^3.0.0",
@@ -19541,10 +19541,10 @@ react-lifecycles-compat@^3.0.4:
  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==

-react-markdown@^8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.6.tgz#3e939018f8bfce800ffdf22cf50aba3cdded7ad1"
-  integrity sha512-KgPWsYgHuftdx510wwIzpwf+5js/iHqBR+fzxefv8Khk3mFbnioF1bmL2idHN3ler0LMQmICKeDrWnZrX9mtbQ==
+react-markdown@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.5.tgz#c9a70a33ca9aeeafb769c6582e7e38843b9d70ad"
+  integrity sha512-jGJolWWmOWAvzf+xMdB9zwStViODyyFQhNB/bwCerbBKmrTmgmA599CGiOlP58OId1IMoIRsA8UdI1Lod4zb5A==
  dependencies:
    "@types/hast" "^2.0.0"
    "@types/prop-types" "^15.0.0"
Author	SHA1	Message	Date
Matthew Russell	52481ccaf5	chore: fix bad grammar in comment	2023-04-10 10:46:14 -07:00
Matthew Russell	483345942d	chore: actually use poll interval in test	2023-04-10 10:45:45 -07:00
Matthew Russell	d71871566b	chore: prevent polling if node switcher query fails	2023-04-10 09:49:58 -07:00