fix(ci): test changes against pull_request

fix(ci): use jq to generate valid json arrays from bash
2023-06-28 11:55:49 +02:00 · 2023-06-28 11:40:14 +02:00
40 changed files with 529 additions and 1166 deletions
@@ -49,7 +49,7 @@ jobs:

  lint-pr-title:
    needs: node-modules
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
    name: Verify PR title
    uses: ./.github/workflows/lint-pr.yml
    secrets: inherit
@@ -204,7 +204,7 @@ jobs:
  cypress:
    needs: lint-test-build
    name: '(CI) cypress'
-    # if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
+    if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
    with:
@@ -214,7 +214,7 @@ jobs:
  publish-dist:
    needs: lint-test-build
    name: '(CD) publish dist'
-    # if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
    uses: ./.github/workflows/publish-dist.yml
    secrets: inherit
    with:
@@ -225,7 +225,7 @@ jobs:
    needs:
      - publish-dist
      - lint-test-build
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
    timeout-minutes: 60
    name: '(CD) comment preview links'
    steps:
@@ -33,7 +33,7 @@ jobs:
        uses: docker/setup-buildx-action@v2

      - name: Log in to the Container registry (ghcr)
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
        uses: docker/login-action@v2
        with:
          registry: ghcr.io
@@ -145,7 +145,7 @@ jobs:
            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local

      - name: Image digest
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
        run: echo ${{ steps.docker_build.outputs.digest }}

      - name: Sanity check docker image
@@ -160,7 +160,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: ghcr-push
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -230,7 +230,7 @@ jobs:

      - name: Add preview label
        uses: actions-ecosystem/action-add-labels@v1
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
        with:
          labels: ${{ matrix.app }}-preview
          number: ${{ github.event.number }}
@@ -1,86 +0,0 @@
-import { render } from '@testing-library/react';
-import { TxDetailsLiquidityAmendment } from './tx-liquidity-amend';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MockedProvider } from '@apollo/client/testing';
-import { MemoryRouter } from 'react-router-dom';
-
-describe('TxDetailsLiquidityAmendment', () => {
-  const mockTxData = {
-    hash: 'test',
-    command: {
-      liquidityProvisionAmendment: {
-        marketId: 'BTC-USD',
-        commitmentAmount: 100,
-        fee: '0.01',
-      },
-    },
-  };
-  const mockPubKey = '123';
-  const mockBlockData = {
-    result: {
-      block: {
-        header: {
-          height: '123',
-        },
-      },
-    },
-  };
-
-  it('should render the component with correct data', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquidityAmendment
-            txData={mockTxData as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(getByText('Market')).toBeInTheDocument();
-    expect(getByText('BTC-USD')).toBeInTheDocument();
-    expect(getByText('Commitment amount')).toBeInTheDocument();
-    expect(getByText('100')).toBeInTheDocument();
-    expect(getByText('Fee')).toBeInTheDocument();
-    expect(getByText('1%')).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when tx data is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquidityAmendment
-            txData={undefined}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when liquidityProvisionAmendment is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquidityAmendment
-            txData={{ command: {} } as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-});
@@ -7,7 +7,6 @@ import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
 import { LiquidityProvisionDetails } from './liquidity-provision/liquidity-provision-details';
 import PriceInMarket from '../../price-in-market/price-in-market';
-import BigNumber from 'bignumber.js';

 export type LiquidityAmendment =
  components['schemas']['v1LiquidityProvisionAmendment'];
@@ -35,10 +34,6 @@ export const TxDetailsLiquidityAmendment = ({
    txData.command.liquidityProvisionAmendment;
  const marketId: string = amendment.marketId || '-';

-  const fee = amendment.fee
-    ? new BigNumber(amendment.fee).times(100).toString()
-    : '-';
-
  return (
    <>
      <TableWithTbody className="mb-8" allowWrap={true}>
@@ -68,7 +63,7 @@ export const TxDetailsLiquidityAmendment = ({
        {amendment.fee ? (
          <TableRow modifier="bordered">
            <TableCell>{t('Fee')}</TableCell>
-            <TableCell>{fee}%</TableCell>
+            <TableCell>{amendment.fee}%</TableCell>
          </TableRow>
        ) : null}
      </TableWithTbody>
@@ -1,86 +0,0 @@
-import { render } from '@testing-library/react';
-import { TxDetailsLiquiditySubmission } from './tx-liquidity-submission';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MockedProvider } from '@apollo/client/testing';
-import { MemoryRouter } from 'react-router-dom';
-
-describe('TxDetailsLiquiditySubmission', () => {
-  const mockTxData = {
-    hash: 'test',
-    command: {
-      liquidityProvisionSubmission: {
-        marketId: 'BTC-USD',
-        commitmentAmount: 100,
-        fee: '0.01',
-      },
-    },
-  };
-  const mockPubKey = '123';
-  const mockBlockData = {
-    result: {
-      block: {
-        header: {
-          height: '123',
-        },
-      },
-    },
-  };
-
-  it('should render the component with correct data', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquiditySubmission
-            txData={mockTxData as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(getByText('Market')).toBeInTheDocument();
-    expect(getByText('BTC-USD')).toBeInTheDocument();
-    expect(getByText('Commitment amount')).toBeInTheDocument();
-    expect(getByText('100')).toBeInTheDocument();
-    expect(getByText('Fee')).toBeInTheDocument();
-    expect(getByText('1%')).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when tx data is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquiditySubmission
-            txData={undefined}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when liquidityProvisionSubmission is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquiditySubmission
-            txData={{ command: {} } as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-});
@@ -7,7 +7,6 @@ import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
 import { LiquidityProvisionDetails } from './liquidity-provision/liquidity-provision-details';
 import PriceInMarket from '../../price-in-market/price-in-market';
-import BigNumber from 'bignumber.js';

 export type LiquiditySubmission =
  components['schemas']['v1LiquidityProvisionSubmission'];
@@ -34,10 +33,6 @@ export const TxDetailsLiquiditySubmission = ({
    txData.command.liquidityProvisionSubmission;
  const marketId: string = submission.marketId || '-';

-  const fee = submission.fee
-    ? new BigNumber(submission.fee).times(100).toString()
-    : '-';
-
  return (
    <>
      <TableWithTbody className="mb-8" allowWrap={true}>
@@ -67,7 +62,7 @@ export const TxDetailsLiquiditySubmission = ({
        {submission.fee ? (
          <TableRow modifier="bordered">
            <TableCell>{t('Fee')}</TableCell>
-            <TableCell>{fee}%</TableCell>
+            <TableCell>{submission.fee}%</TableCell>
          </TableRow>
        ) : null}
      </TableWithTbody>
@@ -28,17 +28,18 @@ import type { testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';

 const proposalVoteProgressForPercentage =
-  'vote-progress-indicator-percentage-for';
+  '[data-testid="vote-progress-indicator-percentage-for"]';
 const proposalVoteProgressAgainstPercentage =
-  'vote-progress-indicator-percentage-against';
-const proposalVoteProgressForTokens = 'vote-progress-indicator-tokens-for';
+  '[data-testid="vote-progress-indicator-percentage-against"]';
+const proposalVoteProgressForTokens =
+  '[data-testid="vote-progress-indicator-tokens-for"]';
 const proposalVoteProgressAgainstTokens =
-  'vote-progress-indicator-tokens-against';
-const changeVoteButton = 'change-vote-button';
-const proposalDetailsTitle = 'proposal-title';
-const proposalDetailsDescription = 'proposal-description';
-const openProposals = 'open-proposals';
-const viewProposalButton = 'view-proposal-btn';
+  '[data-testid="vote-progress-indicator-tokens-against"]';
+const changeVoteButton = '[data-testid="change-vote-button"]';
+const proposalDetailsTitle = '[data-testid="proposal-title"]';
+const proposalDetailsDescription = '[data-testid="proposal-description"]';
+const openProposals = '[data-testid="open-proposals"]';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const proposalDescriptionToggle = 'proposal-description-toggle';
 const voteBreakdownToggle = 'vote-breakdown-toggle';
 const proposalTermsToggle = 'proposal-json-toggle';
@@ -71,18 +72,18 @@ describe(

      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        cy.getByTestId(openProposals).within(() => {
+        cy.get(openProposals).within(() => {
          getProposalFromTitle(rawProposal.rationale.title).within(() => {
-            cy.getByTestId(viewProposalButton).should('be.visible').click();
+            cy.get(viewProposalButton).should('be.visible').click();
          });
        });
-        cy.getByTestId(proposalDetailsTitle).should(
+        cy.get(proposalDetailsTitle).should(
          'contain.text',
          rawProposal.rationale.title
        );
        cy.getByTestId(proposalDescriptionToggle).click();
        cy.getByTestId('proposal-description-toggle');
-        cy.getByTestId(proposalDetailsDescription)
+        cy.get(proposalDetailsDescription)
          .find('p')
          .should('have.text', proposalDescription);
      });
@@ -116,7 +117,7 @@ describe(
      });
      navigateTo(navigation.proposals);
      getProposalFromTitle(proposalTitle).within(() =>
-        cy.getByTestId(viewProposalButton).click()
+        cy.get(viewProposalButton).click()
      );
      cy.wrap(
        formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
@@ -138,7 +139,7 @@ describe(
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
        );
      });
      cy.contains('Participation: Not Met 0.00 0.00%(0.00% Required)').should(
@@ -165,7 +166,7 @@ describe(
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
        );
      });
      // 3001-VOTE-080
@@ -182,16 +183,14 @@ describe(
          .contains(votedDate)
          .should('be.visible');
      });
-      cy.getByTestId(proposalVoteProgressForPercentage) // 3001-VOTE-072
+      cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
        .contains('100.00%')
        .and('be.visible');
-      cy.getByTestId(proposalVoteProgressAgainstPercentage)
+      cy.get(proposalVoteProgressAgainstPercentage)
        .contains('0.00%')
        .and('be.visible');
-      cy.getByTestId(proposalVoteProgressForTokens)
-        .contains('1.00')
-        .and('be.visible');
-      cy.getByTestId(proposalVoteProgressAgainstTokens)
+      cy.get(proposalVoteProgressForTokens).contains('1.00').and('be.visible');
+      cy.get(proposalVoteProgressAgainstTokens)
        .contains('0.00')
        .and('be.visible');
      cy.getByTestId(voteBreakdownToggle).click();
@@ -212,15 +211,15 @@ describe(
      getProposalInformationFromTable('Number of voting parties')
        .should('have.text', '1')
        .and('be.visible');
-      cy.getByTestId(changeVoteButton).should('be.visible').click();
+      cy.get(changeVoteButton).should('be.visible').click();
      voteForProposal('for');
      // 3001-VOTE-064
      getProposalInformationFromTable('Tokens for proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
-      cy.getByTestId(changeVoteButton).should('be.visible').click();
+      cy.get(changeVoteButton).should('be.visible').click();
      voteForProposal('against');
-      cy.getByTestId(proposalVoteProgressAgainstPercentage)
+      cy.get(proposalVoteProgressAgainstPercentage)
        .contains('100.00%')
        .and('be.visible');
      getProposalInformationFromTable('Tokens against proposal')
@@ -237,15 +236,13 @@ describe(
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
        );
      });
      voteForProposal('for');
      // 3001-VOTE-079
      cy.contains('You voted: For').should('be.visible');
-      cy.getByTestId(proposalVoteProgressForTokens)
-        .contains('1')
-        .and('be.visible');
+      cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Total Supply')
        .invoke('text')
@@ -261,22 +258,22 @@ describe(
          navigateTo(navigation.proposals);
          cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
            getProposalFromTitle(rawProposal.rationale.title).within(() =>
-              cy.getByTestId(viewProposalButton).click()
+              cy.get(viewProposalButton).click()
            );
          });
-          cy.getByTestId(proposalVoteProgressForPercentage)
+          cy.get(proposalVoteProgressForPercentage)
            .contains('100.00%')
            .and('be.visible');
-          cy.getByTestId(proposalVoteProgressAgainstPercentage)
+          cy.get(proposalVoteProgressAgainstPercentage)
            .contains('0.00%')
            .and('be.visible');
          // 3001-VOTE-065
-          cy.getByTestId(changeVoteButton).should('be.visible').click();
+          cy.get(changeVoteButton).should('be.visible').click();
          voteForProposal('for');
-          cy.getByTestId(proposalVoteProgressForTokens)
+          cy.get(proposalVoteProgressForTokens)
            .contains(tokensRequiredToAchieveResult)
            .and('be.visible');
-          cy.getByTestId(proposalVoteProgressAgainstTokens)
+          cy.get(proposalVoteProgressAgainstTokens)
            .contains('0.00')
            .and('be.visible');
          cy.getByTestId(voteBreakdownToggle).click();
@@ -313,7 +310,7 @@ describe(
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
        );
        voteForProposal('for');
        cy.contains('You voted: For').should('be.visible');
@@ -322,16 +319,13 @@ describe(
        stakingPageAssociateTokens('2');
        navigateTo(navigation.proposals);
        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
        );
        cy.getByTestId('you-voted').should('not.exist');
        voteForProposal('against');
        cy.contains('You voted: Against').should('be.visible');
        switchVegaWalletPubKey();
-        cy.getByTestId(proposalVoteProgressForTokens).should(
-          'contain.text',
-          '1.00'
-        );
+        cy.get(proposalVoteProgressForTokens).should('contain.text', '1.00');
        // Checking vote status for different public keys is displayed correctly
        cy.contains('You voted: For').should('be.visible');
      });
@@ -19,13 +19,13 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-functions';

 const proposalListItem = '[data-testid="proposals-list-item"]';
-const closedProposals = 'closed-proposals';
-const proposalStatus = 'proposal-status';
-const viewProposalButton = 'view-proposal-btn';
-const votesTable = 'votes-table';
-const openProposals = 'open-proposals';
+const closedProposals = '[data-testid="closed-proposals"]';
+const proposalStatus = '[data-testid="proposal-status"]';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
+const votesTable = '[data-testid="votes-table"]';
+const openProposals = '[data-testid="open-proposals"]';
 const proposalVoteProgressForPercentage =
-  'vote-progress-indicator-percentage-for';
+  '[data-testid="vote-progress-indicator-percentage-for"]';
 const proposalTimeout = { timeout: 8000 };

 context(
@@ -55,18 +55,18 @@ context(
      cy.createMarket();
      cy.reload();
      waitForSpinner();
-      cy.getByTestId(closedProposals).within(() => {
+      cy.get(closedProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil(proposalListItem)
          .last()
          .within(() => {
-            cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
-            cy.getByTestId(viewProposalButton).click();
+            cy.get(proposalStatus).should('have.text', 'Enacted');
+            cy.get(viewProposalButton).click();
          });
      });
      cy.getByTestId('proposal-type').should('have.text', 'New market');
-      cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
-      cy.getByTestId(votesTable).within(() => {
+      cy.get(proposalStatus).should('have.text', 'Enacted');
+      cy.get(votesTable).within(() => {
        cy.contains('Vote passed.').should('be.visible');
        cy.contains('Voting has ended.').should('be.visible');
      });
@@ -81,27 +81,27 @@ context(
      navigateTo(navigation.proposals);
      cy.reload();
      waitForSpinner();
-      cy.getByTestId(openProposals).within(() => {
+      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil(proposalListItem)
          .last()
-          .within(() => cy.getByTestId(viewProposalButton).click());
+          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus).should('have.text', 'Open');
      voteForProposal('for');
-      cy.getByTestId(proposalStatus, proposalTimeout)
+      cy.get(proposalStatus, proposalTimeout)
        .should('have.text', 'Passed')
        .then(() => {
-          cy.getByTestId(proposalStatus, proposalTimeout).should(
+          cy.get(proposalStatus, proposalTimeout).should(
            'have.text',
            'Enacted'
          );
        });
-      cy.getByTestId(votesTable).within(() => {
+      cy.get(votesTable).within(() => {
        cy.contains('Vote passed.').should('be.visible');
        cy.contains('Voting has ended.').should('be.visible');
      });
-      cy.getByTestId(proposalVoteProgressForPercentage)
+      cy.get(proposalVoteProgressForPercentage)
        .contains('100.00%')
        .and('be.visible');
    });
@@ -115,18 +115,15 @@ context(
      navigateTo(navigation.proposals);
      cy.reload();
      waitForSpinner();
-      cy.getByTestId(openProposals, { timeout: 6000 }).within(() => {
+      cy.get(openProposals, { timeout: 6000 }).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil(proposalListItem)
          .last()
-          .within(() => cy.getByTestId(viewProposalButton).click());
+          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus).should('have.text', 'Open');
      voteForProposal('for');
-      cy.getByTestId(proposalStatus, proposalTimeout).should(
-        'have.text',
-        'Enacted'
-      );
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
    });

    // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -137,17 +134,14 @@ context(
      navigateTo(navigation.proposals);
      cy.reload();
      waitForSpinner();
-      cy.getByTestId(openProposals).within(() => {
+      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil(proposalListItem)
          .last()
-          .within(() => cy.getByTestId(viewProposalButton).click());
+          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.getByTestId(proposalStatus).should('have.text', 'Open');
-      cy.getByTestId(proposalStatus, proposalTimeout).should(
-        'have.text',
-        'Declined'
-      );
+      cy.get(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Declined');
      getProposalInformationFromTable('Rejection reason')
        .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
        .and('be.visible');
@@ -36,19 +36,20 @@ import {
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';

-const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
-const vegaWalletAssociatedBalance = 'associated-amount';
-const vegaWalletNameElement = 'wallet-name';
-const vegaWallet = 'vega-wallet';
-const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
-const newProposalSubmitButton = 'proposal-submit';
-const viewProposalButton = 'view-proposal-btn';
-const rawProposalData = 'proposal-data';
-const voteButtons = 'vote-buttons';
+const vegaWalletStakedBalances =
+  '[data-testid="vega-wallet-balance-staked-validators"]';
+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"]';
+const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
+const rawProposalData = '[data-testid="proposal-data"]';
+const voteButtons = '[data-testid="vote-buttons"]';
 const rejectProposalsLink = '[href="/proposals/rejected"]';
-const feedbackError = 'Error';
-const noOpenProposals = 'no-open-proposals';
-const noClosedProposals = 'no-closed-proposals';
+const feedbackError = '[data-testid="Error"]';
+const noOpenProposals = '[data-testid="no-open-proposals"]';
+const noClosedProposals = '[data-testid="no-closed-proposals"]';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
@@ -92,10 +93,10 @@ context(
    // Test can only pass if run before other proposal tests.
    it.skip('Should be able to see that no proposals exist', function () {
      // 3001-VOTE-003
-      cy.getByTestId(noOpenProposals)
+      cy.get(noOpenProposals)
        .should('be.visible')
        .and('have.text', 'There are no open or yet to enact proposals');
-      cy.getByTestId(noClosedProposals)
+      cy.get(noClosedProposals)
        .should('be.visible')
        .and('have.text', 'There are no enacted or rejected proposals');
    });
@@ -125,10 +126,7 @@ context(
      stakingValidatorPageAddStake('2');
      closeStakingDialog();

-      cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
-        'contain',
-        '2'
-      );
+      cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
      createRawProposal();
    });

@@ -170,7 +168,7 @@ context(
        getProposalFromTitle(rawProposal.rationale.title).within(() => {
          cy.contains('Rejected').should('be.visible');
          cy.contains('Close time too late').should('be.visible');
-          cy.getByTestId(viewProposalButton).click();
+          cy.get(viewProposalButton).click();
        });
      });
      cy.getByTestId('proposal-status').should('have.text', 'Rejected');
@@ -187,14 +185,14 @@ context(
      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.getByTestId(vegaWalletAssociatedBalance, txTimeout).contains(
+      cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
        '0.00',
        txTimeout
      );
      goToMakeNewProposal(governanceProposalType.RAW);
      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
      closeDialog();
    });

@@ -207,7 +205,7 @@ context(
      goToMakeNewProposal(governanceProposalType.RAW);
      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
      closeDialog();
    });

@@ -223,17 +221,17 @@ context(
          createTenDigitUnixTimeStampForSpecifiedDays(8);
        freeformProposal.unexpected = `i shouldn't be here`;
        const proposalPayload = JSON.stringify(freeformProposal);
-        cy.getByTestId(rawProposalData).type(proposalPayload, {
+        cy.get(rawProposalData).type(proposalPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
      closeDialog();
-      cy.getByTestId(rawProposalData)
+      cy.get(rawProposalData)
        .invoke('val')
        .should('contain', "i shouldn't be here");
    });
@@ -251,15 +249,15 @@ context(
        rawProposal.terms.unexpectedField = `i shouldn't be here`;
        const proposalPayload = JSON.stringify(rawProposal);

-        cy.getByTestId(rawProposalData).type(proposalPayload, {
+        cy.get(rawProposalData).type(proposalPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
      closeDialog();
    });

@@ -267,10 +265,10 @@ context(
    // 3006-PASC-006 3006-PASC-007 3008-PFRO-018 3008-PFRO-019 3003-PMAN-006 3003-PMAN-007
    it('Unable to submit proposal without valid json', function () {
      goToMakeNewProposal(governanceProposalType.RAW);
-      cy.getByTestId(newProposalSubmitButton).click();
+      cy.get(newProposalSubmitButton).click();
      cy.getByTestId('input-error-text').should('have.text', 'Required');
-      cy.getByTestId(rawProposalData).type('Not a valid json string');
-      cy.getByTestId(newProposalSubmitButton).click();
+      cy.get(rawProposalData).type('Not a valid json string');
+      cy.get(newProposalSubmitButton).click();
      cy.getByTestId('input-error-text').should(
        'have.text',
        'Must be valid JSON'
@@ -285,22 +283,22 @@ context(
      submitUniqueRawProposal({ proposalTitle: proposalTitle });
      ethereumWalletConnect();
      stakingPageDisassociateTokens('0.0001');
-      cy.getByTestId(vegaWallet)
+      cy.get(vegaWallet)
        .first()
        .within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '0.9999'
          );
        });
      navigateTo(navigation.proposals);
      getProposalFromTitle(proposalTitle).within(() =>
-        cy.getByTestId(viewProposalButton).click()
+        cy.get(viewProposalButton).click()
      );
      cy.contains('Vote breakdown').should('be.visible', {
        timeout: 10000,
      });
-      cy.getByTestId(voteButtons).should('not.exist');
+      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`
@@ -313,20 +311,20 @@ context(
      cy.get('[data-testid="disconnect"]').click();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
        );
      });
      // 3001-VOTE-075
      // 3001-VOTE-076
-      cy.getByTestId(connectToVegaWalletButton)
+      cy.get(connectToVegaWalletButton)
        .should('be.visible')
        .and('have.text', 'Connect Vega wallet')
        .click();
      cy.getByTestId('connector-jsonRpc').click();
-      cy.getByTestId(vegaWalletNameElement).should('be.visible');
-      cy.getByTestId(connectToVegaWalletButton).should('not.exist');
+      cy.get(vegaWalletNameElement).should('be.visible');
+      cy.get(connectToVegaWalletButton).should('not.exist');
      // 3001-VOTE-100
-      cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).contains(
+      cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
        '1.00',
        txTimeout
      );
@@ -31,25 +31,27 @@ import {
 } from '../../support/wallet-functions';

 const proposalListItem = '[data-testid="proposals-list-item"]';
-const openProposals = 'open-proposals';
-const proposalType = 'proposal-type';
-const proposalDetails = 'proposal-details';
-const newProposalSubmitButton = 'proposal-submit';
-const proposalVoteDeadline = 'proposal-vote-deadline';
-const proposalParameterSelect = 'proposal-parameter-select';
-const proposalMarketSelect = 'proposal-market-select';
-const newProposalTitle = 'proposal-title';
-const newProposalDescription = 'proposal-description';
-const newProposalTerms = 'proposal-terms';
-const newProposedParameterValue = 'selected-proposal-param-new-value';
-const minVoteDeadline = 'min-vote';
-const maxVoteDeadline = 'max-vote';
-const minValidationDeadline = 'min-validation';
-const minEnactDeadline = 'min-enactment';
-const maxEnactDeadline = 'max-enactment';
-const inputError = 'input-error-text';
-const enactmentDeadlineError = 'enactment-before-voting-deadline';
-const proposalDownloadBtn = 'proposal-download-json';
+const openProposals = '[data-testid="open-proposals"]';
+const proposalType = '[data-testid="proposal-type"]';
+const proposalDetails = '[data-testid="proposal-details"]';
+const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
+const proposalParameterSelect = '[data-testid="proposal-parameter-select"]';
+const proposalMarketSelect = '[data-testid="proposal-market-select"]';
+const newProposalTitle = '[data-testid="proposal-title"]';
+const newProposalDescription = '[data-testid="proposal-description"]';
+const newProposalTerms = '[data-testid="proposal-terms"]';
+const newProposedParameterValue =
+  '[data-testid="selected-proposal-param-new-value"]';
+const minVoteDeadline = '[data-testid="min-vote"]';
+const maxVoteDeadline = '[data-testid="max-vote"]';
+const minValidationDeadline = '[data-testid="min-validation"]';
+const minEnactDeadline = '[data-testid="min-enactment"]';
+const maxEnactDeadline = '[data-testid="max-enactment"]';
+const inputError = '[data-testid="input-error-text"]';
+const enactmentDeadlineError =
+  '[data-testid="enactment-before-voting-deadline"]';
+const proposalDownloadBtn = '[data-testid="proposal-download-json"]';
 const feedbackError = '[data-testid="Error"]';
 const viewProposalBtn = 'view-proposal-btn';
 const liquidityVoteStatus = 'liquidity-votes-status';
@@ -86,20 +88,18 @@ context(
    it('Unable to submit network parameter with missing/invalid fields', function () {
      navigateTo(navigation.proposals);
      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.getByTestId(proposalDownloadBtn).click();
-      cy.getByTestId(inputError).should('have.length', 3);
-      cy.getByTestId(newProposalTitle).type(
+      cy.get(proposalDownloadBtn).click();
+      cy.get(inputError).should('have.length', 3);
+      cy.get(newProposalTitle).type(
        'Invalid update network parameter proposal'
      );
-      cy.getByTestId(newProposalDescription).type(
-        'E2E invalid test for proposals'
-      );
-      cy.getByTestId(proposalParameterSelect).select(
+      cy.get(newProposalDescription).type('E2E invalid test for proposals');
+      cy.get(proposalParameterSelect).select(
        'spam_protection_proposal_min_tokens'
      );
-      cy.getByTestId(newProposedParameterValue).type('0');
-      cy.getByTestId(proposalVoteDeadline).clear().type('0');
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposedParameterValue).type('0');
+      cy.get(proposalVoteDeadline).clear().type('0');
+      cy.get(proposalDownloadBtn)
        .click()
        .then(() => {
          cy.wrap(
@@ -109,7 +109,7 @@ context(
            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
          });
        });
-      cy.getByTestId(newProposalSubmitButton).click();
+      cy.get(newProposalSubmitButton).click();
      validateDialogContentMsg('PROPOSAL_ERROR_CLOSE_TIME_TOO_SOON');
    });

@@ -117,33 +117,29 @@ context(
    it('Able to download and submit network param proposal', function () {
      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
      // 3007-PNEC-006
-      cy.getByTestId(newProposalTitle)
+      cy.get(newProposalTitle)
        .siblings()
        .should('contain.text', '(100 characters or less)');
      // 3007-PNEC-004 3007-PNEC-005
-      cy.getByTestId(newProposalTitle).type(
-        'Test update network parameter proposal'
-      );
+      cy.get(newProposalTitle).type('Test update network parameter proposal');
      // 3007-PNEC-009
-      cy.getByTestId(newProposalDescription)
+      cy.get(newProposalDescription)
        .siblings()
        .should('contain.text', '(20,000 characters or less)');
      // 3007-PNEC-007 3007-PNEC-008
-      cy.getByTestId(newProposalDescription).type(
-        'E2E test for downloading proposals'
-      );
+      cy.get(newProposalDescription).type('E2E test for downloading proposals');
      // 3007-PNEC-010
-      cy.getByTestId(proposalParameterSelect).select(
+      cy.get(proposalParameterSelect).select(
        'governance_proposal_asset_minClose'
      );
      // 3007-PNEC-011
-      cy.getByTestId(newProposedParameterValue).type('10s');
+      cy.get(newProposedParameterValue).type('10s');
      // 3007-PNEC-012
-      cy.getByTestId(proposalVoteDeadline).clear().type('2');
+      cy.get(proposalVoteDeadline).clear().type('2');
      // 3007-PNEC-013 3007-PNEC-014
      cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
      // 3007-PNEC-015
-      cy.getByTestId(maxEnactDeadline).click();
+      cy.get(maxEnactDeadline).click();
      // 3007-PNEC-016
      cy.getByTestId('enactment-date').invoke('text').should('not.be.empty');
      // 3007-PNEC-017
@@ -152,7 +148,7 @@ context(
      ).should('be.visible');
      // 3007-PNE-018
      cy.log('Download updated proposal file');
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -182,21 +178,19 @@ context(
    it('Unable to submit network parameter proposal with vote deadline above enactment deadline', function () {
      navigateTo(navigation.proposals);
      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.getByTestId(newProposalTitle).type(
-        'Test update network parameter proposal'
-      );
-      cy.getByTestId(newProposalDescription).type('invalid deadlines');
-      cy.getByTestId(proposalParameterSelect).select(
+      cy.get(newProposalTitle).type('Test update network parameter proposal');
+      cy.get(newProposalDescription).type('invalid deadlines');
+      cy.get(proposalParameterSelect).select(
        'spam_protection_proposal_min_tokens'
      );
-      cy.getByTestId(newProposedParameterValue).type('0');
-      cy.getByTestId(proposalVoteDeadline).clear().type('0');
-      cy.getByTestId(maxVoteDeadline).click();
-      cy.getByTestId(enactmentDeadlineError).should(
+      cy.get(newProposedParameterValue).type('0');
+      cy.get(proposalVoteDeadline).clear().type('0');
+      cy.get(maxVoteDeadline).click();
+      cy.get(enactmentDeadlineError).should(
        'have.text',
        'The proposal will fail if enactment is earlier than the voting deadline'
      );
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -207,7 +201,7 @@ context(
            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
          });
        });
-      cy.getByTestId(newProposalSubmitButton).click();
+      cy.get(newProposalSubmitButton).click();
      validateFeedBackMsg(
        'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
      );
@@ -220,16 +214,16 @@ context(
      function () {
        const proposalTitle = 'Test new market proposal';
        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-        cy.getByTestId(newProposalTitle).type('Test new market proposal');
-        cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+        cy.get(newProposalTitle).type('Test new market proposal');
+        cy.get(newProposalDescription).type('E2E test for proposals');
        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
          const newMarketPayload = JSON.stringify(newMarketProposal);
-          cy.getByTestId(newProposalTerms).type(newMarketPayload, {
+          cy.get(newProposalTerms).type(newMarketPayload, {
            parseSpecialCharSequences: false,
            delay: 2,
          });
        });
-        cy.getByTestId(proposalDownloadBtn)
+        cy.get(proposalDownloadBtn)
          .should('be.visible')
          .click()
          .then(() => {
@@ -265,19 +259,19 @@ context(
        'Invalid params: the transaction does not use a valid Vega command: unknown field "invalid" in vega.NewMarket';

      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
-      cy.getByTestId(newProposalTitle).type('Test new market proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(proposalDownloadBtn).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';
        const newMarketPayload = JSON.stringify(newMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newMarketPayload, {
+        cy.get(newProposalTerms).type(newMarketPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -288,7 +282,7 @@ context(
            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
          });
        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      validateFeedBackMsg(errorMsg);
    });
@@ -299,19 +293,17 @@ context(
      switchVegaWalletPubKey();
      stakingPageAssociateTokens('1');
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type(
-        'Test update market proposal - rejected'
-      );
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
+      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) => {
        const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -322,7 +314,7 @@ context(
            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
          });
        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
      validateDialogContentMsg('PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
      closeDialog();
@@ -340,19 +332,17 @@ context(
        vegaWalletPublicKey
      );
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type(
-        'Test update market proposal - rejected'
-      );
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
+      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) => {
        const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -363,7 +353,7 @@ context(
            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
          });
        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      validateFeedBackMsg(
        '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)'
@@ -378,9 +368,9 @@ context(
        vegaWalletPublicKey
      );
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type('Test update market proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
+      cy.get(newProposalTitle).type('Test update market proposal');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.get(proposalMarketSelect).select('Test market 1');
      cy.get('[data-testid="update-market-details"]').within(() => {
        cy.get('dd').eq(0).should('have.text', 'Test market 1');
        cy.get('dd').eq(1).should('have.text', 'TEST.24h');
@@ -395,12 +385,12 @@ context(
      });
      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
        const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -447,19 +437,19 @@ context(
    it('Able to submit new asset proposal using min deadlines', function () {
      const proposalTitle = 'Test new asset proposal';
      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.getByTestId(newProposalTitle).type(proposalTitle);
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalTitle).type(proposalTitle);
+      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/new-asset').then((newAssetProposal) => {
        const newAssetPayload = JSON.stringify(newAssetProposal);
-        cy.getByTestId(newProposalTerms).type(newAssetPayload, {
+        cy.get(newProposalTerms).type(newAssetPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
      });
-      cy.getByTestId(minVoteDeadline).click();
-      cy.getByTestId(minValidationDeadline).click();
-      cy.getByTestId(minEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(minVoteDeadline).click();
+      cy.get(minValidationDeadline).click();
+      cy.get(minEnactDeadline).click();
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -470,9 +460,9 @@ context(
            submitUniqueRawProposal({ proposalBody: filePath, submit: false }); // 3005-PASN-003
          });
        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
      closeDialog();
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
      // cannot submit a proposal with ERC20 address already in use
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
      validateDialogContentMsg('PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE');
@@ -493,8 +483,8 @@ context(

    it('Unable to submit new asset proposal with missing/invalid fields', function () {
      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
+      cy.get(proposalDownloadBtn).should('be.visible').click();
+      cy.get(inputError).should('have.length', 3);
    });

    it('Able to submit update asset proposal using min deadline', function () {
@@ -503,9 +493,9 @@ context(

      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      enterUpdateAssetProposalDetails();
-      cy.getByTestId(minVoteDeadline).click();
-      cy.getByTestId(minEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(minVoteDeadline).click();
+      cy.get(minEnactDeadline).click();
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -517,16 +507,13 @@ context(
          });
        });
      navigateTo(navigation.proposals);
-      cy.getByTestId(openProposals).within(() => {
-        cy.getByTestId(proposalType)
+      cy.get(openProposals).within(() => {
+        cy.get(proposalType)
          .contains('Update asset')
          .parentsUntil(proposalListItem)
          .last()
          .within(() => {
-            cy.getByTestId(proposalDetails).should(
-              'contain.text',
-              assetId.slice(0, 6)
-            ); // 3001-VOTE-029
+            cy.get(proposalDetails).should('contain.text', assetId.slice(0, 6)); // 3001-VOTE-029
            cy.getByTestId(viewProposalBtn).click();
          });
      });
@@ -546,9 +533,9 @@ context(
    it('Able to submit update asset proposal using max deadline', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      enterUpdateAssetProposalDetails();
-      cy.getByTestId(maxVoteDeadline).click();
-      cy.getByTestId(maxEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(maxVoteDeadline).click();
+      cy.get(maxEnactDeadline).click();
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -563,36 +550,36 @@ context(

    it('Unable to submit edit asset proposal with missing/invalid fields', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
+      cy.get(proposalDownloadBtn).should('be.visible').click();
+      cy.get(inputError).should('have.length', 3);
    });

    it('Able to download and submit freeform proposal', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      // 3008-PFRO-006
-      cy.getByTestId(newProposalTitle)
+      cy.get(newProposalTitle)
        .siblings()
        .should('contain.text', '(100 characters or less)'); // 3008-PFRO-007
      // 3008-PFRO-005
-      cy.getByTestId(newProposalTitle).type('Test freeform proposal form');
+      cy.get(newProposalTitle).type('Test freeform proposal form');
      // 3008-PFRO-009
-      cy.getByTestId(newProposalDescription)
+      cy.get(newProposalDescription)
        .siblings()
        .should('contain.text', '(20,000 characters or less)'); // 3008-PFRO-010
      // 3008-PFRO-008 3002-PROP-012 3002-PROP-016
-      cy.getByTestId(newProposalDescription).type(
+      cy.get(newProposalDescription).type(
        'E2E test for downloading freeform proposal'
      );
      // 3008-PFRO-012
-      cy.getByTestId(minVoteDeadline).should('exist'); // 3002-PROP-008
-      cy.getByTestId(maxVoteDeadline).should('exist');
+      cy.get(minVoteDeadline).should('exist'); // 3002-PROP-008
+      cy.get(maxVoteDeadline).should('exist');
      // 3008-PFRO-011
-      cy.getByTestId(proposalVoteDeadline).clear().type('2');
+      cy.get(proposalVoteDeadline).clear().type('2');
      // 3008-PFRO-013 3008-PFRO-014
      cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
      // 3008-PFRO-015
      cy.log('Download updated proposal file');
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
@@ -626,11 +613,11 @@ context(
    }

    function enterUpdateAssetProposalDetails() {
-      cy.getByTestId(newProposalTitle).type('Test update asset proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalTitle).type('Test update asset proposal');
+      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/update-asset').then((newAssetProposal) => {
        const newAssetPayload = JSON.stringify(newAssetProposal);
-        cy.getByTestId(newProposalTerms).type(newAssetPayload, {
+        cy.get(newProposalTerms).type(newAssetPayload, {
          parseSpecialCharSequences: false,
          delay: 2,
        });
@@ -24,12 +24,12 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-functions';

 const proposalListItem = 'proposals-list-item';
-const openProposals = 'open-proposals';
+const openProposals = '[data-testid="open-proposals"]';
 const voteStatus = 'vote-status';
 const proposalType = 'proposal-type';
 const proposalStatus = 'proposal-status';
-const proposalClosingDate = 'vote-details';
-const viewProposalButton = 'view-proposal-btn';
+const proposalClosingDate = '[data-testid="vote-details"]';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const voteBreakDownToggle = 'vote-breakdown-toggle';

 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
@@ -62,13 +62,13 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    }

    navigateTo(navigation.proposals);
-    cy.getByTestId(openProposals).within(() => {
-      cy.getByTestId(proposalClosingDate)
+    cy.get(openProposals).within(() => {
+      cy.get(proposalClosingDate)
        .first()
        .invoke('text')
        .should('match', /days|minutes/);
-      cy.getByTestId(proposalClosingDate).should('contain.text', 'months');
-      cy.getByTestId(proposalClosingDate).last().should('contain.text', 'year');
+      cy.get(proposalClosingDate).should('contain.text', 'months');
+      cy.get(proposalClosingDate).last().should('contain.text', 'year');
    });
  });

@@ -77,7 +77,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    const proposalTitle = generateFreeFormProposalTitle();

    submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    cy.get('[data-testid="proposal-filter-toggle"]').click();
+    cy.get('[data-testid="set-proposals-filter-visible"]').click();
    cy.get('[data-testid="filter-input"]').type(proposerId);
    // cy.get(`#${proposalId}`).should('contain', proposalId);
    cy.contains(proposalTitle).should('be.visible');
@@ -106,7 +106,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    createRawProposal(this.minProposerBalance);
    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
      getProposalFromTitle(rawProposal.rationale.title).within(() => {
-        cy.getByTestId(viewProposalButton).should('be.visible');
+        cy.get(viewProposalButton).should('be.visible');
        cy.getByTestId(proposalType).should('have.text', 'Freeform');
        cy.getByTestId(proposalStatus).should('have.text', 'Open');
      });
@@ -124,13 +124,13 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
        'have.text',
        'Participation not reached'
      );
-      cy.getByTestId(viewProposalButton).click();
+      cy.get(viewProposalButton).click();
    });
    voteForProposal('for');
    navigateTo(navigation.proposals);
    getProposalFromTitle(proposalTitle).within(() => {
      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
-      cy.getByTestId(viewProposalButton).click();
+      cy.get(viewProposalButton).click();
    });
    cy.getByTestId(voteBreakDownToggle).click();
    getProposalInformationFromTable('Token participation met')
@@ -17,7 +17,8 @@ import {
 } from '../../support/wallet-functions';

 const vegaAssetAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de';
-const vegaWalletUnstakedBalance = 'vega-wallet-balance-unstaked';
+const vegaWalletUnstakedBalance =
+  '[data-testid="vega-wallet-balance-unstaked"]';
 const rewardsTable = 'epoch-total-rewards-table';
 const txTimeout = Cypress.env('txTimeout');
 const rewardsTimeOut = { timeout: 60000 };
@@ -39,7 +40,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
    cy.associateTokensToVegaWallet('6000');
    navigateTo(navigation.validators);
    cy.VegaWalletTopUpRewardsPool();
-    cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
+    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
      'contain',
      '6,000.0',
      txTimeout
@@ -4,6 +4,7 @@ import {
  verifyStakedBalance,
  verifyEthWalletTotalAssociatedBalance,
  verifyEthWalletAssociatedBalance,
+  waitForSpinner,
  navigateTo,
  navigation,
  turnTelemetryOff,
@@ -57,7 +58,6 @@ context(
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
      ethereumWalletConnect();
-      cy.connectVegaWallet();
      vegaWalletSetSpecifiedApprovalAmount('1000');
    });

@@ -67,9 +67,10 @@ context(
        function () {
          cy.clearLocalStorage();
          turnTelemetryOff();
-          // Go to homepage to allow wallet teardown without epoch timer refreshing page
-          navigateTo(navigation.home);
-          vegaWalletTeardown();
+          cy.reload();
+          waitForSpinner();
+          cy.connectVegaWallet();
+          ethereumWalletConnect();
          navigateTo(navigation.validators);
        }
      );
@@ -127,7 +128,6 @@ context(
        cy.getByTestId('staked-by-user-tooltip')
          .first()
          .should('have.text', 'Staked by me: 2.00');
-        waitForBeginningOfEpoch();
        cy.getByTestId('total-pending-stake').first().realHover();
        cy.getByTestId('pending-user-stake-tooltip')
          .first()
@@ -398,7 +398,6 @@ context(
        vegaWalletSetSpecifiedApprovalAmount('1000');
        cy.reload();
        ethereumWalletConnect();
-        cy.connectVegaWallet();
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -504,6 +503,11 @@ context(
        );
      });

+      afterEach('Teardown Wallet', function () {
+        navigateTo(navigation.home);
+        vegaWalletTeardown();
+      });
+
      function verifyNextEpochValue(amount: number) {
        cy.getByTestId('stake-next-epoch', epochTimeout)
          .contains(amount, epochTimeout)
@@ -21,24 +21,25 @@ import {
  vegaWalletTeardown,
 } from '../../support/wallet-functions';

-const ethWalletContainer = 'ethereum-wallet';
-const vegaWalletAssociatedBalance = 'currency-value';
-const vegaWalletUnstakedBalance = 'vega-wallet-balance-unstaked';
-const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
-const associateWalletRadioButton = 'associate-radio-wallet';
-const tokenAmountInputBox = 'token-amount-input';
-const tokenSubmitButton = 'token-input-submit-button';
-const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
-const vestingContractSection = 'vega-in-vesting-contract';
-const vegaInWalletSection = 'vega-in-wallet';
-const connectedVegaKey = 'connected-vega-key';
-const associatedKey = 'associated-key';
-const associatedAmount = 'associated-amount';
-const associateCompleteText = 'transaction-complete-body';
-const disassociationWarning = 'disassociation-warning';
-const vegaWallet = 'aside [data-testid="vega-wallet"]';
-const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const ethWalletContainer = '[data-testid="ethereum-wallet"]';
+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 = '[data-testid="associate-btn"]:visible';
+const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
+const tokenAmountInputBox = '[data-testid="token-amount-input"]';
+const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
+const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
+const vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
+const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
+const connectedVegaKey = '[data-testid="connected-vega-key"]';
+const associatedKey = '[data-testid="associated-key"]';
+const associatedAmount = '[data-testid="associated-amount"]';
+const associateCompleteText = '[data-testid="transaction-complete-body"]';
+const disassociationWarning = '[data-testid="disassociation-warning"]';
+const vegaWallet = 'aside [data-testid="vega-wallet"]';

 context(
  'Token association flow - with eth and vega wallets connected',
@@ -88,15 +89,12 @@ context(
          verifyEthWalletAssociatedBalance('2.0');
          verifyEthWalletTotalAssociatedBalance('2.0');
          cy.get(vegaWallet).within(() => {
-            cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
              'contain',
              2.0
            );
          });
-          cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
-            'contain',
-            2.0
-          );
+          cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
        }
      );

@@ -129,7 +127,7 @@ context(
        verifyEthWalletAssociatedBalance('1,001.00');
        verifyEthWalletTotalAssociatedBalance('7,001.00');
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '1,001.00'
          );
@@ -139,20 +137,14 @@ context(
      it('Able to disassociate a partial amount of tokens currently associated', function () {
        stakingPageAssociateTokens('2');
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            2.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });
        cy.get('button').contains('Select a validator to nominate').click();
        cy.getByTestId('epoch-countdown').should('be.visible');
        stakingPageDisassociateTokens('1');
        verifyEthWalletAssociatedBalance('1.0');
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            1.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
        });
      });

@@ -162,24 +154,21 @@ context(
          '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.';
        stakingPageAssociateTokens('2');
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            2.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });
        cy.get('button').contains('Select a validator to nominate').click();
        cy.getByTestId('epoch-countdown').should('be.visible');
        cy.get(ethWalletDissociateButton).click();
-        cy.getByTestId(disassociationWarning).should('contain', warningText);
+        cy.get(disassociationWarning).should('contain', warningText);
        stakingPageDisassociateAllTokens();
-        cy.getByTestId(ethWalletContainer)
+        cy.get(ethWalletContainer)
          .first()
          .within(() => {
            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
              'not.exist'
            );
          });
-        cy.getByTestId(ethWalletContainer)
+        cy.get(ethWalletContainer)
          .first()
          .within(() => {
            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
@@ -187,10 +176,7 @@ context(
            );
          });
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            0.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
        });
      });

@@ -212,15 +198,9 @@ context(
        verifyEthWalletAssociatedBalance('2.0');
        verifyEthWalletTotalAssociatedBalance('2.0');
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            2.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });
-        cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          2.0
-        );
+        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
        stakingPageDisassociateTokens('1', {
          type: 'contract',
          skipConfirmation: true,
@@ -241,54 +221,45 @@ context(
        cy.get('button').contains('Select a validator to nominate').click();
        cy.getByTestId('epoch-countdown').should('be.visible');
        stakingPageAssociateTokens('37', { type: 'contract' });
-        cy.getByTestId(vestingContractSection)
+        cy.get(vestingContractSection)
          .first()
          .within(() => {
-            cy.getByTestId(associatedKey).should(
+            cy.get(associatedKey).should(
              'contain',
              Cypress.env('vegaWalletPublicKeyShort')
            );
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 37);
+            cy.get(associatedAmount, txTimeout).should('contain', 37);
          });
-        cy.getByTestId(vegaInWalletSection)
+        cy.get(vegaInWalletSection)
          .first()
          .within(() => {
-            cy.getByTestId(associatedKey).should(
+            cy.get(associatedKey).should(
              'contain',
              Cypress.env('vegaWalletPublicKeyShort')
            );
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 21);
+            cy.get(associatedAmount, txTimeout).should('contain', 21);
          });
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            58
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 58);
        });
        stakingPageDisassociateTokens('6', { type: 'contract' });
-        cy.getByTestId(vestingContractSection)
+        cy.get(vestingContractSection)
          .first()
          .within(() => {
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 31);
+            cy.get(associatedAmount, txTimeout).should('contain', 31);
          });
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            52
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 52);
        });
        navigateTo(navigation.validators);
        stakingPageDisassociateTokens('9', { type: 'wallet' });
-        cy.getByTestId(vegaInWalletSection)
+        cy.get(vegaInWalletSection)
          .first()
          .within(() => {
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 12);
+            cy.get(associatedAmount, txTimeout).should('contain', 12);
          });
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            43
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
        });
      });

@@ -297,10 +268,10 @@ context(
        // 1004-ASSO-010
        // No warning visible as described in AC, but the button is disabled
        cy.get(ethWalletAssociateButton).click();
-        cy.getByTestId(associateWalletRadioButton, { timeout: 30000 }).click();
-        cy.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
-        cy.getByTestId(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
-        cy.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled');
+        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(tokenSubmitButton, txTimeout).should('be.disabled');
      });

      // 1004-ASSO-004
@@ -325,25 +296,22 @@ context(

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

        switchVegaWalletPubKey();
-        cy.getByTestId(connectedVegaKey).should(
+        cy.get(connectedVegaKey).should(
          'have.text',
          Cypress.env('vegaWalletPublicKey2')
        );
        stakingPageAssociateTokens('2');
        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            2.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
        });
-        cy.getByTestId(associateCompleteText).should(
+        cy.get(associateCompleteText).should(
          'have.text',
          `Vega key ${Cypress.env(
            'vegaWalletPublicKey2Short'
@@ -10,10 +10,9 @@ import {
 } from '../../support/governance.functions';
 import { mockNetworkUpgradeProposal } from '../../support/proposal.functions';

-const proposalDocsLink = 'proposal-docs-link';
-const proposalDocumentationLink = 'proposal-documentation-link';
-const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
+const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
 const governanceDocsUrl = 'https://vega.xyz/governance';
+const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';

 context(
  'Governance Page - verify elements on page',
@@ -42,7 +41,7 @@ context(

    it('should be able to see a working link for - find out more about Vega governance', function () {
      // 3001-VOTE-001
-      cy.getByTestId(proposalDocumentationLink)
+      cy.get(proposalDocumentationLink)
        .should('be.visible')
        .and('have.text', 'Find out more about Vega governance')
        .and('have.attr', 'href')
@@ -65,7 +64,7 @@ context(
    // 3007-PNE-021
    it('should have documentation links for network parameter proposal', function () {
      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
        .find('a')
        .should('have.attr', 'href')
        .and('contain', '/tutorials/proposals/network-parameter-proposal');
@@ -74,7 +73,7 @@ context(
    // 3003-PMAN-002 3003-PMAN-005
    it('should have documentation links for new market proposal', function () {
      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
        .find('a')
        .should('have.attr', 'href')
        .and('contain', '/tutorials/proposals/new-market-proposal');
@@ -83,7 +82,7 @@ context(
    // 3004-PMAC-005
    it('should have documentation links for update market proposal', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
        .find('a')
        .should('have.attr', 'href')
        .and('contain', '/tutorials/proposals/update-market-proposal');
@@ -92,7 +91,7 @@ context(
    // 3005-PASN-002 005-PASN-005
    it('should have documentation links for new asset proposal', function () {
      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
        .find('a')
        .should('have.attr', 'href')
        .and('contain', '/tutorials/proposals/new-asset-proposal');
@@ -101,7 +100,7 @@ context(
    // 3006-PASC-002 3006-PASC-005
    it('should have documentation links for update asset proposal', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
        .find('a')
        .should('have.attr', 'href')
        .and('contain', '/tutorials/proposals/update-asset-proposal');
@@ -110,7 +109,7 @@ context(
    // 3008-PFRO-003 3008-PFRO-017
    it('should have documentation links for freeform proposal', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
        .find('a')
        .should('have.attr', 'href')
        .and('contain', '/tutorials/proposals/freeform-proposal');
@@ -118,7 +117,7 @@ context(

    it('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
      goToMakeNewProposal(governanceProposalType.RAW);
-      cy.getByTestId(connectToVegaWalletButton)
+      cy.get(connectToVegaWalletButton)
        .should('be.visible')
        .and('have.text', 'Connect Vega wallet');
    });
@@ -166,7 +165,6 @@ context(
            );
          });
      });
-      cy.get('[data-testid="closed-proposals-toggle-networkUpgrades"]').click();
      cy.getByTestId('closed-proposals').within(() => {
        cy.getByTestId('protocol-upgrade-proposals-list-item').should(
          'have.length',
@@ -5,8 +5,8 @@ import {
 } from '../../support/common.functions';
 import { waitForBeginningOfEpoch } from '../../support/staking.functions';

-const viewToggle = 'epoch-reward-view-toggle-total';
-const warning = 'callout';
+const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
+const warning = '[data-testid="callout"]';

 context(
  'Rewards Page - verify elements on page',
@@ -27,7 +27,7 @@ context(
      });

      it('should have epoch warning', function () {
-        cy.getByTestId(warning)
+        cy.get(warning)
          .should('be.visible')
          .and(
            'have.text',
@@ -36,7 +36,7 @@ context(
      });

      it('should have toggle for seeing total vs individual rewards', function () {
-        cy.getByTestId(viewToggle).should('be.visible');
+        cy.get(viewToggle).should('be.visible');
      });

      // Skipping due to bug #3471 causing flaky failuress
@@ -1,17 +1,18 @@
 import { navigateTo, navigation } from '../../support/common.functions';

 const tokenDetailsTable = '.token-details';
-const address = 'token-address';
-const contract = 'token-contract';
-const totalSupply = 'total-supply';
-const circulatingSupply = 'circulating-supply';
-const staked = 'staked';
-const tranchesLink = 'tranches-link';
-const redeemBtn = 'check-vesting-page-btn';
-const getVegaWalletLink = 'get-vega-wallet-link';
-const associateVegaLink = 'associate-vega-tokens-link-on-homepage';
-const stakingBtn = 'staking-button-on-homepage';
-const governanceBtn = 'governance-button-on-homepage';
+const address = '[data-testid="token-address"]';
+const contract = '[data-testid="token-contract"]';
+const totalSupply = '[data-testid="total-supply"]';
+const circulatingSupply = '[data-testid="circulating-supply"]';
+const staked = '[data-testid="staked"]';
+const tranchesLink = '[data-testid="tranches-link"]';
+const redeemBtn = '[data-testid="check-vesting-page-btn"]';
+const getVegaWalletLink = '[data-testid="get-vega-wallet-link"]';
+const associateVegaLink =
+  '[data-testid="associate-vega-tokens-link-on-homepage"]';
+const stakingBtn = '[data-testid="staking-button-on-homepage"]';
+const governanceBtn = '[data-testid="governance-button-on-homepage"]';

 const vegaTokenAddress = Cypress.env('vegaTokenAddress');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -24,7 +25,7 @@ context('Verify elements on Token page', { tags: '@smoke' }, function () {
  describe('THE $VEGA TOKEN table', function () {
    it('should have TOKEN ADDRESS', function () {
      cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(address)
+        cy.get(address)
          .should('be.visible')
          .invoke('text')
          .should('be.equal', vegaTokenAddress);
@@ -33,7 +34,7 @@ context('Verify elements on Token page', { tags: '@smoke' }, function () {
    it('should have VESTING CONTRACT', function () {
      // 1004-ASSO-001
      cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(contract)
+        cy.get(contract)
          .should('be.visible')
          .invoke('text')
          .should('be.equal', vegaTokenContractAddress);
@@ -41,56 +42,56 @@ context('Verify elements on Token page', { tags: '@smoke' }, function () {
    });
    it('should have TOTAL SUPPLY', function () {
      cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(totalSupply).should('be.visible');
+        cy.get(totalSupply).should('be.visible');
      });
    });
    it('should have CIRCULATING SUPPLY', function () {
      cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(circulatingSupply).should('be.visible');
+        cy.get(circulatingSupply).should('be.visible');
      });
    });
    it('should have STAKED $VEGA', function () {
      cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(staked).should('be.visible');
+        cy.get(staked).should('be.visible');
      });
    });
  });

  describe('links and buttons', function () {
    it('should have TRANCHES link', function () {
-      cy.getByTestId(tranchesLink)
+      cy.get(tranchesLink)
        .should('be.visible')
        .and('have.attr', 'href')
        .and('equal', '/token/tranches');
    });
    it('should have REDEEM button', function () {
-      cy.getByTestId(redeemBtn)
+      cy.get(redeemBtn)
        .should('be.visible')
        .parent()
        .should('have.attr', 'href')
        .and('equal', '/token/redeem');
    });
    it('should have GET VEGA WALLET link', function () {
-      cy.getByTestId(getVegaWalletLink)
+      cy.get(getVegaWalletLink)
        .should('be.visible')
        .and('have.attr', 'href')
        .and('equal', 'https://vega.xyz/wallet');
    });
    it('should have ASSOCIATE VEGA TOKENS link', function () {
-      cy.getByTestId(associateVegaLink)
+      cy.get(associateVegaLink)
        .should('be.visible')
        .and('have.attr', 'href')
        .and('equal', '/token/associate');
    });
    it('should have STAKING button', function () {
-      cy.getByTestId(stakingBtn)
+      cy.get(stakingBtn)
        .should('be.visible')
        .parent()
        .should('have.attr', 'href')
        .and('equal', '/validators');
    });
    it('should have GOVERNANCE button', function () {
-      cy.getByTestId(governanceBtn)
+      cy.get(governanceBtn)
        .should('be.visible')
        .parent()
        .should('have.attr', 'href')
@@ -12,26 +12,28 @@ import {
 } from '../../support/staking.functions';
 import { previousEpochData } from '../../fixtures/mocks/previous-epoch';

-const guideLink = 'staking-guide-link';
-const validatorTitle = 'validator-node-title';
-const validatorId = 'validator-id';
-const validatorPubKey = 'validator-public-key';
-const ethAddressLink = 'link';
-const validatorStatus = 'validator-status';
-const totalStake = 'total-stake';
-const pendingStake = 'pending-stake';
-const stakedByOperator = 'staked-by-operator';
-const stakedByDelegates = 'staked-by-delegates';
-const stakeShare = 'stake-percentage';
-const stakedByOperatorToolTip = 'staked-operator-tooltip';
-const stakedByDelegatesToolTip = 'staked-delegates-tooltip';
-const totalStakedToolTip = 'total-staked-tooltip';
-const unnormalisedVotingPowerToolTip = 'unnormalised-voting-power-tooltip';
-const normalisedVotingPowerToolTip = 'normalised-voting-power-tooltip';
-const performancePenaltyToolTip = 'performance-penalty-tooltip';
-const overstakedPenaltyToolTip = 'overstaked-penalty-tooltip';
-const multisigPenaltyToolTip = 'multisig-error-tooltip';
-const epochCountDown = 'epoch-countdown';
+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 multisigPenaltyToolTip = '[data-testid="multisig-error-tooltip"]';
+const epochCountDown = '[data-testid="epoch-countdown"]';
 const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;

 context('Validators Page - verify elements on page', function () {
@@ -50,7 +52,7 @@ context('Validators Page - verify elements on page', function () {

    it('Should have Staking Guide link visible', function () {
      // 1002-STKE-003
-      cy.getByTestId(guideLink)
+      cy.get(guideLink)
        .should('be.visible')
        .and('have.text', 'Read more about staking on Vega')
        .and(
@@ -93,13 +95,13 @@ context('Validators Page - verify elements on page', function () {
        waitForBeginningOfEpoch();
        cy.getByTestId('total-stake').first().realHover();

-        cy.getByTestId(stakedByOperatorToolTip)
+        cy.get(stakedByOperatorToolTip)
          .invoke('text')
          .should('contain', 'Staked by operator: 3,000.00');
-        cy.getByTestId(stakedByDelegatesToolTip)
+        cy.get(stakedByDelegatesToolTip)
          .invoke('text')
          .should('contain', 'Staked by delegates: 0.00');
-        cy.getByTestId(totalStakedToolTip)
+        cy.get(totalStakedToolTip)
          .invoke('text')
          .should('contain', 'Total stake: 3,000.00');
      });
@@ -116,10 +118,10 @@ context('Validators Page - verify elements on page', function () {
        waitForBeginningOfEpoch();
        cy.getByTestId('normalised-voting-power').first().realHover();

-        cy.getByTestId(unnormalisedVotingPowerToolTip)
+        cy.get(unnormalisedVotingPowerToolTip)
          .invoke('text')
          .should('contain', 'Unnormalised voting power: 20.00%');
-        cy.getByTestId(normalisedVotingPowerToolTip)
+        cy.get(normalisedVotingPowerToolTip)
          .invoke('text')
          .should('contain', 'Normalised voting power: 50.00%');
      });
@@ -137,10 +139,10 @@ context('Validators Page - verify elements on page', function () {
        waitForBeginningOfEpoch();
        cy.getByTestId('total-penalty').realHover();

-        cy.getByTestId(performancePenaltyToolTip)
+        cy.get(performancePenaltyToolTip)
          .invoke('text')
          .should('contain', 'Performance penalty: 0.00%');
-        cy.getByTestId(overstakedPenaltyToolTip)
+        cy.get(overstakedPenaltyToolTip)
          .invoke('text')
          .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
      });
@@ -159,12 +161,12 @@ context('Validators Page - verify elements on page', function () {
        });
        waitForBeginningOfEpoch();
        cy.getByTestId('total-penalty').first().realHover();
-        cy.getByTestId(multisigPenaltyToolTip)
+        cy.get(multisigPenaltyToolTip)
          .invoke('text')
          .should('contain', 'Multisig penalty: 100%');

        cy.getByTestId('total-penalty').eq(1).realHover();
-        cy.getByTestId(multisigPenaltyToolTip)
+        cy.get(multisigPenaltyToolTip)
          .invoke('text')
          .should('contain', 'Multisig penalty: 100%');
      });
@@ -183,59 +185,53 @@ context('Validators Page - verify elements on page', function () {

      // 1002-STKE-006
      it('Should be able to see validator name', function () {
-        cy.getByTestId(validatorTitle).should('not.be.empty');
+        cy.get(validatorTitle).should('not.be.empty');
      });

      // 1002-STKE-007
      it('Should be able to see validator id', function () {
-        cy.getByTestId(validatorId).should('not.be.empty');
+        cy.get(validatorId).should('not.be.empty');
      });

      // 1002-STKE-008
      it('Should be able to see validator public key', function () {
-        cy.getByTestId(validatorPubKey).should('not.be.empty');
+        cy.get(validatorPubKey).should('not.be.empty');
      });

      // 1002-STKE-010
      it('Should be able to see Ethereum address', function () {
-        cy.getByTestId(ethAddressLink)
-          .should('not.be.empty')
-          .and('have.attr', 'href');
+        cy.get(ethAddressLink).should('not.be.empty').and('have.attr', 'href');
      });
      // TODO validators missing url for more information about them 1002-STKE-09

      it('Should be able to see validator status', function () {
-        cy.getByTestId(validatorStatus).should('have.text', 'Consensus');
+        cy.get(validatorStatus).should('have.text', 'Consensus');
      });

      // 1002-STKE-012
      it('Should be able to see total stake', function () {
-        cy.getByTestId(totalStake)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
+        cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
      });

      it('Should be able to see pending stake', function () {
-        cy.getByTestId(pendingStake)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
+        cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
      });

      it('Should be able to see staked by operator', function () {
-        cy.getByTestId(stakedByOperator)
+        cy.get(stakedByOperator)
          .invoke('text')
          .should('match', stakeNumberRegex);
      });

      it('Should be able to see staked by delegates', function () {
-        cy.getByTestId(stakedByDelegates)
+        cy.get(stakedByDelegates)
          .invoke('text')
          .should('match', stakeNumberRegex);
      });

      // 1002-STKE-051
      it('Should be able to see stake share in percentage', function () {
-        cy.getByTestId(stakeShare)
+        cy.get(stakeShare)
          .invoke('text')
          .then(($stakePercentage) => {
            // The pattern must start at a word boundary (\b).
@@ -261,7 +257,7 @@ context('Validators Page - verify elements on page', function () {
        const epochTitle = 'h3';
        const nextEpochInfo = 'p';

-        cy.getByTestId(epochCountDown).within(() => {
+        cy.get(epochCountDown).within(() => {
          cy.get(epochTitle).should('not.be.empty');
          cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
        });
@@ -6,7 +6,7 @@ import {
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';

-const connectButton = 'connect-to-eth-btn';
+const connectButton = '[data-testid="connect-to-eth-btn"]';
 const lockedTokensInVestingContract = '6,499,972.30';

 context(
@@ -29,7 +29,7 @@ context(

      // 1005-VEST-018
      it('should have connect Eth wallet button', function () {
-        cy.getByTestId(connectButton)
+        cy.get(connectButton)
          .should('be.visible')
          .and('have.text', 'Connect Ethereum wallet');
      });
@@ -5,11 +5,11 @@ const walletContainer = 'aside [data-testid="ethereum-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectToEthButton =
  '[data-testid="connect-to-eth-wallet-button"]:visible';
-const connectorList = 'web3-connector-list';
+const connectorList = '[data-testid="web3-connector-list"]';
 const associate = '[href="/token/associate"]';
 const disassociate = '[href="/token/disassociate"]';
-const disconnect = 'disconnect-from-eth-wallet-button';
-const accountNo = 'ethereum-account-truncated';
+const disconnect = '[data-testid="disconnect-from-eth-wallet-button"]';
+const accountNo = '[data-testid="ethereum-account-truncated"]';
 const currencyTitle = '[data-testid="currency-title"]:visible';
 const currencyValue = '[data-testid="currency-value"]:visible';
 const vegaInVesting = '[data-testid="vega-in-vesting-contract"]:visible';
@@ -18,8 +18,8 @@ const progressBar = '[data-testid="progress-bar"]:visible';
 const currencyLocked = '[data-testid="currency-locked"]:visible';
 const currencyUnlocked = '[data-testid="currency-unlocked"]:visible';
 const dialog = '[role="dialog"]:visible';
-const dialogHeader = 'dialog-title';
-const dialogCloseBtn = 'dialog-close';
+const dialogHeader = '[data-testid="dialog-title"]';
+const dialogCloseBtn = '[data-testid="dialog-close"]';

 context(
  'Ethereum Wallet - verify elements on widget',
@@ -59,7 +59,7 @@ context(

      it('should have Connect Ethereum header visible', function () {
        cy.get(dialog).within(() => {
-          cy.getByTestId(dialogHeader)
+          cy.get(dialogHeader)
            .should('be.visible')
            .and('have.text', 'Connect to your Ethereum wallet');
        });
@@ -73,7 +73,7 @@ context(
          'WalletConnect',
          'WalletConnect Legacy',
        ];
-        cy.getByTestId(connectorList).within(() => {
+        cy.get(connectorList).within(() => {
          cy.get('button').each(($btn, i) => {
            cy.wrap($btn).should('be.visible').and('have.text', connectList[i]);
          });
@@ -83,7 +83,7 @@ context(
      after('close popup', function () {
        cy.get(dialog)
          .within(() => {
-            cy.getByTestId(dialogCloseBtn).click();
+            cy.get(dialogCloseBtn).click();
          })
          .should('not.exist');
      });
@@ -106,7 +106,7 @@ context(
      // 0004-EWAL-005
      it('should have account number visible', function () {
        cy.get(walletContainer).within(() => {
-          cy.getByTestId(accountNo)
+          cy.get(accountNo)
            .should('be.visible')
            .and('have.text', Cypress.env('ethWalletPublicKeyTruncated'));
        });
@@ -129,7 +129,7 @@ context(
      // 0004-EWAL-007
      it('should have Disconnect button visible', function () {
        cy.get(walletContainer).within(() => {
-          cy.getByTestId(disconnect)
+          cy.get(disconnect)
            .should('be.visible')
            .and('have.text', 'Disconnect');
        });
@@ -7,28 +7,28 @@ import {

 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
-const connectButton = 'connect-vega-wallet';
-const getVegaLink = 'link';
+const connectButton = '[data-testid="connect-vega-wallet"]';
+const getVegaLink = '[data-testid="link"]';
 const dialog = '[role="dialog"]:visible';
-const dialogHeader = 'dialog-title';
-const walletDialogHeader = 'wallet-dialog-title';
-const connectorsList = 'connectors-list';
-const dialogCloseBtn = 'dialog-close';
-const restConnectorForm = 'rest-connector-form';
+const dialogHeader = '[data-testid="dialog-title"]';
+const walletDialogHeader = '[data-testid="wallet-dialog-title"]';
+const connectorsList = '[data-testid="connectors-list"]';
+const dialogCloseBtn = '[data-testid="dialog-close"]';
+const restConnectorForm = '[data-testid="rest-connector-form"]';
 const restWallet = '#wallet';
 const restPassphrase = '#passphrase';
 const restConnectBtn = '[type="submit"]';
-const accountNo = 'vega-account-truncated';
-const currencyTitle = 'currency-title';
-const currencyValue = 'currency-value';
+const accountNo = '[data-testid="vega-account-truncated"]';
+const currencyTitle = '[data-testid="currency-title"]';
+const currencyValue = '[data-testid="currency-value"]';
 const vegaUnstaked = '[data-testid="vega-wallet-balance-unstaked"] .text-right';
 const governanceBtn = '[href="/proposals"]';
 const stakingBtn = '[href="/validators"]';
-const manageLink = 'manage-vega-wallet';
-const dialogVegaKey = 'vega-public-key-full';
-const dialogDisconnectBtn = 'disconnect';
-const copyPublicKeyBtn = 'copy-vega-public-key';
-const vegaWalletCurrencyTitle = 'currency-title';
+const manageLink = '[data-testid="manage-vega-wallet"]';
+const dialogVegaKey = '[data-testid="vega-public-key-full"]';
+const dialogDisconnectBtn = '[data-testid="disconnect"]';
+const copyPublicKeyBtn = '[data-testid="copy-vega-public-key"]';
+const vegaWalletCurrencyTitle = '[data-testid="currency-title"]';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const txTimeout = Cypress.env('txTimeout');

@@ -47,10 +47,10 @@ context(
          cy.get(walletHeader)
            .should('be.visible')
            .and('have.text', 'Vega Wallet');
-          cy.getByTestId(connectButton)
+          cy.get(connectButton)
            .should('be.visible')
            .and('have.text', 'Connect Vega wallet to use associated $VEGA');
-          cy.getByTestId(getVegaLink)
+          cy.get(getVegaLink)
            .should('be.visible')
            .and('have.text', 'Get a Vega wallet')
            .and('have.attr', 'href', 'https://vega.xyz/wallet');
@@ -61,20 +61,20 @@ context(
    describe('when connect button clicked', () => {
      before('click connect vega wallet button', () => {
        cy.get(walletContainer).within(() => {
-          cy.getByTestId(connectButton).click();
+          cy.get(connectButton).click();
        });
      });

      it('should have Connect Vega header visible', () => {
        cy.get(dialog).within(() => {
-          cy.getByTestId(walletDialogHeader)
+          cy.get(walletDialogHeader)
            .should('be.visible')
            .and('have.text', 'Connect');
        });
      });

      it('should have jsonRpc and hosted connection options visible on list', function () {
-        cy.getByTestId(connectorsList).within(() => {
+        cy.get(connectorsList).within(() => {
          cy.getByTestId('connector-jsonRpc')
            .should('be.visible')
            .and('have.text', 'Connect Vega wallet');
@@ -86,33 +86,33 @@ context(

      it('should have close button visible', function () {
        cy.get(dialog).within(() => {
-          cy.getByTestId(dialogCloseBtn).should('be.visible');
+          cy.get(dialogCloseBtn).should('be.visible');
        });
      });
    });

    describe('when rest connector form opened', function () {
      before('click hosted wallet app button', function () {
-        cy.getByTestId(connectorsList).within(() => {
+        cy.get(connectorsList).within(() => {
          cy.getByTestId('connector-hosted').click();
        });
      });

      // 0002-WCON-002
      it('should have wallet field visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
+        cy.get(restConnectorForm).within(() => {
          cy.get(restWallet).should('be.visible');
        });
      });

      it('should have password field visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
+        cy.get(restConnectorForm).within(() => {
          cy.get(restPassphrase).should('be.visible');
        });
      });

      it('should have connect button visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
+        cy.get(restConnectorForm).within(() => {
          cy.get(restConnectBtn)
            .should('be.visible')
            .and('have.text', 'Connect');
@@ -121,12 +121,12 @@ context(

      it('should have close button visible', function () {
        cy.get(dialog).within(() => {
-          cy.getByTestId(dialogCloseBtn).should('be.visible');
+          cy.get(dialogCloseBtn).should('be.visible');
        });
      });

      after('close dialog', function () {
-        cy.getByTestId(dialogCloseBtn).click().should('not.exist');
+        cy.get(dialogCloseBtn).click().should('not.exist');
      });
    });

@@ -152,7 +152,7 @@ context(
        { tags: '@smoke' },
        function () {
          cy.get(walletContainer).within(() => {
-            cy.getByTestId(accountNo)
+            cy.get(accountNo)
              .should('be.visible')
              .and('have.text', Cypress.env('vegaWalletPublicKeyShort'));
          });
@@ -161,7 +161,7 @@ context(

      it('should have Vega Associated currency title visible', function () {
        cy.get(walletContainer).within(() => {
-          cy.getByTestId(currencyTitle)
+          cy.get(currencyTitle)
            .should('be.visible')
            .and('contain.text', `VEGAAssociated`);
        });
@@ -172,7 +172,7 @@ context(
        { tags: '@smoke' },
        function () {
          cy.get(walletContainer).within(() => {
-            cy.getByTestId(currencyValue)
+            cy.get(currencyValue)
              .should('be.visible')
              .and('contain.text', `0.00`);
          });
@@ -204,23 +204,21 @@ context(

      it('should have Manage link visible', function () {
        cy.get(walletContainer).within(() => {
-          cy.getByTestId(manageLink)
-            .should('be.visible')
-            .and('have.text', 'Manage');
+          cy.get(manageLink).should('be.visible').and('have.text', 'Manage');
        });
      });

      describe('when Manage dialog opened', function () {
        before('click Manage link', function () {
          cy.get(walletContainer).within(() => {
-            cy.getByTestId(manageLink).click();
+            cy.get(manageLink).click();
          });
        });

        // 0002-WCON-025, 0002-WCON-026
        it('should have SELECT A VEGA KEY dialog title visible', function () {
          cy.get(dialog).within(() => {
-            cy.getByTestId(dialogHeader)
+            cy.get(dialogHeader)
              .should('be.visible')
              .and('have.text', 'SELECT A VEGA KEY');
          });
@@ -240,7 +238,7 @@ context(
              'contain.text',
              truncatedPubKey1
            );
-            cy.getByTestId(dialogVegaKey)
+            cy.get(dialogVegaKey)
              .should('be.visible')
              .and('contain.text', truncatedPubKey1)
              .and('contain.text', truncatedPubKey2);
@@ -250,7 +248,7 @@ context(
        // 0002-WCON-029
        it('should have copy public key button visible', function () {
          cy.get(dialog).within(() => {
-            cy.getByTestId(copyPublicKeyBtn)
+            cy.get(copyPublicKeyBtn)
              .should('be.visible')
              .and('contain.text', 'Copy');
          });
@@ -258,13 +256,13 @@ context(

        it('should have close button visible', function () {
          cy.get(dialog).within(() => {
-            cy.getByTestId(dialogCloseBtn).should('be.visible');
+            cy.get(dialogCloseBtn).should('be.visible');
          });
        });

        it('should have vega Disconnect all keys button visible', function () {
          cy.get(dialog).within(() => {
-            cy.getByTestId(dialogDisconnectBtn)
+            cy.get(dialogDisconnectBtn)
              .should('be.visible')
              .and('have.text', 'Disconnect all keys');
          });
@@ -273,10 +271,10 @@ context(
        // 0002-WCON-022
        it('should be able to disconnect all keys', function () {
          cy.get(dialog).within(() => {
-            cy.getByTestId(dialogDisconnectBtn).click();
+            cy.get(dialogDisconnectBtn).click();
          });
          cy.get(walletContainer).within(() => {
-            cy.getByTestId(connectButton).should('be.visible'); // 0002-WCON-023
+            cy.get(connectButton).should('be.visible'); // 0002-WCON-023
          });
        });
      });
@@ -321,22 +319,16 @@ context(
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
-          cy.get(walletContainer).within(() => {
-            cy.getByTestId('currency-title', txTimeout).should(
-              'have.length.at.least',
-              5
-            );
-          });
        });

        for (const { name, symbol, expectedAmount } of assets) {
          it(`should see ${name} within vega wallet`, () => {
            cy.get(walletContainer).within(() => {
-              cy.getByTestId(vegaWalletCurrencyTitle)
+              cy.get(vegaWalletCurrencyTitle)
                .contains(name, txTimeout)
                .should('be.visible');

-              cy.getByTestId(vegaWalletCurrencyTitle)
+              cy.get(vegaWalletCurrencyTitle)
                .contains(name)
                .parent()
                .siblings()
@@ -345,7 +337,7 @@ context(
                  expect(displayedAmount).be.gte(expectedAmount);
                });

-              cy.getByTestId(vegaWalletCurrencyTitle)
+              cy.get(vegaWalletCurrencyTitle)
                .contains(name)
                .parent()
                .contains(symbol);
@@ -5,6 +5,8 @@ import {
  verifyTabHighlighted,
 } from '../../support/common.functions';

+const connectToVegaBtn = '[data-testid="connect-to-vega-wallet-btn"]';
+
 context(
  'Withdraw Page - verify elements on page',
  { tags: '@smoke' },
@@ -24,7 +26,7 @@ context(
      });

      it('should have connect Vega wallet button', function () {
-        cy.getByTestId('connect-to-vega-wallet-btn')
+        cy.get(connectToVegaBtn)
          .should('be.visible')
          .and('have.text', 'Connect Vega wallet');
      });
@@ -139,9 +139,6 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
                      $associatedAmount
                    );
                  });
-                // Wait needed to allow Eth transaction to complete - otherwise could result in nonce error
-                // eslint-disable-next-line cypress/no-unnecessary-waiting
-                cy.wait(2000);
              }
            });
          });
@@ -1,69 +0,0 @@
-import { render, fireEvent } from '@testing-library/react';
-import { CollapsibleToggle } from './collapsible-toggle';
-
-describe('CollapsibleToggle', () => {
-  const testId = 'collapsible-toggle';
-
-  it('renders without crashing', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId, getByText } = render(
-      <CollapsibleToggle
-        toggleState={false}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    expect(getByTestId(testId)).toBeInTheDocument();
-    expect(getByText('Test')).toBeInTheDocument();
-  });
-
-  it('calls setToggleState with the opposite of current toggleState when clicked', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId } = render(
-      <CollapsibleToggle
-        toggleState={false}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    fireEvent.click(getByTestId(testId));
-
-    expect(mockSetToggleState).toHaveBeenCalledWith(true);
-  });
-
-  it('has the rotate-180 class if toggleState is true', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId } = render(
-      <CollapsibleToggle
-        toggleState={true}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    expect(getByTestId('toggle-icon-wrapper')).toHaveClass('rotate-180');
-  });
-
-  it('does not have the rotate-180 class if toggleState is false', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId } = render(
-      <CollapsibleToggle
-        toggleState={false}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    expect(getByTestId('toggle-icon-wrapper')).not.toHaveClass('rotate-180');
-  });
-});
@@ -1,38 +0,0 @@
-import classnames from 'classnames';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import type { Dispatch, SetStateAction, ReactNode } from 'react';
-
-interface CollapsibleToggleProps {
-  toggleState: boolean;
-  setToggleState: Dispatch<SetStateAction<boolean>>;
-  children: ReactNode;
-  dataTestId?: string;
-}
-
-export const CollapsibleToggle = ({
-  toggleState,
-  setToggleState,
-  dataTestId,
-  children,
-}: CollapsibleToggleProps) => {
-  const classes = classnames(
-    'mb-4 transition-transform ease-in-out duration-300',
-    {
-      'rotate-180': toggleState,
-    }
-  );
-
-  return (
-    <button
-      onClick={() => setToggleState(!toggleState)}
-      data-testid={dataTestId}
-    >
-      <div className="flex items-center gap-3">
-        {children}
-        <div className={classes} data-testid="toggle-icon-wrapper">
-          <Icon name="chevron-down" size={8} />
-        </div>
-      </div>
-    </button>
-  );
-};
@@ -1 +0,0 @@
-export * from './collapsible-toggle';
@@ -833,8 +833,5 @@
  "multisigContractIncorrect": "is incorrectly configured. Validator and delegator rewards will be penalised until this is resolved.",
  "learnMore": "Learn more",
  "AllValidators": "All validators",
-  "AllProposals": "All proposals",
-  "RejectedProposals": "Rejected proposals",
-  "networkGovernance": "Network governance",
-  "networkUpgrades": "Network upgrades"
+  "AllProposals": "All proposals"
 }
@@ -0,0 +1,6 @@
+import classnames from 'classnames';
+
+export const collapsibleToggleStyles = (toggleState: boolean) =>
+  classnames('mb-4 transition-transform ease-in-out duration-300', {
+    'rotate-180': toggleState,
+  });
@@ -1,9 +1,9 @@
 import ReactMarkdown from 'react-markdown';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import { Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';

 export const ProposalDescription = ({
  description,
@@ -15,13 +15,17 @@ export const ProposalDescription = ({

  return (
    <section data-testid="proposal-description">
-      <CollapsibleToggle
-        toggleState={showDescription}
-        setToggleState={setShowDescription}
-        dataTestId={'proposal-description-toggle'}
+      <button
+        onClick={() => setShowDescription(!showDescription)}
+        data-testid="proposal-description-toggle"
      >
-        <SubHeading title={t('proposalDescription')} />
-      </CollapsibleToggle>
+        <div className="flex items-center gap-3">
+          <SubHeading title={t('proposalDescription')} />
+          <div className={collapsibleToggleStyles(showDescription)}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>

      {showDescription && (
        <RoundedWrapper paddingBottom={true} marginBottomLarge={true}>
@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { Icon, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';

@@ -16,13 +16,17 @@ export const ProposalJson = ({

  return (
    <section data-testid="proposal-json">
-      <CollapsibleToggle
-        toggleState={showDetails}
-        setToggleState={setShowDetails}
-        dataTestId="proposal-json-toggle"
+      <button
+        onClick={() => setShowDetails(!showDetails)}
+        data-testid="proposal-json-toggle"
      >
-        <SubHeading title={t('proposalJson')} />
-      </CollapsibleToggle>
+        <div className="flex items-center gap-3">
+          <SubHeading title={t('proposalJson')} />
+          <div className={collapsibleToggleStyles(showDetails)}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>

      {showDetails && <SyntaxHighlighter data={proposal} />}
    </section>
@@ -24,7 +24,7 @@ import {
  SyntaxHighlighter,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import { create } from 'zustand';
@@ -77,13 +77,17 @@ export const ProposalMarketData = ({

  return (
    <section className="relative" data-testid="proposal-market-data">
-      <CollapsibleToggle
-        toggleState={showDetails}
-        setToggleState={setShowDetails}
-        dataTestId="proposal-market-data-toggle"
+      <button
+        onClick={() => setShowDetails(!showDetails)}
+        data-testid="proposal-market-data-toggle"
      >
-        <SubHeading title={t('marketSpecification')} />
-      </CollapsibleToggle>
+        <div className="flex items-center gap-3">
+          <SubHeading title={t('marketSpecification')} />
+          <div className={collapsibleToggleStyles(showDetails)}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>

      {showDetails && (
        <>
@@ -5,13 +5,14 @@ import {
  KeyValueTableRow,
  Thumbs,
  RoundedWrapper,
+  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import { formatNumber, formatNumberPercentage } from '@vegaprotocol/utils';
 import { SubHeading } from '../../../../components/heading';
 import { useVoteInformation } from '../../hooks';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { ProposalType } from '../proposal/proposal';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { collapsibleToggleStyles } from '../../../../lib/collapsible-toggle-styles';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';

@@ -58,13 +59,17 @@ export const ProposalVotesTable = ({

  return (
    <>
-      <CollapsibleToggle
-        toggleState={showDetails}
-        setToggleState={setShowDetails}
-        dataTestId="vote-breakdown-toggle"
+      <button
+        onClick={() => setShowDetails(!showDetails)}
+        data-testid="vote-breakdown-toggle"
      >
-        <SubHeading title={t('voteBreakdown')} />
-      </CollapsibleToggle>
+        <div className="flex items-center gap-3">
+          <SubHeading title={t('voteBreakdown')} />
+          <div className={collapsibleToggleStyles(showDetails)}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>

      {showDetails && (
        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
@@ -3,7 +3,6 @@ import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { ProposalState } from '@vegaprotocol/types';

 jest.mock('@vegaprotocol/network-parameters', () => ({
  ...jest.requireActual('@vegaprotocol/network-parameters'),
@@ -65,17 +64,6 @@ it('Renders with a link back to "all proposals"', async () => {
  expect(await screen.findByTestId('all-proposals-link')).toBeInTheDocument();
 });

-it('Renders a rejected proposals with a link back to "rejected proposals"', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_REJECTED,
-  });
-  renderComponent(proposal);
-
-  expect(
-    await screen.findByTestId('rejected-proposals-link')
-  ).toBeInTheDocument();
-});
-
 it('renders each section', async () => {
  const proposal = generateProposal();
  renderComponent(proposal);
@@ -17,7 +17,6 @@ import { ProposalMarketData } from '../proposal-market-data';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
-import { ProposalState } from '@vegaprotocol/types';

 export enum ProposalType {
  PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -92,22 +91,14 @@ export const Proposal = ({
  return (
    <AsyncRenderer data={params} loading={loading} error={error}>
      <section data-testid="proposal">
-        <div className="flex items-center gap-1">
+        <div
+          className="flex items-center gap-1"
+          data-testid="all-proposals-link"
+        >
          <Icon name={'chevron-left'} />
-
-          {proposal.state === ProposalState.STATE_REJECTED ? (
-            <div data-testid="rejected-proposals-link">
-              <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
-                {t('RejectedProposals')}
-              </Link>
-            </div>
-          ) : (
-            <div data-testid="all-proposals-link">
-              <Link className="underline" to={Routes.PROPOSALS}>
-                {t('AllProposals')}
-              </Link>
-            </div>
-          )}
+          <Link className="underline" to={Routes.PROPOSALS}>
+            {t('AllProposals')}
+          </Link>
        </div>
        <ProposalHeader proposal={proposal} isListItem={false} />

@@ -1,34 +0,0 @@
-import { render, fireEvent, screen } from '@testing-library/react';
-import { ProposalsListFilter } from './proposals-list-filter';
-
-describe('ProposalsListFilter', () => {
-  let setFilterString: jest.Mock;
-
-  beforeEach(() => {
-    setFilterString = jest.fn();
-    render(
-      <ProposalsListFilter filterString="" setFilterString={setFilterString} />
-    );
-  });
-
-  it('renders successfully', () => {
-    expect(screen.getByTestId('proposals-list-filter')).toBeInTheDocument();
-  });
-
-  it('should handle the filter toggle click', () => {
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    expect(screen.getByTestId('proposals-list-filter')).toBeInTheDocument();
-  });
-
-  it('should handle input change', () => {
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-
-    expect(setFilterString).toHaveBeenCalledWith('test');
-  });
-
-  // 'clear filter' tests are handled in the proposals-list.spec.tsx file
-  // as it is responsible for the filter state
-});
@@ -1,16 +1,13 @@
 import { useTranslation } from 'react-i18next';
 import { useState } from 'react';
-import { FormGroup, Icon, Input } from '@vegaprotocol/ui-toolkit';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { ButtonLink, FormGroup, Input } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction } from 'react';

 interface ProposalsListFilterProps {
-  filterString: string;
  setFilterString: Dispatch<SetStateAction<string>>;
 }

 export const ProposalsListFilter = ({
-  filterString,
  setFilterString,
 }: ProposalsListFilterProps) => {
  const { t } = useTranslation();
@@ -18,39 +15,27 @@ export const ProposalsListFilter = ({

  return (
    <div data-testid="proposals-list-filter" className="mb-4">
-      <CollapsibleToggle
-        toggleState={filterVisible}
-        setToggleState={setFilterVisible}
-        dataTestId={'proposal-filter-toggle'}
-      >
-        <div className="text-xl mb-4">{t('FilterProposals')}</div>
-      </CollapsibleToggle>
-
+      {!filterVisible && (
+        <ButtonLink
+          onClick={() => setFilterVisible(true)}
+          data-testid="set-proposals-filter-visible"
+        >
+          {t('FilterProposals')}
+        </ButtonLink>
+      )}
      {filterVisible && (
-        <div data-testid="proposals-list-filter-visible">
+        <div data-testid="open-proposals-list-filter">
          <p>{t('FilterProposalsDescription')}</p>
          <FormGroup
            label="Filter text input"
            labelFor="filter-input"
            hideLabel={true}
-            className="relative"
          >
            <Input
-              value={filterString}
              data-testid="filter-input"
              id="filter-input"
              onChange={(e) => setFilterString(e.target.value)}
-              className="pr-8"
            />
-            {filterString && filterString.length > 0 && (
-              <button
-                className="absolute top-2 right-2"
-                onClick={() => setFilterString('')}
-                data-testid="clear-filter"
-              >
-                <Icon name="cross" size={6} className="text-vega-light-200" />
-              </button>
-            )}
          </FormGroup>
        </div>
      )}
@@ -1,7 +1,4 @@
-import {
-  generateProposal,
-  generateProtocolUpgradeProposal,
-} from '../../test-helpers/generate-proposals';
+import { generateProposal } from '../../test-helpers/generate-proposals';
 import { MockedProvider } from '@apollo/client/testing';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { BrowserRouter as Router } from 'react-router-dom';
@@ -18,7 +15,6 @@ import {
  nextMonth,
 } from '../../test-helpers/mocks';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';

 const openProposalClosesNextMonth = generateProposal({
  id: 'proposal1',
@@ -58,22 +54,12 @@ const failedProposalClosedLastMonth = generateProposal({
  },
 });

-const closedProtocolUpgradeProposal = generateProtocolUpgradeProposal({
-  upgradeBlockHeight: '1',
-});
-
-const renderComponent = (
-  proposals: ProposalQuery['proposal'][],
-  protocolUpgradeProposals?: ProtocolUpgradeProposalFieldsFragment[]
-) => (
+const renderComponent = (proposals: ProposalQuery['proposal'][]) => (
  <Router>
    <MockedProvider mocks={[networkParamsQueryMock]}>
      <AppStateProvider>
        <VegaWalletContext.Provider value={mockWalletContext}>
-          <ProposalsList
-            proposals={proposals}
-            protocolUpgradeProposals={protocolUpgradeProposals || []}
-          />
+          <ProposalsList proposals={proposals} protocolUpgradeProposals={[]} />
        </VegaWalletContext.Provider>
      </AppStateProvider>
    </MockedProvider>
@@ -157,15 +143,17 @@ describe('Proposals list', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    expect(screen.getByTestId('proposals-list-filter')).toBeInTheDocument();
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
+    expect(
+      screen.getByTestId('open-proposals-list-filter')
+    ).toBeInTheDocument();
  });

  it('Filters list by text - party id', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'bvcx' },
    });
@@ -178,7 +166,7 @@ describe('Proposals list', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'proposal1' },
    });
@@ -191,7 +179,7 @@ describe('Proposals list', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'osal1' },
    });
@@ -199,92 +187,4 @@ describe('Proposals list', () => {
    expect(container.querySelector('#proposal1')).toBeInTheDocument();
    expect(container.querySelector('#proposal2')).not.toBeInTheDocument();
  });
-
-  it('When filter is used, clear button is visible', () => {
-    render(
-      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
-    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-    expect(screen.getByTestId('clear-filter')).toBeInTheDocument();
-  });
-
-  it('When clear filter button is used, input is cleared', () => {
-    render(
-      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
-    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-    fireEvent.click(screen.getByTestId('clear-filter'));
-    expect((screen.getByTestId('filter-input') as HTMLInputElement).value).toBe(
-      ''
-    );
-  });
-
-  it('Displays a toggle for closed proposals if there are both closed governance proposals and closed upgrade proposals', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    expect(screen.getByTestId('toggle-closed-proposals')).toBeInTheDocument();
-  });
-
-  it('Does not display a toggle for closed proposals if there are only closed upgrade proposals', () => {
-    render(renderComponent([], [closedProtocolUpgradeProposal]));
-    expect(
-      screen.queryByTestId('toggle-closed-proposals')
-    ).not.toBeInTheDocument();
-  });
-
-  it('Does not display a toggle for closed proposals if there are only closed governance proposals', () => {
-    render(renderComponent([enactedProposalClosedLastWeek]));
-    expect(
-      screen.queryByTestId('toggle-closed-proposals')
-    ).not.toBeInTheDocument();
-  });
-
-  it('Does not display a toggle for closed proposals if the proposal filter is engaged', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-    expect(
-      screen.queryByTestId('toggle-closed-proposals')
-    ).not.toBeInTheDocument();
-  });
-
-  it('Displays closed governance proposals by default due to default for the toggle', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    expect(
-      screen.getByTestId('closed-governance-proposals')
-    ).toBeInTheDocument();
-  });
-
-  it('Displays closed upgrade proposals when the toggle is clicked', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    fireEvent.click(screen.getByText('Network upgrades'));
-    expect(screen.getByTestId('closed-upgrade-proposals')).toBeInTheDocument();
-  });
 });
@@ -7,12 +7,7 @@ import { ProposalsListItem } from '../proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
-import {
-  Button,
-  Toggle,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
@@ -59,11 +54,6 @@ export const orderByUpgradeBlockHeight = (
    ['desc', 'desc']
  );

-enum ClosedProposalsViewOptions {
-  NetworkGovernance = 'networkGovernance',
-  NetworkUpgrades = 'networkUpgrades',
-}
-
 export const ProposalsList = ({
  proposals,
  protocolUpgradeProposals,
@@ -71,10 +61,6 @@ export const ProposalsList = ({
 }: ProposalsListProps) => {
  const { t } = useTranslation();
  const [filterString, setFilterString] = useState('');
-  const [closedProposalsView, setClosedProposalsView] =
-    useState<ClosedProposalsViewOptions>(
-      ClosedProposalsViewOptions.NetworkGovernance
-    );

  const sortedProposals: SortedProposalsProps = useMemo(() => {
    const initialSorting = proposals.reduce(
@@ -123,7 +109,7 @@ export const ProposalsList = ({
      );
      return {
        open: orderByUpgradeBlockHeight(initialSorting.open),
-        closed: orderByUpgradeBlockHeight(initialSorting.closed),
+        closed: orderByUpgradeBlockHeight(initialSorting.closed).reverse(),
      };
    }, [protocolUpgradeProposals, lastBlockHeight]);

@@ -141,7 +127,6 @@ export const ProposalsList = ({
          marginBottom={false}
          title={t('pageTitleProposals')}
        />
-
        {DocsLinks && (
          <div className="xs:justify-self-end" data-testid="new-proposal-link">
            <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
@@ -155,7 +140,6 @@ export const ProposalsList = ({
          </div>
        )}
      </div>
-
      <p className="mb-8">
        {t(
          `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
@@ -168,26 +152,11 @@ export const ProposalsList = ({
          {t(`Find out more about Vega governance`)}
        </ExternalLink>
      </p>
-
      {proposals.length > 0 && (
-        <ProposalsListFilter
-          filterString={filterString}
-          setFilterString={(value) => {
-            setFilterString(value);
-            if (value.length > 0) {
-              // If the filter is engaged, ensure the user is viewing governance proposals,
-              // as network upgrades do not have IDs to filter by and will be excluded.
-              setClosedProposalsView(
-                ClosedProposalsViewOptions.NetworkGovernance
-              );
-            }
-          }}
-        />
+        <ProposalsListFilter setFilterString={setFilterString} />
      )}
-
      <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
        <SubHeading title={t('openProposals')} />
-
        {sortedProposals.open.length > 0 ||
        sortedProtocolUpgradeProposals.open.length > 0 ? (
          <ul data-testid="open-proposals">
@@ -197,7 +166,6 @@ export const ProposalsList = ({
                proposal={proposal}
              />
            ))}
-
            {sortedProposals.open.filter(filterPredicate).map((proposal) => (
              <ProposalsListItem key={proposal?.id} proposal={proposal} />
            ))}
@@ -208,81 +176,22 @@ export const ProposalsList = ({
          </p>
        )}
      </section>
-
-      <section className="relative">
+      <section>
        <SubHeading title={t('closedProposals')} />
        {sortedProposals.closed.length > 0 ||
        sortedProtocolUpgradeProposals.closed.length > 0 ? (
-          <>
-            {
-              // We need both the closed proposals and closed protocol upgrade
-              // proposals to be present for there to be a toggle. It also gets
-              // hidden if the user has filtered the list, as the upgrade proposals
-              // do not have the necessary fields for filtering.
-              sortedProposals.closed.length > 0 &&
-                sortedProtocolUpgradeProposals.closed.length > 0 &&
-                filterString.length < 1 && (
-                  <div
-                    className="grid w-full justify-end xl:-mt-12 pb-6"
-                    data-testid="toggle-closed-proposals"
-                  >
-                    <div className="w-[440px]">
-                      <Toggle
-                        name="closed-proposals-toggle"
-                        toggles={[
-                          {
-                            label: t(
-                              ClosedProposalsViewOptions.NetworkGovernance
-                            ),
-                            value: ClosedProposalsViewOptions.NetworkGovernance,
-                          },
-                          {
-                            label: t(
-                              ClosedProposalsViewOptions.NetworkUpgrades
-                            ),
-                            value: ClosedProposalsViewOptions.NetworkUpgrades,
-                          },
-                        ]}
-                        checkedValue={closedProposalsView}
-                        onChange={(e) =>
-                          setClosedProposalsView(
-                            e.target.value as ClosedProposalsViewOptions
-                          )
-                        }
-                      />
-                    </div>
-                  </div>
-                )
-            }
+          <ul data-testid="closed-proposals">
+            {sortedProtocolUpgradeProposals.closed.map((proposal) => (
+              <ProtocolUpgradeProposalsListItem
+                key={proposal.upgradeBlockHeight}
+                proposal={proposal}
+              />
+            ))}

-            <ul data-testid="closed-proposals">
-              {closedProposalsView ===
-                ClosedProposalsViewOptions.NetworkUpgrades && (
-                <div data-testid="closed-upgrade-proposals">
-                  {sortedProtocolUpgradeProposals.closed.map((proposal) => (
-                    <ProtocolUpgradeProposalsListItem
-                      key={proposal.upgradeBlockHeight}
-                      proposal={proposal}
-                    />
-                  ))}
-                </div>
-              )}
-
-              {closedProposalsView ===
-                ClosedProposalsViewOptions.NetworkGovernance && (
-                <div data-testid="closed-governance-proposals">
-                  {sortedProposals.closed
-                    .filter(filterPredicate)
-                    .map((proposal) => (
-                      <ProposalsListItem
-                        key={proposal?.id}
-                        proposal={proposal}
-                      />
-                    ))}
-                </div>
-              )}
-            </ul>
-          </>
+            {sortedProposals.closed.filter(filterPredicate).map((proposal) => (
+              <ProposalsListItem key={proposal?.id} proposal={proposal} />
+            ))}
+          </ul>
        ) : (
          <p className="mb-0" data-testid="no-closed-proposals">
            {t('noClosedProposals')}
@@ -23,10 +23,7 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
  return (
    <>
      <Heading title={t('pageTitleRejectedProposals')} />
-      <ProposalsListFilter
-        filterString={filterString}
-        setFilterString={setFilterString}
-      />
+      <ProposalsListFilter setFilterString={setFilterString} />
      <section>
        {proposals.length > 0 ? (
          <ul data-testid="rejected-proposals">
@@ -1,5 +1,4 @@
 import * as Schema from '@vegaprotocol/types';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import * as faker from 'faker';
 import isArray from 'lodash/isArray';
@@ -7,40 +6,6 @@ import mergeWith from 'lodash/mergeWith';

 import type { PartialDeep } from 'type-fest';
 import type { ProposalQuery } from '../proposal/__generated__/Proposal';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-
-export function generateProtocolUpgradeProposal(
-  override: PartialDeep<ProtocolUpgradeProposalFieldsFragment> = {}
-): ProtocolUpgradeProposalFieldsFragment {
-  const defaultProposal: ProtocolUpgradeProposalFieldsFragment = {
-    __typename: 'ProtocolUpgradeProposal',
-    upgradeBlockHeight: '3917600',
-    vegaReleaseTag: 'v0.71.6',
-    approvers: [
-      '0ac70c4ccc7f961614fe49b93e639ddf916269b7dcf8391db264cefeadf5a6b7',
-      '63a1755006642bda9ab1bfa84660f944d30a113d1609590ca90c50b24aede472',
-      '68ed0770fc3e67b74d09c05443243d27e29a8513dc0e8628beb98338cd509159',
-      'a6e6f7daf8610f9242ab6ab46b394f6fb79cf9533d48051ca7a2f142b8b700a8',
-      'aad2be546ba83cbcab4c1d57ebe22b4a942f294f54333f1a7c2c9ef0e9fe19bb',
-      'acc55c7205cfcd5480e0235acab56a01487a39dc858a641fc04df6ba016870ee',
-      'b7e500deb24cc19bd6ebb2311997f0904ca0d9e51541249e9650ab41fd8ac376',
-      'cf295dff6d9506e8a905d168a44dfcff2f64bd0a6671783a469f8322959c62e2',
-      'f4686749895bf51c6df4092ef6be4279c384a3c380c24ea7a2fd20afc602a35d',
-    ],
-    status:
-      ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED,
-  };
-
-  return mergeWith<
-    ProtocolUpgradeProposalFieldsFragment,
-    PartialDeep<ProtocolUpgradeProposalFieldsFragment>
-  >(defaultProposal, override, (objValue, srcValue) => {
-    if (!isArray(objValue)) {
-      return;
-    }
-    return srcValue;
-  });
-}

 export function generateProposal(
  override: PartialDeep<ProposalQuery['proposal']> = {}
Author	SHA1	Message	Date
Mikołaj Młodzikowski	d959e37e59	fix(ci): test changes against pull_request	2023-06-28 11:55:49 +02:00
Mikołaj Młodzikowski	64db83fe52	fix(ci): use jq to generate valid json arrays from bash	2023-06-28 11:40:14 +02:00