test: update live e2e tests

chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-03-29 14:52:12 +02:00 · 2023-03-28 12:08:16 +00:00 · 2023-03-28 06:08:37 +00:00 · 2023-03-28 00:15:54 +00:00 · 2023-03-27 11:47:35 -07:00 · 2023-03-27 11:46:40 -07:00
236 changed files with 9270 additions and 6896 deletions
@@ -3,3 +3,7 @@ apps/**/node_modules/*
 tmp/*
 .dockerignore
 dockerfiles
+node_modules
+.git
+.github
+.vscode
@@ -0,0 +1,22 @@
+---
+name: Release
+about:
+  A template to outline the steps needed to for a successful release of our frontend apps
+title: 'Release [add dapp version]-core-[add core version]'
+labels: 
+assignees: ''
+---
+
+### Tasks
+
+- [ ] Review [link to core release](xxx) 
+- [ ] Tag frontend-monorepo
+- [ ] Create release and generate release notes
+- [ ] Run `@smoke` tests
+- [ ] Run `@regression` tests
+- [ ] Run `@slow` tests
+- [ ] Explorative testing of key flows
+- [ ] Set `release/[network]` to tagged commit
+- [ ] Verify builds (on Netlify and Fleek) are successful
+- [ ] Verify build has been deployed
+- [ ] Smoke testing on deployed app
@@ -1,3 +1,4 @@
+name: Cypress Run
 on:
  workflow_call:
    inputs:
@@ -17,6 +18,7 @@ jobs:
      fail-fast: false
      matrix:
        project: ${{ fromJSON(inputs.projects) }}
+    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
    timeout-minutes: 30
    steps:
@@ -1,4 +1,4 @@
-name: Cypress tests - PR
+name: PR Validations

 on:
  push:
@@ -20,14 +20,16 @@ jobs:
        with:
          fetch-depth: 0

+      - name: Check node version
+        id: node-version
+        run: |
+          npmVersion=$(cat .nvmrc | head -n 1)
+          echo ::set-output name=npmVersion::${npmVersion}
+
      - name: Setup node
        uses: actions/setup-node@v3
-
-      - name: Remove package.json & yarn.lock to avoid installing everything
-        run: rm package.json yarn.lock
-
-      - name: Install nx
-        run: yarn add nx
+        with:
+          node-version: ${{ steps.node-version.outputs.npmVersion }}

      # Check SHAs
      - name: Derive appropriate SHAs for base and head for `nx affected` commands
@@ -39,38 +41,51 @@ jobs:
      # See affected apps
      - name: See affected apps
        run: |
+          nx_version=$(cat package.json | grep '"nx"' | cut -d ':' -f 2 | tr -d '",[:space:]')
+          rm package.json yarn.lock
+          yarn add nx@$nx_version
          affected=$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)
          echo -n "Affected projects: $affected"
-          projects=""
-          if [[ $affected == *"governance"* ]]; then projects+='"governance-e2e" '; fi
-          if [[ $affected == *"trading"* ]]; then projects+='"trading-e2e" '; fi
-          if [[ $affected == *"explorer"* ]]; then projects+='"explorer-e2e" '; fi
-          if [[ -z "$projects" ]]; then projects+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
-          projects=${projects%?}
-          projects=[${projects// /,}]
-          echo PROJECTS=$projects >> $GITHUB_ENV
+          projects_e2e=""
+          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
+          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
+          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
+          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
+          projects_e2e=${projects_e2e%?}
+          projects_e2e=[${projects_e2e// /,}]
+          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
+          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV

    outputs:
      projects: ${{ env.PROJECTS }}
+      projects-e2e: ${{ env.PROJECTS_E2E }}

-  run:
+  run-cypress:
    needs: pr
    if: ${{ needs.pr.outputs.projects != '[]' }}
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
    with:
-      projects: ${{ needs.pr.outputs.projects }}
+      projects: ${{ needs.pr.outputs.projects-e2e }}
      tags: '@smoke @regression'

+  run-docker-build:
+    needs: pr
+    if: ${{ needs.pr.outputs.projects != '[]' }}
+    uses: ./.github/workflows/publish-docker-containers.yml
+    secrets: inherit
+    with:
+      projects: ${{ needs.pr.outputs.projects }}
+
  # Report single result at the end, to avoid mess with required checks in PR
  result:
    if: ${{ always() }}
-    needs: run
+    needs: run-cypress
    runs-on: ubuntu-latest
    name: Cypress result
    steps:
      - run: |
-          result="${{ needs.run.result }}"
+          result="${{ needs.run-cypress.result }}"
          if [[ $result == "success" || $result == "skipped" ]]; then
            exit 0
          else
@@ -1,54 +1,23 @@
-name: Publish docker containers
+name: Docker build

-'on':
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
-      - 'v[0-9]+.[0-9]+.[0-9]+-*'
-
-  workflow_dispatch:
+on:
+  workflow_call:
    inputs:
-      publish:
-        description: 'Publish tag to Docker Hub & GitHub Registry'
-        required: false
-        type: boolean
-        default: false
-      tag:
-        description: 'Git Tag to build and publish'
-        required: false
+      projects:
+        required: true
        type: string
-        default: ''
-      apps:
-        description: 'Applications to build and publish'
-        required: false
-        type: choice
-        options:
-          - '["explorer", "token", "trading"]'
-          - '["explorer"]'
-          - '["token"]'
-          - '["trading"]'
-      archs:
-        description: 'Architecture to build and publish'
-        required: false
-        type: choice
-        options:
-          - linux/amd64, linux/arm64
-          - linux/amd64
-          - linux/arm64

 jobs:
  master:
    strategy:
      fail-fast: false
      matrix:
-        app: ${{ fromJson(inputs.apps || '["explorer", "token", "trading"]') }}
-    name: Build the ${{ matrix.app }} image
+        app: ${{ fromJSON(inputs.projects) }}
+    name: ${{ matrix.app }}
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.tag }}

      - name: Set up QEMU
        id: quemu
@@ -60,67 +29,66 @@ jobs:
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2

-      - name: Login to DockerHub
-        if: ${{ inputs.publish || startsWith(github.ref, 'refs/tags/') }}
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+      # https://docs.github.com/en/actions/learn-github-actions/contexts
+      # https://github.com/actions/checkout#Checkout-pull-request-HEAD-commit-instead-of-merge-commit
      - name: Determine Docker Image tag
        id: tags
        run: |
-          hash=$(git rev-parse HEAD|cut -b1-8)
-          versionTag=${{ inputs.tag || startsWith(github.ref, 'refs/tags/') && github.ref_name || '${hash}' }}
+          npmVersion=$(cat .nvmrc | head -n 1)
+          versionTag=${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || github.event.pull_request.head.sha }}
+          echo ::set-output name=npmVersion::${npmVersion}
          echo ::set-output name=version::${versionTag}
-          echo ::set-output name=npmVersion::$(cat dockerfiles/${{ matrix.app =='trading' && 'Dockerfile.next' || 'Dockerfile.cra' }} | grep FROM | head -n 1 | awk '{print $2}' | cut -d ':' -f 2 | cut -d '-' -f 1 )

      - name: Print config
        run: |
          git rev-parse --verify HEAD
          git status
-          echo "inputs.tag=${{ inputs.tag }}"
-          echo "inputs.publish=${{ inputs.publish }}"
-          echo "inputs.apps=${{ inputs.apps }}"
-          echo "inputs.archs=${{ inputs.archs }}"
          echo "steps.tags.outputs.version=${{ steps.tags.outputs.version }}"

-      - uses: actions/setup-node@v3
-        with:
-          node-version: ${{ steps.tags.outputs.npmVersion }}
-
-      - name: Build frontend dists
-        run: |
-          yarn --verbose --pure-lockfile
-          yarn nx ${{ matrix.app =='trading' && 'export' || 'build' }} ${{ matrix.app }} --pure-lockfile
-
      - name: Build and export to local Docker
        uses: docker/build-push-action@v3
        with:
-          context: .
-          push: false
-          file: dockerfiles/${{ matrix.app =='trading' && 'Dockerfile.next' || 'Dockerfile.cra' }}.dist
-          build-args: APP=${{ matrix.app }}
          load: true
-          tags: vegaprotocol/${{ matrix.app }}:local
+          build-args: |
+            APP=${{ matrix.app }}
+            NODE_VERSION=${{ steps.tags.outputs.npmVersion }}
+          tags: |
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local

      - name: Sanity check docker image
        run: |
-          docker run --rm vegaprotocol/${{ matrix.app }}:local cat .env
-          docker run --rm vegaprotocol/${{ matrix.app }}:local ls -lah
+          echo "Check .env file"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat .env
+          echo "Check ipfs-hash"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat ipfs-hash
+          echo "List html directory"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local ls -lah

-      - name: Build and push to DockerHub
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
        id: docker_build
        uses: docker/build-push-action@v3
        with:
-          context: .
-          push: ${{ inputs.publish || startsWith(github.ref, 'refs/tags/') }}
-          file: dockerfiles/${{ matrix.app =='trading' && 'Dockerfile.next' || 'Dockerfile.cra' }}.dist
-          build-args: APP=${{ matrix.app }}
-          platforms: ${{ inputs.archs || 'linux/amd64, linux/arm64' }}
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            NODE_VERSION=${{ steps.tags.outputs.npmVersion }}
          tags: |
-            vegaprotocol/${{ matrix.app }}:latest
-            vegaprotocol/${{ matrix.app }}:${{ steps.tags.outputs.version }}
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:latest
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ steps.tags.outputs.version }}
+
+      - name: Add preview label
+        uses: actions-ecosystem/action-add-labels@v1
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          labels: ${{ matrix.app }}-preview
+          number: ${{ github.event.number }}

      - name: Image digest
        run: echo ${{ steps.docker_build.outputs.digest }}
@@ -0,0 +1,33 @@
+# Build container
+ARG NODE_VERSION
+FROM --platform=amd64 node:${NODE_VERSION}-alpine3.16 as build
+WORKDIR /app
+# Argument to allow building of different apps
+ARG APP
+RUN apk add --update --no-cache \
+  python3 \
+  make \
+  gcc \
+  g++
+COPY . ./
+RUN yarn --network-timeout 100000 --pure-lockfile
+# work around for different build process in trading
+RUN sh ./docker-build.sh
+
+# Server environment
+# if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
+# this is to ensure that we run always same version of alpine to make sure ipfs is indempotent
+FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+ARG APP
+# configuration of system
+RUN apk add --no-cache bash go-ipfs
+EXPOSE 80
+COPY entrypoint.sh /entrypoint.sh
+CMD ["/entrypoint.sh"]
+
+# Copy dist
+WORKDIR /usr/share/nginx/html
+COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/dist/apps/${APP} /usr/share/nginx/html
+COPY ./apps/${APP}/.env .env
+RUN ipfs init && echo "$(ipfs add -rQ .)" > ipfs-hash
@@ -6,18 +6,10 @@ context('Home Page', function () {
  describe('Stats page', { tags: '@smoke' }, function () {
    const statsValue = '[data-testid="stats-value"]';

-    it('Should show connected environment', function () {
-      const deployedEnv = Cypress.env('environment').toUpperCase();
-      cy.get('[data-testid="stats-environment"]').should(
-        'have.text',
-        `/ ${deployedEnv}`
-      );
-    });
-
    it('should show connected environment stats', function () {
      const statTitles = {
        0: 'Status',
-        1: 'Height',
+        1: 'Block height',
        2: 'Uptime',
        3: 'Total nodes',
        4: 'Total staked',
@@ -36,27 +28,27 @@ context('Home Page', function () {

      cy.get('[data-testid="stats-title"]')
        .each(($list, index) => {
-          cy.wrap($list).should('have.text', statTitles[index]);
+          cy.wrap($list).should('contain.text', statTitles[index]);
        })
        .then(($list) => {
          cy.wrap($list).should('have.length', 16);
        });

-      cy.get(statsValue).eq(0).should('have.text', 'CONNECTED');
+      cy.get(statsValue).eq(0).should('contain.text', 'CONNECTED');
      cy.get(statsValue).eq(1).should('not.be.empty');
      cy.get(statsValue)
        .eq(2)
        .invoke('text')
        .should('match', /\d+d \d+h \d+m \d+s/i);
-      cy.get(statsValue).eq(3).should('have.text', '2');
+      cy.get(statsValue).eq(3).should('contain.text', '2');
      cy.get(statsValue)
        .eq(4)
        .invoke('text')
        .should('match', /\d+\.\d\d(?!\d)/i);
-      cy.get(statsValue).eq(5).should('have.text', '0');
-      cy.get(statsValue).eq(6).should('have.text', '0');
-      cy.get(statsValue).eq(7).should('have.text', '0');
-      cy.get(statsValue).eq(8).should('have.text', '0');
+      cy.get(statsValue).eq(5).should('contain.text', '0');
+      cy.get(statsValue).eq(6).should('contain.text', '0');
+      cy.get(statsValue).eq(7).should('contain.text', '0');
+      cy.get(statsValue).eq(8).should('contain.text', '0');
      cy.get(statsValue).eq(9).should('not.be.empty');
      cy.get(statsValue).eq(10).should('not.be.empty');
      cy.get(statsValue).eq(11).should('not.be.empty');
@@ -86,75 +78,4 @@ context('Home Page', function () {
        });
    });
  });
-
-  describe('Git info', function () {
-    it('git info is rendered on the footer of the page', function () {
-      cy.getByTestId('git-info').within(() => {
-        cy.getByTestId('git-network-data').within(() => {
-          cy.contains('Reading network data from').should('be.visible');
-          cy.get('span').should('have.text', Cypress.env('networkQueryUrl'));
-          cy.getByTestId('link').should('be.visible');
-        });
-
-        cy.getByTestId('git-eth-data').within(() => {
-          cy.contains('Reading Ethereum data from').should('be.visible');
-          cy.get('span').should('have.text', Cypress.env('ethUrl'));
-        });
-
-        cy.getByTestId('git-commit-hash').within(() => {
-          cy.contains('Version/commit hash:').should('be.visible');
-          cy.getByTestId('link').should('have.text', Cypress.env('commitHash'));
-        });
-      });
-    });
-  });
-
-  describe('Search bar', function () {
-    it('Successful search for specific id by block id', function () {
-      const blockId = '973624';
-      search(blockId);
-      cy.url().should('include', blockId);
-    });
-
-    it('Successful search for specific id by tx hash', function () {
-      const txHash =
-        '9ED3718AA8308E7E08EC588EE7AADAF49711D2138860D8914B4D81A2054D9FB8';
-      search(txHash);
-      cy.url().should('include', txHash);
-    });
-
-    it('Successful search for specific id by tx id', function () {
-      const txId =
-        '0x61DCCEBB955087F50D0B85382DAE138EDA9631BF1A4F92E563D528904AA38898';
-      search(txId);
-      cy.url().should('include', txId);
-    });
-
-    it('Error message displayed when invalid search by wrong string length', function () {
-      search('9ED3718AA8308E7E08EC588EE7AADAF497D2138860D8914B4D81A2054D9FB8');
-      validateSearchError("Something doesn't look right");
-    });
-
-    it('Error message displayed when invalid search by invalid hash', function () {
-      search(
-        '9ED3718AA8308E7E08ECht8EE753DAF49711D2138860D8914B4D81A2054D9FB8'
-      );
-      validateSearchError('Transaction is not hexadecimal');
-    });
-
-    it('Error message displayed when searching empty field', function () {
-      cy.get('[data-testid="search"]').clear();
-      cy.get('[data-testid="search-button"]').click();
-      validateSearchError('Search required');
-    });
-
-    function search(searchTxt) {
-      cy.get('[data-testid="search"]').clear().type(searchTxt);
-      cy.get('[data-testid="search-button"]').click();
-    }
-
-    function validateSearchError(expectedError) {
-      cy.get('[data-testid="search-error"]').should('have.text', expectedError);
-    }
-  });
 });
@@ -2,11 +2,11 @@
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
-NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
+NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.xyz
-NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.xyz/rest
+NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
+NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -1,87 +1,21 @@
 import { NetworkLoader, useInitializeEnv } from '@vegaprotocol/environment';
-import { Header } from './components/header';
-import { Main } from './components/main';
 import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-websocket-provider';
-import { Footer } from './components/footer/footer';
-import {
-  AnnouncementBanner,
-  ExternalLink,
-  Icon,
-} from '@vegaprotocol/ui-toolkit';
-import {
-  AssetDetailsDialog,
-  useAssetDetailsDialogStore,
-} from '@vegaprotocol/assets';
+import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { DEFAULT_CACHE_CONFIG } from '@vegaprotocol/apollo-client';
-import classNames from 'classnames';
-import { useState } from 'react';
+import { RouterProvider } from 'react-router-dom';
+import { router } from './routes/router-config';

-const DialogsContainer = () => {
-  const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
-  return (
-    <AssetDetailsDialog
-      assetId={id}
-      trigger={trigger || null}
-      asJson={asJson}
-      open={isOpen}
-      onChange={setOpen}
-    />
-  );
-};
-
-const MainnetSimAd = () => {
-  const [shouldDisplayBanner, setShouldDisplayBanner] = useState<boolean>(true);
-
-  // Return an empty div so that the grid layout in _app.page.ts
-  // renders correctly
-  if (!shouldDisplayBanner) {
-    return <div />;
-  }
-
-  return (
-    <AnnouncementBanner>
-      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
-        <button
-          className="flex items-center"
-          onClick={() => setShouldDisplayBanner(false)}
-        >
-          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
-        </button>
-        <div>
-          <span className="pr-4">Mainnet sim 3 is live!</span>
-          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
-        </div>
-      </div>
-    </AnnouncementBanner>
-  );
-};
+const splashLoading = (
+  <Splash>
+    <Loader />
+  </Splash>
+);

 function App() {
  return (
    <TendermintWebsocketProvider>
      <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
-        <div
-          className={classNames(
-            'max-w-[1500px] min-h-[100vh]',
-            'mx-auto my-0',
-            'grid grid-rows-[auto_1fr_auto] grid-cols-1',
-            'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
-            'antialiased text-black dark:text-white',
-            'overflow-hidden relative'
-          )}
-        >
-          <div>
-            <Header />
-            <MainnetSimAd />
-          </div>
-          <div>
-            <Main />
-          </div>
-          <div>
-            <Footer />
-          </div>
-        </div>
-        <DialogsContainer />
+        <RouterProvider router={router} fallbackElement={splashLoading} />
      </NetworkLoader>
    </TendermintWebsocketProvider>
  );
@@ -10,7 +10,7 @@ export const Footer = () => {
  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
  const { screenSize } = useScreenDimensions();
  const showFullFeedbackLabel = useMemo(
-    () => ['lg', 'xl'].includes(screenSize),
+    () => ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
    [screenSize]
  );

@@ -13,7 +13,7 @@ jest.mock('../search', () => ({
 }));

 const renderComponent = () => (
-  <MemoryRouter>
+  <MemoryRouter initialEntries={['/txs']}>
    <Header />
  </MemoryRouter>
 );
@@ -24,6 +24,7 @@ describe('Header', () => {

    expect(screen.getByTestId('navigation')).toHaveTextContent('Explorer');
  });
+
  it('should render search', () => {
    render(renderComponent());

@@ -1,4 +1,4 @@
-import { matchPath, useLocation } from 'react-router-dom';
+import { matchPath, useLocation, useMatch } from 'react-router-dom';
 import {
  ThemeSwitcher,
  Navigation,
@@ -13,23 +13,26 @@ import { t } from '@vegaprotocol/i18n';
 import { Routes } from '../../routes/route-names';
 import { NetworkSwitcher } from '@vegaprotocol/environment';
 import type { Navigable } from '../../routes/router-config';
-import routerConfig from '../../routes/router-config';
+import { isNavigable } from '../../routes/router-config';
+import { routerConfig } from '../../routes/router-config';
 import { useMemo } from 'react';
 import compact from 'lodash/compact';
 import { Search } from '../search';

 const routeToNavigationItem = (r: Navigable) => (
-  <NavigationItem key={r.name}>
-    <NavigationLink to={r.path}>{r.text}</NavigationLink>
+  <NavigationItem key={r.handle.name}>
+    <NavigationLink to={r.path}>{r.handle.text}</NavigationLink>
  </NavigationItem>
 );

 export const Header = () => {
+  const isHome = Boolean(useMatch(Routes.HOME));
+  const pages = routerConfig[0].children || [];
  const mainItems = compact(
    [Routes.TX, Routes.BLOCKS, Routes.ORACLES, Routes.VALIDATORS].map((n) =>
-      routerConfig.find((r) => r.path === n)
+      pages.find((r) => r.path === n)
    )
-  );
+  ).filter(isNavigable);

  const groupedItems = compact(
    [
@@ -39,8 +42,8 @@ export const Header = () => {
      Routes.GOVERNANCE,
      Routes.NETWORK_PARAMETERS,
      Routes.GENESIS,
-    ].map((n) => routerConfig.find((r) => r.path === n))
-  );
+    ].map((n) => pages.find((r) => r.path === n))
+  ).filter(isNavigable);

  const { pathname } = useLocation();

@@ -67,7 +70,7 @@ export const Header = () => {
      actions={
        <>
          <ThemeSwitcher />
-          <Search />
+          {!isHome && <Search />}
        </>
      }
      onResize={(width, el) => {
@@ -90,7 +93,7 @@ export const Header = () => {
        hide={[NavigationBreakpoint.Small, NavigationBreakpoint.Narrow]}
      >
        {mainItems.map(routeToNavigationItem)}
-        {groupedItems && (
+        {groupedItems && groupedItems.length > 0 && (
          <NavigationItem>
            <NavigationTrigger isActive={Boolean(isOnOther)}>
              {t('Other')}
@@ -1,9 +0,0 @@
-import { AppRouter } from '../../routes';
-
-export const Main = () => {
-  return (
-    <main className="p-4">
-      <AppRouter />
-    </main>
-  );
-};
@@ -1,143 +1,52 @@
-import {
-  addDecimalsFormatNumber,
-  formatNumberPercentage,
-  getMarketExpiryDateFormatted,
-} from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/market-info';
-import { MarketInfoTable } from '@vegaprotocol/market-info';
+import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
+import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
 import {
-  MarketStateMapping,
-  MarketTradingModeMapping,
-} from '@vegaprotocol/types';
-import { AssetDetailsTable, useAssetDataProvider } from '@vegaprotocol/assets';
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import BigNumber from 'bignumber.js';
-import { useMemo } from 'react';
+  InstrumentInfoPanel,
+  KeyDetailsInfoPanel,
+  LiquidityPriceRangeInfoPanel,
+  MetadataInfoPanel,
+  OracleInfoPanel,
+  RiskFactorsInfoPanel,
+  RiskModelInfoPanel,
+  RiskParametersInfoPanel,
+  SettlementAssetInfoPanel,
+} from '@vegaprotocol/market-info';
+import { MarketInfoTable } from '@vegaprotocol/market-info';
 import { Link } from 'react-router-dom';

 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
-  const quoteUnit = market?.tradableInstrument.instrument.product.quoteName;
-  const assetId = useMemo(
-    () => market?.tradableInstrument.instrument.product?.settlementAsset.id,
-    [market]
-  );
-  const { data: asset } = useAssetDataProvider(assetId ?? '');
-
  if (!market) return null;

-  const keyDetails = {
-    decimalPlaces: market.decimalPlaces,
-    positionDecimalPlaces: market.positionDecimalPlaces,
-    tradingMode: market.tradingMode,
-    state: MarketStateMapping[market.state],
-  };
-  const assetDecimals =
-    market.tradableInstrument.instrument.product.settlementAsset.decimals;
-
-  const liquidityPriceRange = formatNumberPercentage(
-    new BigNumber(market.lpPriceRange).times(100)
-  );
-
  const panels = [
    {
      title: t('Key details'),
-      content: (
-        <MarketInfoTable
-          noBorder={false}
-          data={{
-            name: market.tradableInstrument.instrument.name,
-            marketID: market.id,
-            tradingMode:
-              keyDetails.tradingMode &&
-              MarketTradingModeMapping[keyDetails.tradingMode],
-            marketDecimalPlaces: market.decimalPlaces,
-            positionDecimalPlaces: market.positionDecimalPlaces,
-            settlementAssetDecimalPlaces: assetDecimals,
-          }}
-        />
-      ),
+      content: <KeyDetailsInfoPanel noBorder={false} market={market} />,
    },
    {
      title: t('Instrument'),
-      content: (
-        <MarketInfoTable
-          noBorder={false}
-          data={{
-            marketName: market.tradableInstrument.instrument.name,
-            code: market.tradableInstrument.instrument.code,
-            productType:
-              market.tradableInstrument.instrument.product.__typename,
-            ...market.tradableInstrument.instrument.product,
-          }}
-        />
-      ),
+      content: <InstrumentInfoPanel noBorder={false} market={market} />,
    },
    {
      title: t('Settlement asset'),
-      content: asset ? (
-        <AssetDetailsTable
-          asset={asset}
-          inline={true}
-          noBorder={false}
-          dtClassName="text-black dark:text-white text-ui !px-0 !font-normal"
-          ddClassName="text-black dark:text-white text-ui !px-0 !font-normal max-w-full"
-        />
-      ) : (
-        <Splash>{t('No data')}</Splash>
-      ),
+      content: <SettlementAssetInfoPanel market={market} noBorder={false} />,
    },
    {
      title: t('Metadata'),
-      content: (
-        <MarketInfoTable
-          noBorder={false}
-          data={{
-            expiryDate: getMarketExpiryDateFormatted(
-              market.tradableInstrument.instrument.metadata.tags
-            ),
-            ...market.tradableInstrument.instrument.metadata.tags
-              ?.map((tag) => {
-                const [key, value] = tag.split(':');
-                return { [key]: value };
-              })
-              .reduce((acc, curr) => ({ ...acc, ...curr }), {}),
-          }}
-        />
-      ),
+      content: <MetadataInfoPanel noBorder={false} market={market} />,
    },
    {
      title: t('Risk model'),
-      content: (
-        <MarketInfoTable
-          noBorder={false}
-          data={market.tradableInstrument.riskModel}
-          unformatted={true}
-          omits={[]}
-        />
-      ),
+      content: <RiskModelInfoPanel noBorder={false} market={market} />,
    },
    {
      title: t('Risk parameters'),
-      content: (
-        <MarketInfoTable
-          noBorder={false}
-          data={market.tradableInstrument.riskModel.params}
-          unformatted={true}
-          omits={[]}
-        />
-      ),
+      content: <RiskParametersInfoPanel noBorder={false} market={market} />,
    },
    {
      title: t('Risk factors'),
-      content: (
-        <MarketInfoTable
-          noBorder={false}
-          data={market.riskFactors}
-          unformatted={true}
-          omits={['market', '__typename']}
-        />
-      ),
+      content: <RiskFactorsInfoPanel noBorder={false} market={market} />,
    },
    ...(market.priceMonitoringSettings?.parameters?.triggers || []).map(
      (trigger, i) => ({
@@ -158,7 +67,10 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
          <MarketInfoTable
            noBorder={false}
            data={{ referencePrice: trigger.referencePrice }}
-            decimalPlaces={assetDecimals}
+            decimalPlaces={
+              market.tradableInstrument.instrument.product.settlementAsset
+                .decimals
+            }
          />
        </>
      ),
@@ -166,64 +78,26 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
    {
      title: t('Liquidity monitoring parameters'),
      content: (
-        <MarketInfoTable
+        <LiquidityMonitoringParametersInfoPanel
          noBorder={false}
-          data={{
-            triggeringRatio:
-              market.liquidityMonitoringParameters.triggeringRatio,
-            ...market.liquidityMonitoringParameters.targetStakeParameters,
-          }}
+          market={market}
        />
      ),
    },
+    {
+      title: t('Liquidity'),
+      content: <LiquidityInfoPanel market={market} noBorder={false} />,
+    },
    {
      title: t('Liquidity price range'),
      content: (
-        <>
-          <p className="text-xs mb-4">
-            {`For liquidity orders to count towards a commitment, they must be
-            within the liquidity monitoring bounds.`}
-          </p>
-          <p className="text-xs mb-4">
-            {`The liquidity price range is a ${liquidityPriceRange} difference from the mid
-        price.`}
-          </p>
-          <MarketInfoTable
-            noBorder={false}
-            data={{
-              liquidityPriceRange: `${liquidityPriceRange} of mid price`,
-              lowestPrice:
-                market.data?.midPrice &&
-                `${addDecimalsFormatNumber(
-                  new BigNumber(1)
-                    .minus(market.lpPriceRange)
-                    .times(market.data.midPrice)
-                    .toString(),
-                  market.decimalPlaces
-                )} ${quoteUnit}`,
-              highestPrice:
-                market.data?.midPrice &&
-                `${addDecimalsFormatNumber(
-                  new BigNumber(1)
-                    .plus(market.lpPriceRange)
-                    .times(market.data.midPrice)
-                    .toString(),
-                  market.decimalPlaces
-                )} ${quoteUnit}`,
-            }}
-          ></MarketInfoTable>
-        </>
+        <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
      ),
    },
    {
      title: t('Oracle'),
      content: (
-        <MarketInfoTable
-          noBorder={false}
-          data={
-            market.tradableInstrument.instrument.product.dataSourceSpecBinding
-          }
-        >
+        <OracleInfoPanel noBorder={false} market={market}>
          <Link
            className="text-xs hover:underline"
            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id}`}
@@ -236,7 +110,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
          >
            {t('View termination oracle specification')}
          </Link>
-        </MarketInfoTable>
+        </OracleInfoPanel>
      ),
    },
  ];
@@ -244,7 +118,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  return (
    <>
      {panels.map((p) => (
-        <div className="mb-3">
+        <div key={p.title} className="mb-3">
          <h2 className="font-alpha calt text-xl">{p.title}</h2>
          {p.content}
        </div>
@@ -1,4 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { StatusMessage } from '../status-message';

 interface RenderFetchedProps {
@@ -7,6 +8,7 @@ interface RenderFetchedProps {
  loading: boolean | undefined;
  className?: string;
  errorMessage?: string;
+  refetch?: () => void;
 }

 export const RenderFetched = ({
@@ -15,6 +17,7 @@ export const RenderFetched = ({
  children,
  className,
  errorMessage = t('Error retrieving data'),
+  refetch,
 }: RenderFetchedProps) => {
  if (loading) {
    return (
@@ -23,7 +26,20 @@ export const RenderFetched = ({
  }

  if (error) {
-    return <StatusMessage className={className}>{errorMessage}</StatusMessage>;
+    return (
+      <>
+        <StatusMessage className={className}>{errorMessage}</StatusMessage>
+        {refetch && (
+          <Button
+            onClick={() => {
+              refetch();
+            }}
+          >
+            {t('Try again')}
+          </Button>
+        )}
+      </>
+    );
  }

  return children;
@@ -1,32 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import React from 'react';
-
-interface RouteErrorBoundaryProps {
-  children: React.ReactElement;
-}
-
-export class RouteErrorBoundary extends React.Component<
-  RouteErrorBoundaryProps,
-  { hasError: boolean }
-> {
-  constructor(props: RouteErrorBoundaryProps) {
-    super(props);
-    this.state = { hasError: false };
-  }
-
-  static getDerivedStateFromError() {
-    return { hasError: true };
-  }
-
-  override componentDidCatch(error: Error) {
-    console.log(`Error caught in App error boundary ${error.message}`, error);
-  }
-
-  override render() {
-    if (this.state.hasError) {
-      return <h1>{t('Something went wrong')}</h1>;
-    }
-
-    return this.props.children;
-  }
-}
@@ -1,189 +1,70 @@
 import {
-  detectTypeByFetching,
-  detectTypeFromQuery,
-  getSearchType,
+  determineType,
  isBlock,
-  isHexadecimal,
  isNetworkParty,
-  isNonHex,
  SearchTypes,
-  toHex,
-  toNonHex,
+  isHash,
 } from './detect-search';
-import { DATA_SOURCES } from '../../config';

 global.fetch = jest.fn();

 describe('Detect Search', () => {
-  it("should detect that it's a hexadecimal", () => {
-    const expected = true;
-    const testString =
-      '0x073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
-    const actual = isHexadecimal(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it("should detect that it's not hexadecimal", () => {
-    const expected = true;
-    const testString =
-      '073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
-    const actual = isNonHex(testString);
-    expect(actual).toBe(expected);
+  it.each([
+    ['0000000000000000000000000000000000000000000000000000000000000000', true],
+    ['0000000000000000000000000000000000000000000000000000000000000001', true],
+    [
+      'LOOONG0000000000000000000000000000000000000000000000000000000000000000',
+      false,
+    ],
+    ['xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', false],
+    ['something else', false],
+  ])("should detect that it's a hash", (input, expected) => {
+    expect(isHash(input)).toBe(expected);
  });

  it("should detect that it's a network party", () => {
-    const expected = true;
-    const testString = 'network';
-    const actual = isNetworkParty(testString);
-    expect(actual).toBe(expected);
+    expect(isNetworkParty('network')).toBe(true);
+    expect(isNetworkParty('web')).toBe(false);
  });

  it("should detect that it's a block", () => {
-    const expected = true;
-    const testString = '3188';
-    const actual = isBlock(testString);
-    expect(actual).toBe(expected);
+    expect(isBlock('123')).toBe(true);
+    expect(isBlock('x123')).toBe(false);
  });

-  it('should convert from non-hex to hex', () => {
-    const expected = '0x123';
-    const testString = '123';
-    const actual = toHex(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it('should convert from hex to non-hex', () => {
-    const expected = '123';
-    const testString = '0x123';
-    const actual = toNonHex(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it("should detect type client side from query if it's a hexadecimal", () => {
-    const expected = [SearchTypes.Party, SearchTypes.Transaction];
-    const testString =
-      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("should detect type client side from query if it's a non hex", () => {
-    const expected = [SearchTypes.Party, SearchTypes.Transaction];
-    const testString =
-      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("should detect type client side from query if it's a network party", () => {
-    const expected = [SearchTypes.Party];
-    const testString = 'network';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("should detect type client side from query if it's a block (number)", () => {
-    const expected = [SearchTypes.Block];
-    const testString = '23432';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("detectTypeByFetching should call fetch with non-hex query it's a transaction", async () => {
-    const query = '0xabc';
-    const type = SearchTypes.Transaction;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              transaction: {
-                hash: query,
-              },
-            }),
-        })
-      )
-    );
-    const result = await detectTypeByFetching(query);
-    expect(fetch).toHaveBeenCalledWith(
-      `${DATA_SOURCES.blockExplorerUrl}/transactions/${toNonHex(query)}`
-    );
-    expect(result).toBe(type);
-  });
-
-  it("detectTypeByFetching should call fetch with non-hex query it's a party", async () => {
-    const query = 'abc';
-    const type = SearchTypes.Party;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: false,
-        })
-      )
-    );
-    const result = await detectTypeByFetching(query);
-    expect(result).toBe(type);
-  });
-
-  it('getSearchType should return party from fetch response', async () => {
-    const query =
-      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const expected = SearchTypes.Party;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: false,
-        })
-      )
-    );
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return transaction from fetch response', async () => {
-    const query =
-      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const expected = SearchTypes.Transaction;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              transaction: {
-                hash: query,
-              },
-            }),
-        })
-      )
-    );
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return undefined from transaction response', async () => {
-    const query = 'u';
-    const expected = undefined;
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return block if query is number', async () => {
-    const query = '123';
-    const expected = SearchTypes.Block;
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return party if query is network', async () => {
-    const query = 'network';
-    const expected = SearchTypes.Party;
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
+  it.each([
+    [
+      '0000000000000000000000000000000000000000000000000000000000000000',
+      SearchTypes.Transaction,
+    ],
+    [
+      '0000000000000000000000000000000000000000000000000000000000000001',
+      SearchTypes.Party,
+    ],
+    ['123', SearchTypes.Block],
+    ['network', SearchTypes.Party],
+    ['something else', SearchTypes.Unknown],
+  ])(
+    "detectTypeByFetching should call fetch with non-hex query it's a transaction",
+    async (input, type) => {
+      // @ts-ignore issue related to polyfill
+      fetch.mockImplementation(
+        jest.fn(() =>
+          Promise.resolve({
+            ok:
+              input ===
+              '0000000000000000000000000000000000000000000000000000000000000000',
+            json: () =>
+              Promise.resolve({
+                transaction: {
+                  hash: input,
+                },
+              }),
+          })
+        )
+      );
+      const result = await determineType(input);
+      expect(result).toBe(type);
+    }
+  );
 });
@@ -1,3 +1,4 @@
+import { remove0x } from '@vegaprotocol/utils';
 import { DATA_SOURCES } from '../../config';
 import type { BlockExplorerTransaction } from '../../routes/types/block-explorer-response';

@@ -6,15 +7,20 @@ export enum SearchTypes {
  Party = 'party',
  Block = 'block',
  Order = 'order',
+  Unknown = 'unknown',
 }

-export const TX_LENGTH = 64;
+export const HASH_LENGTH = 64;
+
+export const isHash = (value: string) =>
+  /[0-9a-fA-F]+/.test(remove0x(value)) &&
+  remove0x(value).length === HASH_LENGTH;

 export const isHexadecimal = (search: string) =>
-  search.startsWith('0x') && search.length === 2 + TX_LENGTH;
+  search.startsWith('0x') && search.length === 2 + HASH_LENGTH;

 export const isNonHex = (search: string) =>
-  !search.startsWith('0x') && search.length === TX_LENGTH;
+  !search.startsWith('0x') && search.length === HASH_LENGTH;

 export const isBlock = (search: string) => !Number.isNaN(Number(search));

@@ -23,121 +29,44 @@ export const isNetworkParty = (search: string) => search === 'network';
 export const toHex = (query: string) =>
  isHexadecimal(query) ? query : `0x${query}`;

-export const toNonHex = (query: string) =>
-  isNonHex(query) ? query : `${query.replace('0x', '')}`;
+export const toNonHex = remove0x;

-export const detectTypeFromQuery = (
-  query: string
-): SearchTypes[] | undefined => {
-  const i = query.toLowerCase();
-
-  if (isHexadecimal(i) || isNonHex(i)) {
-    return [SearchTypes.Party, SearchTypes.Transaction];
-  } else if (isNetworkParty(i)) {
-    return [SearchTypes.Party];
-  } else if (isBlock(i)) {
-    return [SearchTypes.Block];
+/**
+ * Determine the type of the given query
+ */
+export const determineType = async (query: string): Promise<SearchTypes> => {
+  const value = query.toLowerCase();
+  if (isHash(value)) {
+    // it can be either `SearchTypes.Party` or `SearchTypes.Transaction`
+    if (await isTransactionHash(value)) {
+      return SearchTypes.Transaction;
+    } else {
+      return SearchTypes.Party;
+    }
+  } else if (isNetworkParty(value)) {
+    return SearchTypes.Party;
+  } else if (isBlock(value)) {
+    return SearchTypes.Block;
  }
-
-  return undefined;
+  return SearchTypes.Unknown;
 };

-export const detectTypeByFetching = async (
-  query: string
-): Promise<SearchTypes | undefined> => {
-  const hash = toNonHex(query);
+/**
+ * Checks if given input is a transaction hash by querying the transactions
+ * endpoint
+ */
+export const isTransactionHash = async (input: string): Promise<boolean> => {
+  const hash = remove0x(input);
  const request = await fetch(
    `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
  );

  if (request?.ok) {
    const body: BlockExplorerTransaction = await request.json();
-
    if (body?.transaction) {
-      return SearchTypes.Transaction;
+      return true;
    }
  }

-  return SearchTypes.Party;
-};
-
-// Code commented out because the current solution to detect a hex is temporary (by process of elimination)
-// export const detectTypeByFetching = async (
-//   query: string,
-//   type: SearchTypes
-// ): Promise<SearchTypes | undefined> => {
-//   const TYPES = [SearchTypes.Party, SearchTypes.Transaction];
-//
-//   if (!TYPES.includes(type)) {
-//     throw new Error('Search type provided not recognised');
-//   }
-//
-//   if (type === SearchTypes.Transaction) {
-//     const hash = toNonHex(query);
-//     const request = await fetch(
-//       `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
-//     );
-//
-//     if (request?.ok) {
-//       const body: BlockExplorerTransaction = await request.json();
-//
-//       if (body?.transaction) {
-//         return SearchTypes.Transaction;
-//       }
-//     }
-//   } else if (type === SearchTypes.Party) {
-//     const party = toNonHex(query);
-//
-//     const request = await fetch(
-//       `${DATA_SOURCES.blockExplorerUrl}/transactions?limit=1&filters[tx.submitter]=${party}`
-//     );
-//
-//     if (request.ok) {
-//       const body: BlockExplorerTransactions = await request.json();
-//
-//       if (body?.transactions?.length) {
-//         return SearchTypes.Party;
-//       }
-//     }
-//   }
-//
-//   return undefined;
-// };
-
-// export const getSearchType = async (
-//   query: string
-// ): Promise<SearchTypes | undefined> => {
-//   const searchTypes = detectTypeFromQuery(query);
-//   const hasResults = searchTypes?.length;
-//
-//   if (hasResults) {
-//     if (hasResults > 1) {
-//       const promises = searchTypes.map((type) =>
-//         detectTypeByFetching(query, type)
-//       );
-//       const results = await Promise.all(promises);
-//       return results.find((result) => result !== undefined);
-//     }
-//
-//     return searchTypes[0];
-//   }
-//
-//   return undefined;
-// };
-
-export const getSearchType = async (
-  query: string
-): Promise<SearchTypes | undefined> => {
-  const searchTypes = detectTypeFromQuery(query);
-  const hasResults = searchTypes?.length;
-
-  if (hasResults) {
-    if (hasResults > 1) {
-      return await detectTypeByFetching(query);
-    }
-
-    return searchTypes[0];
-  }
-
-  return undefined;
+  return false;
 };
@@ -1,157 +1,82 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { Search } from './search';
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
+import { SearchForm } from './search';
 import { MemoryRouter } from 'react-router-dom';
 import { Routes } from '../../routes/route-names';
-import { SearchTypes, getSearchType } from './detect-search';

+global.fetch = jest.fn();
 const mockedNavigate = jest.fn();
-const mockGetSearchType = getSearchType as jest.MockedFunction<
-  typeof getSearchType
->;
-
 jest.mock('react-router-dom', () => ({
  ...jest.requireActual('react-router-dom'),
  useNavigate: () => mockedNavigate,
 }));

-jest.mock('./detect-search', () => ({
-  ...jest.requireActual('./detect-search'),
-  getSearchType: jest.fn(),
-}));
-
 beforeEach(() => {
  mockedNavigate.mockClear();
 });

-const renderComponent = () => (
-  <MemoryRouter>
-    <Search />
-  </MemoryRouter>
-);
+const renderComponent = () =>
+  render(
+    <MemoryRouter>
+      <SearchForm />
+    </MemoryRouter>
+  );

-const getInputs = () => ({
-  input: screen.getByTestId('search'),
-  button: screen.getByTestId('search-button'),
-});
-
-describe('Search', () => {
+describe('SearchForm', () => {
  it('should render search input and button', () => {
-    render(renderComponent());
+    renderComponent();
    expect(screen.getByTestId('search')).toBeInTheDocument();
    expect(screen.getByTestId('search-button')).toHaveTextContent('Search');
  });

-  it('should render error if input is not known', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    fireEvent.change(input, { target: { value: 'asd' } });
-    fireEvent.click(button);
-
-    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      'Transaction type is not recognised'
+  it.each([
+    [
+      Routes.TX,
+      '0000000000000000000000000000000000000000000000000000000000000000',
+    ],
+    [
+      Routes.PARTIES,
+      '0000000000000000000000000000000000000000000000000000000000000001',
+    ],
+    [Routes.BLOCKS, '123'],
+    [undefined, 'something else'],
+  ])('should redirect to %s', async (route, input) => {
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok:
+            input ===
+            '0000000000000000000000000000000000000000000000000000000000000000',
+          json: () =>
+            Promise.resolve({
+              transaction: {
+                hash: input,
+              },
+            }),
+        })
+      )
    );
-  });
-
-  it('should render error if no input is given', async () => {
-    render(renderComponent());
-    const { button } = getInputs();
-
-    fireEvent.click(button);
-
-    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      'Search query required'
-    );
-  });
-
-  it('should redirect to transactions page', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
-    fireEvent.change(input, {
-      target: {
-        value:
-          '0x1234567890123456789012345678901234567890123456789012345678901234',
-      },
+    renderComponent();
+    await act(async () => {
+      fireEvent.change(screen.getByTestId('search'), {
+        target: {
+          value: input,
+        },
+      });
+      fireEvent.click(screen.getByTestId('search-button'));
    });
-
-    fireEvent.click(button);
    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledWith(
-        `${Routes.TX}/0x1234567890123456789012345678901234567890123456789012345678901234`
-      );
-    });
-  });
-
-  it('should redirect to transactions page without proceeding 0x', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
-    fireEvent.change(input, {
-      target: {
-        value:
-          '1234567890123456789012345678901234567890123456789012345678901234',
-      },
-    });
-
-    fireEvent.click(button);
-    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledWith(
-        `${Routes.TX}/0x1234567890123456789012345678901234567890123456789012345678901234`
-      );
-    });
-  });
-
-  it('should redirect to parties page', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
-    fireEvent.change(input, {
-      target: {
-        value:
-          '0x1234567890123456789012345678901234567890123456789012345678901234',
-      },
-    });
-
-    fireEvent.click(button);
-    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledWith(
-        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
-      );
-    });
-  });
-
-  it('should redirect to parties page without proceeding 0x', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
-    fireEvent.change(input, {
-      target: {
-        value:
-          '1234567890123456789012345678901234567890123456789012345678901234',
-      },
-    });
-
-    fireEvent.click(button);
-    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledWith(
-        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
-      );
-    });
-  });
-
-  it('should redirect to blocks page if passed a number', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Block);
-    fireEvent.change(input, {
-      target: {
-        value: '123',
-      },
-    });
-
-    fireEvent.click(button);
-    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledWith(`${Routes.BLOCKS}/123`);
+      expect(mockedNavigate).toBeCalledTimes(route ? 1 : 0);
+      if (route) {
+        // eslint-disable-next-line jest/no-conditional-expect
+        expect(mockedNavigate).toBeCalledWith(`${route}/${input}`);
+      }
    });
  });
 });
@@ -1,12 +1,13 @@
-import { useCallback, useState } from 'react';
+import { useCallback } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { Button, Input, InputError } from '@vegaprotocol/ui-toolkit';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
-import { getSearchType, SearchTypes, toHex } from './detect-search';
 import { Routes } from '../../routes/route-names';
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
 import classNames from 'classnames';
+import { remove0x } from '@vegaprotocol/utils';
+import { determineType, isBlock, isHash, SearchTypes } from './detect-search';

 interface FormFields {
  search: string;
@@ -30,101 +31,26 @@ const MagnifyingGlass = () => (
  </svg>
 );

+const Clear = () => (
+  <svg
+    className="w-3 h-3"
+    viewBox="0 0 12 12"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M11.3748 1.37478L1.37478 11.3748L0.625244 10.6252L10.6252 0.625244L11.3748 1.37478Z"
+      fill="currentColor"
+    />
+    <path
+      d="M1.37478 0.625244L11.3748 10.6252L10.6252 11.3748L0.625244 1.37478L1.37478 0.625244Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
 export const Search = () => {
-  const { register, handleSubmit } = useForm<FormFields>();
-  const navigate = useNavigate();
-  const [error, setError] = useState<Error | null>(null);
-
-  const onSubmit = useCallback(
-    async (fields: FormFields) => {
-      setError(null);
-
-      const query = fields.search;
-
-      if (!query) {
-        return setError(new Error(t('Search query required')));
-      }
-
-      const result = await getSearchType(query);
-      const urlAsHex = toHex(query);
-      const unrecognisedError = new Error(
-        t('Transaction type is not recognised')
-      );
-
-      if (result) {
-        switch (result) {
-          case SearchTypes.Party:
-            return navigate(`${Routes.PARTIES}/${urlAsHex}`);
-          case SearchTypes.Transaction:
-            return navigate(`${Routes.TX}/${urlAsHex}`);
-          case SearchTypes.Block:
-            return navigate(`${Routes.BLOCKS}/${Number(query)}`);
-          default:
-            return setError(unrecognisedError);
-        }
-      }
-
-      return setError(unrecognisedError);
-    },
-    [navigate]
-  );
-
-  const searchForm = (
-    <form className="block min-w-[290px]" onSubmit={handleSubmit(onSubmit)}>
-      <div className="flex relative items-stretch gap-2 text-xs">
-        <label htmlFor="search" className="sr-only">
-          {t('Search by block number or transaction hash')}
-        </label>
-        <button
-          className={classNames(
-            'absolute top-[50%] translate-y-[-50%] left-2',
-            'text-vega-light-300 dark:text-vega-dark-300'
-          )}
-        >
-          <MagnifyingGlass />
-        </button>
-        <Input
-          {...register('search')}
-          id="search"
-          data-testid="search"
-          className={classNames(
-            'peer',
-            'pl-8 py-2 text-xs',
-            'border rounded border-vega-light-200 dark:border-vega-dark-200'
-          )}
-          hasError={Boolean(error?.message)}
-          type="text"
-          placeholder={t('Enter block number, public key or transaction hash')}
-        />
-        {error?.message && (
-          <div
-            className={classNames(
-              'hidden peer-focus:block',
-              'bg-white dark:bg-black',
-              'border rounded-b border-t-0 border-vega-light-200 dark:border-vega-dark-200',
-              'absolute top-[100%] flex-1 w-full pb-2 px-2 text-black dark:text-white'
-            )}
-          >
-            <InputError
-              data-testid="search-error"
-              intent="danger"
-              className="text-xs"
-            >
-              {error.message}
-            </InputError>
-          </div>
-        )}
-        <Button
-          className="hidden [.search-dropdown_&]:block"
-          type="submit"
-          size="xs"
-          data-testid="search-button"
-        >
-          {t('Search')}
-        </Button>
-      </div>
-    </form>
-  );
+  const searchForm = <SearchForm />;

  const searchTrigger = (
    <DropdownMenu.Root>
@@ -154,10 +80,135 @@ export const Search = () => {

  return (
    <>
-      <div className="hidden [.nav-search-full_&]:block">{searchForm}</div>
+      <div className="hidden [.nav-search-full_&]:block min-w-[290px]">
+        {searchForm}
+      </div>
      <div className="hidden [.nav-search-compact_&]:block">
        {searchTrigger}
      </div>
    </>
  );
 };
+
+export const SearchForm = () => {
+  const {
+    register,
+    handleSubmit,
+    setValue,
+    setError,
+    clearErrors,
+    formState,
+    watch,
+  } = useForm<FormFields>();
+  const navigate = useNavigate();
+
+  const onSubmit = useCallback(
+    async (fields: FormFields) => {
+      clearErrors();
+      const type = await determineType(fields.search);
+      if (type) {
+        switch (type) {
+          case SearchTypes.Party:
+            return navigate(`${Routes.PARTIES}/${remove0x(fields.search)}`);
+          case SearchTypes.Transaction:
+            return navigate(`${Routes.TX}/${remove0x(fields.search)}`);
+          case SearchTypes.Block:
+            return navigate(`${Routes.BLOCKS}/${Number(fields.search)}`);
+        }
+      }
+
+      setError('search', new Error(t('The search term is not a valid query')));
+    },
+    [clearErrors, navigate, setError]
+  );
+
+  const searchQuery = watch('search', '');
+
+  return (
+    <form className="block min-w-[200px]" onSubmit={handleSubmit(onSubmit)}>
+      <div className="flex relative items-stretch gap-2 text-xs">
+        <div className="relative w-full">
+          <label htmlFor="search" className="sr-only">
+            {t('Search by block number or transaction hash')}
+          </label>
+          <button
+            className={classNames(
+              'absolute top-[50%] translate-y-[-50%] left-2',
+              'text-vega-light-300 dark:text-vega-dark-300'
+            )}
+          >
+            <MagnifyingGlass />
+          </button>
+          <button
+            onClick={(e) => {
+              e.preventDefault();
+              setValue('search', '');
+              clearErrors();
+            }}
+            className={classNames(
+              { hidden: searchQuery.length === 0 },
+              'absolute top-[50%] translate-y-[-50%] right-2',
+              'text-vega-light-300 dark:text-vega-dark-300'
+            )}
+          >
+            <Clear />
+          </button>
+          <Input
+            {...register('search', {
+              required: t('Search query is required'),
+              validate: (value) =>
+                isHash(value) ||
+                isBlock(value) ||
+                t('Search query has to be a number or a 64 character hash'),
+              onBlur: () => clearErrors('search'),
+            })}
+            id="search"
+            data-testid="search"
+            className={classNames(
+              'pl-8 py-2 text-xs',
+              { 'pr-8': searchQuery.length > 1 },
+              'border rounded border-vega-light-200 dark:border-vega-dark-200',
+              {
+                'border-vega-pink dark:border-vega-pink': Boolean(
+                  formState.errors.search
+                ),
+              }
+            )}
+            hasError={Boolean(formState.errors.search)}
+            type="text"
+            placeholder={t(
+              'Enter block number, public key or transaction hash'
+            )}
+          />
+        </div>
+        {formState.errors.search && (
+          <div
+            className={classNames(
+              '[nav_&]:border [nav_&]:rounded [nav_&]:border-vega-light-300 [nav_&]:dark:border-vega-light-300',
+              '[.search-dropdown_&]:border [.search-dropdown_&]:rounded [.search-dropdown_&]:border-vega-light-300 [.search-dropdown_&]:dark:border-vega-light-300',
+              'bg-white dark:bg-black',
+              'absolute top-[100%] flex-1 w-full pb-2 px-2 text-black dark:text-white'
+            )}
+          >
+            <InputError
+              data-testid="search-error"
+              intent="danger"
+              className="text-xs"
+            >
+              {formState.errors.search.message}
+            </InputError>
+          </div>
+        )}
+        <Button
+          variant="primary"
+          type="submit"
+          size="xs"
+          data-testid="search-button"
+          className="[nav_&]:hidden"
+        >
+          {t('Search')}
+        </Button>
+      </div>
+    </form>
+  );
+};
@@ -1,14 +1,19 @@
 import { StatsManager } from '@vegaprotocol/network-stats';
+import { SearchForm } from '../../components/search';
 import { useDocumentTitle } from '../../hooks/use-document-title';

 const Home = () => {
-  const classnames = 'mt-4 grid grid-cols-1 lg:grid-cols-2 lg:gap-4';
-
+  const classnames = 'mt-4 mb-4';
  useDocumentTitle();

  return (
    <section>
-      <StatsManager className={classnames} />
+      <div className="p-20 max-sm:py-10 max-sm:px-0">
+        <SearchForm />
+      </div>
+      <div className="px-20 max-sm:px-0">
+        <StatsManager className={classnames} />
+      </div>
    </section>
  );
 };
@@ -1,26 +0,0 @@
-import React from 'react';
-import { useRoutes } from 'react-router-dom';
-import { RouteErrorBoundary } from '../components/router-error-boundary';
-
-import routerConfig from './router-config';
-import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
-
-export interface RouteChildProps {
-  name: string;
-}
-
-export const AppRouter = () => {
-  const routes = useRoutes(routerConfig);
-
-  const splashLoading = (
-    <Splash>
-      <Loader />
-    </Splash>
-  );
-
-  return (
-    <RouteErrorBoundary>
-      <React.Suspense fallback={splashLoading}>{routes}</React.Suspense>
-    </RouteErrorBoundary>
-  );
-};
@@ -0,0 +1,187 @@
+import {
+  AssetDetailsDialog,
+  useAssetDetailsDialogStore,
+} from '@vegaprotocol/assets';
+import { t } from '@vegaprotocol/i18n';
+import {
+  AnnouncementBanner,
+  BackgroundVideo,
+  BreadcrumbsContainer,
+  ButtonLink,
+  ExternalLink,
+  Icon,
+} from '@vegaprotocol/ui-toolkit';
+import classNames from 'classnames';
+import { useState } from 'react';
+import {
+  isRouteErrorResponse,
+  Link,
+  Outlet,
+  useMatch,
+  useRouteError,
+} from 'react-router-dom';
+import { Footer } from '../components/footer/footer';
+import { Header } from '../components/header';
+import { Routes } from './route-names';
+
+const DialogsContainer = () => {
+  const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
+  return (
+    <AssetDetailsDialog
+      assetId={id}
+      trigger={trigger || null}
+      asJson={asJson}
+      open={isOpen}
+      onChange={setOpen}
+    />
+  );
+};
+
+const MainnetSimAd = () => {
+  const [shouldDisplayBanner, setShouldDisplayBanner] = useState<boolean>(true);
+
+  // Return an empty div so that the grid layout in _app.page.ts
+  // renders correctly
+  if (!shouldDisplayBanner) {
+    return <div />;
+  }
+
+  return (
+    <AnnouncementBanner>
+      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
+        <button
+          className="flex items-center"
+          onClick={() => setShouldDisplayBanner(false)}
+        >
+          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
+        </button>
+        <div>
+          <span className="pr-4">Mainnet sim 3 is live!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
+        </div>
+      </div>
+    </AnnouncementBanner>
+  );
+};
+
+export const Layout = () => {
+  const isHome = Boolean(useMatch(Routes.HOME));
+  return (
+    <>
+      <div
+        className={classNames(
+          'max-w-[1500px] min-h-[100vh]',
+          'mx-auto my-0',
+          'grid grid-rows-[auto_1fr_auto] grid-cols-1',
+          'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
+          'antialiased text-black dark:text-white',
+          'overflow-hidden relative'
+        )}
+      >
+        <div>
+          <MainnetSimAd />
+          <Header />
+        </div>
+        <div>
+          <main className="p-4">
+            {!isHome && <BreadcrumbsContainer className="mb-4" />}
+            <Outlet />
+          </main>
+        </div>
+        <div>
+          <Footer />
+        </div>
+      </div>
+      <DialogsContainer />
+    </>
+  );
+};
+
+export const ErrorBoundary = () => {
+  const error = useRouteError();
+
+  const errorTitle = isRouteErrorResponse(error)
+    ? `${error.status} ${error.statusText}`
+    : t('Something went wrong');
+
+  const errorMessage = isRouteErrorResponse(error)
+    ? error.error?.message
+    : (error as Error).message || JSON.stringify(error);
+
+  return (
+    <>
+      <BackgroundVideo className="brightness-50" />
+      <div
+        className={classNames(
+          'max-w-[620px] p-2 mt-[10vh]',
+          'mx-auto my-0',
+          'antialiased text-white',
+          'overflow-hidden relative',
+          'flex flex-col gap-2'
+        )}
+      >
+        <div className="flex gap-4">
+          <div>{GHOST}</div>
+          <h1 className="text-[2.7rem] font-alpha calt break-words uppercase">
+            {errorTitle}
+          </h1>
+        </div>
+        <div className="text-sm mt-10 overflow-auto break-all font-mono">
+          {errorMessage}
+        </div>
+        <div>
+          <ButtonLink onClick={() => window.location.reload()}>
+            {t('Try refreshing')}
+          </ButtonLink>{' '}
+          {t('or go back to')}{' '}
+          <Link className="underline" to="/">
+            {t('Home')}
+          </Link>
+        </div>
+      </div>
+    </>
+  );
+};
+
+const GHOST = (
+  <svg
+    width="56"
+    height="85"
+    viewBox="0 0 56 85"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M41 0.5H3V60.5H41V0.5Z" fill="white" />
+    <path d="M15 18.5H13V20.5H15V18.5Z" fill="black" />
+    <path d="M17 20.5H15V22.5H17V20.5Z" fill="black" />
+    <path d="M19 18.5H17V20.5H19V18.5Z" fill="black" />
+    <path d="M15 22.5H13V24.5H15V22.5Z" fill="black" />
+    <path d="M19 22.5H17V24.5H19V22.5Z" fill="black" />
+    <path d="M29 28.5H15V30.5H29V28.5Z" fill="black" />
+    <path d="M27 18.5H25V20.5H27V18.5Z" fill="black" />
+    <path d="M29 20.5H27V22.5H29V20.5Z" fill="black" />
+    <path d="M31 18.5H29V20.5H31V18.5Z" fill="black" />
+    <path d="M27 22.5H25V24.5H27V22.5Z" fill="black" />
+    <path d="M31 22.5H29V24.5H31V22.5Z" fill="black" />
+    <path d="M31 26.5H29V28.5H31V26.5Z" fill="black" />
+    <path d="M19 60.5H17V84.5H19V60.5Z" fill="black" />
+    <path d="M27 60.5H25V84.5H27V60.5Z" fill="black" />
+    <path
+      d="M3 42.5V58.64V60.5V64.5H21V60.5H23V64.5H41V60.5V58.64V42.5H3Z"
+      fill="#FF077F"
+    />
+    <path d="M35 46.5H41V42.5H3V46.5H31H35Z" fill="#CB0666" />
+    <path d="M3 32.32V29.5L0 32.5V60.5H2V33.33L3 32.32Z" fill="black" />
+    <path d="M41 31.8V29.49L54.79 21.53L55.79 23.26L41 31.8Z" fill="black" />
+    <path d="M36 54.5H35V55.5H36V54.5Z" fill="black" />
+    <path d="M35 53.5H34V54.5H35V53.5Z" fill="black" />
+    <path d="M34 48.5H33V53.5H34V48.5Z" fill="black" />
+    <path d="M38 48.5H37V52.5H38V48.5Z" fill="black" />
+    <path d="M37 53.5H36V54.5H37V53.5Z" fill="black" />
+    <path d="M39 52.5H38V53.5H39V52.5Z" fill="black" />
+    <path
+      d="M55.7901 23.27L53.0601 22.54L45.1001 8.75L46.8301 7.75L55.7901 23.27Z"
+      fill="black"
+    />
+  </svg>
+);
@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoProvider } from '@vegaprotocol/market-info';
+import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';

 export const MarketPage = () => {
@@ -17,7 +17,7 @@ export const MarketPage = () => {
  const { marketId } = useParams<{ marketId: string }>();

  const { data, loading, error } = useDataProvider({
-    dataProvider: marketInfoProvider,
+    dataProvider: marketInfoWithDataProvider,
    skipUpdates: true,
    variables: {
      marketId: marketId || '',
@@ -8,7 +8,6 @@ import { Oracle } from './oracles/id';
 import Party from './parties';
 import { Parties } from './parties/home';
 import { Party as PartySingle } from './parties/id';
-import Txs from './txs';
 import { ValidatorsPage } from './validators';
 import Genesis from './genesis';
 import { Block } from './blocks/id';
@@ -20,23 +19,55 @@ import flags from '../config/flags';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
 import { NetworkParameters } from './network-parameters';
-import type { RouteObject } from 'react-router-dom';
+import type { Params, RouteObject } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { MarketPage, MarketsPage } from './markets';
+import type { ReactNode } from 'react';
+import { ErrorBoundary, Layout } from './layout';
+import compact from 'lodash/compact';
+import { AssetLink, MarketLink } from '../components/links';
+import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
+import { remove0x } from '@vegaprotocol/utils';

 export type Navigable = {
  path: string;
-  name: string;
-  text: string;
+  handle: {
+    name: string;
+    text: string;
+  };
+};
+export const isNavigable = (item: RouteObject): item is Navigable =>
+  (item as Navigable).path !== undefined &&
+  (item as Navigable).handle !== undefined &&
+  (item as Navigable).handle.name !== undefined &&
+  (item as Navigable).handle.text !== undefined;
+
+export type Breadcrumbable = {
+  handle: { breadcrumb: (data?: Params<string>) => ReactNode | string };
+};
+export const isBreadcrumbable = (item: RouteObject): item is Breadcrumbable =>
+  (item as Breadcrumbable).handle !== undefined &&
+  (item as Breadcrumbable).handle.breadcrumb !== undefined;
+
+type RouteItem =
+  | RouteObject
+  | (RouteObject & Navigable)
+  | (RouteObject & Breadcrumbable);
+type Route = RouteItem & {
+  children?: RouteItem[];
 };
-type Route = RouteObject & Navigable;

 const partiesRoutes: Route[] = flags.parties
  ? [
      {
        path: Routes.PARTIES,
-        name: t('Parties'),
-        text: t('Parties'),
        element: <Party />,
+        handle: {
+          name: t('Parties'),
+          text: t('Parties'),
+          breadcrumb: () => <Link to={Routes.PARTIES}>{t('Parties')}</Link>,
+        },
        children: [
          {
            index: true,
@@ -45,6 +76,13 @@ const partiesRoutes: Route[] = flags.parties
          {
            path: ':party',
            element: <PartySingle />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.PARTIES, params.party)}>
+                  {truncateMiddle(params.party as string)}
+                </Link>
+              ),
+            },
          },
        ],
      },
@@ -55,8 +93,11 @@ const assetsRoutes: Route[] = flags.assets
  ? [
      {
        path: Routes.ASSETS,
-        text: t('Assets'),
-        name: t('Assets'),
+        handle: {
+          name: t('Assets'),
+          text: t('Assets'),
+          breadcrumb: () => <Link to={Routes.ASSETS}>{t('Assets')}</Link>,
+        },
        children: [
          {
            index: true,
@@ -65,6 +106,11 @@ const assetsRoutes: Route[] = flags.assets
          {
            path: ':assetId',
            element: <AssetPage />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <AssetLink assetId={params.assetId as string} />
+              ),
+            },
          },
        ],
      },
@@ -75,8 +121,13 @@ const genesisRoutes: Route[] = flags.genesis
  ? [
      {
        path: Routes.GENESIS,
-        name: t('Genesis'),
-        text: t('Genesis Parameters'),
+        handle: {
+          name: t('Genesis'),
+          text: t('Genesis Parameters'),
+          breadcrumb: () => (
+            <Link to={Routes.GENESIS}>{t('Genesis Parameters')}</Link>
+          ),
+        },
        element: <Genesis />,
      },
    ]
@@ -86,8 +137,13 @@ const governanceRoutes: Route[] = flags.governance
  ? [
      {
        path: Routes.GOVERNANCE,
-        name: t('Governance proposals'),
-        text: t('Governance Proposals'),
+        handle: {
+          name: t('Governance proposals'),
+          text: t('Governance Proposals'),
+          breadcrumb: () => (
+            <Link to={Routes.GOVERNANCE}>{t('Governance Proposals')}</Link>
+          ),
+        },
        element: <Proposals />,
      },
    ]
@@ -97,8 +153,11 @@ const marketsRoutes: Route[] = flags.markets
  ? [
      {
        path: Routes.MARKETS,
-        name: t('Markets'),
-        text: t('Markets'),
+        handle: {
+          name: t('Markets'),
+          text: t('Markets'),
+          breadcrumb: () => <Link to={Routes.MARKETS}>{t('Markets')}</Link>,
+        },
        children: [
          {
            index: true,
@@ -107,6 +166,11 @@ const marketsRoutes: Route[] = flags.markets
          {
            path: ':marketId',
            element: <MarketPage />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <MarketLink id={params.marketId as string} />
+              ),
+            },
          },
        ],
      },
@@ -117,8 +181,15 @@ const networkParametersRoutes: Route[] = flags.networkParameters
  ? [
      {
        path: Routes.NETWORK_PARAMETERS,
-        name: t('NetworkParameters'),
-        text: t('Network Parameters'),
+        handle: {
+          name: t('NetworkParameters'),
+          text: t('Network Parameters'),
+          breadcrumb: () => (
+            <Link to={Routes.NETWORK_PARAMETERS}>
+              {t('Network Parameters')}
+            </Link>
+          ),
+        },
        element: <NetworkParameters />,
      },
    ]
@@ -128,80 +199,133 @@ const validators: Route[] = flags.validators
  ? [
      {
        path: Routes.VALIDATORS,
-        name: t('Validators'),
-        text: t('Validators'),
+        handle: {
+          name: t('Validators'),
+          text: t('Validators'),
+          breadcrumb: () => (
+            <Link to={Routes.VALIDATORS}>{t('Validators')}</Link>
+          ),
+        },
        element: <ValidatorsPage />,
      },
    ]
  : [];

-const routerConfig: Route[] = [
+const linkTo = (...segments: (string | undefined)[]) =>
+  compact(segments).join('/');
+
+export const routerConfig: Route[] = [
  {
    path: Routes.HOME,
-    name: t('Home'),
-    text: t('Home'),
-    element: <Home />,
-    index: true,
-  },
-  {
-    path: Routes.TX,
-    name: t('Txs'),
-    text: t('Transactions'),
-    element: <Txs />,
-    children: [
-      {
-        path: 'pending',
-        element: <PendingTxs />,
-      },
-      {
-        path: ':txHash',
-        element: <Tx />,
-      },
-      {
-        index: true,
-        element: <TxsList />,
-      },
-    ],
-  },
-  {
-    path: Routes.BLOCKS,
-    name: t('Blocks'),
-    text: t('Blocks'),
-    element: <BlockPage />,
+    element: <Layout />,
+    handle: {
+      name: t('Home'),
+      text: t('Home'),
+      breadcrumb: () => <Link to={Routes.HOME}>{t('Home')}</Link>,
+    },
+    errorElement: <ErrorBoundary />,
    children: [
      {
        index: true,
-        element: <Blocks />,
+        element: <Home />,
      },
      {
-        path: ':block',
-        element: <Block />,
+        path: Routes.TX,
+        handle: {
+          name: t('Txs'),
+          text: t('Transactions'),
+          breadcrumb: () => <Link to={Routes.TX}>{t('Transactions')}</Link>,
+        },
+        children: [
+          {
+            path: 'pending',
+            element: <PendingTxs />,
+            handle: {
+              breadcrumb: () => (
+                <Link to={linkTo(Routes.TX, 'pending')}>
+                  {t('Pending transactions')}
+                </Link>
+              ),
+            },
+          },
+          {
+            path: ':txHash',
+            element: <Tx />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.TX, params.txHash)}>
+                  {truncateMiddle(remove0x(params.txHash as string))}
+                </Link>
+              ),
+            },
+          },
+          {
+            index: true,
+            element: <TxsList />,
+          },
+        ],
      },
+      {
+        path: Routes.BLOCKS,
+        handle: {
+          name: t('Blocks'),
+          text: t('Blocks'),
+          breadcrumb: () => <Link to={Routes.BLOCKS}>{t('Blocks')}</Link>,
+        },
+        element: <BlockPage />,
+        children: [
+          {
+            index: true,
+            element: <Blocks />,
+          },
+          {
+            path: ':block',
+            element: <Block />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.BLOCKS, params.block)}>
+                  {params.block}
+                </Link>
+              ),
+            },
+          },
+        ],
+      },
+      {
+        path: Routes.ORACLES,
+        handle: {
+          name: t('Oracles'),
+          text: t('Oracles'),
+          breadcrumb: () => <Link to={Routes.ORACLES}>{t('Oracles')}</Link>,
+        },
+        element: <OraclePage />,
+        children: [
+          {
+            index: true,
+            element: <Oracles />,
+          },
+          {
+            path: ':id',
+            element: <Oracle />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.ORACLES, params.id)}>
+                  {truncateMiddle(params.id as string)}
+                </Link>
+              ),
+            },
+          },
+        ],
+      },
+      ...partiesRoutes,
+      ...assetsRoutes,
+      ...genesisRoutes,
+      ...governanceRoutes,
+      ...marketsRoutes,
+      ...networkParametersRoutes,
+      ...validators,
    ],
  },
-  {
-    path: Routes.ORACLES,
-    name: t('Oracles'),
-    text: t('Oracles'),
-    element: <OraclePage />,
-    children: [
-      {
-        index: true,
-        element: <Oracles />,
-      },
-      {
-        path: ':id',
-        element: <Oracle />,
-      },
-    ],
-  },
-  ...partiesRoutes,
-  ...assetsRoutes,
-  ...genesisRoutes,
-  ...governanceRoutes,
-  ...marketsRoutes,
-  ...networkParametersRoutes,
-  ...validators,
 ];

-export default routerConfig;
+export const router = createBrowserRouter(routerConfig);
@@ -1,5 +1,4 @@
-import React from 'react';
-import { Link, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { remove0x } from '@vegaprotocol/utils';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { DATA_SOURCES } from '../../../config';
@@ -8,9 +7,6 @@ import { TxDetails } from './tx-details';
 import type { BlockExplorerTransaction } from '../../../routes/types/block-explorer-response';
 import { toNonHex } from '../../../components/search/detect-search';
 import { PageHeader } from '../../../components/page-header';
-import { Routes } from '../../../routes/route-names';
-import { IconNames } from '@blueprintjs/icons';
-import { Icon } from '@vegaprotocol/ui-toolkit';
 import { useDocumentTitle } from '../../../hooks/use-document-title';

 const Tx = () => {
@@ -22,6 +18,7 @@ const Tx = () => {

  const {
    state: { data, loading, error },
+    refetch,
  } = useFetch<BlockExplorerTransaction>(
    `${DATA_SOURCES.blockExplorerUrl}/transactions/${toNonHex(hash)}`
  );
@@ -34,17 +31,6 @@ const Tx = () => {

  return (
    <section>
-      <Link
-        className="font-normal underline underline-offset-4 block mb-5"
-        to={`/${Routes.TX}`}
-      >
-        <Icon
-          className="text-vega-light-150 dark:text-vega-light-150"
-          name={IconNames.CHEVRON_LEFT}
-        />
-        All Transactions
-      </Link>
-
      <PageHeader
        title="transaction"
        truncateStart={5}
@@ -56,6 +42,7 @@ const Tx = () => {
        error={error}
        loading={loading}
        errorMessage={errorMessage}
+        refetch={refetch}
      >
        <TxDetails
          className="mb-28"
@@ -21,7 +21,7 @@ import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
 import { PageTitle } from '../../components/page-helpers/page-title';
 import BigNumber from 'bignumber.js';
 import {
-  ContractAddressLink,
+  EtherscanLink,
  DApp,
  TOKEN_VALIDATOR,
  useLinks,
@@ -224,7 +224,7 @@ export const ValidatorsPage = () => {
                        <KeyValueTableRow>
                          <div>{t('Ethereum address')}</div>
                          <div className="break-all text-xs">
-                            <ContractAddressLink address={v.ethereumAddress} />{' '}
+                            <EtherscanLink address={v.ethereumAddress} />{' '}
                            <CopyWithTooltip text={v.ethereumAddress}>
                              <button title={t('Copy address to clipboard')}>
                                <Icon size={3} name="duplicate" />
@@ -1,5 +1,4 @@
 import { createRoot } from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
 import './styles.css';

 import App from './app/app';
@@ -10,8 +9,6 @@ const root = rootElement && createRoot(rootElement);

 root?.render(
  <StrictMode>
-    <BrowserRouter>
-      <App />
-    </BrowserRouter>
+    <App />
  </StrictMode>
 );
@@ -2,6 +2,8 @@
  "changes": {
    "decimalPlaces": "5",
    "positionDecimalPlaces": "5",
+    "linearSlippageFactor": "0.001",
+    "quadraticSlippageFactor": "0",
    "lpPriceRange": "10",
    "instrument": {
      "name": "Token test market",
@@ -1,5 +1,7 @@
 {
  "lpPriceRange": "10",
+  "linearSlippageFactor": "0.001",
+  "quadraticSlippageFactor": "0",
  "instrument": {
    "code": "TEST.24h",
    "future": {
@@ -1,9 +1,28 @@
-import { associateTokenStartOfTests } from '../../support/common.functions';
 import {
+  navigateTo,
+  waitForSpinner,
+  navigation,
+} from '../../support/common.functions';
+import {
+  convertUnixTimestampToDateformat,
  createRawProposal,
+  createTenDigitUnixTimeStampForSpecifiedDays,
+  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
+  getGovernanceProposalDateFormatForSpecifiedDays,
+  getProposalIdFromList,
+  getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
+  goToMakeNewProposal,
  governanceProposalType,
-} from '../../support/governance.functions';
+  voteForProposal,
+  waitForProposalSubmitted,
+  waitForProposalSync,
+} from '../../../../governance-e2e/src/support/governance.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governance-e2e/src/support/staking.functions';
+import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../../../governance-e2e/src/support/wallet-teardown.functions';
+import type { testFreeformProposal } from '../../support/common-interfaces';

 const proposalVoteProgressForPercentage =
  '[data-testid="vote-progress-indicator-percentage-for"]';
@@ -25,24 +44,23 @@ describe(
  function () {
    before('connect wallets and set approval limit', function () {
      cy.visit('/');
-      cy.vega_wallet_set_specified_approval_amount('1000');
-      associateTokenStartOfTests();
+      vegaWalletSetSpecifiedApprovalAmount('1000');
    });

    beforeEach('visit proposals tab', function () {
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.connectVegaWallet();
-      cy.ethereum_wallet_connect();
-      cy.ensure_specified_unstaked_tokens_are_associated(1);
-      cy.navigate_to_page_if_not_already_loaded('proposals');
+      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      navigateTo(navigation.proposals);
    });

    // 3001-VOTE-055
    it('Newly created raw proposal details - shows proposal title and full description', function () {
      createRawProposal();
-      cy.get('@rawProposal').then((rawProposal) => {
-        cy.get_proposal_id_from_list(rawProposal.rationale.title);
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getProposalIdFromList(rawProposal.rationale.title);
        cy.get('@proposalIdText').then((proposalId) => {
          cy.get(openProposals).within(() => {
            cy.get(`#${proposalId}`).within(() => {
@@ -69,30 +87,26 @@ describe(
    it('Newly created freeform proposal details - shows proposed and closing dates', function () {
      const closingVoteHrs = '72';
      const proposalTitle = generateFreeFormProposalTitle();
+      const proposalTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(3);

-      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(closingVoteHrs, proposalTitle);
-
-          cy.wait_for_proposal_submitted();
-          cy.wait_for_proposal_sync();
-          cy.navigate_to('proposals');
-          cy.get_submitted_proposal_from_proposal_list(proposalTitle).within(
-            () => cy.get(viewProposalButton).click()
-          );
-          cy.convert_unix_timestamp_to_governance_data_table_date_format(
-            closingDateTimestamp
-          ).then((closingDate) => {
-            cy.get_proposal_information_from_table('Closes on')
-              .contains(closingDate)
-              .should('be.visible');
-          });
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody(closingVoteHrs, proposalTitle);
+      waitForProposalSubmitted();
+      waitForProposalSync();
+      navigateTo(navigation.proposals);
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
+        cy.get(viewProposalButton).click()
+      );
+      convertUnixTimestampToDateformat(proposalTimeStamp).then(
+        (closingDate) => {
+          getProposalInformationFromTable('Closes on')
+            .contains(closingDate)
+            .should('be.visible');
        }
      );
-      cy.get_governance_proposal_date_format_for_specified_days('0').then(
+      getGovernanceProposalDateFormatForSpecifiedDays(0).then(
        (proposalDate) => {
-          cy.get_proposal_information_from_table('Proposed on')
+          getProposalInformationFromTable('Proposed on')
            .contains(proposalDate)
            .should('be.visible');
        }
@@ -104,25 +118,25 @@ describe(
      // 3001-VOTE-040
      // 3001-VOTE-067
      createRawProposal();
-      cy.get('@rawProposal').then((rawProposal) => {
-        cy.get_submitted_proposal_from_proposal_list(
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getSubmittedProposalFromProposalList(
          rawProposal.rationale.title
        ).within(() => cy.get(viewProposalButton).click());
      });
      cy.contains('Participation: Not Met 0.00 0.00%(0.00% Required)').should(
        'be.visible'
      );
-      cy.get_proposal_information_from_table('Expected to pass')
+      getProposalInformationFromTable('Expected to pass')
        .contains('👎')
        .should('be.visible');
      // 3001-VOTE-062
      // 3001-VOTE-040
      // 3001-VOTE-070
-      cy.get_proposal_information_from_table('Token majority met')
+      getProposalInformationFromTable('Token majority met')
        .contains('👎')
        .should('be.visible');
      // 3001-VOTE-068
-      cy.get_proposal_information_from_table('Token participation met')
+      getProposalInformationFromTable('Token participation met')
        .contains('👎')
        .should('be.visible');
    });
@@ -130,28 +144,27 @@ describe(
    // 3001-VOTE-080 3001-VOTE-090 3001-VOTE-069 3001-VOTE-072 3001-VOTE-073
    it('Newly created proposal details - ability to vote for and against proposal - with minimum required tokens associated', function () {
      createRawProposal();
-      cy.get('@rawProposal').then((rawProposal) => {
-        cy.get_submitted_proposal_from_proposal_list(
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getSubmittedProposalFromProposalList(
          rawProposal.rationale.title
        ).within(() => cy.get(viewProposalButton).click());
      });
      // 3001-VOTE-080
      cy.getByTestId('vote-buttons').contains('against').should('be.visible');
      cy.getByTestId('vote-buttons').contains('for').should('be.visible');
-      cy.vote_for_proposal('for');
-      cy.get_governance_proposal_date_format_for_specified_days(
-        '0',
-        'shortMonth'
-      ).then((votedDate) => {
-        // 3001-VOTE-051
-        // 3001-VOTE-093
-        cy.contains('You voted:')
-          .siblings()
-          .contains('For')
-          .siblings()
-          .contains(votedDate)
-          .should('be.visible');
-      });
+      voteForProposal('for');
+      getGovernanceProposalDateFormatForSpecifiedDays(0, 'shortMonth').then(
+        (votedDate) => {
+          // 3001-VOTE-051
+          // 3001-VOTE-093
+          cy.contains('You voted:')
+            .siblings()
+            .contains('For')
+            .siblings()
+            .contains(votedDate)
+            .should('be.visible');
+        }
+      );
      cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
        .contains('100.00%')
        .and('be.visible');
@@ -162,38 +175,38 @@ describe(
      cy.get(proposalVoteProgressAgainstTokens)
        .contains('0.00')
        .and('be.visible');
-      cy.get_proposal_information_from_table('Tokens for proposal')
-        .should('have.text', parseFloat(1).toFixed(2))
+      getProposalInformationFromTable('Tokens for proposal')
+        .should('have.text', (1).toFixed(2))
        .and('be.visible');
-      cy.get_proposal_information_from_table('Tokens against proposal')
+      getProposalInformationFromTable('Tokens against proposal')
        .should('have.text', '0.00')
        .and('be.visible');
      // 3001-VOTE-061
-      cy.get_proposal_information_from_table('Participation required')
-        .contains(0.001)
+      getProposalInformationFromTable('Participation required')
+        .contains('0.00%')
        .should('be.visible');
      // 3001-VOTE-066
-      cy.get_proposal_information_from_table('Majority Required') // 3001-VOTE-073
-        .contains(`${parseFloat(100).toFixed(2)}%`)
+      getProposalInformationFromTable('Majority Required') // 3001-VOTE-073
+        .contains(`${(66).toFixed(2)}%`)
        .should('be.visible');
-      cy.get_proposal_information_from_table('Number of voting parties')
+      getProposalInformationFromTable('Number of voting parties')
        .should('have.text', '1')
        .and('be.visible');
      cy.get(changeVoteButton).should('be.visible').click();
-      cy.vote_for_proposal('for');
+      voteForProposal('for');
      // 3001-VOTE-064
-      cy.get_proposal_information_from_table('Tokens for proposal')
-        .should('have.text', parseFloat(1).toFixed(2))
+      getProposalInformationFromTable('Tokens for proposal')
+        .should('have.text', (1).toFixed(2))
        .and('be.visible');
      cy.get(changeVoteButton).should('be.visible').click();
-      cy.vote_for_proposal('against');
+      voteForProposal('against');
      cy.get(proposalVoteProgressAgainstPercentage)
        .contains('100.00%')
        .and('be.visible');
-      cy.get_proposal_information_from_table('Tokens against proposal')
-        .should('have.text', parseFloat(1).toFixed(2))
+      getProposalInformationFromTable('Tokens against proposal')
+        .should('have.text', (1).toFixed(2))
        .and('be.visible');
-      cy.get_proposal_information_from_table('Number of voting parties')
+      getProposalInformationFromTable('Number of voting parties')
        .should('have.text', '1')
        .and('be.visible');
    });
@@ -201,30 +214,31 @@ describe(
    // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060
    it('Newly created proposal details - ability to increase associated tokens - by voting again after association', function () {
      createRawProposal();
-      cy.get('@rawProposal').then((rawProposal) => {
-        cy.get_submitted_proposal_from_proposal_list(
-          rawProposal.rationale.title
-        )
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getSubmittedProposalFromProposalList(rawProposal.rationale.title)
          .as('submittedProposal')
          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.vote_for_proposal('for');
+      voteForProposal('for');
      // 3001-VOTE-079
      cy.contains('You voted: For').should('be.visible');
      cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
-      cy.get_proposal_information_from_table('Total Supply')
+      getProposalInformationFromTable('Total Supply')
        .invoke('text')
        .then((totalSupply) => {
-          let tokensRequiredToAchieveResult = parseFloat(
-            (totalSupply.replace(/,/g, '') * 0.001) / 100
+          const tokensRequiredToAchieveResult = (
+            (Number(totalSupply.replace(/,/g, '')) * 0.001) /
+            100
          ).toFixed(2);
-          cy.ensure_specified_unstaked_tokens_are_associated(
+          ensureSpecifiedUnstakedTokensAreAssociated(
            tokensRequiredToAchieveResult
          );
-          cy.navigate_to_page_if_not_already_loaded('proposals');
-          cy.get('@submittedProposal').within(() =>
-            cy.get(viewProposalButton).click()
-          );
+          navigateTo(navigation.proposals);
+          cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+            getSubmittedProposalFromProposalList(rawProposal.rationale.title)
+              .as('submittedProposal')
+              .within(() => cy.get(viewProposalButton).click());
+          });
          cy.get(proposalVoteProgressForPercentage)
            .contains('100.00%')
            .and('be.visible');
@@ -233,38 +247,36 @@ describe(
            .and('be.visible');
          // 3001-VOTE-065
          cy.get(changeVoteButton).should('be.visible').click();
-          cy.vote_for_proposal('for');
+          voteForProposal('for');
          cy.get(proposalVoteProgressForTokens)
            .contains(tokensRequiredToAchieveResult)
            .and('be.visible');
          cy.get(proposalVoteProgressAgainstTokens)
            .contains('0.00')
            .and('be.visible');
-          cy.get_proposal_information_from_table(
-            'Total tokens voted percentage'
-          )
+          getProposalInformationFromTable('Total tokens voted percentage')
            .should('have.text', '0.00%')
            .and('be.visible');
-          cy.get_proposal_information_from_table('Tokens for proposal')
+          getProposalInformationFromTable('Tokens for proposal')
            .should('have.text', tokensRequiredToAchieveResult)
            .and('be.visible');
-          cy.get_proposal_information_from_table('Tokens against proposal')
+          getProposalInformationFromTable('Tokens against proposal')
            .should('have.text', '0.00')
            .and('be.visible');
-          cy.get_proposal_information_from_table('Number of voting parties')
+          getProposalInformationFromTable('Number of voting parties')
            .should('have.text', '1')
            .and('be.visible');
-          cy.get_proposal_information_from_table('Expected to pass')
+          getProposalInformationFromTable('Expected to pass')
            .contains('👍')
            .should('be.visible');
          // 3001-VOTE-062
-          cy.get_proposal_information_from_table('Token majority met')
+          getProposalInformationFromTable('Token majority met')
            .contains('👍')
            .should('be.visible');
-          cy.get_proposal_information_from_table('Token participation met')
+          getProposalInformationFromTable('Token participation met')
            .contains('👍')
            .should('be.visible');
-          cy.get_proposal_information_from_table('Tokens for proposal')
+          getProposalInformationFromTable('Tokens for proposal')
            .contains(tokensRequiredToAchieveResult)
            .and('be.visible');
        });
@@ -1,10 +1,21 @@
 /// <reference types="cypress" />
-import { associateTokenStartOfTests } from '../../support/governance.functions';
+import {
+  navigateTo,
+  navigation,
+  waitForSpinner,
+} from '../../support/common.functions';
+import {
+  getProposalInformationFromTable,
+  voteForProposal,
+} from '../../support/governance.functions';

 import {
  createUpdateNetworkProposalTxBody,
  createFreeFormProposalTxBody,
 } from '../../support/proposal.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

 const closedProposals = '[data-testid="closed-proposals"]';
 const proposalStatus = '[data-testid="proposal-status"]';
@@ -21,20 +32,19 @@ context(
  function () {
    before('Connect wallets and set approval', function () {
      cy.visit('/');
-      cy.vega_wallet_set_specified_approval_amount('1000');
-      associateTokenStartOfTests();
+      vegaWalletSetSpecifiedApprovalAmount('1000');
      cy.connectVegaWallet();
-      cy.ethereum_wallet_connect();
-      cy.ensure_specified_unstaked_tokens_are_associated(1);
+      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
      cy.clearLocalStorage();
    });

    beforeEach('visit proposals', function () {
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.connectVegaWallet();
-      cy.ethereum_wallet_connect();
-      cy.navigate_to('proposals');
+      ethereumWalletConnect();
+      navigateTo(navigation.proposals);
    });

    // 3001-VOTE-006
@@ -43,7 +53,7 @@ context(

      cy.createMarket();
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.get(closedProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil('[data-testid="proposals-list-item"]')
@@ -53,7 +63,7 @@ context(
          });
      });
      cy.getByTestId('proposal-type').should('have.text', 'New market');
-      cy.get_proposal_information_from_table('State')
+      getProposalInformationFromTable('State')
        .contains('Enacted')
        .and('be.visible');
      cy.get(votesTable).within(() => {
@@ -68,22 +78,22 @@ context(
      const proposalTx = createUpdateNetworkProposalTxBody();

      cy.VegaWalletSubmitProposal(proposalTx);
-      cy.navigate_to('proposals');
+      navigateTo(navigation.proposals);
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.get_proposal_information_from_table('State')
+      getProposalInformationFromTable('State')
        .contains('Open')
        .and('be.visible');
-      cy.vote_for_proposal('for');
-      cy.get_proposal_information_from_table('State') // 3001-VOTE-047
+      voteForProposal('for');
+      getProposalInformationFromTable('State') // 3001-VOTE-047
        .contains('Passed', proposalTimeout)
        .and('be.visible');
-      cy.get_proposal_information_from_table('State')
+      getProposalInformationFromTable('State')
        .contains('Enacted', proposalTimeout)
        .and('be.visible');
      cy.get(votesTable).within(() => {
@@ -101,19 +111,19 @@ context(
      const proposalTx = createFreeFormProposalTxBody();

      cy.VegaWalletSubmitProposal(proposalTx);
-      cy.navigate_to('proposals');
+      navigateTo(navigation.proposals);
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.get_proposal_information_from_table('State')
+      getProposalInformationFromTable('State')
        .contains('Open')
        .and('be.visible');
-      cy.vote_for_proposal('for');
-      cy.get_proposal_information_from_table('State')
+      voteForProposal('for');
+      getProposalInformationFromTable('State')
        .contains('Enacted', proposalTimeout)
        .and('be.visible');
    });
@@ -123,21 +133,21 @@ context(
      const proposalTitle = 'Add New free form proposal with short enactment';
      const proposalTx = createFreeFormProposalTxBody();
      cy.VegaWalletSubmitProposal(proposalTx);
-      cy.navigate_to('proposals');
+      navigateTo(navigation.proposals);
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.get_proposal_information_from_table('State')
+      getProposalInformationFromTable('State')
        .contains('Open')
        .and('be.visible');
-      cy.get_proposal_information_from_table('State') // 3001-VOTE-047
+      getProposalInformationFromTable('State') // 3001-VOTE-047
        .contains('Declined', proposalTimeout)
        .and('be.visible');
-      cy.get_proposal_information_from_table('Rejection reason')
+      getProposalInformationFromTable('Rejection reason')
        .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
        .and('be.visible');
    });
@@ -1,17 +1,42 @@
 /// <reference types="cypress" />
 import {
  createRawProposal,
+  createTenDigitUnixTimeStampForSpecifiedDays,
+  enterRawProposalBody,
+  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
+  getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
+  goToMakeNewProposal,
  governanceProposalType,
+  voteForProposal,
+  waitForProposalSubmitted,
+  waitForProposalSync,
 } from '../../support/governance.functions';

-import { associateTokenStartOfTests } from '../../support/common.functions';
+import {
+  verifyUnstakedBalance,
+  waitForSpinner,
+  navigateTo,
+  navigation,
+} from '../../support/common.functions';
+import {
+  clickOnValidatorFromList,
+  closeStakingDialog,
+  ensureSpecifiedUnstakedTokensAreAssociated,
+  stakingPageDisassociateTokens,
+  stakingValidatorPageAddStake,
+} from '../../support/staking.functions';
+import {
+  vegaWalletSetSpecifiedApprovalAmount,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import type { testFreeformProposal } from '../../support/common-interfaces';

-const vegaWalletUnstakedBalance =
-  '[data-testid="vega-wallet-balance-unstaked"]';
 const vegaWalletStakedBalances =
  '[data-testid="vega-wallet-balance-staked-validators"]';
-const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
+const vegaWalletAssociatedBalance = '[data-testid="associated-amount"]';
 const vegaWalletNameElement = '[data-testid="wallet-name"]';
 const vegaWallet = '[data-testid="vega-wallet"]';
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
@@ -40,30 +65,31 @@ context(
      cy.visit('/');
      cy.get_network_parameters().then((network_parameters) => {
        cy.wrap(
-          network_parameters['spam.protection.proposal.min.tokens'] /
+          Number(network_parameters['spam.protection.proposal.min.tokens']) /
            1000000000000000000
        ).as('minProposerBalance');
        cy.wrap(
-          network_parameters['spam.protection.voting.min.tokens'] /
+          Number(network_parameters['spam.protection.voting.min.tokens']) /
            1000000000000000000
        ).as('minVoterBalance');
        cy.wrap(
-          network_parameters['governance.proposal.freeform.requiredMajority'] *
-            100
+          Number(
+            network_parameters['governance.proposal.freeform.requiredMajority']
+          ) * 100
        ).as('requiredMajority');
      });

-      cy.vega_wallet_set_specified_approval_amount('1000');
-      associateTokenStartOfTests();
+      vegaWalletSetSpecifiedApprovalAmount('1000');
+      cy.associateTokensToVegaWallet('1');
    });

    beforeEach('visit governance tab', function () {
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.connectVegaWallet();
-      cy.ethereum_wallet_connect();
-      cy.ensure_specified_unstaked_tokens_are_associated(1);
-      cy.navigate_to_page_if_not_already_loaded('proposals');
+      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      navigateTo(navigation.proposals);
    });

    it('Should be able to see that no proposals exist', function () {
@@ -80,7 +106,7 @@ context(
    // 3002-PROP-003
    it('Submit a proposal form - shows how many vega tokens are required to make a proposal', function () {
      // 3002-PROP-005
-      cy.go_to_make_new_proposal(governanceProposalType.NEW_MARKET);
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
      cy.contains(
        `You must have at least 1 VEGA associated to make a proposal`
      ).should('be.visible');
@@ -88,7 +114,7 @@ context(

    // 3002-PROP-011
    it('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
      cy.get(minVoteButton).should('be.visible'); // 3002-PROP-008
      cy.get(maxVoteButton).should('be.visible');
      cy.get(votingDate).should('not.be.empty');
@@ -96,40 +122,31 @@ context(
        'contain.text',
        'we add 2 minutes of extra time'
      );
-      cy.enter_unique_freeform_proposal_body(
-        '50',
-        generateFreeFormProposalTitle()
-      );
+      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
      // 3002-PROP-012
      // 3002-PROP-016
-      cy.wait_for_proposal_submitted();
+      waitForProposalSubmitted();
    });

    it('Able to submit a valid freeform proposal - with minimum required tokens associated - but also staked', function () {
-      cy.ensure_specified_unstaked_tokens_are_associated('2');
-      cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', '2');
-      cy.navigate_to('validators');
-      cy.click_on_validator_from_list(0);
-      cy.staking_validator_page_add_stake('2');
-      cy.close_staking_dialog();
+      ensureSpecifiedUnstakedTokensAreAssociated('2');
+      verifyUnstakedBalance(2);
+      navigateTo(navigation.validators);
+      clickOnValidatorFromList(0);
+      stakingValidatorPageAddStake('2');
+      closeStakingDialog();

      cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');

-      cy.navigate_to('proposals');
-      cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
-      cy.enter_unique_freeform_proposal_body(
-        '50',
-        generateFreeFormProposalTitle()
-      );
-      cy.wait_for_proposal_submitted();
+      navigateTo(navigation.proposals);
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
+      waitForProposalSubmitted();
    });

    it('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
-      cy.enter_unique_freeform_proposal_body(
-        '0.1',
-        generateFreeFormProposalTitle()
-      );
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('0.1', generateFreeFormProposalTitle());
      cy.contains('Awaiting network confirmation', epochTimeout).should(
        'not.exist'
      );
@@ -139,8 +156,8 @@ context(
    });

    it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
-      cy.enter_unique_freeform_proposal_body(
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody(
        '100000',
        generateFreeFormProposalTitle()
      );
@@ -154,22 +171,18 @@ context(

    // 3001-VOTE-006
    it('Creating a proposal - proposal rejected - able to access rejected proposals', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.RAW);
-      cy.create_ten_digit_unix_timestamp_for_specified_days('1000').then(
-        (closingDateTimestamp) => {
-          cy.enter_raw_proposal_body(closingDateTimestamp).as('rawProposal');
-        }
-      );
+      goToMakeNewProposal(governanceProposalType.RAW);
+      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(1000));
      cy.contains('Awaiting network confirmation', epochTimeout).should(
        'be.visible'
      );
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
      cy.get(dialogCloseButton).click();
-      cy.wait_for_proposal_sync();
-      cy.navigate_to('proposals');
+      waitForProposalSync();
+      navigateTo(navigation.proposals);
      cy.get(rejectProposalsLink).click();
-      cy.get('@rawProposal').then((rawProposal) => {
-        cy.get_submitted_proposal_from_proposal_list(
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getSubmittedProposalFromProposalList(
          rawProposal.rationale.title
        ).within(() => {
          cy.contains('Rejected').should('be.visible');
@@ -177,78 +190,67 @@ context(
          cy.get(viewProposalButton).click();
        });
      });
-      cy.get_proposal_information_from_table('State')
+      getProposalInformationFromTable('State')
        .contains('Rejected')
        .and('be.visible');
-      cy.get_proposal_information_from_table('Rejection reason')
+      getProposalInformationFromTable('Rejection reason')
        .contains('PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE')
        .and('be.visible');
-      cy.get_proposal_information_from_table('Error details')
+      getProposalInformationFromTable('Error details')
        .contains('proposal closing time too late')
        .and('be.visible');
    });

    // 0005-ETXN-004
    it('Unable to create a proposal - when no tokens are associated', function () {
-      cy.vega_wallet_teardown();
+      const errorMsg =
+        'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)';
+      vegaWalletTeardown();
      cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
        '0.00',
        txTimeout
      );
-      cy.go_to_make_new_proposal(governanceProposalType.RAW);
-      cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-        (closingDateTimestamp) => {
-          cy.enter_raw_proposal_body(closingDateTimestamp).as;
-        }
-      );
+      goToMakeNewProposal(governanceProposalType.RAW);
+      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should(
-        'have.text',
-        'Network error: the network blocked the transaction through the spam protection'
-      );
+      cy.get(feedbackError).should('have.text', errorMsg);
      cy.get(dialogCloseButton).click();
    });

    // 3002-PROP-009
    it('Unable to create a proposal - when some but not enough tokens are associated', function () {
-      cy.ensure_specified_unstaked_tokens_are_associated(0.000001);
-      cy.go_to_make_new_proposal(governanceProposalType.RAW);
-      cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-        (closingDateTimestamp) => {
-          cy.enter_raw_proposal_body(closingDateTimestamp);
-        }
-      );
+      const errorMsg =
+        'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)';
+
+      ensureSpecifiedUnstakedTokensAreAssociated('0.000001');
+      goToMakeNewProposal(governanceProposalType.RAW);
+      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should(
-        'have.text',
-        'Network error: the network blocked the transaction through the spam protection'
-      );
+      cy.get(feedbackError).should('have.text', errorMsg);
      cy.get(dialogCloseButton).click();
    });

    it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
+      const errorMsg =
+        'Invalid params: the transaction does not use a valid Vega command: unknown field unexpected" in vega.commands.v1.ProposalSubmission';
+
      // 3001-VOTE-038 3002-PROP-013 3002-PROP-014
-      cy.go_to_make_new_proposal(governanceProposalType.RAW);
-      cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-        (closingDateTimestamp) => {
-          cy.fixture('/proposals/raw.json').then((freeformProposal) => {
-            freeformProposal.terms.closingTimestamp = closingDateTimestamp;
-            freeformProposal.unexpected = `i shouldn't be here`;
-            let proposalPayload = JSON.stringify(freeformProposal);
-            cy.get(rawProposalData).type(proposalPayload, {
-              parseSpecialCharSequences: false,
-              delay: 2,
-            });
-          });
-        }
-      );
+      goToMakeNewProposal(governanceProposalType.RAW);
+
+      cy.fixture('/proposals/raw.json').then((freeformProposal) => {
+        freeformProposal.terms.closingTimestamp =
+          createTenDigitUnixTimeStampForSpecifiedDays(8);
+        freeformProposal.unexpected = `i shouldn't be here`;
+        const proposalPayload = JSON.stringify(freeformProposal);
+        cy.get(rawProposalData).type(proposalPayload, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
      cy.get(newProposalSubmitButton).should('be.visible').click();

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should(
-        'have.text',
-        'Invalid params: the transaction is malformed'
-      );
+      cy.get(feedbackError).should('have.text', errorMsg);
      cy.get(dialogCloseButton).click();
      cy.get(rawProposalData)
        .invoke('val')
@@ -257,71 +259,64 @@ context(

    it('Unable to create a freeform proposal - when json terms section contains unexpected field', function () {
      // 3001-VOTE-038
-      cy.go_to_make_new_proposal(governanceProposalType.RAW);
-      cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-        (closingDateTimestamp) => {
-          cy.fixture('/proposals/raw.json').then((rawProposal) => {
-            rawProposal.terms.closingTimestamp = closingDateTimestamp;
-            rawProposal.terms.unexpectedField = `i shouldn't be here`;
-            let proposalPayload = JSON.stringify(rawProposal);
+      const errorMsg =
+        'Invalid params: the transaction does not use a valid Vega command: unknown field "unexpectedField" in vega.ProposalTerms';

-            cy.get(rawProposalData).type(proposalPayload, {
-              parseSpecialCharSequences: false,
-              delay: 2,
-            });
-          });
-        }
-      );
+      goToMakeNewProposal(governanceProposalType.RAW);
+
+      cy.fixture('/proposals/raw.json').then((rawProposal) => {
+        rawProposal.terms.closingTimestamp =
+          createTenDigitUnixTimeStampForSpecifiedDays(8);
+        rawProposal.terms.unexpectedField = `i shouldn't be here`;
+        const proposalPayload = JSON.stringify(rawProposal);
+
+        cy.get(rawProposalData).type(proposalPayload, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
      cy.get(newProposalSubmitButton).should('be.visible').click();

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should(
-        'have.text',
-        'Invalid params: the transaction is malformed'
-      );
+      cy.get(feedbackError).should('have.text', errorMsg);
      cy.get(dialogCloseButton).click();
    });

    // 1005-PROP-009
-    it.skip(
-      'Unable to vote on a freeform proposal - when some but not enough vega associated',
-      { tags: '@smoke' },
-      function () {
-        const proposalTitle = generateFreeFormProposalTitle();
+    it('Unable to vote on a freeform proposal - when some but not enough vega associated', function () {
+      const proposalTitle = generateFreeFormProposalTitle();

-        cy.ensure_specified_unstaked_tokens_are_associated(1);
-        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
-        cy.enter_unique_freeform_proposal_body('50', proposalTitle);
-        cy.wait_for_proposal_submitted();
-        cy.staking_page_disassociate_tokens('0.0001');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance).should('have.length', 1);
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '0.9999'
-          );
-        });
-        cy.navigate_to('proposals');
-        cy.get_submitted_proposal_from_proposal_list(proposalTitle).within(() =>
-          cy.get(viewProposalButton).click()
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', proposalTitle);
+      waitForProposalSubmitted();
+      stakingPageDisassociateTokens('0.0001');
+      cy.get(vegaWallet).within(() => {
+        cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+          'contain',
+          '0.9999'
        );
-        cy.contains('Vote breakdown').should('be.visible', {
-          timeout: 10000,
-        });
-        cy.get(voteButtons).should('not.exist');
-        cy.getByTestId('min-proposal-requirements').should(
-          'have.text',
-          `You must have at least ${this.minVoterBalance} VEGA associated to vote on this proposal`
-        );
-      }
-    );
+      });
+      navigateTo(navigation.proposals);
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
+        cy.get(viewProposalButton).click()
+      );
+      cy.contains('Vote breakdown').should('be.visible', {
+        timeout: 10000,
+      });
+      cy.get(voteButtons).should('not.exist');
+      cy.getByTestId('min-proposal-requirements').should(
+        'have.text',
+        `You must have at least ${this.minVoterBalance} VEGA associated to vote on this proposal`
+      );
+    });

    it('Unable to vote on a proposal - when vega wallet disconnected - option to connect from within', function () {
      createRawProposal();
      cy.get('[data-testid="manage-vega-wallet"]').click();
      cy.get('[data-testid="disconnect"]').click();
-      cy.get('@rawProposal').then((rawProposal) => {
-        cy.get_submitted_proposal_from_proposal_list(
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getSubmittedProposalFromProposalList(
          rawProposal.rationale.title
        ).within(() => cy.get(viewProposalButton).click());
      });
@@ -339,7 +334,7 @@ context(
        '1.00',
        txTimeout
      );
-      cy.vote_for_proposal('against');
+      voteForProposal('against');
      // 3001-VOTE-079
      cy.contains('You voted: Against').should('be.visible');
    });
@@ -1,3 +1,22 @@
+import {
+  navigateTo,
+  navigation,
+  waitForSpinner,
+} from '../../support/common.functions';
+import {
+  getProposalInformationFromTable,
+  goToMakeNewProposal,
+  voteForProposal,
+  waitForProposalSubmitted,
+} from '../../support/governance.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import {
+  vegaWalletSetSpecifiedApprovalAmount,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
+
 const proposalListItem = '[data-testid="proposals-list-item"]';
 const openProposals = '[data-testid="open-proposals"]';
 const proposalType = '[data-testid="proposal-type"]';
@@ -51,20 +70,20 @@ context(
    before('connect wallets and set approval limit', function () {
      cy.createMarket();
      cy.visit('/');
-      cy.vega_wallet_set_specified_approval_amount('1000');
+      vegaWalletSetSpecifiedApprovalAmount('1000');
    });

    beforeEach('visit governance tab', function () {
      cy.reload();
-      cy.wait_for_spinner();
+      waitForSpinner();
      cy.connectVegaWallet();
-      cy.ethereum_wallet_connect();
-      cy.ensure_specified_unstaked_tokens_are_associated('1');
-      cy.navigate_to('proposals');
+      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      navigateTo(navigation.proposals);
    });

    it('Able to submit valid update network parameter proposal', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.NETWORK_PARAMETER);
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
      // 3002-PROP-006
      cy.get(newProposalTitle).type('Test update network parameter proposal');
      // 3002-PROP-007
@@ -78,12 +97,12 @@ context(
      cy.get(currentParameterValue).should('have.value', '2s');
      cy.get(newProposedParameterValue).type('5s'); // 3007-PNEC-003
      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.wait_for_proposal_submitted();
+      waitForProposalSubmitted();
    });

    it('Unable to submit network parameter with missing/invalid fields', function () {
-      cy.navigate_to_page_if_not_already_loaded('proposals');
-      cy.go_to_make_new_proposal(governanceProposalType.NETWORK_PARAMETER);
+      navigateTo(navigation.proposals);
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.get(inputError).should('have.length', 3);
      cy.get(newProposalTitle).type(
@@ -108,7 +127,7 @@ context(

    it('Able to download network param proposal json', function () {
      const downloadFolder = './cypress/downloads/';
-      cy.go_to_make_new_proposal(governanceProposalType.NETWORK_PARAMETER);
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
      cy.log('Download proposal file');
      cy.get(proposalDownloadBtn)
        .should('be.visible')
@@ -156,8 +175,8 @@ context(
    });

    it('Unable to submit network parameter proposal with vote deadline above enactment deadline', function () {
-      cy.navigate_to_page_if_not_already_loaded('proposals');
-      cy.go_to_make_new_proposal(governanceProposalType.NETWORK_PARAMETER);
+      navigateTo(navigation.proposals);
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
      cy.get(newProposalTitle).type('Test update network parameter proposal');
      cy.get(newProposalDescription).type('invalid deadlines');
      cy.get(proposalParameterSelect).select(
@@ -182,29 +201,32 @@ context(

    // 3003-PMAN-001
    it('Able to submit valid new market proposal', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.NEW_MARKET);
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
      cy.get(newProposalTitle).type('Test new market proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
-        let newMarketPayload = JSON.stringify(newMarketProposal);
+        const newMarketPayload = JSON.stringify(newMarketProposal);
        cy.get(newProposalTerms).type(newMarketPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.wait_for_proposal_submitted();
+      waitForProposalSubmitted();
    });

    it('Unable to submit new market proposal with missing/invalid fields', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.NEW_MARKET);
+      const errorMsg =
+        'Invalid params: the transaction is not a valid Vega command: unknown field "filters" in vega.DataSourceDefinition';
+
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.get(inputError).should('have.length', 3);
      cy.get(newProposalTitle).type('Test new market proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
        newMarketProposal.invalid = 'I am an invalid field';
-        let newMarketPayload = JSON.stringify(newMarketProposal);
+        const newMarketPayload = JSON.stringify(newMarketProposal);
        cy.get(newProposalTerms).type(newMarketPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
@@ -212,21 +234,18 @@ context(
      });
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should(
-        'have.text',
-        'Invalid params: the transaction is not a valid Vega command: unknown field "invalid" in vega.NewMarket'
-      );
+      cy.get(feedbackError).should('have.text', errorMsg);
    });

    // Will fail if run after 'Able to submit update market proposal and vote for proposal'
    // 3002-PROP-022
    it('Unable to submit update market proposal without equity-like share in the market', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
+      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
      cy.get(newProposalTitle).type('Test update market proposal - rejected');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.get(proposalMarketSelect).select('Test market 1');
      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
-        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
+        const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
          parseSpecialCharSequences: false,
          delay: 2,
@@ -237,23 +256,23 @@ context(
      cy.getByTestId('dialog-content')
        .find('p')
        .should('have.text', 'PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
-      cy.ensure_specified_unstaked_tokens_are_associated('1');
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
    });

    // 3002-PROP-020
    it('Unable to submit update market proposal without minimum amount of tokens', function () {
-      cy.vega_wallet_teardown();
-      cy.vega_wallet_faucet_assets_without_check(
+      vegaWalletTeardown();
+      vegaWalletFaucetAssetsWithoutCheck(
        'fUSDC',
        '1000000',
        vegaWalletPublicKey
      );
-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
+      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
      cy.get(newProposalTitle).type('Test update market proposal - rejected');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.get(proposalMarketSelect).select('Test market 1');
      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
-        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
+        const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
          parseSpecialCharSequences: false,
          delay: 2,
@@ -269,12 +288,12 @@ context(

    // 3001-VOTE-092
    it('Able to submit update market proposal and vote for proposal', function () {
-      cy.vega_wallet_faucet_assets_without_check(
+      vegaWalletFaucetAssetsWithoutCheck(
        'fUSDC',
        '1000000',
        vegaWalletPublicKey
      );
-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
+      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
      cy.get(newProposalTitle).type('Test update market proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.get(proposalMarketSelect).select('Test market 1');
@@ -285,20 +304,20 @@ context(
        cy.get('dd').eq(2).invoke('text').as('EnactedMarketId');
      });
      cy.get('@EnactedMarketId').then((marketId) => {
-        cy.VegaWalletSubmitLiquidityProvision(marketId, '1');
+        cy.VegaWalletSubmitLiquidityProvision(String(marketId), '1');
      });
      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
-        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
+        const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.wait_for_proposal_submitted();
-      cy.navigate_to('proposals');
+      waitForProposalSubmitted();
+      navigateTo(navigation.proposals);
      cy.get('@EnactedMarketId').then((marketId) => {
-        cy.contains(marketId)
+        cy.contains(String(marketId))
          .parentsUntil(proposalListItem)
          .within(() => {
            cy.getByTestId(viewProposalBtn).click();
@@ -312,7 +331,7 @@ context(
        'contain.text',
        'Currently expected to fail'
      );
-      cy.vote_for_proposal('for');
+      voteForProposal('for');
      cy.getByTestId(liquidityVoteStatus).should(
        'contain.text',
        'Currently expected to pass'
@@ -321,18 +340,18 @@ context(
        'contain.text',
        'Currently expected to pass'
      );
-      cy.get_proposal_information_from_table('Expected to pass')
-        .contains('👍 by Token vote')
+      getProposalInformationFromTable('Expected to pass')
+        .contains('👍 by token vote')
        .should('be.visible');
    });

    // 3001-VOTE-026 3001-VOTE-027  3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
    it('Able to submit new asset proposal using min deadlines', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.NEW_ASSET);
+      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
      cy.get(newProposalTitle).type('Test new asset proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/new-asset').then((newAssetProposal) => {
-        let newAssetPayload = JSON.stringify(newAssetProposal);
+        const newAssetPayload = JSON.stringify(newAssetProposal);
        cy.get(newProposalTerms).type(newAssetPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
@@ -361,7 +380,7 @@ context(
    });

    it('Unable to submit new asset proposal with missing/invalid fields', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.NEW_ASSET);
+      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.get(inputError).should('have.length', 3);
      cy.get(newProposalTitle).type('Invalid new asset proposal');
@@ -377,13 +396,13 @@ context(
      const assetId =
        'ebcd94151ae1f0d39a4bde3b21a9c7ae81a80ea4352fb075a92e07608d9c953d';

-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_ASSET);
+      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      enterUpdateAssetProposalDetails();
      cy.get(minVoteDeadline).click();
      cy.get(minEnactDeadline).click();
      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.wait_for_proposal_submitted();
-      cy.navigate_to('proposals');
+      waitForProposalSubmitted();
+      navigateTo(navigation.proposals);
      cy.get(openProposals).within(() => {
        cy.get(proposalType)
          .contains('Update asset')
@@ -393,22 +412,22 @@ context(
            cy.getByTestId(viewProposalBtn).click();
          });
      });
-      cy.get_proposal_information_from_table('Proposed enactment') // 3001-VOTE-044
+      getProposalInformationFromTable('Proposed enactment') // 3001-VOTE-044
        .invoke('text')
        .should('not.be.empty');
    });

    it('Able to submit update asset proposal using max deadline', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_ASSET);
+      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      enterUpdateAssetProposalDetails();
      cy.get(maxVoteDeadline).click();
      cy.get(maxEnactDeadline).click();
      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.wait_for_proposal_submitted();
+      waitForProposalSubmitted();
    });

    it('Unable to submit edit asset proposal with missing/invalid fields', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_ASSET);
+      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.get(inputError).should('have.length', 3);
    });
@@ -428,7 +447,7 @@ context(
      cy.get(newProposalTitle).type('Test update asset proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/update-asset').then((newAssetProposal) => {
-        let newAssetPayload = JSON.stringify(newAssetProposal);
+        const newAssetPayload = JSON.stringify(newAssetProposal);
        cy.get(newProposalTerms).type(newAssetPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
@@ -1,9 +1,28 @@
+import type { testFreeformProposal } from '../../support/common-interfaces';
+import {
+  navigateTo,
+  navigation,
+  waitForSpinner,
+} from '../../support/common.functions';
 import {
  createFreeformProposal,
  createRawProposal,
+  createTenDigitUnixTimeStampForSpecifiedDays,
+  enterRawProposalBody,
  generateFreeFormProposalTitle,
+  getProposalIdFromList,
+  getProposalInformationFromTable,
+  getSortOrderOfSuppliedArray,
+  getSubmittedProposalFromProposalList,
+  goToMakeNewProposal,
  governanceProposalType,
+  voteForProposal,
+  waitForProposalSubmitted,
+  waitForProposalSync,
 } from '../../support/governance.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

 const proposalDetailsTitle = '[data-testid="proposal-title"]';
 const openProposals = '[data-testid="open-proposals"]';
@@ -12,17 +31,17 @@ const viewProposalButton = '[data-testid="view-proposal-btn"]';

 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  before('connect wallets and set approval limit', function () {
-    cy.vega_wallet_set_specified_approval_amount('1000');
+    vegaWalletSetSpecifiedApprovalAmount('1000');
    cy.visit('/');
  });

  beforeEach('visit proposals tab', function () {
    cy.reload();
-    cy.wait_for_spinner();
+    waitForSpinner();
    cy.connectVegaWallet();
-    cy.ethereum_wallet_connect();
-    cy.ensure_specified_unstaked_tokens_are_associated(1);
-    cy.navigate_to_page_if_not_already_loaded('proposals');
+    ethereumWalletConnect();
+    ensureSpecifiedUnstakedTokensAreAssociated('1');
+    navigateTo(navigation.proposals);
  });

  it('Newly created proposals list - proposals closest to closing date appear higher in list', function () {
@@ -30,32 +49,30 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    const maxCloseDays = 3;

    // 3001-VOTE-005
-    let proposalDays = [
+    const proposalDays = [
      minCloseDays + 1,
      maxCloseDays,
      minCloseDays + 3,
      minCloseDays + 2,
    ];
-    for (var index = 0; index < proposalDays.length; index++) {
-      cy.go_to_make_new_proposal(governanceProposalType.RAW);
-      cy.create_ten_digit_unix_timestamp_for_specified_days(
-        proposalDays[index]
-      ).then((closingDateTimestamp) => {
-        cy.enter_raw_proposal_body(closingDateTimestamp);
-      });
-      cy.wait_for_proposal_submitted();
-      cy.wait_for_proposal_sync();
+    for (let index = 0; index < proposalDays.length; index++) {
+      goToMakeNewProposal(governanceProposalType.RAW);
+      enterRawProposalBody(
+        createTenDigitUnixTimeStampForSpecifiedDays(proposalDays[index])
+      );
+      waitForProposalSubmitted();
+      waitForProposalSync();
    }

-    let arrayOfProposals = [];
+    const arrayOfProposals: string[] = [];

-    cy.navigate_to('proposals');
+    navigateTo(navigation.proposals);
    cy.get(proposalDetailsTitle)
      .each((proposalTitleElement) => {
        arrayOfProposals.push(proposalTitleElement.text());
      })
      .then(() => {
-        cy.get_sort_order_of_supplied_array(arrayOfProposals).should(
+        cy.wrap(getSortOrderOfSuppliedArray(arrayOfProposals)).should(
          'equal',
          'descending'
        );
@@ -67,7 +84,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    const proposalTitle = generateFreeFormProposalTitle();

    createFreeformProposal(proposalTitle);
-    cy.get_proposal_id_from_list(proposalTitle);
+    getProposalIdFromList(proposalTitle);
    cy.get('@proposalIdText').then((proposalId) => {
      cy.get('[data-testid="set-proposals-filter-visible"]').click();
      cy.get('[data-testid="filter-input"]').type(proposerId);
@@ -77,8 +94,8 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {

  it('Newly created proposals list - shows title and portion of summary', function () {
    createRawProposal(this.minProposerBalance); // 3001-VOTE-052
-    cy.get('@rawProposal').then((rawProposal) => {
-      cy.get_proposal_id_from_list(rawProposal.rationale.title);
+    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+      getProposalIdFromList(rawProposal.rationale.title);
      cy.get('@proposalIdText').then((proposalId) => {
        cy.get(openProposals).within(() => {
          // 3001-VOTE-008
@@ -102,21 +119,22 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    // 3001-VOTE-004
    // 3001-VOTE-035
    createRawProposal(this.minProposerBalance);
-    cy.get('@rawProposal').then((rawProposal) => {
-      cy.get_submitted_proposal_from_proposal_list(
-        rawProposal.rationale.title
-      ).within(() => {
-        cy.get(viewProposalButton).should('be.visible').click();
-      });
+    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+      getSubmittedProposalFromProposalList(rawProposal.rationale.title).within(
+        () => {
+          cy.get(viewProposalButton).should('be.visible').click();
+        }
+      );
+
      cy.get('@proposalIdText').then((proposalId) => {
-        cy.get_proposal_information_from_table('ID')
-          .contains(proposalId)
+        getProposalInformationFromTable('ID')
+          .contains(String(proposalId))
          .and('be.visible');
      });
-      cy.get_proposal_information_from_table('State')
+      getProposalInformationFromTable('State')
        .contains('Open')
        .and('be.visible');
-      cy.get_proposal_information_from_table('Type')
+      getProposalInformationFromTable('Type')
        .contains('Freeform')
        .and('be.visible');
    });
@@ -125,38 +143,21 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  // 3001-VOTE-071
  it('Newly created freeform proposals list - shows proposal participation - both met and not', function () {
    const proposalTitle = generateFreeFormProposalTitle();
-    const requiredParticipation = 0.001;

    createFreeformProposal(proposalTitle);
-
-    cy.get_submitted_proposal_from_proposal_list(proposalTitle)
-      .as('submittedProposal')
-      .within(() => {
-        // 3001-VOTE-039
-        cy.get(voteStatus).should('have.text', 'Participation not reached');
-        cy.get(viewProposalButton).click();
-      });
-    cy.vote_for_proposal('for');
-    cy.get_proposal_information_from_table('Total Supply')
-      .invoke('text')
-      .then((totalSupply) => {
-        let tokensRequiredToAchieveResult = parseFloat(
-          (totalSupply.replace(/,/g, '') * requiredParticipation) / 100
-        ).toFixed(2);
-        cy.ensure_specified_unstaked_tokens_are_associated(
-          tokensRequiredToAchieveResult
-        );
-        cy.navigate_to_page_if_not_already_loaded('proposals');
-        cy.get('@submittedProposal').within(() =>
-          cy.get(viewProposalButton).click()
-        );
-        cy.get_proposal_information_from_table('Token participation met')
-          .contains('👍')
-          .should('be.visible');
-        cy.navigate_to('proposals');
-        cy.get('@submittedProposal').within(() =>
-          cy.get(voteStatus).should('have.text', 'Set to pass')
-        );
-      });
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
+      // 3001-VOTE-039
+      cy.get(voteStatus).should('have.text', 'Participation not reached');
+      cy.get(viewProposalButton).click();
+    });
+    voteForProposal('for');
+    navigateTo(navigation.proposals);
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
+      cy.get(voteStatus).should('have.text', 'Set to pass');
+      cy.get(viewProposalButton).click();
+    });
+    getProposalInformationFromTable('Token participation met')
+      .contains('👍')
+      .should('be.visible');
  });
 });
@@ -1,3 +1,21 @@
+import {
+  navigateTo,
+  navigation,
+  waitForSpinner,
+} from '../../support/common.functions';
+import {
+  clickOnValidatorFromList,
+  closeStakingDialog,
+  stakingPageAssociateTokens,
+  stakingValidatorPageAddStake,
+  waitForBeginningOfEpoch,
+} from '../../support/staking.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import {
+  depositAsset,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';
+
 const vegaAssetAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de';
 const vegaWalletUnstakedBalance =
  '[data-testid="vega-wallet-balance-unstaked"]';
@@ -8,29 +26,29 @@ const rewardsTimeOut = { timeout: 60000 };
 context('rewards - flow', { tags: '@slow' }, function () {
  before('set up environment to allow rewards', function () {
    cy.visit('/');
-    cy.wait_for_spinner();
-    cy.deposit_asset(vegaAssetAddress, '1000');
+    waitForSpinner();
+    depositAsset(vegaAssetAddress, '1000');
    cy.validatorsSelfDelegate();
-    cy.ethereum_wallet_connect();
+    ethereumWalletConnect();
    cy.connectVegaWallet();
-    topUpRewardsPool();
-    cy.navigate_to('validators');
-    cy.vega_wallet_teardown();
-    cy.staking_page_associate_tokens('6000');
+    cy.VegaWalletTopUpRewardsPool(30, 200);
+    navigateTo(navigation.validators);
+    vegaWalletTeardown();
+    stakingPageAssociateTokens('6000');
    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
      'contain',
      '6,000.0',
      txTimeout
    );
    cy.get('button').contains('Select a validator to nominate').click();
-    cy.click_on_validator_from_list(0);
-    cy.staking_validator_page_add_stake('3000');
-    cy.close_staking_dialog();
-    cy.navigate_to('validators');
-    cy.click_on_validator_from_list(1);
-    cy.staking_validator_page_add_stake('3000');
-    cy.close_staking_dialog();
-    cy.navigate_to('rewards');
+    clickOnValidatorFromList(0);
+    stakingValidatorPageAddStake('3000');
+    closeStakingDialog();
+    navigateTo(navigation.validators);
+    clickOnValidatorFromList(1);
+    stakingValidatorPageAddStake('3000');
+    closeStakingDialog();
+    navigateTo(navigation.rewards);
  });

  it('Should display rewards per epoch', function () {
@@ -54,7 +72,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
      .within(() => {
        cy.get('h2').first().invoke('text').as('epochNumber');
      });
-    cy.wait_for_beginning_of_epoch();
+    waitForBeginningOfEpoch();
    cy.get('@epochNumber').then((epochNumber) => {
      cy.getByTestId(rewardsTable)
        .first()
@@ -76,28 +94,12 @@ context('rewards - flow', { tags: '@slow' }, function () {
        cy.get('h2').first().should('contain.text', 'EPOCH');
        cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD')
-          .should('contain.text', '0.4415')
-          .and('contain.text', '(44.15%)');
+          .should('contain.text', '0.1177')
+          .and('contain.text', '(11.7733%)');
        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
-          .should('contain.text', '0.0004')
-          .and('contain.text', '(44.15%)');
-        cy.getByTestId('total').should('have.text', '0.4419');
+          .should('contain.text', '0.0001')
+          .and('contain.text', '(11.7733%)');
+        cy.getByTestId('total').should('have.text', '0.1179');
      });
  });
-
-  function topUpRewardsPool() {
-    // Must ensure that test wallet contains assets already and that the tests are within the start and end epochs
-    cy.exec(
-      `vega wallet transaction send --wallet ${Cypress.env(
-        'vegaWalletName'
-      )} --pubkey ${Cypress.env(
-        'vegaWalletPublicKey'
-      )} -p "./src/fixtures/wallet/passphrase" --network DV '{"transfer":{"fromAccountType":4,"toAccountType":12,"to":"0000000000000000000000000000000000000000000000000000000000000000","asset":"b4f2726571fbe8e33b442dc92ed2d7f0d810e21835b7371a7915a365f07ccd9b","amount":"1000000000000000000","recurring":{"startEpoch":30, "endEpoch": 200, "factor":"1"}}}' --home ${Cypress.env(
-        'vegaWalletLocation'
-      )}`,
-      { failOnNonZeroExit: false }
-    )
-      .its('stderr')
-      .should('contain', '');
-  }
 });
@@ -1,876 +0,0 @@
-/// <reference types="cypress" />
-const stakeValidatorListTotalStake = '[col-id="stake"] > div > span';
-const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
-const stakeValidatorListValidatorStake = '[col-id="stake"] > div > span';
-const stakeRemoveStakeRadioButton = '[data-testid="remove-stake-radio"]';
-const stakeTokenAmountInputBox = '[data-testid="token-amount-input"]';
-const stakeTokenSubmitButton = '[data-testid="token-input-submit-button"]';
-const stakeNextEpochValue = '[data-testid="stake-next-epoch"]';
-const stakeThisEpochValue = '[data-testid="stake-this-epoch"]';
-const stakeAddStakeRadioButton = '[data-testid="add-stake-radio"]';
-const stakeMaximumTokens = '[data-testid="token-amount-use-maximum"]';
-const totalStake = '[data-testid="total-stake"]';
-const stakeShare = '[data-testid="stake-percentage"]';
-const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
-const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
-const vegaWalletUnstakedBalance =
-  '[data-testid="vega-wallet-balance-unstaked"]:visible';
-const vegaWalletStakedBalances =
-  '[data-testid="vega-wallet-balance-staked-validators"]';
-const ethWalletAssociatedBalances =
-  '[data-testid="eth-wallet-associated-balances"]';
-const ethWalletTotalAssociatedBalance =
-  '[data-testid="currency-locked"]:visible';
-const ethWalletContainer = '[data-testid="ethereum-wallet"]:visible';
-const vegaWallet = '[data-testid="vega-wallet"]';
-const partValidatorId = '…';
-const txTimeout = Cypress.env('txTimeout');
-const epochTimeout = Cypress.env('epochTimeout');
-
-context(
-  'Staking Tab - with eth and vega wallets connected',
-  { tags: '@slow' },
-  function () {
-    // 2001-STKE-002, 2001-STKE-032
-    before('visit staking tab and connect vega wallet', function () {
-      cy.visit('/');
-      cy.vega_wallet_set_specified_approval_amount('1000');
-    });
-
-    describe('Eth wallet - contains VEGA tokens', function () {
-      beforeEach(
-        'teardown wallet & drill into a specific validator',
-        function () {
-          cy.reload();
-          cy.wait_for_spinner();
-          cy.connectVegaWallet();
-          cy.ethereum_wallet_connect();
-          cy.vega_wallet_teardown();
-          cy.navigate_to('validators');
-        }
-      );
-
-      it('Able to stake against a validator - using vega from wallet', function () {
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('3.0', txTimeout)
-          .should('be.visible');
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort, txTimeout)
-          .parent()
-          .should('contain', 3.0, txTimeout);
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        // 2001-STKE-031
-        cy.click_on_validator_from_list(0);
-
-        // 2001-STKE-033, 2001-STKE-034, 2001-STKE-037
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-        // 2001-STKE-039
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .should('contain', 2.0, txTimeout)
-          .and('contain', partValidatorId);
-
-        cy.get(stakeNextEpochValue, epochTimeout) // 2001-STKE-016 2001-STKE-038
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(stakeThisEpochValue, epochTimeout) // 2001-STKE-013
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        // 2002-SINC-007
-        cy.validate_validator_list_total_stake_and_share(
-          '0',
-          '2.00',
-          '100.00%'
-        );
-      });
-
-      it('Able to stake against a validator - using vega from vesting contract', function () {
-        cy.staking_page_associate_tokens('3', { type: 'contract' });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('3.0', txTimeout)
-          .should('be.visible');
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort, txTimeout)
-          .parent()
-          .should('contain', 3.0, txTimeout);
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .should('contain', 2.0, txTimeout)
-          .and('contain', partValidatorId);
-
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(stakeThisEpochValue, epochTimeout)
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        cy.validate_validator_list_total_stake_and_share(
-          '0',
-          '2.00',
-          '100.00%'
-        );
-      });
-
-      it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
-        cy.staking_page_associate_tokens('3', { type: 'contract' });
-        cy.navigate_to('validators');
-        cy.staking_page_associate_tokens('4', { type: 'wallet' });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          7.0,
-          txTimeout
-        );
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('3.0', txTimeout)
-          .should('be.visible');
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('4.0', txTimeout)
-          .should('be.visible');
-
-        cy.get(ethWalletAssociatedBalances, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get(ethWalletAssociatedBalances, txTimeout).should(
-          'contain',
-          4.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('6');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .should('contain', 6.0, txTimeout)
-          .and('contain', partValidatorId);
-
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(6.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(stakeThisEpochValue, epochTimeout)
-          .contains(6.0, epochTimeout)
-          .should('be.visible');
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        cy.validate_validator_list_total_stake_and_share(
-          '0',
-          '6.00',
-          '100.00%'
-        );
-      });
-
-      it('Able to stake against multiple validators', function () {
-        cy.staking_page_associate_tokens('5');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          5.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .parent()
-          .should('contain', 2.0, txTimeout);
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        cy.click_on_validator_from_list(1);
-
-        cy.staking_validator_page_add_stake('1');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          2.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .should('have.length', 2, txTimeout)
-          .eq(0)
-          .should('contain', 2.0, txTimeout);
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .eq(1)
-          .should('contain', 1.0, txTimeout);
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        cy.get(`[row-id="${0}"]`).within(() => {
-          cy.get(stakeValidatorListTotalStake)
-            .should('have.text', '2.00')
-            .and('be.visible');
-          cy.get(stakeValidatorListTotalShare)
-            .should('have.text', '66.67%')
-            .and('be.visible');
-          cy.get(stakeValidatorListValidatorStake)
-            .scrollIntoView()
-            .should('have.text', '2.00')
-            .and('be.visible');
-        });
-
-        cy.get(`[row-id="${1}"]`).within(() => {
-          cy.get(stakeValidatorListTotalStake)
-            .scrollIntoView()
-            .should('have.text', '1.00')
-            .and('be.visible');
-          cy.get(stakeValidatorListTotalShare)
-            .should('have.text', '33.33%')
-            .and('be.visible');
-          cy.get(stakeValidatorListValidatorStake)
-            .scrollIntoView()
-            .should('have.text', '1.00')
-            .and('be.visible');
-        });
-      });
-
-      // 2001-STKE-041
-      it(
-        'Able to remove part of a stake against a validator',
-        { tags: '@smoke' },
-        function () {
-          cy.staking_page_associate_tokens('4');
-
-          cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-            'contain',
-            4.0,
-            txTimeout
-          );
-
-          cy.get('button').contains('Select a validator to nominate').click();
-
-          cy.click_on_validator_from_list(0);
-
-          cy.staking_validator_page_add_stake('3');
-
-          cy.get(stakeNextEpochValue, epochTimeout)
-            .contains(3.0, epochTimeout)
-            .should('be.visible');
-
-          cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-            'contain',
-            1.0,
-            txTimeout
-          );
-
-          cy.close_staking_dialog();
-          cy.navigate_to('validators');
-          // 2001-STKE-040
-          cy.click_on_validator_from_list(0);
-
-          // 2001-STKE-044, 2001-STKE-048
-          cy.staking_validator_page_remove_stake('1');
-
-          // 2001-STKE-049
-          cy.get(stakeNextEpochValue, epochTimeout).contains(2.0, epochTimeout);
-
-          cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-            'contain',
-            2.0,
-            txTimeout
-          );
-
-          cy.get(vegaWalletStakedBalances, txTimeout).should(
-            'contain',
-            2.0,
-            txTimeout
-          );
-
-          cy.get(stakeNextEpochValue, epochTimeout)
-            .contains(2.0, epochTimeout)
-            .should('be.visible');
-
-          cy.get(stakeThisEpochValue, epochTimeout)
-            .contains(2.0, epochTimeout)
-            .should('be.visible');
-
-          cy.get(totalStake, epochTimeout).should('contain.text', '2');
-          cy.get(stakeShare, epochTimeout).should('have.text', '100%');
-
-          cy.navigate_to('validators');
-
-          cy.validate_validator_list_total_stake_and_share(
-            '0',
-            '2.00',
-            '100.00%'
-          );
-        }
-      );
-
-      // 2001-STKE-045
-      it('Able to remove a full stake against a validator', function () {
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('1');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          2.0,
-          txTimeout
-        );
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        cy.click_on_validator_from_list('0');
-
-        cy.staking_validator_page_remove_stake('1');
-
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(0.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(0.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(stakeThisEpochValue, epochTimeout)
-          .contains(0.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'not.exist',
-          txTimeout
-        );
-
-        cy.navigate_to('validators');
-
-        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0.00%');
-      });
-
-      it('Unable to remove a stake with a negative value for a validator', function () {
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        cy.click_on_validator_from_list(0);
-
-        cy.get(stakeRemoveStakeRadioButton, txTimeout).click();
-
-        cy.get(stakeTokenAmountInputBox).type('-0.1');
-
-        cy.contains('Waiting for next epoch to start', epochTimeout);
-
-        cy.get(stakeTokenSubmitButton)
-          .should('be.disabled', epochTimeout)
-          .and('contain', `Remove -0.1 $VEGA tokens at the end of epoch`)
-          .and('be.visible');
-      });
-
-      it('Unable to remove a stake greater than staked amount next epoch for a validator', function () {
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-
-        cy.close_staking_dialog();
-        cy.navigate_to('validators');
-
-        cy.click_on_validator_from_list(0);
-
-        cy.get(stakeRemoveStakeRadioButton).click();
-
-        cy.get(stakeTokenAmountInputBox).type(4);
-
-        cy.contains('Waiting for next epoch to start', epochTimeout);
-
-        cy.get(stakeTokenSubmitButton)
-          .should('be.disabled', epochTimeout)
-          .and('contain', `Remove 4 $VEGA tokens at the end of epoch`)
-          .and('be.visible');
-      });
-
-      it('Disassociating all wallet tokens max - removes all staked tokens', function () {
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list('1');
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          2.0,
-          txTimeout
-        );
-
-        cy.close_staking_dialog();
-        cy.staking_page_disassociate_all_tokens('wallet');
-
-        cy.get(ethWalletContainer).within(() => {
-          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
-        });
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('0.0', txTimeout)
-          .should('be.visible');
-
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '0.00'
-          );
-        });
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'not.exist',
-          txTimeout
-        );
-
-        cy.navigate_to('validators');
-
-        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0.00%');
-      });
-
-      it('Disassociating all vesting contract tokens max - removes all staked tokens', function () {
-        cy.staking_page_associate_tokens('3', { type: 'contract' });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.click_on_validator_from_list('1');
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          2.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-        cy.staking_page_disassociate_all_tokens('contract');
-
-        cy.get(ethWalletContainer).within(() => {
-          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
-        });
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('0.0', txTimeout)
-          .should('be.visible');
-
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '0.00'
-          );
-        });
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'not.exist',
-          txTimeout
-        );
-
-        cy.navigate_to('validators');
-
-        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0.00%');
-      });
-
-      it('Disassociating some tokens - prioritizes unstaked tokens', function () {
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('2');
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          2.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-        cy.staking_page_disassociate_tokens('1');
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('2.0', txTimeout)
-          .should('be.visible');
-
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '2.00'
-          );
-        });
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .should('contain', 2.0, txTimeout)
-          .and('contain', partValidatorId);
-
-        cy.navigate_to('validators');
-
-        cy.validate_validator_list_total_stake_and_share(
-          '0',
-          '2.00',
-          '100.00%'
-        );
-      });
-
-      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 2001-STKE-004
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('3');
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-        cy.staking_page_associate_tokens('4');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          0.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          7.0,
-          txTimeout
-        );
-      });
-
-      it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 2001-STKE-004
-        cy.staking_page_associate_tokens('3', { type: 'contract' });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('3');
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-        cy.staking_page_associate_tokens('4', { type: 'contract' });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          0.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          7.0,
-          txTimeout
-        );
-      });
-
-      it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
-        // 2001-STKE-004
-        cy.staking_page_associate_tokens('3', { type: 'wallet' });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('3');
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-        cy.staking_page_associate_tokens('4', { type: 'contract' });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          0.0,
-          txTimeout
-        );
-
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          7.0,
-          txTimeout
-        );
-      });
-
-      it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
-        // 2001-STKE-004
-        cy.staking_page_associate_tokens('6');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          6.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          0.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-
-        cy.click_on_validator_from_list(1);
-
-        cy.staking_validator_page_add_stake('4');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          0.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-        cy.staking_page_associate_tokens('6');
-
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '12.00'
-          );
-        });
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .should('contain', '4.0', txTimeout)
-          .and('contain', partValidatorId);
-
-        cy.get(vegaWalletStakedBalances, txTimeout)
-          .should('contain', '8.0')
-          .and('contain', partValidatorId);
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          0.0,
-          txTimeout
-        );
-      });
-
-      it('Selecting use maximum where tokens are already staked - suggests the unstaked token amount', function () {
-        cy.staking_page_associate_tokens('3');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          3.0,
-          txTimeout
-        );
-
-        cy.get('button').contains('Select a validator to nominate').click();
-        cy.click_on_validator_from_list(0);
-
-        cy.staking_validator_page_add_stake('2');
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
-        cy.close_staking_dialog();
-
-        cy.click_on_validator_from_list(0);
-
-        cy.get(stakeAddStakeRadioButton).click();
-
-        cy.get(stakeMaximumTokens, { timeout: 60000 }).click();
-
-        cy.get(stakeTokenSubmitButton).should('contain', 'Add 1 $VEGA tokens');
-      });
-
-      after('teardown wallet', function () {
-        cy.vega_wallet_teardown();
-      });
-    });
-  }
-);
@@ -0,0 +1,454 @@
+/// <reference types="cypress" />
+import {
+  verifyUnstakedBalance,
+  verifyStakedBalance,
+  verifyEthWalletTotalAssociatedBalance,
+  verifyEthWalletAssociatedBalance,
+  waitForSpinner,
+  navigateTo,
+  navigation,
+} from '../../support/common.functions';
+import {
+  clickOnValidatorFromList,
+  closeStakingDialog,
+  ensureSpecifiedUnstakedTokensAreAssociated,
+  stakingPageAssociateTokens,
+  stakingPageDisassociateAllTokens,
+  stakingPageDisassociateTokens,
+  stakingValidatorPageAddStake,
+  stakingValidatorPageRemoveStake,
+  validateValidatorListTotalStakeAndShare,
+  waitForBeginningOfEpoch,
+} from '../../support/staking.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import {
+  vegaWalletSetSpecifiedApprovalAmount,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';
+const stakeValidatorListTotalStake = '[col-id="stake"] > div > span';
+const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
+const stakeValidatorListValidatorStake = '[col-id="stake"] > div > span';
+const stakeRemoveStakeRadioButton = '[data-testid="remove-stake-radio"]';
+const stakeTokenAmountInputBox = '[data-testid="token-amount-input"]';
+const stakeTokenSubmitButton = '[data-testid="token-input-submit-button"]';
+const stakeAddStakeRadioButton = '[data-testid="add-stake-radio"]';
+const stakeMaximumTokens = '[data-testid="token-amount-use-maximum"]';
+const totalStake = '[data-testid="total-stake"]';
+const stakeShare = '[data-testid="stake-percentage"]';
+const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
+const vegaWalletStakedBalances =
+  '[data-testid="vega-wallet-balance-staked-validators"]';
+const ethWalletContainer = '[data-testid="ethereum-wallet"]';
+const vegaWallet = '[data-testid="vega-wallet"]';
+const txTimeout = Cypress.env('txTimeout');
+const epochTimeout = Cypress.env('epochTimeout');
+
+context(
+  'Staking Tab - with eth and vega wallets connected',
+  { tags: '@slow' },
+  function () {
+    // 2001-STKE-002, 2001-STKE-032
+    before('visit staking tab and connect vega wallet', function () {
+      cy.visit('/');
+      ethereumWalletConnect();
+      // this is a workaround for #2422 which can be removed once issue is resolved
+      cy.associateTokensToVegaWallet('4');
+      vegaWalletSetSpecifiedApprovalAmount('1000');
+    });
+
+    describe('Eth wallet - contains VEGA tokens', function () {
+      beforeEach(
+        'teardown wallet & drill into a specific validator',
+        function () {
+          cy.reload();
+          waitForSpinner();
+          cy.connectVegaWallet();
+          ethereumWalletConnect();
+          navigateTo(navigation.validators);
+        }
+      );
+
+      it('Able to stake against a validator - using vega from wallet', function () {
+        ensureSpecifiedUnstakedTokensAreAssociated('3');
+        verifyUnstakedBalance(3.0);
+        verifyEthWalletTotalAssociatedBalance('3.0');
+        verifyEthWalletAssociatedBalance('3.0');
+        cy.get('button').contains('Select a validator to nominate').click();
+        // 2001-STKE-031
+        clickOnValidatorFromList(0);
+        // 2001-STKE-033, 2001-STKE-034, 2001-STKE-037
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(1.0);
+        // 2001-STKE-039
+        verifyStakedBalance(2.0);
+        verifyNextEpochValue(2.0); // 2001-STKE-016 2001-STKE-038
+        verifyThisEpochValue(2.0); // 2001-STKE-013
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+
+        // 2002-SINC-007
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+      });
+
+      it('Able to stake against a validator - using vega from vesting contract', function () {
+        stakingPageAssociateTokens('3', { type: 'contract' });
+        verifyUnstakedBalance(3.0);
+        verifyEthWalletTotalAssociatedBalance('3.0');
+        verifyEthWalletAssociatedBalance('3.0');
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(1.0);
+        verifyStakedBalance(2.0);
+        verifyNextEpochValue(2.0);
+        verifyThisEpochValue(2.0);
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+      });
+
+      it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
+        stakingPageAssociateTokens('3', { type: 'contract' });
+        navigateTo(navigation.validators);
+        stakingPageAssociateTokens('4', { type: 'wallet' });
+        verifyUnstakedBalance(7.0);
+        verifyEthWalletTotalAssociatedBalance('3.0');
+        verifyEthWalletTotalAssociatedBalance('4.0');
+        verifyEthWalletTotalAssociatedBalance('3.0');
+        verifyEthWalletTotalAssociatedBalance('4.0');
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('6');
+        verifyUnstakedBalance(1.0);
+        verifyStakedBalance(6.0);
+        verifyNextEpochValue(6.0);
+        verifyThisEpochValue(6.0);
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        validateValidatorListTotalStakeAndShare('0', '6.00', '100.00%');
+      });
+
+      it('Able to stake against multiple validators', function () {
+        stakingPageAssociateTokens('5');
+        verifyUnstakedBalance(5.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(3.0);
+        cy.get(vegaWalletStakedBalances, txTimeout)
+          .parent()
+          .should('contain', 2.0, txTimeout);
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        clickOnValidatorFromList(1);
+        stakingValidatorPageAddStake('1');
+        verifyUnstakedBalance(2.0);
+        cy.get(vegaWalletStakedBalances, txTimeout)
+          .should('have.length', 4, txTimeout)
+          .eq(0)
+          .should('contain', 2.0, txTimeout);
+        cy.get(vegaWalletStakedBalances, txTimeout)
+          .eq(1)
+          .should('contain', 1.0, txTimeout);
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        cy.get(`[row-id="${0}"]`).within(() => {
+          cy.get(stakeValidatorListTotalStake)
+            .should('have.text', '2.00')
+            .and('be.visible');
+          cy.get(stakeValidatorListTotalShare)
+            .should('have.text', '66.67%')
+            .and('be.visible');
+          cy.get(stakeValidatorListValidatorStake)
+            .scrollIntoView()
+            .should('have.text', '2.00')
+            .and('be.visible');
+        });
+        cy.get(`[row-id="${1}"]`).within(() => {
+          cy.get(stakeValidatorListTotalStake)
+            .scrollIntoView()
+            .should('have.text', '1.00')
+            .and('be.visible');
+          cy.get(stakeValidatorListTotalShare)
+            .should('have.text', '33.33%')
+            .and('be.visible');
+          cy.get(stakeValidatorListValidatorStake)
+            .scrollIntoView()
+            .should('have.text', '1.00')
+            .and('be.visible');
+        });
+      });
+
+      // 2001-STKE-041
+      it(
+        'Able to remove part of a stake against a validator',
+        { tags: '@smoke' },
+        function () {
+          ensureSpecifiedUnstakedTokensAreAssociated('4');
+          navigateTo(navigation.validators);
+          clickOnValidatorFromList(0);
+          stakingValidatorPageAddStake('3');
+          verifyNextEpochValue(3.0);
+          verifyUnstakedBalance(1.0);
+          closeStakingDialog();
+          navigateTo(navigation.validators);
+          // 2001-STKE-040
+          clickOnValidatorFromList(0);
+          // 2001-STKE-044, 2001-STKE-048
+          stakingValidatorPageRemoveStake('1');
+          // 2001-STKE-049
+          verifyNextEpochValue(2.0);
+          verifyUnstakedBalance(2.0);
+          verifyStakedBalance(2.0);
+          verifyNextEpochValue(2.0);
+          verifyThisEpochValue(2.0);
+          cy.get(totalStake, epochTimeout).should('contain.text', '2');
+          waitForBeginningOfEpoch();
+          cy.get(stakeShare).should('have.text', '100%');
+          navigateTo(navigation.validators);
+          validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+        }
+      );
+
+      // 2001-STKE-045
+      it('Able to remove a full stake against a validator', function () {
+        stakingPageAssociateTokens('3');
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('1');
+        verifyUnstakedBalance(2.0);
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        clickOnValidatorFromList(0);
+        stakingValidatorPageRemoveStake('1');
+        verifyNextEpochValue(0.0);
+        verifyUnstakedBalance(3.0);
+        verifyNextEpochValue(0.0);
+        verifyThisEpochValue(0.0);
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
+          'not.exist',
+          txTimeout
+        );
+        navigateTo(navigation.validators);
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
+      });
+
+      it('Unable to remove a stake with a negative value for a validator', function () {
+        stakingPageAssociateTokens('3');
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        verifyNextEpochValue(2.0);
+        verifyUnstakedBalance(1.0);
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        clickOnValidatorFromList(0);
+        cy.get(stakeRemoveStakeRadioButton, txTimeout).click();
+        cy.get(stakeTokenAmountInputBox).type('-0.1');
+        cy.contains('Waiting for next epoch to start', epochTimeout);
+        cy.get(stakeTokenSubmitButton)
+          .should('be.disabled', epochTimeout)
+          .and('contain', `Remove -0.1 $VEGA tokens at the end of epoch`)
+          .and('be.visible');
+      });
+
+      it('Unable to remove a stake greater than staked amount next epoch for a validator', function () {
+        stakingPageAssociateTokens('3');
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        verifyNextEpochValue(2.0);
+        verifyUnstakedBalance(3.0);
+        closeStakingDialog();
+        navigateTo(navigation.validators);
+        clickOnValidatorFromList(0);
+        cy.get(stakeRemoveStakeRadioButton).click();
+        cy.get(stakeTokenAmountInputBox).type('4');
+        cy.contains('Waiting for next epoch to start', epochTimeout);
+        cy.get(stakeTokenSubmitButton)
+          .should('be.disabled', epochTimeout)
+          .and('contain', `Remove 4 $VEGA tokens at the end of epoch`)
+          .and('be.visible');
+      });
+
+      it('Disassociating all wallet tokens max - removes all staked tokens', function () {
+        stakingPageAssociateTokens('3');
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(1);
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(3.0);
+        verifyStakedBalance(2.0);
+        closeStakingDialog();
+        stakingPageDisassociateAllTokens();
+        cy.get(ethWalletContainer).within(() => {
+          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
+        });
+        verifyEthWalletTotalAssociatedBalance('0.0');
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '0.00'
+          );
+        });
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
+          'not.exist',
+          txTimeout
+        );
+        navigateTo(navigation.validators);
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
+      });
+
+      it('Disassociating all vesting contract tokens max - removes all staked tokens', function () {
+        stakingPageAssociateTokens('3', { type: 'contract' });
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(1);
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(1.0);
+        verifyStakedBalance(2.0);
+        closeStakingDialog();
+        stakingPageDisassociateAllTokens('contract');
+        cy.get(ethWalletContainer).within(() => {
+          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
+        });
+        verifyEthWalletTotalAssociatedBalance('0.0');
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '0.00'
+          );
+        });
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
+          'not.exist',
+          txTimeout
+        );
+        navigateTo(navigation.validators);
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
+      });
+
+      it('Disassociating some tokens - prioritizes unstaked tokens', function () {
+        stakingPageAssociateTokens('3');
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(1.0);
+        verifyStakedBalance(2.0);
+        closeStakingDialog();
+        stakingPageDisassociateTokens('1');
+        verifyEthWalletTotalAssociatedBalance('2.0');
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '2.00'
+          );
+        });
+        verifyStakedBalance(2.0);
+        navigateTo(navigation.validators);
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+      });
+
+      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
+        // 2001-STKE-004
+        stakingPageAssociateTokens('3');
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('3');
+        verifyStakedBalance(3.0);
+        closeStakingDialog();
+        stakingPageAssociateTokens('4');
+        verifyUnstakedBalance(0.0);
+        verifyStakedBalance(7.0);
+      });
+
+      it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
+        // 2001-STKE-004
+        stakingPageAssociateTokens('3', { type: 'contract' });
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('3');
+        verifyStakedBalance(3.0);
+        closeStakingDialog();
+        stakingPageAssociateTokens('4', { type: 'contract' });
+        verifyUnstakedBalance(0.0);
+        verifyStakedBalance(7.0);
+      });
+
+      it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
+        // 2001-STKE-004
+        stakingPageAssociateTokens('3', { type: 'wallet' });
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('3');
+        verifyStakedBalance(3.0);
+        closeStakingDialog();
+        stakingPageAssociateTokens('4', { type: 'contract' });
+        verifyUnstakedBalance(0.0);
+        verifyStakedBalance(7.0);
+      });
+
+      it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
+        // 2001-STKE-004
+        stakingPageAssociateTokens('6');
+        verifyUnstakedBalance(6.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(0.0);
+        closeStakingDialog();
+        clickOnValidatorFromList(1);
+        stakingValidatorPageAddStake('4');
+        verifyUnstakedBalance(0.0);
+        closeStakingDialog();
+        stakingPageAssociateTokens('6');
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '12.00'
+          );
+        });
+        verifyStakedBalance(4.0);
+        verifyStakedBalance(8.0);
+        verifyUnstakedBalance(0.0);
+      });
+
+      it('Selecting use maximum where tokens are already staked - suggests the unstaked token amount', function () {
+        stakingPageAssociateTokens('3');
+        verifyUnstakedBalance(3.0);
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        stakingValidatorPageAddStake('2');
+        verifyUnstakedBalance(1.0);
+        closeStakingDialog();
+        clickOnValidatorFromList(0);
+        cy.get(stakeAddStakeRadioButton).click();
+        cy.get(stakeMaximumTokens, { timeout: 60000 }).click();
+        cy.get(stakeTokenSubmitButton).should('contain', 'Add 1 $VEGA tokens');
+      });
+
+      afterEach('Teardown Wallet', function () {
+        vegaWalletTeardown();
+      });
+
+      function verifyNextEpochValue(amount: number) {
+        cy.getByTestId('stake-next-epoch', epochTimeout)
+          .contains(amount, epochTimeout)
+          .should('be.visible');
+      }
+
+      function verifyThisEpochValue(amount: number) {
+        cy.getByTestId('stake-this-epoch', epochTimeout) // 2001-STKE-013
+          .contains(amount, epochTimeout)
+          .should('be.visible');
+      }
+    });
+  }
+);
@@ -1,13 +1,31 @@
+import {
+  verifyEthWalletTotalAssociatedBalance,
+  verifyEthWalletAssociatedBalance,
+  waitForSpinner,
+  navigateTo,
+  navigation,
+} from '../../support/common.functions';
+import {
+  stakingPageAssociateTokens,
+  stakingPageDisassociateAllTokens,
+  stakingPageDisassociateTokens,
+  validateWalletCurrency,
+} from '../../support/staking.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import {
+  vegaWalletAssociate,
+  vegaWalletDisassociate,
+  vegaWalletSetSpecifiedApprovalAmount,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';
+
 const ethWalletContainer = '[data-testid="ethereum-wallet"]';
-const ethWalletAssociatedBalances =
-  '[data-testid="eth-wallet-associated-balances"]';
-const ethWalletTotalAssociatedBalance = '[data-testid="currency-locked"]';
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
 const vegaWalletUnstakedBalance =
  '[data-testid="vega-wallet-balance-unstaked"]';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
-const ethWalletAssociateButton = '[href="/token/associate"]';
+const ethWalletAssociateButton = '[data-testid="associate-btn"]';
 const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
@@ -28,7 +46,7 @@ context(
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
      // 0005-ETXN-001
-      cy.vega_wallet_set_specified_approval_amount('1000');
+      vegaWalletSetSpecifiedApprovalAmount('1000');
    });

    describe('Eth wallet - contains VEGA tokens', function () {
@@ -36,11 +54,10 @@ context(
        'teardown wallet & drill into a specific validator',
        function () {
          cy.reload();
-          cy.wait_for_spinner();
-          cy.ethereum_wallet_connect();
+          waitForSpinner();
          cy.connectVegaWallet();
-          cy.vega_wallet_teardown();
-          cy.navigate_to('validators');
+          ethereumWalletConnect();
+          vegaWalletTeardown();
        }
      );

@@ -57,26 +74,21 @@ context(
        //0005-ETXN-006
        //0005-ETXN-003
        //0005-ETXN-005
-        cy.staking_page_associate_tokens('2', { skipConfirmation: true });
+        stakingPageAssociateTokens('2', { skipConfirmation: true });

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

        // 0005-ETXN-002
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort)
-          .parent(txTimeout)
-          .should('contain', 2.0);
+        verifyEthWalletAssociatedBalance('2.0');

-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('2.0', txTimeout)
-          .should('be.visible');
+        verifyEthWalletTotalAssociatedBalance('2.0');

        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
@@ -92,50 +104,30 @@ context(
        // 1004-ASSO-029
        // 1004-ASSO-031

-        cy.staking_page_associate_tokens('2');
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort)
-          .parent(txTimeout)
-          .should('contain', 2.0);
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('2.0', txTimeout)
-          .should('be.visible');
-
+        stakingPageAssociateTokens('2');
+        verifyEthWalletAssociatedBalance('2.0');
+        verifyEthWalletTotalAssociatedBalance('2.0');
        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.staking_page_disassociate_tokens('2');
-
+        stakingPageDisassociateTokens('2');
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
          3
        );
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '0.00');
+        validateWalletCurrency('Associated', '2.00');
+        validateWalletCurrency('Pending association', '2.00');
+        validateWalletCurrency('Total associated after pending', '0.00');
        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-
-        cy.get(ethWalletAssociatedBalances, txTimeout).should('not.exist');
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('0.00', txTimeout)
-          .should('be.visible');
+        cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
+          'not.exist'
+        );
+        verifyEthWalletTotalAssociatedBalance('0.00');
      });

      it('Able to associate more tokens than the approved amount of 1000 - requires re-approval', function () {
        //1004-ASSO-011
-        cy.staking_page_associate_tokens('1001', { approve: true });
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort)
-          .parent()
-          .should('contain', '1,001.00', txTimeout);
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('1,001.00', txTimeout)
-          .should('be.visible');
-
+        stakingPageAssociateTokens('1001', { approve: true });
+        verifyEthWalletAssociatedBalance('1,001.00');
+        verifyEthWalletTotalAssociatedBalance('1,001.00');
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
@@ -145,26 +137,14 @@ context(
      });

      it('Able to disassociate a partial amount of tokens currently associated', function () {
-        cy.staking_page_associate_tokens('2');
-
+        stakingPageAssociateTokens('2');
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });

        cy.get('button').contains('Select a validator to nominate').click();
-
-        cy.staking_page_disassociate_tokens('1');
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort)
-          .parent(txTimeout)
-          .should('contain', 1.0);
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort)
-          .parent(txTimeout)
-          .should('contain', 1.0);
-
+        stakingPageDisassociateTokens('1');
+        verifyEthWalletAssociatedBalance('1.0');
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
        });
@@ -174,32 +154,24 @@ context(
        // 1004-ASSO-026
        const warningText =
          'Warning: Any tokens that have been nominated to a node will sacrifice rewards they are due for the current epoch. If you do not wish to sacrifice these, you should remove stake from a node at the end of an epoch before disassociation.';
-
-        cy.staking_page_associate_tokens('2');
-
+        stakingPageAssociateTokens('2');
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });
-
        cy.get('button').contains('Select a validator to nominate').click();
-
        cy.get(ethWalletDissociateButton).click();
        cy.get(disassociationWarning).should('contain', warningText);
-
-        cy.staking_page_disassociate_all_tokens();
-
+        stakingPageDisassociateAllTokens();
        cy.get(ethWalletContainer).within(() => {
          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
            'not.exist'
          );
        });
-
        cy.get(ethWalletContainer).within(() => {
          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
            'not.exist'
          );
        });
-
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
        });
@@ -212,7 +184,7 @@ context(
        // 1004-ASSO-024
        // 1004-ASSO-023

-        cy.staking_page_associate_tokens('2', {
+        stakingPageAssociateTokens('2', {
          type: 'contract',
          skipConfirmation: true,
        });
@@ -221,47 +193,30 @@ context(
          'have.length.above',
          3
        );
-        cy.validate_wallet_currency('Associated', '0.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '2.00');
+        validateWalletCurrency('Associated', '0.00');
+        validateWalletCurrency('Pending association', '2.00');
+        validateWalletCurrency('Total associated after pending', '2.00');
        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort)
-          .parent(txTimeout)
-          .should('contain', 2.0);
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('2.0', txTimeout)
-          .should('be.visible');
-
+        verifyEthWalletAssociatedBalance('2.0');
+        verifyEthWalletTotalAssociatedBalance('2.0');
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });
-
        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
-        cy.staking_page_disassociate_tokens('1', {
+        stakingPageDisassociateTokens('1', {
          type: 'contract',
          skipConfirmation: true,
        });
-
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
          3
        );
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.validate_wallet_currency('Pending association', '1.00');
-        cy.validate_wallet_currency('Total associated after pending', '1.00');
+        validateWalletCurrency('Associated', '2.00');
+        validateWalletCurrency('Pending association', '1.00');
+        validateWalletCurrency('Total associated after pending', '1.00');
        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-
-        cy.get(ethWalletAssociatedBalances, txTimeout)
-          .contains(vegaWalletPublicKeyShort)
-          .parent(txTimeout)
-          .should('contain', 1.0);
-
-        cy.get(ethWalletTotalAssociatedBalance, txTimeout)
-          .contains('1.0', txTimeout)
-          .should('be.visible');
+        verifyEthWalletAssociatedBalance('1.0');
+        verifyEthWalletTotalAssociatedBalance('1.0');
      });

      it('Able to associate & disassociate both wallet and vesting contract tokens', function () {
@@ -269,11 +224,9 @@ context(
        // 1004-ASSO-020
        // 1004-ASSO-021
        // 1004-ASSO-022
-
-        cy.staking_page_associate_tokens('21', { type: 'wallet' });
+        stakingPageAssociateTokens('21', { type: 'wallet' });
        cy.get('button').contains('Select a validator to nominate').click();
-        cy.staking_page_associate_tokens('37', { type: 'contract' });
-
+        stakingPageAssociateTokens('37', { type: 'contract' });
        cy.get(vestingContractSection).within(() => {
          cy.get(associatedKey).should(
            'contain',
@@ -281,7 +234,6 @@ context(
          );
          cy.get(associatedAmount, txTimeout).should('contain', 37);
        });
-
        cy.get(vegaInWalletSection).within(() => {
          cy.get(associatedKey).should(
            'contain',
@@ -289,27 +241,21 @@ context(
          );
          cy.get(associatedAmount, txTimeout).should('contain', 21);
        });
-
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 58);
        });
-
-        cy.staking_page_disassociate_tokens('6', { type: 'contract' });
+        stakingPageDisassociateTokens('6', { type: 'contract' });
        cy.get(vestingContractSection).within(() => {
          cy.get(associatedAmount, txTimeout).should('contain', 31);
        });
-
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 52);
        });
-
-        cy.navigate_to('validators');
-
-        cy.staking_page_disassociate_tokens('9', { type: 'wallet' });
+        navigateTo(navigation.validators);
+        stakingPageDisassociateTokens('9', { type: 'wallet' });
        cy.get(vegaInWalletSection).within(() => {
          cy.get(associatedAmount, txTimeout).should('contain', 12);
        });
-
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
        });
@@ -319,42 +265,41 @@ context(
        // 1004-ASSO-008
        // 1004-ASSO-010
        // No warning visible as described in AC, but the button is disabled
-
        cy.get(ethWalletAssociateButton).first().click();
        cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
        cy.get(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
-        cy.get(tokenAmountInputBox, { timeout: 10000 }).type(6500000);
+        cy.get(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
        cy.get(tokenSubmitButton, txTimeout).should('be.disabled');
      });

      // 1004-ASSO-004
-
      it('Pending association outside of app is shown', function () {
-        cy.vega_wallet_associate('2');
+        vegaWalletAssociate('2');
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
          3
        );
-        cy.validate_wallet_currency('Associated', '0.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '2.00');
+        validateWalletCurrency('Associated', '0.00');
+        validateWalletCurrency('Pending association', '2.00');
+        validateWalletCurrency('Total associated after pending', '2.00');
        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-        cy.validate_wallet_currency('Associated', '2.00');
+        validateWalletCurrency('Associated', '2.00');
      });

      it('Disassociation outside of app is shown', function () {
-        cy.staking_page_associate_tokens('2');
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.vega_wallet_disassociate('2');
+        stakingPageAssociateTokens('2');
+        cy.wrap(validateWalletCurrency('Associated', '2.00')).then(() => {
+          vegaWalletDisassociate('2');
+        });
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
          3
        );
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '0.00');
+        validateWalletCurrency('Associated', '2.00');
+        validateWalletCurrency('Pending association', '2.00');
+        validateWalletCurrency('Total associated after pending', '0.00');
        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-        cy.validate_wallet_currency('Associated', '0.00');
+        validateWalletCurrency('Associated', '0.00');
      });

      it('Able to associate tokens to different public key of connected vega wallet', function () {
@@ -371,7 +316,7 @@ context(
          'have.text',
          Cypress.env('vegaWalletPublicKey2')
        );
-        cy.staking_page_associate_tokens('2');
+        stakingPageAssociateTokens('2');
        cy.get(vegaWallet).within(() => {
          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });
@@ -381,7 +326,7 @@ context(
            'vegaWalletPublicKey2Short'
          )} can now participate in governance and nominate a validator with your associated $VEGA.`
        );
-        cy.staking_page_disassociate_all_tokens();
+        stakingPageDisassociateAllTokens();
      });
    });
  }
@@ -1,5 +1,16 @@
+import {
+  navigateTo,
+  navigation,
+  waitForSpinner,
+} from '../../support/common.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+import {
+  depositAsset,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';
+
 const withdraw = 'withdraw';
-const selectAsset = 'select-asset';
+const withdrawalForm = 'withdraw-form';
 const ethAddressInput = 'eth-address-input';
 const amountInput = 'amount-input';
 const balanceAvailable = 'BALANCE_AVAILABLE_value';
@@ -17,6 +28,8 @@ const completeWithdrawalButton = 'complete-withdrawal';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
+const usdtSelectValue =
+  '993ed98f4f770d91a796faab1738551193ba45c62341d20597df70fea6704ede';
 const truncatedWithdrawalEthAddress = '0xEe7D…22d94F';
 const formValidationError = 'input-error-text';
 const txTimeout = Cypress.env('txTimeout');
@@ -26,60 +39,72 @@ context(
  { tags: '@slow' },
  function () {
    before('visit withdrawals and connect vega wallet', function () {
-      cy.updateCapsuleMultiSig(); // When running tests locally, will fail if run without restarting capsule
-      cy.deposit_asset(usdcEthAddress, '100000000000000000000');
+      cy.visit('/');
+      // When running tests locally, will fail if run without restarting capsule
+      cy.updateCapsuleMultiSig().then(() => {
+        depositAsset(usdcEthAddress, '100');
+      });
    });

    beforeEach('Navigate to withdrawal page', function () {
      cy.reload();
-      cy.visit('/');
-      cy.wait_for_spinner();
-      cy.navigate_to('withdraw');
+      waitForSpinner();
+      navigateTo(navigation.withdraw);
      cy.connectVegaWallet();
-      cy.ethereum_wallet_connect();
-      cy.vega_wallet_teardown();
+      ethereumWalletConnect();
+      vegaWalletTeardown();
    });

    it('Able to open withdrawal form with vega wallet connected', function () {
      // needs to reload page for withdrawal form to be displayed in ci - not reproducible outside of ci
+      cy.reload();
+      waitForSpinner();
+      ethereumWalletConnect();
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(selectAsset)
-        .find('option')
-        .should('have.length.at.least', 2);
-      cy.getByTestId(ethAddressInput).should('be.visible');
-      cy.getByTestId(amountInput).should('be.visible');
+      cy.getByTestId(withdrawalForm).within(() => {
+        cy.get('select').find('option').should('have.length.at.least', 2);
+        cy.getByTestId(ethAddressInput).should('be.visible');
+        cy.getByTestId(amountInput).should('be.visible');
+      });
    });

    it('Unable to submit withdrawal with invalid fields', function () {
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(selectAsset).select(usdtName);
-      cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-      cy.getByTestId(submitWithdrawalButton).click();
-      cy.getByTestId(formValidationError).should('have.length', 1);
-      cy.getByTestId(amountInput).clear().click().type('0.0000001');
-      cy.getByTestId(submitWithdrawalButton).click();
-      cy.getByTestId(formValidationError).should(
-        'have.text',
-        'Value is below minimum'
-      );
-      cy.getByTestId(amountInput).clear().click().type('10');
-      cy.getByTestId(ethAddressInput).click().type('123');
-      cy.getByTestId(submitWithdrawalButton).click();
-      cy.getByTestId(formValidationError).should(
-        'have.text',
-        'Invalid Ethereum address'
-      );
+      cy.getByTestId(withdrawalForm).within(() => {
+        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+        cy.getByTestId(submitWithdrawalButton).click();
+        cy.getByTestId(formValidationError).should('have.length', 1);
+        cy.getByTestId(amountInput).clear().click().type('0.0000001');
+        cy.getByTestId(submitWithdrawalButton).click();
+        cy.getByTestId(formValidationError).should(
+          'have.text',
+          'Value is below minimum'
+        );
+        cy.getByTestId(amountInput).clear().click().type('10');
+        cy.getByTestId(ethAddressInput).click().type('123');
+        cy.getByTestId(submitWithdrawalButton).click();
+        cy.getByTestId(formValidationError).should(
+          'have.text',
+          'Invalid Ethereum address'
+        );
+      });
    });

    it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
      // fill in withdrawal form
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(selectAsset).select(usdtName);
-      cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-      cy.getByTestId(withdrawalThreshold).should('have.text', '100,000.00000T');
-      cy.getByTestId(delayTime).should('have.text', 'None');
-      cy.getByTestId(amountInput).click().type('100');
-      cy.getByTestId(submitWithdrawalButton).click();
+      cy.getByTestId(withdrawalForm).within(() => {
+        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+        cy.getByTestId(withdrawalThreshold).should(
+          'have.text',
+          '100,000.00000T'
+        );
+        cy.getByTestId(delayTime).should('have.text', 'None');
+        cy.getByTestId(amountInput).click().type('100');
+        cy.getByTestId(submitWithdrawalButton).click();
+      });

      cy.contains('Awaiting network confirmation').should('be.visible');
      // assert withdrawal request
@@ -136,15 +161,17 @@ context(
      waitForAssetsDisplayed(usdtName);
      // fill in withdrawal form
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(selectAsset).select(usdtName);
-      cy.getByTestId(ethAddressInput).should('be.empty');
-      cy.getByTestId(amountInput).click().type('100');
-      cy.getByTestId(submitWithdrawalButton).click();
+      cy.getByTestId(withdrawalForm).within(() => {
+        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId(ethAddressInput).should('be.empty');
+        cy.getByTestId(amountInput).click().type('100');
+        cy.getByTestId(submitWithdrawalButton).click();

-      // Need eth address to submit withdrawal
-      cy.getByTestId(formValidationError).should('have.length', 1);
-      cy.getByTestId(ethAddressInput).click().type(ethWalletAddress);
-      cy.getByTestId(submitWithdrawalButton).click();
+        // Need eth address to submit withdrawal
+        cy.getByTestId(formValidationError).should('have.length', 1);
+        cy.getByTestId(ethAddressInput).click().type(ethWalletAddress);
+        cy.getByTestId(submitWithdrawalButton).click();
+      });

      cy.contains('Awaiting network confirmation').should('be.visible');
      // assert withdrawal request
@@ -180,10 +207,12 @@ context(

      cy.connectPublicKey(vegaWalletPubKey);
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(selectAsset).select(usdtName);
-      cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-      cy.getByTestId(amountInput).click().type('100');
-      cy.getByTestId(submitWithdrawalButton).click();
+      cy.getByTestId(withdrawalForm).within(() => {
+        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+        cy.getByTestId(amountInput).click().type('100');
+        cy.getByTestId(submitWithdrawalButton).click();
+      });

      cy.getByTestId('dialog-content').within(() => {
        cy.get('h1').should('have.text', 'Transaction failed');
@@ -191,7 +220,7 @@ context(
      });
    });

-    function waitForAssetsDisplayed(expectedAsset) {
+    function waitForAssetsDisplayed(expectedAsset: string) {
      cy.contains(expectedAsset, txTimeout).should('be.visible');
    }
  }
@@ -1,3 +1,5 @@
+import { waitForSpinner } from '../../support/common.functions';
+
 context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
  before('visit token home page', function () {
    cy.visit('/');
@@ -18,7 +20,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
          if (!$body.find('[data-testid="proposals-list-item"]').length) {
            cy.createMarket();
            cy.reload();
-            cy.wait_for_spinner();
+            waitForSpinner();
          }
        });
        cy.getByTestId('proposals-list-item')
@@ -107,5 +109,56 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        });
      });
    });
+
+    describe('Mobile view - navigation bar', function () {
+      before('Change to mobile resolution', function () {
+        cy.viewport('iphone-xr');
+      });
+
+      it('should have burger button', () => {
+        cy.getByTestId('button-menu-drawer').should('be.visible').click();
+        cy.getByTestId('menu-drawer').should('be.visible');
+      });
+
+      it('should have link for proposal page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/proposals"]')
+            .should('exist')
+            .and('have.text', 'Proposals');
+        });
+      });
+      it('should have link for validator page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/validators"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Validators');
+        });
+      });
+
+      it('should have link for rewards page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/rewards"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Rewards');
+        });
+      });
+      it('should have link for withdrawal page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/token/withdraw"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Withdraw');
+        });
+      });
+
+      after(function () {
+        cy.viewport(
+          Cypress.config('viewportWidth'),
+          Cypress.config('viewportHeight')
+        );
+      });
+    });
  });
 });
@@ -1,284 +0,0 @@
-context(
-  'Landing pages - verifies required elements',
-  { tags: '@smoke' },
-  () => {
-    const navbar = 'nav .navbar';
-    const mobileNav = '[data-testid="menu-drawer"]';
-
-    const topLevelLinks = [
-      {
-        name: 'Proposals',
-        selector: '[href="/proposals"]',
-        tests: () => {
-          it('should be able to see a working link for - find out more about Vega governance', function () {
-            const governanceDocsUrl = 'https://vega.xyz/governance';
-            const proposalDocumentationLink =
-              '[data-testid="proposal-documentation-link"]';
-            // 3001-VOTE-001
-            cy.get(proposalDocumentationLink)
-              .should('be.visible')
-              .and('have.text', 'Find out more about Vega governance')
-              .and('have.attr', 'href')
-              .and('equal', governanceDocsUrl);
-
-            // 3002-PROP-001
-            cy.request(governanceDocsUrl)
-              .its('body')
-              .then((body) => {
-                if (!body.includes('Govern the network')) {
-                  assert.include(
-                    body,
-                    'Govern the network',
-                    `Checking that governance link destination includes 'Govern the network' text`
-                  );
-                }
-              });
-          });
-
-          it('should be able to see button for - new proposal', function () {
-            // 3001-VOTE-002
-            const newProposalLink = '[data-testid="new-proposal-link"]';
-            cy.get(newProposalLink)
-              .should('be.visible')
-              .and('have.text', 'New proposal')
-              .and('have.attr', 'href')
-              .and('equal', '/proposals/propose');
-          });
-        },
-      },
-      {
-        name: 'Validators',
-        selector: '[href="/validators"]',
-        tests: () => {
-          it('Should have Staking Guide link visible', function () {
-            // 2001-STKE-003
-            cy.get('[data-testid="staking-guide-link"]')
-              .should('be.visible')
-              .and('have.text', 'Read more about staking on Vega')
-              .and(
-                'have.attr',
-                'href',
-                'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
-              );
-          });
-        },
-      },
-      {
-        name: 'Rewards',
-        selector: '[href="/rewards"]',
-        header: 'Rewards and fees',
-        tests: () => {
-          it('should have epoch warning', () => {
-            cy.get('[data-testid="callout"]')
-              .should('be.visible')
-              .and(
-                'have.text',
-                'Rewards are credited less than a minute after the epoch ends.This delay is set by a network parameter'
-              );
-          });
-          it('should have toggle for seeing total vs individual rewards', () => {
-            cy.get('[data-testid="epoch-reward-view-toggle-total"]').should(
-              'be.visible'
-            );
-          });
-        },
-      },
-    ];
-
-    const secondLevelLinks = [
-      {
-        trigger: true,
-        name: 'Token',
-        selector: '[data-testid="state-trigger"]',
-      },
-      {
-        name: 'Token',
-        selector: '[href="/token"]',
-        header: 'The $VEGA token',
-      },
-      {
-        name: 'Supply & Vesting',
-        selector: '[href="/token/tranches"]',
-        header: 'Vesting tranches',
-      },
-      {
-        name: 'Withdraw',
-        selector: '[href="/token/withdraw"]',
-        header: 'Withdrawals',
-        tests: () => {
-          it('should have connect Vega wallet button', function () {
-            cy.get('[data-testid="connect-to-vega-wallet-btn"]')
-              .should('be.visible')
-              .and('have.text', 'Connect Vega wallet');
-          });
-        },
-      },
-      {
-        name: 'Redeem',
-        selector: '[href="/token/redeem"]',
-        header: 'Vesting',
-        tests: () => {
-          // 1005-VEST-018
-          it('should have connect Eth wallet button', function () {
-            cy.get('[data-testid="connect-to-eth-btn"]')
-              .should('be.visible')
-              .and('have.text', 'Connect Ethereum wallet');
-          });
-        },
-      },
-      {
-        name: 'Associate',
-        selector: '[href="/token/associate"]',
-        header: 'Associate $VEGA tokens with Vega Key',
-      },
-      {
-        name: 'Disassociate',
-        selector: '[href="/token/disassociate"]',
-        header: 'Disassociate $VEGA tokens from a Vega key',
-      },
-    ];
-
-    const expand = () => {
-      const trigger = secondLevelLinks.find((l) => l.trigger).selector;
-      cy.get(trigger).then((el) => {
-        if (el.attr('aria-expanded') === 'false') {
-          el.trigger('click');
-        }
-      });
-    };
-
-    const collapse = () => {
-      const trigger = secondLevelLinks.find((l) => l.trigger).selector;
-      cy.get(trigger).then((el) => {
-        if (el.attr('aria-expanded') === 'true') {
-          el.trigger('click');
-        }
-      });
-    };
-
-    const ensureHeader = (text) => {
-      cy.get('main header h1').should('have.text', text);
-    };
-
-    before(() => {
-      // goes to HOME
-      cy.visit('/');
-      // and waits for it to load
-      cy.get(navbar, { timeout: 10000 }).should('be.visible');
-    });
-
-    describe('Navigation (desktop)', () => {
-      for (const { name, selector } of topLevelLinks) {
-        it(`should have ${name} nav link`, () => {
-          cy.get(navbar).within(() => {
-            cy.get(selector).should('be.visible');
-            cy.get(selector).should('have.text', name);
-          });
-        });
-      }
-
-      for (const { name, selector, trigger } of secondLevelLinks) {
-        it(`should have ${name} ${
-          trigger ? 'as trigger button' : ''
-        } second level nav link`, () => {
-          cy.get(navbar).within(() => {
-            cy.get(selector).should('be.visible');
-            cy.get(selector).should('have.text', name);
-            if (trigger) cy.get(selector).click();
-          });
-        });
-      }
-
-      after(() => {
-        collapse();
-      });
-    });
-
-    describe('Navigation (mobile)', () => {
-      beforeEach(() => {
-        // iphone xr
-        cy.viewport(414, 896);
-      });
-
-      it('should have burger button', () => {
-        cy.get('[data-testid="button-menu-drawer"]').should('be.visible');
-        cy.get('[data-testid="button-menu-drawer"]').click();
-        cy.get(mobileNav).should('be.visible');
-      });
-
-      for (const { name, selector } of topLevelLinks) {
-        it(`should have ${name} nav link`, () => {
-          cy.get(mobileNav).within(() => {
-            cy.get(selector).should('be.visible');
-            cy.get(selector).should('have.text', name);
-          });
-        });
-      }
-
-      for (const { name, selector, trigger } of secondLevelLinks) {
-        it(`should have ${name} ${
-          trigger ? 'as trigger button' : ''
-        } second level nav link`, () => {
-          cy.get(mobileNav).within(() => {
-            cy.get(selector).should('be.visible');
-            cy.get(selector).should('have.text', name);
-          });
-        });
-      }
-
-      after(() => {
-        cy.get('[data-testid="button-menu-drawer"]').click();
-        cy.viewport(
-          Cypress.config('viewportWidth'),
-          Cypress.config('viewportHeight')
-        );
-      });
-    });
-
-    describe('Elements', () => {
-      for (const { name, selector, header, tests } of topLevelLinks) {
-        describe(`${name} page`, () => {
-          it(`navigates to ${name}`, () => {
-            cy.get(navbar).within(() => {
-              cy.log(`goes to ${name}`);
-              cy.get(selector).click();
-              cy.log(`ensures ${name} is highlighted`);
-              cy.get(selector).should('have.attr', 'aria-current');
-            });
-          });
-          it('displays header', () => {
-            ensureHeader(header || name);
-          });
-
-          if (tests) tests.apply(this);
-        });
-      }
-
-      for (const { name, selector, header, tests } of secondLevelLinks.filter(
-        (l) => !l.trigger
-      )) {
-        describe(`${name} page`, () => {
-          it(`navigates to ${name}`, () => {
-            cy.get(navbar).within(() => {
-              expand();
-              cy.log(`goes to ${name}`);
-              cy.get(selector).click();
-              expand();
-              cy.log(`ensures ${name} is highlighted`);
-              cy.get(selector).should('have.attr', 'aria-current');
-            });
-          });
-          it('displays header', () => {
-            ensureHeader(header || name);
-          });
-
-          if (tests) tests.apply(this);
-        });
-      }
-
-      after(() => {
-        collapse();
-      });
-    });
-  }
-);
@@ -0,0 +1,77 @@
+import {
+  navigateTo,
+  navigation,
+  verifyPageHeader,
+  verifyTabHighlighted,
+  waitForSpinner,
+} from '../../support/common.functions';
+
+const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
+const newProposalButton = '[data-testid="new-proposal-link"]';
+const newProposalLink = '[data-testid="new-proposal-link"]';
+const governanceDocsUrl = 'https://vega.xyz/governance';
+const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
+
+context(
+  'Governance Page - verify elements on page',
+  { tags: '@smoke' },
+  function () {
+    before('navigate to governance page', function () {
+      cy.visit('/');
+      navigateTo(navigation.proposals);
+    });
+
+    describe('with no network change proposals', function () {
+      it('should have governance tab highlighted', function () {
+        verifyTabHighlighted(navigation.proposals);
+      });
+
+      it('should have GOVERNANCE header visible', function () {
+        verifyPageHeader('Proposals');
+      });
+
+      it('should be able to see a working link for - find out more about Vega governance', function () {
+        // 3001-VOTE-001
+        cy.get(proposalDocumentationLink)
+          .should('be.visible')
+          .and('have.text', 'Find out more about Vega governance')
+          .and('have.attr', 'href')
+          .and('equal', governanceDocsUrl);
+
+        // 3002-PROP-001
+        cy.request(governanceDocsUrl)
+          .its('body')
+          .then((body) => {
+            if (!body.includes('Govern the network')) {
+              assert.include(
+                body,
+                'Govern the network',
+                `Checking that governance link destination includes 'Govern the network' text`
+              );
+            }
+          });
+      });
+
+      it('should be able to see button for - new proposal', function () {
+        // 3001-VOTE-002
+        cy.get(newProposalLink)
+          .should('be.visible')
+          .and('have.text', 'New proposal')
+          .and('have.attr', 'href')
+          .and('equal', '/proposals/propose');
+      });
+
+      // Skipping this test for now, the new proposal button no longer takes a user directly
+      // to a proposal form, instead it takes them to a page where they can select a proposal type.
+      // Keeping this test here for now as it can be repurposed to test the new proposal forms.
+      it.skip('should be able to see a connect wallet button - if vega wallet disconnected and new proposal button selected', function () {
+        cy.get(newProposalButton).should('be.visible').click();
+        cy.get(connectToVegaWalletButton)
+          .should('be.visible')
+          .and('have.text', 'Connect Vega wallet');
+        navigateTo(navigation.proposals);
+        waitForSpinner();
+      });
+    });
+  }
+);
@@ -1,29 +1,36 @@
 /// <reference types="cypress" />
+
+import {
+  navigateTo,
+  navigation,
+  waitForSpinner,
+} from '../../support/common.functions';
+import {
+  enterUniqueFreeFormProposalBody,
+  goToMakeNewProposal,
+} from '../../support/governance.functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
+
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey2');
 const vegaPubkeyTruncated = Cypress.env('vegaWalletPublicKey2Short');
 const banner = 'view-banner';

 context('View functionality with public key', { tags: '@smoke' }, function () {
  before('send asset to wallet', function () {
-    cy.vega_wallet_faucet_assets_without_check(
-      'fUSDC',
-      '1000000',
-      vegaWalletPubKey
-    );
+    vegaWalletFaucetAssetsWithoutCheck('fUSDC', '1000000', vegaWalletPubKey);
  });

  beforeEach('visit home page', function () {
    cy.visit('/');
-    cy.wait_for_spinner();
+    waitForSpinner();
    cy.connectPublicKey(vegaWalletPubKey);
  });

  it('Able to connect public key via wallet', function () {
    verifyConnectedToPubKey();
-    cy.getByTestId('currency-title', Cypress.env('epochTimeout')).should(
-      'contain.text',
-      'USDC (fake)'
-    );
+    cy.getByTestId('currency-title', { timeout: 10000 })
+      .should('have.length.at.least', 4)
+      .and('contain.text', 'USDC (fake)');
  });

  it('Able to connect public key using url', function () {
@@ -35,9 +42,9 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
  it('Unable to submit proposal with public key', function () {
    const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;

-    cy.navigate_to('proposals');
-    cy.go_to_make_new_proposal('Freeform');
-    cy.enter_unique_freeform_proposal_body('50', 'pub key proposal test');
+    navigateTo(navigation.proposals);
+    goToMakeNewProposal('Freeform');
+    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
    cy.getByTestId('dialog-content').within(() => {
      cy.get('h1').should('have.text', 'Transaction failed');
      cy.getByTestId('Error').should('have.text', expectedErrorTxt);
@@ -0,0 +1,42 @@
+import {
+  navigateTo,
+  navigation,
+  verifyPageHeader,
+} from '../../support/common.functions';
+
+const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
+const warning = '[data-testid="callout"]';
+
+context(
+  'Rewards Page - verify elements on page',
+  { tags: '@regression' },
+  function () {
+    before('navigate to rewards page', function () {
+      cy.visit('/');
+      navigateTo(navigation.rewards);
+    });
+
+    describe('with wallets disconnected', function () {
+      it('should have REWARDS tab highlighted', function () {
+        verifyPageHeader('Rewards and fees');
+      });
+
+      it('should have rewards header visible', function () {
+        verifyPageHeader('Rewards and fees');
+      });
+
+      it('should have epoch warning', function () {
+        cy.get(warning)
+          .should('be.visible')
+          .and(
+            'have.text',
+            'Rewards are credited less than a minute after the epoch ends.This delay is set by a network parameter'
+          );
+      });
+
+      it('should have toggle for seeing total vs individual rewards', function () {
+        cy.get(viewToggle).should('be.visible');
+      });
+    });
+  }
+);
@@ -1,3 +1,5 @@
+import { navigateTo, navigation } from '../../support/common.functions';
+
 const tokenDetailsTable = '.token-details';
 const address = '[data-testid="token-address"]';
 const contract = '[data-testid="token-contract"]';
@@ -17,7 +19,8 @@ const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');

 context('Verify elements on Token page', { tags: '@smoke' }, function () {
  before('Visit token page', function () {
-    cy.visit('/token');
+    cy.visit('/');
+    navigateTo(navigation.token);
  });
  describe('THE $VEGA TOKEN table', function () {
    it('should have TOKEN ADDRESS', function () {
@@ -1,4 +1,5 @@
 import { trancheData } from '../../fixtures/mocks/tranches';
+import { navigateTo, navigation } from '../../support/common.functions';

 const tranches = trancheData;

@@ -8,7 +9,13 @@ context(
  function () {
    before('visit homepage', function () {
      cy.intercept('GET', '**/tranches/stats', { tranches });
-      cy.visit('/token/tranches');
+      cy.visit('/');
+    });
+
+    it('Able to navigate to tranches page', function () {
+      navigateTo(navigation.supply);
+      cy.url().should('include', '/token/tranches');
+      cy.get('h1').should('contain.text', 'Vesting tranches');
    });

    // 1005-VEST-001
@@ -62,7 +69,7 @@ context(
    });

    it('Able to view tranches with less than 10 vega', function () {
-      cy.navigate_to('supply');
+      navigateTo(navigation.supply);
      cy.getByTestId('show-all-tranches').click();
      cy.getByTestId('tranche-item')
        .should('have.length', 8)
@@ -1,210 +0,0 @@
-/// <reference types="cypress" />
-const validatorTitle = '[data-testid="validator-node-title"]';
-const validatorId = '[data-testid="validator-id"]';
-const validatorPubKey = '[data-testid="validator-public-key"]';
-const ethAddressLink = '[data-testid="link"]';
-const validatorStatus = '[data-testid="validator-status"]';
-const totalStake = '[data-testid="total-stake"]';
-const pendingStake = '[data-testid="pending-stake"]';
-const stakedByOperator = '[data-testid="staked-by-operator"]';
-const stakedByDelegates = '[data-testid="staked-by-delegates"]';
-const stakeShare = '[data-testid="stake-percentage"]';
-const stakedByOperatorToolTip = "[data-testid='staked-operator-tooltip']";
-const stakedByDelegatesToolTip = "[data-testid='staked-delegates-tooltip']";
-const totalStakedToolTip = "[data-testid='total-staked-tooltip']";
-const unnormalisedVotingPowerToolTip =
-  "[data-testid='unnormalised-voting-power-tooltip']";
-const normalisedVotingPowerToolTip =
-  "[data-testid='normalised-voting-power-tooltip']";
-const performancePenaltyToolTip = "[data-testid='performance-penalty-tooltip']";
-const overstakedPenaltyToolTip = "[data-testid='overstaked-penalty-tooltip']";
-const totalPenaltyToolTip = "[data-testid='total-penalty-tooltip']";
-const epochCountDown = '[data-testid="epoch-countdown"]';
-const stakeNumberRegex = /^\d*\.?\d*$/;
-
-context('Staking Page - verify elements on page', function () {
-  before('navigate to staking page', function () {
-    cy.visit('/validators');
-  });
-
-  describe(
-    'Should be able to see validator list from the staking page',
-    { tags: '@regression' },
-    function () {
-      // 2001-STKE-050
-      it('Should be able to see validator names', function () {
-        cy.get('[col-id="validator"] > div > span')
-          .should('have.length.at.least', 1)
-          .each(($name) => {
-            cy.wrap($name).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake', function () {
-        cy.get('[col-id="stake"] > div > span > span')
-          .should('have.length.at.least', 1)
-          .each(($stake) => {
-            cy.wrap($stake).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake tooltip', function () {
-        cy.get('[col-id="stake"] > div > span > span').first().realHover();
-
-        cy.get(stakedByOperatorToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by operator: 0.00');
-        cy.get(stakedByDelegatesToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by delegates: 0.00');
-        cy.get(totalStakedToolTip)
-          .invoke('text')
-          .should('contain', 'Total stake: 0.00');
-      });
-
-      it('Should be able to see validator normalised voting power', function () {
-        cy.get('[col-id="normalisedVotingPower"] > div > span > span')
-          .should('have.length.at.least', 1)
-          .each(($vPower) => {
-            cy.wrap($vPower).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator voting power tooltip', function () {
-        cy.get('[col-id="normalisedVotingPower"] > div > span > span')
-          .first()
-          .realHover();
-
-        cy.get(unnormalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Unnormalised voting power: 0.00%');
-        cy.get(normalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Normalised voting power: 0.10%');
-      });
-
-      // 2002-SINC-018
-      it('Should be able to see validator total penalties', function () {
-        cy.get('[col-id="totalPenalties"] > div > span > span')
-          .should('have.length.at.least', 1)
-          .each(($penalties) => {
-            cy.wrap($penalties).should('contain.text', '0%');
-          });
-      });
-
-      it('Should be able to see validator penalties tooltip', function () {
-        cy.get('[col-id="totalPenalties"] > div > span > span').realHover();
-
-        cy.get(performancePenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Performance penalty: 100.00%');
-        cy.get(overstakedPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Overstaked penalty:'); // value not asserted due to #2886
-        cy.get(totalPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Total penalties: 0.00%');
-      });
-
-      it('Should be able to see validator pending stake', function () {
-        cy.get('[col-id="pendingStake"] > div > span')
-          .should('have.length.at.least', 1)
-          .each(($pendingStake) => {
-            cy.wrap($pendingStake).should('contain.text', '0.00');
-          });
-      });
-    }
-  );
-
-  // 2001-STKE-050
-  describe(
-    'Should be able to see static information about a validator',
-    { tags: '@smoke' },
-    function () {
-      before('connect wallets and click on validator', function () {
-        cy.connectVegaWallet();
-        cy.click_on_validator_from_list(0);
-      });
-
-      // 2001-STKE-006
-      it('Should be able to see validator name', function () {
-        cy.get(validatorTitle).should('not.be.empty');
-      });
-
-      // 2001-STKE-007
-      it('Should be able to see validator id', function () {
-        cy.get(validatorId).should('not.be.empty');
-      });
-
-      // 2001-STKE-008
-      it('Should be able to see validator public key', function () {
-        cy.get(validatorPubKey).should('not.be.empty');
-      });
-
-      // 2001-STKE-010
-      it('Should be able to see Ethereum address', function () {
-        cy.get(ethAddressLink).should('not.be.empty').and('have.attr', 'href');
-      });
-      // TODO validators missing url for more information about them 2001-STKE-09
-
-      it('Should be able to see validator status', function () {
-        cy.get(validatorStatus).should('have.text', 'Consensus');
-      });
-
-      // 2001-STKE-012
-      it('Should be able to see total stake', function () {
-        cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see pending stake', function () {
-        cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by operator', function () {
-        cy.get(stakedByOperator)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by delegates', function () {
-        cy.get(stakedByDelegates)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      // 2001-STKE-051
-      it('Should be able to see stake share in percentage', function () {
-        cy.get(stakeShare)
-          .invoke('text')
-          .then(($stakePercentage) => {
-            // The pattern must start at a word boundary (\b).
-            // The pattern cannot be immediately preceded by a dot ((?<!\.)).
-            // The pattern can be one of the following:
-            // A percentage value of zero (0%), or
-            // A non-zero percentage value that can be:
-            // A single digit (\d) between 0 and 9, or
-            // A two-digit number between 0 and 99 (\d{1,2}), or
-            // The number 100.
-            // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
-            // The pattern must end with a percentage sign (%).
-
-            cy.wrap($stakePercentage).should(
-              'match',
-              /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
-            );
-          });
-      });
-
-      // 2001-STKE-011 2002-SINC-001 2002-SINC-002
-      it('Should be able to see epoch information', function () {
-        const epochTitle = 'h3';
-        const nextEpochInfo = 'p';
-
-        cy.get(epochCountDown).within(() => {
-          cy.get(epochTitle).should('not.be.empty');
-          cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
-        });
-      });
-    }
-  );
-});
@@ -0,0 +1,246 @@
+/// <reference types="cypress" />
+
+import {
+  navigateTo,
+  navigation,
+  verifyPageHeader,
+  verifyTabHighlighted,
+} from '../../support/common.functions';
+import { clickOnValidatorFromList } from '../../support/staking.functions';
+
+const guideLink = '[data-testid="staking-guide-link"]';
+const validatorTitle = '[data-testid="validator-node-title"]';
+const validatorId = '[data-testid="validator-id"]';
+const validatorPubKey = '[data-testid="validator-public-key"]';
+const ethAddressLink = '[data-testid="link"]';
+const validatorStatus = '[data-testid="validator-status"]';
+const totalStake = '[data-testid="total-stake"]';
+const pendingStake = '[data-testid="pending-stake"]';
+const stakedByOperator = '[data-testid="staked-by-operator"]';
+const stakedByDelegates = '[data-testid="staked-by-delegates"]';
+const stakeShare = '[data-testid="stake-percentage"]';
+const stakedByOperatorToolTip = '[data-testid="staked-operator-tooltip"]';
+const stakedByDelegatesToolTip = '[data-testid="staked-delegates-tooltip"]';
+const totalStakedToolTip = '[data-testid="total-staked-tooltip"]';
+const unnormalisedVotingPowerToolTip =
+  '[data-testid="unnormalised-voting-power-tooltip"]';
+const normalisedVotingPowerToolTip =
+  '[data-testid="normalised-voting-power-tooltip"]';
+const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
+const overstakedPenaltyToolTip = '[data-testid="overstaked-penalty-tooltip"]';
+const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
+const epochCountDown = '[data-testid="epoch-countdown"]';
+const stakeNumberRegex = /^\d*\.?\d*$/;
+
+context('Validators Page - verify elements on page', function () {
+  before('navigate to validators page', function () {
+    cy.visit('/');
+    navigateTo(navigation.validators);
+  });
+
+  describe('with wallets disconnected', { tags: '@smoke' }, function () {
+    describe('description section', function () {
+      it('Should have validators tab highlighted', function () {
+        verifyTabHighlighted(navigation.validators);
+      });
+
+      it('Should have validators ON VEGA header visible', function () {
+        verifyPageHeader('Validators');
+      });
+
+      it('Should have Staking Guide link visible', function () {
+        // 2001-STKE-003
+        cy.get(guideLink)
+          .should('be.visible')
+          .and('have.text', 'Read more about staking on Vega')
+          .and(
+            'have.attr',
+            'href',
+            'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
+          );
+      });
+    });
+    describe(
+      'Should be able to see validator list from the staking page',
+      { tags: '@regression' },
+      function () {
+        // 2001-STKE-050
+        it('Should be able to see validator names', function () {
+          cy.get('[col-id="validator"] > div > span')
+            .should('have.length.at.least', 1)
+            .each(($name) => {
+              cy.wrap($name).should('not.be.empty');
+            });
+        });
+
+        it('Should be able to see validator stake', function () {
+          cy.get('[col-id="stake"] > div > span > span')
+            .should('have.length.at.least', 1)
+            .each(($stake) => {
+              cy.wrap($stake).should('not.be.empty');
+            });
+        });
+
+        it('Should be able to see validator stake tooltip', function () {
+          cy.get('[col-id="stake"] > div > span > span').first().realHover();
+
+          cy.get(stakedByOperatorToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by operator: 0.00');
+          cy.get(stakedByDelegatesToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by delegates: 0.00');
+          cy.get(totalStakedToolTip)
+            .invoke('text')
+            .should('contain', 'Total stake: 0.00');
+        });
+
+        it('Should be able to see validator normalised voting power', function () {
+          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
+            .should('have.length.at.least', 1)
+            .each(($vPower) => {
+              cy.wrap($vPower).should('not.be.empty');
+            });
+        });
+
+        it('Should be able to see validator voting power tooltip', function () {
+          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
+            .first()
+            .realHover();
+
+          cy.get(unnormalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Unnormalised voting power: 0.00%');
+          cy.get(normalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Normalised voting power: 0.10%');
+        });
+
+        // 2002-SINC-018
+        it('Should be able to see validator total penalties', function () {
+          cy.get('[col-id="totalPenalties"] > div > span > span')
+            .should('have.length.at.least', 1)
+            .each(($penalties) => {
+              cy.wrap($penalties).should('contain.text', '0%');
+            });
+        });
+
+        it('Should be able to see validator penalties tooltip', function () {
+          cy.get('[col-id="totalPenalties"] > div > span > span').realHover();
+
+          cy.get(performancePenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Performance penalty: 100.00%');
+          cy.get(overstakedPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Overstaked penalty:'); // value not asserted due to #2886
+          cy.get(totalPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Total penalties: 0.00%');
+        });
+
+        it('Should be able to see validator pending stake', function () {
+          cy.get('[col-id="pendingStake"] > div > span')
+            .should('have.length.at.least', 1)
+            .each(($pendingStake) => {
+              cy.wrap($pendingStake).should('contain.text', '0.00');
+            });
+        });
+      }
+    );
+
+    // 2001-STKE-050
+    describe(
+      'Should be able to see static information about a validator',
+      { tags: '@smoke' },
+      function () {
+        before('connect wallets and click on validator', function () {
+          cy.connectVegaWallet();
+          clickOnValidatorFromList(0);
+        });
+
+        // 2001-STKE-006
+        it('Should be able to see validator name', function () {
+          cy.get(validatorTitle).should('not.be.empty');
+        });
+
+        // 2001-STKE-007
+        it('Should be able to see validator id', function () {
+          cy.get(validatorId).should('not.be.empty');
+        });
+
+        // 2001-STKE-008
+        it('Should be able to see validator public key', function () {
+          cy.get(validatorPubKey).should('not.be.empty');
+        });
+
+        // 2001-STKE-010
+        it('Should be able to see Ethereum address', function () {
+          cy.get(ethAddressLink)
+            .should('not.be.empty')
+            .and('have.attr', 'href');
+        });
+        // TODO validators missing url for more information about them 2001-STKE-09
+
+        it('Should be able to see validator status', function () {
+          cy.get(validatorStatus).should('have.text', 'Consensus');
+        });
+
+        // 2001-STKE-012
+        it('Should be able to see total stake', function () {
+          cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see pending stake', function () {
+          cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by operator', function () {
+          cy.get(stakedByOperator)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by delegates', function () {
+          cy.get(stakedByDelegates)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        // 2001-STKE-051
+        it('Should be able to see stake share in percentage', function () {
+          cy.get(stakeShare)
+            .invoke('text')
+            .then(($stakePercentage) => {
+              // The pattern must start at a word boundary (\b).
+              // The pattern cannot be immediately preceded by a dot ((?<!\.)).
+              // The pattern can be one of the following:
+              // A percentage value of zero (0%), or
+              // A non-zero percentage value that can be:
+              // A single digit (\d) between 0 and 9, or
+              // A two-digit number between 0 and 99 (\d{1,2}), or
+              // The number 100.
+              // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
+              // The pattern must end with a percentage sign (%).
+
+              cy.wrap($stakePercentage).should(
+                'match',
+                /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
+              );
+            });
+        });
+
+        // 2001-STKE-011 2002-SINC-001 2002-SINC-002
+        it('Should be able to see epoch information', function () {
+          const epochTitle = 'h3';
+          const nextEpochInfo = 'p';
+
+          cy.get(epochCountDown).within(() => {
+            cy.get(epochTitle).should('not.be.empty');
+            cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+          });
+        });
+      }
+    );
+  });
+});
@@ -1,3 +1,12 @@
+import {
+  navigateTo,
+  navigation,
+  verifyPageHeader,
+  verifyTabHighlighted,
+} from '../../support/common.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+
+const connectButton = '[data-testid="connect-to-eth-btn"]';
 const lockedTokensInVestingContract = '6,499,972.30';

 context(
@@ -5,12 +14,30 @@ context(
  { tags: '@smoke' },
  function () {
    before('navigate to vesting page', function () {
-      cy.visit('/token/redeem');
+      cy.visit('/');
+      navigateTo(navigation.vesting);
+    });
+
+    describe('with wallets disconnected', function () {
+      it('should have vesting tab highlighted', function () {
+        verifyTabHighlighted(navigation.vesting);
+      });
+
+      it('should have VESTING header visible', function () {
+        verifyPageHeader('Vesting');
+      });
+
+      // 1005-VEST-018
+      it('should have connect Eth wallet button', function () {
+        cy.get(connectButton)
+          .should('be.visible')
+          .and('have.text', 'Connect Ethereum wallet');
+      });
    });

    describe('With Eth wallet connected', function () {
      before('connect eth wallet', function () {
-        cy.ethereum_wallet_connect();
+        ethereumWalletConnect();
        cy.getByTestId('view-connected-eth-btn').click();
      });

@@ -105,7 +132,6 @@ context(
            'All the tokens in this tranche are locked and can not be redeemed yet.'
          );
        });
-        cy.connectVegaWallet();
      });
    });
  }
@@ -1,3 +1,6 @@
+import { convertTokenValueToNumber } from '../../support/common.functions';
+import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
+
 const walletContainer = 'aside [data-testid="ethereum-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectToEthButton =
@@ -87,7 +90,7 @@ context(
    // 0004-EWAL-001 0004-EWAL-002
    describe('when Ethereum wallet connected', function () {
      before('connect to Ethereum wallet', function () {
-        cy.ethereum_wallet_connect();
+        ethereumWalletConnect();
      });

      it('should have ETHEREUM KEY header visible', function () {
@@ -178,22 +181,25 @@ context(
            .within(() => {
              cy.get(currencyValue)
                .invoke('text')
-                .convert_token_value_to_number()
-                .as('value');
+                .then((currencyValueTxt) => {
+                  convertTokenValueToNumber(currencyValueTxt).as('value');
+                });
              cy.get(currencyLocked)
                .invoke('text')
-                .convert_token_value_to_number()
-                .as('locked');
+                .then((currencyLockedTxt) => {
+                  convertTokenValueToNumber(currencyLockedTxt).as('locked');
+                });
              cy.get(currencyUnlocked)
                .invoke('text')
-                .convert_token_value_to_number()
-                .as('unlocked');
+                .then((currencyUnlockedTxt) => {
+                  convertTokenValueToNumber(currencyUnlockedTxt).as('unlocked');
+                });
            })
            .then(function () {
              expect(parseFloat(this.value).toFixed(1)).to.equal(
-                parseFloat(
-                  Math.round((this.locked + this.unlocked) * 100) / 100
-                ).toFixed(1)
+                (Math.round((this.locked + this.unlocked) * 100) / 100).toFixed(
+                  1
+                )
              );
            });
        });
@@ -247,16 +253,19 @@ context(
            .within(() => {
              cy.get(currencyValue)
                .invoke('text')
-                .convert_token_value_to_number()
-                .as('value');
+                .then((currencyValueTxt) => {
+                  convertTokenValueToNumber(currencyValueTxt).as('value');
+                });
              cy.get(currencyLocked)
                .invoke('text')
-                .convert_token_value_to_number()
-                .as('locked');
+                .then((currencyLockedTxt) => {
+                  convertTokenValueToNumber(currencyLockedTxt).as('locked');
+                });
              cy.get(currencyUnlocked)
                .invoke('text')
-                .convert_token_value_to_number()
-                .as('unlocked');
+                .then((currencyUnlockedTxt) => {
+                  convertTokenValueToNumber(currencyUnlockedTxt).as('unlocked');
+                });
            })
            .then(function () {
              expect(this.value).to.equal(this.locked + this.unlocked);
@@ -1,4 +1,7 @@
 import { truncateByChars } from '@vegaprotocol/utils';
+import { waitForSpinner } from '../../support/common.functions';
+import { vegaWalletTeardown } from '../../support/wallet-teardown.functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';

 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
@@ -129,7 +132,7 @@ context(
      before('connect vega wallet', function () {
        cy.visit('/');
        cy.connectVegaWallet();
-        cy.vega_wallet_teardown();
+        vegaWalletTeardown();
      });

      // 0002-WCON-007
@@ -158,7 +161,7 @@ context(
        cy.get(walletContainer).within(() => {
          cy.get(currencyTitle)
            .should('be.visible')
-            .and('have.text', `VEGAAssociated`);
+            .and('contain.text', `VEGAAssociated`);
        });
      });

@@ -167,14 +170,19 @@ context(
        { tags: '@smoke' },
        function () {
          cy.get(walletContainer).within(() => {
-            cy.get(currencyValue).should('be.visible').and('have.text', `0.00`);
+            cy.get(currencyValue)
+              .should('be.visible')
+              .and('contain.text', `0.00`);
          });
        }
      );

      it('should have Unstaked value visible', { tags: '@smoke' }, function () {
        cy.get(walletContainer).within(() => {
-          cy.get(vegaUnstaked).should('be.visible').and('have.text', `0.00`);
+          cy.get(vegaUnstaked)
+            .should('be.visible')
+            .invoke('text')
+            .and('not.be.empty');
        });
      });

@@ -300,16 +308,17 @@ context(

        before('faucet assets to connected vega wallet', function () {
          for (const { id, amount } of assets) {
-            cy.vega_wallet_faucet_assets_without_check(
-              id,
-              amount,
-              vegaWalletPublicKey
-            );
+            vegaWalletFaucetAssetsWithoutCheck(id, amount, vegaWalletPublicKey);
          }
          cy.reload();
-          cy.wait_for_spinner();
+          waitForSpinner();
          cy.connectVegaWallet();
-          cy.ethereum_wallet_connect();
+          cy.get(walletContainer).within(() => {
+            cy.getByTestId('currency-title', txTimeout).should(
+              'have.length.at.least',
+              5
+            );
+          });
        });

        for (const { id, name, expectedAmount } of assets) {
@@ -323,8 +332,9 @@ context(
                .contains(id)
                .parent()
                .siblings()
-                .within((el) => {
-                  const value = parseFloat(el.text());
+                .invoke('text')
+                .then((el) => {
+                  const value = parseFloat(el);
                  cy.wrap(value).should('be.gte', parseFloat(expectedAmount));
                });

@@ -0,0 +1,35 @@
+import {
+  navigateTo,
+  navigation,
+  verifyPageHeader,
+  verifyTabHighlighted,
+} from '../../support/common.functions';
+
+const connectToVegaBtn = '[data-testid="connect-to-vega-wallet-btn"]';
+
+context(
+  'Withdraw Page - verify elements on page',
+  { tags: '@smoke' },
+  function () {
+    before('navigate to withdrawals page', function () {
+      cy.visit('/');
+      navigateTo(navigation.withdraw);
+    });
+
+    describe('with wallets disconnected', function () {
+      it('should have withdraw tab highlighted', function () {
+        verifyTabHighlighted(navigation.withdraw);
+      });
+
+      it('should have WITHDRAW header visible', function () {
+        verifyPageHeader('Withdrawals');
+      });
+
+      it('should have connect Vega wallet button', function () {
+        cy.get(connectToVegaBtn)
+          .should('be.visible')
+          .and('have.text', 'Connect Vega wallet');
+      });
+    });
+  }
+);
@@ -0,0 +1,128 @@
+export interface testFreeformProposal {
+  rationale: {
+    title: string;
+    description: string;
+  };
+  terms: {
+    closingTimestamp: number;
+  };
+}
+
+export interface networkParameters {
+  'blockchains.ethereumConfig': string;
+  'governance.proposal.asset.maxClose': string;
+  'governance.proposal.asset.maxEnact': string;
+  'governance.proposal.asset.minClose': string;
+  'governance.proposal.asset.minEnact': string;
+  'governance.proposal.asset.minProposerBalance': string;
+  'governance.proposal.asset.minVoterBalance': string;
+  'governance.proposal.asset.requiredMajority': string;
+  'governance.proposal.asset.requiredParticipation': string;
+  'governance.proposal.freeform.maxClose': string;
+  'governance.proposal.freeform.minClose': string;
+  'governance.proposal.freeform.minProposerBalance': string;
+  'governance.proposal.freeform.minVoterBalance': string;
+  'governance.proposal.freeform.requiredMajority': string;
+  'governance.proposal.freeform.requiredParticipation': string;
+  'governance.proposal.market.maxClose': string;
+  'governance.proposal.market.maxEnact': string;
+  'governance.proposal.market.minClose': string;
+  'governance.proposal.market.minEnact': string;
+  'governance.proposal.market.minProposerBalance': string;
+  'governance.proposal.market.minVoterBalance': string;
+  'governance.proposal.market.requiredMajority': string;
+  'governance.proposal.market.requiredParticipation': string;
+  'governance.proposal.updateAsset.maxClose': string;
+  'governance.proposal.updateAsset.maxEnact': string;
+  'governance.proposal.updateAsset.minClose': string;
+  'governance.proposal.updateAsset.minEnact': string;
+  'governance.proposal.updateAsset.minProposerBalance': string;
+  'governance.proposal.updateAsset.minVoterBalance': string;
+  'governance.proposal.updateAsset.requiredMajority': string;
+  'governance.proposal.updateAsset.requiredParticipation': string;
+  'governance.proposal.updateMarket.maxClose': string;
+  'governance.proposal.updateMarket.maxEnact': string;
+  'governance.proposal.updateMarket.minClose': string;
+  'governance.proposal.updateMarket.minEnact': string;
+  'governance.proposal.updateMarket.minProposerBalance': string;
+  'governance.proposal.updateMarket.minProposerEquityLikeShare': string;
+  'governance.proposal.updateMarket.minVoterBalance': string;
+  'governance.proposal.updateMarket.requiredMajority': string;
+  'governance.proposal.updateMarket.requiredMajorityLP': string;
+  'governance.proposal.updateMarket.requiredParticipation': string;
+  'governance.proposal.updateMarket.requiredParticipationLP': string;
+  'governance.proposal.updateNetParam.maxClose': string;
+  'governance.proposal.updateNetParam.maxEnact': string;
+  'governance.proposal.updateNetParam.minClose': string;
+  'governance.proposal.updateNetParam.minEnact': string;
+  'governance.proposal.updateNetParam.minProposerBalance': string;
+  'governance.proposal.updateNetParam.minVoterBalance': string;
+  'governance.proposal.updateNetParam.requiredMajority': string;
+  'governance.proposal.updateNetParam.requiredParticipation': string;
+  'limits.assets.proposeEnabledFrom': string;
+  'limits.markets.maxPeggedOrders': string;
+  'limits.markets.proposeEnabledFrom': string;
+  'market.auction.maximumDuration': string;
+  'market.auction.minimumDuration': string;
+  'market.fee.factors.infrastructureFee': string;
+  'market.fee.factors.makerFee': string;
+  'market.liquidity.bondPenaltyParameter': string;
+  'market.liquidity.maximumLiquidityFeeFactorLevel': string;
+  'market.liquidity.minimum.probabilityOfTrading.lpOrders': string;
+  'market.liquidity.probabilityOfTrading.tau.scaling': string;
+  'market.liquidity.providers.fee.distributionTimeStep': string;
+  'market.liquidity.stakeToCcyVolume': string;
+  'market.liquidity.targetstake.triggering.ratio': string;
+  'market.liquidityProvision.minLpStakeQuantumMultiple': string;
+  'market.liquidityProvision.shapes.maxSize': string;
+  'market.margin.scalingFactors': string;
+  'market.monitor.price.defaultParameters': string;
+  'market.stake.target.scalingFactor': string;
+  'market.stake.target.timeWindow': string;
+  'market.value.windowLength': string;
+  'network.checkpoint.timeElapsedBetweenCheckpoints': string;
+  'network.floatingPointUpdates.delay': string;
+  'network.markPriceUpdateMaximumFrequency': string;
+  'network.transaction.defaultgas': string;
+  'network.transactions.maxgasperblock': string;
+  'network.transactions.minBlockCapacity': string;
+  'network.validators.ersatz.multipleOfTendermintValidators': string;
+  'network.validators.ersatz.rewardFactor': string;
+  'network.validators.incumbentBonus': string;
+  'network.validators.minimumEthereumEventsForNewValidator': string;
+  'network.validators.multisig.numberOfSigners': string;
+  'network.validators.tendermint.number': string;
+  'reward.asset': string;
+  'reward.staking.delegation.competitionLevel': string;
+  'reward.staking.delegation.delegatorShare': string;
+  'reward.staking.delegation.maxPayoutPerEpoch': string;
+  'reward.staking.delegation.maxPayoutPerParticipant': string;
+  'reward.staking.delegation.minValidators': string;
+  'reward.staking.delegation.minimumValidatorStake': string;
+  'reward.staking.delegation.optimalStakeMultiplier': string;
+  'reward.staking.delegation.payoutDelay': string;
+  'reward.staking.delegation.payoutFraction': string;
+  'rewards.marketCreationQuantumMultiple': string;
+  'snapshot.interval.length': string;
+  'spam.pow.difficulty': string;
+  'spam.pow.hashFunction': string;
+  'spam.pow.increaseDifficulty': string;
+  'spam.pow.numberOfPastBlocks': string;
+  'spam.pow.numberOfTxPerBlock': string;
+  'spam.protection.delegation.min.tokens': string;
+  'spam.protection.max.batchSize': string;
+  'spam.protection.max.delegations': string;
+  'spam.protection.max.proposals': string;
+  'spam.protection.max.votes': string;
+  'spam.protection.maxUserTransfersPerEpoch': string;
+  'spam.protection.minMultisigUpdates': string;
+  'spam.protection.minimumWithdrawalQuantumMultiple': string;
+  'spam.protection.proposal.min.tokens': string;
+  'spam.protection.voting.min.tokens': string;
+  'transfer.fee.factor': string;
+  'transfer.minTransferQuantumMultiple': string;
+  'validator.performance.scaling.factor': string;
+  'validators.delegation.minAmount': string;
+  'validators.epoch.length': string;
+  'validators.vote.required': string;
+}
@@ -1,87 +0,0 @@
-const epochTimeout = Cypress.env('epochTimeout');
-const txTimeout = Cypress.env('txTimeout');
-
-Cypress.Commands.add(
-  'convert_token_value_to_number',
-  { prevSubject: true },
-  (subject) => {
-    return parseFloat(subject.replace(/,/g, ''));
-  }
-);
-
-const navigation = {
-  section: '[data-testid="navigation"]',
-  vesting: '[href="/token/redeem"]',
-  validators: '[href="/validators"]',
-  rewards: '[href="/rewards"]',
-  withdraw: '[href="/token/withdraw"]',
-  proposals: '[href="/proposals"]',
-  pageSpinner: '[data-testid="splash-loader"]',
-  supply: '[href="/token/tranches"]',
-  token: '[href="/token"]',
-};
-
-const topLevelRoutes = ['proposals', 'validators', 'rewards'];
-const tokenDropDown = 'state-trigger';
-
-Cypress.Commands.add('navigate_to', (page) => {
-  if (!topLevelRoutes.includes(page)) {
-    // FIXME: Timeout madness
-    cy.getByTestId(tokenDropDown, { timeout: 60000 }).eq(0).click();
-    cy.get('[data-testid="token-dropdown"]:visible').within(() => {
-      cy.get(navigation[page]).eq(0).click();
-    });
-  } else {
-    return cy.get(navigation.section, { timeout: 10000 }).within(() => {
-      cy.get(navigation[page]).eq(0).click();
-    });
-  }
-});
-
-Cypress.Commands.add('verify_tab_highlighted', (page) => {
-  return cy.get(navigation.section).within(() => {
-    if (!topLevelRoutes.includes(page)) {
-      cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
-      cy.get('[data-testid="token-dropdown"]:visible').within(() => {
-        cy.get(navigation[page]).should('have.attr', 'aria-current');
-      });
-    } else {
-      cy.get(navigation[page]).should('have.attr', 'aria-current');
-    }
-  });
-});
-
-Cypress.Commands.add('verify_page_header', (text) => {
-  return cy.get('header h1').should('be.visible').and('have.text', text);
-});
-
-Cypress.Commands.add('wait_for_spinner', () => {
-  cy.get(navigation.pageSpinner, Cypress.env('epochTimeout')).should('exist');
-  cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
-});
-
-// This is a workaround function to begin tests with associating tokens without failing
-// Should be removed when eth transaction bug is fixed
-export function associateTokenStartOfTests() {
-  cy.highlight(`Associating tokens for first time`);
-  cy.ethereum_wallet_connect();
-  cy.connectVegaWallet();
-  cy.get('[href="/token/associate"]:visible').first().click();
-  cy.getByTestId('associate-radio-wallet', { timeout: 30000 }).click();
-  cy.getByTestId('token-amount-input', epochTimeout).type('1');
-  cy.getByTestId('token-input-submit-button', txTimeout)
-    .should('be.enabled')
-    .click();
-  cy.contains(
-    `Associating with Vega key. Waiting for ${Cypress.env(
-      'blockConfirmations'
-    )} more confirmations..`,
-    txTimeout
-  ).should('be.visible');
-  cy.getByTestId('associated-amount', txTimeout).should('contain.text', '1');
-  // Wait is needed to allow time for transaction to complete
-  // eslint-disable-next-line cypress/no-unnecessary-waiting
-  cy.wait(10000);
-  cy.vega_wallet_teardown();
-  cy.clearLocalStorage();
-}
@@ -0,0 +1,86 @@
+const tokenDropDown = 'state-trigger';
+const txTimeout = Cypress.env('txTimeout');
+
+export enum navigation {
+  section = 'nav',
+  vesting = '[href="/token/redeem"]',
+  validators = '[href="/validators"]',
+  rewards = '[href="/rewards"]',
+  withdraw = '[href="/token/withdraw"]',
+  proposals = '[href="/proposals"]',
+  pageSpinner = '[data-testid="splash-loader"]',
+  supply = '[href="/token/tranches"]',
+  token = '[href="/token"]',
+}
+
+export function convertTokenValueToNumber(subject: string) {
+  return cy.wrap(parseFloat(subject.replace(/,/g, '')));
+}
+
+const topLevelRoutes = [
+  navigation.proposals,
+  navigation.validators,
+  navigation.rewards,
+];
+
+export function navigateTo(page: navigation) {
+  if (!topLevelRoutes.includes(page)) {
+    cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
+    cy.getByTestId('token-dropdown').within(() => {
+      cy.get(page).eq(0).click();
+    });
+  } else {
+    return cy.get(navigation.section, { timeout: 10000 }).within(() => {
+      cy.get(page).eq(0).click();
+    });
+  }
+}
+
+export function verifyTabHighlighted(page: navigation) {
+  return cy.get(navigation.section).within(() => {
+    if (!topLevelRoutes.includes(page)) {
+      cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
+      cy.get('[data-testid="token-dropdown"]:visible').within(() => {
+        cy.get(page).should('have.attr', 'aria-current');
+      });
+    } else {
+      cy.get(page).should('have.attr', 'aria-current');
+    }
+  });
+}
+
+export function verifyPageHeader(text: string) {
+  return cy.get('header h1').should('be.visible').and('have.text', text);
+}
+
+export function waitForSpinner() {
+  cy.get(navigation.pageSpinner, Cypress.env('epochTimeout')).should('exist');
+  cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
+}
+
+export function verifyUnstakedBalance(amount: number) {
+  cy.getByTestId('vega-wallet-balance-unstaked', txTimeout).should(
+    'contain',
+    amount,
+    txTimeout
+  );
+}
+
+export function verifyStakedBalance(amount: number) {
+  cy.getByTestId('vega-wallet-balance-staked-validators', txTimeout)
+    .should('contain', amount, txTimeout)
+    .and('contain', '…');
+}
+
+export function verifyEthWalletTotalAssociatedBalance(amount: string) {
+  cy.getByTestId('currency-locked', txTimeout)
+    .should('contain', amount)
+    .and('be.visible');
+}
+
+export function verifyEthWalletAssociatedBalance(amount: string) {
+  cy.getByTestId('eth-wallet-associated-balances', txTimeout)
+    .contains(Cypress.env('vegaWalletPublicKeyShort'), txTimeout)
+    .parent(txTimeout)
+    .should('contain', amount, txTimeout);
+}
@@ -1,228 +0,0 @@
-const newProposalButton = '[data-testid="new-proposal-link"]';
-const proposalInformationTableRows = '[data-testid="key-value-table-row"]';
-const proposalListItem = '[data-testid="proposals-list-item"]';
-const newProposalTitle = '[data-testid="proposal-title"]';
-const newProposalDescription = '[data-testid="proposal-description"]';
-const proposalDetails = '[data-testid="proposal-details"]';
-const rawProposalData = '[data-testid="proposal-data"]';
-const voteButtons = '[data-testid="vote-buttons"]';
-const dialogTitle = '[data-testid="dialog-title"]';
-const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
-const newProposalSubmitButton = '[data-testid="proposal-submit"]';
-const dialogCloseButton = '[data-testid="dialog-close"]';
-const epochTimeout = Cypress.env('epochTimeout');
-const proposalTimeout = { timeout: 14000 };
-
-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_raw_proposal_body', (timestamp) => {
-  cy.fixture('/proposals/raw.json').then((rawProposal) => {
-    rawProposal.terms.closingTimestamp = timestamp;
-    rawProposal.rationale.title += timestamp;
-    let proposalPayload = JSON.stringify(rawProposal);
-
-    cy.get(rawProposalData).type(proposalPayload, {
-      parseSpecialCharSequences: false,
-      delay: 2,
-    });
-    cy.get(newProposalSubmitButton).should('be.visible').click();
-    cy.wrap(rawProposal);
-  });
-});
-
-Cypress.Commands.add(
-  'enter_unique_freeform_proposal_body',
-  (timestamp, proposalTitle) => {
-    cy.get(newProposalTitle).type(proposalTitle);
-    cy.get(newProposalDescription).type(
-      'this is a e2e freeform proposal description'
-    );
-    cy.get(proposalVoteDeadline).clear().click().type(timestamp);
-    cy.getByTestId('proposal-submit').should('be.visible').click();
-  }
-);
-
-Cypress.Commands.add(
-  'get_submitted_proposal_from_proposal_list',
-  (proposalTitle) => {
-    cy.get_proposal_id_from_list(proposalTitle).then(() => {
-      cy.get('@proposalIdText').then((proposalId) => {
-        return cy.get(`#${proposalId}`);
-      });
-    });
-  }
-);
-
-Cypress.Commands.add('get_proposal_id_from_list', (proposalTitle) => {
-  cy.contains(proposalTitle)
-    .parentsUntil(proposalListItem)
-    .within(() => {
-      cy.get(proposalDetails)
-        .invoke('text')
-        .then((proposalIdText) => {
-          let newProposalId;
-          if (proposalIdText.includes('Freeform proposal')) {
-            newProposalId = proposalIdText.replace('Freeform proposal: ', '');
-          }
-          cy.wrap(newProposalId).as('proposalIdText');
-        });
-    });
-});
-
-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.get(dialogTitle).should('have.text', 'Transaction complete');
-  cy.get(dialogCloseButton).click();
-});
-
-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);
-    }
-  });
-});
-
-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.navigate_to_page_if_not_already_loaded('proposals');
-  cy.get(newProposalButton).should('be.visible').click();
-  cy.url().should('include', '/proposals/propose');
-  cy.get('li').should('contain.text', proposalType).and('be.visible');
-  cy.get('li').contains(proposalType).click();
-});
-
-Cypress.Commands.add('wait_for_proposal_submitted', () => {
-  cy.contains('Awaiting network confirmation', epochTimeout).should(
-    'be.visible'
-  );
-  cy.contains('Proposal submitted', proposalTimeout).should('be.visible');
-  cy.get(dialogCloseButton).click();
-});
-
-export function createRawProposal(proposerBalance) {
-  if (proposerBalance)
-    cy.ensure_specified_unstaked_tokens_are_associated(proposerBalance);
-  cy.go_to_make_new_proposal('raw proposal');
-  cy.create_ten_digit_unix_timestamp_for_specified_days('8').then(
-    (closingDateTimestamp) => {
-      cy.enter_raw_proposal_body(closingDateTimestamp).as('rawProposal');
-    }
-  );
-  cy.wait_for_proposal_submitted();
-  cy.wait_for_proposal_sync();
-  cy.navigate_to('proposals');
-}
-
-export function generateFreeFormProposalTitle() {
-  const randomNum = Math.floor(Math.random() * 1000) + 1;
-  return randomNum + ': Freeform e2e proposal';
-}
-
-export function createFreeformProposal(proposalTitle) {
-  cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
-  cy.enter_unique_freeform_proposal_body('50', proposalTitle);
-  cy.wait_for_proposal_submitted();
-  cy.wait_for_proposal_sync();
-  cy.getByTestId('proposal-title').invoke('text').as('proposalTitle');
-  cy.navigate_to('proposals');
-}
-
-export const governanceProposalType = {
-  NETWORK_PARAMETER: 'Network parameter',
-  NEW_MARKET: 'New market',
-  UPDATE_MARKET: 'Update market',
-  NEW_ASSET: 'New asset',
-  FREEFORM: 'Freeform',
-  RAW: 'raw proposal',
-};
@@ -0,0 +1,215 @@
+import { navigateTo, navigation } from './common.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';
+
+const newProposalButton = '[data-testid="new-proposal-link"]';
+const proposalInformationTableRows = '[data-testid="key-value-table-row"]';
+const proposalListItem = '[data-testid="proposals-list-item"]';
+const newProposalTitle = '[data-testid="proposal-title"]';
+const newProposalDescription = '[data-testid="proposal-description"]';
+const proposalDetails = '[data-testid="proposal-details"]';
+const rawProposalData = '[data-testid="proposal-data"]';
+const voteButtons = '[data-testid="vote-buttons"]';
+const dialogTitle = '[data-testid="dialog-title"]';
+const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
+const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const dialogCloseButton = '[data-testid="dialog-close"]';
+const epochTimeout = Cypress.env('epochTimeout');
+const proposalTimeout = { timeout: 14000 };
+
+export function convertUnixTimestampToDateformat(
+  unixTimestamp: number,
+  monthTextLength = 'longMonth'
+) {
+  const dateSupplied = new Date(unixTimestamp * 1000);
+  const year = dateSupplied.getFullYear();
+  const months = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+  ];
+  const month = months[dateSupplied.getMonth()];
+  const shortMonth = months[dateSupplied.getMonth()].substring(0, 3),
+    date = dateSupplied.getDate();
+
+  if (monthTextLength === 'longMonth') {
+    return cy.wrap(`${date} ${month} ${year}`);
+  } else return cy.wrap(`${date} ${shortMonth} ${year}`);
+}
+
+export function createTenDigitUnixTimeStampForSpecifiedDays(
+  durationDays: number
+) {
+  const today = new Date();
+  let timestamp = today.setDate(today.getDate() + durationDays);
+  return (timestamp = Math.floor(timestamp / 1000));
+}
+
+export function enterRawProposalBody(timestamp: number) {
+  cy.fixture('/proposals/raw.json').then((rawProposal) => {
+    rawProposal.terms.closingTimestamp = timestamp;
+    rawProposal.rationale.title += timestamp;
+    const proposalPayload = JSON.stringify(rawProposal);
+
+    cy.get(rawProposalData).type(proposalPayload, {
+      parseSpecialCharSequences: false,
+      delay: 2,
+    });
+    cy.get(newProposalSubmitButton).should('be.visible').click();
+    cy.wrap(rawProposal).as('rawProposal');
+  });
+}
+
+export function enterUniqueFreeFormProposalBody(
+  timestamp: string,
+  proposalTitle: string
+) {
+  cy.get(newProposalTitle).type(proposalTitle);
+  cy.get(newProposalDescription).type(
+    'this is a e2e freeform proposal description'
+  );
+  cy.get(proposalVoteDeadline).clear().click().type(timestamp);
+  cy.getByTestId('proposal-submit').should('be.visible').click();
+}
+
+export function getSubmittedProposalFromProposalList(proposalTitle: string) {
+  getProposalIdFromList(proposalTitle);
+  cy.get('@proposalIdText').then((proposalId) => {
+    cy.get(`#${proposalId}`).as('submittedProposal');
+  });
+  return cy.get('@submittedProposal');
+}
+
+export function getProposalIdFromList(proposalTitle: string) {
+  cy.contains(proposalTitle)
+    .parentsUntil(proposalListItem)
+    .within(() => {
+      cy.get(proposalDetails)
+        .invoke('text')
+        .then((proposalIdText) => {
+          let newProposalId;
+          if (proposalIdText.includes('Freeform proposal')) {
+            newProposalId = proposalIdText.replace('Freeform proposal: ', '');
+          }
+          cy.wrap(newProposalId).as('proposalIdText');
+        });
+    });
+}
+
+export function getGovernanceProposalDateFormatForSpecifiedDays(
+  days: number,
+  shortOrLong?: string
+) {
+  return convertUnixTimestampToDateformat(
+    createTenDigitUnixTimeStampForSpecifiedDays(days),
+    shortOrLong
+  );
+}
+
+export function getProposalInformationFromTable(heading: string) {
+  return cy.get(proposalInformationTableRows).contains(heading).siblings();
+}
+
+export function voteForProposal(vote: string) {
+  cy.contains('Vote breakdown').should('be.visible', { timeout: 10000 });
+  cy.get(voteButtons).contains(vote).click();
+  cy.get(dialogTitle, proposalTimeout).should(
+    'have.text',
+    'Transaction complete'
+  );
+  cy.get(dialogCloseButton).click();
+}
+
+export function waitForProposalSync() {
+  // 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();
+    }
+  });
+}
+
+export function getSortOrderOfSuppliedArray(suppliedArray: string[]) {
+  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';
+}
+
+export function goToMakeNewProposal(proposalType: string) {
+  navigateTo(navigation.proposals);
+  cy.get(newProposalButton).should('be.visible').click();
+  cy.url().should('include', '/proposals/propose');
+  cy.get('li').should('contain.text', proposalType).and('be.visible');
+  cy.get('li').contains(proposalType).click();
+}
+
+export function waitForProposalSubmitted() {
+  cy.contains('Awaiting network confirmation', epochTimeout).should(
+    'be.visible'
+  );
+  cy.contains('Proposal submitted', proposalTimeout).should('be.visible');
+  cy.get(dialogCloseButton).click();
+}
+
+export function createRawProposal(proposerBalance?: string) {
+  if (proposerBalance) {
+    ensureSpecifiedUnstakedTokensAreAssociated(proposerBalance);
+  }
+
+  goToMakeNewProposal(governanceProposalType.RAW);
+  enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
+  waitForProposalSubmitted();
+  waitForProposalSync();
+  navigateTo(navigation.proposals);
+}
+
+export function generateFreeFormProposalTitle() {
+  const randomNum = Math.floor(Math.random() * 1000) + 1;
+  return randomNum + ': Freeform e2e proposal';
+}
+
+export function createFreeformProposal(proposalTitle: string) {
+  goToMakeNewProposal(governanceProposalType.FREEFORM);
+  enterUniqueFreeFormProposalBody('50', proposalTitle);
+  waitForProposalSubmitted();
+  waitForProposalSync();
+  cy.getByTestId('proposal-title').invoke('text').as('proposalTitle');
+  navigateTo(navigation.proposals);
+}
+
+export const governanceProposalType = {
+  NETWORK_PARAMETER: 'Network parameter',
+  NEW_MARKET: 'New market',
+  UPDATE_MARKET: 'Update market',
+  NEW_ASSET: 'New asset',
+  FREEFORM: 'Freeform',
+  RAW: 'raw proposal',
+};
@@ -0,0 +1,20 @@
+/// <reference types="cypress" />
+
+declare namespace Cypress {
+  // specify additional properties in the TestConfig object
+  // in our case we will add "tags" property
+  interface SuiteConfigOverrides {
+    /**
+     * List of tags for this test
+     * @example a single tag
+     *  it('logs in', { tags: '@smoke' }, () => { ... })
+     * @example multiple tags
+     *  it('works', { tags: ['@smoke', '@slow'] }, () => { ... })
+     */
+    tags?: string | string[];
+  }
+
+  interface Cypress {
+    grep?: (grep?: string, tags?: string, burn?: string) => void;
+  }
+}
@@ -1,12 +1,12 @@
 import '@vegaprotocol/cypress';
 import 'cypress-real-events/support';

-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';
+import './common.functions.ts';
+import './staking.functions.ts';
+import './governance.functions.ts';
+import './wallet-eth.functions.ts';
+import './wallet-teardown.functions.ts';
+import './wallet-vega.functions.ts';
 import './proposal.functions.ts';
 import registerCypressGrep from '@cypress/grep';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
@@ -1,3 +1,5 @@
+import { vegaWalletTeardown } from './wallet-teardown.functions';
+
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
 const tokenInputApprove = '[data-testid="token-input-approve-button"]';
@@ -21,44 +23,47 @@ const dialogCloseButton = '[data-testid="dialog-close"]';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');

-Cypress.Commands.add('wait_for_beginning_of_epoch', () => {
+export function waitForBeginningOfEpoch() {
  cy.contains('Waiting for next epoch to start', epochTimeout).should(
    'not.exist'
  );
  cy.contains('Waiting for next epoch to start', epochTimeout).should(
    'be.visible'
  );
-});
+}

-Cypress.Commands.add('staking_validator_page_add_stake', (stake) => {
+export function stakingValidatorPageAddStake(stake: string) {
  cy.highlight(`Adding a stake of ${stake}`);
  cy.get(addStakeRadioButton, epochTimeout).click({ force: true });
  cy.get(tokenAmountInputBox).type(stake);
-  cy.wait_for_beginning_of_epoch();
+  waitForBeginningOfEpoch();
  cy.get(tokenSubmitButton, epochTimeout)
    .should('be.enabled')
    .and('contain', `Add ${stake} $VEGA tokens`)
    .and('be.visible')
    .click();
-});
+}

-Cypress.Commands.add('staking_validator_page_remove_stake', (stake) => {
+export function stakingValidatorPageRemoveStake(stake: string) {
  cy.highlight(`Removing a stake of ${stake}`);
  cy.get(removeStakeRadioButton, epochTimeout).click();
  cy.get(tokenAmountInputBox).type(stake);
-  cy.wait_for_beginning_of_epoch();
+  waitForBeginningOfEpoch();
  cy.get(tokenSubmitButton)
    .should('be.enabled', epochTimeout)
    .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
    .and('be.visible')
    .click();
  cy.get(dialogCloseButton).click();
-});
+}

-Cypress.Commands.add('staking_page_associate_tokens', (amount, options) => {
-  let approve = options && options.approve ? options.approve : false;
-  let type = options && options.type ? options.type : 'wallet';
-  let skipConfirmation =
+export function stakingPageAssociateTokens(
+  amount: string,
+  options?: associateOptions
+) {
+  const approve = options && options.approve ? options.approve : false;
+  const type = options && options.type ? options.type : 'wallet';
+  const skipConfirmation =
    options && options.skipConfirmation ? options.skipConfirmation : false;

  cy.highlight(`Associating ${amount} tokens from ${type}`);
@@ -94,10 +99,13 @@ Cypress.Commands.add('staking_page_associate_tokens', (amount, options) => {
      txTimeout
    ).should('be.visible');
  }
-});
+}

-Cypress.Commands.add('staking_page_disassociate_tokens', (amount, options) => {
-  let type = options && options.type ? options.type : 'wallet';
+export function stakingPageDisassociateTokens(
+  amount: string,
+  options?: associateOptions
+) {
+  const type = options && options.type ? options.type : 'wallet';
  cy.highlight(
    `Disassociating ${amount} tokens via Staking Page back to ${type}`
  );
@@ -127,92 +135,89 @@ Cypress.Commands.add('staking_page_disassociate_tokens', (amount, options) => {
      txTimeout
    ).should('be.visible');
  }
-});
+}

-Cypress.Commands.add(
-  'staking_page_disassociate_all_tokens',
-  (type = 'wallet') => {
-    cy.highlight(`Disassociating all tokens via Staking Page`);
-    cy.get(ethWalletDissociateButton).first().click();
-    cy.get(stakeMaximumTokens, epochTimeout).click();
-    cy.get(tokenSubmitButton, epochTimeout).click();
-    if (type === 'wallet') {
-      cy.contains(
-        `$VEGA tokens have been returned to Ethereum wallet`,
-        txTimeout
-      ).should('be.visible');
-    } else if (type === 'contract') {
-      cy.contains(
-        `$VEGA tokens have been returned to Vesting contract`,
-        txTimeout
-      ).should('be.visible');
-    }
+export function stakingPageDisassociateAllTokens(type = 'wallet') {
+  cy.highlight(`Disassociating all tokens via Staking Page`);
+  cy.get(ethWalletDissociateButton).first().click();
+  cy.get(stakeMaximumTokens, epochTimeout).click();
+  cy.get(tokenSubmitButton, epochTimeout).click();
+  if (type === 'wallet') {
+    cy.contains(
+      `$VEGA tokens have been returned to Ethereum wallet`,
+      txTimeout
+    ).should('be.visible');
+  } else if (type === 'contract') {
+    cy.contains(
+      `$VEGA tokens have been returned to Vesting contract`,
+      txTimeout
+    ).should('be.visible');
  }
-);
+}

-Cypress.Commands.add(
-  'click_on_validator_from_list',
-  (validatorNumber, validatorName = null) => {
-    cy.contains('Loading...', epochTimeout).should('not.exist');
-    cy.wait_for_beginning_of_epoch();
-    // below is to ensure validator list is shown
-    cy.get(stakeValidatorListName, { timeout: 10000 }).should('exist');
-    cy.get(stakeValidatorListPendingStake, txTimeout).should(
-      'not.contain',
-      '2,000,000,000,000,000,000.00' // number due to bug #936
+export function clickOnValidatorFromList(
+  validatorNumber: number,
+  validatorName = null
+) {
+  cy.contains('Loading...', epochTimeout).should('not.exist');
+  waitForBeginningOfEpoch();
+  // below is to ensure validator list is shown
+  cy.get(stakeValidatorListName, { timeout: 10000 }).should('exist');
+  cy.get(stakeValidatorListPendingStake, txTimeout).should(
+    'not.contain',
+    '2,000,000,000,000,000,000.00' // number due to bug #936
+  );
+  if (validatorName) {
+    cy.contains(validatorName).click();
+  } else {
+    cy.get(`[row-id="${validatorNumber}"]`)
+      .should('be.visible')
+      .find(stakeValidatorListName)
+      .click();
+  }
+}
+
+export function validateValidatorListTotalStakeAndShare(
+  positionOnList: string,
+  expectedTotalStake: string,
+  expectedTotalShare: string
+) {
+  cy.contains('Loading...', epochTimeout).should('not.exist');
+  waitForBeginningOfEpoch();
+  cy.get(`[row-id="${positionOnList}"]`).within(() => {
+    cy.get(stakeValidatorListTotalStake, epochTimeout).should(
+      'have.text',
+      expectedTotalStake
    );
-    if (validatorName) {
-      cy.contains(validatorName).click();
-    } else {
-      cy.get(`[row-id="${validatorNumber}"]`)
-        .should('be.visible')
-        .find(stakeValidatorListName)
-        .click();
-    }
-  }
-);
+    cy.get(stakeValidatorListTotalShare, epochTimeout).should(
+      'have.text',
+      expectedTotalShare
+    );
+  });
+}

-Cypress.Commands.add(
-  'validate_validator_list_total_stake_and_share',
-  (positionOnList, expectedTotalStake, expectedTotalShare) => {
-    cy.contains('Loading...', epochTimeout).should('not.exist');
-    cy.wait_for_beginning_of_epoch();
-    cy.get(`[row-id="${positionOnList}"]`).within(() => {
-      cy.get(stakeValidatorListTotalStake, epochTimeout).should(
-        'have.text',
-        expectedTotalStake
-      );
-      cy.get(stakeValidatorListTotalShare, epochTimeout).should(
-        'have.text',
-        expectedTotalShare
-      );
+export function ensureSpecifiedUnstakedTokensAreAssociated(
+  tokenAmount: string
+) {
+  cy.highlight(`Ensuring ${tokenAmount} token(s) associated`);
+  cy.get(vegaWalletUnstakedBalance)
+    .children()
+    .children()
+    .eq(1)
+    .invoke('text')
+    .then((unstakedBalance) => {
+      if (parseFloat(unstakedBalance) != parseFloat(tokenAmount)) {
+        vegaWalletTeardown();
+        cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
+          '0.00',
+          txTimeout
+        );
+        stakingPageAssociateTokens(tokenAmount);
+      }
    });
-  }
-);
+}

-Cypress.Commands.add(
-  'ensure_specified_unstaked_tokens_are_associated',
-  (tokenAmount) => {
-    cy.highlight(`Ensuring ${tokenAmount} token(s) associated`);
-    cy.get(vegaWalletUnstakedBalance)
-      .children()
-      .children()
-      .eq(1)
-      .invoke('text')
-      .then((unstakedBalance) => {
-        if (parseFloat(unstakedBalance) != parseFloat(tokenAmount)) {
-          cy.vega_wallet_teardown();
-          cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
-            '0.00',
-            txTimeout
-          );
-          cy.staking_page_associate_tokens(tokenAmount);
-        }
-      });
-  }
-);
-
-Cypress.Commands.add('close_staking_dialog', () => {
+export function closeStakingDialog() {
  cy.getByTestId('dialog-title').should(
    'contain.text',
    'At the beginning of the next epoch'
@@ -220,20 +225,26 @@ Cypress.Commands.add('close_staking_dialog', () => {
  cy.getByTestId('dialog-content').within(() => {
    cy.get('a').should('have.text', 'Back to Staking').click();
  });
-});
+}

-Cypress.Commands.add(
-  'validate_wallet_currency',
-  (currencyTitle, expectedAmount) => {
-    cy.get("[data-testid='currency-title']")
-      .contains(currencyTitle)
-      .parent()
-      .parent()
-      .within(() => {
-        cy.getByTestId('currency-value', txTimeout).should(
-          'have.text',
-          expectedAmount
-        );
-      });
-  }
-);
+export function validateWalletCurrency(
+  currencyTitle: string,
+  expectedAmount: string
+) {
+  cy.get("[data-testid='currency-title']")
+    .contains(currencyTitle)
+    .parent()
+    .parent()
+    .within(() => {
+      cy.getByTestId('currency-value', txTimeout).should(
+        'have.text',
+        expectedAmount
+      );
+    });
+}
+
+interface associateOptions {
+  approve?: boolean;
+  type?: string;
+  skipConfirmation?: boolean;
+}
@@ -3,7 +3,7 @@ const connectToEthButton =
  '[data-testid="connect-to-eth-wallet-button"]:visible';
 const capsuleWalletConnectButton = '[data-testid="web3-connector-Unknown"]';

-Cypress.Commands.add('ethereum_wallet_connect', () => {
+export function ethereumWalletConnect() {
  cy.highlight('Connecting Eth Wallet');
  cy.get(connectToEthButton).within(() => {
    cy.contains('Connect Ethereum wallet to associate $VEGA')
@@ -20,4 +20,4 @@ Cypress.Commands.add('ethereum_wallet_connect', () => {
  // It needs a few seconds before becoming operational
  // eslint-disable-next-line cypress/no-unnecessary-waiting
  cy.wait(4000);
-});
+}
@@ -1,198 +0,0 @@
-import {
-  StakingBridge,
-  Token,
-  TokenVesting,
-  TokenFaucetable,
-  CollateralBridge,
-} from '@vegaprotocol/smart-contracts';
-import { ethers, Wallet } from 'ethers';
-
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
-const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
-const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
-const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
-const vegaTokenAddress = Cypress.env('vegaTokenAddress');
-const ethWalletPubKey = Cypress.env('ethWalletPublicKey');
-const ethStakingBridgeContractAddress = Cypress.env(
-  'ethStakingBridgeContractAddress'
-);
-const ethProviderUrl = Cypress.env('ethProviderUrl');
-const getAccount = (number = 0) => `m/44'/60'/0'/0/${number}`;
-const transactionTimeout = '90000';
-const Erc20BridgeAddress = '0x9708FF7510D4A7B9541e1699d15b53Ecb1AFDc54';
-
-before('Vega wallet teardown prep', function () {
-  cy.wrap(new ethers.providers.JsonRpcProvider({ url: ethProviderUrl }), {
-    log: false,
-  }).as('provider');
-
-  cy.wrap(Wallet.fromMnemonic(vegaWalletMnemonic, getAccount(0)).privateKey, {
-    log: false,
-  }).then((privateKey) => {
-    cy.wrap(new Wallet(privateKey, this.provider), { log: false }).as('signer');
-  });
-
-  cy.get('@signer', { log: false }).then((signer) => {
-    cy.wrap(new StakingBridge(ethStakingBridgeContractAddress, signer), {
-      log: false,
-    }).as('stakingBridgeContract');
-    cy.wrap(new TokenVesting(vegaTokenContractAddress, signer), {
-      log: false,
-    }).as('vestingContract');
-  });
-});
-
-beforeEach(function () {
-  cy.wrap(this.stakingBridgeContract).as('stakingBridgeContract');
-  cy.wrap(this.vestingContract).as('vestingContract');
-});
-
-Cypress.Commands.add('deposit_asset', function (assetEthAddress, amount) {
-  cy.highlight('Depositing asset into vegawallet');
-  cy.get('@signer', { log: false }).then((signer) => {
-    // Approve asset
-    cy.wrap(
-      new TokenFaucetable(assetEthAddress, signer).approve(
-        Erc20BridgeAddress,
-        amount + '0'.repeat(19)
-      )
-    )
-      .then((tx) => {
-        cy.wait_for_transaction(tx);
-      })
-      .then(() => {
-        cy.wrap(new CollateralBridge(Erc20BridgeAddress, signer), {
-          log: false,
-        }).then((bridge) => {
-          // Deposit asset into vega wallet
-          cy.wrap(
-            bridge.deposit_asset(
-              assetEthAddress,
-              amount + '0'.repeat(18),
-              '0x' + vegaWalletPubKey
-            ),
-            { timeout: transactionTimeout, log: false }
-          ).then((tx) => {
-            cy.wait_for_transaction(tx);
-          });
-        });
-      });
-  });
-});
-
-Cypress.Commands.add('faucet_asset', function (assetEthAddress) {
-  cy.get('@signer', { log: false }).then((signer) => {
-    cy.wrap(new TokenFaucetable(assetEthAddress, signer), { log: false }).then(
-      (token) => {
-        cy.wrap(token.faucet(), {
-          timeout: transactionTimeout,
-          log: false,
-        }).then((tx) => {
-          cy.wait_for_transaction(tx);
-        });
-      }
-    );
-  });
-});
-
-Cypress.Commands.add('vega_wallet_teardown', function () {
-  cy.get('aside [data-testid="associated-amount"]')
-    .should('be.visible')
-    .invoke('text')
-    .as('associatedAmount');
-  cy.get('body').then(($body) => {
-    if (
-      $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
-      this.associatedAmount != '0.00'
-    ) {
-      cy.vega_wallet_teardown_vesting(this.vestingContract);
-      cy.vega_wallet_teardown_staking(this.stakingBridgeContract);
-    }
-  });
-  cy.get(vegaWalletContainer).within(() => {
-    cy.get('[data-testid="associated-amount"]', { timeout: 30000 }).should(
-      'contain.text',
-      '0.00'
-    );
-  });
-});
-
-Cypress.Commands.add(
-  'vega_wallet_set_specified_approval_amount',
-  function (resetAmount) {
-    cy.highlight(`Setting token approval amount to ${resetAmount}`);
-    cy.wrap(new Token(vegaTokenAddress, this.signer), { log: false }).then(
-      (token) => {
-        cy.wrap(
-          token.approve(
-            ethStakingBridgeContractAddress,
-            resetAmount.concat('000000000000000000')
-          ),
-          { timeout: transactionTimeout, log: false }
-        ).then((tx) => {
-          cy.wait_for_transaction(tx);
-        });
-      }
-    );
-  }
-);
-
-Cypress.Commands.add(
-  'vega_wallet_teardown_staking',
-  (stakingBridgeContract) => {
-    cy.highlight('Tearing down staking tokens from vega wallet if present');
-    cy.wrap(
-      stakingBridgeContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-      {
-        timeout: transactionTimeout,
-        log: false,
-      }
-    ).then((stake_amount) => {
-      if (String(stake_amount) != '0') {
-        cy.wrap(
-          stakingBridgeContract.remove_stake(stake_amount, vegaWalletPubKey),
-          { timeout: transactionTimeout, log: false }
-        ).then((tx) => {
-          cy.wait_for_transaction(tx);
-        });
-      }
-    });
-  }
-);
-
-Cypress.Commands.add('vega_wallet_teardown_vesting', (vestingContract) => {
-  cy.highlight('Tearing down vesting tokens from vega wallet if present');
-  cy.wrap(vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey), {
-    timeout: transactionTimeout,
-    log: false,
-  }).then((vesting_amount) => {
-    if (String(vesting_amount) != '0') {
-      cy.wrap(vestingContract.remove_stake(vesting_amount, vegaWalletPubKey), {
-        timeout: transactionTimeout,
-        log: false,
-      }).then((tx) => {
-        cy.wait_for_transaction(tx);
-      });
-    }
-  });
-});
-
-Cypress.Commands.add('vega_wallet_associate', (amount) => {
-  amount = amount + '0'.repeat(18);
-  cy.highlight('Associating tokens');
-  cy.get('@stakingBridgeContract').then((stakingBridgeContract) => {
-    stakingBridgeContract.stake(amount, vegaWalletPubKey);
-  });
-});
-
-Cypress.Commands.add('vega_wallet_disassociate', (amount) => {
-  amount = amount + '0'.repeat(18);
-  cy.highlight('Disassociating tokens');
-  cy.get('@stakingBridgeContract').then((stakingBridgeContract) => {
-    stakingBridgeContract.remove_stake(amount, vegaWalletPubKey);
-  });
-});
-
-Cypress.Commands.add('wait_for_transaction', (tx) => {
-  cy.wrap(tx.wait(1).catch(cy.log), { timeout: transactionTimeout });
-});
@@ -0,0 +1,146 @@
+import { promiseWithTimeout } from '@vegaprotocol/cypress';
+import {
+  StakingBridge,
+  Token,
+  TokenVesting,
+  TokenFaucetable,
+  CollateralBridge,
+} from '@vegaprotocol/smart-contracts';
+import { ethers, Wallet } from 'ethers';
+
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
+const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
+const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
+const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
+const vegaTokenAddress = Cypress.env('vegaTokenAddress');
+const ethWalletPubKey = Cypress.env('ethWalletPublicKey');
+const ethStakingBridgeContractAddress = Cypress.env(
+  'ethStakingBridgeContractAddress'
+);
+const ethProviderUrl = Cypress.env('ethProviderUrl');
+const getAccount = (number = 0) => `m/44'/60'/0'/0/${number}`;
+const transactionTimeout = 100000;
+const Erc20BridgeAddress = '0x9708FF7510D4A7B9541e1699d15b53Ecb1AFDc54';
+
+const provider = new ethers.providers.JsonRpcProvider({ url: ethProviderUrl });
+const privateKey = Wallet.fromMnemonic(
+  vegaWalletMnemonic,
+  getAccount(0)
+).privateKey;
+const signer = new Wallet(privateKey, provider);
+const stakingBridgeContract = new StakingBridge(
+  ethStakingBridgeContractAddress,
+  signer
+);
+const vestingContract = new TokenVesting(vegaTokenContractAddress, signer);
+
+export async function depositAsset(assetEthAddress: string, amount: string) {
+  // Approve asset
+  const faucet = new TokenFaucetable(assetEthAddress, signer);
+  cy.wrap(faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(19)), {
+    timeout: transactionTimeout,
+    log: false,
+  }).then(() => {
+    const collateralBridge = new CollateralBridge(Erc20BridgeAddress, signer);
+    cy.wrap(
+      collateralBridge.deposit_asset(
+        assetEthAddress,
+        amount + '0'.repeat(18),
+        '0x' + vegaWalletPubKey
+      ),
+      { timeout: transactionTimeout, log: false }
+    );
+  });
+}
+
+export async function faucetAsset(assetEthAddress: string) {
+  const faucet = new TokenFaucetable(assetEthAddress, signer);
+  await promiseWithTimeout(faucet.faucet(), 10 * 60 * 1000, 'faucet asset');
+}
+
+export async function vegaWalletTeardown() {
+  cy.get('[data-testid="associated-amount"]')
+    .should('be.visible')
+    .invoke('text')
+    .then((associatedAmount) => {
+      cy.get('body').then(($body) => {
+        if (
+          $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
+          associatedAmount != '0.00'
+        ) {
+          vegaWalletTeardownVesting(vestingContract);
+          vegaWalletTeardownStaking(stakingBridgeContract);
+        }
+      });
+      cy.get(vegaWalletContainer).within(() => {
+        cy.getByTestId('vega-wallet-balance-staked-validators', {
+          timeout: transactionTimeout,
+        }).should('not.exist');
+        cy.getByTestId('associated-amount', {
+          timeout: transactionTimeout,
+        }).contains('0.00', {
+          timeout: transactionTimeout,
+        });
+      });
+    });
+}
+
+export async function vegaWalletSetSpecifiedApprovalAmount(
+  resetAmount: string
+) {
+  cy.highlight(`Setting token approval amount to ${resetAmount}`);
+  const token = new Token(vegaTokenAddress, signer);
+  await promiseWithTimeout(
+    token.approve(
+      ethStakingBridgeContractAddress,
+      resetAmount.concat('000000000000000000')
+    ),
+    10 * 60 * 1000,
+    'set approval amount'
+  );
+}
+
+async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
+  cy.highlight('Tearing down staking tokens from vega wallet if present');
+  cy.wrap(
+    stakingBridgeContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
+    { timeout: transactionTimeout, log: false }
+  ).then((stakeBalance) => {
+    if (Number(stakeBalance) != 0) {
+      cy.wrap(
+        stakingBridgeContract.remove_stake(
+          String(stakeBalance),
+          vegaWalletPubKey
+        ),
+        { timeout: transactionTimeout, log: false }
+      );
+    }
+  });
+}
+
+async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
+  cy.highlight('Tearing down vesting tokens from vega wallet if present');
+  cy.wrap(vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey), {
+    timeout: transactionTimeout,
+    log: false,
+  }).then((vestingAmount) => {
+    if (Number(vestingAmount) != 0) {
+      cy.wrap(
+        vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
+        { timeout: transactionTimeout, log: false }
+      );
+    }
+  });
+}
+
+export async function vegaWalletAssociate(amount: string) {
+  cy.highlight('Associating tokens');
+  amount = amount + '0'.repeat(18);
+  stakingBridgeContract.stake(amount, vegaWalletPubKey);
+}
+
+export async function vegaWalletDisassociate(amount: string) {
+  cy.highlight('Disassociating tokens');
+  amount = amount + '0'.repeat(18);
+  stakingBridgeContract.remove_stake(amount, vegaWalletPubKey);
+}
@@ -1,17 +0,0 @@
-Cypress.Commands.add(
-  'vega_wallet_faucet_assets_without_check',
-  function (asset, amount, vegaWalletPublicKey) {
-    cy.highlight(`Topping up vega wallet with ${asset}, amount: ${amount}`);
-    cy.exec(
-      `curl -X POST -d '{"amount": "${amount}", "asset": "${asset}", "party": "${vegaWalletPublicKey}"}' http://localhost:1790/api/v1/mint`
-    )
-      .its('stdout')
-      .then((response) => {
-        assert.include(
-          response,
-          `"success":true`,
-          'Ensuring curl command was successfully undertaken'
-        );
-      });
-  }
-);
@@ -0,0 +1,18 @@
+export function vegaWalletFaucetAssetsWithoutCheck(
+  asset: string,
+  amount: string,
+  vegaWalletPublicKey: string
+) {
+  cy.highlight(`Topping up vega wallet with ${asset}, amount: ${amount}`);
+  cy.exec(
+    `curl -X POST -d '{"amount": "${amount}", "asset": "${asset}", "party": "${vegaWalletPublicKey}"}' http://localhost:1790/api/v1/mint`
+  )
+    .its('stdout')
+    .then((response) => {
+      assert.include(
+        response,
+        `"success":true`,
+        'Ensuring curl command was successfully undertaken'
+      );
+    });
+}
@@ -1,6 +1,8 @@
 {
  "extends": "../../tsconfig.base.json",
  "compilerOptions": {
+    "target": "es5",
+    "lib": ["es5", "dom", "es2021"],
    "strict": true,
    "jsx": "react-jsx",
    "sourceMap": false,
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
-NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
+NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -165,7 +165,7 @@ const ConnectedKey = () => {
      </section>
      <WalletCardActions>
        <Link className="flex-1" to={Routes.ASSOCIATE}>
-          <Button size="sm" fill={true}>
+          <Button data-testid="associate-btn" size="sm" fill={true}>
            {t('associate')}
          </Button>
        </Link>
@@ -21,9 +21,9 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
    <>
      <AnnouncementBanner>
        <div className="font-alpha calt uppercase text-center text-lg text-white">
-          <span className="pr-4">Mainnet sim 3 is live!</span>
-          <ExternalLink href="https://fairground.wtf/">
-            Come help stress test the network
+          <span className="pr-4">Wait no longer, SIM3 is here!</span>
+          <ExternalLink href="https://fairground.wtf/sim3">
+            Learn more
          </ExternalLink>
        </div>
      </AnnouncementBanner>
@@ -221,8 +221,9 @@
  "votePending": "Casting vote",
  "voteError": "Something went wrong, and your vote was not seen by the network",
  "back": "back",
-  "byTokenVote": "by Token vote",
-  "byLiquidityVote": "by Liquidity vote",
+  "byTokenVote": "by token vote",
+  "byLiquidityVote": "by liquidity vote",
+  "byLPVote": "by LP vote",
  "youDidNotVote": "Voting has ended. You did not vote",
  "voteState_Yes": "For",
  "voteState_No": "Against",
@@ -86,7 +86,7 @@ describe('Proposal Votes Table', () => {

  it('displays if an update market proposal will pass by token vote', () => {
    renderComponent(updateMarketProposal, updateMarketProposalType);
-    expect(screen.getByText('👍 by Token vote')).toBeInTheDocument();
+    expect(screen.getByText('👍 by token vote')).toBeInTheDocument();
  });

  it('displays if an update market proposal will pass by LP vote', () => {
@@ -110,6 +110,6 @@ describe('Proposal Votes Table', () => {
      }),
      updateMarketProposalType
    );
-    expect(screen.getByText('👍 by Liquidity vote')).toBeInTheDocument();
+    expect(screen.getByText('👍 by liquidity vote')).toBeInTheDocument();
  });
 });
@@ -136,6 +136,82 @@ describe('Proposals list item details', () => {
    );
  });

+  it('Renders proposal state: Update market proposal - set to pass by LP vote', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+          },
+        },
+        votes: {
+          yes: {
+            ...generateYesVotes(0),
+            totalEquityLikeShareWeight: '1000',
+          },
+          no: {
+            ...generateNoVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Set to pass by LP vote'
+    );
+  });
+
+  it('Renders proposal state: Update market proposal - set to pass by token vote', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+          },
+        },
+        votes: {
+          yes: {
+            ...generateYesVotes(1000, 1000),
+            totalEquityLikeShareWeight: '0',
+          },
+          no: {
+            ...generateNoVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Set to pass by token vote'
+    );
+  });
+
+  it('Renders proposal state: Update market proposal - set to fail', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+          },
+        },
+        votes: {
+          yes: {
+            ...generateYesVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+          no: {
+            ...generateNoVotes(0),
+            totalEquityLikeShareWeight: '0',
+          },
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent('Set to fail');
+  });
+
  it('Renders proposal state: Open - 5 minutes left to vote', () => {
    renderComponent(
      generateProposal({
@@ -41,12 +41,22 @@ export const ProposalsListItemDetails = ({
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
 }) => {
  const state = proposal?.state;
-  const { willPassByTokenVote, majorityMet, participationMet } =
-    useVoteInformation({
-      proposal,
-    });
+  const {
+    willPassByTokenVote,
+    willPassByLPVote,
+    majorityMet,
+    participationMet,
+  } = useVoteInformation({
+    proposal,
+  });
  const { t } = useTranslation();
  const { voteState } = useUserVote(proposal?.id);
+  const isUpdateMarket = proposal?.terms.change.__typename === 'UpdateMarket';
+  const updateMarketWillPass = willPassByTokenVote || willPassByLPVote;
+  const updateMarketVotePassMethod = willPassByTokenVote
+    ? t('byTokenVote')
+    : t('byLPVote');
+
  let proposalStatus: ReactNode;
  let voteDetails: ReactNode;
  let voteStatus: ReactNode;
@@ -128,6 +138,19 @@ export const ProposalsListItemDetails = ({
          </>
        );
      voteStatus =
+        (isUpdateMarket &&
+          (updateMarketWillPass ? (
+            <>
+              {t('Set to')}{' '}
+              <StatusPass>
+                {t('pass')} {updateMarketVotePassMethod}
+              </StatusPass>
+            </>
+          ) : (
+            <>
+              {t('Set to')} <StatusFail>{t('fail')}</StatusFail>
+            </>
+          ))) ||
        (!participationMet && <ParticipationNotReached />) ||
        (!majorityMet && <MajorityNotReached />) ||
        (willPassByTokenVote ? (
@@ -32,6 +32,7 @@ export const VoteDetails = ({
    totalTokensPercentage,
    participationMet,
    totalTokensVoted,
+    totalLPTokensPercentage,
    noPercentage,
    noLPPercentage,
    yesPercentage,
@@ -41,6 +42,8 @@ export const VoteDetails = ({
    requiredMajorityPercentage,
    requiredMajorityLPPercentage,
    requiredParticipation,
+    requiredParticipationLP,
+    participationLPMet,
  } = useVoteInformation({ proposal });

  const { t } = useTranslation();
@@ -101,6 +104,25 @@ export const VoteDetails = ({
              </tr>
            </tbody>
          </table>
+
+          <p className="mb-6">
+            {t('participation')}
+            {': '}
+            {participationLPMet ? (
+              <span className="text-vega-green mx-4">{t('met')}</span>
+            ) : (
+              <span className="text-danger mx-4">{t('notMet')}</span>
+            )}{' '}
+            {formatNumber(totalLPTokensPercentage, defaultDecimals)}%
+            <span className="ml-4">
+              {requiredParticipationLP && (
+                <>
+                  ({formatNumber(requiredParticipationLP, defaultDecimals)}%{' '}
+                  {t('governanceRequired')})
+                </>
+              )}
+            </span>
+          </p>
        </section>
      )}
      <section data-testid="votes-table">
@@ -2,7 +2,7 @@ import type { Dispatch, SetStateAction } from 'react';
 import { forwardRef, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { Button } from '@vegaprotocol/ui-toolkit';
+import { Button, Icon } from '@vegaprotocol/ui-toolkit';
 import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
@@ -87,7 +87,12 @@ const TopThirdCellRenderer = (
        <div className="mb-4">
          <Button
            data-testid="show-all-validators"
-            rightIcon="arrow-right"
+            rightIcon={
+              <Icon
+                name="arrow-right"
+                className="fill-current mr-2 align-text-top"
+              />
+            }
            className="inline-flex items-center"
          >
            {t('Reveal top validators')}
@@ -1,7 +1,6 @@
 import {
  KeyValueTable,
  KeyValueTableRow,
-  Link,
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { Link as RouterLink } from 'react-router-dom';
@@ -11,7 +10,7 @@ import { useParams } from 'react-router';
 import { Navigate } from 'react-router-dom';
 import { formatNumber } from '@vegaprotocol/utils';

-import { useEnvironment } from '@vegaprotocol/environment';
+import { EtherscanLink } from '@vegaprotocol/environment';
 import { TrancheItem } from '../redemption/tranche-item';
 import Routes from '../routes';
 import { TrancheLabel } from './tranche-label';
@@ -19,7 +18,6 @@ import { useTranches } from '../../lib/tranches/tranches-store';

 export const Tranche = () => {
  const tranches = useTranches((state) => state.tranches);
-  const { ETHERSCAN_URL } = useEnvironment();
  const { t } = useTranslation();
  const { trancheId } = useParams<{ trancheId: string; address: string }>();
  const { chainId } = useWeb3React();
@@ -59,25 +57,15 @@ export const Tranche = () => {
            </KeyValueTableRow>
            {tranche.users.map((user) => (
              <KeyValueTableRow key={user}>
-                {
-                  <Link
-                    title={t('View on Etherscan (opens in a new tab)')}
-                    href={`${ETHERSCAN_URL}/address/${user}`}
-                    target="_blank"
-                  >
-                    {user}
-                  </Link>
-                }
-                {
-                  <RouterLink
-                    className="underline"
-                    title={t('View vesting information')}
-                    to={`${Routes.REDEEM}/${user}`}
-                    data-testid="redeem-link"
-                  >
-                    {t('View vesting information')}
-                  </RouterLink>
-                }
+                <EtherscanLink address={user} data-testid="link" />
+                <RouterLink
+                  className="underline"
+                  title={t('View vesting information')}
+                  to={`${Routes.REDEEM}/${user}`}
+                  data-testid="redeem-link"
+                >
+                  {t('View vesting information')}
+                </RouterLink>
              </KeyValueTableRow>
            ))}
          </KeyValueTable>
@@ -18,6 +18,7 @@ import type * as Schema from '@vegaprotocol/types';
 import {
  AsyncRenderer,
  Icon,
+  HealthBar,
  TooltipCellComponent,
 } from '@vegaprotocol/ui-toolkit';
 import type { GetRowIdParams, RowClickedEvent } from 'ag-grid-community';
@@ -27,9 +28,9 @@ import { AgGridColumn } from 'ag-grid-react';
 import { useCallback, useState } from 'react';

 import { Grid } from '../../grid';
-import { HealthBar } from '../../health-bar';
 import { HealthDialog } from '../../health-dialog';
 import { Status } from '../../status';
+import { intentForStatus } from '../../../lib/utils';
 import { formatDistanceToNow } from 'date-fns';

 export const MarketList = () => {
@@ -273,13 +274,13 @@ export const MarketList = () => {
              data: Market;
            }) => (
              <HealthBar
-                status={value}
                target={data.target}
                decimals={
                  data.tradableInstrument.instrument.product.settlementAsset
                    .decimals
                }
                levels={data.feeLevels}
+                intent={intentForStatus(value)}
              />
            )}
            sortable={false}
@@ -1,13 +1,13 @@
 import { useState } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import { Icon } from '@vegaprotocol/ui-toolkit';
+import { Icon, HealthBar } from '@vegaprotocol/ui-toolkit';
 import { formatWithAsset } from '@vegaprotocol/liquidity';

 import type * as Schema from '@vegaprotocol/types';
-import { HealthBar } from '../../health-bar';
 import { HealthDialog } from '../../health-dialog';
 import { Last24hVolume } from '../last-24h-volume';
 import { Status } from '../../status';
+import { intentForStatus } from '../../../lib/utils';

 interface Levels {
  fee: string;
@@ -92,10 +92,10 @@ export const Market = ({
              <td className="px-4">
                {tradingMode && settlementAsset?.decimals && feeLevels && (
                  <HealthBar
-                    status={tradingMode}
                    target={targetStake}
                    decimals={settlementAsset.decimals}
                    levels={feeLevels}
+                    intent={intentForStatus(tradingMode)}
                  />
                )}
              </td>
@@ -1,213 +0,0 @@
-import classNames from 'classnames';
-import type * as Schema from '@vegaprotocol/types';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import { BigNumber } from 'bignumber.js';
-import type { ReactNode } from 'react';
-
-import { getColorForStatus } from '../../lib/utils';
-
-import { Indicator } from '../indicator';
-
-const Remainder = () => (
-  <div className="bg-greys-light-200 h-[inherit] relative flex-1"></div>
-);
-
-const COPY_CLASS =
-  'text-sm font-medium whitespace-nowrap text-white font-alpha calt';
-
-const Tooltip = ({
-  children,
-  isExpanded,
-}: {
-  children: ReactNode;
-  isExpanded: boolean;
-}) => {
-  return (
-    <div
-      className={classNames(
-        'absolute top-0 left-1/2 -translate-x-2/4 -translate-y-[80%] p-2 z-10 bg-greys-light-400 group-hover:flex rounded',
-        {
-          flex: isExpanded,
-          hidden: !isExpanded,
-        }
-      )}
-    >
-      {children}
-    </div>
-  );
-};
-
-const Target = ({
-  targetPercent,
-  isLarge,
-  children,
-}: {
-  targetPercent: number;
-  isLarge: boolean;
-  children: ReactNode;
-}) => {
-  return (
-    <div
-      className={classNames(
-        'absolute top-1/2 left-1/2 -translate-x-2/4 -translate-y-1/2 px-1.5 group'
-      )}
-      style={{ left: `${targetPercent}%` }}
-    >
-      <div
-        className={classNames(
-          'health-target w-0.5 bg-black group-hover:scale-x-150 group-hover:scale-y-108',
-          {
-            'h-6': !isLarge,
-            'h-12': isLarge,
-          }
-        )}
-      ></div>
-      {children}
-    </div>
-  );
-};
-
-const Level = ({
-  children,
-  commitmentAmount,
-  total,
-  backgroundColor,
-  opacity,
-}: {
-  children: ReactNode;
-  commitmentAmount: number;
-  total: number;
-  backgroundColor: string;
-  opacity: number;
-}) => {
-  const width = new BigNumber(commitmentAmount)
-    .div(total)
-    .multipliedBy(100)
-    .toNumber();
-
-  return (
-    <div
-      className={classNames(`relative h-[inherit] w-full group min-w-[1px]`)}
-      style={{
-        width: `${width}%`,
-      }}
-    >
-      <div
-        className="relative w-full h-[inherit] group-hover:scale-y-150"
-        style={{
-          opacity,
-          backgroundColor,
-        }}
-      ></div>
-
-      {children}
-    </div>
-  );
-};
-
-const Full = () => (
-  <div className="bg-transparent w-full h-[inherit] absolute bottom-0 left-0"></div>
-);
-
-interface Levels {
-  fee: string;
-  commitmentAmount: number;
-}
-
-export const HealthBar = ({
-  status,
-  target = '0',
-  decimals,
-  levels,
-  size = 'small',
-  isExpanded = false,
-}: {
-  status: Schema.MarketTradingMode;
-  target: string;
-  decimals: number;
-  levels: Levels[];
-  isExpanded?: boolean;
-  size?: 'small' | 'large';
-}) => {
-  const targetNumber = parseInt(target, 10);
-
-  const committedNumber = levels
-    .reduce((total, current) => {
-      return total.plus(current.commitmentAmount);
-    }, new BigNumber(0))
-    .toNumber();
-
-  const total =
-    targetNumber * 2 >= committedNumber ? targetNumber * 2 : committedNumber;
-  const targetPercent = (targetNumber / total) * 100;
-  const isLarge = size === 'large';
-  const backgroundColor = getColorForStatus(status);
-
-  return (
-    <div className="w-full">
-      <div
-        className={classNames('health-wrapper relative', {
-          'py-2': !isLarge,
-          'py-5': isLarge,
-        })}
-      >
-        <div
-          className={classNames('health-inner relative w-full flex', {
-            'h-4': !isLarge,
-            'h-8': isLarge,
-          })}
-        >
-          <Full />
-
-          <div className="health-bars h-[inherit] flex w-full gap-0.5">
-            {levels.map((p, index) => {
-              const { commitmentAmount, fee } = p;
-              const prevLevel = levels[index - 1]?.commitmentAmount;
-              const opacity = 1 - 0.2 * index;
-              return (
-                <Level
-                  commitmentAmount={commitmentAmount}
-                  total={total}
-                  backgroundColor={backgroundColor}
-                  opacity={opacity}
-                >
-                  <Tooltip isExpanded={isExpanded}>
-                    <div className="mt-1.5 inline-flex">
-                      <Indicator status={status} opacity={opacity} />
-                    </div>
-                    <div className="flex  flex-col">
-                      <span className={COPY_CLASS}>
-                        {fee}% {t('Fee')}
-                      </span>
-                      <span className={classNames(COPY_CLASS, 'opacity-60')}>
-                        {prevLevel
-                          ? addDecimalsFormatNumber(prevLevel, decimals)
-                          : '0'}{' '}
-                        - {addDecimalsFormatNumber(commitmentAmount, decimals)}
-                      </span>
-                    </div>
-                  </Tooltip>
-                </Level>
-              );
-            })}
-            {(total !== committedNumber || levels.length === 0) && (
-              <Remainder />
-            )}
-          </div>
-        </div>
-
-        <Target targetPercent={targetPercent} isLarge={isLarge}>
-          <Tooltip isExpanded={isExpanded}>
-            <div className="mt-1.5 inline-flex">
-              <Indicator />
-            </div>
-            <span className={COPY_CLASS}>
-              {t('Target stake')} {addDecimalsFormatNumber(target, decimals)}
-            </span>
-          </Tooltip>
-        </Target>
-      </div>
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './health-bar';
@@ -1,9 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import { Dialog } from '@vegaprotocol/ui-toolkit';
+import { Dialog, HealthBar } from '@vegaprotocol/ui-toolkit';
 import * as Schema from '@vegaprotocol/types';
 import classNames from 'classnames';
-
-import { HealthBar } from '../health-bar';
+import { intentForStatus } from '../../lib/utils';

 interface HealthDialogProps {
  isOpen: boolean;
@@ -96,9 +95,9 @@ export const HealthDialog = ({ onChange, isOpen }: HealthDialogProps) => {
                  <HealthBar
                    size="large"
                    levels={r.data.levels}
-                    status={r.data.status}
                    target={r.data.target}
                    decimals={r.data.decimals}
+                    intent={intentForStatus(r.data.status)}
                  />
                </td>
              </tr>
@@ -5,6 +5,7 @@ import * as Schema from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';

 import { Indicator } from '../indicator';
+import type { AuctionTrigger } from '@vegaprotocol/types';

 export const Status = ({
  tradingMode,
@@ -31,7 +32,8 @@ export const Status = ({
  };

  const status = getStatus();
-  const tooltipDescription = t(getTooltipDescription(status));
+  const tooltipDescription =
+    tradingMode && getTooltipDescription(tradingMode, trigger);

  return (
    <div>
@@ -52,24 +54,43 @@ export const Status = ({
  );
 };

-const getTooltipDescription = (status: string) => {
-  let tooltipDescription = '';
+const getTooltipDescription = (
+  status: Schema.MarketTradingMode,
+  trigger?: Schema.AuctionTrigger
+) => {
  switch (status) {
-    case Schema.MarketTradingModeMapping.TRADING_MODE_CONTINUOUS:
-      tooltipDescription =
-        'This is the standard trading mode where trades are executed whenever orders are received';
-      break;
-    case `${Schema.MarketTradingModeMapping.TRADING_MODE_MONITORING_AUCTION} - ${Schema.AuctionTriggerMapping.AUCTION_TRIGGER_LIQUIDITY}`:
-      tooltipDescription =
-        'This market is in auction until it reaches sufficient liquidity';
-      break;
-    case Schema.MarketTradingModeMapping.TRADING_MODE_OPENING_AUCTION:
-      tooltipDescription =
-        'This is a new market in an opening auction to determine a fair mid-price before starting continuous trading.';
-      break;
+    case Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS:
+      return t(
+        'This is the standard trading mode where trades are executed whenever orders are received'
+      );
+    case Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION:
+      return getMonitoringDescriptionTooltip(trigger);
+    case Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION:
+      return t(
+        'This is a new market in an opening auction to determine a fair mid-price before starting continuous trading.'
+      );
    default:
-      break;
+      return '';
+  }
+};
+
+const getMonitoringDescriptionTooltip = (trigger?: AuctionTrigger) => {
+  switch (trigger) {
+    case Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET:
+      return t(
+        `This market is in auction until it reaches sufficient liquidity.`
+      );
+    case Schema.AuctionTrigger.AUCTION_TRIGGER_UNABLE_TO_DEPLOY_LP_ORDERS:
+      return t(
+        `This market may have sufficient liquidity but there are not enough priced limit orders in the order book, which are required to deploy liquidity commitment pegged orders.`
+      );
+    case Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE:
+      return t(`This market is in auction due to high price volatility.`);
+    case Schema.AuctionTrigger.AUCTION_TRIGGER_OPENING:
+      return t(
+        `This is a new market in an opening auction to determine a fair mid-price before starting continuous trading`
+      );
+    default:
+      return '';
  }
-
-  return tooltipDescription;
 };
@@ -1,4 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
+import { Intent } from '@vegaprotocol/ui-toolkit';

 const marketTradingModeStyle = {
  [Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS]: '#00D46E',
@@ -10,3 +11,15 @@ const marketTradingModeStyle = {

 export const getColorForStatus = (status: Schema.MarketTradingMode) =>
  marketTradingModeStyle[status];
+
+const marketTradingModeIntent = {
+  [Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS]: Intent.Success,
+  [Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION]: Intent.Danger,
+  [Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION]: Intent.Primary,
+  [Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION]: Intent.Danger,
+  [Schema.MarketTradingMode.TRADING_MODE_NO_TRADING]: Intent.Danger,
+};
+
+export const intentForStatus = (status: Schema.MarketTradingMode) => {
+  return marketTradingModeIntent[status];
+};
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api.n04.d.vega.xyz/graphql"]
+  "hosts": ["https://api-n04.d.vega.rocks/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api.n00.mainnet-mirror.vega.xyz/graphql"]
+  "hosts": ["https://api-n00.mainnet-mirror.vega.rocks/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api.n01.sandbox.vega.xyz/graphql"]
+  "hosts": ["https://api-n01.sandbox.vega.rocks/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api.n00.stagnet1.vega.xyz/graphql"]
+  "hosts": ["https://api-n00.stagnet1.vega.rocks/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api.stagnet3.vega.xyz/graphql"]
+  "hosts": ["https://api-stagnet3.vega.rocks/graphql"]
 }
@@ -1,11 +1,11 @@
 {
  "hosts": [
-    "https://api.n06.testnet.vega.xyz/graphql",
-    "https://api.n07.testnet.vega.xyz/graphql",
-    "https://api.n08.testnet.vega.xyz/graphql",
-    "https://api.n09.testnet.vega.xyz/graphql",
-    "https://api.n10.testnet.vega.xyz/graphql",
-    "https://api.n11.testnet.vega.xyz/graphql",
-    "https://api.n12.testnet.vega.xyz/graphql"
+    "https://api-n06.testnet.vega.rocks/graphql",
+    "https://api-n07.testnet.vega.rocks/graphql",
+    "https://api-n08.testnet.vega.rocks/graphql",
+    "https://api-n09.testnet.vega.rocks/graphql",
+    "https://api-n10.testnet.vega.rocks/graphql",
+    "https://api-n11.testnet.vega.rocks/graphql",
+    "https://api-n12.testnet.vega.rocks/graphql"
  ]
 }
@@ -1,5 +1,6 @@
 NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=''
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -135,7 +135,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.getByTestId(transferForm).find(submitTransferBtn).click();
    cy.getByTestId(toastContent).should(
      'contain.text',
-      'Transfer completeYour transaction has been confirmed TransferTo 7f9cf0…c255351.00 tBTC'
+      'Transfer completeYour transaction has been confirmed View in block explorerTransferTo 7f9cf0…c255351.00 tBTC'
    );
    cy.getByTestId(toastCloseBtn).click();
  });
@@ -143,6 +143,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
  it('can not withdrawal because of no MultiSign', function () {
    // 1002-WITH-022
    // 1002-WITH-023
+    // 0003-WTXN-011

    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();
@@ -281,8 +282,7 @@ describe('capsule', { tags: '@slow' }, () => {
        });
    });
  });
-  // comment because of bug #2695
-  it.skip('can edit order', function () {
+  it('can edit order', function () {
    cy.getByTestId(ordersTab).click();
    cy.getByTestId('edit').first().should('be.visible').click();
    cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
@@ -421,7 +421,11 @@ describe('capsule', { tags: '@slow' }, () => {
    cy.getByTestId(depositSubmit).click();
    cy.getByTestId('input-error-text').should(
      'contain.text',
-      'Amount is above approved amount.Update approve amount'
+      'Amount is above approved amount'
+    );
+    cy.getByTestId('reapprove-default').should(
+      'contain.text',
+      'Approve again to deposit more than'
    );
  });

@@ -436,9 +440,11 @@ describe('capsule', { tags: '@slow' }, () => {
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
    cy.get(assetSelectField, txTimeout).select(vegaName, { force: true });
-    cy.getByTestId('deposit-submit').click();
-    cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
-    cy.get('[data-testid="Return to deposit"]').click();
+    cy.getByTestId('approve-submit').click();
+    cy.getByTestId('approve-confirmed').should(
+      'contain.text',
+      'You can now make deposits in VEGA, up to a maximum of'
+    );
    cy.get(amountField).clear().type('10000');
    cy.getByTestId('deposit-submit').click();
    cy.getByTestId(toastContent, txTimeout).should(
@@ -446,7 +452,7 @@ describe('capsule', { tags: '@slow' }, () => {
      `Your transaction has been confirmed.`,
      { matchCase: false }
    );
-    cy.getByTestId(toastCloseBtn).click();
+    cy.getByTestId(toastCloseBtn).click({ multiple: true });
    cy.getByTestId('Collateral').click();

    cy.highlight('deposit verification');
@@ -52,6 +52,8 @@ describe('Console - market list - live env', { tags: '@live' }, () => {
 describe('Console - market info - live env', { tags: '@live' }, () => {
  before(() => {
    cy.visit('/');
+    cy.contains('Loading market data...').should('not.exist');
+    cy.getByTestId('link').should('be.visible');
    cy.getByTestId('dialog-close').click();
    cy.getByTestId(marketInfoBtn).click();
  });
@@ -68,17 +70,20 @@ describe('Console - market info - live env', { tags: '@live' }, () => {
    'Risk model',
    'Risk parameters',
    'Risk factors',
-    'Price monitoring trigger 1',
+    'Price monitoring bounds 1',
    'Liquidity monitoring parameters',
    'Liquidity',
+    'Liquidity price range',
    'Oracle',
    'Proposal',
  ];

  it('market info titles are displayed', () => {
-    cy.get('.text-lg').each((element, index) => {
-      cy.wrap(element).should('have.text', titles[index]);
-    });
+    cy.getByTestId('split-view-view')
+      .find('.text-lg')
+      .each((element, index) => {
+        cy.wrap(element).should('have.text', titles[index]);
+      });
  });

  it('market info subtitles are displayed', () => {
@@ -205,6 +210,8 @@ describe('Console - markets table - live env', { tags: '@live' }, () => {
 });

 function openMarketDropDown() {
+  cy.contains('Loading...').should('not.exist');
+  cy.getByTestId('link').should('be.visible');
  cy.getByTestId('dialog-close').click();
  cy.getByTestId('popover-trigger').click();
  cy.contains('Loading market data...').should('not.exist');
@@ -7,6 +7,10 @@ const externalLink = 'external-link';
 const accordionContent = 'accordion-content';

 describe('market info is displayed', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+  });
+
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
@@ -21,7 +21,7 @@ describe('Market proposal notification', { tags: '@smoke' }, () => {
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
    );
    cy.mockGQL((req) => {
      aliasGQLQuery(
@@ -62,7 +62,7 @@ describe('Market trading page', () => {
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
    );
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
@@ -148,7 +148,7 @@ describe('Market trading page', () => {
          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
          cy.getByTestId(itemValue).should(
            'have.text',
-            'Monitoring auction - liquidity'
+            'Monitoring auction - liquidity (target not met)'
          );
        });
      });
@@ -216,6 +216,60 @@ describe('Market trading page', () => {
        });
    });
  });
+
+  describe('market bottom panel', { tags: '@smoke' }, () => {
+    it('on xxl screen should be splitted out into two tables', () => {
+      cy.getByTestId('tab-positions').should(
+        'have.attr',
+        'data-state',
+        'active'
+      );
+      cy.getByTestId('tab-orders').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
+      cy.getByTestId('tab-accounts').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+
+      cy.viewport(1801, 1000);
+      cy.getByTestId('tab-positions').should(
+        'have.attr',
+        'data-state',
+        'active'
+      );
+      cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'active');
+      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
+      cy.getByTestId('tab-accounts').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+
+      cy.getByTestId('Fills').click();
+      cy.getByTestId('Collateral').click();
+      cy.getByTestId('tab-positions').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+      cy.getByTestId('tab-orders').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'active');
+      cy.getByTestId('tab-accounts').should(
+        'have.attr',
+        'data-state',
+        'active'
+      );
+    });
+  });
 });

 describe('market states not accepting orders', { tags: '@smoke' }, function () {
@@ -12,7 +12,7 @@ describe('markets table', { tags: '@smoke' }, () => {
      cy.mockTradingPage(
        Schema.MarketState.STATE_ACTIVE,
        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
      );
      cy.mockSubscription();
      cy.visit('/');
@@ -25,6 +25,23 @@ describe('Desktop view', { tags: '@smoke' }, () => {
          });
      });
    });
+
+    it('Resources dropdown should be correctly rendered', () => {
+      const resourceSelector = 'ul li:last-child';
+      ['Docs', 'Give Feedback'].forEach((text, index) => {
+        cy.get('nav').find(resourceSelector).contains('Resources').click();
+        cy.get('nav')
+          .find(resourceSelector)
+          .find('.navigation-content li')
+          .eq(index)
+          .find('a')
+          .then((element) => {
+            expect(element.attr('target')).to.eq('_blank');
+            expect(element.attr('href')).to.not.be.empty;
+            expect(element.text()).to.eq(text);
+          });
+      });
+    });
  });
 });

@@ -10,7 +10,7 @@ beforeEach(() => {

 describe('accounts', { tags: '@smoke' }, () => {
  it('renders accounts', () => {
-    const tradingAccountRowId = '[row-id="asset-0"]';
+    const tradingAccountRowId = '[row-id="t-0"]';
    cy.getByTestId('Collateral').click();

    cy.getByTestId('tab-accounts').should('be.visible');
@@ -44,9 +44,9 @@ describe('accounts', { tags: '@smoke' }, () => {
  describe('sorting by ag-grid columns should work well', () => {
    it('sorting by asset', () => {
      cy.getByTestId('Collateral').click();
-      const marketsSortedDefault = ['tBTC', 'AST0', 'tEURO', 'tDAI', 'tBTC'];
-      const marketsSortedAsc = ['AST0', 'tBTC', 'tBTC', 'tDAI', 'tEURO'];
-      const marketsSortedDesc = ['tEURO', 'tDAI', 'tBTC', 'tBTC', 'AST0'];
+      const marketsSortedDefault = ['tBTC', 'tEURO', 'tDAI', 'tBTC'];
+      const marketsSortedAsc = ['tBTC', 'tBTC', 'tDAI', 'tEURO'];
+      const marketsSortedDesc = ['tEURO', 'tDAI', 'tBTC', 'tBTC'];
      checkSorting(
        'asset.symbol',
        marketsSortedDefault,
@@ -59,7 +59,6 @@ describe('accounts', { tags: '@smoke' }, () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
        '1,000.00002',
-        '100,001.01',
        '1,000.01',
        '1,000.00',
        '1,000.00001',
@@ -69,10 +68,8 @@ describe('accounts', { tags: '@smoke' }, () => {
        '1,000.00001',
        '1,000.00002',
        '1,000.01',
-        '100,001.01',
      ];
      const marketsSortedDesc = [
-        '100,001.01',
        '1,000.01',
        '1,000.00002',
        '1,000.00001',
@@ -90,7 +87,6 @@ describe('accounts', { tags: '@smoke' }, () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
        '0.000.00%',
-        '1.010.00%',
        '0.010.00%',
        '0.000.00%',
        '0.000.00%',
@@ -100,10 +96,8 @@ describe('accounts', { tags: '@smoke' }, () => {
        '0.000.00%',
        '0.000.00%',
        '0.010.00%',
-        '1.010.00%',
      ];
      const marketsSortedDesc = [
-        '1.010.00%',
        '0.010.00%',
        '0.000.00%',
        '0.000.00%',
@@ -121,7 +115,6 @@ describe('accounts', { tags: '@smoke' }, () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
        '1,000.00002',
-        '100,001.01',
        '1,000.01',
        '1,000.00',
        '1,000.00001',
@@ -131,10 +124,8 @@ describe('accounts', { tags: '@smoke' }, () => {
        '1,000.00001',
        '1,000.00002',
        '1,000.01',
-        '100,001.01',
      ];
      const marketsSortedDesc = [
-        '100,001.01',
        '1,000.01',
        '1,000.00002',
        '1,000.00001',
@@ -42,7 +42,7 @@ describe('time in force default values', () => {
  });

  it('must have market order set up to IOC by default', function () {
-    //7002-SORD-031
+    // 7002-SORD-031
    cy.getByTestId(toggleMarket).click();
    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
      'have.text',
@@ -51,7 +51,7 @@ describe('time in force default values', () => {
  });

  it('must have time in force set to GTC for limit order', function () {
-    //7002-SORD-031
+    // 7002-SORD-031
    cy.getByTestId(toggleLimit).click();
    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
      'have.text',
@@ -75,7 +75,9 @@ describe('must submit order', { tags: '@smoke' }, () => {
  });

  it('successfully places market buy order', () => {
-    //7002-SORD-010
+    // 7002-SORD-010
+    // 0003-WTXN-012
+    // 0003-WTXN-003
    cy.mockVegaWalletTransaction();
    const order: OrderSubmission = {
      marketId: 'market-0',
@@ -161,7 +163,7 @@ describe(
      cy.mockTradingPage(
        Schema.MarketState.STATE_SUSPENDED,
        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
      );
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -230,7 +232,7 @@ describe(
      cy.mockTradingPage(
        Schema.MarketState.STATE_SUSPENDED,
        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
      );
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -299,7 +301,7 @@ describe(
      cy.mockTradingPage(
        Schema.MarketState.STATE_SUSPENDED,
        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
      );
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -367,6 +369,7 @@ describe('deal ticket validation', { tags: '@smoke' }, () => {
  });

  it('must show place order button and connect wallet if wallet is not connected', () => {
+    // 0003-WTXN-001
    cy.getByTestId('connect-vega-wallet'); // Not connected
    cy.getByTestId('order-connect-wallet').should('exist');
    cy.getByTestId(placeOrderBtn).should('exist');
@@ -374,15 +377,15 @@ describe('deal ticket validation', { tags: '@smoke' }, () => {
  });

  it('must be able to select order direction - long/short', function () {
-    //7002-SORD-004
+    // 7002-SORD-004
    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
  });

  it('must be able to select order type - limit/market', function () {
-    //7002-SORD-005
-    //7002-SORD-006
-    //7002-SORD-007
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
  });
@@ -412,7 +415,7 @@ describe('deal ticket size validation', { tags: '@smoke' }, function () {
  });

  it('must warn if order size input has too many digits after the decimal place', function () {
-    //7002-SORD-016
+    // 7002-SORD-016
    cy.getByTestId('order-type-TYPE_MARKET').click();
    cy.getByTestId(orderSizeField).clear().type('1.234');
    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
@@ -452,7 +455,7 @@ describe('limit order validations', { tags: '@smoke' }, () => {
  });

  it('must see the price unit', function () {
-    //7002-SORD-018
+    // 7002-SORD-018
    cy.getByTestId(orderPriceField)
      .siblings('label')
      .should('have.text', 'Price (DAI)');
@@ -478,7 +481,7 @@ describe('limit order validations', { tags: '@smoke' }, () => {
  });

  it('must see warning if price has too many digits after decimal place', function () {
-    //7002-SORD-059
+    // 7002-SORD-059
    cy.getByTestId(toggleLimit).click();
    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
    cy.getByTestId(orderSizeField).clear().type('1');
@@ -492,12 +495,12 @@ describe('limit order validations', { tags: '@smoke' }, () => {
  describe('time in force validations', function () {
    const validTIF = TIFlist;
    validTIF.forEach((tif) => {
-      //7002-SORD-023
-      //7002-SORD-024
-      //7002-SORD-025
-      //7002-SORD-026
-      //7002-SORD-027
-      //7002-SORD-028
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-025
+      // 7002-SORD-026
+      // 7002-SORD-027
+      // 7002-SORD-028

      it(`must be able to select ${tif.code}`, function () {
        cy.getByTestId(orderTIFDropDown).select(tif.value);
@@ -544,7 +547,7 @@ describe('market order validations', { tags: '@smoke' }, () => {
  });

  it('must not see the price unit', function () {
-    //7002-SORD-019
+    // 7002-SORD-019
    cy.getByTestId(orderPriceField).should('not.exist');
  });

@@ -555,8 +558,8 @@ describe('market order validations', { tags: '@smoke' }, () => {
    );

    validTIF.forEach((tif) => {
-      //7002-SORD-025
-      //7002-SORD-026
+      // 7002-SORD-025
+      // 7002-SORD-026

      it(`must be able to select ${tif.code}`, function () {
        cy.getByTestId(orderTIFDropDown).select(tif.value);
@@ -568,10 +571,10 @@ describe('market order validations', { tags: '@smoke' }, () => {
    });

    invalidTIF.forEach((tif) => {
-      //7002-SORD-023
-      //7002-SORD-024
-      //7002-SORD-027
-      //7002-SORD-028
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-027
+      // 7002-SORD-028
      it(`must not be able to select ${tif.code}`, function () {
        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
      });
@@ -585,7 +588,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
    cy.mockTradingPage(
      Schema.MarketState.STATE_SUSPENDED,
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
    );
    const accounts = accountsQuery();
    cy.mockGQL((req) => {
@@ -652,7 +655,7 @@ describe('account validation', { tags: '@regression' }, () => {

    it('should show an error if your balance is zero', () => {
      cy.getByTestId('place-order').should('be.disabled');
-      //7002-SORD-003
+      // 7002-SORD-003
      cy.getByTestId('dealticket-error-message-zero-balance').should(
        'have.text',
        'You need ' +
@@ -681,7 +684,8 @@ describe('account validation', { tags: '@regression' }, () => {
    });

    it('should display info and button for deposit', () => {
-      //7002-SORD-003
+      // 7002-SORD-003
+
      // warning should show immediately
      cy.getByTestId('dealticket-warning-margin').should(
        'contain.text',
@@ -698,4 +702,94 @@ describe('account validation', { tags: '@regression' }, () => {
        .should('have.text', 'Deposit');
    });
  });
+
+  describe('must submit order', { tags: '@smoke' }, () => {
+    // 7002-SORD-039
+    beforeEach(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    it('must see a prompt to check connected vega wallet to approve transaction', () => {
+      // 0003-WTXN-002
+      cy.mockVegaWalletTransaction(1000);
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_MARKET,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        size: '100',
+      };
+      createOrder(order);
+      cy.getByTestId('toast-content').should(
+        'contain.text',
+        'Please go to your Vega wallet application and approve or reject the transaction.'
+      );
+    });
+
+    it('must show error returned by wallet ', () => {
+      // 0003-WTXN-009
+      // 0003-WTXN-011
+
+      //trigger error from the wallet
+      cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+        req.on('response', (res) => {
+          res.send({
+            jsonrpc: '2.0',
+            id: '1',
+          });
+        });
+      });
+
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_MARKET,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        size: '100',
+      };
+      createOrder(order);
+      cy.getByTestId('toast-content').should(
+        'contain.text',
+        'The connection to your Vega Wallet has been lost.'
+      );
+    });
+
+    it('must see that the order was rejected by the connected wallet', () => {
+      // 0003-WTXN-007
+
+      //trigger rejection error from the wallet
+      cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+        req.alias = 'client.send_transaction';
+        req.reply({
+          statusCode: 400,
+          body: {
+            jsonrpc: '2.0',
+            error: {
+              code: 3001,
+              data: 'the user rejected the wallet connection',
+              message: 'User error',
+            },
+            id: '0',
+          },
+        });
+      });
+
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_MARKET,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        size: '100',
+      };
+      createOrder(order);
+      cy.getByTestId('toast-content').should(
+        'contain.text',
+        'Error occurredthe user rejected the wallet connection'
+      );
+    });
+  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dariusz Majcherczyk	5017224fcd	test: update live e2e tests	2023-03-29 14:52:12 +02:00
dexturr	e306d1c9fa	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-28 12:08:16 +00:00
dexturr	737dec4f5f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-28 06:08:37 +00:00
dexturr	6780b2f618	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-28 00:15:54 +00:00
Penny Andrews	08dc60086d	chore(ci): update name of release issue template (#3279 )	2023-03-27 11:47:35 -07:00
Bartłomiej Głownia	4595db07b0	fix(trading): throttle deal ticket submit (#3282 )	2023-03-27 11:46:40 -07:00
dexturr	c3da31146f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-27 18:08:26 +00:00
dexturr	b6a9faaa7c	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-27 12:10:42 +00:00
daro-maj	477d523582	test(trading): fixed capsule tests (#3281 )	2023-03-27 12:50:22 +02:00
Maciek	a2b112d898	fix(positions): make positions table smoothly updated (again) (#3266 )	2023-03-27 12:30:55 +02:00
Mikołaj Młodzikowski	621ba497e8	feat: remove env vars file after setting up js file	2023-03-27 11:03:06 +02:00
dexturr	a6964bc3cf	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-27 06:06:57 +00:00
dexturr	48a9998441	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-27 00:16:27 +00:00
dexturr	bd1bd94ee7	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-26 18:07:12 +00:00
dexturr	2fdebbd694	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-26 12:10:22 +00:00
dexturr	96af8035d0	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-26 06:07:03 +00:00
dexturr	051e3da366	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-26 00:17:44 +00:00
dexturr	af5e666d5e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-25 18:09:35 +00:00
dexturr	333a7d6206	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-25 12:10:21 +00:00
dexturr	cb6b988466	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-25 06:09:33 +00:00
dexturr	806ea74f7e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-25 00:14:18 +00:00
Matthew Russell	8693f3bfd8	chore(trading): dont show faucet button until connected (#3251 )	2023-03-24 17:06:22 -07:00
Bartłomiej Głownia	58c6652e29	feat(trading): use mini scroll in deal ticket, market info for and landing dialog (#3269 )	2023-03-24 17:01:12 -07:00
Bartłomiej Głownia	e8adff25c4	fix(trading): handle lack of approval in trading deposit flow (#3278 )	2023-03-24 16:57:00 -07:00
Penny Andrews	3e594a783a	chore(ci): add release issue template (#3272 )	2023-03-24 16:55:22 -07:00
dexturr	1f7117075b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-24 18:09:07 +00:00
Bartłomiej Głownia	4c850ecead	fix(trading): change etherscan link label on toast (#3262 )	2023-03-24 17:57:59 +01:00
Mikołaj Młodzikowski	19f8fa909e	feat(explorer,trading,governance): use nx to know which apps needs building (#3267 )	2023-03-24 16:42:33 +01:00
Sam Keen	8214858685	feat(governance): lp vote now reflected on proposal cards (#3256 )	2023-03-24 14:56:56 +00:00
dexturr	868f8e21dc	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-24 12:08:16 +00:00
dexturr	6ead84b57c	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-24 06:09:30 +00:00
dexturr	3975477985	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-24 00:14:29 +00:00
Art	8a0c15ac11	feat(explorer): breadcrumbs (#3254 )	2023-03-23 19:11:34 +00:00
dexturr	a4f512f946	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-23 18:08:43 +00:00
dexturr	88f3c278f8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-23 12:08:36 +00:00
Mikołaj Młodzikowski	34d5f3fd13	feat(explorer): build docker image on pull request + refactor dockerfile for ipfs (#3245 )	2023-03-23 10:50:23 +01:00
daro-maj	a060f94146	test(trading): 0003-WTXN submit vega transaction e2e tests (#3246 )	2023-03-23 09:46:28 +01:00
MaciekandMatthew Russell	f649d78565	chore(orders): remove infinite scroll from order table (#3247 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-03-23 09:13:07 +01:00
dexturr	b611d30b31	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-23 06:08:50 +00:00
dexturr	545324ccd6	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-23 00:16:17 +00:00
Bartłomiej Głownia	8c16759621	fix(trading): use unique keys in LocalStoragePersistTabs (#3255 )	2023-03-22 16:34:58 -07:00
Matthew Russell	e724aac2f1	feat(trading): add resources dropdown to console nav (#3249 )	2023-03-22 16:33:29 -07:00
dexturr	e3a6b75130	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-22 18:09:03 +00:00
Joe Tsang	8d8f6b4928	test(governance): governance tests refactor (#3059 )	2023-03-22 17:35:00 +00:00
m.ray	6c1c5bf2a9	feat(trading): pin collateral row (#3218 )	2023-03-22 13:05:05 +01:00
Ciaran McGhie	74a3aa8566	refactor(ui-toolkit): move healthbar to ui-toolkit (#3121 )	2023-03-22 11:33:46 +00:00
dexturr	4cbd7a4928	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-22 06:09:20 +00:00
dexturr	201cf07a01	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-22 00:13:57 +00:00
Dexter EdwardsandMatthew Russell	90ceeebf15	fix(ui-toolkit): anchor button should be same size as button by default (#3172 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-03-21 15:24:34 -07:00
dexturr	965f7f6e2d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-21 18:08:39 +00:00
Ciaran McGhie	18633efec3	chore(ui-toolkit): rework intent colours (#3202 )	2023-03-21 16:40:39 +00:00
m.ray Matthew Russell Dariusz Majcherczyk	a0b758334a	fix(trading): auction triggers liquidity API change in develop for core 0.69.0 (#3197 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com> Co-authored-by: Dariusz Majcherczyk <dariusz.majcherczyk@gmail.com>	2023-03-21 09:19:21 -07:00
Bartłomiej Głownia	9f3026aa4b	fix(market-depth): fix depth chart data upate, use market depth as mid price source (#3242 )	2023-03-21 08:46:04 -07:00
Maciek	faa359e2fb	chore(trading): 2764 link to mainnet incident reports (#3235 )	2023-03-21 08:19:54 -07:00
Bartłomiej Głownia	1d178b940f	feat(trading): store current tab selection (#3148 )	2023-03-21 15:50:31 +01:00
dexturr	b2dd053621	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-21 12:10:18 +00:00
dexturr	77f5193b7a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-21 06:07:47 +00:00
dexturr	055a0070db	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-21 00:13:48 +00:00
dexturr	29b221c86a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-20 18:09:57 +00:00
Dexter Edwards	3e619acd4b	feat(ui-toolkit): button icons (#3233 )	2023-03-20 14:40:04 +00:00
botond	c720719ac5	chore(governance): update announcement banner text (#3234 )	2023-03-20 13:52:03 +00:00
Art	c676a7c1e2	chore(explorer): move banner up (#3237 )	2023-03-20 13:38:31 +00:00
dexturr	ca63a671c8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-20 12:09:43 +00:00
Maciek	4165f3905f	chore(static): update domains in network conf files (#3219 )	2023-03-20 09:58:05 +00:00
dexturr	a359ccb755	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-20 06:07:41 +00:00
dexturr	e584737005	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-20 00:17:40 +00:00
dexturr	b12c5ed39f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-19 18:08:07 +00:00
dexturr	d3dbd64cf1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-19 12:07:36 +00:00
dexturr	2df62bca61	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-19 06:07:48 +00:00
dexturr	fd2a434b46	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-19 00:17:10 +00:00
dexturr	4e7a78f988	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-18 18:08:23 +00:00
dexturr	327619652a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-18 12:07:24 +00:00
dexturr	d2339205cc	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-18 06:06:50 +00:00
dexturr	63df4cf465	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-18 00:13:54 +00:00
dexturr	5e34178291	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-17 18:06:54 +00:00
dexturr	0c44664aa5	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-17 12:07:53 +00:00
Bartłomiej Głownia	7ef1d75529	chore(trading): remove red background from trades table (#3214 )	2023-03-17 09:52:40 +00:00
Maciek	84795b2d6a	chore(trading): split bottom panel into two parts (#3205 )	2023-03-17 09:50:43 +00:00
dexturr	300019f108	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-17 06:09:09 +00:00
dexturr	2d0aebd3fe	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-17 00:14:43 +00:00
dexturr	9e86d2aff5	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-16 18:09:41 +00:00
daro-maj	0f7e76ae01	test(trading): increase coverage for 0004-ewal (#3210 )	2023-03-16 13:29:40 +01:00
dexturr	56732d1503	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-16 12:08:59 +00:00
Joe Tsang	5c19263653	chore(governance): include slippage factor to proposals (#3204 )	2023-03-16 10:41:18 +00:00
dexturr	0d911b3029	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-16 06:08:43 +00:00
Matthew RussellandEdd	9f059e7862	chore(explorer,governance): update be endpoints (#3183 ) Co-authored-by: Edd <edd@vega.xyz>	2023-03-15 20:12:04 -07:00
dexturr	92ea93dadb	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-16 00:16:50 +00:00
daro-maj	6165aefad7	test(trading): fixed settlement asset displayed test (#3209 )	2023-03-15 18:38:57 +00:00
dexturr	c95369d914	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-15 18:08:52 +00:00
Maciek	5dbc5d7997	chore(trading): make loading masks in tabs consistent along the app (#3155 )	2023-03-15 16:08:48 +01:00
dexturr	47b3d5b55f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-15 12:07:50 +00:00
Maciek	da7c0b84f7	chore(trading): display latency in block height progressing as warn or error (#3169 )	2023-03-15 12:49:31 +01:00
Art	67e602ebb1	feat(explorer): try again for tx details (#3195 )	2023-03-15 08:24:42 +00:00
Art	f407110e95	chore(environment): etherscan link (#3193 )	2023-03-15 08:24:20 +00:00
Art	66a85cce2a	chore(explorer): market info shared panels (#3192 )	2023-03-15 08:21:12 +00:00
Art	93f8450ecb	fix(utils): missing flags (#3194 )	2023-03-15 08:20:41 +00:00
dexturr	0447a6cf5d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-15 06:09:39 +00:00
dexturr	498be838c7	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-15 00:17:07 +00:00