fix(oracles): update market-info.cy.ts

Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile
2023-05-03 10:28:50 +01:00 · 2023-05-03 09:48:08 +01:00 · 2023-05-03 08:29:27 +01:00 · 2023-05-02 23:29:09 +01:00 · 2023-05-02 23:24:59 +01:00 · 2023-05-02 23:12:17 +01:00
423 changed files with 3173 additions and 5750 deletions
@@ -1,16 +0,0 @@
-name: 'Check if branch is shorter than 52 chars'
-on: pull_request
-
-jobs:
-  branch-naming-rules:
-    runs-on: ubuntu-latest
-    steps:
-      # echo "branches that are longer than 51 chars can't be parsed by kubernetes to create previews. Each app has prefix of it's name like: 'governance-' (12 chars), what leaves 51 max branch length"
-      # current parsable length: $( git rev-parse --abbrev-ref HEAD | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | wc -c)
-      - uses: deepakputhraya/action-branch-name@master
-        with:
-          # regex: '([a-z])+\/([a-z])+' # Regex the branch should match. This example enforces grouping
-          # allowed_prefixes: 'feature,stable,fix' # All branches should start with the given prefix
-          # ignore: master,develop # Ignore exactly matching branch names from convention
-          min_length: 1 # Min length of the branch name
-          max_length: 51 # Max length of the branch name
@@ -105,7 +105,7 @@ jobs:
          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
          echo -n "Affected projects: $affected"

-          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
+          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g )"
          projects_e2e=""
          preview_governance="not deployed"
          preview_trading="not deployed"
@@ -66,7 +66,7 @@ jobs:
                fi
              fi
            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet1"
+              envName="stagnet3"
            fi
            bucketName="${{ matrix.app }}.${envName}.${domain}"
            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
@@ -7,4 +7,5 @@ __generated___

 apps/static/src/assets/devnet-tranches.json
 apps/static/src/assets/mainnet-tranches.json
+apps/static/src/assets/stagnet3-tranches.json
 apps/static/src/assets/testnet-tranches.json
@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
-NX_VEGA_URL=https://api.vega.community/graphql
+NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest

@@ -0,0 +1,18 @@
+# App configuration variables
+NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
+NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET3
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+
+# App flags
+NX_EXPLORER_ASSETS=1
+NX_EXPLORER_GENESIS=1
+NX_EXPLORER_GOVERNANCE=1
+NX_EXPLORER_MARKETS=1
+NX_EXPLORER_ORACLES=1
+NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_NETWORK_PARAMETERS=1
+NX_EXPLORER_PARTIES=1
+NX_EXPLORER_VALIDATORS=1
@@ -10,8 +10,6 @@
    "governance.proposal.updateMarket.minVoterBalance",
    "governance.proposal.updateNetParam.minProposerBalance",
    "governance.proposal.updateNetParam.minVoterBalance",
-    "governance.proposal.updateAsset.minProposerBalance",
-    "governance.proposal.updateAsset.minVoterBalance",
    "reward.staking.delegation.maxPayoutPerEpoch",
    "reward.staking.delegation.maxPayoutPerParticipant",
    "reward.staking.delegation.minimumValidatorStake",
@@ -21,6 +19,9 @@
    "validators.delegation.minAmount"
  ],
  "fiveDecimal": [
+    "governance.proposal.updateAsset.minProposerBalance",
+    "governance.proposal.updateAsset.minVoterBalance",
+    "governance.proposal.updateAsset.requiredParticipation",
    "market.fee.factors.infrastructureFee",
    "market.fee.factors.makerFee",
    "market.liquidity.bondPenaltyParameter",
@@ -76,7 +77,6 @@
    "governance.proposal.updateNetParam.requiredMajority",
    "governance.proposal.updateNetParam.requiredParticipation",
    "governance.proposal.updateMarket.minProposerEquityLikeShare",
-    "governance.proposal.updateAsset.requiredParticipation",
    "validators.vote.required"
  ],
  "duration": [
@@ -138,7 +138,7 @@ context('Network parameters page', { tags: '@smoke' }, function () {
      });
    });

-    it.skip('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
+    it('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
      cy.get_network_parameters().then((network_parameters) => {
        network_parameters = Object.entries(network_parameters);
        network_parameters.forEach((network_parameter) => {
@@ -1,18 +1,13 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_ENV=STAGNET3
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
-NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,7 +4,14 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/

 # App flags
+NX_EXPLORER_ASSETS=1
+NX_EXPLORER_GENESIS=1
+NX_EXPLORER_GOVERNANCE=1
+NX_EXPLORER_MARKETS=1
+NX_EXPLORER_ORACLES=1
 NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_NETWORK_PARAMETERS=1
+NX_EXPLORER_PARTIES=1
+NX_EXPLORER_VALIDATORS=1
@@ -8,5 +8,4 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_EXPLORER_URL=/
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -1,10 +1,9 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://be.vega.community
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+NX_TENDERMINT_URL=https://be.explorer.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
-NX_BLOCK_EXPLORER=https://be.vega.community/rest/
+NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
-NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -1 +1,14 @@
-# .env is stagnet1, so there are no overrides required
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_ENV=STAGNET1
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
+NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -0,0 +1,8 @@
+NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.stagnet3.vega.xyz/websocket
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_ENV=STAGNET3
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
+NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -8,5 +8,4 @@ NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -11,4 +11,3 @@ NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
 NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
-NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/
@@ -5,4 +5,3 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/
@@ -35,11 +35,12 @@ Example configurations are provided here:
 - [Devnet](./.env.devnet)
 - [Capsule](./.env.capsule)
 - [Testnet](./.env.testnet)
+- [Stagnet3](./.env.stagnet3)

 For convenience, you can boot the app injecting one of the configurations above by running:

 ```bash
-yarn nx run explorer:serve --env={env} # e.g. stagnet1
+yarn nx run explorer:serve --env={env} # e.g. stagnet3
 ```

 There are a few different configuration options offered for this app:
@@ -6,7 +6,6 @@ export type AssetBalanceProps = {
  assetId: string;
  price: string;
  showAssetLink?: boolean;
-  showAssetSymbol?: boolean;
 };

 /**
@@ -17,21 +16,18 @@ const AssetBalance = ({
  assetId,
  price,
  showAssetLink = true,
-  showAssetSymbol = false,
 }: AssetBalanceProps) => {
-  const { data: asset, loading } = useAssetDataProvider(assetId);
+  const { data: asset } = useAssetDataProvider(assetId);

  const label =
-    !loading && asset && asset.decimals
+    asset && asset.decimals
      ? addDecimalsFormatNumber(price, asset.decimals)
      : price;

  return (
    <div className="inline-block">
      <span>{label}</span>{' '}
-      {showAssetLink && asset?.id ? (
-        <AssetLink showAssetSymbol={showAssetSymbol} assetId={assetId} />
-      ) : null}
+      {showAssetLink && asset?.id ? <AssetLink assetId={assetId} /> : null}
    </div>
  );
 };
@@ -13,17 +13,11 @@ const DEFAULT_DECIMALS = 18;
 * the governance asset first, which is set by a network parameter
 */
 const GovernanceAssetBalance = ({ price }: GovernanceAssetBalanceProps) => {
-  const { data, loading } = useExplorerGovernanceAssetQuery();
+  const { data } = useExplorerGovernanceAssetQuery();

-  if (!loading && data && data.networkParameter?.value) {
+  if (data && data.networkParameter?.value) {
    const governanceAssetId = data.networkParameter.value;
-    return (
-      <AssetBalance
-        price={price}
-        showAssetSymbol={true}
-        assetId={governanceAssetId}
-      />
-    );
+    return <AssetBalance price={price} assetId={governanceAssetId} />;
  } else {
    return (
      <div className="inline-block">
@@ -14,72 +14,10 @@ import {
  SettlementAssetInfoPanel,
 } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
-import type { DataSourceDefinition } from '@vegaprotocol/types';
-import isEqual from 'lodash/isEqual';

 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  if (!market) return null;

-  const settlementData =
-    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
-      .data;
-  const terminationData =
-    market.tradableInstrument.instrument.product
-      .dataSourceSpecForTradingTermination.data;
-
-  const getSigners = (data: DataSourceDefinition) => {
-    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
-      const signers = data.sourceType.sourceType.signers || [];
-
-      return signers.map(({ signer }, i) => {
-        return (
-          (signer.__typename === 'ETHAddress' && signer.address) ||
-          (signer.__typename === 'PubKey' && signer.key)
-        );
-      });
-    }
-    return [];
-  };
-
-  const oraclePanels = isEqual(
-    getSigners(settlementData),
-    getSigners(terminationData)
-  )
-    ? [
-        {
-          title: t('Settlement Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="settlementData"
-            />
-          ),
-        },
-        {
-          title: t('Termination Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="termination"
-            />
-          ),
-        },
-      ]
-    : [
-        {
-          title: t('Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="settlementData"
-            />
-          ),
-        },
-      ];
-
  const panels = [
    {
      title: t('Key details'),
@@ -157,7 +95,22 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
        <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
      ),
    },
-    ...oraclePanels,
+    {
+      title: t('Settlement Oracle'),
+      content: (
+        <OracleInfoPanel
+          noBorder={false}
+          market={market}
+          type="settlementData"
+        />
+      ),
+    },
+    {
+      title: t('Termination Oracle'),
+      content: (
+        <OracleInfoPanel noBorder={false} market={market} type="termination" />
+      ),
+    },
  ];

  return (
@@ -20,7 +20,7 @@ export const PageHeader = ({
  copy = false,
  className,
 }: PageHeaderProps) => {
-  const titleClasses = 'text-xl uppercase font-alpha calt';
+  const titleClasses = 'text-4xl xl:text-5xl uppercase font-alpha calt';
  return (
    <header className={className}>
      <span className={`${titleClasses} block`}>{prefix}</span>
@@ -12,10 +12,7 @@ import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import { ProposalStateMapping } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
@@ -30,7 +30,7 @@ export const BundleExists = ({
  // Note if this is wrong, the wrong decoder will be used which will give incorrect data

  return (
-    <div className="w-auto h-10 max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
+    <div className="w-auto max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
      <IconForBundleStatus status={status} />
      <h1 className="text-xl pb-1">
        {status === 'STATUS_ENABLED'
@@ -1,3 +1,4 @@
+export { TxList } from './tx-list';
 export { TxOrderType } from './tx-order-type';
 export { TxsInfiniteList } from './txs-infinite-list';
 export { TxsInfiniteListItem } from './txs-infinite-list-item';
@@ -0,0 +1,14 @@
+import { t } from '@vegaprotocol/i18n';
+import type { TendermintUnconfirmedTransactionsResponse } from '../../routes/txs/tendermint-unconfirmed-transactions-response.d';
+
+interface TxsProps {
+  data: TendermintUnconfirmedTransactionsResponse | undefined;
+}
+
+export const TxList = ({ data }: TxsProps) => {
+  if (!data) {
+    return <div>{t('Awaiting transactions')}</div>;
+  }
+
+  return <div>{JSON.stringify(data, null, '  ')}</div>;
+};
@@ -7,7 +7,7 @@ import { toHex } from '../search/detect-search';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import isNumber from 'lodash/isNumber';

-const TRUNCATE_LENGTH = 10;
+const TRUNCATE_LENGTH = 5;

 export const TxsInfiniteListItem = ({
  hash,
@@ -34,10 +34,10 @@ export const TxsInfiniteListItem = ({
      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10 py-2"
    >
      <div
-        className="text-sm col-span-10 md:col-span-3 leading-none"
+        className="text-sm col-span-10 xl:col-span-3 leading-none"
        data-testid="tx-hash"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
+        <span className="xl:hidden uppercase text-vega-dark-300">
          ID:&nbsp;
        </span>
        <TruncatedLink
@@ -48,10 +48,10 @@ export const TxsInfiniteListItem = ({
        />
      </div>
      <div
-        className="text-sm col-span-10 md:col-span-3 leading-none"
+        className="text-sm col-span-10 xl:col-span-3 leading-none"
        data-testid="pub-key"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
+        <span className="xl:hidden uppercase text-vega-dark-300">
          By:&nbsp;
        </span>
        <TruncatedLink
@@ -61,14 +61,14 @@ export const TxsInfiniteListItem = ({
          endChars={TRUNCATE_LENGTH}
        />
      </div>
-      <div className="text-sm col-span-5 md:col-span-2 leading-none	flex items-center">
+      <div className="text-sm col-span-5 xl:col-span-2 leading-none	flex items-center">
        <TxOrderType orderType={type} command={command} />
      </div>
      <div
-        className="text-sm col-span-3 md:col-span-1 leading-none flex items-center"
+        className="text-sm col-span-3 xl:col-span-1 leading-none flex items-center"
        data-testid="tx-block"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
+        <span className="xl:hidden uppercase text-vega-dark-300">
          Block:&nbsp;
        </span>
        <TruncatedLink
@@ -79,10 +79,10 @@ export const TxsInfiniteListItem = ({
        />
      </div>
      <div
-        className="text-sm col-span-2 md:col-span-1 leading-none flex items-center"
+        className="text-sm col-span-2 xl:col-span-1 leading-none flex items-center"
        data-testid="tx-success"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
+        <span className="xl:hidden uppercase text-vega-dark-300">
          Success:&nbsp;
        </span>
        {isNumber(code) ? (
@@ -64,7 +64,9 @@ describe('Txs infinite list', () => {
        error={Error('test error!')}
      />
    );
-    expect(screen.getByText('Cannot fetch transaction')).toBeInTheDocument();
+    expect(
+      screen.getByText('Cannot fetch transaction: Error: test error!')
+    ).toBeInTheDocument();
  });

  it('item renders data of n length into list of n length', () => {
@@ -30,7 +30,7 @@ const NOOP = () => {};
 const Item = ({ index, style, isLoading, error }: ItemProps) => {
  let content;
  if (error) {
-    content = t(`Cannot fetch transaction`);
+    content = t(`Cannot fetch transaction: ${error}`);
  } else if (isLoading) {
    content = <Loader />;
  } else {
@@ -68,7 +68,7 @@ export const TxsInfiniteList = ({
  className,
 }: TxsInfiniteListProps) => {
  const { screenSize } = useScreenDimensions();
-  const isStacked = ['xs', 'sm'].includes(screenSize);
+  const isStacked = ['xs', 'sm', 'md', 'lg'].includes(screenSize);

  if (!txs) {
    if (!areTxsLoading) {
@@ -95,15 +95,15 @@ export const TxsInfiniteList = ({

  return (
    <div className={className} data-testid="transactions-list">
-      <div className="lg:grid grid-cols-10 w-full mb-3 hidden text-vega-dark-300 uppercase">
+      <div className="xl:grid grid-cols-10 w-full mb-3 hidden text-vega-dark-300 uppercase">
        <div className="col-span-3">
-          <span className="hidden xl:inline">{t('Transaction')} &nbsp;</span>
+          <span className="hidden xl:inline">Transaction &nbsp;</span>
          <span>ID</span>
        </div>
-        <div className="col-span-3">{t('Submitted By')}</div>
-        <div className="col-span-2">{t('Type')}</div>
-        <div className="col-span-1">{t('Block')}</div>
-        <div className="col-span-1">{t('Success')}</div>
+        <div className="col-span-3">Submitted By</div>
+        <div className="col-span-2">Type</div>
+        <div className="col-span-1">Block</div>
+        <div className="col-span-1">Success</div>
      </div>
      <div data-testid="infinite-scroll-wrapper">
        <InfiniteLoader
@@ -1,4 +1,5 @@
 import { Routes } from '../../routes/route-names';
+import { RenderFetched } from '../render-fetched';
 import { TruncatedLink } from '../truncate/truncated-link';
 import { TxOrderType } from './tx-order-type';
 import { Table, TableRow, TableCell } from '../table';
@@ -8,7 +9,7 @@ import type { BlockExplorerTransactions } from '../../routes/types/block-explore
 import isNumber from 'lodash/isNumber';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import { getTxsDataUrl } from '../../hooks/use-txs-data';
-import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
+import { Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';

 interface TxsPerBlockProps {
@@ -26,7 +27,7 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
  } = useFetch<BlockExplorerTransactions>(url);

  return (
-    <AsyncRenderer data={data} error={error} loading={!!loading}>
+    <RenderFetched error={error} loading={loading} className="text-body-large">
      {data && data.transactions.length > 0 ? (
        <div className="overflow-x-auto whitespace-nowrap mb-28">
          <Table>
@@ -94,6 +95,6 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
          label={t('0 transactions')}
        />
      )}
-    </AsyncRenderer>
+    </RenderFetched>
  );
 };
@@ -144,12 +144,12 @@ afterEach(() => {
 describe('Block', () => {
  it('renders error state if error is present', async () => {
    (useFetch as jest.Mock).mockReturnValue({
-      state: { data: null, loading: false, error: new Error('asd') },
+      state: { data: null, loading: false, error: 'asd' },
    });
    render(renderComponent());

    expect(screen.getByText(`BLOCK ${blockId}`)).toBeInTheDocument();
-    expect(screen.getByText('Something went wrong: asd')).toBeInTheDocument();
+    expect(screen.getByText('Error retrieving data')).toBeInTheDocument();
  });

  it('renders loading state if present', async () => {
@@ -1,3 +1,4 @@
+import React from 'react';
 import { Link, useParams } from 'react-router-dom';
 import { DATA_SOURCES } from '../../../config';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
@@ -11,8 +12,9 @@ import {
  TableCell,
 } from '../../../components/table';
 import { TxsPerBlock } from '../../../components/txs/txs-per-block';
-import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { Routes } from '../../route-names';
+import { RenderFetched } from '../../../components/render-fetched';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { NodeLink } from '../../../components/links';
@@ -32,7 +34,7 @@ const Block = () => {
  return (
    <section>
      <RouteTitle data-testid="block-header">{t(`BLOCK ${block}`)}</RouteTitle>
-      <AsyncRenderer data={blockData} error={error} loading={!!loading}>
+      <RenderFetched error={error} loading={loading}>
        <>
          <div className="grid grid-cols-2 gap-2 mb-8">
            <Link
@@ -121,7 +123,7 @@ const Block = () => {
            </>
          )}
        </>
-      </AsyncRenderer>
+      </RenderFetched>
    </section>
  );
 };
@@ -1,7 +1,7 @@
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { RouteTitle } from '../../components/route-title';
-import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { DATA_SOURCES } from '../../config';
 import type { TendermintGenesisResponse } from './tendermint-genesis-response';
 import { useDocumentTitle } from '../../hooks/use-document-title';
@@ -10,26 +10,21 @@ const Genesis = () => {
  useDocumentTitle(['Genesis']);

  const {
-    state: { data, loading, error },
+    state: { data: genesis, loading },
  } = useFetch<TendermintGenesisResponse>(
    `${DATA_SOURCES.tendermintUrl}/genesis`
  );
-
+  if (!genesis?.result.genesis) {
+    if (loading) {
+      return <Loader />;
+    }
+    return null;
+  }
  return (
-    <>
+    <section>
      <RouteTitle data-testid="genesis-header">{t('Genesis')}</RouteTitle>
-      <AsyncRenderer
-        data={data}
-        error={error}
-        loading={!!loading}
-        loadingMessage={t('Loading genesis information...')}
-        errorMessage={t('Could not fetch genesis data')}
-      >
-        <section>
-          <SyntaxHighlighter data={data?.result.genesis} />
-        </section>
-      </AsyncRenderer>
-    </>
+      <SyntaxHighlighter data={genesis?.result.genesis} />
+    </section>
  );
 };

@@ -1,6 +1,6 @@
 import { proposalsDataProvider } from '@vegaprotocol/proposals';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ProposalsTable } from '../../components/proposals/proposals-table';
 import { RouteTitle } from '../../components/route-title';
@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useState } from 'react';
 import { useParams } from 'react-router-dom';
@@ -49,7 +49,6 @@ export const MarketPage = () => {
        />
        <AsyncRenderer
          noDataMessage={t('This chain has no markets')}
-          errorMessage={t('Could not fetch market') + ' ' + marketId}
          data={data}
          loading={loading}
          error={error}
@@ -4,7 +4,7 @@ import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { MarketsTable } from '../../components/markets/markets-table';

 export const MarketsPage = () => {
@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import { NetworkParametersTable } from './network-parameters';

 describe('NetworkParametersTable', () => {
@@ -13,15 +13,14 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
 import orderBy from 'lodash/orderBy';
-import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { useNetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';

 const PERCENTAGE_PARAMS = [
  'governance.proposal.asset.requiredMajority',
  'governance.proposal.asset.requiredParticipation',
-  'governance.proposal.updateAsset.requiredParticipation',
  'governance.proposal.freeform.requiredMajority',
  'governance.proposal.freeform.requiredParticipation',
  'governance.proposal.market.requiredMajority',
@@ -54,8 +53,6 @@ const BIG_NUMBER_PARAMS = [
  'governance.proposal.asset.minProposerBalance',
  'governance.proposal.market.minProposerBalance',
  'governance.proposal.market.minVoterBalance',
-  'governance.proposal.updateAsset.minProposerBalance',
-  'governance.proposal.updateAsset.minVoterBalance',
 ];

 export const NetworkParameterRow = ({
@@ -1,4 +1,4 @@
-import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { RouteTitle } from '../../../components/route-title';
 import { t } from '@vegaprotocol/i18n';
 import { useExplorerOracleSpecsQuery } from '../__generated__/Oracles';
@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';

 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleSpecsQuery();
+  const { data, loading } = useExplorerOracleSpecsQuery();

  useDocumentTitle(['Oracles']);
  useScrollToLocation();
@@ -16,40 +16,28 @@ const Oracles = () => {
  return (
    <section>
      <RouteTitle data-testid="oracle-specs-heading">{t('Oracles')}</RouteTitle>
-      <AsyncRenderer
-        data={data}
-        loading={loading}
-        error={error}
-        loadingMessage={t('Loading oracle data...')}
-        errorMessage={t('Oracle data could not be loaded')}
-        noDataMessage={t('No oracles found')}
-        noDataCondition={(data) =>
-          !data?.oracleSpecsConnection?.edges ||
-          data.oracleSpecsConnection.edges?.length === 0
-        }
-      >
-        {data?.oracleSpecsConnection?.edges
-          ? data.oracleSpecsConnection.edges.map((o) => {
-              const id = o?.node.dataSourceSpec.spec.id;
-              if (!id) {
-                return null;
-              }
-              return (
-                <div id={id} key={id} className="mb-10">
-                  <OracleDetails
-                    id={id}
-                    dataSource={o?.node}
-                    showBroadcasts={false}
-                  />
-                  <details>
-                    <summary className="pointer">JSON</summary>
-                    <SyntaxHighlighter data={filter(o, ['__typename'])} />
-                  </details>
-                </div>
-              );
-            })
-          : null}
-      </AsyncRenderer>
+      {loading ? <Loader /> : null}
+      {data?.oracleSpecsConnection?.edges
+        ? data.oracleSpecsConnection.edges.map((o) => {
+            const id = o?.node.dataSourceSpec.spec.id;
+            if (!id) {
+              return null;
+            }
+            return (
+              <div id={id} key={id} className="mb-10">
+                <OracleDetails
+                  id={id}
+                  dataSource={o?.node}
+                  showBroadcasts={false}
+                />
+                <details>
+                  <summary className="pointer">JSON</summary>
+                  <SyntaxHighlighter data={filter(o, ['__typename'])} />
+                </details>
+              </div>
+            );
+          })
+        : null}
    </section>
  );
 };
@@ -1,11 +1,12 @@
 import { RouteTitle } from '../../../components/route-title';
+import { RenderFetched } from '../../../components/render-fetched';
 import { truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import { useParams } from 'react-router-dom';
 import { useExplorerOracleSpecByIdQuery } from '../__generated__/Oracles';
 import { OracleDetails } from '../components/oracle';
-import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import filter from 'recursive-key-filter';
 import { TruncateInline } from '../../../components/truncate/truncate';

@@ -26,14 +27,7 @@ export const Oracle = () => {
        {t(`Oracle `)}
        <TruncateInline startChars={5} endChars={5} text={id || '1'} />
      </RouteTitle>
-      <AsyncRenderer
-        data={data}
-        error={error}
-        loading={loading}
-        noDataCondition={(data) => !data?.oracleSpec}
-        errorMessage={t('Could not load oracle data')}
-        loadingMessage={t('Loading oracle data...')}
-      >
+      <RenderFetched error={error} loading={loading}>
        {data?.oracleSpec ? (
          <div id={id} key={id} className="mb-10">
            <OracleDetails
@@ -50,7 +44,7 @@ export const Oracle = () => {
        ) : (
          <span></span>
        )}
-      </AsyncRenderer>
+      </RenderFetched>
    </section>
  );
 };
@@ -48,13 +48,6 @@ query ExplorerPartyAssets($partyId: ID!) {
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: { first: 100 }) {
-            edges {
-              node {
-                amount
-              }
-            }
-          }
        }
        accountsConnection {
          edges {
@@ -10,7 +10,7 @@ export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
 }>;


-export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
+export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };

 export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
    fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -64,13 +64,6 @@ export const ExplorerPartyAssetsDocument = gql`
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: {first: 100}) {
-            edges {
-              node {
-                amount
-              }
-            }
-          }
        }
        accountsConnection {
          edges {
@@ -1,24 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { useParams } from 'react-router-dom';
-import { toNonHex } from '../../../../components/search/detect-search';
-import { PageHeader } from '../../../../components/page-header';
-import { useDocumentTitle } from '../../../../hooks/use-document-title';
-
-import { PartyAccounts } from '../components/party-accounts';
-
-const PartyAccountsByAsset = () => {
-  const { party } = useParams<{ party: string }>();
-
-  useDocumentTitle(['Public keys', party || '-']);
-  const partyId = toNonHex(party ? party : '');
-
-  return (
-    <section>
-      <PageHeader title={t('Balances by asset')} />
-
-      <PartyAccounts partyId={partyId} />
-    </section>
-  );
-};
-
-export { PartyAccountsByAsset };
@@ -1,9 +1,32 @@
-import { AccountManager } from '@vegaprotocol/accounts';
-import { useCallback } from 'react';
-import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
+import { t } from '@vegaprotocol/i18n';
+import get from 'lodash/get';
+import AssetBalance from '../../../../components/asset-balance/asset-balance';
+import { AssetLink, MarketLink } from '../../../../components/links';
+import { Table, TableRow } from '../../../../components/table';
+import type * as Schema from '@vegaprotocol/types';
+import type { ExplorerPartyAssetsAccountsFragment } from '../__generated__/Party-assets';
+
+const accountTypeString: Record<Schema.AccountType, string> = {
+  ACCOUNT_TYPE_BOND: t('Bond'),
+  ACCOUNT_TYPE_EXTERNAL: t('External'),
+  ACCOUNT_TYPE_FEES_INFRASTRUCTURE: t('Fees (Infrastructure)'),
+  ACCOUNT_TYPE_FEES_LIQUIDITY: t('Fees (Liquidity)'),
+  ACCOUNT_TYPE_FEES_MAKER: t('Fees (Maker)'),
+  ACCOUNT_TYPE_GENERAL: t('General'),
+  ACCOUNT_TYPE_GLOBAL_INSURANCE: t('Global Insurance Pool'),
+  ACCOUNT_TYPE_GLOBAL_REWARD: t('Global Reward Pool'),
+  ACCOUNT_TYPE_INSURANCE: t('Insurance'),
+  ACCOUNT_TYPE_MARGIN: t('Margin'),
+  ACCOUNT_TYPE_PENDING_TRANSFERS: t('Pending Transfers'),
+  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: t('Reward - LP Fees received'),
+  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: t('Reward - Maker fees paid'),
+  ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: t('Reward - Maker fees received'),
+  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: t('Reward - Market proposers'),
+  ACCOUNT_TYPE_SETTLEMENT: t('Settlement'),
+};

 interface PartyAccountsProps {
-  partyId: string;
+  accounts: ExplorerPartyAssetsAccountsFragment[];
 }

 /**
@@ -11,22 +34,49 @@ interface PartyAccountsProps {
 * probably do with sorting by asset, and then within asset, by type with general
 * appearing first and... tbd
 */
-export const PartyAccounts = ({ partyId }: PartyAccountsProps) => {
-  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
-  const onClickAsset = useCallback(
-    (assetId?: string) => {
-      assetId && openAssetDetailsDialog(assetId);
-    },
-    [openAssetDetailsDialog]
-  );
-
+export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
  return (
-    <div className="block min-h-44 h-60 4 w-full border-red-800 relative">
-      <AccountManager
-        partyId={partyId}
-        onClickAsset={onClickAsset}
-        isReadOnly={true}
-      />
-    </div>
+    <Table className="max-w-5xl min-w-fit">
+      <thead>
+        <TableRow modifier="bordered" className="font-mono">
+          <td>{t('Type')}</td>
+          <td>{t('Market')}</td>
+          <td className="text-right pr-2">{t('Balance')}</td>
+          <td>{t('Asset')}</td>
+        </TableRow>
+      </thead>
+      <tbody>
+        {accounts.map((account) => {
+          const m = get(account, 'market.tradableInstrument.instrument.name');
+
+          return (
+            <TableRow
+              key={`pa-${account.asset.id}-${account.type}`}
+              title={account.asset.name}
+              id={`${accountTypeString[account.type]} ${m ? ` - ${m}` : ''}`}
+            >
+              <td className="text-md">{accountTypeString[account.type]}</td>
+              <td className="text-md">
+                {account.market?.id ? (
+                  <MarketLink id={account.market?.id} />
+                ) : (
+                  <p>-</p>
+                )}
+              </td>
+              <td className="text-md text-right pr-2">
+                <AssetBalance
+                  assetId={account.asset.id}
+                  price={account.balance}
+                  showAssetLink={false}
+                />
+              </td>
+              <td className="text-md">
+                <AssetLink assetId={account.asset.id} asDialog={true} />
+              </td>
+            </TableRow>
+          );
+        })}
+      </tbody>
+    </Table>
  );
 };
@@ -1,63 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { useNavigate } from 'react-router-dom';
-import { Routes } from '../../../../routes/route-names';
-import { Button, Icon, Loader } from '@vegaprotocol/ui-toolkit';
-import { PartyBlock } from './party-block';
-import type { AccountFields } from '@vegaprotocol/accounts';
-
-export interface PartyBlockAccountProps {
-  partyId: string;
-  accountData: AccountFields[] | null;
-  accountLoading: boolean;
-  accountError?: Error;
-}
-
-/**
- * Displays an overview of a party's assets. This uses existing data
- * providers to structure the details by asset, rather than looking at
- * it by account. The assumption is that this is a more natural way to
- * get an idea of the assets and activity of a party.
- */
-export const PartyBlockAccounts = ({
-  partyId,
-  accountData,
-  accountLoading,
-  accountError,
-}: PartyBlockAccountProps) => {
-  const navigate = useNavigate();
-
-  const shouldShowActionButton =
-    accountData && accountData.length > 0 && !accountLoading && !accountError;
-
-  const action = shouldShowActionButton ? (
-    <Button
-      size="sm"
-      onClick={() => navigate(`/${Routes.PARTIES}/${partyId}/assets`)}
-    >
-      {t('Show all')}
-    </Button>
-  ) : null;
-
-  return (
-    <PartyBlock title={t('Assets')} action={action}>
-      {accountData && accountData.length > 0 ? (
-        <p>
-          {accountData.length} {t('assets, including')}{' '}
-          {accountData
-            .map((a) => a.asset.symbol)
-            .slice(0, 3)
-            .join(', ')}
-        </p>
-      ) : accountLoading && !accountError ? (
-        <Loader size="small" />
-      ) : accountData && accountData.length === 0 ? (
-        <p>{t('No accounts found')}</p>
-      ) : (
-        <p>
-          <Icon className="mr-1" name="error" />
-          <span className="text-sm">{t('Could not load assets')}</span>
-        </p>
-      )}
-    </PartyBlock>
-  );
-};
@@ -1,83 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { useExplorerPartyAssetsQuery } from '../__generated__/Party-assets';
-import GovernanceAssetBalance from '../../../../components/asset-balance/governance-asset-balance';
-import {
-  Icon,
-  KeyValueTable,
-  KeyValueTableRow,
-  Loader,
-} from '@vegaprotocol/ui-toolkit';
-import { PartyBlock } from './party-block';
-import BigNumber from 'bignumber.js';
-
-export interface PartyBlockStakeProps {
-  partyId: string;
-  accountLoading: boolean;
-  accountError?: Error;
-}
-
-/**
- * Displays an overview of a single party's staking balance, importantly maintaining'
- * the same height before and after the details are loaded in.
- *
- * Unlike PartyBlockAccounts there is not action button in the title of this block as
- * there is no page for it to link to currently. That's a future task.
- */
-export const PartyBlockStake = ({
-  partyId,
-  accountLoading,
-  accountError,
-}: PartyBlockStakeProps) => {
-  const partyRes = useExplorerPartyAssetsQuery({
-    // Don't cache data for this query, party information can move quite quickly
-    fetchPolicy: 'network-only',
-    variables: { partyId: partyId },
-    skip: !partyId,
-  });
-
-  const p = partyRes.data?.partiesConnection?.edges[0].node;
-
-  const linkedLength = p?.stakingSummary?.linkings?.edges?.length;
-  const linkedStake =
-    linkedLength && linkedLength > 0
-      ? p?.stakingSummary?.linkings?.edges
-          ?.reduce((total, e) => {
-            return new BigNumber(total).plus(
-              new BigNumber(e?.node.amount || 0)
-            );
-          }, new BigNumber(0))
-          .toString()
-      : '0';
-
-  return (
-    <PartyBlock title={t('Staking')}>
-      {p?.stakingSummary.currentStakeAvailable ? (
-        <KeyValueTable>
-          <KeyValueTableRow noBorder={true}>
-            <div>{t('Available stake')}</div>
-            <div>
-              <GovernanceAssetBalance
-                price={p.stakingSummary.currentStakeAvailable}
-              />
-            </div>
-          </KeyValueTableRow>
-          <KeyValueTableRow noBorder={true}>
-            <div>{t('Active stake')}</div>
-            <div>
-              <GovernanceAssetBalance price={linkedStake || '0'} />
-            </div>
-          </KeyValueTableRow>
-        </KeyValueTable>
-      ) : accountLoading && !accountError ? (
-        <Loader size="small" />
-      ) : !accountError ? (
-        <p>{t('No staking balance')}</p>
-      ) : (
-        <p>
-          <Icon className="mr-1" name="error" />
-          <span className="text-sm">{t('Could not load stake details')}</span>
-        </p>
-      )}
-    </PartyBlock>
-  );
-};
@@ -1,24 +0,0 @@
-import type { ReactNode } from 'react';
-
-export interface PartyBlockProps {
-  children: ReactNode;
-  title: string;
-  action?: ReactNode;
-}
-
-export function PartyBlock({ children, title, action }: PartyBlockProps) {
-  return (
-    <div className="border-2 min-h-[138px] border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
-      <div
-        className="flex flex-col md:flex-row gap-1 justify-between content-start mb-2"
-        data-testid="page-title"
-      >
-        <h3 className="font-semibold text-lg">{title}</h3>
-
-        {action ? action : null}
-      </div>
-
-      {children}
-    </div>
-  );
-}
@@ -1,26 +1,24 @@
+import { getNodes } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useMemo } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
+import { Panel } from '../../../components/panel';
 import { toNonHex } from '../../../components/search/detect-search';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { TxsInfiniteList } from '../../../components/txs';
 import { PageHeader } from '../../../components/page-header';
+import { useExplorerPartyAssetsQuery } from './__generated__/Party-assets';
+import type { ExplorerPartyAssetsAccountsFragment } from './__generated__/Party-assets';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
-import { Icon, Intent, Notification, Splash } from '@vegaprotocol/ui-toolkit';
-import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
-import { PartyBlockStake } from './components/party-block-stake';
-import { PartyBlockAccounts } from './components/party-block-accounts';
-import { isValidPartyId } from './components/party-id-error';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import GovernanceAssetBalance from '../../../components/asset-balance/governance-asset-balance';
+import { PartyAccounts } from './components/party-accounts';

 const Party = () => {
  const { party } = useParams<{ party: string }>();

  useDocumentTitle(['Public keys', party || '-']);
-  const navigate = useNavigate();
-
  const partyId = toNonHex(party ? party : '');
  const { isMobile } = useScreenDimensions();
  const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
@@ -30,72 +28,71 @@ const Party = () => {
    filters,
  });

-  const variables = useMemo(() => ({ partyId }), [partyId]);
-  const {
-    data: AccountData,
-    loading: AccountLoading,
-    error: AccountError,
-  } = useDataProvider({
-    dataProvider: aggregatedAccountsDataProvider,
-    variables,
+  const partyRes = useExplorerPartyAssetsQuery({
+    // Don't cache data for this query, party information can move quite quickly
+    fetchPolicy: 'network-only',
+    variables: { partyId: partyId },
+    skip: !party,
  });

-  if (!isValidPartyId(partyId)) {
-    return (
-      <div className="max-w-sm mx-auto">
-        <Notification
-          message={t('Invalid party ID')}
-          intent={Intent.Danger}
-          buttonProps={{
-            text: t('Go back'),
-            action: () => navigate(-1),
-            className: 'py-1',
-            size: 'sm',
-          }}
-        />
-      </div>
-    );
-  }
+  const p = partyRes.data?.partiesConnection?.edges[0].node;
+
+  const header = p?.id ? (
+    <PageHeader
+      title={p.id}
+      copy
+      truncateStart={visibleChars}
+      truncateEnd={visibleChars}
+    />
+  ) : (
+    <Panel>
+      <p>No data found for public key {party}</p>
+    </Panel>
+  );
+
+  const staking = (
+    <section>
+      {p?.stakingSummary?.currentStakeAvailable ? (
+        <div className="mt-4 leading-3">
+          <strong className="font-semibold">{t('Staking Balance: ')}</strong>
+          <GovernanceAssetBalance
+            price={p.stakingSummary.currentStakeAvailable}
+          />
+        </div>
+      ) : null}
+    </section>
+  );
+
+  const accounts = getNodes<ExplorerPartyAssetsAccountsFragment>(
+    p?.accountsConnection
+  );

  return (
    <section>
-      <PageHeader
-        title={partyId}
-        copy
-        truncateStart={visibleChars}
-        truncateEnd={visibleChars}
-      />
+      <h1
+        className="font-alpha calt uppercase font-xl mb-4 text-vega-dark-100 dark:text-vega-light-100"
+        data-testid="parties-header"
+      >
+        {t('Public key')}
+      </h1>
+      {partyRes.data ? (
+        <>
+          {header}
+          <SubHeading>{t('Asset data')}</SubHeading>
+          {accounts ? <PartyAccounts accounts={accounts} /> : null}
+          {staking}

-      <div className="grid md:grid-flow-col grid-flow-row md:space-x-4 grid-cols-1 md:grid-cols-2 w-full">
-        <PartyBlockAccounts
-          accountError={AccountError}
-          accountLoading={AccountLoading}
-          accountData={AccountData}
-          partyId={partyId}
-        />
-        <PartyBlockStake
-          accountError={AccountError}
-          accountLoading={AccountLoading}
-          partyId={partyId}
-        />
-      </div>
-
-      <SubHeading>{t('Transactions')}</SubHeading>
-      {!error && txsData ? (
-        <TxsInfiniteList
-          hasMoreTxs={hasMoreTxs}
-          areTxsLoading={loading}
-          txs={txsData}
-          loadMoreTxs={loadTxs}
-          error={error}
-          className="mb-28"
-        />
-      ) : (
-        <Splash>
-          <Icon name="error" className="mr-1" />
-          &nbsp;{t('Could not load transaction list for party')}
-        </Splash>
-      )}
+          <SubHeading>{t('Transactions')}</SubHeading>
+          <TxsInfiniteList
+            hasMoreTxs={hasMoreTxs}
+            areTxsLoading={loading}
+            txs={txsData}
+            loadMoreTxs={loadTxs}
+            error={error}
+            className="mb-28"
+          />
+        </>
+      ) : null}
    </section>
  );
 };
@@ -1,7 +0,0 @@
-import { Outlet } from 'react-router-dom';
-
-const PartiesSubPage = () => {
-  return <Outlet />;
-};
-
-export default PartiesSubPage;
@@ -0,0 +1,35 @@
+import React from 'react';
+import { DATA_SOURCES } from '../../config';
+import type { TendermintUnconfirmedTransactionsResponse } from '../txs/tendermint-unconfirmed-transactions-response.d';
+import { TxList } from '../../components/txs';
+import { RouteTitle } from '../../components/route-title';
+import { t } from '@vegaprotocol/i18n';
+import { useFetch } from '@vegaprotocol/react-helpers';
+import { useDocumentTitle } from '../../hooks/use-document-title';
+
+const PendingTxs = () => {
+  const {
+    state: { data: unconfirmedTransactions },
+  } = useFetch<TendermintUnconfirmedTransactionsResponse>(
+    `${DATA_SOURCES.tendermintUrl}/unconfirmed_txs`
+  );
+
+  useDocumentTitle(['Pending transactions']);
+
+  return (
+    <section>
+      <RouteTitle data-testid="unconfirmed-transactions-header">
+        {t('Unconfirmed transactions')}
+      </RouteTitle>
+      <br />
+      <div>{t(`Number: ${unconfirmedTransactions?.result?.n_txs || 0}`)}</div>
+      <br />
+      <div>
+        <br />
+        <TxList data={unconfirmedTransactions} />
+      </div>
+    </section>
+  );
+};
+
+export { PendingTxs };
@@ -14,6 +14,7 @@ import { Block } from './blocks/id';
 import { Blocks } from './blocks/home';
 import { Tx } from './txs/id';
 import { TxsList } from './txs/home';
+import { PendingTxs } from './pending';
 import flags from '../config/flags';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
@@ -28,7 +29,6 @@ import compact from 'lodash/compact';
 import { AssetLink, MarketLink } from '../components/links';
 import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import { remove0x } from '@vegaprotocol/utils';
-import { PartyAccountsByAsset } from './parties/id/accounts';

 export type Navigable = {
  path: string;
@@ -75,43 +75,14 @@ const partiesRoutes: Route[] = flags.parties
          },
          {
            path: ':party',
-            element: <Party />,
-
-            children: [
-              {
-                index: true,
-                element: <PartySingle />,
-                handle: {
-                  breadcrumb: (params: Params<string>) => (
-                    <Link to={linkTo(Routes.PARTIES, params.party)}>
-                      {truncateMiddle(params.party as string)}
-                    </Link>
-                  ),
-                },
-              },
-              {
-                path: 'assets',
-                element: <Party />,
-                handle: {
-                  breadcrumb: (params: Params<string>) => (
-                    <Link to={linkTo(Routes.PARTIES, params.party)}>
-                      {truncateMiddle(params.party as string)}
-                    </Link>
-                  ),
-                },
-                children: [
-                  {
-                    index: true,
-                    element: <PartyAccountsByAsset />,
-                    handle: {
-                      breadcrumb: () => {
-                        return t('Assets');
-                      },
-                    },
-                  },
-                ],
-              },
-            ],
+            element: <PartySingle />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.PARTIES, params.party)}>
+                  {truncateMiddle(params.party as string)}
+                </Link>
+              ),
+            },
          },
        ],
      },
@@ -266,6 +237,17 @@ export const routerConfig: Route[] = [
          breadcrumb: () => <Link to={Routes.TX}>{t('Transactions')}</Link>,
        },
        children: [
+          {
+            path: 'pending',
+            element: <PendingTxs />,
+            handle: {
+              breadcrumb: () => (
+                <Link to={linkTo(Routes.TX, 'pending')}>
+                  {t('Pending transactions')}
+                </Link>
+              ),
+            },
+          },
          {
            path: ':txHash',
            element: <Tx />,
@@ -10,7 +10,7 @@ interface TxDetailsProps {

 export const txDetailsTruncateLength = 30;

-export const TxDetails = ({ txData, pubKey }: TxDetailsProps) => {
+export const TxDetails = ({ txData, pubKey, className }: TxDetailsProps) => {
  if (!txData) {
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }
@@ -28,7 +28,6 @@ import {
 } from '@vegaprotocol/environment';
 import classNames from 'classnames';
 import { NodeStatus, NodeStatusMapping } from '@vegaprotocol/types';
-import { PartyLink } from '../../components/links';

 type RateProps = {
  value: BigNumber | number | undefined;
@@ -192,9 +191,7 @@ export const ValidatorsPage = () => {
                      <KeyValueTable>
                        <KeyValueTableRow>
                          <div>{t('ID')}</div>
-                          <div className="break-all text-xs font-mono">
-                            {v.id}
-                          </div>
+                          <div className="break-all text-xs">{v.id}</div>
                        </KeyValueTableRow>
                        <KeyValueTableRow>
                          <div>{t('Status')}</div>
@@ -221,14 +218,12 @@ export const ValidatorsPage = () => {
                          </div>
                        </KeyValueTableRow>
                        <KeyValueTableRow>
-                          <div>{t('Key')}</div>
-                          <div className="break-all text-xs">
-                            <PartyLink id={v.pubkey} />
-                          </div>
+                          <div>{t('Public key')}</div>
+                          <div className="break-all text-xs">{v.pubkey}</div>
                        </KeyValueTableRow>
                        <KeyValueTableRow>
                          <div>{t('Ethereum address')}</div>
-                          <div className="break-all text-xs font-mono">
+                          <div className="break-all text-xs">
                            <EtherscanLink address={v.ethereumAddress} />{' '}
                            <CopyWithTooltip text={v.ethereumAddress}>
                              <button title={t('Copy address to clipboard')}>
@@ -239,9 +234,7 @@ export const ValidatorsPage = () => {
                        </KeyValueTableRow>
                        <KeyValueTableRow>
                          <div>{t('Tendermint public key')}</div>
-                          <div className="break-all text-xs font-mono">
-                            {v.tmPubkey}
-                          </div>
+                          <div className="break-all text-xs">{v.tmPubkey}</div>
                        </KeyValueTableRow>

                        <KeyValueTableRow>
@@ -32,11 +32,6 @@
  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }

-.vega-ag-grid .ag-row {
-  border-width: 1px 0;
-  border-bottom: 1px solid transparent;
-}
-
 /* Light variables */
 .ag-theme-balham {
  --ag-background-color: theme(colors.white);
@@ -13,7 +13,7 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=MAINNET
-NX_VEGA_URL=https://api.vega.community/graphql
+NX_VEGA_URL=https://api.vega.xyz/query
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
@@ -0,0 +1,5 @@
+# App configuration variables
+NX_VEGA_ENV=STAGNET3
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -9,7 +9,7 @@
      "name": "Token test market",
      "code": "Token.24h",
      "future": {
-        "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
+        "settlementAsset": "fBTC",
        "quoteName": "fBTC",
        "dataSourceSpecForSettlementData": {
          "external": {
@@ -4,11 +4,12 @@ import {
  navigation,
 } from '../../support/common.functions';
 import {
+  convertUnixTimestampToDateformat,
  createRawProposal,
  createTenDigitUnixTimeStampForSpecifiedDays,
  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
-  getDateFormatForSpecifiedDays,
+  getGovernanceProposalDateFormatForSpecifiedDays,
  getProposalIdFromList,
  getProposalInformationFromTable,
  getSubmittedProposalFromProposalList,
@@ -22,7 +23,6 @@ import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governan
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../../../governance-e2e/src/support/wallet-teardown.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
-import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';

 const proposalVoteProgressForPercentage =
  '[data-testid="vote-progress-indicator-percentage-for"]';
@@ -49,7 +49,6 @@ describe(
    });

    beforeEach('visit proposals tab', function () {
-      cy.clearLocalStorage();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -99,22 +98,20 @@ describe(
      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
        cy.get(viewProposalButton).click()
      );
-      cy.wrap(
-        formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
-      ).then((closingDate) => {
-        getProposalInformationFromTable('Closes on')
-          .contains(closingDate)
-          .should('be.visible');
-      });
-      cy.wrap(
-        formatDateWithLocalTimezone(
-          new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
-        )
-      ).then((proposalDate) => {
-        getProposalInformationFromTable('Proposed on')
-          .contains(proposalDate)
-          .should('be.visible');
-      });
+      convertUnixTimestampToDateformat(proposalTimeStamp).then(
+        (closingDate) => {
+          getProposalInformationFromTable('Closes on')
+            .contains(closingDate)
+            .should('be.visible');
+        }
+      );
+      getGovernanceProposalDateFormatForSpecifiedDays(0).then(
+        (proposalDate) => {
+          getProposalInformationFromTable('Proposed on')
+            .contains(proposalDate)
+            .should('be.visible');
+        }
+      );
    });

    it('Newly created proposal details - shows default status set to fail', function () {
@@ -157,16 +154,18 @@ describe(
      cy.getByTestId('vote-buttons').contains('against').should('be.visible');
      cy.getByTestId('vote-buttons').contains('for').should('be.visible');
      voteForProposal('for');
-      getDateFormatForSpecifiedDays(0).then((votedDate) => {
-        // 3001-VOTE-051
-        // 3001-VOTE-093
-        cy.contains('You voted:')
-          .siblings()
-          .contains('For')
-          .siblings()
-          .contains(votedDate)
-          .should('be.visible');
-      });
+      getGovernanceProposalDateFormatForSpecifiedDays(0, 'shortMonth').then(
+        (votedDate) => {
+          // 3001-VOTE-051
+          // 3001-VOTE-093
+          cy.contains('You voted:')
+            .siblings()
+            .contains('For')
+            .siblings()
+            .contains(votedDate)
+            .should('be.visible');
+        }
+      );
      cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
        .contains('100.00%')
        .and('be.visible');
@@ -218,9 +217,9 @@ describe(
      vegaWalletSetSpecifiedApprovalAmount('1000');
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(
-          rawProposal.rationale.title
-        ).within(() => cy.get(viewProposalButton).click());
+        getSubmittedProposalFromProposalList(rawProposal.rationale.title)
+          .as('submittedProposal')
+          .within(() => cy.get(viewProposalButton).click());
      });
      voteForProposal('for');
      // 3001-VOTE-079
@@ -238,9 +237,9 @@ describe(
          );
          navigateTo(navigation.proposals);
          cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-            getSubmittedProposalFromProposalList(
-              rawProposal.rationale.title
-            ).within(() => cy.get(viewProposalButton).click());
+            getSubmittedProposalFromProposalList(rawProposal.rationale.title)
+              .as('submittedProposal')
+              .within(() => cy.get(viewProposalButton).click());
          });
          cy.get(proposalVoteProgressForPercentage)
            .contains('100.00%')
@@ -16,7 +16,6 @@ import {
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

-const proposalListItem = '[data-testid="proposals-list-item"]';
 const closedProposals = '[data-testid="closed-proposals"]';
 const proposalStatus = '[data-testid="proposal-status"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
@@ -36,7 +35,6 @@ context(
    });

    beforeEach('visit proposals', function () {
-      cy.clearLocalStorage();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -53,8 +51,7 @@ context(
      waitForSpinner();
      cy.get(closedProposals).within(() => {
        cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => {
            cy.get(proposalStatus).should('have.text', 'Enacted ');
            cy.get(viewProposalButton).click();
@@ -81,8 +78,7 @@ context(
      waitForSpinner();
      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
      });
      getProposalInformationFromTable('State')
@@ -115,8 +111,7 @@ context(
      waitForSpinner();
      cy.get(openProposals, { timeout: 6000 }).within(() => {
        cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
      });
      getProposalInformationFromTable('State')
@@ -138,8 +133,7 @@ context(
      waitForSpinner();
      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
      });
      getProposalInformationFromTable('State')
@@ -84,7 +84,6 @@ context(
    });

    beforeEach('visit governance tab', function () {
-      cy.clearLocalStorage();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -76,7 +76,6 @@ context(
    });

    beforeEach('visit governance tab', function () {
-      cy.clearLocalStorage();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -305,10 +304,7 @@ context(
        cy.get('dd').eq(0).should('have.text', 'Test market 1');
        cy.get('dd').eq(1).should('have.text', 'TEST.24h');
        cy.get('dd').eq(2).should('not.be.empty');
-        cy.get('dd')
-          .eq(2)
-          .invoke('text')
-          .as('EnactedMarketId', { type: 'static' });
+        cy.get('dd').eq(2).invoke('text').as('EnactedMarketId');
      });
      cy.get('@EnactedMarketId').then((marketId) => {
        cy.VegaWalletSubmitLiquidityProvision(String(marketId), '1');
@@ -326,7 +322,6 @@ context(
      cy.get('@EnactedMarketId').then((marketId) => {
        cy.contains(String(marketId))
          .parentsUntil(proposalListItem)
-          .last()
          .within(() => {
            cy.getByTestId(viewProposalBtn).click();
          });
@@ -380,19 +375,16 @@ context(
      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');
-      cy.getByTestId('dialog-content')
-        .last()
-        .within(() => {
-          cy.get('p').should(
-            'have.text',
-            'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
-          );
-        });
+      cy.getByTestId('dialog-content').within(() => {
+        cy.get('p').should(
+          'have.text',
+          'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
+        );
+      });
      closeDialog();
      navigateTo(navigation.proposals);
      cy.contains(proposalTitle)
        .parentsUntil(proposalListItem)
-        .last()
        .within(() => {
          cy.getByTestId(viewProposalBtn).click();
        });
@@ -430,7 +422,6 @@ context(
        cy.get(proposalType)
          .contains('Update asset')
          .parentsUntil(proposalListItem)
-          .last()
          .within(() => {
            cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
            cy.getByTestId(viewProposalBtn).click();
@@ -35,7 +35,6 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  });

  beforeEach('visit proposals tab', function () {
-    cy.clearLocalStorage();
    cy.reload();
    waitForSpinner();
    cy.connectVegaWallet();
@@ -60,10 +59,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    cy.get(openProposals).within(() => {
      cy.get(proposalClosingDate).first().should('contain.text', 'year');
      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate)
-        .last()
-        .invoke('text')
-        .should('match', /days|minutes/);
+      cy.get(proposalClosingDate).last().should('contain.text', 'days');
    });
  });

@@ -25,10 +25,9 @@ const rewardsTimeOut = { timeout: 60000 };

 context('rewards - flow', { tags: '@slow' }, function () {
  before('set up environment to allow rewards', function () {
-    cy.clearLocalStorage();
    cy.visit('/');
    waitForSpinner();
-    depositAsset(vegaAssetAddress, '1000', 18);
+    depositAsset(vegaAssetAddress, '1000');
    cy.validatorsSelfDelegate();
    ethereumWalletConnect();
    cy.connectVegaWallet();
@@ -57,7 +56,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
    cy.getByTestId(rewardsTable)
      .first()
      .within(() => {
-        cy.getByTestId('asset', rewardsTimeOut).should('have.text', 'Vega');
+        cy.getByTestId('asset').should('have.text', 'Vega');
        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD').should('have.text', '1');
        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE').should(
          'have.text',
@@ -94,13 +93,13 @@ context('rewards - flow', { tags: '@slow' }, function () {
      .within(() => {
        cy.get('h2').first().should('contain.text', 'EPOCH');
        cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut)
-          .should('contain.text', '0.4415')
-          .and('contain.text', '(44.15%)');
+        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD')
+          .should('contain.text', '0.1177')
+          .and('contain.text', '(11.7733%)');
        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
-          .should('contain.text', '0.0004')
-          .and('contain.text', '(44.15%)');
-        cy.getByTestId('total').should('have.text', '0.4419');
+          .should('contain.text', '0.0001')
+          .and('contain.text', '(11.7733%)');
+        cy.getByTestId('total').should('have.text', '0.1179');
      });
  });
 });
@@ -66,7 +66,7 @@ context(
      beforeEach(
        'teardown wallet & drill into a specific validator',
        function () {
-          cy.clearLocalStorage();
+          cy.clearAllLocalStorage();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -53,7 +53,6 @@ context(
      beforeEach(
        'teardown wallet & drill into a specific validator',
        function () {
-          cy.clearLocalStorage();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -91,14 +90,9 @@ context(

        verifyEthWalletTotalAssociatedBalance('2.0');

-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });

        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
      });
@@ -134,38 +128,26 @@ context(
        stakingPageAssociateTokens('1001', { approve: true });
        verifyEthWalletAssociatedBalance('1,001.00');
        verifyEthWalletTotalAssociatedBalance('1,001.00');
-        cy.get(vegaWallet)
-          .last()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              '1,001.00'
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '1,001.00'
+          );
+        });
      });

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

        cy.get('button').contains('Select a validator to nominate').click();
        stakingPageDisassociateTokens('1');
        verifyEthWalletAssociatedBalance('1.0');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              1.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
+        });
      });

      it('Able to disassociate all tokens - using max', function () {
@@ -173,40 +155,26 @@ context(
        const warningText =
          'Warning: Any tokens that have been nominated to a node will sacrifice rewards they are due for the current epoch. If you do not wish to sacrifice these, you should remove stake from a node at the end of an epoch before disassociation.';
        stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
        cy.get('button').contains('Select a validator to nominate').click();
        cy.get(ethWalletDissociateButton).click();
        cy.get(disassociationWarning).should('contain', warningText);
        stakingPageDisassociateAllTokens();
-        cy.get(ethWalletContainer)
-          .first()
-          .within(() => {
-            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
-              'not.exist'
-            );
-          });
-        cy.get(ethWalletContainer)
-          .first()
-          .within(() => {
-            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
-              'not.exist'
-            );
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              0.0
-            );
-          });
+        cy.get(ethWalletContainer).within(() => {
+          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
+            'not.exist'
+          );
+        });
+        cy.get(ethWalletContainer).within(() => {
+          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
+            'not.exist'
+          );
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
+        });
      });

      it('Able to associate and disassociate vesting contract tokens', function () {
@@ -232,14 +200,9 @@ context(
        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
        verifyEthWalletAssociatedBalance('2.0');
        verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
        stakingPageDisassociateTokens('1', {
          type: 'contract',
@@ -265,61 +228,38 @@ context(
        stakingPageAssociateTokens('21', { type: 'wallet' });
        cy.get('button').contains('Select a validator to nominate').click();
        stakingPageAssociateTokens('37', { type: 'contract' });
-        cy.get(vestingContractSection)
-          .first()
-          .within(() => {
-            cy.get(associatedKey).should(
-              'contain',
-              Cypress.env('vegaWalletPublicKeyShort')
-            );
-            cy.get(associatedAmount, txTimeout).should('contain', 37);
-          });
-        cy.get(vegaInWalletSection)
-          .first()
-          .within(() => {
-            cy.get(associatedKey).should(
-              'contain',
-              Cypress.env('vegaWalletPublicKeyShort')
-            );
-            cy.get(associatedAmount, txTimeout).should('contain', 21);
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              58
-            );
-          });
+        cy.get(vestingContractSection).within(() => {
+          cy.get(associatedKey).should(
+            'contain',
+            Cypress.env('vegaWalletPublicKeyShort')
+          );
+          cy.get(associatedAmount, txTimeout).should('contain', 37);
+        });
+        cy.get(vegaInWalletSection).within(() => {
+          cy.get(associatedKey).should(
+            'contain',
+            Cypress.env('vegaWalletPublicKeyShort')
+          );
+          cy.get(associatedAmount, txTimeout).should('contain', 21);
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 58);
+        });
        stakingPageDisassociateTokens('6', { type: 'contract' });
-        cy.get(vestingContractSection)
-          .first()
-          .within(() => {
-            cy.get(associatedAmount, txTimeout).should('contain', 31);
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              52
-            );
-          });
+        cy.get(vestingContractSection).within(() => {
+          cy.get(associatedAmount, txTimeout).should('contain', 31);
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 52);
+        });
        navigateTo(navigation.validators);
        stakingPageDisassociateTokens('9', { type: 'wallet' });
-        cy.get(vegaInWalletSection)
-          .first()
-          .within(() => {
-            cy.get(associatedAmount, txTimeout).should('contain', 12);
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              43
-            );
-          });
+        cy.get(vegaInWalletSection).within(() => {
+          cy.get(associatedAmount, txTimeout).should('contain', 12);
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
+        });
      });

      it('Not able to associate more tokens than owned', function () {
@@ -378,14 +318,9 @@ context(
          Cypress.env('vegaWalletPublicKey2')
        );
        stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
        cy.get(associateCompleteText).should(
          'have.text',
          `Vega key ${Cypress.env(
@@ -4,7 +4,10 @@ import {
  waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import { depositAsset } from '../../support/wallet-teardown.functions';
+import {
+  depositAsset,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';

 const withdraw = 'withdraw';
 const withdrawalForm = 'withdraw-form';
@@ -22,15 +25,6 @@ const withdrawalAmount = 'withdrawal-amount';
 const withdrawalRecipient = 'withdrawal-recipient';
 const withdrawFundsButton = 'withdraw-funds';
 const completeWithdrawalButton = 'complete-withdrawal';
-const tableTxHash = '[col-id="txHash"]';
-const tableAssetSymbol = '[col-id="asset.symbol"]';
-const tableAmount = '[col-id="amount"]';
-const tableReceiverAddress = '[col-id="details.receiverAddress"]';
-const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
-const tableWithdrawnStatus = '[col-id="status"]';
-const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
-const toastContent = 'toast-content';
-const toastPanel = 'toast-panel';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
@@ -48,23 +42,26 @@ context(
      cy.visit('/');
      // When running tests locally, will fail if run without restarting capsule
      cy.updateCapsuleMultiSig().then(() => {
-        ethereumWalletConnect();
-        depositAsset(usdcEthAddress, '1000', 5);
+        depositAsset(usdcEthAddress, '100');
      });
    });

    beforeEach('Navigate to withdrawal page', function () {
-      cy.clearLocalStorage();
      cy.reload();
      waitForSpinner();
      navigateTo(navigation.withdraw);
      cy.connectVegaWallet();
      ethereumWalletConnect();
+      vegaWalletTeardown();
    });

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

    it('Unable to submit withdrawal with invalid fields', function () {
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
        cy.get('select').select(usdtSelectValue, { force: true });
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(submitWithdrawalButton).click();
@@ -97,7 +94,7 @@ context(
    it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
      // fill in withdrawal form
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
        cy.get('select').select(usdtSelectValue, { force: true });
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(withdrawalThreshold).should(
@@ -105,7 +102,7 @@ context(
          '100,000.00000T'
        );
        cy.getByTestId(delayTime).should('have.text', 'None');
-        cy.getByTestId(amountInput).click().type('120');
+        cy.getByTestId(amountInput).click().type('100');
        cy.getByTestId(submitWithdrawalButton).click();
      });

@@ -119,7 +116,7 @@ context(
        .should('have.attr', 'href')
        .and('contain', '/txs/');
      cy.getByTestId(withdrawalAssetSymbol).should('have.text', usdcSymbol);
-      cy.getByTestId(withdrawalAmount).should('have.text', '120.00');
+      cy.getByTestId(withdrawalAmount).should('have.text', '100.00');
      cy.getByTestId(withdrawalRecipient)
        .should('have.text', truncatedWithdrawalEthAddress)
        .and('have.attr', 'href')
@@ -131,36 +128,43 @@ context(
        'Withdraw asset complete'
      );
      cy.getByTestId(dialogClose).click();
+
+      // need to reload page to see withdrawal history complete
+      cy.reload();
+      waitForAssetsDisplayed(usdtName);
+
      // withdrawal history for complete withdrawal displayed
-      cy.get(tableWithdrawnStatus)
-        .eq(1, txTimeout)
-        .should('have.text', 'Completed')
+      cy.get('[col-id="txHash"]', txTimeout)
+        .should('have.length.above', 1)
+        .eq(1)
        .parent()
        .within(() => {
-          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-          cy.get(tableAmount).should('have.text', '120.00');
-          cy.get(tableReceiverAddress)
+          cy.get('[col-id="asset.symbol"]').should('have.text', usdcSymbol);
+          cy.get('[col-id="amount"]').should('have.text', '100.00');
+          cy.get('[col-id="details.receiverAddress"]')
            .find('a')
            .should('have.attr', 'href')
            .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
-          cy.get(tableTxHash)
+          cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
+          cy.get('[col-id="status"]').should('have.text', 'Completed');
+          cy.get('[col-id="txHash"]')
            .find('a')
            .should('have.attr', 'href')
            .and('contain', 'https://sepolia.etherscan.io/tx/');
        });
    });

-    it('Able to withdraw asset: -eth wallet not connected', function () {
+    // Skipping because of bug #1857
+    it.skip('Able to withdraw asset: -eth wallet not connected', function () {
      const ethWalletAddress = Cypress.env('ethWalletPublicKey');
      cy.reload();
      waitForAssetsDisplayed(usdtName);
      // fill in withdrawal form
      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
        cy.get('select').select(usdtSelectValue, { force: true });
        cy.getByTestId(ethAddressInput).should('be.empty');
-        cy.getByTestId(amountInput).click().type('110');
+        cy.getByTestId(amountInput).click().type('100');
        cy.getByTestId(submitWithdrawalButton).click();

        // Need eth address to submit withdrawal
@@ -176,38 +180,20 @@ context(
        'Transaction complete'
      );
      cy.getByTestId(dialogClose).click();
-      cy.get(tableTxHash)
-        .eq(1)
-        .should('have.text', 'Complete withdrawal')
+
+      cy.getByTestId(completeWithdrawalButton)
+        .eq(0)
+        .parent()
        .parent()
        .within(() => {
-          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-          cy.get(tableAmount).should('have.text', '110.00');
-          cy.get(tableReceiverAddress)
+          cy.get('[col-id="asset.symbol"]').should('have.text', usdcSymbol);
+          cy.get('[col-id="amount"]').should('have.text', '100.00');
+          cy.get('[col-id="details.receiverAddress"]')
            .find('a')
            .should('have.attr', 'href')
            .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get(tableCreatedTimeStamp).should('not.be.empty');
-        });
-      ethereumWalletConnect();
-      cy.getByTestId(completeWithdrawalButton).click();
-      cy.getByTestId(toastContent)
-        .last()
-        .should('contain.text', 'Awaiting confirmation')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-        });
-      cy.getByTestId(toastContent)
-        .first()
-        .should('contain.text', 'The withdrawal has been approved.')
-        .within(() => {
-          cy.getByTestId(toastPanel).should('contain.text', '110.00', 'tUSDC');
-        });
-      cy.getByTestId(toastContent)
-        .last()
-        .should('contain.text', 'Transaction confirmed')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
+          cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
+          cy.getByTestId(completeWithdrawalButton).click();
        });
    });

@@ -216,31 +202,26 @@ context(
      const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;

      // Disconnect vega wallet
-      cy.getByTestId('manage-vega-wallet').last().click();
+      cy.getByTestId('manage-vega-wallet').click();
      cy.getByTestId('disconnect').click();

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

-      cy.getByTestId('dialog-content')
-        .last()
-        .within(() => {
-          cy.get('h1').should('have.text', 'Transaction failed');
-          cy.getByTestId('Error').should('have.text', expectedErrorTxt);
-        });
+      cy.getByTestId('dialog-content').within(() => {
+        cy.get('h1').should('have.text', 'Transaction failed');
+        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+      });
    });

    function waitForAssetsDisplayed(expectedAsset: string) {
-      cy.getByTestId('currency-title', txTimeout).should(
-        'contain.text',
-        expectedAsset
-      );
+      cy.contains(expectedAsset, txTimeout).should('be.visible');
    }
  }
 );
@@ -27,7 +27,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('app-announcement').should('not.exist');
    });

-    it('should show open or enacted proposals without proposal summary', function () {
+    it('should show open or enacted proposals with proposal summary', function () {
      cy.get('body').then(($body) => {
        if (!$body.find('[data-testid="proposals-list-item"]').length) {
          cy.createMarket();
@@ -43,6 +43,12 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
            .invoke('text')
            .should('not.be.empty');
          cy.getByTestId('proposal-type').invoke('text').should('not.be.empty');
+          cy.getByTestId('proposal-description')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('proposal-details')
+            .invoke('text')
+            .should('not.be.empty');
          cy.getByTestId('proposal-status')
            .invoke('text')
            .should('not.be.empty');
@@ -101,15 +101,15 @@ context(
            );
            cy.getByTestId('protocol-upgrade-proposal-release-tag').should(
              'have.text',
-              'Vega release tag: v1'
+              'Vega release tagv1'
            );
            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
              'have.text',
-              'Upgrade block height: 2015942'
+              'Upgrade block height2015942'
            );
            cy.getByTestId('protocol-upgrade-proposal-status').should(
              'have.text',
-              'Approved '
+              'Approved'
            );
          });
      });
@@ -1,4 +1,3 @@
-import { format } from 'date-fns';
 import { closeDialog, navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';

@@ -16,6 +15,35 @@ const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

+export function convertUnixTimestampToDateformat(
+  unixTimestamp: number,
+  monthTextLength = 'longMonth'
+) {
+  const dateSupplied = new Date(unixTimestamp * 1000);
+  const year = dateSupplied.getFullYear();
+  const months = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+  ];
+  const month = months[dateSupplied.getMonth()];
+  const shortMonth = months[dateSupplied.getMonth()].substring(0, 3),
+    date = dateSupplied.getDate();
+
+  if (monthTextLength === 'longMonth') {
+    return cy.wrap(`${date} ${month} ${year}`);
+  } else return cy.wrap(`${date} ${shortMonth} ${year}`);
+}
+
 export function createTenDigitUnixTimeStampForSpecifiedDays(
  durationDays: number
 ) {
@@ -24,13 +52,6 @@ export function createTenDigitUnixTimeStampForSpecifiedDays(
  return (timestamp = Math.floor(timestamp / 1000));
 }

-export function getDateFormatForSpecifiedDays(days: number) {
-  const date = new Date(
-    createTenDigitUnixTimeStampForSpecifiedDays(days) * 1000
-  );
-  return cy.wrap(format(date, 'dd MMM yyyy'));
-}
-
 export function enterRawProposalBody(timestamp: number) {
  cy.fixture('/proposals/raw.json').then((rawProposal) => {
    rawProposal.terms.closingTimestamp = timestamp;
@@ -69,7 +90,6 @@ export function getSubmittedProposalFromProposalList(proposalTitle: string) {
 export function getProposalIdFromList(proposalTitle: string) {
  cy.contains(proposalTitle)
    .parentsUntil(proposalListItem)
-    .last()
    .within(() => {
      cy.get(proposalDetails)
        .invoke('text')
@@ -83,6 +103,16 @@ export function getProposalIdFromList(proposalTitle: string) {
    });
 }

+export function getGovernanceProposalDateFormatForSpecifiedDays(
+  days: number,
+  shortOrLong?: string
+) {
+  return convertUnixTimestampToDateformat(
+    createTenDigitUnixTimeStampForSpecifiedDays(days),
+    shortOrLong
+  );
+}
+
 export function getProposalInformationFromTable(heading: string) {
  return cy.get(proposalInformationTableRows).contains(heading).siblings();
 }
@@ -103,7 +133,7 @@ export function waitForProposalSync() {
  // before proposal appears in the list - so rather than hard coded wait - we just wait on the
  // delegation checks that are performed on the governance page.

-  cy.intercept('POST', '/graphql', (req) => {
+  cy.intercept('POST', '/query', (req) => {
    if (req.body.operationName === 'Delegations') {
      req.alias = 'proposalDelegationsCompletion';
    }
@@ -113,7 +143,7 @@ export function waitForProposalSync() {
  cy.wait(['@proposalDelegationsCompletion', '@proposalDelegationsCompletion']);

  // Turn off this intercept from here on in
-  cy.intercept('POST', '/graphql', (req) => {
+  cy.intercept('POST', '/query', (req) => {
    if (req.body.operationName === 'Delegations') {
      req.continue();
    }
@@ -89,6 +89,6 @@ export function mockNetworkUpgradeProposal() {
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'Nodes', nodeData);
    aliasGQLQuery(req, 'Proposals', proposalsData);
-    aliasGQLQuery(req, 'ProtocolUpgradeProposals', upgradeProposalsData);
+    aliasGQLQuery(req, 'ProtocolUpgrades', upgradeProposalsData);
  });
 }
@@ -35,25 +35,18 @@ const stakingBridgeContract = new StakingBridge(
 );
 const vestingContract = new TokenVesting(vegaTokenContractAddress, signer);

-export async function depositAsset(
-  assetEthAddress: string,
-  amount: string,
-  decimalPlaces: number
-) {
+export async function depositAsset(assetEthAddress: string, amount: string) {
  // Approve asset
  const faucet = new TokenFaucetable(assetEthAddress, signer);
-  cy.wrap(
-    faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
-    {
-      timeout: transactionTimeout,
-      log: false,
-    }
-  ).then(() => {
+  cy.wrap(faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(19)), {
+    timeout: transactionTimeout,
+    log: false,
+  }).then(() => {
    const collateralBridge = new CollateralBridge(Erc20BridgeAddress, signer);
    cy.wrap(
      collateralBridge.deposit_asset(
        assetEthAddress,
-        amount + '0'.repeat(decimalPlaces),
+        amount + '0'.repeat(18),
        '0x' + vegaWalletPubKey
      ),
      { timeout: transactionTimeout, log: false }
@@ -109,49 +102,27 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
  cy.highlight('Tearing down staking tokens from vega wallet if present');
  cy.wrap(
    stakingBridgeContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-    { timeout: transactionTimeout }
+    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('currency-value')
-          .first()
-          .invoke('text')
-          .then(($associatedAmount) => {
-            cy.wrap(
-              stakingBridgeContract.remove_stake(
-                String(stakeBalance),
-                vegaWalletPubKey
-              ),
-              { timeout: transactionTimeout }
-            );
-            cy.wrap(
-              vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-              {
+      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
+        () => {
+          cy.get(associatedAmountInWallet)
+            .invoke('text')
+            .then(($walletAmount) => {
+              cy.wrap(
+                stakingBridgeContract.remove_stake(
+                  String(stakeBalance),
+                  vegaWalletPubKey
+                ),
+                { timeout: transactionTimeout, log: false }
+              );
+              cy.get(associatedAmountInWallet, {
                timeout: transactionTimeout,
-                log: false,
-              }
-            ).then((vestingAmount) => {
-              if (Number(vestingAmount) != 0) {
-                cy.contains('Associated', {
-                  timeout: transactionTimeout,
-                })
-                  .parent()
-                  .parent()
-                  .within(() => {
-                    cy.getByTestId('currency-value', {
-                      timeout: transactionTimeout,
-                    })
-                      .should('have.length', 1)
-                      .invoke('text')
-                      .as('displayedAmount');
-                    cy.get('@displayedAmount', {
-                      timeout: transactionTimeout,
-                    }).should('not.eq', $associatedAmount);
-                  });
-              }
+              }).should('not.have.text', $walletAmount);
            });
-          });
-      });
+        }
+      );
    }
  });
 }
@@ -165,7 +136,7 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
    if (Number(vestingAmount) != 0) {
      cy.wrap(
        vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
-        { timeout: transactionTimeout }
+        { timeout: transactionTimeout, log: false }
      );
    }
  });
@@ -1,18 +1,18 @@
 # App configuration variables
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET3
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

@@ -3,7 +3,7 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''
@@ -16,7 +16,7 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=DEVNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_URL=https://api.n00.devnet1.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -1,8 +1,8 @@
 # App configuration variables
 NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
-NX_VEGA_URL=https://api.vega.community/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -0,0 +1,11 @@
+# App configuration variables
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET3
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_DELEGATIONS_PAGINATION=50
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -3,7 +3,7 @@ NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -27,11 +27,12 @@ Example configurations are provided here:
 - [Mainnet](./.env.mainnet)
 - [Devnet](./.env.devnet)
 - [Testnet](./.env.testnet)
+- [Stagnet3](./.env.stagnet3)

 For convenience, you can boot the app injecting one of the configurations above by running:

 ```bash
-yarn nx run governance:serve --env={env} # e.g. stagnet1
+yarn nx run governance:serve --env={env} # e.g. stagnet3
 ```

 There are a few different configuration options offered for this app:
@@ -1,5 +0,0 @@
-function ReactMarkdown({ children }) {
-  return <div>{children}</div>;
-}
-
-export default ReactMarkdown;
@@ -20,17 +20,12 @@ import type { EthereumConfig } from '@vegaprotocol/web3';
 import {
  createConnectors,
  useEthTransactionManager,
-  useEthTransactionUpdater,
  useEthWithdrawApprovalsManager,
  useWeb3ConnectStore,
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import {
-  useVegaTransactionManager,
-  useVegaTransactionUpdater,
-  VegaWalletProvider,
-} from '@vegaprotocol/wallet';
+import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -42,7 +37,6 @@ import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
-import { ToastsManager } from './toasts-manager';

 const cache: InMemoryCacheConfig = {
  typePolicies: {
@@ -87,10 +81,7 @@ const Web3Container = ({
  providerUrl: string;
 }) => {
  const InitializeHandlers = () => {
-    useVegaTransactionManager();
-    useVegaTransactionUpdater();
    useEthTransactionManager();
-    useEthTransactionUpdater();
    useEthWithdrawApprovalsManager();
    return null;
  };
@@ -144,7 +135,6 @@ const Web3Container = ({
                      <NetworkInfo />
                    </footer>
                  </AppLayout>
-                  <ToastsManager />
                  <InitializeHandlers />
                  <VegaWalletDialogs />
                  <TransactionModal />
@@ -23,7 +23,6 @@ export const ConnectToVega = () => {
        openVegaWalletDialog();
      }}
      data-testid="connect-to-vega-wallet-btn"
-      variant="primary"
    >
      {t('connectVegaWallet')}
    </Button>
@@ -23,7 +23,7 @@ export const Heading = ({
      })}
    >
      <h1
-        className={classNames('font-alpha calt text-5xl break-words', {
+        className={classNames('font-alpha calt text-5xl', {
          'mt-0': !marginTop,
          'mb-0': !marginBottom,
        })}
@@ -33,6 +33,10 @@ export const ContractAddresses: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
+  STAGNET3: {
+    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
+    lockedAddress: '0x0', // TODO not deployed to this env
+  },
  TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
@@ -21,10 +21,10 @@ export const useGetUserBalances = (account: string | undefined) => {
        token.allowance(account, config.staking_bridge_contract.address),
      ]);

-      const balance = toBigNum(b.toString(), decimals);
-      const walletBalance = toBigNum(w.toString(), decimals);
-      const lien = toBigNum(stats.lien.toString(), decimals);
-      const allowance = toBigNum(a.toString(), decimals);
+      const balance = toBigNum(b, decimals);
+      const walletBalance = toBigNum(w, decimals);
+      const lien = toBigNum(stats.lien, decimals);
+      const allowance = toBigNum(a, decimals);

      return {
        balanceFormatted: balance,
@@ -21,14 +21,8 @@ export function useRefreshAssociatedBalances() {
        ]);

      updateBalances({
-        walletAssociatedBalance: toBigNum(
-          walletAssociatedBalance.toString(),
-          decimals
-        ),
-        vestingAssociatedBalance: toBigNum(
-          vestingAssociatedBalance.toString(),
-          decimals
-        ),
+        walletAssociatedBalance: toBigNum(walletAssociatedBalance, decimals),
+        vestingAssociatedBalance: toBigNum(vestingAssociatedBalance, decimals),
      });
    },
    [staking, vesting, updateBalances, decimals]
@@ -31,18 +31,12 @@ export const useRefreshBalances = (address: string) => {
          pubKey ? vesting.stake_balance(address, pubKey) : null,
        ]);

-      const balance = toBigNum(b.toString(), decimals);
-      const walletBalance = toBigNum(w.toString(), decimals);
-      const lien = toBigNum(stats.lien.toString(), decimals);
-      const allowance = toBigNum(a.toString(), decimals);
-      const walletAssociatedBalance = toBigNum(
-        walletStakeBalance ? walletStakeBalance.toString() : 0,
-        decimals
-      );
-      const vestingAssociatedBalance = toBigNum(
-        vestingStakeBalance ? vestingStakeBalance.toString() : 0,
-        decimals
-      );
+      const balance = toBigNum(b, decimals);
+      const walletBalance = toBigNum(w, decimals);
+      const lien = toBigNum(stats.lien, decimals);
+      const allowance = toBigNum(a, decimals);
+      const walletAssociatedBalance = toBigNum(walletStakeBalance, decimals);
+      const vestingAssociatedBalance = toBigNum(vestingStakeBalance, decimals);

      updateBalances({
        balanceFormatted: balance,
@@ -201,7 +201,7 @@
  "NewFreeform": "Freeform",
  "tokenVotes": "Token votes",
  "liquidityVotes": "Liquidity votes",
-  "castYourVote": "Cast your vote",
+  "yourVote": "Your vote",
  "for": "For",
  "against": "Against",
  "majorityRequired": "Majority Required",
@@ -587,7 +587,7 @@
  "tokensAgainstProposal": "Tokens against proposal",
  "participationRequired": "Participation required",
  "numberOfVotingParties": "Number of voting parties",
-  "totalTokensVotes": "Total tokens voted",
+  "totalTokensVotes": "Total yes tokens",
  "totalTokenVotedPercentage": "Total tokens voted percentage",
  "numberOfForVotes": "Number of votes for",
  "numberOfAgainstVotes": "Number of votes against",
@@ -631,10 +631,7 @@
  "New market": "New market",
  "Market change": "Market change",
  "Network parameter": "Network parameter",
-  "Change": "Change",
  "Unknown proposal": "Unknown proposal",
-  "ERC20ContractAddress": "ERC20 contract address",
-  "MaxFaucetAmountMint": "Max faucet amount mint",
  "Code": "Code",
  "settled future": "settled future",
  "Symbol": "Symbol",
@@ -680,7 +677,6 @@
  "NewProposal": "New proposal",
  "ProposalTypeQuestion": "What type of proposal would you like to make?",
  "NetworkParameterProposal": "Update network parameter proposal",
-  "parameter": "parameter",
  "NewMarketProposal": "New market proposal",
  "UpdateMarketProposal": "Update market proposal",
  "NewAssetProposal": "New asset proposal",
@@ -698,7 +694,6 @@
  "UpdateMarket": "Update market",
  "NewAsset": "New asset",
  "UpdateAsset": "Update asset",
-  "AssetID": "Asset ID",
  "Freeform": "Freeform",
  "RawProposal": "Let me choose (raw proposal)",
  "UseMin": "Use minimum",
@@ -742,7 +737,6 @@
  "ProposalNotFound": "Proposal not found",
  "ProposalNotFoundDetails": "The proposal you are looking for is not here, it may have been enacted before the last chain restore. You could check the Vega forums/discord instead for information about it.",
  "FreeformProposal": "Freeform proposal",
-  "Id": "ID",
  "unknownReason": "unknown reason",
  "votingEnded": "Voting has ended.",
  "STATUS": "STATUS",
@@ -797,7 +791,5 @@
  "67% voting power required": "67% voting power required",
  "Token": "Token",
  "associateVegaNow": "Associate $VEGA now",
-  "disconnectedNotice": "You have been disconnected. Connect your ETH wallet to the {{correctNetwork}} network to use this app.",
-  "connectAVegaWalletToVote": "Connect a Vega wallet with $VEGA tokens to vote on a proposal.",
-  "findOutMoreAboutHowToVote": "Find out more about how to vote on Vega"
+  "disconnectedNotice": "You have been disconnected. Connect your ETH wallet to the {{correctNetwork}} network to use this app."
 }
@@ -15,6 +15,7 @@ import Routes from '../routes';
 import { ExternalLinks, removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
+import { useProtocolUpgradesQuery } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 import {
  getNotRejectedProposals,
  getNotRejectedProtocolUpgradeProposals,
@@ -24,8 +25,7 @@ import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
 import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';

 const nodesToShow = 6;

@@ -181,7 +181,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    data: protocolUpgradesData,
    loading: protocolUpgradesLoading,
    error: protocolUpgradesError,
-  } = useProtocolUpgradeProposalsQuery({
+  } = useProtocolUpgradesQuery({
    pollInterval: 5000,
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
@@ -1,11 +1,7 @@
 import { useTranslation } from 'react-i18next';
-import { Icon } from '@vegaprotocol/ui-toolkit';
+import * as Schema from '@vegaprotocol/types';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { ProposalState } from '@vegaprotocol/types';
-import { ProposalInfoLabel } from '../proposal-info-label';
-import type { ReactNode } from 'react';
-import type { ProposalInfoLabelVariant } from '../proposal-info-label';

 export const CurrentProposalState = ({
  proposal,
@@ -13,63 +9,19 @@ export const CurrentProposalState = ({
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
 }) => {
  const { t } = useTranslation();
-  let proposalStatus: ReactNode;
-  let variant = 'tertiary' as ProposalInfoLabelVariant;
+  let className = 'text-white';

-  switch (proposal?.state) {
-    case ProposalState.STATE_ENACTED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Enacted')}</span>
-          <Icon name={'tick'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_PASSED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Passed')}</span>
-          <Icon name={'tick'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_WaitingForNodeVote')}</span>
-          <Icon name={'time'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_OPEN: {
-      variant = 'primary' as ProposalInfoLabelVariant;
-      proposalStatus = <>{t('voteState_Open')}</>;
-      break;
-    }
-    case ProposalState.STATE_DECLINED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Declined')}</span>
-          <Icon name={'cross'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_REJECTED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Rejected')}</span>
-          <Icon name={'warning-sign'} />
-        </>
-      );
-      break;
-    }
+  if (
+    proposal?.state === Schema.ProposalState.STATE_DECLINED ||
+    proposal?.state === Schema.ProposalState.STATE_FAILED ||
+    proposal?.state === Schema.ProposalState.STATE_REJECTED
+  ) {
+    className = 'text-danger';
+  } else if (
+    proposal?.state === Schema.ProposalState.STATE_ENACTED ||
+    proposal?.state === Schema.ProposalState.STATE_PASSED
+  ) {
+    className = 'text-white';
  }
-
-  return (
-    <ProposalInfoLabel variant={variant}>{proposalStatus}</ProposalInfoLabel>
-  );
+  return <span className={className}>{t(`${proposal?.state}`)}</span>;
 };
@@ -2,8 +2,8 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { render, screen } from '@testing-library/react';
 import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { CurrentProposalStatus } from './current-proposal-status';
@@ -1,7 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
+import { format } from 'date-fns';

+import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { ProposalChangeTable } from './proposal-change-table';

@@ -16,26 +17,37 @@ it('Renders all data for table', () => {
  render(<ProposalChangeTable proposal={proposal} />);
  expect(screen.getByText('ID')).toBeInTheDocument();
  expect(screen.getByText(proposal?.id as string)).toBeInTheDocument();
+
+  expect(screen.getByText('State')).toBeInTheDocument();
+  expect(screen.getByText('Open')).toBeInTheDocument();
+
  expect(screen.getByText('Closes on')).toBeInTheDocument();
  expect(
    screen.getByText(
-      formatDateWithLocalTimezone(new Date(proposal?.terms.closingDatetime))
+      format(new Date(proposal?.terms.closingDatetime), DATE_FORMAT_DETAILED)
    )
  ).toBeInTheDocument();
+
  expect(screen.getByText('Proposed enactment')).toBeInTheDocument();
  expect(
    screen.getByText(
-      formatDateWithLocalTimezone(
-        new Date(proposal?.terms.enactmentDatetime || 0)
+      format(
+        new Date(proposal?.terms.enactmentDatetime || 0),
+        DATE_FORMAT_DETAILED
      )
    )
  ).toBeInTheDocument();
+
  expect(screen.getByText('Proposed by')).toBeInTheDocument();
  expect(screen.getByText(proposal?.party.id ?? '')).toBeInTheDocument();
+
  expect(screen.getByText('Proposed on')).toBeInTheDocument();
  expect(
-    screen.getByText(formatDateWithLocalTimezone(new Date(proposal?.datetime)))
+    screen.getByText(format(new Date(proposal?.datetime), DATE_FORMAT_DETAILED))
  ).toBeInTheDocument();
+
+  expect(screen.getByText('Type')).toBeInTheDocument();
+  expect(screen.getByText('Network parameter')).toBeInTheDocument();
 });

 it('Changes data based on if data is in future or past', () => {
@@ -43,17 +55,23 @@ it('Changes data based on if data is in future or past', () => {
    state: ProposalState.STATE_ENACTED,
  });
  render(<ProposalChangeTable proposal={proposal} />);
+
+  expect(screen.getByText('State')).toBeInTheDocument();
+  expect(screen.getByText('Enacted')).toBeInTheDocument();
+
  expect(screen.getByText('Closed on')).toBeInTheDocument();
  expect(
    screen.getByText(
-      formatDateWithLocalTimezone(new Date(proposal?.terms.closingDatetime))
+      format(new Date(proposal?.terms.closingDatetime), DATE_FORMAT_DETAILED)
    )
  ).toBeInTheDocument();
+
  expect(screen.getByText('Enacted on')).toBeInTheDocument();
  expect(
    screen.getByText(
-      formatDateWithLocalTimezone(
-        new Date(proposal?.terms.enactmentDatetime || 0)
+      format(
+        new Date(proposal?.terms.enactmentDatetime || 0),
+        DATE_FORMAT_DETAILED
      )
    )
  ).toBeInTheDocument();
@@ -73,8 +91,9 @@ it('Does not render enactment time for freeform proposal', () => {
  expect(screen.queryByText('Enacted on')).not.toBeInTheDocument();
  expect(
    screen.queryByText(
-      formatDateWithLocalTimezone(
-        new Date(proposal?.terms.enactmentDatetime || 0)
+      format(
+        new Date(proposal?.terms.enactmentDatetime || 0),
+        DATE_FORMAT_DETAILED
      )
    )
  ).not.toBeInTheDocument();
@@ -89,6 +108,7 @@ it('Renders error details and rejection reason if present', () => {
  render(<ProposalChangeTable proposal={proposal} />);
  expect(screen.getByText('Error details')).toBeInTheDocument();
  expect(screen.getByText(errorDetails)).toBeInTheDocument();
+
  expect(screen.getByText('Rejection reason')).toBeInTheDocument();
  expect(
    screen.getByText(ProposalRejectionReason.PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE)
@@ -1,11 +1,13 @@
-import { isFuture } from 'date-fns';
+import { format, isFuture } from 'date-fns';
 import { useTranslation } from 'react-i18next';
-import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
+
 import {
  KeyValueTable,
  KeyValueTableRow,
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
+import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
+import { CurrentProposalState } from '../current-proposal-state';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';

@@ -19,25 +21,30 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
  const terms = proposal?.terms;

  return (
-    <RoundedWrapper paddingBottom={true}>
+    <RoundedWrapper>
      <KeyValueTable data-testid="proposal-change-table">
        <KeyValueTableRow>
          {t('id')}
          {proposal?.id}
        </KeyValueTableRow>
+        <KeyValueTableRow>
+          {t('state')}
+          <CurrentProposalState proposal={proposal} />
+        </KeyValueTableRow>
        <KeyValueTableRow>
          {isFuture(new Date(terms?.closingDatetime))
            ? t('closesOn')
            : t('closedOn')}
-          {formatDateWithLocalTimezone(new Date(terms?.closingDatetime))}
+          {format(new Date(terms?.closingDatetime), DATE_FORMAT_DETAILED)}
        </KeyValueTableRow>
        {terms?.change.__typename !== 'NewFreeform' ? (
          <KeyValueTableRow>
            {isFuture(new Date(terms?.enactmentDatetime || 0))
              ? t('proposedEnactment')
              : t('enactedOn')}
-            {formatDateWithLocalTimezone(
-              new Date(terms?.enactmentDatetime || 0)
+            {format(
+              new Date(terms?.enactmentDatetime || 0),
+              DATE_FORMAT_DETAILED
            )}
          </KeyValueTableRow>
        ) : null}
@@ -45,24 +52,26 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
          {t('proposedBy')}
          <span style={{ wordBreak: 'break-word' }}>{proposal?.party.id}</span>
        </KeyValueTableRow>
-        <KeyValueTableRow
-          noBorder={!proposal?.rejectionReason && !proposal?.errorDetails}
-        >
+        <KeyValueTableRow>
          {t('proposedOn')}
-          {formatDateWithLocalTimezone(new Date(proposal?.datetime))}
+          {format(new Date(proposal?.datetime), DATE_FORMAT_DETAILED)}
        </KeyValueTableRow>
        {proposal?.rejectionReason ? (
-          <KeyValueTableRow noBorder={!proposal?.errorDetails}>
+          <KeyValueTableRow>
            {t('rejectionReason')}
            {proposal.rejectionReason}
          </KeyValueTableRow>
        ) : null}
        {proposal?.errorDetails ? (
-          <KeyValueTableRow noBorder={true}>
+          <KeyValueTableRow>
            {t('errorDetails')}
            {proposal.errorDetails}
          </KeyValueTableRow>
        ) : null}
+        <KeyValueTableRow>
+          {t('type')}
+          {t(`${proposal?.terms.change.__typename}`)}
+        </KeyValueTableRow>
      </KeyValueTable>
    </RoundedWrapper>
  );
@@ -1,68 +1,68 @@
 import { render, screen } from '@testing-library/react';
-import {
-  generateNoVotes,
-  generateProposal,
-  generateYesVotes,
-} from '../../test-helpers/generate-proposals';
+import { generateProposal } from '../../test-helpers/generate-proposals';
 import { ProposalHeader } from './proposal-header';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import { lastWeek, nextWeek } from '../../test-helpers/mocks';

-const renderComponent = (
-  proposal: ProposalQuery['proposal'],
-  isListItem = true
-) => render(<ProposalHeader proposal={proposal} isListItem={isListItem} />);
+const renderComponent = (proposal: ProposalQuery['proposal']) => (
+  <ProposalHeader proposal={proposal} />
+);

 describe('Proposal header', () => {
  it('Renders New market proposal', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'New some market',
-          description: 'A new some market',
-        },
-        terms: {
-          change: {
-            __typename: 'NewMarket',
-            instrument: {
-              __typename: 'InstrumentConfiguration',
-              name: 'Some market',
-              code: 'FX:BTCUSD/DEC99',
-              futureProduct: {
-                __typename: 'FutureProduct',
-                settlementAsset: {
-                  __typename: 'Asset',
-                  symbol: 'tGBP',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'New some market',
+            description: 'A new some market',
+          },
+          terms: {
+            change: {
+              __typename: 'NewMarket',
+              instrument: {
+                __typename: 'InstrumentConfiguration',
+                name: 'Some market',
+                code: 'FX:BTCUSD/DEC99',
+                futureProduct: {
+                  __typename: 'FutureProduct',
+                  settlementAsset: {
+                    __typename: 'Asset',
+                    symbol: 'tGBP',
+                  },
                },
              },
            },
          },
-        },
-      })
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'New some market'
    );
    expect(screen.getByTestId('proposal-type')).toHaveTextContent('New market');
+    expect(screen.getByTestId('proposal-description')).toHaveTextContent(
+      'A new some market'
+    );
    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
      'tGBP settled future.'
    );
  });

  it('Renders Update market proposal', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'New market id',
-        },
-        terms: {
-          change: {
-            __typename: 'UpdateMarket',
-            marketId: 'MarketId',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'New market id',
          },
-        },
-      })
+          terms: {
+            change: {
+              __typename: 'UpdateMarket',
+              marketId: 'MarketId',
+            },
+          },
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'New market id'
@@ -79,49 +79,53 @@ describe('Proposal header', () => {
  });

  it('Renders New asset proposal - ERC20', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'New asset: Fake currency',
-          description: '',
-        },
-        terms: {
-          change: {
-            __typename: 'NewAsset',
-            name: 'Fake currency',
-            symbol: 'FAKE',
-            source: {
-              __typename: 'ERC20',
-              contractAddress: '0x0',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'New asset: Fake currency',
+            description: '',
+          },
+          terms: {
+            change: {
+              __typename: 'NewAsset',
+              name: 'Fake currency',
+              symbol: 'FAKE',
+              source: {
+                __typename: 'ERC20',
+                contractAddress: '0x0',
+              },
            },
          },
-        },
-      })
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'New asset: Fake currency'
    );
    expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
-      'Symbol: FAKE. ERC20 contract address: 0x0'
+      'Symbol: FAKE. ERC20 0x0'
    );
  });

  it('Renders New asset proposal - BuiltInAsset', () => {
-    renderComponent(
-      generateProposal({
-        terms: {
-          change: {
-            __typename: 'NewAsset',
-            name: 'Fake currency',
-            symbol: 'BIA',
-            source: {
-              __typename: 'BuiltinAsset',
-              maxFaucetAmountMint: '300',
+    render(
+      renderComponent(
+        generateProposal({
+          terms: {
+            change: {
+              __typename: 'NewAsset',
+              name: 'Fake currency',
+              symbol: 'BIA',
+              source: {
+                __typename: 'BuiltinAsset',
+                maxFaucetAmountMint: '300',
+              },
            },
          },
-        },
-      })
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'Unknown proposal'
@@ -133,22 +137,24 @@ describe('Proposal header', () => {
  });

  it('Renders Update network', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'Network parameter',
-        },
-        terms: {
-          change: {
-            __typename: 'UpdateNetworkParameter',
-            networkParameter: {
-              __typename: 'NetworkParameter',
-              key: 'Network key',
-              value: 'Network value',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'Network parameter',
+          },
+          terms: {
+            change: {
+              __typename: 'UpdateNetworkParameter',
+              networkParameter: {
+                __typename: 'NetworkParameter',
+                key: 'Network key',
+                value: 'Network value',
+              },
            },
          },
-        },
-      })
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'Network parameter'
@@ -161,211 +167,122 @@ describe('Proposal header', () => {
    );
  });

-  it('Renders Freeform proposal - short rationale', () => {
-    renderComponent(
-      generateProposal({
-        id: 'short',
-        rationale: {
-          title: '0x0',
-        },
-        terms: {
-          change: {
-            __typename: 'NewFreeform',
+  it('Renders Freeform network - short rationale', () => {
+    render(
+      renderComponent(
+        generateProposal({
+          id: 'short',
+          rationale: {
+            title: '0x0',
          },
-        },
-      })
+          terms: {
+            change: {
+              __typename: 'NewFreeform',
+            },
+          },
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent('0x0');
    expect(screen.getByTestId('proposal-type')).toHaveTextContent('Freeform');
    expect(
      screen.queryByTestId('proposal-description')
    ).not.toBeInTheDocument();
+    expect(screen.getByTestId('proposal-details')).toHaveTextContent('short');
  });

-  it('Renders Freeform proposal - long rationale (105 chars) - listing', () => {
-    renderComponent(
-      generateProposal({
-        id: 'long',
-        rationale: {
-          title: '0x0',
-          description:
-            'Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean dolor.',
-        },
-        terms: {
-          change: {
-            __typename: 'NewFreeform',
+  it('Renders Freeform proposal - long rationale (105 chars)', () => {
+    render(
+      renderComponent(
+        generateProposal({
+          id: 'long',
+          rationale: {
+            title: '0x0',
+            description:
+              'Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean dolor.',
          },
-        },
-      })
+          terms: {
+            change: {
+              __typename: 'NewFreeform',
+            },
+          },
+        })
+      )
    );
+    // For a rationale over 100 chars, we expect the header to be truncated at
+    // 100 chars with ellipsis and the details-one element to contain the rest.
    expect(screen.getByTestId('proposal-title')).toHaveTextContent('0x0');
    expect(screen.getByTestId('proposal-type')).toHaveTextContent('Freeform');
-    // Rationale in list view is not rendered
-    expect(
-      screen.queryByTestId('proposal-description')
-    ).not.toBeInTheDocument();
-  });
-
-  it('Renders Freeform proposal - long rationale (105 chars) - details', () => {
-    renderComponent(
-      generateProposal({
-        id: 'long',
-        rationale: {
-          title: '0x0',
-          description:
-            'Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean dolor.',
-        },
-        terms: {
-          change: {
-            __typename: 'NewFreeform',
-          },
-        },
-      }),
-      false
-    );
    expect(screen.getByTestId('proposal-description')).toHaveTextContent(
-      /Class aptent/
+      'Class aptent taciti sociosqu ad litora torquent per conubia'
    );
+    expect(screen.getByTestId('proposal-details')).toHaveTextContent('long');
  });

  // Remove once proposals have rationale and re-enable above tests
  it('Renders Freeform proposal - id for title', () => {
-    renderComponent(
-      generateProposal({
-        id: 'freeform id',
-        rationale: {
-          title: 'freeform',
-        },
-        terms: {
-          change: {
-            __typename: 'NewFreeform',
+    render(
+      renderComponent(
+        generateProposal({
+          id: 'freeform id',
+          rationale: {
+            title: 'freeform',
          },
-        },
-      })
+          terms: {
+            change: {
+              __typename: 'NewFreeform',
+            },
+          },
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent('freeform');
    expect(screen.getByTestId('proposal-type')).toHaveTextContent('Freeform');
    expect(
      screen.queryByTestId('proposal-description')
    ).not.toBeInTheDocument();
+    expect(screen.queryByTestId('proposal-details')).toHaveTextContent(
+      'freeform id'
+    );
  });

  it('Renders asset change proposal header', () => {
-    renderComponent(
-      generateProposal({
-        terms: {
-          change: {
-            __typename: 'UpdateAsset',
-            assetId: 'foo',
+    render(
+      renderComponent(
+        generateProposal({
+          terms: {
+            change: {
+              __typename: 'UpdateAsset',
+              assetId: 'foo',
+            },
          },
-        },
-      })
+        })
+      )
    );
    expect(screen.getByTestId('proposal-type')).toHaveTextContent(
      'Update asset'
    );
+    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
+      'Update asset'
+    );
    expect(screen.getByText('foo')).toBeInTheDocument();
  });

  it("Renders unknown proposal if it's a different proposal type", () => {
-    renderComponent(
-      generateProposal({
-        terms: {
-          change: {
-            // @ts-ignore unknown proposal
-            __typename: 'Foo',
+    render(
+      renderComponent(
+        generateProposal({
+          terms: {
+            change: {
+              // @ts-ignore unknown proposal
+              __typename: 'Foo',
+            },
          },
-        },
-      })
+        })
+      )
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'Unknown proposal'
    );
  });
-
-  it('Renders proposal state: Enacted', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_ENACTED,
-        terms: {
-          enactmentDatetime: lastWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Enacted');
-  });
-
-  it('Renders proposal state: Passed', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Passed');
-  });
-
-  it('Renders proposal state: Waiting for node vote', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
-        terms: {
-          enactmentDatetime: nextWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent(
-      'Waiting for node vote'
-    );
-  });
-
-  it('Renders proposal state: Open', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_OPEN,
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(3000, 1000000000000000000),
-          no: generateNoVotes(0),
-        },
-        terms: {
-          closingDatetime: nextWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
-  });
-
-  it('Renders proposal state: Declined - majority not reached', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_DECLINED,
-        terms: {
-          enactmentDatetime: lastWeek.toString(),
-        },
-        votes: {
-          no: generateNoVotes(1, 1000000000000000000),
-          yes: generateYesVotes(1, 1000000000000000000),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Declined');
-  });
-
-  it('Renders proposal state: Rejected', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_REJECTED,
-        terms: {
-          enactmentDatetime: lastWeek.toString(),
-        },
-        rejectionReason:
-          ProposalRejectionReason.PROPOSAL_ERROR_INVALID_FUTURE_PRODUCT,
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Rejected');
-  });
 });
@@ -1,27 +1,23 @@
 import { useTranslation } from 'react-i18next';
-import { Lozenge } from '@vegaprotocol/ui-toolkit';
+import { Intent, Lozenge } from '@vegaprotocol/ui-toolkit';
 import { shorten } from '@vegaprotocol/utils';
 import { Heading, SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import ReactMarkdown from 'react-markdown';
-import { truncateMiddle } from '../../../../lib/truncate-middle';
-import { CurrentProposalState } from '../current-proposal-state';
-import { ProposalInfoLabel } from '../proposal-info-label';

 export const ProposalHeader = ({
  proposal,
-  isListItem = true,
+  useSubHeading = true,
 }: {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  isListItem?: boolean;
+  useSubHeading?: boolean;
 }) => {
  const { t } = useTranslation();
  const change = proposal?.terms.change;

  let details: ReactNode;
-  let proposalType = '';
+  let proposalType: ReactNode;

  let title = proposal?.rationale.title.trim();
  let description = proposal?.rationale.description.trim();
@@ -34,12 +30,10 @@ export const ProposalHeader = ({

  switch (change?.__typename) {
    case 'NewMarket': {
-      proposalType = 'NewMarket';
+      proposalType = t('NewMarket');
      details = (
        <>
-          <span>
-            {t('Code')}: {change.instrument.code}.
-          </span>{' '}
+          {t('Code')}: {change.instrument.code}.{' '}
          {change.instrument.futureProduct?.settlementAsset.symbol ? (
            <>
              <span className="font-semibold">
@@ -55,61 +49,54 @@ export const ProposalHeader = ({
      break;
    }
    case 'UpdateMarket': {
-      proposalType = 'UpdateMarket';
-      details = (
-        <>
-          <span>{t('Market change')}:</span>{' '}
-          <span>{truncateMiddle(change.marketId)}</span>
-        </>
-      );
+      proposalType = t('UpdateMarket');
+      details = `${t('Market change')}: ${change.marketId}`;
      break;
    }
    case 'NewAsset': {
-      proposalType = 'NewAsset';
+      proposalType = t('NewAsset');
      details = (
        <>
-          <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
-          {change.source.__typename === 'ERC20' && (
-            <>
-              <span>{t('ERC20ContractAddress')}:</span>{' '}
-              <Lozenge>{change.source.contractAddress}</Lozenge>
-            </>
-          )}{' '}
-          {change.source.__typename === 'BuiltinAsset' && (
-            <>
-              <span>{t('MaxFaucetAmountMint')}:</span>{' '}
-              <Lozenge>{change.source.maxFaucetAmountMint}</Lozenge>
-            </>
-          )}
+          {t('Symbol')}: {change.symbol}.{' '}
+          <Lozenge>
+            {change.source.__typename === 'ERC20' &&
+              `ERC20 ${change.source.contractAddress}`}
+            {change.source.__typename === 'BuiltinAsset' &&
+              `${t('Max faucet amount mint')}: ${
+                change.source.maxFaucetAmountMint
+              }`}
+          </Lozenge>
        </>
      );
      break;
    }
    case 'UpdateNetworkParameter': {
-      proposalType = 'NetworkParameter';
+      proposalType = t('NetworkParameter');
+      const parametersClasses = 'font-mono leading-none';
      details = (
        <>
-          <span>{t('Change')}:</span>{' '}
-          <Lozenge>{change.networkParameter.key}</Lozenge>{' '}
-          <span>{t('to')}</span>{' '}
-          <span className="whitespace-nowrap">
-            <Lozenge>{change.networkParameter.value}</Lozenge>
+          <span className={`${parametersClasses} mr-2`}>
+            {change.networkParameter.key}
+          </span>{' '}
+          {t('to')}{' '}
+          <span className={`${parametersClasses} ml-2`}>
+            {change.networkParameter.value}
          </span>
        </>
      );
      break;
    }
    case 'NewFreeform': {
-      proposalType = 'Freeform';
-      details = <span />;
+      proposalType = t('Freeform');
+      details = `${t('FreeformProposal')}: ${proposal?.id}`;
      break;
    }
    case 'UpdateAsset': {
-      proposalType = 'UpdateAsset';
+      proposalType = t('UpdateAsset');
      details = (
        <>
-          <span>{t('AssetID')}:</span>{' '}
-          <Lozenge>{truncateMiddle(change.assetId)}</Lozenge>
+          `${t('Update asset')}`;
+          <Lozenge>{change.assetId}</Lozenge>
        </>
      );
      break;
@@ -117,9 +104,9 @@ export const ProposalHeader = ({
  }

  return (
-    <>
+    <div className="text-sm mb-2">
      <div data-testid="proposal-title">
-        {isListItem ? (
+        {useSubHeading ? (
          <header>
            <SubHeading title={titleContent || t('Unknown proposal')} />
          </header>
@@ -129,39 +116,18 @@ export const ProposalHeader = ({
      </div>

      <div className="flex items-center gap-2 mb-4">
-        <div data-testid="proposal-type">
-          <ProposalInfoLabel variant="secondary">
-            {t(`${proposalType}`)}
-          </ProposalInfoLabel>
-        </div>
+        {proposalType && (
+          <div data-testid="proposal-type">
+            <Lozenge variant={Intent.None}>{proposalType}</Lozenge>
+          </div>
+        )}

-        <div data-testid="proposal-status">
-          <CurrentProposalState proposal={proposal} />
-        </div>
+        {description && (
+          <div data-testid="proposal-description">{description}</div>
+        )}
      </div>

-      {details && (
-        <div data-testid="proposal-details" className="break-words my-10">
-          {details}
-        </div>
-      )}
-
-      {description && !isListItem && (
-        <div data-testid="proposal-description">
-          {/*<div className="uppercase mr-2">{t('ProposalDescription')}:</div>*/}
-          <SubHeading title={t('ProposalDescription')} />
-          <ReactMarkdown
-            className="react-markdown-container"
-            /* Prevents HTML embedded in the description from rendering */
-            skipHtml={true}
-            /* Stops users embedding images which could be used for tracking  */
-            disallowedElements={['img']}
-            linkTarget="_blank"
-          >
-            {description}
-          </ReactMarkdown>
-        </div>
-      )}
-    </>
+      {details && <div data-testid="proposal-details">{details}</div>}
+    </div>
  );
 };
@@ -1 +0,0 @@
-export * from './proposal-info-label';
@@ -1,35 +0,0 @@
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-
-export type ProposalInfoLabelVariant =
-  | 'primary'
-  | 'secondary'
-  | 'tertiary'
-  | 'highlight';
-
-const base = 'rounded-md px-2 py-1 font-alpha';
-const primary = 'bg-vega-light-150 text-black';
-const secondary = 'bg-vega-dark-200 text-white';
-const tertiary = 'bg-vega-dark-150 text-white';
-const highlight = 'bg-vega-yellow text-black';
-
-const getClassname = (variant: ProposalInfoLabelVariant) => {
-  return classNames(base, {
-    [primary]: variant === 'primary',
-    [secondary]: variant === 'secondary',
-    [tertiary]: variant === 'tertiary',
-    [highlight]: variant === 'highlight',
-  });
-};
-
-interface ProposalInfoLabelProps {
-  children: ReactNode;
-  variant?: ProposalInfoLabelVariant;
-}
-
-export const ProposalInfoLabel = ({
-  children,
-  variant = 'primary',
-}: ProposalInfoLabelProps) => {
-  return <div className={getClassname(variant)}>{children}</div>;
-};
@@ -1,10 +1,8 @@
 import { useTranslation } from 'react-i18next';
-import { Icon, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
 import type { PartialDeep } from 'type-fest';
 import type * as Schema from '@vegaprotocol/types';
-import { useState } from 'react';
-import classnames from 'classnames';

 export const ProposalTermsJson = ({
  terms,
@@ -12,26 +10,10 @@ export const ProposalTermsJson = ({
  terms: PartialDeep<Schema.ProposalTerms>;
 }) => {
  const { t } = useTranslation();
-  const [showDetails, setShowDetails] = useState(false);
-  const showDetailsIconClasses = classnames('mb-4', {
-    'rotate-180': showDetails,
-  });
-
  return (
    <section>
-      <button
-        onClick={() => setShowDetails(!showDetails)}
-        data-testid="proposal-terms-toggle"
-      >
-        <div className="flex items-center gap-3">
-          <SubHeading title={t('proposalTerms')} />
-          <div className={showDetailsIconClasses}>
-            <Icon name="chevron-down" size={8} />
-          </div>
-        </div>
-      </button>
-
-      {showDetails && <SyntaxHighlighter data={terms} />}
+      <SubHeading title={t('proposalTerms')} />
+      <SyntaxHighlighter data={terms} />
    </section>
  );
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	c923bf7837	fix(oracles): update market-info.cy.ts	2023-05-03 10:28:50 +01:00
Madalina Raicu	633717c0e8	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-05-03 09:48:08 +01:00
Madalina Raicu	4fbea2998b	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-05-03 08:29:27 +01:00
Madalina Raicu	2396c95e35	fix(wallet): set up tests	2023-05-02 23:29:09 +01:00
Madalina Raicu	6d0ca04283	fix(oracles): fix accounts grid dropdown trigger prop remove	2023-05-02 23:24:59 +01:00
Madalina Raicu	a39ff3a788	fix(oracles): update index.ts	2023-05-02 23:12:17 +01:00
Madalina Raicu	6c3772a712	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-05-02 23:11:42 +01:00
Madalina Raicu	54a4b9b694	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-05-02 10:45:34 +03:00
Madalina Raicu	3f05089e63	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-04-28 20:53:13 +03:00
Madalina Raicu	632b5dffb8	feat(oracles): update test and storybook config	2023-04-28 16:08:55 +03:00
Madalina Raicu	6227a2ef8d	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-04-27 18:20:15 +03:00
Madalina Raicu	3400f58907	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-04-27 14:12:04 +03:00
Madalina Raicu	74dab3c338	fix(explorer): market details oracle build	2023-04-26 00:02:37 +03:00
Madalina Raicu	a263384387	fix(oracle): globe icon and key	2023-04-25 23:31:03 +03:00
Madalina Raicu	e10ea0e369	fix(oracles): fix initial layout	2023-04-25 23:26:16 +03:00
Madalina Raicu	4be343e0e5	Merge branch 'feat/data-grid-dropdown' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-04-25 15:09:31 +03:00
Madalina Raicu	d6a57280bd	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/data-grid-dropdown	2023-04-25 15:02:29 +03:00
Madalina Raicu	2b9bfd7707	fix: network switcher text color	2023-04-25 15:02:06 +03:00
Madalina Raicu	1e75c3cdba	Merge branch 'feat/data-grid-dropdown' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-04-25 11:21:21 +03:00
Madalina Raicu	e39ecdd77a	fix(accounts): add grid actions dropdown trigger prop	2023-04-25 11:15:26 +03:00
Madalina Raicu	058ed8a717	fix: add stroke current svgs	2023-04-25 09:40:14 +03:00
Madalina Raicu	50908772fc	Merge branch 'feat/data-grid-dropdown-icons' of github.com:vegaprotocol/frontend-monorepo into feat/data-grid-dropdown	2023-04-25 00:13:57 +03:00
Madalina Raicu	303097acc6	fix: fix gray scale vega	2023-04-25 00:13:38 +03:00
Madalina Raicu	0a81a6b7d1	Merge branch 'feat/data-grid-dropdown-icons' of github.com:vegaprotocol/frontend-monorepo into feat/oracle-basic-profile	2023-04-24 23:43:43 +03:00
Madalina Raicu	a452a4cad3	feat(icons): add icon components	2023-04-24 23:41:04 +03:00
Madalina Raicu	32e87d75a0	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/data-grid-dropdown	2023-04-24 15:33:12 +03:00
Madalina Raicu	8539343f9a	fix(ui-toolkit): storybook build on icons	2023-04-24 14:24:17 +03:00
Madalina Raicu	40e8942011	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/data-grid-dropdown	2023-04-21 21:46:13 +03:00
Madalina Raicu	2a884ac95a	fix(icons): vega icon records	2023-04-21 18:15:33 +03:00
Madalina Raicu	15a7fe8cff	fix(icons): add svg vega icons	2023-04-21 17:54:27 +03:00
Madalina Raicu	b616aee978	fix(trdaing): trading accounts test	2023-04-21 15:28:08 +03:00
Madalina Raicu	9b975157cc	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/data-grid-dropdown	2023-04-20 15:01:37 +03:00
Madalina Raicu	78a88cbb90	fix(trading): trading-accounts.cy.ts accounts actions empty text	2023-04-20 11:42:53 +03:00
Madalina Raicu	d2c3c263a0	fix(trading): trading-accounts.cy.ts accounts actions empty text	2023-04-20 11:18:22 +03:00
Madalina Raicu	b3cce4b9e9	fix(accounts): update test	2023-04-19 21:11:20 +03:00
Madalina Raicu	3a5f03ac55	feat(trading): add data grid dropdown	2023-04-19 18:19:57 +03:00
Madalina Raicu	82c7939c5f	fix(icons): add icons	2023-04-12 23:41:02 +03:00
Madalina Raicu	3dfd3e9470	fix(oracles): oracle basic profile bootstrap	2023-04-12 23:25:31 +03:00