chore: nx upgrade for trading-e2e

chore: upgrade nx, remove custom executors, amend trading app .env files
chore(trading): maintain always up to date active orders list (#3430 )
2023-04-18 14:00:08 +02:00 · 2023-04-18 13:03:24 +02:00 · 2023-04-18 12:49:42 +02:00 · 2023-04-18 06:08:58 +00:00 · 2023-04-18 00:16:31 +00:00 · 2023-04-17 18:07:00 +00:00
184 changed files with 3472 additions and 3933 deletions
@@ -4,14 +4,54 @@ on:
  push:
    branches:
      - release/*
+      - develop
  pull_request:
    types:
      - opened
-      - reopened
-      - synchronize
      - ready_for_review
+      - reopened
+      - edited
+      - synchronize
 jobs:
+  node-modules:
+    runs-on: ubuntu-22.04
+    name: 'Cache yarn modules'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Cache node modules
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+          # comment out "resotre-keys" if you need to rebuild yarn from 0
+          restore-keys: |
+            ${{ runner.os }}-cache-node-modules-
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn
+
+      - name: yarn install
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: yarn install --pure-lockfile
+
+  lint-pr-title:
+    needs: node-modules
+    if: ${{ github.event_name == 'pull_request' }}
+    name: Verify PR title
+    uses: ./.github/workflows/lint-pr.yml
+    secrets: inherit
+
  lint-test-build:
+    timeout-minutes: 20
+    needs: node-modules
    runs-on: ubuntu-22.04
    name: '(CI) lint + unit test + build'
    steps:
@@ -27,8 +67,11 @@ jobs:
          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
          cache: yarn

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

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

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

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

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

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

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

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

-      # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Check node version
-        id: tags
-        run: |
-          nodeVersion=$(cat .nvmrc | head -n 1)
-          echo ::set-output name=nodeVersion::${nodeVersion}
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn

+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+
+      # https://docs.github.com/en/actions/learn-github-actions/contexts
+      - name: Define variables
+        run: |
+          envName=''
+          dockerfile="dist.Dockerfile"
          if [[ "${{ github.event_name }}" = "push" ]]; then
-            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-            bucketName="${{ github.event.repository.name }}-$envName"
-            echo ::set-output name=bucketName::${bucketName}
-            echo ::set-output name=envName::${envName}
+            domain="vega.rocks"
+            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
+              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
+                domain="vega.community"
+                if [[ "${{ matrix.app }}" = "trading" ]]; then
+                  dockerfile="ipfs.Dockerfile"
+                fi
+              fi
+            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+              envName="stagnet3"
+            fi
+            bucketName="${{ matrix.app }}.${envName}.${domain}"
+            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
          fi
+          nodeVersion=$(cat .nvmrc | head -n 1)
+          echo ENV_NAME=${envName} >> $GITHUB_ENV
+          echo NODE_VERSION=${nodeVersion} >> $GITHUB_ENV
+          echo DOCKERFILE=docker/${dockerfile} >> $GITHUB_ENV
+
+      - name: Build local dist
+        if: ${{ env.DOCKERFILE != 'docker/ipfs.Dockerfile' }}
+        run: |
+          flags=""
+          if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
+            if [[ "${{ env.ENV_NAME }}" != "ops-vega" ]]; then
+              flags="--env=${{ env.ENV_NAME }}"
+            fi
+          fi
+
+          if [ "${{ matrix.app }}" = "trading" ]; then
+            yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
+            DIST_LOCATION=dist/apps/trading/exported
+          else
+            yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
+            DIST_LOCATION=dist/apps/${{ matrix.app }}
+          fi
+          mv $DIST_LOCATION dist-result
+          tree dist-result

      - name: Build and export to local Docker
        id: docker_build
+        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
        uses: docker/build-push-action@v3
        with:
+          context: .
+          file: ${{ env.DOCKERFILE }}
          load: true
          build-args: |
            APP=${{ matrix.app }}
-            NODE_VERSION=${{ steps.tags.outputs.nodeVersion }}
-            ENV_NAME=${{ steps.tags.outputs.envName || '' }}
+            NODE_VERSION=${{ env.NODE_VERSION }}
+            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local

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

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

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

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

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

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

      - name: Add preview label
        uses: actions-ecosystem/action-add-labels@v1
@@ -103,6 +169,3 @@ jobs:
        with:
          labels: ${{ matrix.app }}-preview
          number: ${{ github.event.number }}
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
@@ -4,8 +4,6 @@
 /dist
 /tmp
 /out-tsc
-/tools/executors/**/*.js
-/tools/utils/*.js

 # dependencies
 /node_modules
@@ -1,4 +1,5 @@
 {
+  "name": "explorer-e2e",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/explorer-e2e/src",
  "projectType": "application",
@@ -1,10 +1,10 @@
 {
+  "name": "explorer",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/explorer/src",
  "projectType": "application",
  "targets": {
    "build": {
-      "executor": "./tools/executors/webpack:build",
      "outputs": ["{options.outputPath}"],
      "defaultConfiguration": "production",
      "options": {
@@ -38,7 +38,6 @@
      }
    },
    "serve": {
-      "executor": "./tools/executors/webpack:serve",
      "options": {
        "port": 3000,
        "buildTarget": "explorer:build:development",
@@ -10,7 +10,7 @@ export const Footer = () => {
  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
  const { screenSize } = useScreenDimensions();
  const showFullFeedbackLabel = useMemo(
-    () => ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
+    () => ['md', 'lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
    [screenSize]
  );

@@ -1,4 +1,5 @@
 {
+  "name": "governance-e2e",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/governance-e2e/src",
  "projectType": "application",
@@ -44,7 +44,8 @@ describe(
  function () {
    before('connect wallets and set approval limit', function () {
      cy.visit('/');
-      vegaWalletSetSpecifiedApprovalAmount('1000');
+      ethereumWalletConnect();
+      cy.associateTokensToVegaWallet('1');
    });

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 export async function vegaWalletTeardown() {
-  cy.get('[data-testid="associated-amount"]')
+  cy.get(associatedAmountInWallet)
    .should('be.visible')
    .invoke('text')
    .then((associatedAmount) => {
@@ -68,12 +69,12 @@ export async function vegaWalletTeardown() {
          $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
          associatedAmount != '0.00'
        ) {
-          vegaWalletTeardownVesting(vestingContract);
          vegaWalletTeardownStaking(stakingBridgeContract);
+          vegaWalletTeardownVesting(vestingContract);
        }
      });
      cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('associated-amount', {
+        cy.get(associatedAmountInWallet, {
          timeout: transactionTimeout,
        }).contains('0.00', {
          timeout: transactionTimeout,
@@ -90,7 +91,7 @@ export async function vegaWalletSetSpecifiedApprovalAmount(
  await promiseWithTimeout(
    token.approve(
      ethStakingBridgeContractAddress,
-      resetAmount.concat('000000000000000000')
+      resetAmount + '0'.repeat(18)
    ),
    10 * 60 * 1000,
    'set approval amount'
@@ -104,12 +105,23 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      cy.wrap(
-        stakingBridgeContract.remove_stake(
-          String(stakeBalance),
-          vegaWalletPubKey
-        ),
-        { timeout: transactionTimeout, log: false }
+      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
+        () => {
+          cy.get(associatedAmountInWallet)
+            .invoke('text')
+            .then(($walletAmount) => {
+              cy.wrap(
+                stakingBridgeContract.remove_stake(
+                  String(stakeBalance),
+                  vegaWalletPubKey
+                ),
+                { timeout: transactionTimeout, log: false }
+              );
+              cy.get(associatedAmountInWallet, {
+                timeout: transactionTimeout,
+              }).should('not.have.text', $walletAmount);
+            });
+        }
      );
    }
  });
@@ -124,7 +136,6 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
    if (Number(vestingAmount) != 0) {
      // Wait needed to allow time for ganache to process tx for stakingBridgeContract.remove_stake
      // eslint-disable-next-line cypress/no-unnecessary-waiting
-      cy.wait(1000);
      cy.wrap(
        vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
        { timeout: transactionTimeout, log: false }
@@ -1,10 +1,10 @@
 {
+  "name": "governance",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/governance/src",
  "projectType": "application",
  "targets": {
    "build": {
-      "executor": "./tools/executors/webpack:build",
      "outputs": ["{options.outputPath}"],
      "defaultConfiguration": "production",
      "options": {
@@ -41,7 +41,6 @@
      }
    },
    "serve": {
-      "executor": "./tools/executors/webpack:serve",
      "options": {
        "port": 4210,
        "buildTarget": "governance:build:development",
@@ -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-[440px]">
+            <div className="w-[360px]">
              <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-[400px]">
+        <div className="w-[340px]">
          <Toggle
            name="validators-view-toggle"
            toggles={[
              {
-                label: t('ALL VALIDATORS'),
+                label: t('All validators'),
                value: 'all',
              },
              {
-                label: t('STAKED BY ME'),
+                label: t('Staked by me'),
                value: 'myStake',
              },
            ]}
@@ -1,4 +1,5 @@
 {
+  "name": "liquidity-provision-dashboard",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/liquidity-provision-dashboard/src",
  "projectType": "application",
@@ -47,7 +48,6 @@
      }
    },
    "serve": {
-      "executor": "./tools/executors/webpack:serve",
      "options": {
        "buildTarget": "liquidity-provision-dashboard:build",
        "hmr": true,
@@ -1,10 +1,10 @@
 {
+  "name": "multisig-signer",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/multisig-signer/src",
  "projectType": "application",
  "targets": {
    "build": {
-      "executor": "./tools/executors/webpack:build",
      "outputs": ["{options.outputPath}"],
      "defaultConfiguration": "production",
      "options": {
@@ -38,7 +38,6 @@
      }
    },
    "serve": {
-      "executor": "./tools/executors/webpack:serve",
      "options": {
        "port": 3000,
        "buildTarget": "multisig-signer:build:development",
@@ -1,11 +1,11 @@
 {
+  "name": "static",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "projectType": "application",
  "sourceRoot": "apps/static/src",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "./tools/executors/webpack:build",
      "outputs": ["{options.outputPath}"],
      "defaultConfiguration": "production",
      "options": {
@@ -36,7 +36,6 @@
      }
    },
    "serve": {
-      "executor": "./tools/executors/webpack:serve",
      "options": {
        "buildTarget": "static:build"
      },
@@ -0,0 +1 @@
+apps/trading-e2e/.env.capsule
@@ -0,0 +1 @@
+apps/trading-e2e/.env.stagnet3
@@ -1,4 +1,5 @@
 {
+  "name": "trading-e2e",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/trading-e2e/src",
  "projectType": "application",
@@ -15,7 +16,9 @@
        },
        "live": {
          "devServerTarget": ""
-        }
+        },
+        "capsule": {},
+        "stagnet3": {}
      }
    },
    "lint": {
@@ -411,6 +411,7 @@ 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 });
@@ -430,8 +431,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,6 +76,7 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
  });

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

@@ -41,6 +41,12 @@ describe('accounts', { tags: '@smoke' }, () => {
      .should('have.text', '100,001.01');
  });

+  it('asset detail should be properly rendered', () => {
+    cy.getByTestId('Collateral').click();
+    cy.getByTestId('asset').contains('tEURO').click();
+    cy.get('[data-testid$="_label"]').should('have.length', 16);
+  });
+
  describe('sorting by ag-grid columns should work well', () => {
    it('sorting by asset', () => {
      cy.getByTestId('Collateral').click();
@@ -514,6 +514,8 @@ 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) => {
@@ -537,6 +539,8 @@ 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-031
+    // 7002-SORD-030
    cy.getByTestId(toggleMarket).click();
    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
      'have.text',
@@ -117,6 +117,7 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
    // 0002-WCON-002
    // 0002-WCON-005
    // 0002-WCON-007
+    // 0002-WCON-009

    mockConnectWallet();
    cy.getByTestId(connectVegaBtn).click();
@@ -124,6 +125,10 @@ 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');
  });
@@ -132,6 +137,7 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
    // 0002-WCON-002
    // 0002-WCON-005
    // 0002-WCON-007
+    // 0002-WCON-015

    mockConnectWalletWithUserError();
    cy.getByTestId(connectVegaBtn).click();
@@ -1,17 +1,6 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=''
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -1,14 +1,4 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -0,0 +1 @@
+.env.capsule
@@ -0,0 +1 @@
+.env.devnet
@@ -0,0 +1 @@
+.env.mainnet
@@ -0,0 +1 @@
+.env.stagnet1
@@ -0,0 +1 @@
+.env.stagnet3
@@ -0,0 +1 @@
+.env.testnet
@@ -0,0 +1 @@
+.env.validator-testnet
@@ -1,13 +1,8 @@
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -0,0 +1 @@
+.env.capsule
@@ -0,0 +1 @@
+.env.devnet
@@ -0,0 +1 @@
+.env.mainnet
@@ -0,0 +1 @@
+.env.stagnet1
@@ -0,0 +1 @@
+.env.stagnet3
@@ -0,0 +1 @@
+.env.testnet
@@ -0,0 +1 @@
+.env.validator-testnet
@@ -1,14 +1,4 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,14 +1,4 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
 NX_VEGA_ENV=STAGNET3
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,14 +1,3 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,14 +1,4 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"STAGNET3\":\"https://stagnet3.console.vega.xyz\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_VEGA_TOKEN_URL=https://validator-testnet.governance.fairground.wtf
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -185,7 +185,7 @@ export const columns = (
          onClick={(e) => {
            e.preventDefault();
            e.stopPropagation();
-            onSelect(market.id, e.metaKey);
+            onSelect(market.id, e.metaKey || e.ctrlKey);
          }}
        >
          <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -366,7 +366,7 @@ export const columnsPositionMarkets = (
          onClick={(e) => {
            e.preventDefault();
            e.stopPropagation();
-            onSelect(market.id, e.metaKey);
+            onSelect(market.id, e.metaKey || e.ctrlKey);
          }}
        >
          <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);
+        onSelect(marketId, ev.metaKey || ev.ctrlKey);
      }}
      data-testid={`market-link-${marketId}`}
    >
@@ -8,6 +8,10 @@ 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<
@@ -174,4 +178,25 @@ 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,9 +12,10 @@ import {
  SelectMarketTableRow,
 } from '../select-market';
 import { WelcomeDialogHeader } from './welcome-dialog-header';
-import { Link, useNavigate, useParams } from 'react-router-dom';
+import { Link } 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,
@@ -23,23 +24,13 @@ export const SelectMarketLandingTable = ({
  markets: MarketMaybeWithDataAndCandles[] | null;
  onClose: () => void;
 }) => {
-  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 onSelect = useMarketClickHandler();
  const onSelectMarket = useCallback(
-    (id: string) => {
-      onSelect(id);
-      onClose();
+    (id: string, metaKey?: boolean) => {
+      onSelect(id, metaKey);
+      if (!metaKey) {
+        onClose();
+      }
    },
    [onSelect, onClose]
  );
@@ -73,7 +64,7 @@ export const SelectMarketLandingTable = ({
                key={i}
                detailed={false}
                onSelect={onSelectMarket}
-                columns={columns(market, onSelect, onCellClick)}
+                columns={columns(market, onSelectMarket, onCellClick)}
              />
            ))}
          </tbody>
@@ -7,7 +7,11 @@ import {
 } from '@vegaprotocol/types';
 import type { VegaStoredTxState } from '@vegaprotocol/wallet';
 import { VegaTxStatus } from '@vegaprotocol/wallet';
-import { VegaTransactionDetails } from './use-vega-transaction-toasts';
+import {
+  VegaTransactionDetails,
+  getVegaTransactionContentIntent,
+} from './use-vega-transaction-toasts';
+import { Intent } from '@vegaprotocol/ui-toolkit';

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

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

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

    return {
      id: `vega-${tx.id}`,
@@ -676,3 +663,27 @@ export const useVegaTransactionToasts = () => {
    }
  );
 };
+
+export const getVegaTransactionContentIntent = (tx: VegaStoredTxState) => {
+  let content: ToastContent;
+  if (tx.status === VegaTxStatus.Requested) {
+    content = <VegaTxRequestedToastContent tx={tx} />;
+  }
+  if (tx.status === VegaTxStatus.Pending) {
+    content = <VegaTxPendingToastContentProps tx={tx} />;
+  }
+  if (tx.status === VegaTxStatus.Complete) {
+    content = <VegaTxCompleteToastsContent tx={tx} />;
+  }
+  if (tx.status === VegaTxStatus.Error) {
+    content = <VegaTxErrorToastContent tx={tx} />;
+  }
+
+  // Transaction can be successful but the order can be rejected by the network
+  const intent =
+    (tx.order &&
+      !isOrderAmendmentTransaction(tx.body) &&
+      getOrderToastIntent(tx.order.status)) ||
+    intentMap[tx.status];
+  return { intent, content };
+};
@@ -33,6 +33,8 @@ import { ViewingBanner } from '../components/viewing-banner';
 import { Banner } from '../components/banner';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { activeOrdersProvider } from '@vegaprotocol/orders';

 const DEFAULT_TITLE = t('Welcome to Vega trading!');

@@ -95,6 +97,7 @@ function AppBody({ Component }: AppProps) {
      <ToastsManager />
      <InitializeHandlers />
      <MaybeConnectEagerly />
+      <PartyData />
    </div>
  );
 }
@@ -127,6 +130,18 @@ function VegaTradingApp(props: AppProps) {

 export default VegaTradingApp;

+const PartyData = () => {
+  const { pubKey } = useVegaWallet();
+  const variables = { partyId: pubKey || '' };
+  const skip = !pubKey;
+  useDataProvider({
+    dataProvider: activeOrdersProvider,
+    variables,
+    skip,
+  });
+  return null;
+};
+
 const MaybeConnectEagerly = () => {
  useVegaEagerConnect(Connectors);
  useEthereumEagerConnect();
@@ -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.500');
+  --pennant-color-volume-sell: theme('colors.vega.pink.400');

  /* depth chart */
  --pennant-color-depth-buy-fill: theme('colors.vega.green.400');
@@ -1,10 +1,11 @@
 {
+  "name": "trading",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/trading",
  "projectType": "application",
  "targets": {
    "build": {
-      "executor": "./tools/executors/next:build",
+      "executor": "@nrwl/next:build",
      "outputs": ["{options.outputPath}"],
      "defaultConfiguration": "production",
      "options": {
@@ -15,11 +16,18 @@
        "production": {
          "optimization": true,
          "sourceMap": true
-        }
+        },
+        "capsule": {},
+        "devnet": {},
+        "mainnet": {},
+        "stagnet1": {},
+        "stagnet3": {},
+        "testnet": {},
+        "validator-testnet": {}
      }
    },
    "serve": {
-      "executor": "./tools/executors/next:serve",
+      "executor": "@nrwl/next:server",
      "options": {
        "buildTarget": "trading:build",
        "dev": true
@@ -28,13 +36,29 @@
        "production": {
          "buildTarget": "trading:build:production",
          "dev": false
-        }
+        },
+        "capsule": {},
+        "devnet": {},
+        "mainnet": {},
+        "stagnet1": {},
+        "stagnet3": {},
+        "testnet": {},
+        "validator-testnet": {}
      }
    },
    "export": {
-      "executor": "./tools/executors/next:export",
+      "executor": "@nrwl/next:export",
      "options": {
        "buildTarget": "trading:build:production"
+      },
+      "configurations": {
+        "capsule": {},
+        "devnet": {},
+        "mainnet": {},
+        "stagnet1": {},
+        "stagnet3": {},
+        "testnet": {},
+        "validator-testnet": {}
      }
    },
    "test": {
@@ -0,0 +1,6 @@
+FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+EXPOSE 80
+WORKDIR /usr/share/nginx/html
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
+RUN rm -rf /usr/share/nginx/html/*
+COPY ./dist-result/ /usr/share/nginx/html/
@@ -5,7 +5,9 @@ export PATH="/app/node_modules/.bin:$PATH"
 flags="--network-timeout 100000 --pure-lockfile"

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

 if [ "${APP}" = "trading" ]; then
@@ -16,7 +18,3 @@ if [ "${APP}" = "trading" ]; then
 else
  yarn nx build ${APP} $flags
 fi
-
-env_vars_file="/app/dist/apps/${APP}/.env"
-# make sure there are no exposed .env files
-rm $env_vars_file || echo "No env vars file"
@@ -13,7 +13,7 @@ RUN apk add --update --no-cache \
 COPY . ./
 RUN yarn --network-timeout 100000 --pure-lockfile
 # work around for different build process in trading
-RUN sh ./docker-build.sh
+RUN sh docker/docker-build.sh

 # Server environment
 # if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
@@ -23,6 +23,7 @@ FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a
 EXPOSE 80
 # Copy dist
 WORKDIR /usr/share/nginx/html
-COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=build /app/dist/apps/${APP} /usr/share/nginx/html
-RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > ipfs-hash; apk del go-ipfs
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
+RUN rm -rf /usr/share/nginx/html/*
+COPY --from=build /app/dist/apps/${APP}/* /usr/share/nginx/html
+RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > /ipfs-hash; apk del go-ipfs
@@ -1,11 +1,12 @@
 {
+  "name": "accounts",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/accounts/src",
  "projectType": "library",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/accounts",
@@ -1,123 +0,0 @@
-import type { Story, Meta } from '@storybook/react';
-import { AccountType } from '@vegaprotocol/types';
-import { getAccountData } from './accounts-data-provider';
-import { AccountTable } from './accounts-table';
-
-export default {
-  component: AccountTable,
-  title: 'AccountsTable',
-} as Meta;
-
-const Template: Story = (args) => (
-  <AccountTable data={args.data} onClickAsset={() => null} />
-);
-
-export const Primary = Template.bind({});
-Primary.args = {
-  data: getAccountData([
-    {
-      __typename: 'AccountBalance',
-      type: AccountType.ACCOUNT_TYPE_MARGIN,
-      balance: '2781397',
-      market: {
-        __typename: 'Market',
-        id: 'd90fd7c746286625504d7a3f5f420a280875acd3cd611676d9e70acc675f4540',
-        tradableInstrument: {
-          __typename: 'TradableInstrument',
-          instrument: {
-            __typename: 'Instrument',
-            name: 'Tesla Quarterly (30 Jun 2022)',
-          },
-        },
-      },
-      asset: {
-        __typename: 'Asset',
-        id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4',
-        symbol: 'tEURO',
-        decimals: 5,
-      },
-    },
-    {
-      __typename: 'AccountBalance',
-      type: AccountType.ACCOUNT_TYPE_MARGIN,
-      balance: '406922',
-      market: {
-        __typename: 'Market',
-        id: '9c1ee71959e566c484fcea796513137f8a02219cca2e973b7ae72dc29d099581',
-        tradableInstrument: {
-          __typename: 'TradableInstrument',
-          instrument: {
-            __typename: 'Instrument',
-            name: 'AAVEDAI Monthly (30 Jun 2022)',
-          },
-        },
-      },
-      asset: {
-        __typename: 'Asset',
-        id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
-        symbol: 'tDAI',
-        decimals: 5,
-      },
-    },
-    {
-      __typename: 'AccountBalance',
-      type: AccountType.ACCOUNT_TYPE_GENERAL,
-      balance: '10001000000',
-      market: null,
-      asset: {
-        __typename: 'Asset',
-        id: 'XYZalpha',
-        symbol: 'XYZalpha',
-        decimals: 5,
-      },
-    },
-    {
-      __typename: 'AccountBalance',
-      type: AccountType.ACCOUNT_TYPE_GENERAL,
-      balance: '1990351587',
-      market: null,
-      asset: {
-        __typename: 'Asset',
-        id: '993ed98f4f770d91a796faab1738551193ba45c62341d20597df70fea6704ede',
-        symbol: 'tUSDC',
-        decimals: 5,
-      },
-    },
-    {
-      __typename: 'AccountBalance',
-      type: AccountType.ACCOUNT_TYPE_GENERAL,
-      balance: '2996218603',
-      market: null,
-      asset: {
-        __typename: 'Asset',
-        id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4',
-        symbol: 'tEURO',
-        decimals: 5,
-      },
-    },
-    {
-      __typename: 'AccountBalance',
-      type: AccountType.ACCOUNT_TYPE_GENERAL,
-      balance: '5000593078',
-      market: null,
-      asset: {
-        __typename: 'Asset',
-        id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
-        symbol: 'tDAI',
-        decimals: 5,
-      },
-    },
-    {
-      __typename: 'AccountBalance',
-      type: AccountType.ACCOUNT_TYPE_GENERAL,
-      balance: '4000000000000001006031',
-      market: null,
-      asset: {
-        __typename: 'Asset',
-        id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-        symbol: 'tBTC',
-        decimals: 5,
-      },
-    },
-  ]),
-};
@@ -1,11 +1,12 @@
 {
+  "name": "announcements",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/announcements/src",
  "projectType": "library",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/accounts",
@@ -1,10 +1,11 @@
 {
+  "name": "apollo-client",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/apollo-client/src",
  "projectType": "library",
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/apollo-client",
@@ -1,11 +1,12 @@
 {
+  "name": "assets",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/assets/src",
  "projectType": "library",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/assets",
@@ -1,8 +1,25 @@
+fragment AssetListFields on Asset {
+  id
+  name
+  symbol
+  decimals
+  quantum
+  source {
+    __typename
+    ... on ERC20 {
+      contractAddress
+      lifetimeLimit
+      withdrawThreshold
+    }
+  }
+  status
+}
+
 query Assets {
  assetsConnection {
    edges {
      node {
-        ...AssetFields
+        ...AssetListFields
      }
    }
  }
@@ -1,26 +1,44 @@
 import * as Types from '@vegaprotocol/types';

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


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

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

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

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

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

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

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

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

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

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

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

-const assetFields: AssetFieldsFragment[] = [
+const assetFields: AssetListFieldsFragment[] = [
  {
    __typename: 'Asset',
    id: 'asset-id',
@@ -33,30 +35,6 @@ const assetFields: AssetFieldsFragment[] = [
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
-    infrastructureFeeAccount: {
-      balance: '1',
-      __typename: 'AccountBalance',
-    },
-    globalRewardPoolAccount: {
-      balance: '2',
-      __typename: 'AccountBalance',
-    },
-    takerFeeRewardAccount: {
-      balance: '3',
-      __typename: 'AccountBalance',
-    },
-    makerFeeRewardAccount: {
-      balance: '4',
-      __typename: 'AccountBalance',
-    },
-    lpFeeRewardAccount: {
-      balance: '5',
-      __typename: 'AccountBalance',
-    },
-    marketProposerRewardAccount: {
-      balance: '6',
-      __typename: 'AccountBalance',
-    },
  },
  {
    __typename: 'Asset',
@@ -72,30 +50,6 @@ const assetFields: AssetFieldsFragment[] = [
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
-    infrastructureFeeAccount: {
-      balance: '1',
-      __typename: 'AccountBalance',
-    },
-    globalRewardPoolAccount: {
-      balance: '2',
-      __typename: 'AccountBalance',
-    },
-    takerFeeRewardAccount: {
-      balance: '3',
-      __typename: 'AccountBalance',
-    },
-    makerFeeRewardAccount: {
-      balance: '4',
-      __typename: 'AccountBalance',
-    },
-    lpFeeRewardAccount: {
-      balance: '5',
-      __typename: 'AccountBalance',
-    },
-    marketProposerRewardAccount: {
-      balance: '6',
-      __typename: 'AccountBalance',
-    },
  },
  {
    __typename: 'Asset',
@@ -104,20 +58,10 @@ const assetFields: AssetFieldsFragment[] = [
    decimals: 5,
    name: 'Asto',
    source: {
-      maxFaucetAmountMint: '5000000000',
      __typename: 'BuiltinAsset',
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
-    infrastructureFeeAccount: {
-      balance: '0',
-      __typename: 'AccountBalance',
-    },
-    globalRewardPoolAccount: null,
-    takerFeeRewardAccount: null,
-    makerFeeRewardAccount: null,
-    lpFeeRewardAccount: null,
-    marketProposerRewardAccount: null,
  },
  {
    __typename: 'Asset',
@@ -126,20 +70,10 @@ const assetFields: AssetFieldsFragment[] = [
    decimals: 5,
    name: 'tBTC TEST',
    source: {
-      maxFaucetAmountMint: '5000000000',
      __typename: 'BuiltinAsset',
    },
    quantum: '1',
    status: Types.AssetStatus.STATUS_ENABLED,
-    infrastructureFeeAccount: {
-      balance: '0',
-      __typename: 'AccountBalance',
-    },
-    globalRewardPoolAccount: null,
-    takerFeeRewardAccount: null,
-    makerFeeRewardAccount: null,
-    lpFeeRewardAccount: null,
-    marketProposerRewardAccount: null,
  },
  // NOTE: These assets ids and contract addresses are real assets on Sepolia, this is needed
  // because we don't currently mock our seplia infura provider. If we change network these will
@@ -158,30 +92,6 @@ const assetFields: AssetFieldsFragment[] = [
      __typename: 'ERC20',
    },
    quantum: '1',
-    infrastructureFeeAccount: {
-      balance: '1',
-      __typename: 'AccountBalance',
-    },
-    globalRewardPoolAccount: {
-      balance: '2',
-      __typename: 'AccountBalance',
-    },
-    takerFeeRewardAccount: {
-      balance: '3',
-      __typename: 'AccountBalance',
-    },
-    makerFeeRewardAccount: {
-      balance: '4',
-      __typename: 'AccountBalance',
-    },
-    lpFeeRewardAccount: {
-      balance: '5',
-      __typename: 'AccountBalance',
-    },
-    marketProposerRewardAccount: {
-      balance: '6',
-      __typename: 'AccountBalance',
-    },
  },
  {
    __typename: 'Asset',
@@ -197,29 +107,5 @@ const assetFields: AssetFieldsFragment[] = [
      __typename: 'ERC20',
    },
    quantum: '1',
-    infrastructureFeeAccount: {
-      balance: '1',
-      __typename: 'AccountBalance',
-    },
-    globalRewardPoolAccount: {
-      balance: '2',
-      __typename: 'AccountBalance',
-    },
-    takerFeeRewardAccount: {
-      balance: '3',
-      __typename: 'AccountBalance',
-    },
-    makerFeeRewardAccount: {
-      balance: '4',
-      __typename: 'AccountBalance',
-    },
-    lpFeeRewardAccount: {
-      balance: '5',
-      __typename: 'AccountBalance',
-    },
-    marketProposerRewardAccount: {
-      balance: '6',
-      __typename: 'AccountBalance',
-    },
  },
 ];
@@ -0,0 +1,4 @@
+import { t } from '@vegaprotocol/i18n';
+export const WITHDRAW_THRESHOLD_TOOLTIP_TEXT = t(
+  "The maximum you can withdraw instantly. There's no limit on the size of a withdrawal, but all withdrawals over the threshold will have a delay time added to them"
+);
@@ -5,3 +5,4 @@ export * from './assets-data-provider';
 export * from './asset-details-dialog';
 export * from './asset-details-table';
 export * from './asset-option';
+export * from './constants';
@@ -1,11 +1,12 @@
 {
+  "name": "candles-chart",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/candles-chart/src",
  "projectType": "library",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/candles-chart",
@@ -1,4 +1,5 @@
 {
+  "name": "cypress",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/cypress/src",
  "projectType": "library",
@@ -1,11 +1,12 @@
 {
+  "name": "datagrid",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/datagrid/src",
  "projectType": "library",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/datagrid",
@@ -21,7 +21,7 @@ export const MarketNameCell = ({
      ev.preventDefault();
      ev.stopPropagation();
      if (onMarketClick) {
-        onMarketClick(id, ev.metaKey);
+        onMarketClick(id, ev.metaKey || ev.ctrlKey);
      }
    },
    [id, onMarketClick]
@@ -8,7 +8,7 @@ const commonProps = {

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

@@ -1,5 +1,5 @@
 import type { ChangeEvent } from 'react';
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 import type * as Schema from '@vegaprotocol/types';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import type { IDoesFilterPassParams, IFilterParams } from 'ag-grid-community';
@@ -17,9 +17,9 @@ import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { InputError } from '@vegaprotocol/ui-toolkit';

-const defaultFilterValue: Schema.DateRange = {};
+const defaultValue: Schema.DateRange = {};
 export interface DateRangeFilterProps extends IFilterParams {
-  defaultRangeFilter?: Schema.DateRange;
+  defaultValue?: Schema.DateRange;
  maxSubDays?: number;
  maxNextDays?: number;
  maxDaysRange?: number;
@@ -27,8 +27,9 @@ export interface DateRangeFilterProps extends IFilterParams {

 export const DateRangeFilter = forwardRef(
  (props: DateRangeFilterProps, ref) => {
-    const defaultDates = props?.defaultRangeFilter || defaultFilterValue;
+    const defaultDates = props?.defaultValue || defaultValue;
    const [value, setValue] = useState<Schema.DateRange>(defaultDates);
+    const valueRef = useRef<Schema.DateRange>(value);
    const [error, setError] = useState<string>('');
    const [minStartDate, maxStartDate, minEndDate, maxEndDate] = useMemo(() => {
      const minStartDate =
@@ -93,7 +94,7 @@ export const DateRangeFilter = forwardRef(
        },

        isFilterActive() {
-          return value.start || value.end;
+          return valueRef.current.start || valueRef.current.end;
        },

        getModel() {
@@ -101,13 +102,13 @@ export const DateRangeFilter = forwardRef(
            return null;
          }

-          return { value };
+          return { value: valueRef.current };
        },

        setModel(model?: { value: Schema.DateRange } | null) {
-          setValue(
-            model?.value || props?.defaultRangeFilter || defaultFilterValue
-          );
+          valueRef.current =
+            model?.value || props?.defaultValue || defaultValue;
+          setValue(valueRef.current);
        },
      };
    });
@@ -185,10 +186,8 @@ export const DateRangeFilter = forwardRef(
      update = { ...update, end: checkForEndDate(endDate, startDate) };

      if (validate(name, date, update)) {
-        setValue((curr) => ({
-          ...curr,
-          ...update,
-        }));
+        valueRef.current = { ...valueRef.current, ...update };
+        setValue(valueRef.current);
      }
    };
    useEffect(() => {
@@ -241,7 +240,8 @@ export const DateRangeFilter = forwardRef(
            className="ag-standard-button ag-filter-apply-panel-button"
            onClick={() => {
              setError('');
-              setValue(defaultDates);
+              valueRef.current = defaultDates;
+              setValue(valueRef.current);
            }}
          >
            {t('Reset')}
@@ -1,10 +1,17 @@
 import type { ChangeEvent } from 'react';
-import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import {
+  forwardRef,
+  useEffect,
+  useImperativeHandle,
+  useState,
+  useRef,
+} from 'react';
 import type { IDoesFilterPassParams, IFilterParams } from 'ag-grid-community';
 import { t } from '@vegaprotocol/i18n';

 export const SetFilter = forwardRef((props: IFilterParams, ref) => {
  const [value, setValue] = useState<string[]>([]);
+  const valueRef = useRef(value);

  // expose AG Grid Filter Lifecycle callbacks
  useImperativeHandle(ref, () => {
@@ -28,29 +35,28 @@ export const SetFilter = forwardRef((props: IFilterParams, ref) => {
      },

      isFilterActive() {
-        return value.length !== 0;
+        return valueRef.current.length !== 0;
      },

      getModel() {
        if (!this.isFilterActive()) {
          return null;
        }
-
-        return { value };
+        return { value: valueRef.current };
      },

      setModel(model?: { value: string[] } | null) {
-        setValue(!model ? [] : model.value);
+        valueRef.current = !model ? [] : model.value;
+        setValue(valueRef.current);
      },
    };
  });

  const onChange = (event: ChangeEvent<HTMLInputElement>) => {
-    setValue(
-      event.target.checked
-        ? [...value, event.target.value]
-        : value.filter((v) => v !== event.target.value)
-    );
+    valueRef.current = event.target.checked
+      ? [...value, event.target.value]
+      : value.filter((v) => v !== event.target.value);
+    setValue(valueRef.current);
  };

  useEffect(() => {
@@ -77,7 +83,7 @@ export const SetFilter = forwardRef((props: IFilterParams, ref) => {
        <button
          type="button"
          className="ag-standard-button ag-filter-apply-panel-button"
-          onClick={() => setValue([])}
+          onClick={() => setValue((valueRef.current = []))}
        >
          {t('Reset')}
        </button>
@@ -1,11 +1,12 @@
 {
+  "name": "deal-ticket",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/deal-ticket/src",
  "projectType": "library",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/deal-ticket",
@@ -78,7 +78,9 @@ export const compileGridData = (
      label: (
        <Link
          to={`/liquidity/${market.id}`}
-          onClick={(ev) => onSelect && onSelect(market.id, ev.metaKey)}
+          onClick={(ev) =>
+            onSelect && onSelect(market.id, ev.metaKey || ev.ctrlKey)
+          }
        >
          <UILink>{t('Current liquidity')}</UILink>
        </Link>
@@ -1,6 +1,2 @@
 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';
@@ -1,144 +0,0 @@
-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();
-    });
-  });
-});
@@ -1,63 +0,0 @@
-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,7 +18,6 @@ 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';
@@ -49,12 +48,6 @@ 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)
@@ -74,16 +67,8 @@ export const useFeeDealTicketDetails = (
      notionalSize,
      accountBalance,
      estimateOrder: estMargin?.estimateOrder,
-      estCloseOut,
    };
-  }, [
-    market,
-    assetSymbol,
-    notionalSize,
-    accountBalance,
-    estMargin,
-    estCloseOut,
-  ]);
+  }, [market, assetSymbol, notionalSize, accountBalance, estMargin]);
 };

 export interface FeeDetails {
@@ -92,7 +77,6 @@ export interface FeeDetails {
  market: Market;
  assetSymbol: string;
  notionalSize: string | null;
-  estCloseOut: string | null;
  estimateOrder: EstimateOrderQuery['estimateOrder'] | undefined;
  estimatedInitialMargin: string;
  estimatedTotalInitialMargin: string;
@@ -15,8 +15,8 @@ export const useInitialMargin = (
  marketId: OrderSubmissionBody['orderSubmission']['marketId'],
  order?: OrderSubmissionBody['orderSubmission']
 ) => {
-  const { pubKey: partyId } = useVegaWallet();
-  const commonVariables = { marketId, partyId: partyId || '' };
+  const { pubKey } = useVegaWallet();
+  const commonVariables = { marketId, partyId: pubKey || '' };
  const { data: marketData } = useDataProvider({
    dataProvider: marketDataProvider,
    variables: { marketId },
@@ -24,7 +24,7 @@ export const useInitialMargin = (
  const { data: activeVolumeAndMargin } = useDataProvider({
    dataProvider: volumeAndMarginProvider,
    variables: commonVariables,
-    skip: !partyId,
+    skip: !pubKey,
  });
  const { data: marketInfo } = useDataProvider({
    dataProvider: marketInfoProvider,
@@ -1,53 +0,0 @@
-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();
-  });
-});
@@ -1,34 +0,0 @@
-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]);
-};
@@ -1,120 +0,0 @@
-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);
-  });
-});
@@ -1,46 +0,0 @@
-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();
-};
@@ -1,117 +0,0 @@
-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');
-  });
-});
@@ -1,61 +0,0 @@
-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;
-};
@@ -1,11 +1,12 @@
 {
+  "name": "deposits",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "libs/deposits/src",
  "projectType": "library",
  "tags": [],
  "targets": {
    "build": {
-      "executor": "@nrwl/web:rollup",
+      "executor": "@nrwl/rollup:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
        "outputPath": "dist/libs/deposits",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Artur Siaznik	25e42582da	chore: nx upgrade for trading-e2e	2023-04-18 14:00:08 +02:00
Bartłomiej Głownia	721009bec8	chore: upgrade nx, remove custom executors, amend trading app .env files	2023-04-18 13:03:24 +02:00
Bartłomiej Głownia	31859cb779	chore(trading): maintain always up to date active orders list (#3430 )	2023-04-18 12:49:42 +02:00
dexturr	20507ecdd1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-18 06:08:58 +00:00
dexturr	13ba661ea0	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-18 00:16:31 +00:00
dexturr	03f5b9fc7b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-17 18:07:00 +00:00
dexturr	b9fed65615	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-17 12:10:37 +00:00
Mikołaj Młodzikowski	d671e51edf	fix(ci): adjust timeouts	2023-04-17 12:45:30 +02:00
Mikołaj Młodzikowski	4f3295d3fc	feat(ci): rebuild yarn on failed build	2023-04-17 11:24:53 +02:00
dexturr	7be7bab1ca	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-17 06:09:49 +00:00
dexturr	61380f06b9	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-17 00:14:49 +00:00
dexturr	c113856d63	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-16 18:07:16 +00:00
dexturr	90884beee8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-16 12:07:18 +00:00
dexturr	d9d2e428f4	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-16 06:09:55 +00:00
dexturr	ba8d54b761	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-16 00:15:24 +00:00
dexturr	dce4edb943	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-15 18:06:56 +00:00
dexturr	b468a0fd84	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-15 12:07:02 +00:00
dexturr	c98fbe7453	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-15 06:06:58 +00:00
dexturr	d20928ec06	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-15 00:15:18 +00:00
dexturr	289559fe4f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-14 18:09:58 +00:00
Mikołaj Młodzikowski	071fd6128c	feat: fix releasing dist	2023-04-14 15:45:14 +02:00
Mikołaj Młodzikowski	554d07a31b	feat(ci): fix regressions detected after merging to develop (#3442 )	2023-04-14 15:00:20 +02:00
dexturr	48b62380b0	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-14 12:10:09 +00:00
Mikołaj Młodzikowski	a9f4604bad	feat(governance,trading,explorer): pipelines improvements (#3422 )	2023-04-14 11:47:41 +02:00
Sam Keen	54f2519a62	feat(governance): toggles design review tweaks (#3431 )	2023-04-14 09:22:22 +01:00
dexturr	260e7bf9cf	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-14 06:09:41 +00:00
dexturr	83db796cdb	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-14 00:14:08 +00:00
m.ray	2f6800212e	fix(trading): fix order toast intent on amendments (#3433 )	2023-04-13 13:20:28 -07:00
dexturr	77e16ad1b7	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-13 18:09:10 +00:00
dexturr	dcce983842	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-13 12:10:33 +00:00
Maciek	53ce9bfaa2	chore(assets): make query for asset list lighter (#3425 )	2023-04-13 11:42:09 +00:00
Edd	6ae34d296f	fix(explorer): tweak footer to show more detail on smaller screens (#3418 )	2023-04-13 10:49:42 +01:00
Joe Tsang	ee2aafb99c	fix(governance): failing nightly tests (#3351 )	2023-04-13 10:46:01 +01:00
dexturr	e8fdb63323	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-13 06:09:41 +00:00
dexturr	3df9270b57	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-13 00:13:51 +00:00
dexturr	ab26667265	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-12 18:08:22 +00:00
m.ray	9fc6b255c8	fix(orders): update order toast intent and title (#3424 )	2023-04-12 15:19:15 +00:00
dexturr	91f61d8bb5	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-12 12:09:32 +00:00
Bartłomiej Głowniaandm.ray	bbfda65bcc	feat(withdraws): improve ux surrounding withdraw balances thresholds and delays (#3402 ) Co-authored-by: m.ray <16125548+MadalinaRaicu@users.noreply.github.com>	2023-04-12 11:21:24 +02:00
Mikołaj Młodzikowski	45f2e926c3	feat(governance,trading,explorer): split steps by logic (#3387 )	2023-04-12 09:38:26 +02:00
dexturr	ccadbc2cb6	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-12 06:08:40 +00:00
dexturr	7128acb7b8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-12 00:14:18 +00:00
dexturr	357bdaa4f3	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-11 18:07:51 +00:00
Maciek	f3fe43724e	fix(deposits): deposit dialog doesn't respect given assetId (#3414 )	2023-04-11 16:41:20 +02:00
m.ray	03f5ca3096	fix(trading): fix formatting on clicking on orderbook cell after decimal resolution update (#3409 )	2023-04-11 12:23:43 +00:00
dexturr	03d19349af	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-11 12:08:24 +00:00
daro-maj	1f53b2cbb5	test(trading): increase coverage for the remaining ACs (#3412 )	2023-04-11 11:59:21 +02:00
Maciek	b010c98346	fix(trading): welcome dialog with markets list click on market close window (#3404 )	2023-04-11 11:34:44 +02:00
Matthew Russell	29d57af2ba	fix(trading): make light theme sell volume bar match candle color (#3405 )	2023-04-11 09:06:35 +02:00
Bartłomiej Głownia	fd7940c4cf	chore(deal-ticket): remove not used code (#3406 )	2023-04-11 08:13:41 +02:00
dexturr	8ab7ac8414	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-11 06:07:03 +00:00
dexturr	ce7cd03c3e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-11 00:15:30 +00:00
Matthew Russell	dfa3355a68	chore(trading): prevent node poll if query fails (#3411 )	2023-04-10 14:48:03 -07:00
dexturr	8553904d81	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-10 18:07:16 +00:00
dexturr	10afa3c1d4	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-10 12:10:31 +00:00
Maciek	ecd362615e	chore(deposits): impove UX on deposit dialog (#3401 )	2023-04-10 12:59:02 +01:00