chore: delete references to sandbox or mirror

chore: delete rest of sandbox/mirror env files
chore: update tranches
2023-04-03 11:59:16 -07:00 · 2023-04-03 11:56:27 -07:00 · 2023-04-03 18:09:46 +00:00 · 2023-04-03 14:33:10 +00:00 · 2023-04-03 15:53:50 +02:00 · 2023-04-03 15:17:23 +02:00
83 changed files with 1570 additions and 1049 deletions
@@ -1,15 +1,14 @@
 ---
 name: Release
-about:
-  A template to outline the steps needed to for a successful release of our frontend apps
+about: A template to outline the steps needed to for a successful release of our frontend apps
 title: 'Release [add dapp version]-core-[add core version]'
-labels: 
+labels:
 assignees: ''
 ---

 ### Tasks

- [ ] Review [link to core release](xxx) 
+- [ ] Review [link to core release](xxx)
 - [ ] Tag frontend-monorepo
 - [ ] Create release and generate release notes
 - [ ] Run `@smoke` tests
@@ -13,7 +13,7 @@ env:

 jobs:
  add_issue:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: 'Add issue to project board'
        run: |
@@ -0,0 +1,110 @@
+name: CI/CD
+
+on:
+  push:
+    branches:
+      - release/*
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+jobs:
+  lint-test-build:
+    runs-on: ubuntu-22.04
+    name: '(CI) lint + unit test + build'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - 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: Install root dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v3
+        with:
+          main-branch-name: develop
+
+      - name: Check formatting
+        run: yarn nx format:check
+
+      - name: Lint affected
+        run: yarn nx affected:lint --max-warnings=0
+
+      - name: Build affected spec
+        run: yarn nx affected --target=build-spec
+
+      - name: Test affected
+        run: yarn nx affected:test
+
+      - name: Build affected
+        run: yarn nx affected:build
+
+      # See affected apps
+      - name: See affected apps
+        run: |
+          echo ">>>> debug"
+          echo "NX Version: $nx_version"
+          echo "NX_BASE: ${{ env.NX_BASE }}"
+          echo "NX_HEAD: ${{ env.NX_HEAD }}"
+          echo ">>>> eof debug"
+
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+          echo -n "Affected projects: $affected"
+
+          projects_e2e=""
+          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
+          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
+          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
+          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
+          projects_e2e=${projects_e2e%?}
+          projects_e2e=[${projects_e2e// /,}]
+          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
+          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
+
+    outputs:
+      projects: ${{ env.PROJECTS }}
+      projects-e2e: ${{ env.PROJECTS_E2E }}
+
+  cypress:
+    needs: lint-test-build
+    name: '(CI) cypress'
+    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    uses: ./.github/workflows/cypress-run.yml
+    secrets: inherit
+    with:
+      projects: ${{ needs.lint-test-build.outputs.projects-e2e }}
+      tags: '@smoke @regression'
+
+  publish-dist:
+    needs: lint-test-build
+    name: '(CD) publish dist'
+    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    uses: ./.github/workflows/publish-dist.yml
+    secrets: inherit
+    with:
+      projects: ${{ needs.lint-test-build.outputs.projects }}
+
+  # Report single result at the end, to avoid mess with required checks in PR
+  cypress-result:
+    if: ${{ always() }}
+    needs: cypress
+    runs-on: ubuntu-22.04
+    steps:
+      - run: |
+          result="${{ needs.cypress.result }}"
+          if [[ $result == "success" || $result == "skipped" ]]; then
+            exit 0
+          else
+            exit 1
+          fi
@@ -13,7 +13,7 @@ on:
 jobs:
  cypress-run:
    name: Run Cypress Trading tests -- live environment
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@@ -1,4 +1,4 @@
-name: Cypress Run
+name: (CI) Cypress Run
 on:
  workflow_call:
    inputs:
@@ -8,22 +8,25 @@ on:
 jobs:
  master:
    name: Generate Queries
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup node
+        uses: actions/setup-node@v3
        with:
-          fetch-depth: 0
-      - name: Use Node.js 16
-        id: Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16.15.1
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn
+
      - name: Install root dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
+
      - name: Generate queries
        run: node ./scripts/get-queries.js
+
      - uses: actions/upload-artifact@v2
        with:
          name: queries
@@ -3,21 +3,28 @@ name: Verify PR title

 on:
  pull_request:
-    types: [opened, ready_for_review, reopened, edited, synchronize]
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - edited
+      - synchronize
 jobs:
  lint_pr:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup node
+        uses: actions/setup-node@v3
        with:
-          fetch-depth: 0
-      - name: Use Node.js 16
-        id: Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16.15.1
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn
+
      - name: Install root dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
+
      - name: Check PR title
        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -1,121 +0,0 @@
-name: PR Validations
-
-on:
-  push:
-    branches:
-      - develop
-      - main
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-jobs:
-  pr:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout frontend mono repo
-        uses: actions/checkout@v3
-        with:
-          # We need to fetch all branches and commits so that Nx affected has a base to compare against.
-          fetch-depth: 0
-
-      - name: Check node version
-        id: node-version
-        run: |
-          npmVersion=$(cat .nvmrc | head -n 1)
-          echo ::set-output name=npmVersion::${npmVersion}
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ steps.node-version.outputs.npmVersion }}
-
-      # Check SHAs
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: develop
-
-      # See affected apps
-      - name: See affected apps
-        run: |
-          nx_version=$(cat package.json | grep '"nx"' | cut -d ':' -f 2 | tr -d '",[:space:]')
-          rm package.json yarn.lock
-          yarn add nx@$nx_version
-
-          echo ">>>> debug"
-          echo "NX Version: $nx_version"
-          echo "NX_BASE: ${{ env.NX_BASE }}"
-          echo "NX_HEAD: ${{ env.NX_HEAD }}"
-
-          # echo "Main branch name: ${{ github.base_ref || github.ref_name }}"
-          # echo "git rev-parse HEAD: $(git rev-parse HEAD)"
-          # echo "Head: ${{ github.head_ref }}"
-
-          # echo "command to execute: 'yarn nx print-affected --base=${{ github.base_ref || github.ref_name }} --head=${{ github.head_ref }} --select=projects'"
-
-          # merge_base=$(git merge-base origin/develop HEAD)
-          # echo "git merge-base origin/develop HEAD: $merge_base"
-
-          # head_sha="${{ github.event.pull_request.head.sha || github.sha }}"
-          # echo "Head SHA: $head_sha"
-
-          # echo "command to execute (without nx-set-sha): 'yarn nx print-affected --base=$merge_base --head=$head_sha --select=projects'"
-          echo ">>>> eof debug"
-
-          # affected_1=$(yarn nx print-affected --base=$merge_base --head=$head_sha --select=projects || true)
-          # echo -n "Affected projects (allowed to fail): $affected_1"
-
-          # affected=$(yarn nx print-affected --base=${{ github.base_ref || github.ref_name }} --head=${{ github.head_ref }} --select=projects)
-          # echo -n "Affected projects: $affected"
-
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=HEAD --select=projects)"
-          echo -n "Affected projects: $affected"
-
-          projects_e2e=""
-          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
-          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
-          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
-          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
-          projects_e2e=${projects_e2e%?}
-          projects_e2e=[${projects_e2e// /,}]
-          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
-          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
-
-    outputs:
-      projects: ${{ env.PROJECTS }}
-      projects-e2e: ${{ env.PROJECTS_E2E }}
-
-  run-cypress:
-    needs: pr
-    if: ${{ needs.pr.outputs.projects != '[]' }}
-    uses: ./.github/workflows/cypress-run.yml
-    secrets: inherit
-    with:
-      projects: ${{ needs.pr.outputs.projects-e2e }}
-      tags: '@smoke @regression'
-
-  run-docker-build:
-    needs: pr
-    if: ${{ needs.pr.outputs.projects != '[]' }}
-    uses: ./.github/workflows/publish-docker-containers.yml
-    secrets: inherit
-    with:
-      projects: ${{ needs.pr.outputs.projects }}
-
-  # Report single result at the end, to avoid mess with required checks in PR
-  result:
-    if: ${{ always() }}
-    needs: run-cypress
-    runs-on: ubuntu-latest
-    name: Cypress result
-    steps:
-      - run: |
-          result="${{ needs.run-cypress.result }}"
-          if [[ $result == "success" || $result == "skipped" ]]; then
-            exit 0
-          else
-            exit 1
-          fi
@@ -7,7 +7,7 @@ on:
 jobs:
  master:
    name: Generate Queries
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
      - name: Checkout
@@ -1,4 +1,4 @@
-name: Docker build
+name: (CD) Publish docker + s3

 on:
  workflow_call:
@@ -8,13 +8,13 @@ on:
        type: string

 jobs:
-  master:
+  publish-dist:
    strategy:
      fail-fast: false
      matrix:
        app: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.app }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Check out code
        uses: actions/checkout@v3
@@ -29,41 +29,6 @@ jobs:
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2

-      # https://docs.github.com/en/actions/learn-github-actions/contexts
-      # https://github.com/actions/checkout#Checkout-pull-request-HEAD-commit-instead-of-merge-commit
-      - name: Determine Docker Image tag
-        id: tags
-        run: |
-          npmVersion=$(cat .nvmrc | head -n 1)
-          versionTag=${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || github.event.pull_request.head.sha }}
-          echo ::set-output name=npmVersion::${npmVersion}
-          echo ::set-output name=version::${versionTag}
-
-      - name: Print config
-        run: |
-          git rev-parse --verify HEAD
-          git status
-          echo "steps.tags.outputs.version=${{ steps.tags.outputs.version }}"
-
-      - name: Build and export to local Docker
-        uses: docker/build-push-action@v3
-        with:
-          load: true
-          build-args: |
-            APP=${{ matrix.app }}
-            NODE_VERSION=${{ steps.tags.outputs.npmVersion }}
-          tags: |
-            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
-
-      - name: Sanity check docker image
-        run: |
-          echo "Check .env file"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat .env
-          echo "Check ipfs-hash"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat ipfs-hash
-          echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local ls -lah
-
      - name: Log in to the Container registry
        uses: docker/login-action@v2
        with:
@@ -71,17 +36,66 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Build and push
+      # 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}
+
+          if [[ "${{ github.event_name }}" = "push" ]]; then
+            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+            bucketName="${{ github.event.repository.name }}-$envName"
+            echo ::set-output name=bucketName::${bucketName}
+            echo ::set-output name=envName::${envName}
+          fi
+
+      - name: Build and export to local Docker
        id: docker_build
        uses: docker/build-push-action@v3
+        with:
+          load: true
+          build-args: |
+            APP=${{ matrix.app }}
+            NODE_VERSION=${{ steps.tags.outputs.nodeVersion }}
+            ENV_NAME=${{ steps.tags.outputs.envName || '' }}
+          tags: |
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
+
+      - name: Sanity check docker image
+        run: |
+          echo "Check ipfs-hash"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat ipfs-hash
+
+          echo "List html directory"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local ls -lah
+
+          echo "Copy dist to local filesystem"
+          docker create --name=dist ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
+          docker cp dist:/usr/share/nginx/html dist
+
+          echo "Check local dist"
+          ls -al dist
+
+      - name: Publish dist as docker image
+        uses: docker/build-push-action@v3
+        if: ${{ github.event_name == 'pull_request' }}
        with:
          push: true
          build-args: |
            APP=${{ matrix.app }}
-            NODE_VERSION=${{ steps.tags.outputs.npmVersion }}
+            NODE_VERSION=${{ steps.tags.outputs.nodeVersion }}
          tags: |
-            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:latest
-            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ steps.tags.outputs.version }}
+            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'

      - name: Add preview label
        uses: actions-ecosystem/action-add-labels@v1
@@ -19,29 +19,27 @@ on:
 jobs:
  publish:
    name: Build & Publish - Tag
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    permissions:
      contents: 'read'
      actions: 'read'
    steps:
      - name: Checkout
        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: User Node.js 16
-        id: Node
+
+      - name: Setup node
        uses: actions/setup-node@v3
        with:
-          node-version: 16.15.1
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: node_modules-${{ hashFiles('**/yarn.lock') }}
+          node-version-file: '.nvmrc'
+          # 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: Build project
        run: yarn nx build ${{inputs.project}}
+
      - name: Publish project to @vegaprotocol
        uses: JS-DevTools/npm-publish@v1
        with:
@@ -1,46 +0,0 @@
-name: Unit tests & build
-
-on:
-  push:
-    branches:
-      - develop
-      - main
-  pull_request:
-jobs:
-  pr:
-    name: Test and lint - PR
-    runs-on: ubuntu-latest
-    permissions:
-      contents: 'read'
-      actions: 'read'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          main-branch-name: ${{ github.base_ref }}
-      - name: Use Node.js 16
-        id: Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.15.1
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: node_modules-${{ hashFiles('**/yarn.lock') }}
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-      - name: Check formatting
-        run: yarn nx format:check
-      - name: Lint affected
-        run: yarn nx affected:lint --max-warnings=0
-      - name: Test affected
-        run: yarn nx affected:test
-      - name: Build affected
-        run: yarn nx affected:build
-      - name: Build affected spec
-        run: yarn nx affected --target=build-spec
@@ -4,6 +4,7 @@ FROM --platform=amd64 node:${NODE_VERSION}-alpine3.16 as build
 WORKDIR /app
 # Argument to allow building of different apps
 ARG APP
+ARG ENV_NAME=""
 RUN apk add --update --no-cache \
  python3 \
  make \
@@ -18,16 +19,10 @@ RUN sh ./docker-build.sh
 # if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
 # this is to ensure that we run always same version of alpine to make sure ipfs is indempotent
 FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
-ARG APP
 # configuration of system
-RUN apk add --no-cache bash go-ipfs
 EXPOSE 80
-COPY entrypoint.sh /entrypoint.sh
-CMD ["/entrypoint.sh"]
-
 # 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
-COPY ./apps/${APP}/.env .env
-RUN ipfs init && echo "$(ipfs add -rQ .)" > ipfs-hash
+RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > ipfs-hash; apk del go-ipfs
@@ -1,7 +1,7 @@
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_NETWORKS='{"SANDBOX":"https://sandbox.explorer.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
@@ -1,20 +0,0 @@
-# App configuration variables
-NX_TENDERMINT_URL=https://tm.be.mainnet-mirror.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
-NX_VEGA_ENV=MIRROR
-NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://mainnet-mirror.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
-
-# App flags
-NX_EXPLORER_ASSETS=1
-NX_EXPLORER_GENESIS=1
-NX_EXPLORER_GOVERNANCE=1
-NX_EXPLORER_NETWORK_PARAMETERS=1
-NX_EXPLORER_PARTIES=1
-NX_EXPLORER_VALIDATORS=1
-NX_EXPLORER_MARKETS=0
-NX_EXPLORER_ORACLES=0
-NX_EXPLORER_TXS_LIST=1
@@ -1,12 +0,0 @@
-# App configuration variables
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
-NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_TENDERMINT_URL=https://tm.sandbox.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.sandbox.vega.xyz/websocket
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://sandbox.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -13,6 +13,8 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -6,159 +6,203 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    cy.get('nav', { timeout: 10000 }).should('be.visible');
  });

-  describe('with wallets disconnected', function () {
-    describe('Links and buttons', function () {
-      it('should have link for proposal page', function () {
-        cy.getByTestId('home-proposals').within(() => {
-          cy.get('[href="/proposals"]')
-            .should('exist')
-            .and('have.text', 'Browse, vote, and propose');
-        });
-      });
-      it('should show open or enacted proposals with proposal summary', function () {
-        cy.get('body').then(($body) => {
-          if (!$body.find('[data-testid="proposals-list-item"]').length) {
-            cy.createMarket();
-            cy.reload();
-            waitForSpinner();
-          }
-        });
-        cy.getByTestId('proposals-list-item')
-          .should('have.length.at.least', 1)
-          .first()
-          .within(() => {
-            cy.getByTestId('proposal-title')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-type')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-description')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-details')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-status')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('vote-details')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('view-proposal-btn').should('be.visible');
-          });
-      });
-      it('should have external link for governance', function () {
-        cy.getByTestId('home-proposals').within(() => {
-          cy.getByTestId('external-link')
-            .should('have.attr', 'href')
-            .and('contain', 'https://vega.xyz/governance');
-        });
-      });
-      it('should have link for validator page', function () {
-        cy.getByTestId('home-validators').within(() => {
-          cy.get('[href="/validators"]')
-            .first()
-            .should('exist')
-            .and('have.text', 'Browse, and stake');
-        });
-      });
-      it('should have external link for validators', function () {
-        cy.getByTestId('home-validators').within(() => {
-          cy.getByTestId('external-link')
-            .should('have.attr', 'href')
-            .and(
-              'contain',
-              'https://community.vega.xyz/c/mainnet-validator-candidates'
-            );
-        });
-      });
-      it('should have information on active nodes', function () {
-        cy.getByTestId('node-information')
-          .first()
-          .should('contain.text', '2')
-          .and('contain.text', 'active nodes');
-      });
-      it('should have information on consensus nodes', function () {
-        cy.getByTestId('node-information')
-          .last()
-          .should('contain.text', '2')
-          .and('contain.text', 'consensus nodes');
-      });
-      it('should contain link to specific validators', function () {
-        cy.getByTestId('validators')
-          .should('have.length', '2')
-          .each(($validator) => {
-            cy.wrap($validator).find('a').should('have.attr', 'href');
-          });
-      });
-      it('should have link for rewards page', function () {
-        cy.getByTestId('home-rewards').within(() => {
-          cy.get('[href="/rewards"]')
-            .first()
-            .should('exist')
-            .and('have.text', 'See rewards');
-        });
-      });
-      it('should have link for withdrawal page', function () {
-        cy.getByTestId('home-vega-token').within(() => {
-          cy.get('[href="/token/withdraw"]')
-            .first()
-            .should('exist')
-            .and('have.text', 'Manage tokens');
-        });
+  describe('Links and buttons', function () {
+    it('should have link for proposal page', function () {
+      cy.getByTestId('home-proposals').within(() => {
+        cy.get('[href="/proposals"]')
+          .should('exist')
+          .and('have.text', 'Browse, vote, and propose');
      });
    });

-    describe('Mobile view - navigation bar', function () {
-      before('Change to mobile resolution', function () {
-        cy.viewport('iphone-xr');
-      });
-
-      it('should have burger button', () => {
-        cy.getByTestId('button-menu-drawer').should('be.visible').click();
-        cy.getByTestId('menu-drawer').should('be.visible');
-      });
-
-      it('should have link for proposal page', function () {
-        cy.getByTestId('menu-drawer').within(() => {
-          cy.get('[href="/proposals"]')
-            .should('exist')
-            .and('have.text', 'Proposals');
+    it('should display announcement banner', function () {
+      cy.getByTestId('app-announcement')
+        .should('be.visible')
+        .within(() => {
+          cy.getByTestId('external-link').should('exist');
        });
+      cy.getByTestId('app-announcement-close').should('be.visible').click();
+      cy.getByTestId('app-announcement').should('not.exist');
+    });
+
+    it('should show open or enacted proposals with proposal summary', function () {
+      cy.get('body').then(($body) => {
+        if (!$body.find('[data-testid="proposals-list-item"]').length) {
+          cy.createMarket();
+          cy.reload();
+          waitForSpinner();
+        }
      });
-      it('should have link for validator page', function () {
-        cy.getByTestId('menu-drawer').within(() => {
-          cy.get('[href="/validators"]')
+      cy.getByTestId('proposals-list-item')
+        .should('have.length.at.least', 1)
+        .first()
+        .within(() => {
+          cy.getByTestId('proposal-title')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('proposal-type').invoke('text').should('not.be.empty');
+          cy.getByTestId('proposal-description')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('proposal-details')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('proposal-status')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('vote-details').invoke('text').should('not.be.empty');
+          cy.getByTestId('view-proposal-btn').should('be.visible');
+        });
+    });
+
+    it('should have external link for governance', function () {
+      cy.getByTestId('home-proposals').within(() => {
+        cy.getByTestId('external-link')
+          .should('have.attr', 'href')
+          .and('contain', 'https://vega.xyz/governance');
+      });
+    });
+
+    it('should have link for validator page', function () {
+      cy.getByTestId('home-validators').within(() => {
+        cy.get('[href="/validators"]')
+          .first()
+          .should('exist')
+          .and('have.text', 'Browse, and stake');
+      });
+    });
+
+    it('should have external link for validators', function () {
+      cy.getByTestId('home-validators').within(() => {
+        cy.getByTestId('external-link')
+          .should('have.attr', 'href')
+          .and(
+            'contain',
+            'https://community.vega.xyz/c/mainnet-validator-candidates'
+          );
+      });
+    });
+
+    it('should have information on active nodes', function () {
+      cy.getByTestId('node-information')
+        .first()
+        .should('contain.text', '2')
+        .and('contain.text', 'active nodes');
+    });
+
+    it('should have information on consensus nodes', function () {
+      cy.getByTestId('node-information')
+        .last()
+        .should('contain.text', '2')
+        .and('contain.text', 'consensus nodes');
+    });
+
+    it('should contain link to specific validators', function () {
+      cy.getByTestId('validators')
+        .should('have.length', '2')
+        .each(($validator) => {
+          cy.wrap($validator).find('a').should('have.attr', 'href');
+        });
+    });
+
+    it('should have link for rewards page', function () {
+      cy.getByTestId('home-rewards').within(() => {
+        cy.get('[href="/rewards"]')
+          .first()
+          .should('exist')
+          .and('have.text', 'See rewards');
+      });
+    });
+
+    it('should have link for withdrawal page', function () {
+      cy.getByTestId('home-vega-token').within(() => {
+        cy.get('[href="/token/withdraw"]')
+          .first()
+          .should('exist')
+          .and('have.text', 'Manage tokens');
+      });
+    });
+
+    it('should display network data', function () {
+      cy.getByTestId('git-network-data')
+        .should('contain.text', 'Reading network data from')
+        .within(() => {
+          cy.get('span')
            .first()
-            .should('exist')
-            .and('have.text', 'Validators');
+            .should('have.text', 'http://localhost:3028/query');
+          cy.getByTestId('link').should('exist');
        });
-      });
+    });

-      it('should have link for rewards page', function () {
-        cy.getByTestId('menu-drawer').within(() => {
-          cy.get('[href="/rewards"]')
-            .first()
-            .should('exist')
-            .and('have.text', 'Rewards');
+    it('should display eth data', function () {
+      cy.getByTestId('git-eth-data')
+        .should('contain.text', 'Reading Ethereum data from')
+        .within(() => {
+          cy.get('span').should('have.text', 'http://localhost:8545');
        });
-      });
-      it('should have link for withdrawal page', function () {
-        cy.getByTestId('menu-drawer').within(() => {
-          cy.get('[href="/token/withdraw"]')
-            .first()
-            .should('exist')
-            .and('have.text', 'Withdraw');
-        });
-      });
+    });

-      after(function () {
-        cy.viewport(
-          Cypress.config('viewportWidth'),
-          Cypress.config('viewportHeight')
-        );
+    it('should contain link for known issues on Github', function () {
+      cy.getByTestId('git-info').within(() => {
+        cy.contains('Known issues and feedback on')
+          .find('[data-testid="link"]')
+          .should(
+            'have.attr',
+            'href',
+            'https://github.com/vegaprotocol/feedback/discussions'
+          );
      });
    });
  });
+
+  describe('Mobile view - navigation bar', function () {
+    before('Change to mobile resolution', function () {
+      cy.viewport('iphone-xr');
+    });
+
+    it('should have burger button', () => {
+      cy.getByTestId('button-menu-drawer').should('be.visible').click();
+      cy.getByTestId('menu-drawer').should('be.visible');
+    });
+
+    it('should have link for proposal page', function () {
+      cy.getByTestId('menu-drawer').within(() => {
+        cy.get('[href="/proposals"]')
+          .should('exist')
+          .and('have.text', 'Proposals');
+      });
+    });
+    it('should have link for validator page', function () {
+      cy.getByTestId('menu-drawer').within(() => {
+        cy.get('[href="/validators"]')
+          .first()
+          .should('exist')
+          .and('have.text', 'Validators');
+      });
+    });
+
+    it('should have link for rewards page', function () {
+      cy.getByTestId('menu-drawer').within(() => {
+        cy.get('[href="/rewards"]')
+          .first()
+          .should('exist')
+          .and('have.text', 'Rewards');
+      });
+    });
+    it('should have link for withdrawal page', function () {
+      cy.getByTestId('menu-drawer').within(() => {
+        cy.get('[href="/token/withdraw"]')
+          .first()
+          .should('exist')
+          .and('have.text', 'Withdraw');
+      });
+    });
+
+    after(function () {
+      cy.viewport(
+        Cypress.config('viewportWidth'),
+        Cypress.config('viewportHeight')
+      );
+    });
+  });
 });
@@ -5,6 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_CONFIG_URL=''

 NX_VEGA_URL=http://localhost:3028/query
@@ -16,7 +17,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -1,12 +0,0 @@
-# App configuration variables
-NX_VEGA_ENV=MIRROR
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
-NX_VEGA_URL=https://api.n00.mainnet-mirror.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-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_VEGA_EXPLORER_URL=https://mirror.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_DELEGATIONS_PAGINATION=50
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -1,9 +0,0 @@
-# App configuration variables
-NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
-NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -36,18 +36,10 @@ export const ContractAddresses: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
-  SANDBOX: {
-    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
-    lockedAddress: '0x0', // TODO not deployed to this env
-  },
  TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
-  MIRROR: {
-    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
-    lockedAddress: '0x0', // TODO not deployed to this env
-  },
  VALIDATOR_TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
@@ -1,5 +0,0 @@
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
-NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_NETWORKS={\"DEVNET\":\"https://dev.token.vega.xyz\",\"STAGNET3\":\"https://stagnet3.token.vega.xyz\",\"STAGNET1\":\"https://stagnet1.token.vega.xyz\",\"TESTNET\":\"https://token.fairground.wtf\",\"MAINNET\":\"https://token.vega.xyz\"}
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
@@ -3,12 +3,134 @@
    "tranche_id": 56,
    "tranche_start": "2023-04-20T00:00:00.000Z",
    "tranche_end": "2023-05-20T00:00:00.000Z",
-    "total_added": "0",
+    "total_added": "10724.25",
    "total_removed": "0",
-    "locked_amount": "0",
-    "deposits": [],
+    "locked_amount": "10724.25",
+    "deposits": [
+      {
+        "amount": "50",
+        "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
+        "tx": "0xc38d2e52912f15452c76b863dbfad88927b49435c284eaf6997be4cf13782fc0"
+      },
+      {
+        "amount": "6001.25",
+        "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C",
+        "tx": "0xde2c8eedaba7ef1c953a7ca5439a8d7900ff01d92bd49d9dff1c9cdeaaa38d6f"
+      },
+      {
+        "amount": "2378.75",
+        "user": "0xd5EAB7ecE436D997139dbCd2c38bCE932B65a8ea",
+        "tx": "0x79d5279a108f5621488b5fba2e0b4c1508fff80bd3cf7bd36f8d79f5a87f9fea"
+      },
+      {
+        "amount": "1121.25",
+        "user": "0xf96afaB11e5617560b9183766470B23F45c38C56",
+        "tx": "0xd75c7996c5a9484ad3432eab458341b21eb76e117d68fb2885170bfb7b017da1"
+      },
+      {
+        "amount": "1121.25",
+        "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
+        "tx": "0x6840e2b579765303fc31a04f43fcea1d5ccf157b46bbd1e3f3e7f6a2e6cea039"
+      },
+      {
+        "amount": "51.75",
+        "user": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
+        "tx": "0x3e9c304b5ca74d1238cc4ee2f1396812aac6e62eb8674e8be3e01c9ad3e5bcb0"
+      }
+    ],
    "withdrawals": [],
-    "users": []
+    "users": [
+      {
+        "address": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
+        "deposits": [
+          {
+            "amount": "50",
+            "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
+            "tranche_id": 56,
+            "tx": "0xc38d2e52912f15452c76b863dbfad88927b49435c284eaf6997be4cf13782fc0"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "50",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "50"
+      },
+      {
+        "address": "0x94097462EF7c43D0aC732E7B18f830096D95207C",
+        "deposits": [
+          {
+            "amount": "6001.25",
+            "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C",
+            "tranche_id": 56,
+            "tx": "0xde2c8eedaba7ef1c953a7ca5439a8d7900ff01d92bd49d9dff1c9cdeaaa38d6f"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "6001.25",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "6001.25"
+      },
+      {
+        "address": "0xd5EAB7ecE436D997139dbCd2c38bCE932B65a8ea",
+        "deposits": [
+          {
+            "amount": "2378.75",
+            "user": "0xd5EAB7ecE436D997139dbCd2c38bCE932B65a8ea",
+            "tranche_id": 56,
+            "tx": "0x79d5279a108f5621488b5fba2e0b4c1508fff80bd3cf7bd36f8d79f5a87f9fea"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "2378.75",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "2378.75"
+      },
+      {
+        "address": "0xf96afaB11e5617560b9183766470B23F45c38C56",
+        "deposits": [
+          {
+            "amount": "1121.25",
+            "user": "0xf96afaB11e5617560b9183766470B23F45c38C56",
+            "tranche_id": 56,
+            "tx": "0xd75c7996c5a9484ad3432eab458341b21eb76e117d68fb2885170bfb7b017da1"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "1121.25",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "1121.25"
+      },
+      {
+        "address": "0xf915Da10e5136352Ba049acB0545Deb119054256",
+        "deposits": [
+          {
+            "amount": "1121.25",
+            "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
+            "tranche_id": 56,
+            "tx": "0x6840e2b579765303fc31a04f43fcea1d5ccf157b46bbd1e3f3e7f6a2e6cea039"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "1121.25",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "1121.25"
+      },
+      {
+        "address": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
+        "deposits": [
+          {
+            "amount": "51.75",
+            "user": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
+            "tranche_id": 56,
+            "tx": "0x3e9c304b5ca74d1238cc4ee2f1396812aac6e62eb8674e8be3e01c9ad3e5bcb0"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "51.75",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "51.75"
+      }
+    ]
  },
  {
    "tranche_id": 55,
@@ -67,9 +189,9 @@
    "tranche_id": 54,
    "tranche_start": "2023-04-06T00:00:00.000Z",
    "tranche_end": "2023-05-06T00:00:00.000Z",
-    "total_added": "2970",
+    "total_added": "8565",
    "total_removed": "0",
-    "locked_amount": "2970",
+    "locked_amount": "8565",
    "deposits": [
      {
        "amount": "33",
@@ -86,6 +208,21 @@
        "user": "0xE9F41a0090fcc7eaf626037003AAD44B17098E7C",
        "tx": "0x09d3e968eb8dbd6851f47b36f7bb9e7d25a078c5c1b23ce5341a66ce19578e65"
      },
+      {
+        "amount": "678",
+        "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C",
+        "tx": "0x157b13e78d027a5b6cf35fdae80a8cec7797149f35c23eb43faa07d74a03d70d"
+      },
+      {
+        "amount": "2394",
+        "user": "0xd5EAB7ecE436D997139dbCd2c38bCE932B65a8ea",
+        "tx": "0xbe03bd7e16faa3586fe66ddaac2bcacba4604b175721eb10aee29b40248759ea"
+      },
+      {
+        "amount": "2523",
+        "user": "0xf96afaB11e5617560b9183766470B23F45c38C56",
+        "tx": "0x49ab3f37bda02347cb1966e8fa21885a463f09d0593a890e96b2e36dfb8dec49"
+      },
      {
        "amount": "111",
        "user": "0x268070d5EEd5b24E34a5F4C17B5482178b18089D",
@@ -214,6 +351,51 @@
        "withdrawn_tokens": "0",
        "remaining_tokens": "288"
      },
+      {
+        "address": "0x94097462EF7c43D0aC732E7B18f830096D95207C",
+        "deposits": [
+          {
+            "amount": "678",
+            "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C",
+            "tranche_id": 54,
+            "tx": "0x157b13e78d027a5b6cf35fdae80a8cec7797149f35c23eb43faa07d74a03d70d"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "678",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "678"
+      },
+      {
+        "address": "0xd5EAB7ecE436D997139dbCd2c38bCE932B65a8ea",
+        "deposits": [
+          {
+            "amount": "2394",
+            "user": "0xd5EAB7ecE436D997139dbCd2c38bCE932B65a8ea",
+            "tranche_id": 54,
+            "tx": "0xbe03bd7e16faa3586fe66ddaac2bcacba4604b175721eb10aee29b40248759ea"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "2394",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "2394"
+      },
+      {
+        "address": "0xf96afaB11e5617560b9183766470B23F45c38C56",
+        "deposits": [
+          {
+            "amount": "2523",
+            "user": "0xf96afaB11e5617560b9183766470B23F45c38C56",
+            "tranche_id": 54,
+            "tx": "0x49ab3f37bda02347cb1966e8fa21885a463f09d0593a890e96b2e36dfb8dec49"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "2523",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "2523"
+      },
      {
        "address": "0x268070d5EEd5b24E34a5F4C17B5482178b18089D",
        "deposits": [
@@ -561,7 +743,7 @@
    "tranche_end": "2023-04-06T00:00:00.000Z",
    "total_added": "14099",
    "total_removed": "165.10784124668",
-    "locked_amount": "2498.09813097371518858",
+    "locked_amount": "1020.23509744623685628",
    "deposits": [
      {
        "amount": "30",
@@ -3349,7 +3531,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "59002.5721929382952291455",
+    "locked_amount": "58231.0206471161547092772",
    "deposits": [
      {
        "amount": "86666.297",
@@ -3415,7 +3597,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "844.6794235856736",
+    "locked_amount": "800.044356684981575",
    "deposits": [
      {
        "amount": "2500",
@@ -3536,7 +3718,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "14598.48687852254525",
+    "locked_amount": "14289.43755661231775",
    "deposits": [
      {
        "amount": "12500",
@@ -3802,8 +3984,8 @@
    "tranche_start": "2023-02-01T00:00:00.000Z",
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
-    "total_removed": "11535.201330975",
-    "locked_amount": "25378.31395794966",
+    "total_removed": "11781.2245815",
+    "locked_amount": "24705.08891574585375",
    "deposits": [
      {
        "amount": "7500",
@@ -3832,6 +4014,16 @@
        "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
        "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
      },
+      {
+        "amount": "133.120395975",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xf440dd4b160a155a08a3cc6e16706d5e4f9609bddd46c495217c377ef538c76f"
+      },
+      {
+        "amount": "112.90285455",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x69a4b32bad0a702a9e19ec1a77e4bc75d936f323720ca4c6213f2e4f41a750ed"
+      },
      {
        "amount": "92.587476975",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -3952,6 +4144,18 @@
            "tranche_id": 34,
            "tx": "0xe021c767a9587b28a6772b57666d72122e5d869c477596e246a4365ee6b7ce43"
          },
+          {
+            "amount": "133.120395975",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0xf440dd4b160a155a08a3cc6e16706d5e4f9609bddd46c495217c377ef538c76f"
+          },
+          {
+            "amount": "112.90285455",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0x69a4b32bad0a702a9e19ec1a77e4bc75d936f323720ca4c6213f2e4f41a750ed"
+          },
          {
            "amount": "92.587476975",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4062,8 +4266,8 @@
          }
        ],
        "total_tokens": "7500",
-        "withdrawn_tokens": "2299.752052575",
-        "remaining_tokens": "5200.247947425"
+        "withdrawn_tokens": "2545.7753031",
+        "remaining_tokens": "4954.2246969"
      },
      {
        "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -4101,7 +4305,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "58948.7397698005357803525",
+    "locked_amount": "58177.89216768362770314",
    "deposits": [
      {
        "amount": "129999.45",
@@ -4134,7 +4338,7 @@
    "tranche_end": "2024-04-01T00:00:00.000Z",
    "total_added": "54144.7663",
    "total_removed": "0",
-    "locked_amount": "54144.7663",
+    "locked_amount": "53736.93921662980913205788",
    "deposits": [
      {
        "amount": "54144.7663",
@@ -4167,7 +4371,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "26668.05655758498125",
+    "locked_amount": "26110.75656392694224",
    "deposits": [
      {
        "amount": "10000",
@@ -4360,7 +4564,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "2321.8172881785898",
+    "locked_amount": "2277.30450913242",
    "deposits": [
      {
        "amount": "5000",
@@ -4571,7 +4775,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "97499.58",
    "total_removed": "0",
-    "locked_amount": "1045.42401358724405665446",
+    "locked_amount": "289.2943236127702715019",
    "deposits": [
      {
        "amount": "97499.58",
@@ -4603,8 +4807,8 @@
    "tranche_start": "2022-02-04T00:00:00.000Z",
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "135173.4239508",
-    "total_removed": "98230.390980249184455396",
-    "locked_amount": "1428.9141416472286457282187408",
+    "total_removed": "133818.54965292963650862",
+    "locked_amount": "395.4153957972609424964042112",
    "deposits": [
      {
        "amount": "135173.4239508",
@@ -4613,6 +4817,11 @@
      }
    ],
    "withdrawals": [
+      {
+        "amount": "35588.158672680452053224",
+        "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
+        "tx": "0xb5e4c868526bc95258404cf26ce9d4dc8522e3a6352ebf503e3808023b45c90d"
+      },
      {
        "amount": "98230.390980249184455396",
        "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
@@ -4631,6 +4840,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "35588.158672680452053224",
+            "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
+            "tranche_id": 26,
+            "tx": "0xb5e4c868526bc95258404cf26ce9d4dc8522e3a6352ebf503e3808023b45c90d"
+          },
          {
            "amount": "98230.390980249184455396",
            "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
@@ -4639,8 +4854,8 @@
          }
        ],
        "total_tokens": "135173.4239508",
-        "withdrawn_tokens": "98230.390980249184455396",
-        "remaining_tokens": "36943.032970550815544604"
+        "withdrawn_tokens": "133818.54965292963650862",
+        "remaining_tokens": "1354.87429787036349138"
      }
    ]
  },
@@ -4650,7 +4865,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "32499.86",
    "total_removed": "0",
-    "locked_amount": "439.79182900909079309166",
+    "locked_amount": "121.701126098142348042122",
    "deposits": [
      {
        "amount": "32499.86",
@@ -4683,7 +4898,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "10833.29",
    "total_removed": "0",
-    "locked_amount": "143.1479727035669506741",
+    "locked_amount": "39.612535585171623792263",
    "deposits": [
      {
        "amount": "10833.29",
@@ -4716,7 +4931,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "22749.93",
    "total_removed": "4720.860935375",
-    "locked_amount": "535.1190934882196895813",
+    "locked_amount": "148.080505317408011860722",
    "deposits": [
      {
        "amount": "6500",
@@ -4867,8 +5082,8 @@
    "tranche_start": "2022-11-01T00:00:00.000Z",
    "tranche_end": "2023-05-01T00:00:00.000Z",
    "total_added": "22500",
-    "total_removed": "6111.900993675",
-    "locked_amount": "3790.52428637200815",
+    "total_removed": "6357.929999175",
+    "locked_amount": "3386.5892610497226",
    "deposits": [
      {
        "amount": "7500",
@@ -4892,6 +5107,21 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x2ab0e85bffb0894e741265c4efb962d5f09831002daa4acc92ab87f72917bfe3"
      },
+      {
+        "amount": "133.080110475",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x0e47007cb85268a4e0c3c1143b96e4c98c9880060c4218babcadd0c82f8247a9"
+      },
+      {
+        "amount": "112.943139975",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xde2d6d5df9d5097adf8a894beb8a02f0bd1cc4da1eccc221f8bfa08403dfed87"
+      },
+      {
+        "amount": "0.00575505",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xa7a9a0e91b78fd7d8ba4c16bf5b58fb1a3cb19ec1302788e894f5e24ccb07904"
+      },
      {
        "amount": "92.593232025",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5067,6 +5297,24 @@
            "tranche_id": 33,
            "tx": "0x2ab0e85bffb0894e741265c4efb962d5f09831002daa4acc92ab87f72917bfe3"
          },
+          {
+            "amount": "133.080110475",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0x0e47007cb85268a4e0c3c1143b96e4c98c9880060c4218babcadd0c82f8247a9"
+          },
+          {
+            "amount": "112.943139975",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0xde2d6d5df9d5097adf8a894beb8a02f0bd1cc4da1eccc221f8bfa08403dfed87"
+          },
+          {
+            "amount": "0.00575505",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0xa7a9a0e91b78fd7d8ba4c16bf5b58fb1a3cb19ec1302788e894f5e24ccb07904"
+          },
          {
            "amount": "92.593232025",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5249,8 +5497,8 @@
          }
        ],
        "total_tokens": "7500",
-        "withdrawn_tokens": "6111.900993675",
-        "remaining_tokens": "1388.099006325"
+        "withdrawn_tokens": "6357.929999175",
+        "remaining_tokens": "1142.070000825"
      },
      {
        "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -5275,7 +5523,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "928642.9598472029154",
-    "locked_amount": "332140.516787388458401018",
+    "locked_amount": "314870.1961185216721358008",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -8284,10 +8532,15 @@
    "tranche_id": 10,
    "tranche_start": "2021-07-15T23:37:11.000Z",
    "tranche_end": "2021-07-15T23:37:11.000Z",
-    "total_added": "6359302.299000000000000001",
-    "total_removed": "6313483.280000000000000001",
+    "total_added": "6459302.299000000000000001",
+    "total_removed": "6413483.280000000000000001",
    "locked_amount": "0",
    "deposits": [
+      {
+        "amount": "100000",
+        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+        "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
+      },
      {
        "amount": "100000",
        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8820,6 +9073,11 @@
      }
    ],
    "withdrawals": [
+      {
+        "amount": "100000",
+        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+        "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
+      },
      {
        "amount": "100000",
        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -9295,6 +9553,12 @@
      {
        "address": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
        "deposits": [
+          {
+            "amount": "100000",
+            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+            "tranche_id": 10,
+            "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
+          },
          {
            "amount": "100000",
            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -9489,6 +9753,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "100000",
+            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+            "tranche_id": 10,
+            "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
+          },
          {
            "amount": "100000",
            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -9676,8 +9946,8 @@
            "tx": "0xac16a4ce688d40a482a59914d68c3a676592f8804ee8f0781b66a4ba5ccfbdfc"
          }
        ],
-        "total_tokens": "3156651",
-        "withdrawn_tokens": "3156651",
+        "total_tokens": "3256651",
+        "withdrawn_tokens": "3256651",
        "remaining_tokens": "0"
      },
      {
@@ -10741,7 +11011,7 @@
    "tranche_id": 11,
    "tranche_start": "2021-09-03T00:00:00.000Z",
    "tranche_end": "2022-09-03T00:00:00.000Z",
-    "total_added": "57188.000000000000000003",
+    "total_added": "57213.000000000000000003",
    "total_removed": "48157.21518131551",
    "locked_amount": "0",
    "deposits": [
@@ -10760,6 +11030,11 @@
        "user": "0xE9F41a0090fcc7eaf626037003AAD44B17098E7C",
        "tx": "0x971e9bcaace01278dc20ecd83d5de588d15be22c1797f4934cfd2ffb357a95ef"
      },
+      {
+        "amount": "25",
+        "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
+        "tx": "0x180cd3aca2d716aa233483a9a52b02e83d9ac88716ca85d998269965c7a01a96"
+      },
      {
        "amount": "150",
        "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008",
@@ -22548,6 +22823,21 @@
        "withdrawn_tokens": "0",
        "remaining_tokens": "472"
      },
+      {
+        "address": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
+        "deposits": [
+          {
+            "amount": "25",
+            "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
+            "tranche_id": 11,
+            "tx": "0x180cd3aca2d716aa233483a9a52b02e83d9ac88716ca85d998269965c7a01a96"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "25",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "25"
+      },
      {
        "address": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008",
        "deposits": [
@@ -38966,7 +39256,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "700133.348465855088393",
-    "locked_amount": "534885.659985720488890481127",
+    "locked_amount": "508347.190004695251441550046",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -40347,8 +40637,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "813076.82067738050885452",
-    "locked_amount": "7196357.79300839193275956963101122784130845",
+    "total_removed": "814951.95458233668060452",
+    "locked_amount": "7102254.0823883096815429813321985808150852",
    "deposits": [
      {
        "amount": "16249.93",
@@ -40872,6 +41162,21 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x48e6b25d368a94770abfeffd5b28d7bb8b42269831394aa4b653c6eedd471909"
      },
+      {
+        "amount": "575.13946745617175",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x83497ea22d041f3b818b20cc112250ea3e38dc24b89a0bc5fee7198d6399a9cc"
+      },
+      {
+        "amount": "818.82253036937375",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x58bac20de3636c17156dcb64322cc7612c48f553d941bc039c796ef4167eeeb5"
+      },
+      {
+        "amount": "481.17190713062625",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x625ce40117b67b756a12ad676cfbfd2c59e264b3c86adbc624bf7107c4dbc5d5"
+      },
      {
        "amount": "545.4204142199725",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -42884,6 +43189,24 @@
            "tranche_id": 2,
            "tx": "0x48e6b25d368a94770abfeffd5b28d7bb8b42269831394aa4b653c6eedd471909"
          },
+          {
+            "amount": "575.13946745617175",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x83497ea22d041f3b818b20cc112250ea3e38dc24b89a0bc5fee7198d6399a9cc"
+          },
+          {
+            "amount": "818.82253036937375",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x58bac20de3636c17156dcb64322cc7612c48f553d941bc039c796ef4167eeeb5"
+          },
+          {
+            "amount": "481.17190713062625",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x625ce40117b67b756a12ad676cfbfd2c59e264b3c86adbc624bf7107c4dbc5d5"
+          },
          {
            "amount": "545.4204142199725",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44260,8 +44583,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "141620.8402756194025",
-        "remaining_tokens": "118378.0472243805975"
+        "withdrawn_tokens": "143495.97418057557425",
+        "remaining_tokens": "116502.91331942442575"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46606,8 +46929,8 @@
    "tranche_start": "2021-11-05T00:00:00.000Z",
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
-    "total_removed": "5795208.686867379341857406",
-    "locked_amount": "922186.339036689126024393500517294",
+    "total_removed": "5806817.570026167688715156",
+    "locked_amount": "835310.394250092778046317149087858",
    "deposits": [
      {
        "amount": "129284.449",
@@ -46851,6 +47174,36 @@
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
        "tx": "0xdf89247c6bdb472dcd750818d83cb70cbbe1ed660320ad1df6b1c94fb49f0161"
      },
+      {
+        "amount": "797.50404161762011275",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0xf7c393e9346520e22750d3065cb66f49e315599b24406aed2b9570b5a25babe0"
+      },
+      {
+        "amount": "5343.35381683275644592",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0x5a00c2a54f777e2d2ac0f487c6978d4c0edd8a2b146636e45ba94c6988a330f8"
+      },
+      {
+        "amount": "4.83182614679928618",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0x14811c8d77a39b0331cb2fdc96049b462916877050cc73143c494277304c2496"
+      },
+      {
+        "amount": "1135.14149158400926325",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0xae9047ab72d73da1001c570a12dddc5e82fd523454c1b377928e008da9bdfa85"
+      },
+      {
+        "amount": "3666.3885480971028369",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0x54687b81b06562122894e34822a416021671c28f99066a23c5a69399b614409d"
+      },
+      {
+        "amount": "661.66343451005891275",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x523cbf99fb25ac9633e40a26cf1aa66ac5442392e577299159bf50e844a860e1"
+      },
      {
        "amount": "755.482067130393772",
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -50005,6 +50358,24 @@
            "tranche_id": 3,
            "tx": "0xdf89247c6bdb472dcd750818d83cb70cbbe1ed660320ad1df6b1c94fb49f0161"
          },
+          {
+            "amount": "797.50404161762011275",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0xf7c393e9346520e22750d3065cb66f49e315599b24406aed2b9570b5a25babe0"
+          },
+          {
+            "amount": "1135.14149158400926325",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0xae9047ab72d73da1001c570a12dddc5e82fd523454c1b377928e008da9bdfa85"
+          },
+          {
+            "amount": "661.66343451005891275",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x523cbf99fb25ac9633e40a26cf1aa66ac5442392e577299159bf50e844a860e1"
+          },
          {
            "amount": "755.482067130393772",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52683,8 +53054,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "335769.930942892212403",
-        "remaining_tokens": "23353.538632107787597"
+        "withdrawn_tokens": "338364.23991060390069175",
+        "remaining_tokens": "20759.22966439609930825"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -52932,6 +53303,24 @@
            "tranche_id": 3,
            "tx": "0x55259c6fbd43ea2b1e081dc4964c6785ed4d03bb0cafc49de2f07685b056f487"
          },
+          {
+            "amount": "5343.35381683275644592",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0x5a00c2a54f777e2d2ac0f487c6978d4c0edd8a2b146636e45ba94c6988a330f8"
+          },
+          {
+            "amount": "4.83182614679928618",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0x14811c8d77a39b0331cb2fdc96049b462916877050cc73143c494277304c2496"
+          },
+          {
+            "amount": "3666.3885480971028369",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0x54687b81b06562122894e34822a416021671c28f99066a23c5a69399b614409d"
+          },
          {
            "amount": "80421.5336580481619385",
            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -53264,8 +53653,8 @@
          }
        ],
        "total_tokens": "1266324.603486",
-        "withdrawn_tokens": "1183921.35061421307696042",
-        "remaining_tokens": "82403.25287178692303958"
+        "withdrawn_tokens": "1192935.92480528973552942",
+        "remaining_tokens": "73388.67868071026447058"
      },
      {
        "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296",
@@ -54094,7 +54483,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "5778205.3912159303",
    "total_removed": "3381706.364737906998719578",
-    "locked_amount": "47457.9963497595169438268586090283",
+    "locked_amount": "13132.78514323649783129733831977186",
    "deposits": [
      {
        "amount": "552496.6455",
@@ -56221,8 +56610,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "39906.7861606897949",
-    "locked_amount": "84755.690361520729285180485438864",
+    "total_removed": "40152.1324861581949",
+    "locked_amount": "80550.51809266543339246000913244",
    "deposits": [
      {
        "amount": "3000",
@@ -62886,6 +63275,21 @@
        "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
        "tx": "0x93540a3930099c8b54157bb83ae50c8ced993009ae2091888f85704e6f13869c"
      },
+      {
+        "amount": "164.310191526",
+        "user": "0xfA580dabBa10A5Ef817C7dc26Aaa5fF579D45a9D",
+        "tx": "0xf1df34ff15a8c7238e188632cf69532edb92f0d8203bf3031e5d19338cb5a9ca"
+      },
+      {
+        "amount": "58.7761643844",
+        "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B",
+        "tx": "0xda5812fda239af9581d2d60c8f4b959e0a8cc5466e5422c5b8fa9df72435d3bc"
+      },
+      {
+        "amount": "22.259969558",
+        "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
+        "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9"
+      },
      {
        "amount": "154.812094114",
        "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7",
@@ -82132,6 +82536,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "58.7761643844",
+            "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B",
+            "tranche_id": 5,
+            "tx": "0xda5812fda239af9581d2d60c8f4b959e0a8cc5466e5422c5b8fa9df72435d3bc"
+          },
          {
            "amount": "20.679657534",
            "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B",
@@ -82146,8 +82556,8 @@
          }
        ],
        "total_tokens": "180",
-        "withdrawn_tokens": "89.6315011398",
-        "remaining_tokens": "90.3684988602"
+        "withdrawn_tokens": "148.4076655242",
+        "remaining_tokens": "31.5923344758"
      },
      {
        "address": "0x68927b7A4A360f5B615e104BA2cA2E264a563A33",
@@ -82861,10 +83271,17 @@
            "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "164.310191526",
+            "user": "0xfA580dabBa10A5Ef817C7dc26Aaa5fF579D45a9D",
+            "tranche_id": 5,
+            "tx": "0xf1df34ff15a8c7238e188632cf69532edb92f0d8203bf3031e5d19338cb5a9ca"
+          }
+        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "200"
+        "withdrawn_tokens": "164.310191526",
+        "remaining_tokens": "35.689808474"
      },
      {
        "address": "0x40c9DF6b867cA219c0Ab4C2E390E8B919Be52e7e",
@@ -84421,6 +84838,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "22.259969558",
+            "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
+            "tranche_id": 5,
+            "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9"
+          },
          {
            "amount": "17.060806698",
            "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
@@ -84453,8 +84876,8 @@
          }
        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "142.641089548",
-        "remaining_tokens": "57.358910452"
+        "withdrawn_tokens": "164.901059106",
+        "remaining_tokens": "35.098940894"
      },
      {
        "address": "0xBef628af8547cE5264835F32487055a7e3dF393D",
@@ -1,3 +0,0 @@
-{
-  "hosts": ["https://api-n00.mainnet-mirror.vega.rocks/graphql"]
-}
@@ -1,3 +0,0 @@
-{
-  "hosts": ["https://api-n01.sandbox.vega.rocks/graphql"]
-}
@@ -95,6 +95,16 @@ describe('Console - market info - live env', { tags: '@live' }, () => {
      cy.wrap(element).should('have.text', subtitles[index]);
    });
  });
+
+  it('renders correctly liquidity in trading tab', () => {
+    cy.getByTestId('Liquidity').click();
+    cy.contains('Loading').should('not.exist');
+    cy.contains('Something went wrong').should('not.exist');
+    cy.contains('Application error').should('not.exist');
+    cy.getByTestId('tab-liquidity').within(() => {
+      cy.get('[col-id="party.id"]').eq(1).should('not.be.empty');
+    });
+  });
 });

 describe('Console - market summary - live env', { tags: '@live' }, () => {
@@ -84,6 +84,8 @@ describe('must submit order', { tags: '@smoke' }, () => {
      type: Schema.OrderType.TYPE_MARKET,
      side: Schema.Side.SIDE_BUY,
      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+      postOnly: false,
+      reduceOnly: false,
      size: '100',
    };
    createOrder(order);
@@ -98,6 +100,8 @@ describe('must submit order', { tags: '@smoke' }, () => {
      side: Schema.Side.SIDE_SELL,
      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
      size: '100',
+      postOnly: false,
+      reduceOnly: false,
    };
    createOrder(order);
    testOrderSubmission(order);
@@ -112,6 +116,8 @@ describe('must submit order', { tags: '@smoke' }, () => {
      side: Schema.Side.SIDE_BUY,
      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
      size: '100',
+      postOnly: false,
+      reduceOnly: false,
      price: '200',
    };
    createOrder(order);
@@ -126,6 +132,8 @@ describe('must submit order', { tags: '@smoke' }, () => {
      side: Schema.Side.SIDE_SELL,
      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GFN,
      size: '100',
+      postOnly: false,
+      reduceOnly: false,
      price: '50000',
    };
    createOrder(order);
@@ -143,6 +151,8 @@ describe('must submit order', { tags: '@smoke' }, () => {
      size: '100',
      price: '1.00',
      expiresAt: expiresAt.toISOString().substring(0, 16),
+      postOnly: false,
+      reduceOnly: false,
    };

    createOrder(order);
@@ -150,6 +160,8 @@ describe('must submit order', { tags: '@smoke' }, () => {
      price: '100000',
      expiresAt:
        new Date(order.expiresAt as string).getTime().toString() + '000000',
+      postOnly: false,
+      reduceOnly: false,
    });
  });
 });
@@ -182,6 +194,8 @@ describe(
        side: Schema.Side.SIDE_BUY,
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
        size: '100',
+        postOnly: false,
+        reduceOnly: false,
        price: '200',
      };
      createOrder(order);
@@ -196,6 +210,8 @@ describe(
        side: Schema.Side.SIDE_SELL,
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
        size: '100',
+        postOnly: false,
+        reduceOnly: false,
        price: '50000',
      };
      createOrder(order);
@@ -210,12 +226,16 @@ describe(
        side: Schema.Side.SIDE_SELL,
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
        size: '100',
+        postOnly: false,
+        reduceOnly: false,
        price: '1.00',
        expiresAt: displayTomorrow(),
      };
      createOrder(order);
      testOrderSubmission(order, {
        price: '100000',
+        postOnly: false,
+        reduceOnly: false,
        expiresAt:
          new Date(order.expiresAt as string).getTime().toString() + '000000',
      });
@@ -251,6 +271,8 @@ describe(
        side: Schema.Side.SIDE_BUY,
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
        size: '100',
+        postOnly: false,
+        reduceOnly: false,
        price: '200',
      };
      createOrder(order);
@@ -265,6 +287,8 @@ describe(
        side: Schema.Side.SIDE_SELL,
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
        size: '100',
+        postOnly: false,
+        reduceOnly: false,
        price: '50000',
      };
      createOrder(order);
@@ -281,6 +305,8 @@ describe(
        size: '100',
        price: '1.00',
        expiresAt: displayTomorrow(),
+        postOnly: false,
+        reduceOnly: false,
      };
      createOrder(order);
      testOrderSubmission(order, {
@@ -320,6 +346,8 @@ describe(
        side: Schema.Side.SIDE_BUY,
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
        size: '100',
+        postOnly: false,
+        reduceOnly: false,
        price: '200',
      };
      createOrder(order);
@@ -335,6 +363,8 @@ describe(
        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
        size: '100',
        price: '50000',
+        postOnly: false,
+        reduceOnly: false,
      };
      createOrder(order);
      testOrderSubmission(order, { price: '5000000000' });
@@ -350,6 +380,8 @@ describe(
        size: '100',
        price: '1.00',
        expiresAt: displayTomorrow(),
+        postOnly: false,
+        reduceOnly: false,
      };
      createOrder(order);
      testOrderSubmission(order, {
@@ -1,5 +1,5 @@
 import {
-  getId,
+  matchFilter,
  liquidityProvisionsDataProvider,
  LiquidityTable,
  lpAggregatedDataProvider,
@@ -17,7 +17,6 @@ import {
  useNetworkParams,
  updateGridData,
 } from '@vegaprotocol/react-helpers';
-import * as Schema from '@vegaprotocol/types';
 import {
  AsyncRenderer,
  Tab,
@@ -26,19 +25,18 @@ import {
  Indicator,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useRef, useState } from 'react';

 import { Header, HeaderStat, HeaderTitle } from '../../components/header';

 import type { AgGridReact } from 'ag-grid-react';
 import type { IGetRowsParams } from 'ag-grid-community';

-import type { LiquidityProvisionData } from '@vegaprotocol/liquidity';
+import type { LiquidityProvisionData, Filter } from '@vegaprotocol/liquidity';
 import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';

 import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
-import isEqual from 'lodash/isEqual';

 const enum LiquidityTabs {
  Active = 'active',
@@ -67,8 +65,10 @@ const useReloadLiquidityData = (marketId: string | undefined) => {

 export const LiquidityContainer = ({
  marketId,
+  filter,
 }: {
  marketId: string | undefined;
+  filter?: Filter;
 }) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const { data: market } = useMarket(marketId);
@@ -87,7 +87,7 @@ export const LiquidityContainer = ({
  const { data, loading, error } = useDataProvider({
    dataProvider: lpAggregatedDataProvider,
    update,
-    variables: { marketId: marketId || '' },
+    variables: { marketId: marketId || '', filter },
    skip: !marketId,
  });

@@ -216,178 +216,56 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
 });
 LiquidityViewHeader.displayName = 'LiquidityViewHeader';

-const filterLiquidities = (
-  tab: string,
-  liquidities?: LiquidityProvisionData[] | null,
-  pubKey?: string | null
-) => {
-  switch (tab) {
-    case LiquidityTabs.MyLiquidityProvision:
-      return pubKey
-        ? (liquidities || []).filter((e) => e.party.id === pubKey)
-        : [];
-      break;
-    case LiquidityTabs.Active:
-      return (liquidities || []).filter(
-        (e) => e.status === Schema.LiquidityProvisionStatus.STATUS_ACTIVE
-      );
-    case LiquidityTabs.Inactive:
-      return (liquidities || []).filter(
-        (e) => e.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE
-      );
-    default:
-      return [];
-  }
-};
-
 export const LiquidityViewContainer = ({
  marketId,
 }: {
  marketId: string | undefined;
 }) => {
-  const [tab, setTab] = useState('');
+  const [tab, setTab] = useState<string | undefined>(undefined);
  const { pubKey } = useVegaWallet();
-  const [liquidityProviders, setLiquidityProviders] = useState<
-    LiquidityProvisionData[] | null
-  >();
-  const gridRef = useRef<AgGridReact | null>(null);
-  const { data: market } = useMarket(marketId);
-  const dataRef = useRef<LiquidityProvisionData[] | null>(null);

-  // To be removed when liquidityProvision subscriptions are working
-  useReloadLiquidityData(marketId);
-
-  const update = useCallback(
-    ({ data }: { data: LiquidityProvisionData[] | null }) => {
-      if (!dataRef.current) {
-        setLiquidityProviders(data);
-        dataRef.current = data;
-      }
-      if (!gridRef.current?.api) {
-        return false;
-      }
-      const updateRows: LiquidityProvisionData[] = [];
-      const addRows: LiquidityProvisionData[] = [];
-      if (gridRef.current?.api?.getModel().getType() === 'infinite') {
-        dataRef.current = data;
-        gridRef.current.api.refreshInfiniteCache();
-      } else {
-        const filteredData = filterLiquidities(tab, data, pubKey as string);
-        filteredData?.forEach((d) => {
-          const rowNode = gridRef.current?.api?.getRowNode(getId(d));
-          if (rowNode) {
-            if (!isEqual(rowNode.data, d)) {
-              updateRows.push(d);
-            }
-          } else {
-            addRows.push(d);
-          }
-        });
-        gridRef.current?.api?.applyTransaction({
-          update: updateRows,
-          add: addRows,
-          addIndex: 0,
-        });
-      }
-      return true;
-    },
-    [gridRef, tab, pubKey]
-  );
-
-  const { loading, error } = useDataProvider({
+  const { data } = useDataProvider({
    dataProvider: lpAggregatedDataProvider,
-    update,
+    skipUpdates: true,
    variables: { marketId: marketId || '' },
    skip: !marketId,
  });
-  const assetDecimalPlaces =
-    market?.tradableInstrument.instrument.product.settlementAsset.decimals || 0;
-  const symbol =
-    market?.tradableInstrument.instrument.product.settlementAsset.symbol;
-
-  const { params } = useNetworkParams([
-    NetworkParams.market_liquidity_stakeToCcyVolume,
-    NetworkParams.market_liquidity_targetstake_triggering_ratio,
-  ]);
-  const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;
-  const myLpEdges = useMemo(
-    () =>
-      filterLiquidities(
-        LiquidityTabs.MyLiquidityProvision,
-        liquidityProviders,
-        pubKey
-      ),
-    [liquidityProviders, pubKey]
-  );
-  const activeEdges = useMemo(
-    () => filterLiquidities(LiquidityTabs.Active, liquidityProviders),
-    [liquidityProviders]
-  );
-  const inactiveEdges = useMemo(
-    () => filterLiquidities(LiquidityTabs.Inactive, liquidityProviders),
-    [liquidityProviders]
-  );

  useEffect(() => {
-    if (tab) {
-      return;
+    if (data) {
+      if (pubKey && data.some((lp) => matchFilter({ partyId: pubKey }, lp))) {
+        setTab(LiquidityTabs.MyLiquidityProvision);
+        return;
+      }
+      if (data.some((lp) => matchFilter({ active: true }, lp))) {
+        setTab(LiquidityTabs.Active);
+        return;
+      }
+      setTab(LiquidityTabs.Inactive);
    }
-    let initialTab = LiquidityTabs.Active;
-    if (myLpEdges.length > 0) {
-      initialTab = LiquidityTabs.MyLiquidityProvision;
-    }
-    if (activeEdges?.length) {
-      initialTab = LiquidityTabs.Active;
-    } else if (inactiveEdges.length > 0) {
-      initialTab = LiquidityTabs.Inactive;
-    }
-    setTab(initialTab);
-  }, [tab, myLpEdges?.length, activeEdges?.length, inactiveEdges?.length]);
+  }, [data, pubKey]);

  return (
-    <AsyncRenderer loading={loading} error={error} data={liquidityProviders}>
-      <div className="h-full grid grid-rows-[min-content_1fr]">
-        <LiquidityViewHeader marketId={marketId} />
-        <Tabs value={tab} onValueChange={setTab}>
-          <Tab
-            id={LiquidityTabs.MyLiquidityProvision}
-            name={t('My liquidity provision')}
-            hidden={!pubKey}
-          >
-            {myLpEdges && (
-              <LiquidityTable
-                ref={gridRef}
-                rowData={myLpEdges}
-                symbol={symbol}
-                stakeToCcyVolume={stakeToCcyVolume}
-                assetDecimalPlaces={assetDecimalPlaces}
-              />
-            )}
-          </Tab>
-          <Tab id={LiquidityTabs.Active} name={t('Active')}>
-            {activeEdges && (
-              <LiquidityTable
-                ref={gridRef}
-                rowData={activeEdges}
-                symbol={symbol}
-                assetDecimalPlaces={assetDecimalPlaces}
-                stakeToCcyVolume={stakeToCcyVolume}
-              />
-            )}
-          </Tab>
-          <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
-            {inactiveEdges && (
-              <LiquidityTable
-                ref={gridRef}
-                rowData={inactiveEdges}
-                symbol={symbol}
-                assetDecimalPlaces={assetDecimalPlaces}
-                stakeToCcyVolume={stakeToCcyVolume}
-              />
-            )}
-          </Tab>
-        </Tabs>
-      </div>
-    </AsyncRenderer>
+    <div className="h-full grid grid-rows-[min-content_1fr]">
+      <LiquidityViewHeader marketId={marketId} />
+      <Tabs value={tab || LiquidityTabs.Active} onValueChange={setTab}>
+        <Tab
+          id={LiquidityTabs.MyLiquidityProvision}
+          name={t('My liquidity provision')}
+          hidden={!pubKey}
+        >
+          <LiquidityContainer
+            marketId={marketId}
+            filter={{ partyId: pubKey || undefined }}
+          />
+        </Tab>
+        <Tab id={LiquidityTabs.Active} name={t('Active')}>
+          <LiquidityContainer marketId={marketId} filter={{ active: true }} />
+        </Tab>
+        <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
+          <LiquidityContainer marketId={marketId} filter={{ active: false }} />
+        </Tab>
+      </Tabs>
+    </div>
  );
 };
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -13,6 +13,7 @@ import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid, TradePanels } from './trade-grid';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
  return markPrice && decimalPlaces
@@ -66,14 +67,7 @@ export const MarketPage = () => {
  const update = useGlobalStore((store) => store.update);
  const lastMarketId = useGlobalStore((store) => store.marketId);

-  const onSelect = useCallback(
-    (id: string) => {
-      if (id && id !== marketId) {
-        navigate(Links[Routes.MARKET](id));
-      }
-    },
-    [marketId, navigate]
-  );
+  const onSelect = useMarketClickHandler();

  const { data, error, loading } = useDataProvider({
    dataProvider: marketProvider,
@@ -8,7 +8,7 @@ import { TradesContainer } from '@vegaprotocol/trades';
 import { LayoutPriority } from 'allotment';
 import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { memo, useCallback, useState } from 'react';
+import { memo, useState } from 'react';
 import type { ReactNode, ComponentProps } from 'react';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import { CandlesChartContainer } from '@vegaprotocol/candles-chart';
@@ -27,9 +27,9 @@ import { TradeMarketHeader } from './trade-market-header';
 import { NO_MARKET } from './constants';
 import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
-import { Links, Routes } from '../../pages/client-router';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -66,7 +66,7 @@ type TradingView = keyof typeof TradingViews;

 interface TradeGridProps {
  market: Market | null;
-  onSelect: (marketId: string) => void;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
  pinnedAsset?: PinnedAsset;
 }

@@ -78,15 +78,7 @@ interface BottomPanelProps {
 const MarketBottomPanel = memo(
  ({ marketId, pinnedAsset }: BottomPanelProps) => {
    const { screenSize } = useScreenDimensions();
-    const navigate = useNavigate();
-    const onMarketClick = useCallback(
-      (marketId: string) => {
-        navigate(Links[Routes.MARKET](marketId), {
-          replace: true,
-        });
-      },
-      [navigate]
-    );
+    const onMarketClick = useMarketClickHandler(true);

    return 'xxxl' === screenSize ? (
      <ResizableGrid proportionalLayout minSize={200}>
@@ -189,7 +181,7 @@ const MainGrid = memo(
    pinnedAsset,
  }: {
    marketId: string;
-    onSelect?: (marketId: string) => void;
+    onSelect: (marketId: string, metaKey?: boolean) => void;
    pinnedAsset?: PinnedAsset;
  }) => {
    const navigate = useNavigate();
@@ -230,12 +222,7 @@ const MainGrid = memo(
                    />
                  </Tab>
                  <Tab id="info" name={t('Info')}>
-                    <TradingViews.Info
-                      marketId={marketId}
-                      onSelect={(id: string) => {
-                        onSelect?.(id);
-                      }}
-                    />
+                    <TradingViews.Info marketId={marketId} />
                  </Tab>
                </Tabs>
              </TradeGridChild>
@@ -304,7 +291,7 @@ const TradeGridChild = ({ children }: TradeGridChildProps) => {

 interface TradePanelsProps {
  market: Market | null;
-  onSelect: (marketId: string) => void;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
  onMarketClick?: (marketId: string) => void;
  onClickCollateral: () => void;
  pinnedAsset?: PinnedAsset;
@@ -320,7 +307,7 @@ export const TradePanels = ({
  const renderView = () => {
    const Component = memo<{
      marketId: string;
-      onSelect: (marketId: string) => void;
+      onSelect: (marketId: string, metaKey?: boolean) => void;
      onMarketClick?: (marketId: string) => void;
      onClickCollateral: () => void;
      pinnedAsset?: PinnedAsset;
@@ -22,7 +22,7 @@ import { MarketState as State } from '@vegaprotocol/types';

 interface TradeMarketHeaderProps {
  market: Market | null;
-  onSelect: (marketId: string) => void;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
 }

 export const TradeMarketHeader = ({
@@ -91,7 +91,6 @@ export const TradeMarketHeader = ({
      </HeaderStat>
      <HeaderStatMarketTradingMode
        marketId={market?.id}
-        onSelect={onSelect}
        initialTradingMode={market?.tradingMode}
      />
      <MarketState market={market} />
@@ -1,16 +1,7 @@
-import { useCallback } from 'react';
 import { MarketsContainer } from '@vegaprotocol/market-list';
-import { useNavigate } from 'react-router-dom';
-import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 export const Markets = () => {
-  const navigate = useNavigate();
-  const handleOnSelect = useCallback(
-    (marketId: string) => {
-      navigate(Links[Routes.MARKET](marketId));
-    },
-    [navigate]
-  );
-
+  const handleOnSelect = useMarketClickHandler();
  return <MarketsContainer onSelect={handleOnSelect} />;
 };
@@ -19,25 +19,18 @@ import { usePageTitleStore } from '../../stores';
 import { LedgerContainer } from '@vegaprotocol/ledger';
 import { AccountsContainer } from '../../components/accounts-container';
 import { AccountHistoryContainer } from './account-history-container';
-import { useNavigate } from 'react-router-dom';
-import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 export const Portfolio = () => {
  const { updateTitle } = usePageTitleStore((store) => ({
    updateTitle: store.updateTitle,
  }));

-  const navigate = useNavigate();
-
  useEffect(() => {
    updateTitle(titlefy([t('Portfolio')]));
  }, [updateTitle]);

-  const onMarketClick = (marketId: string) => {
-    navigate(Links[Routes.MARKET](marketId), {
-      replace: true,
-    });
-  };
+  const onMarketClick = useMarketClickHandler(true);

  const wrapperClasses = 'h-full max-h-full flex flex-col';
  return (
@@ -25,7 +25,7 @@ const getTradingModeLabel = (

 interface HeaderStatMarketTradingModeProps {
  marketId?: string;
-  onSelect?: (marketId: string) => void;
+  onSelect?: (marketId: string, metaKey?: boolean) => void;
  initialTradingMode?: Schema.MarketTradingMode;
  initialTrigger?: Schema.AuctionTrigger;
 }
@@ -66,7 +66,9 @@ export const MarketTradingMode = ({

  return (
    <Tooltip
-      description={<TradingModeTooltip marketId={marketId} skip={!inView} />}
+      description={
+        <TradingModeTooltip marketId={marketId} skip={!inView} skipGrid />
+      }
    >
      <span ref={ref}>
        {getTradingModeLabel(
@@ -1,4 +1,4 @@
-import type { RefObject } from 'react';
+import type { RefObject, MouseEvent } from 'react';
 import { FeesCell } from '@vegaprotocol/market-info';
 import {
  calcCandleHigh,
@@ -157,14 +157,14 @@ export const columnHeaders: Column[] = [
 ];

 export type OnCellClickHandler = (
-  e: React.MouseEvent,
+  e: MouseEvent,
  kind: ColumnKind,
  value: string
 ) => void;

 export const columns = (
  market: MarketMaybeWithDataAndCandles,
-  onSelect: (id: string) => void,
+  onSelect: (id: string, metaKey?: boolean) => void,
  onCellClick: OnCellClickHandler,
  inViewRoot?: RefObject<HTMLElement>
 ) => {
@@ -174,14 +174,7 @@ export const columns = (
  const candleLow = market.candles && calcCandleLow(market.candles);
  const candleHigh = market.candles && calcCandleHigh(market.candles);
  const candleVolume = market.candles && calcCandleVolume(market.candles);
-  const handleKeyPress = (
-    event: React.KeyboardEvent<HTMLAnchorElement>,
-    id: string
-  ) => {
-    if (event.key === 'Enter' && onSelect) {
-      return onSelect(id);
-    }
-  };
+
  const selectMarketColumns: Column[] = [
    {
      kind: ColumnKind.Market,
@@ -189,10 +182,10 @@ export const columns = (
        <Link
          to={Links[Routes.MARKET](market.id)}
          data-testid={`market-link-${market.id}`}
-          onKeyPress={(event) => handleKeyPress(event, market.id)}
          onClick={(e) => {
            e.preventDefault();
-            onSelect(market.id);
+            e.stopPropagation();
+            onSelect(market.id, e.metaKey);
          }}
        >
          <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -352,7 +345,7 @@ export const columns = (

 export const columnsPositionMarkets = (
  market: MarketMaybeWithDataAndCandles,
-  onSelect: (id: string) => void,
+  onSelect: (id: string, metaKey?: boolean) => void,
  inViewRoot?: RefObject<HTMLElement>,
  openVolume?: string,
  onCellClick?: OnCellClickHandler
@@ -362,14 +355,6 @@ export const columnsPositionMarkets = (
    .filter((c: string | undefined): c is CandleClose => !isNil(c));
  const candleLow = market.candles && calcCandleLow(market.candles);
  const candleHigh = market.candles && calcCandleHigh(market.candles);
-  const handleKeyPress = (
-    event: React.KeyboardEvent<HTMLSpanElement>,
-    id: string
-  ) => {
-    if (event.key === 'Enter' && onSelect) {
-      return onSelect(id);
-    }
-  };
  const candleVolume = market.candles && calcCandleVolume(market.candles);
  const selectMarketColumns: Column[] = [
    {
@@ -378,10 +363,10 @@ export const columnsPositionMarkets = (
        <Link
          to={Links[Routes.MARKET](market.id)}
          data-testid={`market-link-${market.id}`}
-          onKeyPress={(event) => handleKeyPress(event, market.id)}
          onClick={(e) => {
            e.preventDefault();
-            onSelect(market.id);
+            e.stopPropagation();
+            onSelect(market.id, e.metaKey);
          }}
        >
          <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -37,14 +37,14 @@ export const SelectMarketTableRow = ({
 }: {
  detailed?: boolean;
  columns: Column[];
-  onSelect: (id: string) => void;
+  onSelect: (id: string, metaKey?: boolean) => void;
  marketId: string;
 }) => {
  return (
    <tr
      className={`hover:bg-neutral-200 dark:hover:bg-neutral-700 cursor-pointer relative h-[34px]`}
-      onClick={() => {
-        onSelect(marketId);
+      onClick={(ev) => {
+        onSelect(marketId, ev.metaKey);
      }}
      data-testid={`market-link-${marketId}`}
    >
@@ -178,6 +178,6 @@ describe('SelectMarket', () => {
    expect(screen.getByText('25.00%')).toBeTruthy(); // price change
    expect(container).toHaveTextContent(/1,000/); // volume
    fireEvent.click(screen.getAllByTestId(`market-link-1`)[0]);
-    expect(onSelect).toHaveBeenCalledWith('1');
+    expect(onSelect).toHaveBeenCalledWith('1', false);
  });
 });
@@ -40,7 +40,7 @@ export const SelectAllMarketsTableBody = ({
  markets?: MarketMaybeWithDataAndCandles[] | null;
  positions?: PositionFieldsFragment[];
  title?: string;
-  onSelect: (id: string) => void;
+  onSelect: (id: string, metaKey?: boolean) => void;
  onCellClick: OnCellClickHandler;
  headers?: Column[];
  tableColumns?: (
@@ -95,7 +95,7 @@ export const SelectMarketPopover = ({
 }: {
  marketCode: string;
  marketName: string;
-  onSelect: (id: string) => void;
+  onSelect: (id: string, metaKey?: boolean) => void;
  onCellClick: OnCellClickHandler;
 }) => {
  const { pubKey } = useVegaWallet();
@@ -116,8 +116,8 @@ export const SelectMarketPopover = ({
    skip: !pubKey,
  });
  const onSelectMarket = useCallback(
-    (marketId: string) => {
-      onSelect(marketId);
+    (marketId: string, metaKey?: boolean) => {
+      onSelect(marketId, metaKey);
      setOpen(false);
    },
    [onSelect]
@@ -0,0 +1,21 @@
+import { useNavigate, useParams, useLocation } from 'react-router-dom';
+import { useCallback } from 'react';
+import { Links, Routes } from '../../pages/client-router';
+
+export const useMarketClickHandler = (replace = false) => {
+  const navigate = useNavigate();
+  const { marketId } = useParams();
+  const { pathname } = useLocation();
+  const isMarketPage = pathname.match(/^\/markets\/(.+)/);
+  return useCallback(
+    (selectedId: string, metaKey?: boolean) => {
+      const link = Links[Routes.MARKET](selectedId);
+      if (metaKey) {
+        window.open(`/#${link}`, '_blank');
+      } else if (selectedId !== marketId || !isMarketPage) {
+        navigate(link, { replace });
+      }
+    },
+    [navigate, marketId, replace, isMarketPage]
+  );
+};
@@ -474,15 +474,17 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
  }

  if (tx.order && tx.order.rejectionReason) {
+    const rejectionReason = getRejectionReason(tx.order) || ' ';
    return (
      <>
        <ToastHeading>{t('Order rejected')}</ToastHeading>
-        <p>
-          {t(
-            'Your order has been rejected because: %s',
-            getRejectionReason(tx.order) || ''
-          )}
-        </p>
+        {rejectionReason ? (
+          <p>
+            {t('Your order has been rejected because: %s', [rejectionReason])}
+          </p>
+        ) : (
+          <p>{t('Your order has been rejected.')}</p>
+        )}
        {tx.txHash && (
          <p className="break-all">
            <ExternalLink
@@ -576,10 +578,9 @@ const VegaTxErrorToastContent = ({ tx }: VegaTxToastContentProps) => {
    walletNoConnectionCodes.includes(tx.error.code);
  if (orderRejection) {
    label = t('Order rejected');
-    errorMessage = t(
-      'Your order has been rejected because: %s',
-      orderRejection
-    );
+    errorMessage = t('Your order has been rejected because: %s', [
+      orderRejection,
+    ]);
  }
  if (walletError) {
    label = t('Wallet disconnected');
@@ -1,3 +1,5 @@
+import { useMemo, useState } from 'react';
+import classNames from 'classnames';
 import Head from 'next/head';
 import type { AppProps } from 'next/app';
 import { t } from '@vegaprotocol/i18n';
@@ -23,14 +25,12 @@ import {
 import './styles.css';
 import { useGlobalStore, usePageTitleStore } from '../stores';
 import { Footer } from '../components/footer';
-import { useMemo, useState } from 'react';
 import DialogsContainer from './dialogs-container';
 import ToastsManager from './toasts-manager';
 import { HashRouter, useLocation, useSearchParams } from 'react-router-dom';
 import { Connectors } from '../lib/vega-connectors';
 import { ViewingBanner } from '../components/viewing-banner';
 import { Banner } from '../components/banner';
-import classNames from 'classnames';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';

@@ -57,7 +57,7 @@ const Title = () => {
  );
 };

-const TransactionsHandler = () => {
+const InitializeHandlers = () => {
  useVegaTransactionManager();
  useVegaTransactionUpdater();
  useEthTransactionManager();
@@ -93,7 +93,7 @@ function AppBody({ Component }: AppProps) {
      </div>
      <DialogsContainer />
      <ToastsManager />
-      <TransactionsHandler />
+      <InitializeHandlers />
      <MaybeConnectEagerly />
    </div>
  );
@@ -1,10 +1,22 @@
-#!/bin/sh -eux
+#!/bin/bash -ex
+
 export PATH="/app/node_modules/.bin:$PATH"
+
+flags="--network-timeout 100000 --pure-lockfile"
+
+if [[ ! -z "${ENV_NAME}" ]]; then
+  flags="--env=${ENV_NAME} $flags"
+fi
+
 if [ "${APP}" = "trading" ]; then
-  yarn nx export ${APP} --network-timeout 100000 --pure-lockfile
+  yarn nx export ${APP} $flags
  mv /app/dist/apps/trading/exported/ /app/tmp
  rm -rf /app/dist/apps/trading
  mv /app/tmp /app/dist/apps/trading
 else
-  yarn nx build ${APP} --network-timeout 100000 --pure-lockfile
+  yarn nx build ${APP} $flags
 fi
+
+env_vars_file="/app/dist/apps/${APP}/.env"
+# make sure there are no exposed .env files
+rm $env_vars_file || echo "No env vars file"
@@ -1,43 +0,0 @@
-#!/bin/bash
-set -e
-
-# Recreate config file
-env_file=/usr/share/nginx/html/assets/env-config.js
-mkdir -p $(dirname $env_file)
-rm -rf $env_file || echo "no file to delete"
-touch $env_file
-
-env_vars_file=/usr/share/nginx/html/.env
-sed -i '/^#/d' $env_vars_file # remove comment lines
-sed -i '/^$/d' $env_vars_file # remove empty lines
-
-# Add assignment
-echo "window._env_ = {" >> $env_file
-
-# Read each line in .env file
-# Each line represents key=value pairs
-while read -r line || [[ -n "$line" ]];
-do
-  # Split env variables by character `=`
-  if printf '%s\n' "$line" | grep -q -e '='; then
-    varname=$(printf '%s\n' "$line" | sed -e 's/=.*//')
-    varvalue=$(printf '%s\n' "$line" | sed -e 's/^[^=]*=//')
-  fi
-
-  # Read value of current variable if exists as Environment variable
-  value=$(printf '%s\n' "${!varname}")
-  # Otherwise use value from .env file
-  [[ -z $value ]] && value=${varvalue}
-
-  # Append configuration property to JS file if non-empty
-  if [ ! -z "$varname" ]; then
-    echo "  $varname: \"$value\"," >> $env_file
-  fi
-done < $env_vars_file
-
-rm $env_vars_file
-
-echo "}" >> $env_file
-
-# start serving
-nginx -g 'daemon off;'
@@ -9,6 +9,7 @@ export * from './lib/cells/price-change-cell';
 export * from './lib/cells/price-flash-cell';
 export * from './lib/cells/vol-cell';
 export * from './lib/cells/centered-grid-cell';
+export * from './lib/cells/market-name-cell';

 export * from './lib/filters/date-range-filter';
 export * from './lib/filters/set-filter';
@@ -0,0 +1,35 @@
+import type { MouseEvent } from 'react';
+import { useCallback } from 'react';
+import get from 'lodash/get';
+
+interface MarketNameCellProps {
+  value?: string;
+  data?: { id?: string; marketId?: string; market?: { id: string } };
+  idPath?: string;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+}
+
+export const MarketNameCell = ({
+  value,
+  data,
+  idPath,
+  onMarketClick,
+}: MarketNameCellProps) => {
+  const id = data ? get(data, idPath ?? 'id', 'all') : '';
+  const handleOnClick = useCallback(
+    (ev: MouseEvent<HTMLButtonElement>) => {
+      ev.preventDefault();
+      ev.stopPropagation();
+      if (onMarketClick) {
+        onMarketClick(id, ev.metaKey);
+      }
+    },
+    [id, onMarketClick]
+  );
+  if (!data) return null;
+  return (
+    <button onClick={handleOnClick} tabIndex={0}>
+      {value}
+    </button>
+  );
+};
@@ -1,4 +1,5 @@
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import classnames from 'classnames';
 import type { ReactNode } from 'react';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import type { Market, MarketData } from '@vegaprotocol/market-list';
@@ -11,9 +12,12 @@ interface DealTicketFeeDetailsProps {
  order: OrderSubmissionBody['orderSubmission'];
  market: Market;
  marketData: MarketData;
-  margin: string;
-  totalMargin: string;
-  balance: string;
+  currentInitialMargin?: string;
+  currentMaintenanceMargin?: string;
+  estimatedInitialMargin: string;
+  estimatedTotalInitialMargin: string;
+  marginAccountBalance: string;
+  generalAccountBalance: string;
 }

 export interface DealTicketFeeDetailProps {
@@ -45,23 +49,22 @@ export const DealTicketFeeDetails = ({
  order,
  market,
  marketData,
-  margin,
-  totalMargin,
-  balance,
+  ...args
 }: DealTicketFeeDetailsProps) => {
  const feeDetails = useFeeDealTicketDetails(order, market, marketData);
  const details = getFeeDetailsValues({
    ...feeDetails,
-    margin,
-    totalMargin,
-    balance,
+    ...args,
  });
  return (
    <div>
-      {details.map(({ label, value, labelDescription, symbol }) => (
+      {details.map(({ label, value, labelDescription, symbol, indent }) => (
        <div
          key={typeof label === 'string' ? label : 'value-dropdown'}
-          className="text-xs mt-2 flex justify-between items-center gap-4 flex-wrap"
+          className={classnames(
+            'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',
+            { 'ml-2': indent }
+          )}
        >
          <div>
            <Tooltip description={labelDescription}>
@@ -107,6 +107,50 @@ describe('DealTicket', () => {
    );
  });

+  it('should use local storage state for initial values reduceOnly and postOnly', () => {
+    const expectedOrder = {
+      marketId: market.id,
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      size: '0.1',
+      price: '300.22',
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+      persist: true,
+      reduceOnly: true,
+      postOnly: false,
+    };
+
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
+      },
+    });
+
+    render(generateJsx());
+
+    // Assert correct defaults are used from store
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
+    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
+      expectedOrder.size
+    );
+    expect(screen.getByTestId('order-tif')).toHaveValue(
+      expectedOrder.timeInForce
+    );
+    expect(screen.getByTestId('order-price')).toHaveDisplayValue(
+      expectedOrder.price
+    );
+  });
+
  it('handles TIF select box dependent on order type', async () => {
    render(generateJsx());

@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
-import { memo, useCallback, useEffect, useState, useRef } from 'react';
+import { memo, useCallback, useEffect, useState, useRef, useMemo } from 'react';
 import { Controller } from 'react-hook-form';
 import { DealTicketAmount } from './deal-ticket-amount';
 import { DealTicketButton } from './deal-ticket-button';
@@ -16,10 +16,12 @@ import {
  useVegaWalletDialogStore,
 } from '@vegaprotocol/wallet';
 import {
+  Checkbox,
  ExternalLink,
  InputError,
  Intent,
  Notification,
+  Tooltip,
  TinyScroll,
 } from '@vegaprotocol/ui-toolkit';

@@ -42,6 +44,9 @@ import {

 import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import { useOrderForm } from '../../hooks/use-order-form';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
+
+import { marketMarginDataProvider } from '@vegaprotocol/positions';

 export interface DealTicketProps {
  market: Market;
@@ -101,6 +106,12 @@ export const DealTicket = ({

  const { margin, totalMargin } = useInitialMargin(market.id, normalizedOrder);

+  const { data: currentMargins } = useDataProvider({
+    dataProvider: marketMarginDataProvider,
+    variables: { marketId: market.id, partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+
  useEffect(() => {
    if (!pubKey) {
      setError('summary', {
@@ -146,6 +157,16 @@ export const DealTicket = ({
    clearErrors,
  ]);

+  const disablePostOnlyCheckbox = useMemo(() => {
+    const disabled = order
+      ? [
+          Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+          Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        ].includes(order.timeInForce)
+      : true;
+    return disabled;
+  }, [order]);
+
  const onSubmit = useCallback(
    (order: OrderSubmission) => {
      const now = new Date().getTime();
@@ -239,7 +260,7 @@ export const DealTicket = ({
              value={order.timeInForce}
              orderType={order.type}
              onSelect={(timeInForce) => {
-                update({ timeInForce });
+                update({ timeInForce, postOnly: false, reduceOnly: false });
                // Set tif value for the given order type, so that when switching
                // types we know the last used TIF for the given order type
                setLastTIF((curr) => ({
@@ -276,6 +297,65 @@ export const DealTicket = ({
              )}
            />
          )}
+        <div className="flex gap-2 pb-2 justify-between">
+          <Controller
+            name="postOnly"
+            control={control}
+            render={() => (
+              <Checkbox
+                name="post-only"
+                checked={order.postOnly}
+                disabled={disablePostOnlyCheckbox}
+                onCheckedChange={() => {
+                  update({ postOnly: !order.postOnly, reduceOnly: false });
+                }}
+                label={
+                  <Tooltip
+                    description={
+                      <span>
+                        {disablePostOnlyCheckbox
+                          ? t(
+                              '"Post only" can not be used on "Fill or Kill" or "Immediate or Cancel" orders.'
+                            )
+                          : t(
+                              '"Post only" will ensure the order is not filled immediately but is placed on the order book as a passive order. When the order is processed it is either stopped (if it would not be filled immediately), or placed in the order book as a passive order until the price taker matches with it.'
+                            )}
+                      </span>
+                    }
+                  >
+                    <span className="text-xs">{t('Post only')}</span>
+                  </Tooltip>
+                }
+              />
+            )}
+          />
+          <Controller
+            name="reduceOnly"
+            control={control}
+            render={() => (
+              <Checkbox
+                name="reduce-only"
+                checked={order.reduceOnly}
+                onCheckedChange={() => {
+                  update({ postOnly: false, reduceOnly: !order.reduceOnly });
+                }}
+                label={
+                  <Tooltip
+                    description={
+                      <span>
+                        {t(
+                          '"Reduce only" will ensure that this order will not increase the size of an open position. When the order is matched, it will only trade enough volume to bring your open volume towards 0 but never change the direction of your position. If applied to a limit order that is not instantly filled, the order will be stopped.'
+                        )}
+                      </span>
+                    }
+                  >
+                    <span className="text-xs">{t('Reduce only')}</span>
+                  </Tooltip>
+                }
+              />
+            )}
+          />
+        </div>
        <SummaryMessage
          errorMessage={errors.summary?.message}
          asset={asset}
@@ -296,9 +376,12 @@ export const DealTicket = ({
          order={normalizedOrder}
          market={market}
          marketData={marketData}
-          margin={margin}
-          totalMargin={totalMargin}
-          balance={marginAccountBalance}
+          estimatedInitialMargin={margin}
+          estimatedTotalInitialMargin={totalMargin}
+          currentInitialMargin={currentMargins?.initialLevel}
+          currentMaintenanceMargin={currentMargins?.maintenanceLevel}
+          marginAccountBalance={marginAccountBalance}
+          generalAccountBalance={generalAccountBalance}
        />
      </form>
    </TinyScroll>
@@ -96,16 +96,6 @@ export const TimeInForceSelector = ({
        id="select-time-in-force"
        value={value}
        onChange={(e) => {
-          // setPreviousTimeInForce({
-          //   ...previousTimeInForce,
-          //   [orderType]: e.target.value,
-          // });
-
-          // if (previousOrderType !== orderType) {
-          //   setPreviousOrderType(orderType);
-          //   const prev = previousTimeInForce[orderType as OrderType];
-          //   onSelect(prev);
-          // }
          onSelect(e.target.value as Schema.OrderTimeInForce);
        }}
        className="w-full"
@@ -26,7 +26,7 @@ export const compileGridData = (
    | 'targetStake'
    | 'trigger'
  > | null,
-  onSelect?: (id: string) => void
+  onSelect?: (id: string, metaKey?: boolean) => void
 ): { label: ReactNode; value?: ReactNode }[] => {
  const grid: SimpleGridProps['grid'] = [];
  const isLiquidityMonitoringAuction =
@@ -78,7 +78,7 @@ export const compileGridData = (
      label: (
        <Link
          to={`/liquidity/${market.id}`}
-          onClick={() => onSelect && onSelect(market.id)}
+          onClick={(ev) => onSelect && onSelect(market.id, ev.metaKey)}
        >
          <UILink>{t('Current liquidity')}</UILink>
        </Link>
@@ -12,14 +12,16 @@ import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';

 type TradingModeTooltipProps = {
  marketId?: string;
-  onSelect?: (marketId: string) => void;
+  onSelect?: (marketId: string, metaKey?: boolean) => void;
  skip?: boolean;
+  skipGrid?: boolean;
 };

 export const TradingModeTooltip = ({
  marketId,
  onSelect,
  skip,
+  skipGrid,
 }: TradingModeTooltipProps) => {
  const { VEGA_DOCS_URL } = useEnvironment();
  const { data: market } = useMarket(marketId);
@@ -42,7 +44,7 @@ export const TradingModeTooltip = ({
  );

  const compiledGrid =
-    onSelect && compileGridData(market, marketData, onSelect);
+    !skipGrid && compileGridData(market, marketData, onSelect);

  switch (marketTradingMode) {
    case Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS: {
@@ -103,6 +105,7 @@ export const TradingModeTooltip = ({
            {VEGA_DOCS_URL && (
              <ExternalLink
                href={createDocsLinks(VEGA_DOCS_URL).AUCTION_TYPE_OPENING}
+                className="ml-1"
              >
                {t('Find out more')}
              </ExternalLink>
@@ -129,6 +132,7 @@ export const TradingModeTooltip = ({
                      createDocsLinks(VEGA_DOCS_URL)
                        .AUCTION_TYPE_LIQUIDITY_MONITORING
                    }
+                    className="ml-1"
                  >
                    {t('Find out more')}
                  </ExternalLink>
@@ -153,6 +157,7 @@ export const TradingModeTooltip = ({
                      createDocsLinks(VEGA_DOCS_URL)
                        .AUCTION_TYPE_LIQUIDITY_MONITORING
                    }
+                    className="ml-1"
                  >
                    {t('Find out more')}
                  </ExternalLink>
@@ -175,6 +180,7 @@ export const TradingModeTooltip = ({
                      createDocsLinks(VEGA_DOCS_URL)
                        .AUCTION_TYPE_PRICE_MONITORING
                    }
+                    className="ml-1"
                  >
                    {t('Find out more')}
                  </ExternalLink>
@@ -10,12 +10,36 @@ export const EST_MARGIN_TOOLTIP_TEXT = (settlementAsset: string) =>
 export const EST_TOTAL_MARGIN_TOOLTIP_TEXT = t(
  'Estimated total margin that will cover open position, active orders and this order.'
 );
-export const MARGIN_ACCOUNT_TOOLTIP_TEXT = t('Margin account balance');
+export const MARGIN_ACCOUNT_TOOLTIP_TEXT = t('Margin account balance.');
 export const MARGIN_DIFF_TOOLTIP_TEXT = (settlementAsset: string) =>
  t(
    "The additional margin required for your new position (taking into account volume and open orders), compared to your current margin. Measured in the market's settlement asset (%s).",
    [settlementAsset]
  );
+export const DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT = (
+  settlementAsset: string
+) =>
+  t(
+    'To cover the required margin, this amount will be drawn from your general (%s) account.',
+    [settlementAsset]
+  );
+
+export const TOTAL_MARGIN_AVAILABLE = (
+  generalAccountBalance: string,
+  marginAccountBalance: string,
+  marginMaintenance: string,
+  settlementAsset: string
+) =>
+  t(
+    'Total margin available = general %s balance (%s) + margin balance (%s) - maintenance level (%s).',
+    [
+      settlementAsset,
+      `${generalAccountBalance} ${settlementAsset}`,
+      `${marginAccountBalance} ${settlementAsset}`,
+      `${marginMaintenance} ${settlementAsset}`,
+    ]
+  );
+
 export const CONTRACTS_MARGIN_TOOLTIP_TEXT = t(
  'The number of contracts determines how many units of the futures contract to buy or sell. For example, this is similar to buying one share of a listed company. The value of 1 contract is equivalent to the price of the contract. For example, if the current price is $50, then one contract is worth $50.'
 );
@@ -40,7 +64,7 @@ export const EST_SLIPPAGE = t(
 );

 export const ERROR_SIZE_DECIMAL = t(
-  'The size field accepts up to X decimal places'
+  'The size field accepts up to X decimal places.'
 );

 export enum MarketModeValidationType {
@@ -15,6 +15,8 @@ import {
  NOTIONAL_SIZE_TOOLTIP_TEXT,
  MARGIN_ACCOUNT_TOOLTIP_TEXT,
  MARGIN_DIFF_TOOLTIP_TEXT,
+  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
+  TOTAL_MARGIN_AVAILABLE,
 } from '../constants';
 import { useOrderCloseOut } from './use-order-closeout';
 import { useMarketAccountBalance } from '@vegaprotocol/accounts';
@@ -85,24 +87,32 @@ export const useFeeDealTicketDetails = (
 };

 export interface FeeDetails {
-  balance: string;
+  generalAccountBalance?: string;
+  marginAccountBalance?: string;
  market: Market;
  assetSymbol: string;
  notionalSize: string | null;
  estCloseOut: string | null;
  estimateOrder: EstimateOrderQuery['estimateOrder'] | undefined;
-  margin: string;
-  totalMargin: string;
+  estimatedInitialMargin: string;
+  estimatedTotalInitialMargin: string;
+  currentInitialMargin?: string;
+  currentMaintenanceMargin?: string;
 }

 export const getFeeDetailsValues = ({
-  balance,
+  marginAccountBalance,
+  generalAccountBalance,
  assetSymbol,
  estimateOrder,
  market,
  notionalSize,
-  totalMargin,
+  estimatedTotalInitialMargin,
+  currentInitialMargin,
+  currentMaintenanceMargin,
 }: FeeDetails) => {
+  const totalBalance =
+    BigInt(generalAccountBalance || '0') + BigInt(marginAccountBalance || '0');
  const assetDecimals =
    market.tradableInstrument.instrument.product.settlementAsset.decimals;
  const formatValueWithMarketDp = (
@@ -123,7 +133,8 @@ export const getFeeDetailsValues = ({
    label: string;
    value?: string | null;
    symbol: string;
-    labelDescription: React.ReactNode;
+    indent?: boolean;
+    labelDescription?: React.ReactNode;
  }[] = [
    {
      label: t('Notional'),
@@ -153,38 +164,64 @@ export const getFeeDetailsValues = ({
      ),
      symbol: assetSymbol,
    },
-    /*
-    {
-      label: t('Initial margin'),
-      value: margin && `~${formatValueWithAssetDp(margin)}`,
-      symbol: assetSymbol,
-      labelDescription: EST_MARGIN_TOOLTIP_TEXT(assetSymbol),
-    },
-    */
    {
      label: t('Margin required'),
      value: `~${formatValueWithAssetDp(
-        balance
-          ? (BigInt(totalMargin) - BigInt(balance)).toString()
-          : totalMargin
+        currentInitialMargin
+          ? (
+              BigInt(estimatedTotalInitialMargin) - BigInt(currentInitialMargin)
+            ).toString()
+          : estimatedTotalInitialMargin
      )}`,
      symbol: assetSymbol,
      labelDescription: MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol),
    },
  ];
-  if (balance) {
+  if (totalBalance) {
+    const totalMarginAvailable = (
+      currentMaintenanceMargin
+        ? totalBalance - BigInt(currentMaintenanceMargin)
+        : totalBalance
+    ).toString();
+
+    details.push({
+      indent: true,
+      label: t('Total margin available'),
+      value: `~${formatValueWithAssetDp(totalMarginAvailable)}`,
+      symbol: assetSymbol,
+      labelDescription: TOTAL_MARGIN_AVAILABLE(
+        formatValueWithAssetDp(generalAccountBalance),
+        formatValueWithAssetDp(marginAccountBalance),
+        formatValueWithAssetDp(currentMaintenanceMargin),
+        assetSymbol
+      ),
+    });
+
+    if (marginAccountBalance) {
+      const deductionFromCollateral =
+        BigInt(estimatedTotalInitialMargin) - BigInt(marginAccountBalance);
+
+      details.push({
+        indent: true,
+        label: t('Deduction from collateral'),
+        value: `~${formatValueWithAssetDp(
+          deductionFromCollateral > 0 ? deductionFromCollateral.toString() : '0'
+        )}`,
+        symbol: assetSymbol,
+        labelDescription: DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT(assetSymbol),
+      });
+    }
+
    details.push({
      label: t('Projected margin'),
-      value: `~${formatValueWithAssetDp(totalMargin)}`,
+      value: `~${formatValueWithAssetDp(estimatedTotalInitialMargin)}`,
      symbol: assetSymbol,
      labelDescription: EST_TOTAL_MARGIN_TOOLTIP_TEXT,
    });
  }
  details.push({
    label: t('Current margin allocation'),
-    value: balance
-      ? `~${formatValueWithAssetDp(balance)}`
-      : `${formatValueWithAssetDp(balance)}`,
+    value: `${formatValueWithAssetDp(marginAccountBalance)}`,
    symbol: assetSymbol,
    labelDescription: MARGIN_ACCOUNT_TOOLTIP_TEXT,
  });
@@ -65,5 +65,11 @@ export const useInitialMargin = (
      sellMargin > buyMargin ? sellMargin.toString() : buyMargin.toString();
  }

-  return useMemo(() => ({ totalMargin, margin }), [totalMargin, margin]);
+  return useMemo(
+    () => ({
+      totalMargin,
+      margin,
+    }),
+    [totalMargin, margin]
+  );
 };
@@ -1,2 +1,7 @@
 import '@testing-library/jest-dom';
 import 'jest-canvas-mock';
+import ResizeObserver from 'resize-observer-polyfill';
+import { defaultFallbackInView } from 'react-intersection-observer';
+
+defaultFallbackInView(true);
+global.ResizeObserver = ResizeObserver;
@@ -140,8 +140,6 @@ describe('Network switcher', () => {
      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
-      [Networks.SANDBOX]: 'https://sandbox.net',
-      [Networks.MIRROR]: 'https://mirror.net',
    };
    // @ts-ignore Typescript doesn't know about this module being mocked
    useEnvironment.mockImplementation(() => ({
@@ -181,8 +179,6 @@ describe('Network switcher', () => {
      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
-      [Networks.SANDBOX]: 'https://sandbox.net',
-      [Networks.MIRROR]: 'https://mirror.net',
    };
    // @ts-ignore Typescript doesn't know about this module being mocked
    useEnvironment.mockImplementation(() => ({
@@ -215,8 +211,6 @@ describe('Network switcher', () => {
      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
-      [Networks.SANDBOX]: 'https://sandbox.net',
-      [Networks.MIRROR]: 'https://mirror.net',
    };
    // @ts-ignore Typescript doesn't know about this module being mocked
    useEnvironment.mockImplementation(() => ({
@@ -17,12 +17,10 @@ export const envNameMapping: Record<Networks, string> = {
  [Networks.VALIDATOR_TESTNET]: t('VALIDATOR_TESTNET'),
  [Networks.CUSTOM]: t('Custom'),
  [Networks.DEVNET]: t('Devnet'),
-  [Networks.SANDBOX]: t('Sandbox'),
  [Networks.STAGNET1]: t('Stagnet'),
  [Networks.STAGNET3]: t('Stagnet3'),
  [Networks.TESTNET]: t('Fairground testnet'),
  [Networks.MAINNET]: t('Mainnet'),
-  [Networks.MIRROR]: t('Mainnet mirror'),
 };

 export const envTriggerMapping: Record<Networks, string> = {
@@ -32,7 +30,6 @@ export const envTriggerMapping: Record<Networks, string> = {

 export const envDescriptionMapping: Record<Networks, string> = {
  [Networks.CUSTOM]: '',
-  [Networks.SANDBOX]: t('A playground test environment'),
  [Networks.VALIDATOR_TESTNET]: t('The validator deployed testnet'),
  [Networks.DEVNET]: t('The latest Vega code auto-deployed'),
  [Networks.STAGNET1]: t('A release candidate for the staging environment'),
@@ -41,9 +38,6 @@ export const envDescriptionMapping: Record<Networks, string> = {
    'Public testnet run by the Vega team, often used for incentives'
  ),
  [Networks.MAINNET]: t('The vega mainnet'),
-  [Networks.MIRROR]: t(
-    'A mirror of the mainnet environment running on an Ethereum test network'
-  ),
 };

 const standardNetworkKeys = [Networks.MAINNET, Networks.TESTNET];
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { Networks } from '../types';
 import { useEnvironment } from './use-environment';

-type Net = Exclude<Networks, 'CUSTOM' | 'SANDBOX'>;
+type Net = Exclude<Networks, 'CUSTOM'>;
 export enum DApp {
  Explorer = 'Explorer',
  Console = 'Console',
@@ -21,7 +21,6 @@ const EmptyLinks: DAppLinks = {
  [Networks.STAGNET3]: '',
  [Networks.TESTNET]: '',
  [Networks.MAINNET]: '',
-  [Networks.MIRROR]: '',
 };

 const ExplorerLinks = {
@@ -61,7 +60,7 @@ export const useLinks = (dapp: DApp, network?: Net) => {
  };

  let net = network || VEGA_ENV;
-  if (net === Networks.CUSTOM || net === Networks.SANDBOX) {
+  if (net === Networks.CUSTOM) {
    net = Networks.TESTNET;
  }

@@ -5,13 +5,11 @@ import type { envSchema } from './utils/validate-environment';
 export enum Networks {
  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
  CUSTOM = 'CUSTOM',
-  SANDBOX = 'SANDBOX',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
  STAGNET3 = 'STAGNET3',
  DEVNET = 'DEVNET',
  MAINNET = 'MAINNET',
-  MIRROR = 'MIRROR',
 }
 export type Environment = z.infer<typeof envSchema>;
 export type Configuration = z.infer<typeof tomlConfigSchema>;
@@ -3,13 +3,11 @@ import z from 'zod';
 export enum Networks {
  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
  CUSTOM = 'CUSTOM',
-  SANDBOX = 'SANDBOX',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
  STAGNET3 = 'STAGNET3',
  DEVNET = 'DEVNET',
  MAINNET = 'MAINNET',
-  MIRROR = 'MIRROR',
 }

 const schemaObject = {
@@ -8,7 +8,7 @@ export const FillsContainer = ({
  onMarketClick,
 }: {
  marketId?: string;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
  const { pubKey } = useVegaWallet();

@@ -11,7 +11,7 @@ import { useBottomPlaceholder } from '@vegaprotocol/react-helpers';
 interface FillsManagerProps {
  partyId: string;
  marketId?: string;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }

 export const FillsManager = ({
@@ -14,16 +14,13 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { AgGridColumn } from 'ag-grid-react';
-import { Link } from '@vegaprotocol/ui-toolkit';
 import {
  AgGridDynamic as AgGrid,
  positiveClassNames,
  negativeClassNames,
+  MarketNameCell,
 } from '@vegaprotocol/datagrid';
-import type {
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
-} from '@vegaprotocol/datagrid';
+import type { VegaValueFormatterParams } from '@vegaprotocol/datagrid';
 import { forwardRef } from 'react';
 import BigNumber from 'bignumber.js';
 import type { Trade } from './fills-data-provider';
@@ -34,7 +31,7 @@ const MAKER = 'MAKER';

 export type Props = (AgGridReactProps | AgReactUiProps) & {
  partyId: string;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 };

 export const FillsTable = forwardRef<AgGridReact, Props>(
@@ -48,30 +45,14 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
        getRowId={({ data }) => data?.id}
        tooltipShowDelay={0}
        tooltipHideDelay={2000}
+        components={{ MarketNameCell }}
        {...props}
      >
        <AgGridColumn
          headerName={t('Market')}
          field="market.tradableInstrument.instrument.name"
-          cellRenderer={({
-            value,
-            data,
-          }: VegaICellRendererParams<
-            Trade,
-            'market.tradableInstrument.instrument.name'
-          >) =>
-            onMarketClick ? (
-              <Link
-                onClick={() =>
-                  data?.market?.id && onMarketClick(data?.market?.id)
-                }
-              >
-                {value}
-              </Link>
-            ) : (
-              value
-            )
-          }
+          cellRenderer="MarketNameCell"
+          cellRendererParams={{ idPath: 'market.id', onMarketClick }}
        />
        <AgGridColumn
          headerName={t('Size')}
@@ -57,7 +57,7 @@ fragment LiquidityProvisionFields on LiquidityProvision {

 query LiquidityProvisions($marketId: ID!) {
  market(id: $marketId) {
-    liquidityProvisionsConnection {
+    liquidityProvisionsConnection(live: true) {
      edges {
        node {
          ...LiquidityProvisionFields
@@ -1,6 +1,6 @@
 fragment MarketNode on Market {
  id
-  liquidityProvisionsConnection {
+  liquidityProvisionsConnection(live: true) {
    edges {
      node {
        commitmentAmount
@@ -138,7 +138,7 @@ export type MarketLpQueryResult = Apollo.QueryResult<MarketLpQuery, MarketLpQuer
 export const LiquidityProvisionsDocument = gql`
    query LiquidityProvisions($marketId: ID!) {
  market(id: $marketId) {
-    liquidityProvisionsConnection {
+    liquidityProvisionsConnection(live: true) {
      edges {
        node {
          ...LiquidityProvisionFields
@@ -290,4 +290,4 @@ export function useLiquidityProviderFeeShareUpdateSubscription(baseOptions: Apol
        return Apollo.useSubscription<LiquidityProviderFeeShareUpdateSubscription, LiquidityProviderFeeShareUpdateSubscriptionVariables>(LiquidityProviderFeeShareUpdateDocument, options);
      }
 export type LiquidityProviderFeeShareUpdateSubscriptionHookResult = ReturnType<typeof useLiquidityProviderFeeShareUpdateSubscription>;
-export type LiquidityProviderFeeShareUpdateSubscriptionResult = Apollo.SubscriptionResult<LiquidityProviderFeeShareUpdateSubscription>;
+export type LiquidityProviderFeeShareUpdateSubscriptionResult = Apollo.SubscriptionResult<LiquidityProviderFeeShareUpdateSubscription>;
@@ -13,7 +13,7 @@ export type LiquidityProvisionMarketsQuery = { __typename?: 'Query', marketsConn
 export const MarketNodeFragmentDoc = gql`
    fragment MarketNode on Market {
  id
-  liquidityProvisionsConnection {
+  liquidityProvisionsConnection(live: true) {
    edges {
      node {
        commitmentAmount
@@ -65,23 +65,11 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
    });
  },
  getData: (responseData: LiquidityProvisionsQuery | null) => {
-    // to remove dedupe after core fix https://github.com/vegaprotocol/vega/issues/8043
-    const dedupeArr: string[] = [];
    return (
      responseData?.market?.liquidityProvisionsConnection?.edges?.map(
        (e) => e?.node
      ) ?? []
-    ).filter((e) => {
-      if (e) {
-        const id = getId(e);
-        if (dedupeArr.includes(id)) {
-          return false;
-        }
-        dedupeArr.push(id);
-        return true;
-      }
-      return false;
-    }) as LiquidityProvisionFieldsFragment[];
+    ).filter((e) => !!e) as LiquidityProvisionFieldsFragment[];
  },
  getDelta: (
    subscriptionData: LiquidityProvisionsUpdateSubscription
@@ -165,35 +153,84 @@ export const liquidityFeeShareDataProvider = makeDataProvider<
  },
 });

+export type Filter = { partyId?: string; active?: boolean };
+
 export const lpAggregatedDataProvider = makeDerivedDataProvider<
-  ReturnType<typeof getLiquidityProvision>,
+  LiquidityProvisionData[],
  never,
-  MarketLpQueryVariables
+  MarketLpQueryVariables & { filter?: Filter }
 >(
  [
-    liquidityProvisionsDataProvider,
-    marketLiquidityDataProvider,
-    liquidityFeeShareDataProvider,
+    (callback, client, variables) =>
+      liquidityProvisionsDataProvider(callback, client, {
+        marketId: variables.marketId,
+      }),
+    (callback, client, variables) =>
+      marketLiquidityDataProvider(callback, client, {
+        marketId: variables.marketId,
+      }),
+    (callback, client, variables) =>
+      liquidityFeeShareDataProvider(callback, client, {
+        marketId: variables.marketId,
+      }),
  ],
-  ([
-    liquidityProvisions,
-    marketLiquidity,
-    liquidityFeeShare,
-  ]): LiquidityProvisionData[] => {
+  (
+    [liquidityProvisions, marketLiquidity, liquidityFeeShare],
+    { filter }
+  ): LiquidityProvisionData[] => {
    return getLiquidityProvision(
      liquidityProvisions,
      marketLiquidity,
-      liquidityFeeShare
+      liquidityFeeShare,
+      filter
    );
  }
 );

+export const matchFilter = (
+  filter: Filter,
+  lp: LiquidityProvisionFieldsFragment
+) => {
+  if (filter.partyId && lp.party.id !== filter.partyId) {
+    return false;
+  }
+  if (
+    filter.active === true &&
+    lp.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE
+  ) {
+    return false;
+  }
+  if (
+    filter.active === false &&
+    lp.status === Schema.LiquidityProvisionStatus.STATUS_ACTIVE
+  ) {
+    return false;
+  }
+  return true;
+};
+
 export const getLiquidityProvision = (
  liquidityProvisions: LiquidityProvisionFieldsFragment[],
  marketLiquidity: MarketLpQuery,
-  liquidityFeeShare: LiquidityProviderFeeShareFieldsFragment[]
+  liquidityFeeShare: LiquidityProviderFeeShareFieldsFragment[],
+  filter?: Filter
 ): LiquidityProvisionData[] => {
  return liquidityProvisions
+    .filter((lp) => {
+      if (
+        ![
+          Schema.LiquidityProvisionStatus.STATUS_ACTIVE,
+          Schema.LiquidityProvisionStatus.STATUS_UNDEPLOYED,
+          Schema.LiquidityProvisionStatus.STATUS_PENDING,
+        ].includes(lp.status)
+      ) {
+        return false;
+      }
+      if (filter && !matchFilter(filter, lp)) {
+        return false;
+      }
+      return true;
+    })
    .map((lp) => {
      const market = marketLiquidity?.market;
      const feeShare = liquidityFeeShare.find(
@@ -222,14 +259,7 @@ export const getLiquidityProvision = (
            .decimals,
        balance,
      };
-    })
-    .filter((e) =>
-      [
-        Schema.LiquidityProvisionStatus.STATUS_ACTIVE,
-        Schema.LiquidityProvisionStatus.STATUS_UNDEPLOYED,
-        Schema.LiquidityProvisionStatus.STATUS_PENDING,
-      ].includes(e.status)
-    );
+    });
 };

 export interface LiquidityProvisionData
@@ -39,12 +39,12 @@ import {

 export interface InfoProps {
  market: MarketInfoWithDataAndCandles;
-  onSelect: (id: string) => void;
+  onSelect?: (id: string, metaKey?: boolean) => void;
 }

 export interface MarketInfoContainerProps {
  marketId: string;
-  onSelect?: (id: string) => void;
+  onSelect?: (id: string, metaKey?: boolean) => void;
 }
 export const MarketInfoContainer = ({
  marketId,
@@ -73,7 +73,7 @@ export const MarketInfoContainer = ({
    <AsyncRenderer data={data} loading={loading} error={error} reload={reload}>
      {data ? (
        <TinyScroll className="h-full overflow-auto">
-          <Info market={data} onSelect={(id) => onSelect?.(id)} />
+          <Info market={data} onSelect={onSelect} />
        </TinyScroll>
      ) : (
        <Splash>
@@ -169,7 +169,7 @@ export const Info = ({ market, onSelect }: InfoProps) => {
        <LiquidityInfoPanel market={market}>
          <Link
            to={`/liquidity/${market.id}`}
-            onClick={() => onSelect(market.id)}
+            onClick={(ev) => onSelect?.(market.id, ev.metaKey)}
            data-testid="view-liquidity-link"
          >
            <UILink>{t('View liquidity provision table')}</UILink>
@@ -10,6 +10,7 @@ import type {
 import {
  AgGridDynamic as AgGrid,
  PriceFlashCell,
+  MarketNameCell,
 } from '@vegaprotocol/datagrid';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { AgGridColumn } from 'ag-grid-react';
@@ -24,8 +25,10 @@ export const getRowId = ({ data }: { data: { id: string } }) => data.id;

 export const MarketListTable = forwardRef<
  AgGridReact,
-  TypedDataAgGrid<MarketMaybeWithData>
->((props, ref) => {
+  TypedDataAgGrid<MarketMaybeWithData> & {
+    onMarketClick: (marketId: string, metaKey?: boolean) => void;
+  }
+>(({ onMarketClick, ...props }, ref) => {
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
  return (
    <AgGrid
@@ -41,22 +44,14 @@ export const MarketListTable = forwardRef<
        filterParams: { buttons: ['reset'] },
      }}
      suppressCellFocus={true}
-      components={{ PriceFlashCell }}
+      components={{ PriceFlashCell, MarketNameCell }}
      {...props}
    >
      <AgGridColumn
        headerName={t('Market')}
        field="tradableInstrument.instrument.code"
-        cellRenderer={({
-          value,
-          data,
-        }: VegaICellRendererParams<
-          MarketMaybeWithData,
-          'tradableInstrument.instrument.code'
-        >) => {
-          if (!data) return null;
-          return <span data-testid={`market-${data.id}`}>{value}</span>;
-        }}
+        cellRenderer="MarketNameCell"
+        cellRendererParams={{ onMarketClick }}
      />
      <AgGridColumn
        headerName={t('Description')}
@@ -1,12 +1,14 @@
+import type { MouseEvent } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { MarketListTable } from './market-list-table';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
-import type { RowClickedEvent } from 'ag-grid-community';
+import type { CellClickedEvent } from 'ag-grid-community';
 import { marketsWithDataProvider as dataProvider } from '../../markets-provider';
 import type { MarketMaybeWithData } from '../../markets-provider';
+
 interface MarketsContainerProps {
-  onSelect: (marketId: string) => void;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
 }

 export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
@@ -21,16 +23,23 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
        rowData={error ? [] : data}
        suppressLoadingOverlay
        suppressNoRowsOverlay
-        onRowClicked={(rowEvent: RowClickedEvent) => {
-          const { data, event } = rowEvent;
-          // filters out clicks on the symbol column because it should display asset details
+        onCellClicked={(cellEvent: CellClickedEvent) => {
+          const { data, column, event } = cellEvent;
+          const colId = column.getColId();
          if (
-            (event?.target as HTMLElement).tagName.toUpperCase() === 'BUTTON'
+            [
+              'tradableInstrument.instrument.code',
+              'tradableInstrument.instrument.product.settlementAsset',
+            ].includes(colId)
          ) {
            return;
          }
-          onSelect((data as MarketMaybeWithData).id);
+          onSelect(
+            (data as MarketMaybeWithData).id,
+            (event as unknown as MouseEvent)?.metaKey
+          );
        }}
+        onMarketClick={onSelect}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -9,7 +9,7 @@ export const OrderListContainer = ({
  enforceBottomPlaceholder,
 }: {
  marketId?: string;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  enforceBottomPlaceholder?: boolean;
 }) => {
  const { pubKey, isReadOnly } = useVegaWallet();
@@ -23,7 +23,7 @@ import type { Order, OrderEdge } from '../order-data-provider';
 export interface OrderListManagerProps {
  partyId: string;
  marketId?: string;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  isReadOnly: boolean;
  enforceBottomPlaceholder?: boolean;
 }
@@ -5,7 +5,7 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
-import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit';
+import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { AgGridColumn } from 'ag-grid-react';
 import BigNumber from 'bignumber.js';
 import { memo, forwardRef } from 'react';
@@ -15,6 +15,7 @@ import {
  DateRangeFilter,
  negativeClassNames,
  positiveClassNames,
+  MarketNameCell,
 } from '@vegaprotocol/datagrid';
 import type {
  TypedDataAgGrid,
@@ -29,7 +30,7 @@ type OrderListProps = TypedDataAgGrid<Order> & { marketId?: string };
 export type OrderListTableProps = OrderListProps & {
  cancel: (order: Order) => void;
  setEditOrder: (order: Order) => void;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  isReadOnly: boolean;
 };

@@ -50,30 +51,14 @@ export const OrderListTable = memo(
            height: '100%',
          }}
          getRowId={({ data }) => data.id}
+          components={{ MarketNameCell }}
          {...props}
        >
          <AgGridColumn
            headerName={t('Market')}
            field="market.tradableInstrument.instrument.code"
-            cellRenderer={({
-              value,
-              data,
-            }: VegaICellRendererParams<
-              Order,
-              'market.tradableInstrument.instrument.code'
-            >) =>
-              onMarketClick ? (
-                <Link
-                  onClick={() =>
-                    data?.market?.id && onMarketClick(data?.market?.id)
-                  }
-                >
-                  {value}
-                </Link>
-              ) : (
-                value
-              )
-            }
+            cellRenderer="MarketNameCell"
+            cellRendererParams={{ idPath: 'market.id', onMarketClick }}
            minWidth={150}
          />
          <AgGridColumn
@@ -13,6 +13,8 @@ export type OrderObj = {
  price?: string;
  expiresAt?: string | undefined;
  persist: boolean; // key used to determine if order should be kept in localStorage
+  postOnly?: boolean;
+  reduceOnly?: boolean;
 };
 type OrderMap = { [marketId: string]: OrderObj | undefined };

@@ -114,4 +116,6 @@ export const getDefaultOrder = (marketId: string): OrderObj => ({
  price: '0',
  expiresAt: undefined,
  persist: false,
+  postOnly: false,
+  reduceOnly: false,
 });
@@ -1,8 +1,7 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import type { Position } from '../';
 import { usePositionsData, PositionsTable } from '../';
-import type { FilterChangedEvent } from 'ag-grid-community';
 import type { AgGridReact } from 'ag-grid-react';
 import * as Schema from '@vegaprotocol/types';
 import { useVegaTransactionStore } from '@vegaprotocol/wallet';
@@ -23,8 +22,8 @@ export const PositionsManager = ({
  noBottomPlaceholder,
 }: PositionsManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
-  const [dataCount, setDataCount] = useState(0);
  const { data, error, loading, reload } = usePositionsData(partyId, gridRef);
+  const [dataCount, setDataCount] = useState(data?.length ?? 0);
  const create = useVegaTransactionStore((store) => store.create);
  const onClose = ({
    marketId,
@@ -67,10 +66,7 @@ export const PositionsManager = ({
    setId,
    disabled: noBottomPlaceholder,
  });
-  useEffect(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, [data]);
-  const onFilterChanged = useCallback((event: FilterChangedEvent) => {
+  const updateRowCount = useCallback(() => {
    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
  }, []);
  return (
@@ -83,7 +79,8 @@ export const PositionsManager = ({
        suppressLoadingOverlay
        suppressNoRowsOverlay
        isReadOnly={isReadOnly}
-        onFilterChanged={onFilterChanged}
+        onFilterChanged={updateRowCount}
+        onRowDataUpdated={updateRowCount}
        {...bottomPlaceholderProps}
      />
      <div className="pointer-events-none absolute inset-0">
@@ -14,12 +14,12 @@ import {
  PriceFlashCell,
  signedNumberCssClass,
  signedNumberCssClassRules,
+  MarketNameCell,
 } from '@vegaprotocol/datagrid';
 import {
  ButtonLink,
  Tooltip,
  TooltipCellComponent,
-  Link,
  ExternalLink,
  Icon,
  ProgressBarCell,
@@ -43,7 +43,7 @@ import { useEnvironment } from '@vegaprotocol/environment';

 interface Props extends TypedDataAgGrid<Position> {
  onClose?: (data: Position) => void;
-  onMarketClick?: (id: string) => void;
+  onMarketClick?: (id: string, metaKey?: boolean) => void;
  style?: CSSProperties;
  isReadOnly: boolean;
 }
@@ -96,26 +96,19 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
          filterParams: { buttons: ['reset'] },
          tooltipComponent: TooltipCellComponent,
        }}
-        components={{ AmountCell, PriceFlashCell, ProgressBarCell }}
+        components={{
+          AmountCell,
+          PriceFlashCell,
+          ProgressBarCell,
+          MarketNameCell,
+        }}
        {...props}
      >
        <AgGridColumn
          headerName={t('Market')}
          field="marketName"
-          cellRenderer={({
-            value,
-            data,
-          }: VegaICellRendererParams<Position, 'marketName'>) =>
-            onMarketClick ? (
-              <Link
-                onClick={() => data?.marketId && onMarketClick(data?.marketId)}
-              >
-                {value}
-              </Link>
-            ) : (
-              value
-            )
-          }
+          cellRenderer="MarketNameCell"
+          cellRendererParams={{ idPath: 'marketId', onMarketClick }}
          minWidth={190}
        />
        <AgGridColumn
@@ -54,7 +54,12 @@ export const Checkbox = ({
          )}
        </CheckboxPrimitive.CheckboxIndicator>
      </CheckboxPrimitive.Root>
-      <label htmlFor={name} className="text-sm">
+      <label
+        htmlFor={name}
+        className={classNames('text-sm', {
+          'dark:text-neutral-400 text-neutral-600': disabled,
+        })}
+      >
        {label}
      </label>
    </div>
@@ -45,6 +45,7 @@ export interface OrderSubmission {
  size: string;
  price?: string;
  expiresAt?: string;
+  postOnly?: boolean;
  reduceOnly?: boolean;
 }

@@ -48,6 +48,8 @@ export const normalizeOrderSubmission = (
    order.expiresAt && order.timeInForce === OrderTimeInForce.TIME_IN_FORCE_GTT
      ? toNanoSeconds(order.expiresAt)
      : undefined,
+  postOnly: order.postOnly,
+  reduceOnly: order.reduceOnly,
 });

 export const normalizeOrderAmendment = <T extends Exact<OrderAmendment, T>>(
@@ -11,7 +11,8 @@
    "build:all": "nx run-many --all --target=build",
    "lint:all": "nx run-many --all --target=lint",
    "e2e:all": "nx run-many --all --target=e2e",
-    "vegacapsule": "vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl"
+    "vegacapsule": "vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl",
+    "release": "git checkout develop ; git pull ; node scripts/make-release.js"
  },
  "engines": {
    "node": ">=16.15.1"
@@ -166,6 +167,7 @@
    "flush-promises": "^1.0.2",
    "glob": "^8.0.3",
    "husky": "^7.0.4",
+    "inquirer": "^8.0.0",
    "jest": "27.5.1",
    "jest-canvas-mock": "^2.3.1",
    "jest-websocket-mock": "^2.3.0",
@@ -0,0 +1,82 @@
+const { execSync } = require('child_process');
+const inquirer = require('inquirer');
+
+const getTags = (take) => {
+  const tags = execSync(
+    "git for-each-ref --sort=taggerdate --format '%(refname)' refs/tags"
+  )
+    .toString()
+    .trim()
+    .split('\n')
+    .map((t) => t.replace('refs/tags/', ''))
+    .reverse()
+    .slice(0, take);
+  return tags;
+};
+
+const getReleaseBranches = () => {
+  const branches = execSync('git branch --remote | grep origin/release/')
+    .toString()
+    .trim()
+    .split('\n')
+    .map((b) => b.trim().replace('origin/release/', ''));
+  return branches;
+};
+
+const release = (tag, branch) => {
+  const steps = [
+    `git checkout ${branch}`,
+    'git pull',
+    `git reset --hard ${tag}`,
+    'git push --force',
+  ];
+  try {
+    for (const cmd of steps) {
+      const result = execSync(cmd).toString();
+    }
+  } catch (err) {
+    console.error('Could not make a release');
+  }
+};
+
+inquirer
+  .prompt([
+    {
+      type: 'list',
+      name: 'tag',
+      message: 'What version would you like to release?',
+      choices: getTags(),
+    },
+    {
+      type: 'checkbox',
+      name: 'envs',
+      message: 'To what environment you wish to release?',
+      choices: ['mainnet', ...getReleaseBranches()],
+      validate(answer) {
+        return answer.length > 0;
+      },
+    },
+  ])
+  .then((answers) => {
+    inquirer
+      .prompt({
+        type: 'confirm',
+        name: 'sure',
+        message: `Are you sure? This will release ${
+          answers.tag
+        } to ${answers.envs.join(', ')}`,
+      })
+      .then(() => {
+        for (const env of answers.envs) {
+          const branch = env === 'mainnet' ? 'master' : `release/${env}`;
+          release(answers.tag, branch);
+        }
+        execSync('git checkout develop');
+      })
+      .catch((err) => {
+        console.log('Something went wrong', err.toString());
+      });
+  })
+  .catch((err) => {
+    console.log('Something went wrong', err.toString());
+  });
Author	SHA1	Message	Date
Matthew Russell	1531da364d	chore: delete references to sandbox or mirror	2023-04-03 11:59:16 -07:00
Matthew Russell	59fd11520a	chore: delete rest of sandbox/mirror env files	2023-04-03 11:56:27 -07:00
dexturr	662753c74b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-03 18:09:46 +00:00
daro-majandm.ray	71aa8882bc	test(trading): renders correctly liquidity in trading tab (#3343 ) Co-authored-by: m.ray <16125548+MadalinaRaicu@users.noreply.github.com>	2023-04-03 14:33:10 +00:00
Mikołaj Młodzikowski	ecfbccf8ed	feat(trading,governance,explorer): dist on s3 (#3332 )	2023-04-03 15:53:50 +02:00
Bartłomiej Głownia	2aad6b1a14	feat(deal-ticket): show total margin available for an order, and where it will come from (#3318 )	2023-04-03 15:17:23 +02:00
Bartłomiej Głownia	8463d371ad	chore(trading): liquidity table DRY (#3346 )	2023-04-03 15:02:43 +02:00
dexturr	0914e7ce4b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-03 12:08:48 +00:00
Maciek	7c82144f37	chore(trading): add metaKey detection - clean up some unit tests (#3337 )	2023-04-03 10:20:20 +02:00
Joe Tsang	17ad0cc975	test(governance): add e2e tests for banner and footer links (#3340 )	2023-04-03 09:16:42 +01:00
dexturr	eb58dcd350	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-03 06:09:59 +00:00
dexturr	c8c0bf2cc0	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-03 00:16:15 +00:00
dexturr	00579fcb1f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-02 18:06:45 +00:00
dexturr	5e13173efb	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-02 12:09:35 +00:00
dexturr	3a6c0554cc	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-02 06:06:55 +00:00
dexturr	d4b237a6ba	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-02 00:17:15 +00:00
dexturr	5e765f3172	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-01 18:07:57 +00:00
dexturr	5ef8c11e6e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-01 12:07:28 +00:00
dexturr	84bae12def	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-01 06:06:47 +00:00
dexturr	c5b22f5bfb	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-01 00:14:47 +00:00
dexturr	071dcc61a8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-31 18:09:16 +00:00
m.ray	ce0ccdfebc	feat(trading): add post only and reduce only orders (#3311 )	2023-03-31 17:00:55 +01:00
Art	f1524d3fcd	feat(utils): make release script (#3290 )	2023-03-31 17:01:19 +02:00
MaciekandMatthew Russell	82e5128ba1	chore(trading): add "holding CMD + click" external link (#3273 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-03-31 15:23:44 +02:00
Maciek	2bfc3abd15	chore(trading): liquidity provision, change query for set flag live on true (#3335 )	2023-03-31 14:20:44 +01:00