ci: separate capsule test run from non capsule test run

fix: 1569 trading tab navigation update (#1573 )
* fix: #1569 trading tab navigation update * fix: #1569 get market id value from init
2022-09-30 19:32:15 -07:00 · 2022-09-30 16:50:48 +01:00 · 2022-09-30 16:51:41 +02:00 · 2022-09-30 15:42:42 +02:00 · 2022-09-30 12:04:57 +00:00 · 2022-09-30 11:02:55 +02:00
197 changed files with 5287 additions and 1780 deletions
@@ -0,0 +1,31 @@
+inputs:
+  all:
+    description: 'Install all binaries'
+    default: false
+  version:
+    description: 'Vega version'
+  gobin:
+    description: 'GOBIN path'
+    default: '/home/runner/go/bin'
+runs:
+  using: 'composite'
+  steps:
+    - name: Install Vega binaries
+      if: ${{ inputs.all }}
+      shell: bash
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip' -q
+        unzip vega-linux-amd64.zip -d ${{ inputs.gobin }}
+
+    - name: Install date-node binaries
+      if: ${{ inputs.all  }}
+      shell: bash
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip' -q
+        unzip data-node-linux-amd64.zip -d ${{ inputs.gobin }}
+
+    - name: Install Vega wallet binaries
+      shell: bash
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip' -q
+        unzip vegawallet-linux-amd64.zip -d ${{ inputs.gobin }}
@@ -0,0 +1,30 @@
+inputs:
+  github-token:
+    description: 'github token'
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout capsule
+      uses: actions/checkout@v2
+      with:
+        repository: vegaprotocol/vegacapsule
+        ref: main
+        token: ${{ inputs.github-token }}
+        path: './capsule'
+
+    - name: Build capsule
+      run: go install
+      shell: bash
+      working-directory: capsule
+
+    - name: Login to docker
+      shell: bash
+      run: echo -n ${{ inputs.github-token }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
+
+    - name: Start nomad
+      shell: bash
+      run: vegacapsule nomad &
+
+    - name: Bootstrap network
+      shell: bash
+      run: vegacapsule network bootstrap --config-path=./frontend-monorepo/vegacapsule/config.hcl --force
@@ -0,0 +1,30 @@
+inputs:
+  recovery:
+    description: 'Recovery phrase'
+  passphrase:
+    description: 'Wallet password'
+  capsule:
+    description: 'Is Capsule network used'
+    default: false
+runs:
+  using: 'composite'
+  steps:
+    - name: Create passphrase
+      shell: bash
+      run: echo "${{ inputs.passphrase }}" > ./passphrase
+
+    - name: Create recovery
+      shell: bash
+      run: echo "${{ inputs.recovery }}" > ./recovery
+
+    - name: Initialize wallet
+      shell: bash
+      run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
+
+    - name: Import wallet
+      shell: bash
+      run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+
+    - name: Create public key 2
+      shell: bash
+      run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
@@ -1,4 +1,4 @@
-name: Capsule tests -- manual trigger
+name: Cypress tests -- manual trigger

 # This workflow runs the frontend tests against chosen branch

@@ -15,20 +15,43 @@ on:
          - stats-e2e
          - token-e2e
          - trading-e2e
-      runAlltests:
+      smokeOnly:
        description: 'Run only smoke tests?'
        required: true
        type: boolean
        default: false
+      skip-nx-cache:
+        description: 'Add --skip-nx-cache to cypress test'
+        required: false
+        type: boolean
+        default: false

 jobs:
  manual:
-    name: Run capsule tests -- manual trigger
+    name: Run Cypress tests -- manual trigger
    runs-on: self-hosted
    env:
      GO111MODULE: 'on'
-      VEGA_VERSION: 'v0.56.0'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.57.0'
    steps:
+      #######
+      ## Setup flags
+      #######
+
+      - name: Set smoke tag
+        if: ${{ github.event.inputs.smokeOnly == 'true' }}
+        run: echo TAGS="--env.grepTags @smoke" >> $GITHUB_ENV
+
+      - name: Set --skip-nx-cache flag
+        if: ${{ github.event.inputs.skip-nx-cache == 'true' }}
+        run: echo SKIP_NX_CACHE="--skip-nx-cache" >> $GITHUB_ENV
+
+      # See if we capsule is needed for this project
+      - name: Set capsule flag
+        if: ${{  github.event.inputs.project == 'explorer-e2e' || github.event.inputs.project == 'token-e2e' }}
+        run: echo RUN_CAPSULE=true >> $GITHUB_ENV
+
      #######
      ## Setup langs
      #######
@@ -37,6 +60,7 @@ jobs:
        id: go
        with:
          go-version: 1.19
+
      - name: Set up Node 16
        uses: actions/setup-node@v2
        id: npm
@@ -57,25 +81,9 @@ jobs:
      - name: Checkout frontend mono repo
        uses: actions/checkout@v2
        with:
-          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

-      # See if we capsule is needed for this project
-      - name: See if capsule is necessary
-        if: ${{  github.event.inputs.project == 'explorer-e2e' || github.event.inputs.project == 'token-e2e' }}
-        run: echo RUN_CAPSULE=true >> $GITHUB_ENV
-
-      # Checkout capsule to build local network
-      - name: Checkout capsule
-        if: ${{ env.RUN_CAPSULE }}
-        uses: actions/checkout@v2
-        with:
-          repository: vegaprotocol/vegacapsule
-          ref: main
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-          path: './capsule'
-
      # Restore node_modules from cache if possible
      - name: Restore node_modules from cache
        uses: actions/cache@v3
@@ -91,75 +99,32 @@ jobs:
        working-directory: frontend-monorepo

      #######
-      ## Build binaries
+      ## Build and run Vegacapsule network
      #######
-      - name: Build capsule
-        if: ${{ env.RUN_CAPSULE }}
-        run: go install
-        working-directory: capsule
-
-      - name: Set GOBIN
-        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV

      - name: Install Vega binaries
-        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip'
-          unzip vega-linux-amd64.zip -d ${{ env.GOBIN }}
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}

-      - name: Install date-node binaries
+      - name: Build and run Vegacapsule network
        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip'
-          unzip data-node-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      - name: Install Vega wallet binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip'
-          unzip vegawallet-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      ######
-      ## Start capsule
-      ######
-      - name: Login to docker
-        if: ${{ env.RUN_CAPSULE }}
-        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
-
-      - name: Start nomad
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule nomad &
-
-      - name: Bootstrap network
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl --force
-        working-directory: capsule
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######
-      - name: Create passphrase
-        run: echo "${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}" > ./passphrase
-      - name: Create recovery
-        run: echo "${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}" > ./recovery

-      - name: Initialize wallet
-        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
-      - name: Import wallet
-        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Create public key 2
-        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-      - name: Import fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks/master/fairground/fairground.toml" --force --home ~/.vegacapsule/testnet/wallet
-
-      - name: Start service using fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet service run --network fairground --automatic-consent --home ~/.vegacapsule/testnet/wallet &
-
-      - name: Start service using capsule network
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}

      ######
      ## Run some tests
@@ -170,24 +135,13 @@ jobs:
        run: yarn cypress install
        working-directory: frontend-monorepo

-      - name: Run smoke Cypress tests
-        if: ${{ github.event.inputs.runAlltests == 'true' }}
-        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke'
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
-
      - name: Run Cypress tests
-        if: ${{ github.event.inputs.runAlltests == 'false' }}
-        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
+        run: yarn nx run ${{ github.event.inputs.project }}:e2e ${{ env.SKIP_NX_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ env.TAGS }}
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

      ######
@@ -1,4 +1,4 @@
-name: Capsule tests -- night run
+name: Cypress tests -- night run

 # This workflow runs the frontend tests against latest develop of the core to preempt breaking changes

@@ -8,11 +8,14 @@ on:

 jobs:
  nightly:
-    name: Run capsule tests -- nightly
+    name: Run Cypress tests -- nightly
    runs-on: self-hosted
+    timeout-minutes: 60
    env:
      GO111MODULE: 'on'
-      VEGA_VERSION: 'v0.56.0'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.57.0'
+      RUN_CAPSULE: true
    steps:
      #######
      ## Setup langs
@@ -42,19 +45,9 @@ jobs:
      - name: Checkout frontend mono repo
        uses: actions/checkout@v2
        with:
-          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

-      # Checkout capsule to build local network
-      - name: Checkout capsule
-        uses: actions/checkout@v2
-        with:
-          repository: vegaprotocol/vegacapsule
-          ref: main
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-          path: './capsule'
-
      # Restore node_modules from cache if possible
      - name: Restore node_modules from cache
        uses: actions/cache@v3
@@ -70,59 +63,32 @@ jobs:
        working-directory: frontend-monorepo

      #######
-      ## Build binaries
+      ## Build and run Vegacapsule network
      #######
-      - name: Build capsule
-        run: go install
-        working-directory: capsule
-
-      - name: Set GOBIN
-        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV

      - name: Install Vega binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip'
-          unzip vega-linux-amd64.zip -d ${{ env.GOBIN }}
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}

-      - name: Install date-node binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip'
-          unzip data-node-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      - name: Install Vega wallet binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip'
-          unzip vegawallet-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      ######
-      ## Start capsule
-      ######
-      - name: Login to docker
-        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
-
-      - name: Start nomad
-        run: vegacapsule nomad &
-
-      - name: Bootstrap network
-        run: vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl --force
-        working-directory: capsule
+      - name: Build and run Vegacapsule network
+        if: ${{ env.RUN_CAPSULE }}
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######
-      - name: Create passphrase
-        run: echo "${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}" > ./passphrase
-      - name: Create recovery
-        run: echo "${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}" > ./recovery

-      - name: Initialize wallet
-        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
-      - name: Import wallet
-        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Create public key 2
-        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Start service
-        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}

      ######
      ## Run some tests
@@ -134,12 +100,12 @@ jobs:
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: yarn nx run-many --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
+        run: yarn nx run-many --skip-nx-cache --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_NIGHTLY_RUN: true
          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

@@ -1,4 +1,4 @@
-name: Capsule tests
+name: Capsule Cypress tests

 on:
  push:
@@ -14,11 +14,13 @@ on:

 jobs:
  pr:
-    name: Run capsule tests - PR
+    name: Run Cypress tests - PR
    runs-on: self-hosted
+    timeout-minutes: 30
    env:
      GO111MODULE: 'on'
-      VEGA_VERSION: 'v0.56.0'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.57.0'
    steps:
      #######
      ## Setup langs
@@ -28,6 +30,7 @@ jobs:
        id: go
        with:
          go-version: 1.19
+
      - name: Set up Node 16
        uses: actions/setup-node@v2
        id: npm
@@ -48,7 +51,6 @@ jobs:
      - name: Checkout frontend mono repo
        uses: actions/checkout@v2
        with:
-          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

@@ -66,118 +68,61 @@ jobs:
        run: yarn install --frozen-lockfile
        working-directory: frontend-monorepo

-      # See affected apps to see if building all binaries is necessary
-      - name: See affected apps
-        run: echo AFFECTED=$(yarn nx print-affected --base=origin/${{github.base_ref}} --head=${{github.head_ref}} --select=projects) >> $GITHUB_ENV
-        working-directory: frontend-monorepo
-
-      - name: See if capsule is necessary
-        if: ${{ contains(env.AFFECTED, 'token') || contains(env.AFFECTED, 'token-e2e') || contains(env.AFFECTED, 'explorer') || contains(env.AFFECTED, 'explorer-e2e') }}
-        run: echo RUN_CAPSULE=true >> $GITHUB_ENV
-
-      # Checkout capsule to build local network
-      - name: Checkout capsule
-        if: ${{ env.RUN_CAPSULE }}
-        uses: actions/checkout@v2
+      # Check SHAs
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
        with:
-          repository: vegaprotocol/vegacapsule
-          ref: main
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-          path: './capsule'
+          working-directory: frontend-monorepo
+          main-branch-name: ${{ github.base_ref || github.ref_name }}
+          set-environment-variables-for-job: true

      #######
-      ## Build binaries
+      ## Build and run Vegacapsule network
      #######
-      - name: Build capsule
-        if: ${{ env.RUN_CAPSULE }}
-        run: go install
-        working-directory: capsule
-
-      - name: Set GOBIN
-        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV

      - name: Install Vega binaries
-        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip'
-          unzip vega-linux-amd64.zip -d ${{ env.GOBIN }}
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}

-      - name: Install date-node binaries
-        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip'
-          unzip data-node-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      - name: Install Vega wallet binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip'
-          unzip vegawallet-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      ######
-      ## Start capsule
-      ######
-      - name: Login to docker
-        if: ${{ env.RUN_CAPSULE }}
-        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
-
-      - name: Start nomad
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule nomad &
-
-      - name: Bootstrap network
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl --force
-        working-directory: capsule
+      - name: Build and run Vegacapsule network
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######
-      - name: Create passphrase
-        run: echo "${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}" > ./passphrase
-      - name: Create recovery
-        run: echo "${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}" > ./recovery

-      - name: Initialize wallet
-        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
-      - name: Import wallet
-        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Create public key 2
-        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-      - name: Import fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks/master/fairground/fairground.toml" --force --home ~/.vegacapsule/testnet/wallet
-
-      - name: Start service using fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet service run --network fairground --automatic-consent --home ~/.vegacapsule/testnet/wallet &
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: true

      - name: Start service using capsule network
-        if: ${{ env.RUN_CAPSULE }}
+        shell: bash
+        if: ${{ inputs.capsule }}
        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &

      ######
      ## Run some tests
      ######

-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          working-directory: frontend-monorepo
-          main-branch-name: ${{github.base_ref}}
-
      # To make sure that all Cypress binaries are installed properly
      - name: Install cypress bins
        run: yarn cypress install
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke'
+        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke' --browser chrome --exclude=trading,trading-e2e,console-lite,console-lite-e2e
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

      ######
@@ -185,11 +130,9 @@ jobs:
      ######

      - name: Logs
-        if: ${{ env.RUN_CAPSULE }}
        run: vegacapsule network logs > vega-capsule-logs.txt

      - uses: actions/upload-artifact@v2
-        if: ${{ env.RUN_CAPSULE }}
        with:
          name: logs
          path: ./vega-capsule-logs.txt
@@ -0,0 +1,124 @@
+name: Cypress tests
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  pr:
+    name: Run Cypress tests - PR
+    runs-on: self-hosted
+    timeout-minutes: 30
+    env:
+      GO111MODULE: 'on'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.57.0'
+    steps:
+      #######
+      ## Setup langs
+      #######
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        id: go
+        with:
+          go-version: 1.19
+
+      - name: Set up Node 16
+        uses: actions/setup-node@v2
+        id: npm
+        with:
+          node-version: 16
+
+      #######
+      ## Install Yarn
+      #######
+      - name: Setup yarn
+        run: npm install -g yarn
+
+      #######
+      ## Checkout repos
+      #######
+
+      # Checkout front ends
+      - name: Checkout frontend mono repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          path: './frontend-monorepo'
+
+      # Restore node_modules from cache if possible
+      - name: Restore node_modules from cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            frontend-monorepo/node_modules
+            /home/runner/.cache/Cypress
+          key: node_modules_cypress-${{ hashFiles('frontend-monorepo/yarn.lock') }}
+
+      # Install frontend dependencies
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile
+        working-directory: frontend-monorepo
+
+      # Check SHAs
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
+        with:
+          working-directory: frontend-monorepo
+          main-branch-name: ${{ github.base_ref || github.ref_name }}
+          set-environment-variables-for-job: true
+
+      #######
+      ## Install Vega wallet
+      #######
+
+      - name: Install Vega wallet binaries
+        shell: bash
+        run: |
+          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip' -q
+          unzip vegawallet-linux-amd64.zip -d ${{ env.GOBIN }}
+
+      ######
+      ## Setup a Vega wallet for our user
+      ######
+
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: false
+
+      - name: Import fairground network
+        shell: bash
+        run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks/master/fairground/fairground.toml" --force --home ~/.vegacapsule/testnet/wallet
+
+      - name: Start service using fairground network
+        shell: bash
+        run: vegawallet service run --network fairground --automatic-consent --home ~/.vegacapsule/testnet/wallet &
+
+      ######
+      ## Run some tests
+      ######
+
+      # To make sure that all Cypress binaries are installed properly
+      - name: Install cypress bins
+        run: yarn cypress install
+        working-directory: frontend-monorepo
+
+      - name: Run Cypress tests
+        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke' --browser chrome --exclude=explorer,explorer-e2e,token,token-e2e
+        working-directory: frontend-monorepo
+        env:
+          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
@@ -30,6 +30,10 @@ An application for the status of the Vega network. Showing block height and othe

 Hosting for static content being shared across apps, for example fonts.

+### [Multisig-signer](./apps/multisig-signer)
+
+The utility dApp for validators wishing to add or remove themselves as a signer of the multisig contract.
+
 # 🧱 Libraries in this repo

 ### [UI toolkit](./libs/ui-toolkit)
@@ -299,7 +299,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
      cy.getByTestId('place-order').click();
      cy.getByTestId('dialog-title').should(
        'have.text',
-        'Confirm transaction in wallet'
+        'Awaiting network confirmation'
      );
    }
  });
@@ -56,7 +56,7 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
    });

    it('data should be properly rendered', () => {
-      cy.get('.ag-center-cols-container .ag-row').should('have.length', 5);
+      cy.get('.ag-center-cols-container .ag-row').should('have.length', 3);
      cy.get(
        '.ag-center-cols-container [row-id="ACCOUNT_TYPE_GENERAL-asset-id-null"]'
      )
@@ -77,7 +77,7 @@ export const protoCandles = [
 ];

 export const protoMarket: Market = {
-  id: 'first-btcusd-id',
+  id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
  tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
  state: MarketState.STATE_ACTIVE,
  decimalPlaces: 5,
@@ -1,7 +1,7 @@
 export const generateDealTicket = () => {
  return {
    market: {
-      id: 'first-btcusd-id',
+      id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
      decimalPlaces: 5,
      positionDecimalPlaces: 0,
      state: 'STATE_ACTIVE',
@@ -21,7 +21,7 @@ export const generateMarketPositions = () => {
          },
          balance: '265329',
          market: {
-            id: 'first-btcusd-id',
+            id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
            __typename: 'Market',
          },
        },
@@ -43,7 +43,7 @@ export const generateMarketPositions = () => {
            node: {
              openVolume: '12',
              market: {
-                id: 'first-btcusd-id',
+                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
                __typename: 'Market',
              },
              __typename: 'Position',
@@ -31,6 +31,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -50,6 +52,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -69,6 +73,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -88,6 +94,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -106,6 +114,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      createdAt: new Date(2020, 1, 27).toISOString(),
      updatedAt: null,
      expiresAt: null,
+      liquidityProvision: null,
+      peggedOrder: null,
      rejectionReason: null,
    },
  ];
@@ -105,9 +105,7 @@ const ConsoleLiteGrid = <T extends { id?: string }>(
  );
 };

-const ConsoleLiteGridForwarder = forwardRef(ConsoleLiteGrid) as <
-  T extends { id?: string }
->(
+const ConsoleLiteGridForwarder = forwardRef(ConsoleLiteGrid) as <T>(
  p: Props<T> & { ref?: React.Ref<AgGridReact> }
 ) => React.ReactElement;

@@ -1,16 +1,10 @@
-import { useMemo, useRef } from 'react';
+import { useMemo, useRef, useCallback } from 'react';
 import { useOutletContext } from 'react-router-dom';
 import type { AgGridReact } from 'ag-grid-react';
 import { PriceCell, useDataProvider } from '@vegaprotocol/react-helpers';
-import type {
-  AccountFieldsFragment,
-  AccountEventsSubscription,
-} from '@vegaprotocol/accounts';
-import {
-  accountsDataProvider,
-  accountsManagerUpdate,
-  getId,
-} from '@vegaprotocol/accounts';
+import type { AccountFields } from '@vegaprotocol/accounts';
+import { aggregatedAccountsDataProvider, getId } from '@vegaprotocol/accounts';
+import type { IGetRowsParams } from 'ag-grid-community';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import {
  AssetDetailsDialog,
@@ -20,20 +14,43 @@ import { NO_DATA_MESSAGE } from '../../../constants';
 import { ConsoleLiteGrid } from '../../console-lite-grid';
 import { useAccountColumnDefinitions } from '.';

-interface AccountObj extends AccountFieldsFragment {
-  id: string;
-}
-
 const AccountsManager = () => {
  const { partyId = '' } = useOutletContext<{ partyId: string }>();
  const { isOpen, symbol, setOpen } = useAssetDetailsDialogStore();
  const gridRef = useRef<AgGridReact | null>(null);
+  const dataRef = useRef<AccountFields[] | null>(null);
  const variables = useMemo(() => ({ partyId }), [partyId]);
-  const update = useMemo(() => accountsManagerUpdate(gridRef), []);
-  const { data, error, loading } = useDataProvider<
-    AccountFieldsFragment[],
-    AccountEventsSubscription['accounts']
-  >({ dataProvider: accountsDataProvider, update, variables });
+  const update = useCallback(
+    ({ data }: { data: AccountFields[] | null }) => {
+      if (!gridRef.current?.api) {
+        return false;
+      }
+      if (dataRef.current?.length) {
+        dataRef.current = data;
+        gridRef.current.api.refreshInfiniteCache();
+        return true;
+      }
+      return false;
+    },
+    [gridRef]
+  );
+  const { data, error, loading } = useDataProvider<AccountFields[], never>({
+    dataProvider: aggregatedAccountsDataProvider,
+    update,
+    variables,
+  });
+  dataRef.current = data;
+  const getRows = async ({
+    successCallback,
+    startRow,
+    endRow,
+  }: IGetRowsParams) => {
+    const rowsThisBlock = dataRef.current
+      ? dataRef.current.slice(startRow, endRow)
+      : [];
+    const lastRow = dataRef.current?.length ?? -1;
+    successCallback(rowsThisBlock, lastRow);
+  };
  const { columnDefs, defaultColDef } = useAccountColumnDefinitions();
  return (
    <>
@@ -43,8 +60,11 @@ const AccountsManager = () => {
        data={data}
        noDataMessage={NO_DATA_MESSAGE}
      >
-        <ConsoleLiteGrid<AccountObj>
-          rowData={data as AccountObj[]}
+        <ConsoleLiteGrid<AccountFields>
+          rowData={data?.length ? undefined : []}
+          rowModelType={data?.length ? 'infinite' : 'clientSide'}
+          ref={gridRef}
+          datasource={{ getRows }}
          columnDefs={columnDefs}
          defaultColDef={defaultColDef}
          components={{ PriceCell }}
@@ -1,45 +1,9 @@
 import React, { useMemo } from 'react';
 import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
-import type { SummaryRow } from '@vegaprotocol/react-helpers';
-import type { AccountFieldsFragment } from '@vegaprotocol/accounts';
+import type { AccountFields } from '@vegaprotocol/accounts';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import type {
-  ColDef,
-  GroupCellRendererParams,
-  ValueFormatterParams,
-} from 'ag-grid-community';
-import type { AccountType } from '@vegaprotocol/types';
-import { AccountTypeMapping } from '@vegaprotocol/types';
-
-interface AccountsTableValueFormatterParams extends ValueFormatterParams {
-  data: AccountFieldsFragment;
-}
-
-const comparator = (
-  valueA: string,
-  valueB: string,
-  nodeA: { data: AccountFieldsFragment & SummaryRow },
-  nodeB: { data: AccountFieldsFragment & SummaryRow },
-  isInverted: boolean
-) => {
-  if (valueA < valueB) {
-    return -1;
-  }
-
-  if (valueA > valueB) {
-    return 1;
-  }
-
-  if (nodeA.data.__summaryRow) {
-    return isInverted ? -1 : 1;
-  }
-
-  if (nodeB.data.__summaryRow) {
-    return isInverted ? 1 : -1;
-  }
-
-  return 0;
-};
+import type { ColDef, GroupCellRendererParams } from 'ag-grid-community';
+import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';

 const useAccountColumnDefinitions = () => {
  const { open } = useAssetDetailsDialogStore();
@@ -49,7 +13,6 @@ const useAccountColumnDefinitions = () => {
        colId: 'account-asset',
        headerName: t('Asset'),
        field: 'asset.symbol',
-        comparator,
        headerClass: 'uppercase justify-start',
        cellClass: 'uppercase flex h-full items-center md:pl-4',
        cellRenderer: ({ value }: GroupCellRendererParams) =>
@@ -71,28 +34,34 @@ const useAccountColumnDefinitions = () => {
          ),
      },
      {
-        colId: 'type',
-        headerName: t('Type'),
-        field: 'type',
-        cellClass: 'uppercase !flex h-full items-center',
-        valueFormatter: ({ value }: ValueFormatterParams) =>
-          value ? AccountTypeMapping[value as AccountType] : '-',
-      },
-      {
-        colId: 'market',
-        headerName: t('Market'),
-        cellClass: 'uppercase !flex h-full items-center',
-        field: 'market.tradableInstrument.instrument.name',
-        valueFormatter: "value || '—'",
-      },
-      {
-        colId: 'balance',
-        headerName: t('Balance'),
-        field: 'balance',
-        cellClass: 'uppercase !flex h-full items-center',
+        colId: 'deposited',
+        headerName: t('Deposited'),
+        field: 'deposited',
        cellRenderer: 'PriceCell',
-        valueFormatter: ({ value, data }: AccountsTableValueFormatterParams) =>
-          addDecimalsFormatNumber(value, data.asset.decimals),
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<AccountFields, 'deposited'>) => {
+          if (value && data) {
+            return addDecimalsFormatNumber(value, data.asset.decimals);
+          }
+          return '-';
+        },
+      },
+      {
+        colId: 'used',
+        headerName: t('Used'),
+        field: 'used',
+        cellRenderer: 'PriceCell',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<AccountFields, 'used'>) => {
+          if (value && data) {
+            return addDecimalsFormatNumber(value, data.asset.decimals);
+          }
+          return '-';
+        },
      },
    ];
  }, [open]);
@@ -17,11 +17,11 @@ const getRowId = ({ data }: { data: Position }) => data.marketId;

 const PositionsAsset = ({ partyId, assetSymbol }: Props) => {
  const gridRef = useRef<AgGridReact | null>(null);
-  const { data, error, loading, getRows } = usePositionsData({
+  const { data, error, loading, getRows } = usePositionsData(
    partyId,
-    assetSymbol,
    gridRef,
-  });
+    assetSymbol
+  );
  const { columnDefs, defaultColDef } = useColumnDefinitions();
  return (
    <AsyncRenderer loading={loading} error={error} data={data}>
@@ -6,9 +6,7 @@ import PositionsAsset from './positions-asset';

 const Positions = () => {
  const { partyId } = useOutletContext<{ partyId: string }>();
-  const { data, error, loading, assetSymbols } = usePositionsAssets({
-    partyId,
-  });
+  const { data, error, loading, assetSymbols } = usePositionsAssets(partyId);
  return (
    <AsyncRenderer loading={loading} error={error} data={data}>
      {assetSymbols && assetSymbols.length > 0 && (
@@ -11,7 +11,7 @@ import type {
  PositionsTableValueFormatterParams,
  Position,
 } from '@vegaprotocol/positions';
-import { AmountCell, ProgressBarCell } from '@vegaprotocol/positions';
+import { AmountCell } from '@vegaprotocol/positions';
 import type {
  CellRendererSelectorResult,
  ICellRendererParams,
@@ -20,7 +20,7 @@ import type {
  ColDef,
 } from 'ag-grid-community';
 import { MarketTradingMode } from '@vegaprotocol/types';
-import { Intent } from '@vegaprotocol/ui-toolkit';
+import { Intent, ProgressBarCell } from '@vegaprotocol/ui-toolkit';

 const EmptyCell = () => '';

@@ -70,6 +70,7 @@ const SimpleMarketList = () => {
          rowData={localData}
          defaultColDef={defaultColDef}
          handleRowClicked={handleRowClicked}
+          getRowId={({ data }) => data.id}
        />
      </AsyncRenderer>
    </div>
@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "@nrwl/react/babel",
+      {
+        "runtime": "automatic"
+      }
+    ]
+  ],
+  "plugins": []
+}
@@ -0,0 +1,16 @@
+# This file is used by:
+# 1. autoprefixer to adjust CSS to support the below specified browsers
+# 2. babel preset-env to adjust included polyfills
+#
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+#
+# If you need to support different browsers in production, you may tweak the list below.
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major version
+last 2 iOS major versions
+Firefox ESR
+not IE 9-11 # For IE 9-11 support, remove 'not'.
@@ -0,0 +1,4 @@
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
+NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
+NX_VEGA_ENV=STAGNET3
@@ -0,0 +1,5 @@
+# App configuration variables
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
+NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
+NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
+NX_VEGA_ENV=DEVNET
@@ -0,0 +1,5 @@
+# App configuration variables
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
+NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
+NX_VEGA_ENV=MAINNET
@@ -0,0 +1,5 @@
+# App configuration variables
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
+NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
+NX_VEGA_ENV=STAGNET3
@@ -0,0 +1,5 @@
+# App configuration variables
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
+NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
+NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
+NX_VEGA_ENV=TESTNET
@@ -0,0 +1,18 @@
+{
+  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*", "__generated__", "__generated___"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
@@ -0,0 +1,46 @@
+## Multisig-signer
+
+## Development
+
+First copy the configuration of the application you are starting:
+
+```bash
+cp .env.[environment] .env.local
+```
+
+Starting the app:
+
+```bash
+yarn nx serve multisig-signer
+```
+
+### Configuration
+
+Example configurations are provided here:
+
+- [Mainnet](./.env.mainnet)
+- [Devnet](./.env.devnet)
+- [Capsule](./.env.capsule)
+- [Testnet](./.env.testnet)
+- [Stagnet3](./.env.stagnet3)
+
+For convenience, you can boot the app injecting one of the configurations above by running:
+
+```bash
+yarn nx run multisig-signer:serve --env={env} # e.g. stagnet3
+```
+
+There are a few different configuration options offered for this app:
+
+| **Flag** | **Purpose** |
+| -------------------------------- | ---------------------------------------------------------------------------------------------------- | --- | |
+| `NX_VEGA_URL` | The GraphQl query endpoint of a [Vega data node](https://github.com/vegaprotocol/networks#data-node) |
+| `NX_VEGA_ENV` | The name of the currently connected vega environment |
+
+## Testing
+
+To run the minimal set of unit tests, run the following:
+
+```bash
+yarn nx test multisig-signer
+```
@@ -0,0 +1,5 @@
+/// <reference types="react-scripts" />
+
+interface Window {
+  _env_?: Record<string, string>;
+}
@@ -0,0 +1,12 @@
+/* eslint-disable */
+export default {
+  displayName: 'multisig-signer',
+  preset: '../../jest.preset.js',
+  transform: {
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
+    '^.+\\.[tj]sx?$': 'babel-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../coverage/apps/multisig-signer',
+  setupFilesAfterEnv: ['./src/app/setup-tests.ts'],
+};
@@ -0,0 +1,4 @@
+[[redirects]]
+  from = "/*"
+  to = "/index.html"
+  status = 200
@@ -0,0 +1,10 @@
+const { join } = require('path');
+
+module.exports = {
+  plugins: {
+    tailwindcss: {
+      config: join(__dirname, 'tailwind.config.js'),
+    },
+    autoprefixer: {},
+  },
+};
@@ -0,0 +1,80 @@
+{
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/multisig-signer/src",
+  "projectType": "application",
+  "targets": {
+    "build": {
+      "executor": "./tools/executors/webpack:build",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "production",
+      "options": {
+        "compiler": "babel",
+        "outputPath": "dist/apps/multisig-signer",
+        "index": "apps/multisig-signer/src/index.html",
+        "baseHref": "/",
+        "main": "apps/multisig-signer/src/main.tsx",
+        "polyfills": "apps/multisig-signer/src/polyfills.ts",
+        "tsConfig": "apps/multisig-signer/tsconfig.app.json",
+        "assets": ["apps/multisig-signer/src/assets"],
+        "styles": ["apps/multisig-signer/src/styles.css"],
+        "scripts": [],
+        "webpackConfig": "apps/multisig-signer/webpack.config.js"
+      },
+      "configurations": {
+        "production": {
+          "fileReplacements": [
+            {
+              "replace": "apps/multisig-signer/src/environments/environment.ts",
+              "with": "apps/multisig-signer/src/environments/environment.prod.ts"
+            }
+          ],
+          "optimization": true,
+          "outputHashing": "all",
+          "sourceMap": true,
+          "namedChunks": false,
+          "extractLicenses": true,
+          "vendorChunk": false
+        }
+      }
+    },
+    "serve": {
+      "executor": "./tools/executors/webpack:serve",
+      "options": {
+        "port": 3000,
+        "buildTarget": "multisig-signer:build:development",
+        "hmr": true
+      },
+      "configurations": {
+        "production": {
+          "buildTarget": "multisig-signer:build:production",
+          "hmr": false
+        }
+      }
+    },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/multisig-signer/**/*.{ts,tsx,js,jsx}"]
+      }
+    },
+    "test": {
+      "executor": "@nrwl/jest:jest",
+      "outputs": ["coverage/apps/multisig-signer"],
+      "options": {
+        "jestConfig": "apps/multisig-signer/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "build-netlify": {
+      "executor": "@nrwl/workspace:run-commands",
+      "options": {
+        "commands": [
+          "cp apps/multisig-signer/netlify.toml netlify.toml",
+          "nx build multisig-signer"
+        ]
+      }
+    }
+  },
+  "tags": []
+}
@@ -0,0 +1,108 @@
+import * as Sentry from '@sentry/react';
+import classnames from 'classnames';
+import { useEffect, useMemo, useState } from 'react';
+import { BrowserTracing } from '@sentry/tracing';
+import {
+  EnvironmentProvider,
+  NetworkLoader,
+  useEnvironment,
+} from '@vegaprotocol/environment';
+import { AsyncRenderer, Button, Lozenge } from '@vegaprotocol/ui-toolkit';
+import type { EthereumConfig } from '@vegaprotocol/web3';
+import { useEthereumConfig, Web3Provider } from '@vegaprotocol/web3';
+import { ThemeContext, useThemeSwitcher, t } from '@vegaprotocol/react-helpers';
+import { createClient } from './lib/apollo-client';
+import { ENV } from './config/env';
+import { ContractsProvider } from './config/contracts/contracts-provider';
+import {
+  AddSignerForm,
+  RemoveSignerForm,
+  Header,
+  ContractDetails,
+} from './components';
+import { createConnectors } from './lib/web3-connectors';
+import { Web3Connector } from './components/web3-connector';
+import { EthWalletContainer } from './components/eth-wallet-container';
+import { useWeb3React } from '@web3-react/core';
+
+const pageWrapperClasses = classnames(
+  'min-h-screen w-screen',
+  'grid grid-rows-[auto,1fr]',
+  'bg-white dark:bg-black',
+  'text-neutral-900 dark:text-neutral-100'
+);
+
+const ConnectedApp = ({ config }: { config: EthereumConfig | null }) => {
+  const { account, connector } = useWeb3React();
+  return (
+    <main className="w-full max-w-3xl px-5 justify-self-center">
+      <h1>{t('Multisig signer')}</h1>
+      <div className="mb-8">
+        <p>
+          Connected to Eth wallet: <Lozenge>{account}</Lozenge>
+        </p>
+        <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+      </div>
+      <ContractDetails config={config} />
+      <h2>{t('Add or remove signer')}</h2>
+      <AddSignerForm />
+      <RemoveSignerForm />
+    </main>
+  );
+};
+
+function App() {
+  const { VEGA_ENV, ETHEREUM_PROVIDER_URL } = useEnvironment();
+  const { config, loading, error } = useEthereumConfig();
+  const [dialogOpen, setDialogOpen] = useState(false);
+  const [theme, toggleTheme] = useThemeSwitcher();
+
+  useEffect(() => {
+    Sentry.init({
+      dsn: ENV.dsn,
+      integrations: [new BrowserTracing()],
+      tracesSampleRate: 1,
+      environment: VEGA_ENV,
+    });
+  }, [VEGA_ENV]);
+  const Connectors = useMemo(() => {
+    if (config?.chain_id) {
+      return createConnectors(ETHEREUM_PROVIDER_URL, Number(config.chain_id));
+    }
+    return [];
+  }, [config?.chain_id, ETHEREUM_PROVIDER_URL]);
+
+  return (
+    <ThemeContext.Provider value={theme}>
+      <Web3Provider connectors={Connectors}>
+        <Web3Connector dialogOpen={dialogOpen} setDialogOpen={setDialogOpen}>
+          <div className={pageWrapperClasses}>
+            <AsyncRenderer loading={loading} data={config} error={error}>
+              <Header theme={theme} toggleTheme={toggleTheme} />
+              <EthWalletContainer
+                dialogOpen={dialogOpen}
+                setDialogOpen={setDialogOpen}
+              >
+                <ConnectedApp config={config} />
+              </EthWalletContainer>
+            </AsyncRenderer>
+          </div>
+        </Web3Connector>
+      </Web3Provider>
+    </ThemeContext.Provider>
+  );
+}
+
+const Wrapper = () => {
+  return (
+    <EnvironmentProvider>
+      <NetworkLoader createClient={createClient}>
+        <ContractsProvider>
+          <App />
+        </ContractsProvider>
+      </NetworkLoader>
+    </EnvironmentProvider>
+  );
+};
+
+export default Wrapper;
@@ -0,0 +1,45 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: AddSignerBundle
+// ====================================================
+
+export interface AddSignerBundle_erc20MultiSigSignerAddedBundles_edges_node {
+  __typename: "ERC20MultiSigSignerAddedBundle";
+  /**
+   * The ethereum address of the signer to be added
+   */
+  newSigner: string;
+  /**
+   * The nonce used in the signing operation
+   */
+  nonce: string;
+  /**
+   * The bundle of signatures from current validators to sign in the new signer
+   */
+  signatures: string;
+}
+
+export interface AddSignerBundle_erc20MultiSigSignerAddedBundles_edges {
+  __typename: "ERC20MultiSigSignerAddedBundleEdge";
+  node: AddSignerBundle_erc20MultiSigSignerAddedBundles_edges_node;
+}
+
+export interface AddSignerBundle_erc20MultiSigSignerAddedBundles {
+  __typename: "ERC20MultiSigSignerAddedConnection";
+  edges: (AddSignerBundle_erc20MultiSigSignerAddedBundles_edges | null)[] | null;
+}
+
+export interface AddSignerBundle {
+  /**
+   * Get the signature bundle to add a particular validator to the signer list of the multisig contract
+   */
+  erc20MultiSigSignerAddedBundles: AddSignerBundle_erc20MultiSigSignerAddedBundles;
+}
+
+export interface AddSignerBundleVariables {
+  nodeId: string;
+}
@@ -0,0 +1,48 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: RemoveSignerBundle
+// ====================================================
+
+export interface RemoveSignerBundle_erc20MultiSigSignerRemovedBundles_edges_node {
+  __typename: "ERC20MultiSigSignerRemovedBundle";
+  /**
+   * The ethereum address of the signer to be removed
+   */
+  oldSigner: string;
+  /**
+   * The nonce used in the signing operation
+   */
+  nonce: string;
+  /**
+   * The bundle of signatures from current validators to sign in the new signer
+   */
+  signatures: string;
+}
+
+export interface RemoveSignerBundle_erc20MultiSigSignerRemovedBundles_edges {
+  __typename: "ERC20MultiSigSignerRemovedBundleEdge";
+  node: RemoveSignerBundle_erc20MultiSigSignerRemovedBundles_edges_node;
+}
+
+export interface RemoveSignerBundle_erc20MultiSigSignerRemovedBundles {
+  __typename: "ERC20MultiSigSignerRemovedConnection";
+  /**
+   * The list of signer bundles for that validator
+   */
+  edges: (RemoveSignerBundle_erc20MultiSigSignerRemovedBundles_edges | null)[] | null;
+}
+
+export interface RemoveSignerBundle {
+  /**
+   * Get the signatures bundle to remove a particular validator from signer list of the multisig contract
+   */
+  erc20MultiSigSignerRemovedBundles: RemoveSignerBundle_erc20MultiSigSignerRemovedBundles;
+}
+
+export interface RemoveSignerBundleVariables {
+  nodeId: string;
+}
@@ -0,0 +1,121 @@
+import { useState } from 'react';
+import { gql, useLazyQuery } from '@apollo/client';
+import { captureException } from '@sentry/react';
+import { t } from '@vegaprotocol/react-helpers';
+import { useEthereumTransaction } from '@vegaprotocol/web3';
+import {
+  FormGroup,
+  Input,
+  Button,
+  InputError,
+  Loader,
+} from '@vegaprotocol/ui-toolkit';
+import { prepend0x } from '@vegaprotocol/smart-contracts';
+import { useContracts } from '../../config/contracts/contracts-context';
+import type { FormEvent } from 'react';
+import type {
+  AddSignerBundle,
+  AddSignerBundleVariables,
+} from '../__generated__/AddSignerBundle';
+import type { MultisigControl } from '@vegaprotocol/smart-contracts';
+
+export const ADD_SIGNER_QUERY = gql`
+  query AddSignerBundle($nodeId: ID!) {
+    erc20MultiSigSignerAddedBundles(nodeId: $nodeId) {
+      edges {
+        node {
+          newSigner
+          nonce
+          signatures
+        }
+      }
+    }
+  }
+`;
+
+export const AddSignerForm = () => {
+  const { multisig } = useContracts();
+  const [address, setAddress] = useState('');
+  const [bundleNotFound, setBundleNotFound] = useState(false);
+  const [runQuery, { data, error, loading }] = useLazyQuery<
+    AddSignerBundle,
+    AddSignerBundleVariables
+  >(ADD_SIGNER_QUERY);
+  const { perform, Dialog } = useEthereumTransaction<
+    MultisigControl,
+    'add_signer'
+  >(multisig, 'add_signer');
+  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    setBundleNotFound(false);
+    try {
+      if (address === '') {
+        return;
+      }
+      await runQuery({
+        variables: { nodeId: address },
+      });
+      const bundle = data?.erc20MultiSigSignerAddedBundles?.edges?.[0]?.node;
+
+      if (!bundle) {
+        if (!error) {
+          setBundleNotFound(true);
+        }
+        return;
+      }
+
+      await perform(
+        bundle.newSigner,
+        bundle.nonce.startsWith('0x') ? bundle.nonce : prepend0x(bundle.nonce),
+        bundle.signatures.startsWith('0x')
+          ? bundle.signatures
+          : prepend0x(bundle.signatures)
+      );
+    } catch (err: unknown) {
+      captureException(err);
+    }
+  };
+
+  return (
+    <form onSubmit={(e) => handleSubmit(e)}>
+      <FormGroup
+        label={t('Add signer')}
+        labelFor="add-signer-input"
+        labelDescription={t('Public key of the signer to add')}
+        className="max-w-xl"
+      >
+        <div className="grid grid-cols-[1fr,auto] gap-2">
+          <Input
+            id="add-signer-input"
+            onChange={(e) => setAddress(e.target.value)}
+            data-testid="add-signer-input-input"
+          />
+          <Button
+            type="submit"
+            data-testid="add-signer-submit"
+            disabled={loading}
+          >
+            {loading ? <Loader size="small" /> : t('Add')}
+          </Button>
+        </div>
+        <div>
+          {error && (
+            <InputError intent="danger">
+              {error?.message.includes('InvalidArgument')
+                ? t('Invalid node id')
+                : error?.message}
+            </InputError>
+          )}
+          {bundleNotFound && !error && (
+            <InputError intent="danger">
+              {t(
+                'Bundle was not found, are you sure this validator needs to be added?'
+              )}
+            </InputError>
+          )}
+        </div>
+      </FormGroup>
+      <Dialog />
+    </form>
+  );
+};
@@ -0,0 +1 @@
+export * from './add-signer-form';
@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react';
+import * as Sentry from '@sentry/react';
+import { Lozenge } from '@vegaprotocol/ui-toolkit';
+import { useContracts } from '../../config/contracts/contracts-context';
+import type { EthereumConfig } from '@vegaprotocol/web3';
+
+interface ContractDetailsProps {
+  config: EthereumConfig | null;
+}
+
+export const ContractDetails = ({ config }: ContractDetailsProps) => {
+  const { multisig } = useContracts();
+  const [validSignerCount, setValidSignerCount] = useState(undefined);
+
+  useEffect(() => {
+    (async () => {
+      try {
+        const res = await multisig.get_valid_signer_count();
+        setValidSignerCount(res);
+      } catch (err) {
+        Sentry.captureException(err);
+      }
+    })();
+  }, [multisig]);
+
+  return (
+    <div className="mb-8">
+      <p>
+        Multisig contract address:{' '}
+        <Lozenge>{config?.multisig_control_contract?.address}</Lozenge>
+      </p>
+      <p>Valid signer count: {validSignerCount}</p>
+    </div>
+  );
+};
@@ -0,0 +1 @@
+export * from './contract-details';
@@ -0,0 +1,25 @@
+import { Button } from '@vegaprotocol/ui-toolkit';
+import { useWeb3React } from '@web3-react/core';
+import type { ReactElement } from 'react';
+
+export const EthWalletContainer = ({
+  dialogOpen,
+  setDialogOpen,
+  children,
+}: {
+  dialogOpen: boolean;
+  setDialogOpen: (open: boolean) => void;
+  children: ReactElement;
+}) => {
+  const { account } = useWeb3React();
+  if (!account) {
+    return (
+      <div className="w-full text-center">
+        <Button onClick={() => setDialogOpen(true)}>
+          Connect Ethereum Wallet
+        </Button>
+      </div>
+    );
+  }
+  return children;
+};
@@ -0,0 +1 @@
+export * from './eth-wallet-container';
@@ -0,0 +1,24 @@
+import {
+  BackgroundVideo,
+  ThemeSwitcher,
+  VegaLogo,
+} from '@vegaprotocol/ui-toolkit';
+
+interface HeaderProps {
+  theme: 'light' | 'dark';
+  toggleTheme: () => void;
+}
+
+export const Header = ({ theme, toggleTheme }: HeaderProps) => {
+  return (
+    <header className="relative overflow-hidden py-2 mb-8">
+      <BackgroundVideo />
+      <div className="relative flex justify-center px-2 dark:bg-black bg-white">
+        <div className="w-full max-w-3xl p-5 flex items-center justify-between">
+          <VegaLogo />
+          <ThemeSwitcher theme={theme} onToggle={toggleTheme} />
+        </div>
+      </div>
+    </header>
+  );
+};
@@ -0,0 +1 @@
+export * from './header';
@@ -0,0 +1,4 @@
+export * from './add-signer-form';
+export * from './remove-signer-form';
+export * from './header';
+export * from './contract-details';
@@ -0,0 +1 @@
+export * from './remove-signer-form';
@@ -0,0 +1,121 @@
+import { useState } from 'react';
+import { gql, useLazyQuery } from '@apollo/client';
+import { captureException } from '@sentry/react';
+import { t } from '@vegaprotocol/react-helpers';
+import { useEthereumTransaction } from '@vegaprotocol/web3';
+import {
+  FormGroup,
+  Input,
+  Button,
+  InputError,
+  Loader,
+} from '@vegaprotocol/ui-toolkit';
+import { prepend0x } from '@vegaprotocol/smart-contracts';
+import { useContracts } from '../../config/contracts/contracts-context';
+import type { FormEvent } from 'react';
+import type {
+  RemoveSignerBundle,
+  RemoveSignerBundleVariables,
+} from '../__generated__/RemoveSignerBundle';
+import type { MultisigControl } from '@vegaprotocol/smart-contracts';
+
+const REMOVE_SIGNER_QUERY = gql`
+  query RemoveSignerBundle($nodeId: ID!) {
+    erc20MultiSigSignerRemovedBundles(nodeId: $nodeId) {
+      edges {
+        node {
+          oldSigner
+          nonce
+          signatures
+        }
+      }
+    }
+  }
+`;
+
+export const RemoveSignerForm = () => {
+  const { multisig } = useContracts();
+  const [address, setAddress] = useState('');
+  const [bundleNotFound, setBundleNotFound] = useState(false);
+  const [runQuery, { data, error, loading }] = useLazyQuery<
+    RemoveSignerBundle,
+    RemoveSignerBundleVariables
+  >(REMOVE_SIGNER_QUERY);
+  const { perform, Dialog } = useEthereumTransaction<
+    MultisigControl,
+    'remove_signer'
+  >(multisig, 'remove_signer');
+  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    setBundleNotFound(false);
+    try {
+      if (address === '') {
+        return;
+      }
+      await runQuery({
+        variables: { nodeId: address },
+      });
+      const bundle = data?.erc20MultiSigSignerRemovedBundles?.edges?.[0]?.node;
+
+      if (!bundle) {
+        if (!error) {
+          setBundleNotFound(true);
+        }
+        return;
+      }
+
+      await perform(
+        bundle.oldSigner,
+        bundle.nonce.startsWith('0x') ? bundle.nonce : prepend0x(bundle.nonce),
+        bundle.signatures.startsWith('0x')
+          ? bundle.signatures
+          : prepend0x(bundle.signatures)
+      );
+    } catch (err: unknown) {
+      captureException(err);
+    }
+  };
+
+  return (
+    <form onSubmit={(e) => handleSubmit(e)}>
+      <FormGroup
+        label={t('Remove signer')}
+        labelFor="remove-signer-input"
+        labelDescription={t('Public key of the signer to remove')}
+        className="max-w-xl"
+      >
+        <div className="grid grid-cols-[1fr,auto] gap-2">
+          <Input
+            id="remove-signer-input"
+            onChange={(e) => setAddress(e.target.value)}
+            data-testid="remove-signer-input-input"
+          />
+          <Button
+            type="submit"
+            data-testid="remove-signer-submit"
+            disabled={loading}
+          >
+            {loading ? <Loader size="small" /> : t('Remove')}
+          </Button>
+        </div>
+        <div>
+          {error && (
+            <InputError intent="danger">
+              {error?.message.includes('InvalidArgument')
+                ? t('Invalid node id')
+                : error?.message}
+            </InputError>
+          )}
+          {bundleNotFound && !error && (
+            <InputError intent="danger">
+              {t(
+                'Bundle was not found, are you sure this validator needs to be removed?'
+              )}
+            </InputError>
+          )}
+        </div>
+      </FormGroup>
+      <Dialog />
+    </form>
+  );
+};
@@ -0,0 +1 @@
+export * from './web3-connector';
@@ -0,0 +1,94 @@
+import { useEnvironment } from '@vegaprotocol/environment';
+import { useEthereumConfig } from '@vegaprotocol/web3';
+import { Button, Splash, AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import { Web3ConnectDialog } from '@vegaprotocol/web3';
+import { useWeb3React } from '@web3-react/core';
+import type { ReactElement } from 'react';
+import { useEffect, useMemo } from 'react';
+import { createConnectors } from '../../lib/web3-connectors';
+
+interface Web3ConnectorProps {
+  children: ReactElement;
+  dialogOpen: boolean;
+  setDialogOpen: (open: boolean) => void;
+}
+
+export function Web3Connector({
+  children,
+  dialogOpen,
+  setDialogOpen,
+}: Web3ConnectorProps) {
+  const { ETHEREUM_PROVIDER_URL } = useEnvironment();
+  const { config, loading, error } = useEthereumConfig();
+  const Connectors = useMemo(() => {
+    if (config?.chain_id) {
+      return createConnectors(ETHEREUM_PROVIDER_URL, Number(config.chain_id));
+    }
+    return undefined;
+  }, [config?.chain_id, ETHEREUM_PROVIDER_URL]);
+  const appChainId = Number(config?.chain_id);
+  return (
+    <AsyncRenderer loading={loading} error={error} data={config}>
+      <Web3Content appChainId={appChainId} setDialogOpen={setDialogOpen}>
+        {children}
+      </Web3Content>
+      {Connectors && (
+        <Web3ConnectDialog
+          connectors={Connectors}
+          dialogOpen={dialogOpen}
+          setDialogOpen={setDialogOpen}
+          desiredChainId={appChainId}
+        />
+      )}
+    </AsyncRenderer>
+  );
+}
+
+interface Web3ContentProps {
+  children: ReactElement;
+  appChainId: number;
+  setDialogOpen: (isOpen: boolean) => void;
+}
+
+export const Web3Content = ({
+  children,
+  appChainId,
+  setDialogOpen,
+}: Web3ContentProps) => {
+  const { error, connector, chainId } = useWeb3React();
+
+  useEffect(() => {
+    if (connector?.connectEagerly) {
+      connector.connectEagerly();
+    }
+    // wallet connect doesnt handle connectEagerly being called when connector is also in the
+    // deps array.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [connector]);
+
+  if (error) {
+    return (
+      <Splash>
+        <div className="flex flex-col items-center gap-12">
+          <p className="text-white">Something went wrong: {error.message}</p>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+        </div>
+      </Splash>
+    );
+  }
+
+  if (chainId !== undefined && chainId !== appChainId) {
+    return (
+      <Splash>
+        <div className="flex flex-col items-center gap-12">
+          <p className="text-white">
+            This app only works on chain ID: {appChainId}
+          </p>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+        </div>
+      </Splash>
+    );
+  }
+
+  return children;
+};
@@ -0,0 +1,18 @@
+import { createContext, useContext } from 'react';
+import type { MultisigControl } from '@vegaprotocol/smart-contracts';
+
+export interface ContractsContextShape {
+  multisig: MultisigControl;
+}
+
+export const ContractsContext = createContext<
+  ContractsContextShape | undefined
+>(undefined);
+
+export function useContracts() {
+  const context = useContext(ContractsContext);
+  if (context === undefined) {
+    throw new Error('useContracts must be used within ContractsProvider');
+  }
+  return context;
+}
@@ -0,0 +1,60 @@
+import { useEffect, useState } from 'react';
+import { MultisigControl } from '@vegaprotocol/smart-contracts';
+import { Splash } from '@vegaprotocol/ui-toolkit';
+import { ethers } from 'ethers';
+import type { ContractsContextShape } from './contracts-context';
+import { ContractsContext } from './contracts-context';
+import { useEthereumConfig } from '@vegaprotocol/web3';
+import { useEnvironment } from '@vegaprotocol/environment';
+
+/**
+ * Provides Vega Ethereum contract instances to its children.
+ */
+export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
+  const { config } = useEthereumConfig();
+  const { VEGA_ENV, ETHEREUM_PROVIDER_URL } = useEnvironment();
+  const [contracts, setContracts] = useState<ContractsContextShape | null>(
+    null
+  );
+
+  // Create instances of contract classes. If we have an account use a signer for the
+  // contracts so that we can sign transactions, otherwise use the provider for just
+  // reading data
+  useEffect(() => {
+    let cancelled = false;
+    const run = async () => {
+      if (config) {
+        const provider = new ethers.providers.JsonRpcProvider(
+          ETHEREUM_PROVIDER_URL,
+          Number(config.chain_id)
+        );
+
+        if (provider && config) {
+          if (!cancelled) {
+            setContracts({
+              multisig: new MultisigControl(
+                config.multisig_control_contract.address,
+                provider
+              ),
+            });
+          }
+        }
+      }
+    };
+    run();
+    return () => {
+      //  TODO: hacky quick fix for release to prevent race condition, find a better fix for this.
+      cancelled = true;
+    };
+  }, [config, VEGA_ENV, ETHEREUM_PROVIDER_URL]);
+
+  if (!contracts) {
+    return <Splash>Error: cannot get data on multisig contract</Splash>;
+  }
+
+  return (
+    <ContractsContext.Provider value={contracts}>
+      {children}
+    </ContractsContext.Provider>
+  );
+};
@@ -0,0 +1,12 @@
+const windowOrDefault = (key: string) => {
+  if (window._env_ && window._env_[key]) {
+    return window._env_[key] as string;
+  }
+  return (process.env[key] as string) || '';
+};
+
+export const ENV = {
+  dsn: windowOrDefault('NX_SENTRY_DSN'),
+  flags: {},
+  dataSources: {},
+};
@@ -0,0 +1,3 @@
+import { ENV } from './env';
+
+export default ENV.flags;
@@ -0,0 +1,3 @@
+import { ENV } from './env';
+
+export const DATA_SOURCES = ENV.dataSources;
@@ -0,0 +1,54 @@
+import * as Sentry from '@sentry/react';
+import { ApolloClient, from, HttpLink, InMemoryCache } from '@apollo/client';
+import { onError } from '@apollo/client/link/error';
+import { RetryLink } from '@apollo/client/link/retry';
+
+export function createClient(base?: string) {
+  if (!base) {
+    throw new Error('Base must be passed into createClient!');
+  }
+  const urlHTTP = new URL(base);
+  const urlWS = new URL(base);
+  // Replace http with ws, preserving if its a secure connection eg. https => wss
+  urlWS.protocol = urlWS.protocol.replace('http', 'ws');
+
+  const cache = new InMemoryCache({
+    typePolicies: {
+      Query: {},
+      Account: {
+        keyFields: false,
+        fields: {
+          balanceFormatted: {},
+        },
+      },
+      Node: {
+        keyFields: false,
+      },
+    },
+  });
+
+  const retryLink = new RetryLink({
+    delay: {
+      initial: 300,
+      max: 10000,
+      jitter: true,
+    },
+  });
+
+  const httpLink = new HttpLink({
+    uri: urlHTTP.href,
+    credentials: 'same-origin',
+  });
+
+  const errorLink = onError(({ graphQLErrors, networkError }) => {
+    console.log(graphQLErrors);
+    console.log(networkError);
+    Sentry.captureException(graphQLErrors);
+  });
+
+  return new ApolloClient({
+    connectToDevTools: process.env['NODE_ENV'] === 'development',
+    link: from([errorLink, retryLink, httpLink]),
+    cache,
+  });
+}
@@ -0,0 +1,34 @@
+import { ethers } from 'ethers';
+import type { Web3ReactHooks } from '@web3-react/core';
+import { initializeConnector } from '@web3-react/core';
+import { MetaMask } from '@web3-react/metamask';
+import { WalletConnect } from '@web3-react/walletconnect';
+import type { Connector } from '@web3-react/types';
+
+const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
+  (actions) => new MetaMask(actions)
+);
+
+export const createDefaultProvider = (providerUrl: string, chainId: number) => {
+  return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
+};
+
+export const createConnectors = (providerUrl: string, chainId: number) => {
+  if (isNaN(chainId)) {
+    throw new Error('Invalid Ethereum chain ID for environment');
+  }
+  const [walletconnect, walletconnectHooks] =
+    initializeConnector<WalletConnect>(
+      (actions) =>
+        new WalletConnect(actions, {
+          rpc: {
+            [chainId]: providerUrl,
+          },
+        }),
+      [chainId]
+    );
+  return [
+    [metamask, metamaskHooks],
+    [walletconnect, walletconnectHooks],
+  ] as [Connector, Web3ReactHooks][];
+};
@@ -0,0 +1 @@
+/// <reference types="react-scripts" />
@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';
@@ -0,0 +1 @@
+window._env_ = {};
@@ -0,0 +1,3 @@
+export const environment = {
+  production: true,
+};
@@ -0,0 +1,6 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// When building for production, this file is replaced with `environment.prod.ts`.
+
+export const environment = {
+  production: false,
+};
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Multisig Signer</title>
+    <base href="/" />
+    <link
+      rel="preload"
+      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin="anonymous"
+    />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link
+      rel="icon"
+      type="image/x-icon"
+      href="https://static.vega.xyz/favicon.ico"
+    />
+    <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
+    <script src="./assets/env-config.js"></script>
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
@@ -0,0 +1,14 @@
+import { createRoot } from 'react-dom/client';
+import './styles.css';
+
+import App from './app/app';
+import { StrictMode } from 'react';
+
+const rootElement = document.getElementById('root');
+const root = rootElement && createRoot(rootElement);
+
+root?.render(
+  <StrictMode>
+    <App />
+  </StrictMode>
+);
@@ -0,0 +1,7 @@
+/**
+ * Polyfill stable language features. These imports will be optimized by `@babel/preset-env`.
+ *
+ * See: https://github.com/zloirock/core-js#babel
+ */
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
@@ -0,0 +1,16 @@
+/* You can add global styles to this file, and also import other style files */
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer base {
+  h1 {
+    @apply text-2xl uppercase mb-4;
+  }
+  h2 {
+    @apply text-xl mb-4;
+  }
+  p {
+    @apply mb-2;
+  }
+}
@@ -0,0 +1,17 @@
+const { join } = require('path');
+const { createGlobPatternsForDependencies } = require('@nrwl/next/tailwind');
+const theme = require('../../libs/tailwindcss-config/src/theme');
+const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
+
+module.exports = {
+  content: [
+    join(__dirname, 'src/**/*.{js,ts,jsx,tsx}'),
+    'libs/ui-toolkit/src/utils/shared.ts',
+    ...createGlobPatternsForDependencies(__dirname),
+  ],
+  darkMode: 'class',
+  theme: {
+    extend: theme,
+  },
+  plugins: [vegaCustomClasses],
+};
@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "files": [
+    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nrwl/react/typings/image.d.ts"
+  ],
+  "exclude": [
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "**/*.spec.tsx",
+    "**/*.test.tsx",
+    "**/*.spec.js",
+    "**/*.test.js",
+    "**/*.spec.jsx",
+    "**/*.test.jsx",
+    "jest.config.ts"
+  ],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
@@ -0,0 +1,26 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "lib": ["es5", "es6", "dom", "dom.iterable"]
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
@@ -0,0 +1,24 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node", "@testing-library/jest-dom"]
+  },
+  "include": [
+    "**/*.test.ts",
+    "**/*.spec.ts",
+    "**/*.test.tsx",
+    "**/*.spec.tsx",
+    "**/*.test.js",
+    "**/*.spec.js",
+    "**/*.test.jsx",
+    "**/*.spec.jsx",
+    "**/*.d.ts",
+    "jest.config.ts"
+  ],
+  "files": [
+    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nrwl/react/typings/image.d.ts"
+  ]
+}
@@ -0,0 +1,17 @@
+const SentryPlugin = require('@sentry/webpack-plugin');
+
+module.exports = (config, context) => {
+  const additionalPlugins = process.env.SENTRY_AUTH_TOKEN
+    ? [
+        new SentryPlugin({
+          include: './dist/apps/multisig-signer',
+          project: 'multisig-signer',
+        }),
+      ]
+    : [];
+
+  return {
+    ...config,
+    plugins: [...additionalPlugins, ...config.plugins],
+  };
+};
@@ -232,7 +232,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "102776.663713959859613115",
+    "locked_amount": "102124.66487571281440878",
    "deposits": [
      {
        "amount": "129999.45",
@@ -298,7 +298,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "52600",
    "total_removed": "0",
-    "locked_amount": "49032.56712328767008",
+    "locked_amount": "48636.49092465753612",
    "deposits": [
      {
        "amount": "2600",
@@ -471,7 +471,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "4852.6712328767125",
+    "locked_amount": "4815.021404109589",
    "deposits": [
      {
        "amount": "5000",
@@ -682,7 +682,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "97499.58",
    "total_removed": "0",
-    "locked_amount": "44036.534647016709282804",
+    "locked_amount": "43396.9845231354428142546",
    "deposits": [
      {
        "amount": "97499.58",
@@ -715,7 +715,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "135173.4239508",
    "total_removed": "0",
-    "locked_amount": "60190.340271927400921693158168",
+    "locked_amount": "59316.185666304390069312369924",
    "deposits": [
      {
        "amount": "135173.4239508",
@@ -748,7 +748,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "32499.86",
    "total_removed": "0",
-    "locked_amount": "18525.409655722893015054",
+    "locked_amount": "18256.361963045934439756",
    "deposits": [
      {
        "amount": "32499.86",
@@ -781,7 +781,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "10833.29",
    "total_removed": "0",
-    "locked_amount": "6029.841076617647186274",
+    "locked_amount": "5942.268663428308441178",
    "deposits": [
      {
        "amount": "10833.29",
@@ -814,7 +814,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "22749.93",
    "total_removed": "0",
-    "locked_amount": "22540.892685078533352489",
+    "locked_amount": "22213.527445631542739796",
    "deposits": [
      {
        "amount": "6500",
@@ -889,7 +889,7 @@
    "tranche_end": "2022-11-01T00:00:00.000Z",
    "total_added": "30000",
    "total_removed": "0",
-    "locked_amount": "5583.4239130434792",
+    "locked_amount": "5135.309103260871",
    "deposits": [
      {
        "amount": "7500",
@@ -1006,7 +1006,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "479504.6187210477481",
-    "locked_amount": "1314075.595378356132494328",
+    "locked_amount": "1299468.001112859474771342",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -1292,7 +1292,7 @@
    "tranche_end": "2023-02-01T00:00:00.000Z",
    "total_added": "42500",
    "total_removed": "0",
-    "locked_amount": "29159.8505434782605",
+    "locked_amount": "28525.021229619563",
    "deposits": [
      {
        "amount": "12500",
@@ -2171,7 +2171,7 @@
    "tranche_end": "2022-09-30T00:00:00.000Z",
    "total_added": "60916.66666633337",
    "total_removed": "20696.25757434884556896",
-    "locked_amount": "350.661324784407113191239311209955",
+    "locked_amount": "0",
    "deposits": [
      {
        "amount": "2833.333333",
@@ -5916,8 +5916,8 @@
    "tranche_id": 11,
    "tranche_start": "2021-09-03T00:00:00.000Z",
    "tranche_end": "2022-09-03T00:00:00.000Z",
-    "total_added": "39478.000000000000000003",
-    "total_removed": "23401.61400743624",
+    "total_added": "39534.000000000000000003",
+    "total_removed": "23433.61400743624",
    "locked_amount": "0",
    "deposits": [
      {
@@ -5960,6 +5960,31 @@
        "user": "0x012B26C7A9e275ed6dB3a6f335348b7502D6c230",
        "tx": "0x3c8738bdc3f24f7f3a39171aa7e7f6d4b37a7ffe076599a9fdc57c615a4e3c8e"
      },
+      {
+        "amount": "12",
+        "user": "0x296138CDfe7C40374ae1B0EB2575B80Fa19A3AD4",
+        "tx": "0xe82ee1dfb2cb0637cb4d2a1e85b92988ecde9868068f33b60ada0d2a03861df5"
+      },
+      {
+        "amount": "25",
+        "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+        "tx": "0x510919ff3973b6d4d85676615b42e3a79ea90f04248074a89928575737d43dde"
+      },
+      {
+        "amount": "2",
+        "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+        "tx": "0x957f17e567e4cecbf36662e1d69c139d44c0bbed87d3745fd6bc8adc107da1e1"
+      },
+      {
+        "amount": "5",
+        "user": "0x2005b7AfF9Ab13185611bF316f4e505C120D73fB",
+        "tx": "0xfc792c7ac73ed7162ab820f297d20ef1cd3c2364ebbc3ff84366efade7d466ae"
+      },
+      {
+        "amount": "12",
+        "user": "0x6CEF4e034F349dB138210733e127188cc5dEAF4e",
+        "tx": "0x6fea36c9c604eddb8b4552ee03f1b03c9d83cd98c3f781d7e0e9f03d2732d6b5"
+      },
      {
        "amount": "20",
        "user": "0x9e02d57941833BB800cF0343b65A3D9dCa935b91",
@@ -12482,6 +12507,11 @@
        "user": "0x012B26C7A9e275ed6dB3a6f335348b7502D6c230",
        "tx": "0x82fe54b5aa40e75d1ad7ce239e8aba5e8beb6479ebd446d3e4c8f4146c973d16"
      },
+      {
+        "amount": "32",
+        "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+        "tx": "0x829da4f41e9196956aa917966fb996a2feacd9809b385581ed624e0ecae0fb39"
+      },
      {
        "amount": "44.915525116",
        "user": "0x3f626D48C2a6104976A03009cFDB4A48F32fd282",
@@ -13410,6 +13440,85 @@
        "withdrawn_tokens": "200",
        "remaining_tokens": "0"
      },
+      {
+        "address": "0x296138CDfe7C40374ae1B0EB2575B80Fa19A3AD4",
+        "deposits": [
+          {
+            "amount": "12",
+            "user": "0x296138CDfe7C40374ae1B0EB2575B80Fa19A3AD4",
+            "tranche_id": 11,
+            "tx": "0xe82ee1dfb2cb0637cb4d2a1e85b92988ecde9868068f33b60ada0d2a03861df5"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "12",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "12"
+      },
+      {
+        "address": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+        "deposits": [
+          {
+            "amount": "25",
+            "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+            "tranche_id": 11,
+            "tx": "0x510919ff3973b6d4d85676615b42e3a79ea90f04248074a89928575737d43dde"
+          },
+          {
+            "amount": "2",
+            "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+            "tranche_id": 11,
+            "tx": "0x957f17e567e4cecbf36662e1d69c139d44c0bbed87d3745fd6bc8adc107da1e1"
+          },
+          {
+            "amount": "5",
+            "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+            "tranche_id": 11,
+            "tx": "0x0ee98bb5ed32af68a393fc1b845f7a485bc0b9bfa0be7b30e3dd58ea85fd01ee"
+          }
+        ],
+        "withdrawals": [
+          {
+            "amount": "32",
+            "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
+            "tranche_id": 11,
+            "tx": "0x829da4f41e9196956aa917966fb996a2feacd9809b385581ed624e0ecae0fb39"
+          }
+        ],
+        "total_tokens": "32",
+        "withdrawn_tokens": "32",
+        "remaining_tokens": "0"
+      },
+      {
+        "address": "0x2005b7AfF9Ab13185611bF316f4e505C120D73fB",
+        "deposits": [
+          {
+            "amount": "5",
+            "user": "0x2005b7AfF9Ab13185611bF316f4e505C120D73fB",
+            "tranche_id": 11,
+            "tx": "0xfc792c7ac73ed7162ab820f297d20ef1cd3c2364ebbc3ff84366efade7d466ae"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "5",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "5"
+      },
+      {
+        "address": "0x6CEF4e034F349dB138210733e127188cc5dEAF4e",
+        "deposits": [
+          {
+            "amount": "12",
+            "user": "0x6CEF4e034F349dB138210733e127188cc5dEAF4e",
+            "tranche_id": 11,
+            "tx": "0x6fea36c9c604eddb8b4552ee03f1b03c9d83cd98c3f781d7e0e9f03d2732d6b5"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "12",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "12"
+      },
      {
        "address": "0x9e02d57941833BB800cF0343b65A3D9dCa935b91",
        "deposits": [
@@ -20900,21 +21009,6 @@
        "withdrawn_tokens": "20",
        "remaining_tokens": "0"
      },
-      {
-        "address": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
-        "deposits": [
-          {
-            "amount": "5",
-            "user": "0xF1bfCb79a510faC196c4Da74009Ea67e0926b25f",
-            "tranche_id": 11,
-            "tx": "0x0ee98bb5ed32af68a393fc1b845f7a485bc0b9bfa0be7b30e3dd58ea85fd01ee"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "5",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "5"
-      },
      {
        "address": "0x7De6cC7b5651afC4e8A56797D93062958B4D800c",
        "deposits": [
@@ -24050,7 +24144,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "212048.9552173080602",
-    "locked_amount": "2043778.0022963665452890709",
+    "locked_amount": "2021331.21573445189292278477",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -24961,8 +25055,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "216800.5058515497741144",
-    "locked_amount": "12546793.1586938570064980374422638556934307",
+    "total_removed": "217792.1733439389823644",
+    "locked_amount": "12467198.2947667529364788233552915487956204",
    "deposits": [
      {
        "amount": "16249.93",
@@ -25496,6 +25590,16 @@
        "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
        "tx": "0xb352a46b93f3d337cd6369e8322a63c5f1eb5662dcca8261eedcbcd61e07b4db"
      },
+      {
+        "amount": "507.59616606480375",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x667df753933beec52fa8bfab3c25fcf71dafe68bfe7a078edb3cd25760ab0f52"
+      },
+      {
+        "amount": "484.0713263244045",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x784d2bbe949ccdab8911923548c87bcca0db14dfe46782b14462edd9e6ddfa82"
+      },
      {
        "amount": "504.652814859004625",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -26187,6 +26291,18 @@
            "tranche_id": 2,
            "tx": "0x5f8473cd1bdb3668468c9650ea102b00642bdf0ef05d4acc6dea2a90897435a3"
          },
+          {
+            "amount": "507.59616606480375",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x667df753933beec52fa8bfab3c25fcf71dafe68bfe7a078edb3cd25760ab0f52"
+          },
+          {
+            "amount": "484.0713263244045",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x784d2bbe949ccdab8911923548c87bcca0db14dfe46782b14462edd9e6ddfa82"
+          },
          {
            "amount": "504.652814859004625",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -26765,8 +26881,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "54263.362280027527",
-        "remaining_tokens": "205735.525219972473"
+        "withdrawn_tokens": "55255.02977241673525",
+        "remaining_tokens": "204743.85772758326475"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -28353,8 +28469,8 @@
    "tranche_start": "2021-11-05T00:00:00.000Z",
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
-    "total_removed": "2774565.712070543764160647",
-    "locked_amount": "5861674.105785159717672239659830096",
+    "total_removed": "2824713.304367824465984097",
+    "locked_amount": "5788192.63562566244215645815984993",
    "deposits": [
      {
        "amount": "129284.449",
@@ -28578,6 +28694,21 @@
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
        "tx": "0xbc8810b12e9ed3f19e6a5d1ba1465ef6b66a225878f54216800246426ed32210"
      },
+      {
+        "amount": "709.07518789718728975",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x3f24197802692dd588b979e8e2e4d99ffe2ef1615d2461332b6ddcab9288b498"
+      },
+      {
+        "amount": "48774.0217600680709137",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0x6faa8f3b747c1c577e95247bd110f080e70aacb2bd8f0877d0db8e46e3bb7767"
+      },
+      {
+        "amount": "664.49534931544362",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x72f889f7065fd400d3781697c6a362930ad72596396195590c0fd2d329bb1ff2"
+      },
      {
        "amount": "700.967684681521309",
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -30767,6 +30898,18 @@
            "tranche_id": 3,
            "tx": "0xbc8810b12e9ed3f19e6a5d1ba1465ef6b66a225878f54216800246426ed32210"
          },
+          {
+            "amount": "709.07518789718728975",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x3f24197802692dd588b979e8e2e4d99ffe2ef1615d2461332b6ddcab9288b498"
+          },
+          {
+            "amount": "664.49534931544362",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x72f889f7065fd400d3781697c6a362930ad72596396195590c0fd2d329bb1ff2"
+          },
          {
            "amount": "700.967684681521309",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -32623,8 +32766,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "214666.06459364959229025",
-        "remaining_tokens": "144457.40498135040770975"
+        "withdrawn_tokens": "216039.6351308622232",
+        "remaining_tokens": "143083.8344441377768"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -32823,6 +32966,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "48774.0217600680709137",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0x6faa8f3b747c1c577e95247bd110f080e70aacb2bd8f0877d0db8e46e3bb7767"
+          },
          {
            "amount": "36806.4510907456099182",
            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -33047,8 +33196,8 @@
          }
        ],
        "total_tokens": "1266324.603486",
-        "withdrawn_tokens": "712780.14190100771935614",
-        "remaining_tokens": "553544.46158499228064386"
+        "withdrawn_tokens": "761554.16366107579026984",
+        "remaining_tokens": "504770.43982492420973016"
      },
      {
        "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296",
@@ -33712,7 +33861,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "5778205.3912159303",
    "total_removed": "1802365.899333321320457354",
-    "locked_amount": "1999079.48676537239516389854625001",
+    "locked_amount": "1970046.513493123510894970951257399",
    "deposits": [
      {
        "amount": "552496.6455",
@@ -35197,8 +35346,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "3739.39870202926",
-    "locked_amount": "323848.30719698602842289210958904",
+    "total_removed": "3994.36100542526",
+    "locked_amount": "320291.48555494834014306441095892",
    "deposits": [
      {
        "amount": "3000",
@@ -41822,6 +41971,21 @@
        "user": "0x7708B79e2bc3b7ab816E66aF33A8c9385f0FcA4b",
        "tx": "0xe3ab9d765434fa063a736c12bbd788550d003d3239e5ba894fa7fcfc8cffa93c"
      },
+      {
+        "amount": "63.617193048",
+        "user": "0x8920AAB96cA36a8f3BA278f57D306DfbEa466110",
+        "tx": "0x8c5536508a3f1744825f63878e4dce65d6e4e33703da68a2f6f4edb15bf679c3"
+      },
+      {
+        "amount": "127.394812276",
+        "user": "0xf016E520e70f12A366a34B24B621F83140f8Be68",
+        "tx": "0x30b6e699bb7ae1c109f053d849a2d9a05e9bb7218017d78633fd9007d410cb1c"
+      },
+      {
+        "amount": "63.950298072",
+        "user": "0xf07dfEa6Fcb61A46e9CFaB361E6Dd890872426de",
+        "tx": "0x3dff3cd1fc1a1d5b1ef09f9fb7fee91b49d9df338e494530fbd3a2bd27c01e18"
+      },
      {
        "amount": "52.731139014",
        "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
@@ -43259,10 +43423,17 @@
            "tx": "0xee02e72ef8e0755982704385da512cc12c8ff0ea7b58056fa3d5a5932394e9ca"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "63.617193048",
+            "user": "0x8920AAB96cA36a8f3BA278f57D306DfbEa466110",
+            "tranche_id": 5,
+            "tx": "0x8c5536508a3f1744825f63878e4dce65d6e4e33703da68a2f6f4edb15bf679c3"
+          }
+        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "200"
+        "withdrawn_tokens": "63.617193048",
+        "remaining_tokens": "136.382806952"
      },
      {
        "address": "0xf75c8a077a6E0f9fAbeEd70Dc29503C1A89687e0",
@@ -55870,10 +56041,17 @@
            "tx": "0xb1425d9b0d5f10c5b06236d6f9d61ebddd21c4027e0f41deb5ec227a1753c715"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "127.394812276",
+            "user": "0xf016E520e70f12A366a34B24B621F83140f8Be68",
+            "tranche_id": 5,
+            "tx": "0x30b6e699bb7ae1c109f053d849a2d9a05e9bb7218017d78633fd9007d410cb1c"
+          }
+        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "400"
+        "withdrawn_tokens": "127.394812276",
+        "remaining_tokens": "272.605187724"
      },
      {
        "address": "0x1d999A280c97D468866b80292c707c47f23D7B18",
@@ -56410,10 +56588,17 @@
            "tx": "0xb1425d9b0d5f10c5b06236d6f9d61ebddd21c4027e0f41deb5ec227a1753c715"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "63.950298072",
+            "user": "0xf07dfEa6Fcb61A46e9CFaB361E6Dd890872426de",
+            "tranche_id": 5,
+            "tx": "0x3dff3cd1fc1a1d5b1ef09f9fb7fee91b49d9df338e494530fbd3a2bd27c01e18"
+          }
+        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "200"
+        "withdrawn_tokens": "63.950298072",
+        "remaining_tokens": "136.049701928"
      },
      {
        "address": "0xc40ED37b6a423fdd64EcD15503Df84F4e0d0a318",
@@ -61827,7 +62012,7 @@
    "tranche_start": "2021-12-05T00:00:00.000Z",
    "tranche_end": "2022-06-05T00:00:00.000Z",
    "total_added": "171288.42",
-    "total_removed": "53804.7088304822989",
+    "total_removed": "54054.7088304822989",
    "locked_amount": "0",
    "deposits": [
      {
@@ -66057,6 +66242,11 @@
        "user": "0x9195bCD64d01C55a495f67364fF1d24C9df59540",
        "tx": "0x357c5690d5eb629493666d179c0e45885b7c2da080dd72eb4637b506b6dbc244"
      },
+      {
+        "amount": "250",
+        "user": "0x45d2c6e88dDA2ae0053F69335189D790580c5744",
+        "tx": "0x16c4863812887f0b33009187b71f063b1263938a2fdb709948db9c7bdd258da9"
+      },
      {
        "amount": "250",
        "user": "0x1f2c5E955082614F062b5BaC23DB5C2d345A4701",
@@ -81236,10 +81426,17 @@
            "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0x45d2c6e88dDA2ae0053F69335189D790580c5744",
+            "tranche_id": 6,
+            "tx": "0x16c4863812887f0b33009187b71f063b1263938a2fdb709948db9c7bdd258da9"
+          }
+        ],
        "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0x3B0F08BA6F4AE2A9d6Ff505f281a0ECb7e2fF98b",
@@ -89,7 +89,7 @@
    "tranche_end": "2022-10-12T00:53:20.000Z",
    "total_added": "1010.000000000000000001",
    "total_removed": "668.4622323651",
-    "locked_amount": "39.520221334348034750039128932014205975",
+    "locked_amount": "31.914987950279039060031598997970573306",
    "deposits": [
      {
        "amount": "1000",
@@ -11,10 +11,10 @@ function App() {
  return (
    <ThemeContext.Provider value={theme}>
      <NetworkLoader createClient={createClient}>
-        <div className="w-screen min-h-screen grid pb-24 bg-white text-neutral-900 dark:bg-black dark:text-neutral-100">
+        <div className="w-screen min-h-screen grid pb-6 bg-white text-neutral-900 dark:bg-black dark:text-neutral-100">
          <div className="layout-grid w-screen justify-self-center">
            <Header theme={theme} toggleTheme={toggleTheme} />
-            <StatsManager className="max-w-3xl px-24" />
+            <StatsManager className="max-w-3xl px-6" />
          </div>
        </div>
      </NetworkLoader>
@@ -1,5 +1,8 @@
-import { VegaLogo, ThemeSwitcher } from '@vegaprotocol/ui-toolkit';
-import { VegaBackgroundVideo } from '../videos';
+import {
+  BackgroundVideo,
+  VegaLogo,
+  ThemeSwitcher,
+} from '@vegaprotocol/ui-toolkit';

 interface ThemeToggleProps {
  theme: 'light' | 'dark';
@@ -8,11 +11,11 @@ interface ThemeToggleProps {

 export const Header = ({ theme, toggleTheme }: ThemeToggleProps) => {
  return (
-    <header className="relative overflow-hidden py-8 mb-40 md:mb-64">
-      <VegaBackgroundVideo />
+    <header className="relative overflow-hidden py-2 mb-10 md:mb-16">
+      <BackgroundVideo />

-      <div className="relative flex justify-center px-8 dark:bg-black bg-white">
-        <div className="w-full max-w-3xl p-20 flex items-center justify-between">
+      <div className="relative flex justify-center px-2 dark:bg-black bg-white">
+        <div className="w-full max-w-3xl p-5 flex items-center justify-between">
          <VegaLogo />
          <ThemeSwitcher theme={theme} onToggle={toggleTheme} />
        </div>
@@ -1 +0,0 @@
-export { VegaBackgroundVideo } from './vega-background-video';
@@ -10,12 +10,9 @@ const vegaWallet = '[data-testid="vega-wallet"]';
 const vegaWalletName = Cypress.env('vegaWalletName');
 const vegaWalletPassphrase = Cypress.env('vegaWalletPassphrase');
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
-const newProposalButton = '[data-testid="new-proposal-link"]';
-const newProposalDatabox = '[data-testid="proposal-data"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const dialogCloseButton = '[data-testid="dialog-close"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const proposalInformationTableRows = '[data-testid="key-value-table-row"]';
 const openProposals = '[data-testid="open-proposals"]';
 const proposalResponseProposalIdPath =
  'response.body.data.busEvents.0.event.id';
@@ -30,6 +27,7 @@ const proposalVoteProgressAgainstTokens =
 const changeVoteButton = '[data-testid="change-vote-button"]';
 const proposalDetailsTitle = '[data-testid="proposal-title"]';
 const proposalDetailsDescription = '[data-testid="proposal-description"]';
+const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
 const voteButtons = '[data-testid="vote-buttons"]';
 const voteStatus = '[data-testid="vote-status"]';
 const rejectProposalsLink = '[href="/governance/rejected"]';
@@ -39,6 +37,14 @@ const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 const restConnectorForm = '[data-testid="rest-connector-form"]';

+const governanceProposalType = {
+  NETWORK_PARAMETER: 'Network parameter',
+  NEW_MARKET: 'New market',
+  UPDATE_MARKET: 'Update market',
+  NEW_ASSET: 'New asset',
+  FREEFORM: 'Freeform',
+};
+
 context(
  'Governance flow - with eth and vega wallets connected',
  { tags: '@slow' },
@@ -73,6 +79,16 @@ context(
            'h'
          )[0] / 24
        ).as('maxCloseDays');
+        cy.wrap(
+          network_parameters['governance.proposal.freeform.minClose'].split(
+            'h'
+          )[0]
+        ).as('minCloseHours');
+        cy.wrap(
+          network_parameters['governance.proposal.freeform.maxClose'].split(
+            'h'
+          )[0]
+        ).as('maxCloseHours');
      });
      cy.vega_wallet_connect();
      cy.vega_wallet_set_specified_approval_amount('1000');
@@ -125,7 +141,7 @@ context(
      });

      it('Submit a proposal form - shows how many vega tokens are required to make a proposal', function () {
-        cy.get(newProposalButton).should('be.visible').click();
+        cy.go_to_make_new_proposal(governanceProposalType.NEW_MARKET);
        cy.contains(
          `You must have at least ${this.minProposerBalance} VEGA associated to make a proposal`
        ).should('be.visible');
@@ -135,13 +151,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Confirm transaction in wallet', epochTimeout).should(
          'be.visible'
@@ -157,7 +169,7 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
+        cy.navigate_to_page_if_not_already_loaded('governance');
        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
          'contain',
          this.minProposerBalance,
@@ -176,12 +188,8 @@ context(

        cy.navigate_to('governance');
        cy.wait_for_spinner();
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -194,13 +202,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -223,13 +227,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -252,15 +252,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp).as(
-              'freeformProposal'
-            );
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50').as('freeformProposal');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -297,13 +291,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -330,32 +320,29 @@ context(
        // 1004-VOTE-005
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
-        );
+        ).then(() => {
+          let proposalHours = [
+            (Number(this.minCloseHours) + 1).toString(),
+            this.maxCloseHours,
+            (Number(this.minCloseHours) + 3).toString(),
+            (Number(this.minCloseHours) + 2).toString(),
+          ];
+          for (var index = 0; index < proposalHours.length; index++) {
+            cy.navigate_to_page_if_not_already_loaded('governance');
+            cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+            cy.enter_unique_freeform_proposal_body(proposalHours[index]);
+            cy.get(newProposalSubmitButton).should('be.visible').click();
+            cy.contains('Awaiting network confirmation', epochTimeout).should(
+              'be.visible'
+            );
+            cy.contains('Proposal submitted', proposalTimeout).should(
+              'be.visible'
+            );
+            cy.get(dialogCloseButton).click();
+            cy.wait_for_proposal_sync();
+          }
+        });
        // Ensuring that proposals are not posted in same order as sort order
-        let proposalDays = [
-          this.minCloseDays + 1,
-          this.maxCloseDays,
-          this.minCloseDays + 3,
-          this.minCloseDays + 2,
-        ];
-        for (var index = 0; index < proposalDays.length; index++) {
-          cy.navigate_to_page_if_not_allready_loaded('governance');
-          cy.get(newProposalButton).should('be.visible').click();
-          cy.create_ten_digit_unix_timestamp_for_specified_days(
-            proposalDays[index]
-          ).then((closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          });
-          cy.get(newProposalSubmitButton).should('be.visible').click();
-          cy.contains('Awaiting network confirmation', epochTimeout).should(
-            'be.visible'
-          );
-          cy.contains('Proposal submitted', proposalTimeout).should(
-            'be.visible'
-          );
-          cy.get(dialogCloseButton).click();
-          cy.wait_for_proposal_sync();
-        }

        let arrayOfProposals = [];

@@ -379,13 +366,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -406,13 +389,13 @@ context(
        cy.get_proposal_information_from_table('Total Supply')
          .invoke('text')
          .then((totalSupply) => {
-            let tokensRequiredToAcheiveResult = parseFloat(
+            let tokensRequiredToAchieveResult = parseFloat(
              (totalSupply.replace(/,/g, '') * this.requiredParticipation) / 100
            ).toFixed(2);
            cy.ensure_specified_unstaked_tokens_are_associated(
-              tokensRequiredToAcheiveResult
+              tokensRequiredToAchieveResult
            );
-            cy.navigate_to_page_if_not_allready_loaded('governance');
+            cy.navigate_to_page_if_not_already_loaded('governance');
            cy.get('@submittedProposal').within(() =>
              cy.get(viewProposalButton).click()
            );
@@ -432,14 +415,8 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp).as(
-              'freeformProposal'
-            );
-          }
-        );
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50').as('freeformProposal');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -474,15 +451,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp).as(
-              'freeformProposal'
-            );
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50').as('freeformProposal');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -517,13 +488,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -554,14 +521,15 @@ context(
      });

      it('Newly created freeform proposal details - shows proposed and closing dates', function () {
+        const closingVoteHrs = '72';
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('9').then(
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.create_ten_digit_unix_timestamp_for_specified_days('3').then(
          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
+            cy.enter_unique_freeform_proposal_body(closingVoteHrs);
            cy.get(newProposalSubmitButton).should('be.visible').click();

            cy.contains('Awaiting network confirmation', epochTimeout).should(
@@ -594,7 +562,7 @@ context(
          }
        );
        // 1004-VOTE-043
-        cy.contains('9 days left to vote').should('be.visible');
+        cy.contains('3 days left to vote').should('be.visible');
      });

      it('Newly created freeform proposal details - shows default status set to fail', function () {
@@ -603,13 +571,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -643,13 +607,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -714,13 +674,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -779,13 +735,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -837,13 +789,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -893,13 +841,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -918,13 +862,13 @@ context(
        cy.get_proposal_information_from_table('Total Supply')
          .invoke('text')
          .then((totalSupply) => {
-            let tokensRequiredToAcheiveResult = parseFloat(
+            let tokensRequiredToAchieveResult = parseFloat(
              (totalSupply.replace(/,/g, '') * this.requiredParticipation) / 100
            ).toFixed(2);
            cy.ensure_specified_unstaked_tokens_are_associated(
-              tokensRequiredToAcheiveResult
+              tokensRequiredToAchieveResult
            );
-            cy.navigate_to_page_if_not_allready_loaded('governance');
+            cy.navigate_to_page_if_not_already_loaded('governance');
            cy.get('@submittedProposal').within(() =>
              cy.get(viewProposalButton).click()
            );
@@ -936,13 +880,13 @@ context(
              .and('be.visible');
            // 1004-VOTE-065
            cy.get(proposalVoteProgressForTokens)
-              .contains(tokensRequiredToAcheiveResult)
+              .contains(tokensRequiredToAchieveResult)
              .and('be.visible');
            cy.get(proposalVoteProgressAgainstTokens)
              .contains('0.00')
              .and('be.visible');
            cy.get_proposal_information_from_table('Tokens for proposal')
-              .should('have.text', tokensRequiredToAcheiveResult)
+              .should('have.text', tokensRequiredToAchieveResult)
              .and('be.visible');
            cy.get_proposal_information_from_table('Tokens against proposal')
              .should('have.text', '0.00')
@@ -973,67 +917,36 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days(
-          this.minCloseDays - 1
-        ).then((closingDateTimestamp) => {
-          cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-        });
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('40');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
-          'be.visible'
+          'not.exist'
        );
-        cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-        cy.get(dialogCloseButton).click();
-        cy.wait_for_proposal_sync();
-        cy.navigate_to('governance');
-        cy.wait_for_spinner();
-        cy.get(rejectProposalsLink).click().wait_for_spinner();
-        cy.get_submitted_proposal_from_proposal_list().within(() => {
-          cy.contains('Rejected').should('be.visible');
-          cy.contains('Close time too soon').should('be.visible');
-        });
      });

      it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days(
-          this.maxCloseDays + 1
-        ).then((closingDateTimestamp) => {
-          cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-        });
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('100000');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
-          'be.visible'
+          'not.exist'
        );
-        cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-        cy.get(dialogCloseButton).click();
-        cy.wait_for_proposal_sync();
-        cy.navigate_to('governance');
-        cy.wait_for_spinner();
-        cy.get(rejectProposalsLink).click().wait_for_spinner();
-        cy.get_submitted_proposal_from_proposal_list().within(() => {
-          cy.contains('Rejected').should('be.visible');
-          cy.contains('Close time too late').should('be.visible');
-        });
      });

-      it('Creating a proposal - proposal rejected - able to access rejected proposals', function () {
+      // No longer able to submit a rejected freeform proposal
+      it.skip('Creating a proposal - proposal rejected - able to access rejected proposals', function () {
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days(
-          this.maxCloseDays + 1
-        ).then((closingDateTimestamp) => {
-          cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-        });
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('500000000');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -1066,12 +979,8 @@ context(
          '0.000000000000000000',
          txTimeout
        );
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('1').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('49');
        cy.get(newProposalSubmitButton).should('be.visible').click();

        cy.contains('Transaction failed', proposalTimeout).should('be.visible');
@@ -1086,13 +995,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance - 0.000001
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('1').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('49');
        cy.get(newProposalSubmitButton).should('be.visible').click();

        cy.contains('Transaction failed', proposalTimeout).should('be.visible');
@@ -1103,13 +1008,14 @@ context(
          .should('be.visible');
      });

-      it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
+      // Json containing unexpected field no longer fails submission
+      it.skip('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
        // 1004-VOTE-038
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
        cy.create_ten_digit_unix_timestamp_for_specified_days('1').then(
          (closingDateTimestamp) => {
            cy.fixture('/proposals/freeform.json').then((freeformProposal) => {
@@ -1117,10 +1023,14 @@ context(
              freeformProposal.unexpectfield = `i shouldn't be here`;
              let proposalPayload = JSON.stringify(freeformProposal);

-              cy.get(newProposalDatabox).type(proposalPayload, {
+              cy.get(proposalDetailsTitle).type(
+                freeformProposal.rationale.title
+              );
+              cy.get(proposalDetailsDescription).type(proposalPayload, {
                parseSpecialCharSequences: false,
                delay: 2,
              });
+              cy.get(proposalVoteDeadline).clear().click().type('50');
            });
          }
        );
@@ -1128,28 +1038,33 @@ context(

        cy.contains('Transaction failed', proposalTimeout).should('be.visible');
        cy.get(feedbackError)
-          .contains('Unknown field unexpectfield in vega commands')
+          .contains('Unknown field unexpectfield in vega proposal terms')
          .should('be.visible');
      });

-      it('Unable to create a freeform proposal - when json terms section contains unexpected field', function () {
+      // Json containing unexpected field no longer fails submission
+      it.skip('Unable to create a freeform proposal - when json terms section contains unexpected field', function () {
        // 1004-VOTE-038
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
        cy.create_ten_digit_unix_timestamp_for_specified_days('1').then(
          (closingDateTimestamp) => {
            cy.fixture('/proposals/freeform.json').then((freeformProposal) => {
              freeformProposal.terms.closingTimestamp = closingDateTimestamp;
-              freeformProposal.terms.unexpectfield = `i shouldn't be here`;
+              freeformProposal.terms.unexpectedField = `i shouldn't be here`;
              let proposalPayload = JSON.stringify(freeformProposal);

-              cy.get(newProposalDatabox).type(proposalPayload, {
+              cy.get(proposalDetailsTitle).type(
+                freeformProposal.rationale.title
+              );
+              cy.get(proposalDetailsDescription).type(proposalPayload, {
                parseSpecialCharSequences: false,
                delay: 2,
              });
+              cy.get(proposalVoteDeadline).clear().click().type('50');
            });
          }
        );
@@ -1166,13 +1081,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -1201,13 +1112,9 @@ context(
        cy.ensure_specified_unstaked_tokens_are_associated(
          this.minProposerBalance
        );
-        cy.navigate_to_page_if_not_allready_loaded('governance');
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.create_ten_digit_unix_timestamp_for_specified_days('7').then(
-          (closingDateTimestamp) => {
-            cy.enter_unique_freeform_proposal_body(closingDateTimestamp);
-          }
-        );
+        cy.navigate_to_page_if_not_already_loaded('governance');
+        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+        cy.enter_unique_freeform_proposal_body('50');
        cy.get(newProposalSubmitButton).should('be.visible').click();
        cy.contains('Awaiting network confirmation', epochTimeout).should(
          'be.visible'
@@ -1254,175 +1161,6 @@ context(
          }
        }
      );
-
-      Cypress.Commands.add(
-        'convert_unix_timestamp_to_governance_data_table_date_format',
-        (unixTimestamp, monthTextLength = 'longMonth') => {
-          let dateSupplied = new Date(unixTimestamp * 1000),
-            year = dateSupplied.getFullYear(),
-            months = [
-              'January',
-              'February',
-              'March',
-              'April',
-              'May',
-              'June',
-              'July',
-              'August',
-              'September',
-              'October',
-              'November',
-              'December',
-            ],
-            month = months[dateSupplied.getMonth()],
-            shortMonth = months[dateSupplied.getMonth()].substring(0, 3),
-            date = dateSupplied.getDate();
-
-          if (monthTextLength === 'longMonth')
-            return `${date} ${month} ${year}`;
-          else return `${date} ${shortMonth} ${year}`;
-        }
-      );
-
-      Cypress.Commands.add(
-        'create_ten_digit_unix_timestamp_for_specified_days',
-        (durationDays) => {
-          let today = new Date();
-          let timestamp = today.setDate(
-            today.getDate() + parseInt(durationDays)
-          );
-          timestamp = Math.floor(timestamp / 1000);
-
-          return timestamp;
-        }
-      );
-
-      Cypress.Commands.add(
-        'enter_unique_freeform_proposal_body',
-        (timestamp) => {
-          cy.fixture('/proposals/freeform.json').then((freeformProposal) => {
-            freeformProposal.terms.closingTimestamp = timestamp;
-            freeformProposal.rationale.title += timestamp;
-            let proposalPayload = JSON.stringify(freeformProposal);
-
-            cy.get(newProposalDatabox).type(proposalPayload, {
-              parseSpecialCharSequences: false,
-              delay: 2,
-            });
-
-            cy.wrap(freeformProposal);
-          });
-        }
-      );
-
-      Cypress.Commands.add('get_network_parameters', () => {
-        let mutation = '{networkParameters {key value}}';
-        cy.request({
-          method: 'POST',
-          url: `http://localhost:3028/query`,
-          body: {
-            query: mutation,
-          },
-          headers: { 'content-type': 'application/json' },
-        })
-          .its(`body.data.networkParameters`)
-          .then(function (response) {
-            let object = response.reduce(function (r, e) {
-              r[e.key] = e.value;
-              return r;
-            }, {});
-
-            return object;
-          });
-      });
-
-      Cypress.Commands.add('get_submitted_proposal_from_proposal_list', () => {
-        cy.wait('@proposalSubmissionCompletion')
-          .its(proposalResponseProposalIdPath)
-          .then((proposalId) => {
-            return cy.get(`#${proposalId}`);
-          });
-      });
-
-      Cypress.Commands.add(
-        'get_governance_proposal_date_format_for_specified_days',
-        (days, shortOrLong) => {
-          cy.create_ten_digit_unix_timestamp_for_specified_days(days).then(
-            (date) => {
-              cy.convert_unix_timestamp_to_governance_data_table_date_format(
-                date,
-                shortOrLong
-              ).then((convertedDate) => {
-                return convertedDate;
-              });
-            }
-          );
-        }
-      );
-
-      Cypress.Commands.add('get_proposal_information_from_table', (heading) => {
-        cy.get(proposalInformationTableRows).contains(heading).siblings();
-      });
-
-      Cypress.Commands.add('vote_for_proposal', (vote) => {
-        cy.contains('Vote breakdown').should('be.visible', { timeout: 10000 });
-        cy.get(voteButtons).contains(vote).click();
-        cy.contains('Casting vote...').should('be.visible');
-        cy.contains('Casting vote...', txTimeout).should('not.exist');
-      });
-
-      Cypress.Commands.add('wait_for_proposal_sync', () => {
-        // This is a workaround function required because after posting a proposal
-        // and waiting for the ProposalEvent network call to respond there can still be a few seconds
-        // before proposal appears in the list - so rather than hard coded wait - we just wait on the
-        // delegation checks that are performed on the governance page.
-
-        cy.intercept('POST', '/query', (req) => {
-          if (req.body.operationName === 'Delegations') {
-            req.alias = 'proposalDelegationsCompletion';
-          }
-        });
-
-        // waiting for two network calls
-        cy.wait([
-          '@proposalDelegationsCompletion',
-          '@proposalDelegationsCompletion',
-        ]);
-
-        // Turn off this intercept from here on in
-        cy.intercept('POST', '/query', (req) => {
-          if (req.body.operationName === 'Delegations') {
-            req.continue();
-          }
-        });
-      });
-
-      Cypress.Commands.add(
-        'navigate_to_page_if_not_allready_loaded',
-        (section) => {
-          cy.url().then((url) => {
-            if (url != `http://localhost:4210/${section}`) {
-              cy.navigate_to(section);
-              cy.wait_for_spinner();
-            }
-          });
-        }
-      );
-
-      Cypress.Commands.add(
-        'get_sort_order_of_supplied_array',
-        (suppliedArray) => {
-          const tempArray = [];
-          for (let index = 1; index < suppliedArray.length; index++) {
-            tempArray.push(
-              suppliedArray[index - 1].localeCompare(suppliedArray[index])
-            );
-          }
-          if (tempArray.every((n) => n <= 0)) return 'ascending';
-          else if (tempArray.every((n) => n >= 0)) return 'descending';
-          else return 'unsorted';
-        }
-      );
    });
  }
 );
@@ -0,0 +1,170 @@
+const newProposalButton = '[data-testid="new-proposal-link"]';
+const proposalInformationTableRows = '[data-testid="key-value-table-row"]';
+const newProposalTitle = '[data-testid="proposal-title"]';
+const newProposalDescription = '[data-testid="proposal-description"]';
+const proposalResponseProposalIdPath =
+  'response.body.data.busEvents.0.event.id';
+const voteButtons = '[data-testid="vote-buttons"]';
+const txTimeout = Cypress.env('txTimeout');
+const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
+
+Cypress.Commands.add(
+  'convert_unix_timestamp_to_governance_data_table_date_format',
+  (unixTimestamp, monthTextLength = 'longMonth') => {
+    let dateSupplied = new Date(unixTimestamp * 1000),
+      year = dateSupplied.getFullYear(),
+      months = [
+        'January',
+        'February',
+        'March',
+        'April',
+        'May',
+        'June',
+        'July',
+        'August',
+        'September',
+        'October',
+        'November',
+        'December',
+      ],
+      month = months[dateSupplied.getMonth()],
+      shortMonth = months[dateSupplied.getMonth()].substring(0, 3),
+      date = dateSupplied.getDate();
+
+    if (monthTextLength === 'longMonth') return `${date} ${month} ${year}`;
+    else return `${date} ${shortMonth} ${year}`;
+  }
+);
+
+Cypress.Commands.add(
+  'create_ten_digit_unix_timestamp_for_specified_days',
+  (durationDays) => {
+    let today = new Date();
+    let timestamp = today.setDate(today.getDate() + parseInt(durationDays));
+    timestamp = Math.floor(timestamp / 1000);
+
+    return timestamp;
+  }
+);
+
+Cypress.Commands.add('enter_unique_freeform_proposal_body', (timestamp) => {
+  cy.fixture('/proposals/freeform.json').then((freeformProposal) => {
+    freeformProposal.terms.closingTimestamp = timestamp;
+    freeformProposal.rationale.title += timestamp;
+    let proposalPayload = JSON.stringify(freeformProposal);
+
+    cy.get(newProposalTitle).type(freeformProposal.rationale.title);
+
+    cy.get(newProposalDescription).type(proposalPayload, {
+      parseSpecialCharSequences: false,
+      delay: 2,
+    });
+
+    cy.get(proposalVoteDeadline).clear().click().type(timestamp);
+
+    cy.wrap(freeformProposal);
+  });
+});
+
+Cypress.Commands.add('get_network_parameters', () => {
+  let mutation = '{networkParameters {key value}}';
+  cy.request({
+    method: 'POST',
+    url: `http://localhost:3028/query`,
+    body: {
+      query: mutation,
+    },
+    headers: { 'content-type': 'application/json' },
+  })
+    .its(`body.data.networkParameters`)
+    .then(function (response) {
+      let object = response.reduce(function (r, e) {
+        r[e.key] = e.value;
+        return r;
+      }, {});
+
+      return object;
+    });
+});
+
+Cypress.Commands.add('get_submitted_proposal_from_proposal_list', () => {
+  cy.wait('@proposalSubmissionCompletion')
+    .its(proposalResponseProposalIdPath)
+    .then((proposalId) => {
+      return cy.get(`#${proposalId}`);
+    });
+});
+
+Cypress.Commands.add(
+  'get_governance_proposal_date_format_for_specified_days',
+  (days, shortOrLong) => {
+    cy.create_ten_digit_unix_timestamp_for_specified_days(days).then((date) => {
+      cy.convert_unix_timestamp_to_governance_data_table_date_format(
+        date,
+        shortOrLong
+      ).then((convertedDate) => {
+        return convertedDate;
+      });
+    });
+  }
+);
+
+Cypress.Commands.add('get_proposal_information_from_table', (heading) => {
+  cy.get(proposalInformationTableRows).contains(heading).siblings();
+});
+
+Cypress.Commands.add('vote_for_proposal', (vote) => {
+  cy.contains('Vote breakdown').should('be.visible', { timeout: 10000 });
+  cy.get(voteButtons).contains(vote).click();
+  cy.contains('Casting vote...').should('be.visible');
+  cy.contains('Casting vote...', txTimeout).should('not.exist');
+});
+
+Cypress.Commands.add('wait_for_proposal_sync', () => {
+  // This is a workaround function required because after posting a proposal
+  // and waiting for the ProposalEvent network call to respond there can still be a few seconds
+  // before proposal appears in the list - so rather than hard coded wait - we just wait on the
+  // delegation checks that are performed on the governance page.
+
+  cy.intercept('POST', '/query', (req) => {
+    if (req.body.operationName === 'Delegations') {
+      req.alias = 'proposalDelegationsCompletion';
+    }
+  });
+
+  // waiting for two network calls
+  cy.wait(['@proposalDelegationsCompletion', '@proposalDelegationsCompletion']);
+
+  // Turn off this intercept from here on in
+  cy.intercept('POST', '/query', (req) => {
+    if (req.body.operationName === 'Delegations') {
+      req.continue();
+    }
+  });
+});
+
+Cypress.Commands.add('navigate_to_page_if_not_already_loaded', (section) => {
+  cy.url().then((url) => {
+    if (url != `http://localhost:4210/${section}`) {
+      cy.navigate_to(section);
+      cy.wait_for_spinner();
+    }
+  });
+});
+
+Cypress.Commands.add('get_sort_order_of_supplied_array', (suppliedArray) => {
+  const tempArray = [];
+  for (let index = 1; index < suppliedArray.length; index++) {
+    tempArray.push(
+      suppliedArray[index - 1].localeCompare(suppliedArray[index])
+    );
+  }
+  if (tempArray.every((n) => n <= 0)) return 'ascending';
+  else if (tempArray.every((n) => n >= 0)) return 'descending';
+  else return 'unsorted';
+});
+
+Cypress.Commands.add('go_to_make_new_proposal', (proposalType) => {
+  cy.get(newProposalButton).should('be.visible').click();
+  cy.get('a.underline').contains(proposalType).click();
+});
@@ -2,6 +2,7 @@ import '@vegaprotocol/cypress';

 import './common.functions.js';
 import './staking.functions.js';
+import './governance.functions.js';
 import './wallet-eth.functions.js';
 import './wallet-teardown.functions.js';
 import './wallet-vega.functions.js';
@@ -470,7 +470,7 @@
  "notAssociated": "Not Associated",
  "title": "VEGA TOKEN",
  "Use the Ethereum wallet you want to send your tokens to. You'll also need enough Ethereum to pay gas.": "Connect to the Ethereum wallet that holds your $VEGA tokens to see what can be redeemed from vesting tranches. To redeem tokens you will need some ETH to pay gas fees.\n",
-  "Staked on Vega validator": "Staked $VEGA",
+  "Staked on Vega validator": "Associated to Vega key",
  "You can associate tokens while they are held in the vesting contract, when they unlock you will need to disassociate them before they can be redeemed.": "You can associate tokens while they are held in the vesting contract, when they unlock you will need to disassociate them before they can be redeemed.",
  "Nominate Stake to Validator Node": "Select a validator to nominate",
  "successfullAssociationMessage": "Vega key {{vegaKey}} can now participate in governance and nominate a validator with your associated $VEGA.",
@@ -49,6 +49,15 @@ fragment ProposalFields on Proposal {
          value
        }
      }
+      ... on UpdateAsset {
+        quantum
+        source {
+          ... on UpdateERC20 {
+            lifetimeLimit
+            withdrawThreshold
+          }
+        }
+      }
    }
  }
  votes {
@@ -33,8 +33,8 @@ export interface ProposalFields_party {
  id: string;
 }

-export interface ProposalFields_terms_change_UpdateAsset {
-  __typename: "UpdateAsset" | "NewFreeform";
+export interface ProposalFields_terms_change_NewFreeform {
+  __typename: "NewFreeform";
 }

 export interface ProposalFields_terms_change_NewMarket_instrument_futureProduct_settlementAsset {
@@ -133,7 +133,33 @@ export interface ProposalFields_terms_change_UpdateNetworkParameter {
  networkParameter: ProposalFields_terms_change_UpdateNetworkParameter_networkParameter;
 }

-export type ProposalFields_terms_change = ProposalFields_terms_change_UpdateAsset | ProposalFields_terms_change_NewMarket | ProposalFields_terms_change_UpdateMarket | ProposalFields_terms_change_NewAsset | ProposalFields_terms_change_UpdateNetworkParameter;
+export interface ProposalFields_terms_change_UpdateAsset_source {
+  __typename: "UpdateERC20";
+  /**
+   * The lifetime limits deposit per address
+   * Note: this is a temporary measure for alpha mainnet
+   */
+  lifetimeLimit: string;
+  /**
+   * The maximum allowed per withdrawal
+   * Note: this is a temporary measure for alpha mainnet
+   */
+  withdrawThreshold: string;
+}
+
+export interface ProposalFields_terms_change_UpdateAsset {
+  __typename: "UpdateAsset";
+  /**
+   * The minimum economically meaningful amount of this specific asset
+   */
+  quantum: string;
+  /**
+   * The source of the updated asset
+   */
+  source: ProposalFields_terms_change_UpdateAsset_source;
+}
+
+export type ProposalFields_terms_change = ProposalFields_terms_change_NewFreeform | ProposalFields_terms_change_NewMarket | ProposalFields_terms_change_UpdateMarket | ProposalFields_terms_change_NewAsset | ProposalFields_terms_change_UpdateNetworkParameter | ProposalFields_terms_change_UpdateAsset;

 export interface ProposalFields_terms {
  __typename: "ProposalTerms";
@@ -3,19 +3,19 @@ import { Schema as Types } from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: string, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: string, enactmentDatetime?: string | null, change: { __typename: 'NewAsset', name: string, symbol: string, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array<string> | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: string, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: string, enactmentDatetime?: string | null, change: { __typename: 'NewAsset', name: string, symbol: string, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array<string> | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null } } };

 export type ProposalQueryVariables = Types.Exact<{
  proposalId: Types.Scalars['ID'];
 }>;


-export type ProposalQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: string, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: string, enactmentDatetime?: string | null, change: { __typename: 'NewAsset', name: string, symbol: string, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array<string> | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null } } } | null };
+export type ProposalQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: string, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: string, enactmentDatetime?: string | null, change: { __typename: 'NewAsset', name: string, symbol: string, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array<string> | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null } } } | null };

 export type ProposalsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ProposalsQuery = { __typename?: 'Query', proposals?: Array<{ __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: string, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: string, enactmentDatetime?: string | null, change: { __typename: 'NewAsset', name: string, symbol: string, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array<string> | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null } } }> | null };
+export type ProposalsQuery = { __typename?: 'Query', proposals?: Array<{ __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: string, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: string, enactmentDatetime?: string | null, change: { __typename: 'NewAsset', name: string, symbol: string, source: { __typename: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename: 'ERC20', contractAddress: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array<string> | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, votes?: Array<{ __typename?: 'Vote', value: Types.VoteValue, datetime: string, party: { __typename?: 'Party', id: string, stake: { __typename?: 'PartyStake', currentStakeAvailable: string } } }> | null } } }> | null };

 export const ProposalFieldsFragmentDoc = gql`
    fragment ProposalFields on Proposal {
@@ -69,6 +69,15 @@ export const ProposalFieldsFragmentDoc = gql`
          value
        }
      }
+      ... on UpdateAsset {
+        quantum
+        source {
+          ... on UpdateERC20 {
+            lifetimeLimit
+            withdrawThreshold
+          }
+        }
+      }
    }
  }
  votes {
@@ -1,9 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { ProposalHeader } from './proposal-header';
-import type { Proposal_proposal } from '@vegaprotocol/governance';
+import type { ProposalFields } from '../../__generated__/ProposalFields';

-const renderComponent = (proposal: Proposal_proposal) => (
+const renderComponent = (proposal: ProposalFields) => (
  <ProposalHeader proposal={proposal} />
 );

@@ -234,6 +234,23 @@ describe('Proposal header', () => {
    );
  });

+  it('Renders asset change proposal header', () => {
+    render(
+      renderComponent(
+        generateProposal({
+          terms: {
+            change: {
+              __typename: 'UpdateAsset',
+            },
+          },
+        })
+      )
+    );
+    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
+      'Update asset'
+    );
+  });
+
  it("Renders unknown proposal if it's a different proposal type", () => {
    render(
      renderComponent(
@@ -76,6 +76,10 @@ export const ProposalHeader = ({ proposal }: { proposal: ProposalFields }) => {
      details = `${t('FreeformProposal')}: ${proposal.id}`;
      break;
    }
+    case 'UpdateAsset': {
+      details = `${t('Update asset')}`;
+      break;
+    }
  }

  return (
@@ -1,8 +1,8 @@
 import { captureException, captureMessage } from '@sentry/minimal';
-import * as React from 'react';

 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { VoteValue } from '@vegaprotocol/types';
+import { useEffect, useMemo, useState } from 'react';

 export type Vote = {
  value: VoteValue;
@@ -43,15 +43,17 @@ export function useUserVote(
  noVotes: Votes | null
 ) {
  const { keypair, sendTx } = useVegaWallet();
-  const yes = React.useMemo(() => yesVotes || [], [yesVotes]);
-  const no = React.useMemo(() => noVotes || [], [noVotes]);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const [timeout, setTimeoutValue] = useState<any>(null);
+  const yes = useMemo(() => yesVotes || [], [yesVotes]);
+  const no = useMemo(() => noVotes || [], [noVotes]);

-  const [voteState, setVoteState] = React.useState<VoteState | null>(
+  const [voteState, setVoteState] = useState<VoteState | null>(
    VoteState.NotCast
  );

  // Find the users vote everytime yes or no votes change
-  const userVote = React.useMemo(() => {
+  const userVote = useMemo(() => {
    if (keypair) {
      return getUserVote(keypair.pub, yes, no);
    }
@@ -59,7 +61,7 @@ export function useUserVote(
  }, [keypair, yes, no]);

  // If user vote changes update the vote state
-  React.useEffect(() => {
+  useEffect(() => {
    if (!userVote) {
      setVoteState(VoteState.NotCast);
    } else {
@@ -71,21 +73,19 @@ export function useUserVote(

  // Starts a timeout of 30s to set a failed message if
  // the vote is not seen by the time the callback is invoked
-  React.useEffect(() => {
-    // eslint-disable-next-line
-    let timeout: any;
-
-    if (voteState === VoteState.Pending) {
-      setTimeout(() => {
+  useEffect(() => {
+    if (voteState === VoteState.Pending && !timeout) {
+      const timeout = setTimeout(() => {
        setVoteState(VoteState.Failed);
        captureMessage('Vote not seen after 30s');
      }, 1000 * 30);
-    } else {
+      setTimeoutValue(timeout);
+    } else if (voteState !== VoteState.Pending) {
      clearTimeout(timeout);
    }

    return () => clearTimeout(timeout);
-  }, [voteState]);
+  }, [timeout, voteState]);

  /**
   * Casts a vote using the users connected wallet
@@ -52,6 +52,15 @@ export const PROPOSAL_FRAGMENT = gql`
            value
          }
        }
+        ... on UpdateAsset {
+          quantum
+          source {
+            ... on UpdateERC20 {
+              lifetimeLimit
+              withdrawThreshold
+            }
+          }
+        }
      }
    }
    votes {
@@ -33,8 +33,8 @@ export interface Proposal_proposal_party {
  id: string;
 }

-export interface Proposal_proposal_terms_change_UpdateAsset {
-  __typename: "UpdateAsset" | "NewFreeform";
+export interface Proposal_proposal_terms_change_NewFreeform {
+  __typename: "NewFreeform";
 }

 export interface Proposal_proposal_terms_change_NewMarket_instrument_futureProduct_settlementAsset {
@@ -133,7 +133,33 @@ export interface Proposal_proposal_terms_change_UpdateNetworkParameter {
  networkParameter: Proposal_proposal_terms_change_UpdateNetworkParameter_networkParameter;
 }

-export type Proposal_proposal_terms_change = Proposal_proposal_terms_change_UpdateAsset | Proposal_proposal_terms_change_NewMarket | Proposal_proposal_terms_change_UpdateMarket | Proposal_proposal_terms_change_NewAsset | Proposal_proposal_terms_change_UpdateNetworkParameter;
+export interface Proposal_proposal_terms_change_UpdateAsset_source {
+  __typename: "UpdateERC20";
+  /**
+   * The lifetime limits deposit per address
+   * Note: this is a temporary measure for alpha mainnet
+   */
+  lifetimeLimit: string;
+  /**
+   * The maximum allowed per withdrawal
+   * Note: this is a temporary measure for alpha mainnet
+   */
+  withdrawThreshold: string;
+}
+
+export interface Proposal_proposal_terms_change_UpdateAsset {
+  __typename: "UpdateAsset";
+  /**
+   * The minimum economically meaningful amount of this specific asset
+   */
+  quantum: string;
+  /**
+   * The source of the updated asset
+   */
+  source: Proposal_proposal_terms_change_UpdateAsset_source;
+}
+
+export type Proposal_proposal_terms_change = Proposal_proposal_terms_change_NewFreeform | Proposal_proposal_terms_change_NewMarket | Proposal_proposal_terms_change_UpdateMarket | Proposal_proposal_terms_change_NewAsset | Proposal_proposal_terms_change_UpdateNetworkParameter | Proposal_proposal_terms_change_UpdateAsset;

 export interface Proposal_proposal_terms {
  __typename: "ProposalTerms";
@@ -33,8 +33,8 @@ export interface Proposals_proposalsConnection_edges_node_party {
  id: string;
 }

-export interface Proposals_proposalsConnection_edges_node_terms_change_UpdateAsset {
-  __typename: "UpdateAsset" | "NewFreeform";
+export interface Proposals_proposalsConnection_edges_node_terms_change_NewFreeform {
+  __typename: "NewFreeform";
 }

 export interface Proposals_proposalsConnection_edges_node_terms_change_NewMarket_instrument_futureProduct_settlementAsset {
@@ -133,7 +133,33 @@ export interface Proposals_proposalsConnection_edges_node_terms_change_UpdateNet
  networkParameter: Proposals_proposalsConnection_edges_node_terms_change_UpdateNetworkParameter_networkParameter;
 }

-export type Proposals_proposalsConnection_edges_node_terms_change = Proposals_proposalsConnection_edges_node_terms_change_UpdateAsset | Proposals_proposalsConnection_edges_node_terms_change_NewMarket | Proposals_proposalsConnection_edges_node_terms_change_UpdateMarket | Proposals_proposalsConnection_edges_node_terms_change_NewAsset | Proposals_proposalsConnection_edges_node_terms_change_UpdateNetworkParameter;
+export interface Proposals_proposalsConnection_edges_node_terms_change_UpdateAsset_source {
+  __typename: "UpdateERC20";
+  /**
+   * The lifetime limits deposit per address
+   * Note: this is a temporary measure for alpha mainnet
+   */
+  lifetimeLimit: string;
+  /**
+   * The maximum allowed per withdrawal
+   * Note: this is a temporary measure for alpha mainnet
+   */
+  withdrawThreshold: string;
+}
+
+export interface Proposals_proposalsConnection_edges_node_terms_change_UpdateAsset {
+  __typename: "UpdateAsset";
+  /**
+   * The minimum economically meaningful amount of this specific asset
+   */
+  quantum: string;
+  /**
+   * The source of the updated asset
+   */
+  source: Proposals_proposalsConnection_edges_node_terms_change_UpdateAsset_source;
+}
+
+export type Proposals_proposalsConnection_edges_node_terms_change = Proposals_proposalsConnection_edges_node_terms_change_NewFreeform | Proposals_proposalsConnection_edges_node_terms_change_NewMarket | Proposals_proposalsConnection_edges_node_terms_change_UpdateMarket | Proposals_proposalsConnection_edges_node_terms_change_NewAsset | Proposals_proposalsConnection_edges_node_terms_change_UpdateNetworkParameter | Proposals_proposalsConnection_edges_node_terms_change_UpdateAsset;

 export interface Proposals_proposalsConnection_edges_node_terms {
  __typename: "ProposalTerms";
@@ -14,7 +14,7 @@ import type { NodeData } from './__generated__/NodeData';
 import { TokenDetails } from './token-details';
 import { Button } from '@vegaprotocol/ui-toolkit';

-export const TOTAL_STAKED_QUERY = gql`
+export const TOTAL_ASSOCIATED_QUERY = gql`
  query NodeData {
    nodeData {
      stakedTotal
@@ -27,8 +27,8 @@ const Home = ({ name }: RouteChildProps) => {
  useDocumentTitle(name);
  const { t } = useTranslation();
  const { appState } = useAppState();
-  const { data } = useQuery<NodeData>(TOTAL_STAKED_QUERY);
-  const totalStaked = React.useMemo(() => {
+  const { data } = useQuery<NodeData>(TOTAL_ASSOCIATED_QUERY);
+  const totalAssociated = React.useMemo(() => {
    return new BigNumber(data?.nodeData?.stakedTotalFormatted || '0');
  }, [data]);

@@ -38,7 +38,7 @@ const Home = ({ name }: RouteChildProps) => {
      <HomeSection>
        <TokenDetails
          totalSupply={appState.totalSupply}
-          totalStaked={totalStaked}
+          totalAssociated={totalAssociated}
        />
      </HomeSection>
      <HomeSection>
@@ -13,10 +13,10 @@ import { useContracts } from '../../../contexts/contracts/contracts-context';

 export const TokenDetails = ({
  totalSupply,
-  totalStaked,
+  totalAssociated,
 }: {
  totalSupply: BigNumber;
-  totalStaked: BigNumber;
+  totalAssociated: BigNumber;
 }) => {
  const { ETHERSCAN_URL } = useEnvironment();
  const { t } = useTranslation();
@@ -81,7 +81,7 @@ export const TokenDetails = ({
        <KeyValueTableRow>
          {t('Staked on Vega validator').toUpperCase()}
          <span data-testid="staked" className="font-mono">
-            {formatNumber(totalStaked, 2)}
+            {formatNumber(totalAssociated, 2)}
          </span>
        </KeyValueTableRow>
      </KeyValueTable>
@@ -49,7 +49,8 @@ describe('vega wallet', { tags: '@smoke' }, () => {
      .should('have.text', 'Required');
  });

-  it('can change selected public key and disconnect', () => {
+  // skipped as it was blocking CI jobs
+  it.skip('can change selected public key and disconnect', () => {
    const key2 = Cypress.env('VEGA_PUBLIC_KEY2');
    const truncatedKey2 = Cypress.env('TRUNCATED_VEGA_PUBLIC_KEY2');
    connectVegaWallet();
@@ -87,13 +87,6 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(4, 'Sector', 'crypto');
  });

-  it('risk factors displayed', () => {
-    cy.getByTestId(marketTitle).contains('Risk factors').click();
-
-    validateMarketDataRow(0, 'Short', '0.008571790367285281');
-    validateMarketDataRow(1, 'Long', '0.008508132993273576');
-  });
-
  it('risk model displayed', () => {
    cy.getByTestId(marketTitle).contains('Risk model').click();

@@ -102,6 +95,21 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(2, 'Risk Aversion Parameter', '0.01');
  });

+  it('risk parameters displayed', () => {
+    cy.getByTestId(marketTitle).contains('Risk parameters').click();
+
+    validateMarketDataRow(0, 'Typename', 'LogNormalModelParams');
+    validateMarketDataRow(1, 'R', '0.016');
+    validateMarketDataRow(2, 'Sigma', '0.3');
+  });
+
+  it('risk factors displayed', () => {
+    cy.getByTestId(marketTitle).contains('Risk factors').click();
+
+    validateMarketDataRow(0, 'Short', '0.008571790367285281');
+    validateMarketDataRow(1, 'Long', '0.008508132993273576');
+  });
+
  it('price monitoring trigger displayed', () => {
    cy.getByTestId(marketTitle).contains('Price monitoring trigger 1').click();

@@ -15,9 +15,7 @@ describe('markets table', { tags: '@regression' }, () => {
    cy.wait('@Markets');
    cy.wait('@MarketsDataQuery');
    cy.wait('@MarketsCandlesQuery');
-    cy.get('[data-testid^="market-link-"]')
-      .should('not.be.empty')
-      .and('have.attr', 'href');
+    cy.get('[data-testid^="market-link-"]').should('not.be.empty');
    cy.getByTestId('price').invoke('text').should('not.be.empty');
    cy.getByTestId('settlement-asset').should('not.be.empty');
    cy.getByTestId('price-change-percentage').should('not.be.empty');
@@ -113,7 +111,7 @@ describe('markets table', { tags: '@regression' }, () => {
          'contain.text',
          'This market is in auction until it reaches sufficient liquidity.'
        );
-      cy.getByTestId('link')
+      cy.getByTestId('external-link')
        .should('have.attr', 'href')
        .and(
          'include',
@@ -1,46 +1,40 @@
 import { MarketState } from '@vegaprotocol/types';
 import { mockTradingPage } from '../support/trading';
 import { connectVegaWallet } from '../support/vega-wallet';
+import { connectEthereumWallet } from '../support/ethereum-wallet';

 beforeEach(() => {
  cy.mockGQL((req) => {
    mockTradingPage(req, MarketState.STATE_ACTIVE);
  });
+  cy.mockWeb3Provider();
  cy.mockGQLSubscription();
  cy.visit('/markets/market-0');
 });

 describe('accounts', { tags: '@smoke' }, () => {
  it('renders accounts', () => {
-    const tradingAccountRowId = '[row-id="ACCOUNT_TYPE_GENERAL-asset-id-null"]';
+    const tradingAccountRowId = '[row-id="asset-0"]';
    cy.getByTestId('Collateral').click();
    cy.getByTestId('tab-accounts').contains('Please connect Vega wallet');

    connectVegaWallet();
+    connectEthereumWallet();

    cy.getByTestId('tab-accounts').should('be.visible');
    cy.getByTestId('tab-accounts')
-      .should('be.visible')
      .get(tradingAccountRowId)
      .find('[col-id="asset.symbol"]')
-      .should('have.text', 'tEURO');
+      .should('have.text', 'AST0');

    cy.getByTestId('tab-accounts')
-      .should('be.visible')
      .get(tradingAccountRowId)
-      .find('[col-id="type"]')
-      .should('have.text', 'General');
+      .find('[col-id="breakdown"]')
+      .should('have.text', 'Collateral breakdown');

    cy.getByTestId('tab-accounts')
-      .should('be.visible')
      .get(tradingAccountRowId)
-      .find('[col-id="market.tradableInstrument.instrument.name"]')
-      .should('have.text', '—');
-
-    cy.getByTestId('tab-accounts')
-      .should('be.visible')
-      .get(tradingAccountRowId)
-      .find('[col-id="balance"]')
+      .find('[col-id="deposited"]')
      .should('have.text', '1,000.00000');
  });
 });
@@ -1,34 +0,0 @@
-import { MarketState } from '@vegaprotocol/types';
-import { mockTradingPage } from '../support/trading';
-import { connectVegaWallet } from '../support/vega-wallet';
-
-beforeEach(() => {
-  cy.mockGQL((req) => {
-    mockTradingPage(req, MarketState.STATE_ACTIVE);
-  });
-  cy.mockGQLSubscription();
-  cy.visit('/markets/market-0');
-});
-
-describe('collateral', { tags: '@smoke' }, () => {
-  const collateralTab = 'Collateral';
-  const assetSymbolColumn = "[col-id='asset.symbol']";
-  const assetTypeColumn = "[col-id='type']";
-  const assetMarketName =
-    "[col-id='market.tradableInstrument.instrument.name']";
-  it('renders collateral', () => {
-    connectVegaWallet();
-    cy.getByTestId(collateralTab).click();
-    cy.get(assetSymbolColumn).each(($symbol) => {
-      cy.wrap($symbol).invoke('text').should('not.be.empty');
-    });
-    cy.get(assetTypeColumn).should('contain.text', 'General');
-    cy.get(assetMarketName).should(
-      'contain.text',
-      'AAVEDAI Monthly (30 Jun 2022)'
-    );
-    cy.getByTestId('price').each(($price) => {
-      cy.wrap($price).invoke('text').should('not.be.empty');
-    });
-  });
-});
@@ -27,7 +27,7 @@ const mockTx = {
  },
 };

-describe('deal ticket orders', { tags: '@regression' }, () => {
+describe('deal ticket orders', { tags: '@smoke' }, () => {
  before(() => {
    cy.mockGQL((req) => {
      mockTradingPage(req, MarketState.STATE_ACTIVE);
@@ -158,7 +158,7 @@ describe('deal ticket orders', { tags: '@regression' }, () => {
  it.skip('unsuccessful order due to no collateral');
 });

-describe('deal ticket validation', { tags: '@regression' }, () => {
+describe('deal ticket validation', { tags: '@smoke' }, () => {
  before(() => {
    cy.mockGQL((req) => {
      mockTradingPage(req, MarketState.STATE_ACTIVE);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	7fc6e10d64	ci: separate capsule test run from non capsule test run	2022-09-30 19:32:15 -07:00
m.ray	c221d0772c	fix: 1569 trading tab navigation update (#1573 ) * fix: #1569 trading tab navigation update * fix: #1569 get market id value from init	2022-09-30 16:50:48 +01:00
Radosław Szpiech	efcd128240	fix: console-lite e2e tests (#1576 )	2022-09-30 16:51:41 +02:00
Radosław Szpiechandasiaznik	9a88c33458	Fix/console failing tests (#1572 ) * fix: market and trading tests * fix: trading tests * fix: balance DP * fix: select asset * fix: withdrawal tests Co-authored-by: asiaznik <artur@vegaprotocol.io>	2022-09-30 15:42:42 +02:00
mattrussell36	d2a5adf6ce	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-30 12:04:57 +00:00
Radosław Szpiech	ab0065bd9a	chore: env setup fixed (#1567 )	2022-09-30 11:02:55 +02:00
Radosław Szpiech	5600c56da1	fix: fix (#1565 )	2022-09-30 10:59:15 +02:00
Radosław Szpiech	3d7267f496	fix: fix capsule workflow (#1563 )	2022-09-30 10:31:38 +02:00
mattrussell36	c87beb4050	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-30 06:25:43 +00:00
m.rayandBartłomiej Głownia	907a4e256e	feat(#847 ): collateral table, add breakdown (#1442 ) * feat: #847 show progress bar, margin accounts, no used/deposited * feat: #847 add collateral tables * fix: #847 add deposit asset type and fix tests * feat: #847 show deposited value, avaliable and percentage used * fix: #847 add styling fixes * fix: #847 add deposit new asset button * fix: #847 remove disabledSelect to fix withdraw and deposit dialogs * fix: #847 remove global reward from incoming - needs to be party specific * fix: #847 integration tests * fix: #847 default select deposit & withdraw * fix: #847 default select deposit & withdraw * fix: #847 pass asset id as default value * fix: #847 use only bigint no bignumber, remove NaN check * fix: #847 update deposit-form.spec.tsx * fix: revert update on account fields * feat: add storybook set up * chore: ignore apollo errors - to be reverted after API will be fixed * fix: container moved, progress bar in helpers * fix: #847 UI tweaks around accounts container * feat: #847 added useDepositAsset and useWithdrawAsset * fix: #847 fix progress bar in accounts and positions * feat: #847 add storybook * fix: #847 added tooltip and updated filtering * chore: #847 add get account data test * fix: #847 fix lint and type in account story * fix: #847 update data provider * fix: #847 fix get account data dry & lp link * fix: #847 fix breakdown table test * fix: #847 account data provider test * fix: #847 remove deposit new asset button - subscription does not display a sset data * fix: #847 add defaultValue in select otherwise default is not set up * feat: #847 update data provider update method and tables * fix: #847 fix accounts tests * fix: #847 remove unused getRows * fix: add decimals * fix: #847 fix imports * fix: update ids * Update apps/trading/pages/liquidity/[marketId].page.tsx * fix: #847 accounts update method check delta * fix: #847 use vega value formatters and cell renderers * fix: #847 fix imports * fix: #847 handle new account else block comment * fix: accounts and breakdown tables * fix(#847): account data provider improvments * fix: #847 fix formatters null check and add param * fix: #847 fix withdraw test and mock the hook * fix: #847 fix console lite grid select market test * fix: console lite build * fix: revert withdraw limits * fix: remove redundant waitFor use vega cell renderer * fix: breakdown display only use accounts * fix: breakdown display only use accounts * fix: updated accounts table * fix: move update inside try useWithdrawAsset * fix: update trading-accounts test * fix: portfolio-page.test.ts Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>	2022-09-29 17:40:44 -07:00
mattrussell36	835bf36393	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-30 00:17:39 +00:00
John Walley	57863a7167	chore(deps): update dependency pennant to v0.4.18 (#1557 )	2022-09-29 16:47:36 -07:00
Sam KeenandDexter	4272fefb0b	feat(#807 ): adds app for validator add and remove signer (#1402 ) * Feat/807: ABI and classes for the contract methods * Feat/807: Added a new multisig-signer app * Feat/807: Added a new multisig-signer app * Feat/800: Untested signer forms * Feat/800: Moved reused bg video into ui-toolkit to use in multisig-signer project, and cleaned up some spacing that was overlooked in the stats theme changes * Feat/800: Componentised a bit, made the app look ok * Feat/800: Linting, prettifying, removing some unneeded tests, ensuring e2e tests run * Feat/800: Bit of translation * chore: fix type errors * chore: some parts error handling * feat: handle error and not found cases * feat: add changes to remove signer form as well * chore: rename component * chore: fix type issues * feat: add web3 connector logic * feat: allow disconnecting and show connected eth wallet info * Feat/800: Removed unused 'useApolloClient' * Feat/800: Ensure bundle.nonce and bundle.signatures have '0x' prepended * Feat/800: Removed unused e2e directory * Feat/800: Removed unnecessary app test * Feat/800: Removed unnecessary router * Feat/800: Capturing GQL errors in Sentry * Feat/800: Removing references to the unused e2e test directory * Feat/807: Consistent react hook imports * Feat/807: Removed unnecessary spreads Co-authored-by: Dexter <dexter.edwards93@gmail.com>	2022-09-29 12:10:53 -07:00
mattrussell36	8fee3ca080	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-29 18:06:47 +00:00
Radosław Szpiech	98abe2910d	chore: fix smoke flag meaning (#1553 )	2022-09-29 19:11:52 +02:00
AndyWhiteVega	22f4edff82	test: fix mocks for console light to include id (#1551 )	2022-09-29 18:06:33 +01:00
Radosław Szpiech	28aa5cd060	Chore/add skip nx cache flag (#1549 ) * chore: add skip-nx-cache flag to manual flow * chore: set --skip-nx-cache flag * chore: set --skip-nx-cache flag * chore: set --skip-nx-cache flag * chore: remove log	2022-09-29 18:27:08 +02:00
Radosław Szpiech	7b0d41b4a6	fix: typo (#1547 )	2022-09-29 18:02:40 +02:00
Radosław Szpiech	83ea12b4cb	Fix/smoke test flag (#1545 ) * fix: fix smoke test flag logic * fix: fix smoke test flag logic	2022-09-29 16:32:43 +01:00
Dexter Edwards	a7768f154b	chore: relabel total associated (#1531 )	2022-09-29 15:47:09 +01:00
Matthew Russell	65af6bc0a8	fix: make sparkline strokes the same thickness (#1527 ) * fix: make sparkline strokes the same thickness * fix: data test id in sparkline	2022-09-29 07:20:04 -07:00
Radosław Szpiech	93c1835cd6	Chore/1495 workflows minor improvements fixes and cleanup (#1538 ) * test: try with shared actions * test: fix env * test: fix path * test: fix path * test: fix path * test: fix path * test: fix path * test: fix path * test: fix path * test: fix path * test: fix path * test: fix path * test: fix path * test: create action for capsule build * test: create action for capsule build * test: create action for capsule build * test: create action for capsule build * fix: fix * fix: fix * fix: fix * fix: fix * chore: create action for vegawallet setup * chore: create action for vegawallet setup * chore: fix * chore: fix * chore: fix * chore: fix * fix: fix * fix: fix * fix: fix * fix: fix * fix: fix * fix: fix * fix: fix * fix: fix * fix: fix * fix: fix * chore: apply changes to all workflows * chore: apply changes to all workflows	2022-09-29 14:13:09 +01:00
Art	446af23d9c	fix: orderbook sticky behaviour and precision options (#1519 ) * fix: orderbook sticky behaviour and precision options * chore: add handling of y-axis resize * fix: addressed PR comments * fix: addressed PR comments * added cy.log * Update apps/trading-e2e/src/support/vega-wallet.ts	2022-09-29 14:23:14 +02:00
mattrussell36	2cfe8608fb	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-29 12:05:36 +00:00
Matthew Russell	032805b5b9	Feat/1500 cancel and edit buttons conditional rendering (#1528 ) * feat: allow second type arg to be generic as you dont always need the value * feat: update order data provider to include fields required to determine if editable or cancellable * feat: use ag grid type helpers and add rendering logic to cancel and amend buttons * feat: combine cancel/edit buttons into single cell for better spacing * feat: add test cases for dispaly of amend/cancel buttons * chore: add missing fields to mock generate function * chore: remove unnecessary wait for in fills test that was sporadically failing * fix: add missing fields to generate order function * fix: add missing fields to generate order function for console-lite	2022-09-29 11:00:39 +02:00
Joe Tsang	7a7c4ad452	Test/governance flows update (#1523 ) * test: update governance flows with new ui change * chore: existing governance flow tests passing * chore: remove unused import * chore: remove unused var	2022-09-29 09:18:06 +01:00
mattrussell36	0c5b2f5c29	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-29 06:27:20 +00:00
mattrussell36	a8667eea31	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-29 00:15:10 +00:00
Bartłomiej GłowniaandRado	8dd63d7cac	chore: fix mocks and hydration error (#1520 ) * chore: fix DealTicket mock * chore: fix React Hydration Error * test: change tag Co-authored-by: Rado <szpiechrados@gmail.com>	2022-09-28 14:40:21 -07:00
Matthew Russell	8bffc05be2	fix: ensure sub is cancelled if dialog is closed (#1472 ) * fix: ensure sub is cancelled if dialog is closed * fix: pass transaction object in use proposal hooks	2022-09-28 12:34:49 -07:00
Matthew Russell	26e3596c5a	fix: align market dropdown cells for both my markets and all markets (#1492 )	2022-09-28 12:15:09 -07:00
mattrussell36	6ad68f87cc	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-28 18:08:30 +00:00
Radosław Szpiech	86fdd75d6c	fix: disabled test (#1525 )	2022-09-28 18:56:45 +02:00
Dexter Edwards	f688b28b29	fix: vote not seen being incorrectly reported (#1508 )	2022-09-28 14:55:25 +01:00
Radosław Szpiech	6ddceaf6bd	chore: update vega binaries to v0.57.0 (#1514 )	2022-09-28 15:31:35 +02:00
AndyWhiteVega	a9e8b6915e	Test/using chrome headless (#1516 ) * test: change night run to use headless chrome to address memory issues * test: update manual for non-smoke * test: remove headless flag since depreciated * test: update browser for cypress	2022-09-28 14:26:22 +01:00
Dexter Edwards	9318dab698	Chore/support update asset (#1473 ) * chore: generate types * chore: add update asset type * feat: display asset change proposals in list * chore: generate types	2022-09-28 13:46:41 +01:00
mattrussell36	ae0424e21a	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-28 12:06:11 +00:00
mattrussell36	5e484dfab0	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-28 06:26:05 +00:00
mattrussell36	e5b1390302	chore: update tranches Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-09-28 00:16:31 +00:00
m.ray	6a6779ee72	feat: 1506 add risk parameters (#1510 ) * feat: #1506 add risk parameters * fix: integration test * fix: integration test	2022-09-27 23:49:34 +01:00
Bartłomiej Głownia	414b8ced13	chore: fix positions data provider restarts (#1509 )	2022-09-27 15:02:48 -07:00
				`@@ -1 +0,0 @@`
				`export { VegaBackgroundVideo } from './vega-background-video';`