fix: flakely test had welcome dialog blocking trading interface

chore: rename wrapper classes
chore: add newlines to reduce diff
2023-02-15 19:19:45 -08:00 · 2023-02-15 13:26:56 -08:00 · 2023-02-15 13:22:03 -08:00 · 2023-02-15 11:48:50 -08:00 · 2023-02-15 11:48:50 -08:00 · 2023-02-15 11:48:50 -08:00
52 changed files with 276 additions and 1410 deletions
@@ -2761,7 +2761,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "68916.5304132697229014062",
+    "locked_amount": "69391.0872001880742983107",
    "deposits": [
      {
        "amount": "86666.297",
@@ -2827,7 +2827,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "1418.21231430606425",
+    "locked_amount": "1445.66592261904775",
    "deposits": [
      {
        "amount": "2500",
@@ -3215,7 +3215,7 @@
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
    "total_removed": "2836.415649675",
-    "locked_amount": "34028.837668815225",
+    "locked_amount": "34442.91695441989125",
    "deposits": [
      {
        "amount": "7500",
@@ -3326,7 +3326,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "68853.652750677974505795",
+    "locked_amount": "69327.776564239291943985",
    "deposits": [
      {
        "amount": "129999.45",
@@ -3392,7 +3392,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "33829.0153855910767",
+    "locked_amount": "34171.79286529680654",
    "deposits": [
      {
        "amount": "10000",
@@ -3585,7 +3585,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "2893.778855910705",
+    "locked_amount": "2921.1572488584475",
    "deposits": [
      {
        "amount": "5000",
@@ -3796,7 +3796,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "97499.58",
    "total_removed": "0",
-    "locked_amount": "10761.2209634480270840046",
+    "locked_amount": "11226.2922579206452066194",
    "deposits": [
      {
        "amount": "97499.58",
@@ -3829,7 +3829,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "135173.4239508",
    "total_removed": "98230.390980249184455396",
-    "locked_amount": "14708.73120973917718086298914",
+    "locked_amount": "15344.40337807380869704113192",
    "deposits": [
      {
        "amount": "135173.4239508",
@@ -3875,7 +3875,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "32499.86",
    "total_removed": "0",
-    "locked_amount": "4527.0598229766283023892",
+    "locked_amount": "4722.707285209589580316",
    "deposits": [
      {
        "amount": "32499.86",
@@ -3908,7 +3908,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "10833.29",
    "total_removed": "0",
-    "locked_amount": "1473.514042830201860202",
+    "locked_amount": "1537.1953932689953826786",
    "deposits": [
      {
        "amount": "10833.29",
@@ -3941,7 +3941,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "22749.93",
    "total_removed": "4720.860935375",
-    "locked_amount": "5508.324595517016566601",
+    "locked_amount": "5746.3797064299737259078",
    "deposits": [
      {
        "amount": "6500",
@@ -4093,7 +4093,7 @@
    "tranche_end": "2023-05-01T00:00:00.000Z",
    "total_added": "22500",
    "total_removed": "4373.451408",
-    "locked_amount": "8980.8385128913431",
+    "locked_amount": "9229.28608425414375",
    "deposits": [
      {
        "amount": "7500",
@@ -4324,7 +4324,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "928642.9598472029154",
-    "locked_amount": "554053.412289953077578596",
+    "locked_amount": "564675.8365855764677193232",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -7298,15 +7298,10 @@
    "tranche_id": 10,
    "tranche_start": "2021-07-15T23:37:11.000Z",
    "tranche_end": "2021-07-15T23:37:11.000Z",
-    "total_added": "6259302.299000000000000001",
-    "total_removed": "6213483.280000000000000001",
+    "total_added": "6159302.299000000000000001",
+    "total_removed": "6113483.280000000000000001",
    "locked_amount": "0",
    "deposits": [
-      {
-        "amount": "100000",
-        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-        "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-      },
      {
        "amount": "100000",
        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -7829,11 +7824,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "100000",
-        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-        "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-      },
      {
        "amount": "100000",
        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8299,12 +8289,6 @@
      {
        "address": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
        "deposits": [
-          {
-            "amount": "100000",
-            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-            "tranche_id": 10,
-            "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-          },
          {
            "amount": "100000",
            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8487,12 +8471,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "100000",
-            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-            "tranche_id": 10,
-            "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-          },
          {
            "amount": "100000",
            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8668,8 +8646,8 @@
            "tx": "0xac16a4ce688d40a482a59914d68c3a676592f8804ee8f0781b66a4ba5ccfbdfc"
          }
        ],
-        "total_tokens": "3056651",
-        "withdrawn_tokens": "3056651",
+        "total_tokens": "2956651",
+        "withdrawn_tokens": "2956651",
        "remaining_tokens": "0"
      },
      {
@@ -36616,7 +36594,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "592998.0503546212334",
-    "locked_amount": "875888.518509001519437488391",
+    "locked_amount": "892211.486316038327909139488",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -37941,8 +37919,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "570447.40018226362274952",
-    "locked_amount": "8405532.0348557766289364422878397935063531",
+    "total_removed": "565985.90378116129377952",
+    "locked_amount": "8463412.2306648275892962453531986551946473",
    "deposits": [
      {
        "amount": "16249.93",
@@ -38471,16 +38449,6 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x307e498402679f0f8ee11dcd3dfc684db5558203469f07ce58e98a4f87f0fa62"
      },
-      {
-        "amount": "1640.93679110232897",
-        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
-        "tx": "0x4870598253a2a664d9c96af37904f08ac772ee9620b5975560ef7e7fb51c9a7f"
-      },
-      {
-        "amount": "2820.55961",
-        "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
-        "tx": "0x039c7d1eb6b18a13c3fb91589403d43710e12b319e7d40936280a576502f80fe"
-      },
      {
        "amount": "856.08784586478614",
        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -41553,12 +41521,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "1640.93679110232897",
-            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
-            "tranche_id": 2,
-            "tx": "0x4870598253a2a664d9c96af37904f08ac772ee9620b5975560ef7e7fb51c9a7f"
-          },
          {
            "amount": "856.08784586478614",
            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -41789,8 +41751,8 @@
          }
        ],
        "total_tokens": "150551.801",
-        "withdrawn_tokens": "70289.2123238900799",
-        "remaining_tokens": "80262.5886761099201"
+        "withdrawn_tokens": "68648.27553278775093",
+        "remaining_tokens": "81903.52546721224907"
      },
      {
        "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -41992,12 +41954,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "2820.55961",
-            "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
-            "tranche_id": 2,
-            "tx": "0x039c7d1eb6b18a13c3fb91589403d43710e12b319e7d40936280a576502f80fe"
-          },
          {
            "amount": "1412.763584",
            "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
@@ -42198,8 +42154,8 @@
          }
        ],
        "total_tokens": "200000",
-        "withdrawn_tokens": "93634.576066",
-        "remaining_tokens": "106365.423934"
+        "withdrawn_tokens": "90814.016456",
+        "remaining_tokens": "109185.983544"
      },
      {
        "address": "0x1b956E6c00E238194B331eddEFF72Cb5f28A8d01",
@@ -43552,7 +43508,7 @@
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
    "total_removed": "3926967.723059737571037032",
-    "locked_amount": "2038488.278459767293130894768769085",
+    "locked_amount": "2091922.905662142960425555307396306",
    "deposits": [
      {
        "amount": "129284.449",
@@ -50465,7 +50421,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "5778205.3912159303",
    "total_removed": "2749067.463242913023296295",
-    "locked_amount": "488515.643953737443539557205122125",
+    "locked_amount": "509627.9883313308999788596484477",
    "deposits": [
      {
        "amount": "552496.6455",
@@ -52491,8 +52447,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "33803.2676021352685",
-    "locked_amount": "138789.542549975765711077066869624",
+    "total_removed": "33643.6376997992685",
+    "locked_amount": "141376.01010506265186415083105024",
    "deposits": [
      {
        "amount": "3000",
@@ -59176,16 +59132,6 @@
        "user": "0x4F4A140E9B4a8403792970C6b5535ed0AA32c8A4",
        "tx": "0x181a9afe9b3592427f1ee10f205e01f34ae7be383294e8d93e397766092bf6df"
      },
-      {
-        "amount": "18.399238968",
-        "user": "0xD3ec605d078326B0a636ca90d496Ebb5Eb457a27",
-        "tx": "0xa82e451753cbced76b064af62868d3170dff7afca557680e657c27ebba5c7beb"
-      },
-      {
-        "amount": "141.230663368",
-        "user": "0xb7df334217A208B5B35a3824D1CDdBCa85BD352B",
-        "tx": "0x41e9fa9b5003c1d6edf1e9423bd6ae7ce6e4e48fcbce0b47ba17968a67da4d48"
-      },
      {
        "amount": "13.1116203702",
        "user": "0x4cBC0C88d8FE503f62823B42f30a4900292C13bE",
@@ -63801,17 +63747,10 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "141.230663368",
-            "user": "0xb7df334217A208B5B35a3824D1CDdBCa85BD352B",
-            "tranche_id": 5,
-            "tx": "0x41e9fa9b5003c1d6edf1e9423bd6ae7ce6e4e48fcbce0b47ba17968a67da4d48"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "200",
-        "withdrawn_tokens": "141.230663368",
-        "remaining_tokens": "58.769336632"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "200"
      },
      {
        "address": "0x287a34EB03418ad55c2e93d0E4FB1e18DCE607ED",
@@ -67351,12 +67290,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "18.399238968",
-            "user": "0xD3ec605d078326B0a636ca90d496Ebb5Eb457a27",
-            "tranche_id": 5,
-            "tx": "0xa82e451753cbced76b064af62868d3170dff7afca557680e657c27ebba5c7beb"
-          },
          {
            "amount": "262.76406646",
            "user": "0xD3ec605d078326B0a636ca90d496Ebb5Eb457a27",
@@ -67365,8 +67298,8 @@
          }
        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "281.163305428",
-        "remaining_tokens": "118.836694572"
+        "withdrawn_tokens": "262.76406646",
+        "remaining_tokens": "137.23593354"
      },
      {
        "address": "0x7f6aba7563Cb5d31980D440337D3d1A6e3dB58F3",
@@ -63,39 +63,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
            .and('have.text', 'Browse, vote, and propose');
        });
      });
-      it('should show open or enacted proposals with proposal summary', function () {
-        cy.get('body').then(($body) => {
-          if (!$body.find('[data-testid="proposals-list-item"]').length) {
-            cy.createMarket();
-            cy.reload();
-            cy.wait_for_spinner();
-          }
-        });
-        cy.getByTestId('proposals-list-item')
-          .should('have.length.at.least', 1)
-          .first()
-          .within(() => {
-            cy.getByTestId('proposal-title')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-type')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-description')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-details')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('proposal-status')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('vote-details')
-              .invoke('text')
-              .should('not.be.empty');
-            cy.getByTestId('view-proposal-btn').should('be.visible');
-          });
-      });
      it('should have external link for governance', function () {
        cy.getByTestId('home-proposals').within(() => {
          cy.getByTestId('external-link')
@@ -30,11 +30,11 @@ context('Staking Page - verify elements on page', function () {

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
    describe('description section', function () {
-      it('Should have validators tab highlighted', function () {
+      it('Should have staking tab highlighted', function () {
        cy.verify_tab_highlighted('validators');
      });

-      it('Should have validators ON VEGA header visible', function () {
+      it('Should have STAKING ON VEGA header visible', function () {
        cy.verify_page_header('Validators');
      });

@@ -338,8 +338,8 @@ context(
              .contains(currency.id)
              .parent()
              .siblings()
-              .invoke('text')
-              .should('not.be.empty');
+              .within(() => cy.contains_exactly('10.00').should('be.visible'));
+
            cy.get(vegaWalletCurrencyTitle)
              .contains(currency.id)
              .parent()
@@ -18,7 +18,7 @@ export const NavDropDown = ({ navbarTheme }: { navbarTheme: NavbarTheme }) => {
      <AppNavLink
        name={
          <NavDropdownMenuTrigger
-            className="w-auto flex items-center -m-3 p-3 cursor-pointer"
+            className="w-auto flex items-center"
            data-testid="state-trigger"
            onClick={() => setOpen(!isOpen)}
          >
@@ -1,21 +1,13 @@
 import { Link } from 'react-router-dom';
 import { NetworkSwitcher } from '@vegaprotocol/environment';
 import { useEffect, useState } from 'react';
-import { TOP_LEVEL_ROUTES, TOKEN_DROPDOWN_ROUTES } from '../../routes/routes';
+import { TOP_LEVEL_ROUTES } from '../../routes/routes';
 import { useTranslation } from 'react-i18next';
 import logoWhiteText from '../../images/logo-white-text.png';
 import logoBlackText from '../../images/logo-black-text.png';
 import debounce from 'lodash/debounce';
 import { NavDrawer } from './nav-draw';
-import {
-  Nav as ToolkitNav,
-  Navbar,
-  NavigationContent,
-  NavigationItem,
-  NavigationLink,
-  NavigationList,
-  NavigationTrigger,
-} from '@vegaprotocol/ui-toolkit';
+import { Nav as ToolkitNav } from '@vegaprotocol/ui-toolkit';
 import { AppNavLink } from './nav-link';
 import { NavDropDown } from './nav-dropdown';

@@ -49,28 +41,7 @@ export const Nav = ({ navbarTheme = 'inherit' }: NavbarProps) => {

  const { t } = useTranslation();
  const isYellow = navbarTheme === 'yellow';
-  return (
-    <Navbar>
-      <NavigationList>
-        {TOP_LEVEL_ROUTES.map((r) => (
-          <NavigationItem key={r.path}>
-            <NavigationLink path={r.path}>{t(r.name)}</NavigationLink>
-          </NavigationItem>
-        ))}
-        <NavigationItem>
-          <NavigationTrigger>{t('Token')}</NavigationTrigger>
-          <NavigationContent backText={t('Token')}>
-            {TOKEN_DROPDOWN_ROUTES.map((r) => (
-              <NavigationItem>
-                <NavigationLink path={r.path}>{r.name}</NavigationLink>
-              </NavigationItem>
-            ))}
-          </NavigationContent>
-        </NavigationItem>
-      </NavigationList>
-    </Navbar>
-  );
-  /*
+
  return (
    <ToolkitNav
      navbarTheme={navbarTheme}
@@ -107,5 +78,4 @@ export const Nav = ({ navbarTheme = 'inherit' }: NavbarProps) => {
      )}
    </ToolkitNav>
  );
-  */
 };
@@ -35,7 +35,7 @@ export const TOP_LEVEL_ROUTES = [

 export const TOKEN_DROPDOWN_ROUTES = [
  {
-    name: 'Information',
+    name: 'Token',
    path: Routes.TOKEN,
  },
  {
@@ -50,117 +50,101 @@ export const StandbyPendingValidatorsTable = ({
  const nodes = useMemo(() => {
    if (!data) return [];

-    return data
-      .sort((a, b) => {
-        const aVotingPower = new BigNumber(a.rankingScore.votingPower);
-        const bVotingPower = new BigNumber(b.rankingScore.votingPower);
-        return bVotingPower.minus(aVotingPower).toNumber();
-      })
-      .map((node, index) => {
-        const votingPowerRanking = index + 1;
+    return data.map(
+      ({
+        id,
+        name,
+        avatarUrl,
+        stakedByDelegates,
+        stakedByOperator,
+        stakedTotal,
+        rankingScore: { stakeScore },
+        pendingStake,
+      }) => {
+        const { rawValidatorScore, performanceScore } =
+          getLastEpochScoreAndPerformance(previousEpochData, id);
+
+        const overstakedAmount = getOverstakedAmount(
+          rawValidatorScore,
+          stakedTotal,
+          totalStake
+        );
+        let individualStakeNeededForPromotion,
+          individualStakeNeededForPromotionDescription;
+
+        if (stakeNeededForPromotion && performanceScore) {
+          const stakedTotalBigNum = new BigNumber(stakedTotal);
+          const stakeNeededBigNum = new BigNumber(stakeNeededForPromotion);
+          const performanceScoreBigNum = new BigNumber(performanceScore);
+
+          const calc = stakeNeededBigNum
+            .dividedBy(performanceScoreBigNum)
+            .minus(stakedTotalBigNum);
+
+          if (calc.isGreaterThan(0)) {
+            individualStakeNeededForPromotion = calc.toString();
+            individualStakeNeededForPromotionDescription = t(
+              stakeNeededForPromotionDescription,
+              {
+                prefix: formatNumber(calc, 2).toString(),
+              }
+            );
+          } else {
+            individualStakeNeededForPromotion = '0';
+            individualStakeNeededForPromotionDescription = t(
+              stakeNeededForPromotionDescription,
+              {
+                prefix: formatNumber(0, 2).toString(),
+              }
+            );
+          }
+        }

        return {
-          ...node,
-          votingPowerRanking,
-        };
-      })
-      .map(
-        ({
          id,
-          name,
-          avatarUrl,
-          stakedByDelegates,
-          stakedByOperator,
-          stakedTotal,
-          rankingScore: { stakeScore },
-          pendingStake,
-          votingPowerRanking,
-        }) => {
-          const { rawValidatorScore, performanceScore } =
-            getLastEpochScoreAndPerformance(previousEpochData, id);
-
-          const overstakedAmount = getOverstakedAmount(
+          [ValidatorFields.VALIDATOR]: {
+            avatarUrl,
+            name,
+          },
+          [ValidatorFields.STAKE]: formatNumber(
+            toBigNum(stakedTotal, decimals),
+            2
+          ),
+          [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION]:
+            individualStakeNeededForPromotion || null,
+          [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION_DESCRIPTION]:
+            individualStakeNeededForPromotionDescription || t('n/a'),
+          [ValidatorFields.STAKE_SHARE]: stakedTotalPercentage(stakeScore),
+          [ValidatorFields.STAKED_BY_DELEGATES]: formatNumber(
+            toBigNum(stakedByDelegates, decimals),
+            2
+          ),
+          [ValidatorFields.STAKED_BY_OPERATOR]: formatNumber(
+            toBigNum(stakedByOperator, decimals),
+            2
+          ),
+          [ValidatorFields.PERFORMANCE_SCORE]:
+            getFormattedPerformanceScore(performanceScore).toString(),
+          [ValidatorFields.PERFORMANCE_PENALTY]:
+            getPerformancePenalty(performanceScore),
+          [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
+          [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
+            overstakedAmount,
+            totalStake
+          ),
+          [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
            rawValidatorScore,
+            performanceScore,
            stakedTotal,
            totalStake
-          );
-          let individualStakeNeededForPromotion,
-            individualStakeNeededForPromotionDescription;
-
-          if (stakeNeededForPromotion && performanceScore) {
-            const stakedTotalBigNum = new BigNumber(stakedTotal);
-            const stakeNeededBigNum = new BigNumber(stakeNeededForPromotion);
-            const performanceScoreBigNum = new BigNumber(performanceScore);
-
-            const calc = stakeNeededBigNum
-              .dividedBy(performanceScoreBigNum)
-              .minus(stakedTotalBigNum);
-
-            if (calc.isGreaterThan(0)) {
-              individualStakeNeededForPromotion = calc.toString();
-              individualStakeNeededForPromotionDescription = t(
-                stakeNeededForPromotionDescription,
-                {
-                  prefix: formatNumber(calc, 2).toString(),
-                }
-              );
-            } else {
-              individualStakeNeededForPromotion = '0';
-              individualStakeNeededForPromotionDescription = t(
-                stakeNeededForPromotionDescription,
-                {
-                  prefix: formatNumber(0, 2).toString(),
-                }
-              );
-            }
-          }
-
-          return {
-            id,
-            [ValidatorFields.RANKING_INDEX]: votingPowerRanking,
-            [ValidatorFields.VALIDATOR]: {
-              avatarUrl,
-              name,
-            },
-            [ValidatorFields.STAKE]: formatNumber(
-              toBigNum(stakedTotal, decimals),
-              2
-            ),
-            [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION]:
-              individualStakeNeededForPromotion || null,
-            [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION_DESCRIPTION]:
-              individualStakeNeededForPromotionDescription || t('n/a'),
-            [ValidatorFields.STAKE_SHARE]: stakedTotalPercentage(stakeScore),
-            [ValidatorFields.STAKED_BY_DELEGATES]: formatNumber(
-              toBigNum(stakedByDelegates, decimals),
-              2
-            ),
-            [ValidatorFields.STAKED_BY_OPERATOR]: formatNumber(
-              toBigNum(stakedByOperator, decimals),
-              2
-            ),
-            [ValidatorFields.PERFORMANCE_SCORE]:
-              getFormattedPerformanceScore(performanceScore).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]:
-              getPerformancePenalty(performanceScore),
-            [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
-            [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              overstakedAmount,
-              totalStake
-            ),
-            [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              rawValidatorScore,
-              performanceScore,
-              stakedTotal,
-              totalStake
-            ),
-            [ValidatorFields.PENDING_STAKE]: formatNumber(
-              toBigNum(pendingStake, decimals),
-              2
-            ),
-          };
-        }
-      );
+          ),
+          [ValidatorFields.PENDING_STAKE]: formatNumber(
+            toBigNum(pendingStake, decimals),
+            2
+          ),
+        };
+      }
+    );
  }, [
    data,
    decimals,
@@ -174,12 +158,6 @@ export const StandbyPendingValidatorsTable = ({
  const StandbyPendingTable = forwardRef<AgGridReact>((_, gridRef) => {
    const colDefs = useMemo<ColDef[]>(
      () => [
-        {
-          field: ValidatorFields.RANKING_INDEX,
-          headerName: '#',
-          width: 60,
-          pinned: 'left',
-        },
        {
          field: ValidatorFields.VALIDATOR,
          headerName: t(ValidatorFields.VALIDATOR).toString(),
@@ -59,17 +59,11 @@ export const getOverstakedAmount = (
 export const getOverstakingPenalty = (
  overstakedAmount: BigNumber,
  stakedOnNode: string
-) => {
-  // avoid division by zero
-  if (new BigNumber(stakedOnNode).isZero() || overstakedAmount.isZero()) {
-    return '0';
-  }
-
-  return formatNumberPercentage(
+) =>
+  formatNumberPercentage(
    overstakedAmount.dividedBy(new BigNumber(stakedOnNode)).times(100),
    2
  );
-};

 export const getTotalPenalties = (
  rawValidatorScore: string | null | undefined,
@@ -3,8 +3,6 @@ import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsQuery } from '@vegaprotocol/mock';
 import { getDateTimeFormat } from '@vegaprotocol/react-helpers';

-const dialogCloseBtn = 'dialog-close';
-
 describe('markets table', { tags: '@smoke' }, () => {
  beforeEach(() => {
    cy.clearLocalStorage().then(() => {
@@ -149,7 +147,7 @@ describe('markets table', { tags: '@smoke' }, () => {
    });
    cy.visit('#/markets/market-0');
    cy.url().should('contain', 'market-0');
-    cy.getByTestId(dialogCloseBtn).click();
+    cy.getByTestId('dialog-close').click();
    cy.getByTestId('item-value').contains('Opening auction').realHover();
    cy.getByTestId('opening-auction-sub-status').should(
      'contain.text',
@@ -173,8 +171,7 @@ describe('markets table', { tags: '@smoke' }, () => {
 });

 function openMarketDropDown() {
-  cy.getByTestId(dialogCloseBtn).should('be.visible');
-  cy.getByTestId(dialogCloseBtn).click();
+  cy.getByTestId('dialog-close').click();
  cy.getByTestId('popover-trigger').click();
  cy.contains('Loading market data...').should('not.exist');
 }
@@ -23,7 +23,6 @@ describe('Desktop view', { tags: '@smoke' }, () => {
            cy.wrap(element)
              .get('span.absolute.md\\:h-1.w-full')
              .should('exist');
-            cy.contains('No market').should('not.exist');
            cy.location('hash').should('equal', hashes[index]);
          });
      });
@@ -69,7 +68,6 @@ describe('Mobile view', { tags: '@smoke' }, () => {
      cy.getByTestId('button-menu-drawer').click();
      cy.getByTestId('menu-drawer').within((el) => {
        cy.wrap(el).getByTestId('Trading').click();
-        cy.contains('No market').should('not.exist');
        cy.location('hash').should('equal', '#/markets/market-1');
      });
    });
@@ -96,15 +96,7 @@ export const MarketPage = () => {

  const tradeView = useMemo(() => {
    if (w > 960) {
-      return (
-        <TradeGrid
-          market={data}
-          onSelect={onSelect}
-          pinnedAsset={
-            data?.tradableInstrument.instrument.product.settlementAsset
-          }
-        />
-      );
+      return <TradeGrid market={data} onSelect={onSelect} />;
    }
    return (
      <TradePanels
@@ -28,7 +28,6 @@ import { NO_MARKET } from './constants';
 import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
-import type { PinnedAsset } from '@vegaprotocol/accounts';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -66,17 +65,14 @@ type TradingView = keyof typeof TradingViews;
 interface TradeGridProps {
  market: Market | null;
  onSelect: (marketId: string) => void;
-  pinnedAsset?: PinnedAsset;
 }

 const MainGrid = ({
  marketId,
  onSelect,
-  pinnedAsset,
 }: {
  marketId: string;
  onSelect?: (marketId: string) => void;
-  pinnedAsset?: PinnedAsset;
 }) => {
  const navigate = useNavigate();
  const onMarketClick = (marketId: string) => {
@@ -179,7 +175,7 @@ const MainGrid = ({
            </Tab>
            <Tab id="accounts" name={t('Collateral')}>
              <VegaWalletContainer>
-                <TradingViews.Collateral pinnedAsset={pinnedAsset} />
+                <TradingViews.Collateral />
              </VegaWalletContainer>
            </Tab>
          </Tabs>
@@ -190,19 +186,11 @@ const MainGrid = ({
 };
 const MainGridWrapped = memo(MainGrid);

-export const TradeGrid = ({
-  market,
-  onSelect,
-  pinnedAsset,
-}: TradeGridProps) => {
+export const TradeGrid = ({ market, onSelect }: TradeGridProps) => {
  return (
    <div className="h-full grid grid-rows-[min-content_1fr]">
      <TradeMarketHeader market={market} onSelect={onSelect} />
-      <MainGridWrapped
-        marketId={market?.id || ''}
-        onSelect={onSelect}
-        pinnedAsset={pinnedAsset}
-      />
+      <MainGridWrapped marketId={market?.id || ''} onSelect={onSelect} />
    </div>
  );
 };
@@ -226,14 +214,12 @@ interface TradePanelsProps {
  onSelect: (marketId: string) => void;
  onMarketClick?: (marketId: string) => void;
  onClickCollateral: () => void;
-  pinnedAsset?: PinnedAsset;
 }

 export const TradePanels = ({
  market,
  onSelect,
  onClickCollateral,
-  pinnedAsset,
 }: TradePanelsProps) => {
  const [view, setView] = useState<TradingView>('Candles');
  const renderView = () => {
@@ -242,7 +228,6 @@ export const TradePanels = ({
      onSelect: (marketId: string) => void;
      onMarketClick?: (marketId: string) => void;
      onClickCollateral: () => void;
-      pinnedAsset?: PinnedAsset;
    }>(TradingViews[view]);

    if (!Component) {
@@ -256,7 +241,6 @@ export const TradePanels = ({
        marketId={market?.id}
        onSelect={onSelect}
        onClickCollateral={onClickCollateral}
-        pinnedAsset={pinnedAsset}
      />
    );
  };
@@ -6,7 +6,7 @@ import { useVegaWallet } from '@vegaprotocol/wallet';

 export const DepositsContainer = () => {
  const { pubKey, isReadOnly } = useVegaWallet();
-  const { data, loading, error, reload } = useDataProvider({
+  const { data, loading, error } = useDataProvider({
    dataProvider: depositsProvider,
    variables: { partyId: pubKey || '' },
    skip: !pubKey,
@@ -27,7 +27,6 @@ export const DepositsContainer = () => {
            error={error}
            noDataCondition={(data) => !(data && data.length)}
            noDataMessage={t('No deposits')}
-            reload={reload}
          />
        </div>
      </div>
@@ -10,7 +10,7 @@ import { VegaWalletContainer } from '../../components/vega-wallet-container';

 export const WithdrawalsContainer = () => {
  const { pubKey, isReadOnly } = useVegaWallet();
-  const { data, loading, error, reload } = useDataProvider({
+  const { data, loading, error } = useDataProvider({
    dataProvider: withdrawalProvider,
    variables: { partyId: pubKey || '' },
    skip: !pubKey,
@@ -33,7 +33,6 @@ export const WithdrawalsContainer = () => {
              error={error}
              noDataCondition={(data) => !(data && data.length)}
              noDataMessage={t('No withdrawals')}
-              reload={reload}
            />
          </div>
        </div>
@@ -5,15 +5,10 @@ import { useWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { AccountManager, useTransferDialog } from '@vegaprotocol/accounts';
 import { useDepositDialog } from '@vegaprotocol/deposits';

-export const AccountsContainer = ({
-  pinnedAsset,
-}: {
-  pinnedAsset?: PinnedAsset;
-}) => {
+export const AccountsContainer = () => {
  const { pubKey, isReadOnly } = useVegaWallet();
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
  const openWithdrawalDialog = useWithdrawalDialog((store) => store.open);
@@ -44,7 +39,6 @@ export const AccountsContainer = ({
          onClickWithdraw={openWithdrawalDialog}
          onClickDeposit={openDepositDialog}
          isReadOnly={isReadOnly}
-          pinnedAsset={pinnedAsset}
        />
      </div>
      {!isReadOnly && (
@@ -1 +1 @@
-export * from './navbar2';
+export * from './navbar';
@@ -185,7 +185,7 @@ interface AppNavLinkProps {
  onClick?: () => void;
 }

-export const AppNavLink = ({
+const AppNavLink = ({
  name,
  path,
  navbarTheme,
@@ -1,295 +0,0 @@
-import { NavLink } from 'react-router-dom';
-import { Vega } from '../icons/vega';
-import { create } from 'zustand';
-import * as NavigationMenu from '@radix-ui/react-navigation-menu';
-import type { ReactNode } from 'react';
-import * as Dialog from '@radix-ui/react-dialog';
-import { Icon, ThemeSwitcher } from '@vegaprotocol/ui-toolkit';
-import { NetworkSwitcher } from '@vegaprotocol/environment';
-import classNames from 'classnames';
-import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
-import { animated, useTransition, useSpring, config } from 'react-spring';
-
-const BREAKPOINT = 760;
-const useNav = create<{
-  drawerOpen: boolean;
-  value: string;
-  update: (state: Partial<{ drawerOpen: boolean; value: string }>) => void;
-}>((set) => ({
-  drawerOpen: false,
-  value: '',
-  update: (state) => set(state),
-}));
-
-export const Navbar = ({ children }: { children: ReactNode }) => {
-  return (
-    <div className="px-4 border-b border-vega-light-200 dark:border-vega-dark-200">
-      <div className="flex items-center gap-2">
-        <div className="py-3 mr-4">
-          <Vega />
-        </div>
-        {window.innerWidth > BREAKPOINT ? (
-          <Menu>{children}</Menu>
-        ) : (
-          <Drawer>{children}</Drawer>
-        )}
-      </div>
-    </div>
-  );
-};
-
-const Menu = ({ children }: { children: ReactNode }) => {
-  const { value, update } = useNav();
-  return (
-    <>
-      <div className="mr-4">
-        <NetworkSwitcher />
-      </div>
-      <NavigationMenu.Root
-        value={value}
-        onValueChange={(value) => update({ value })}
-        className="relative self-end"
-      >
-        {children}
-      </NavigationMenu.Root>
-      <div className="flex items-center gap-2 ml-auto">
-        <VegaWalletConnectButton />
-        <ThemeSwitcher />
-      </div>
-    </>
-  );
-};
-
-const Drawer = ({ children }: { children: ReactNode }) => {
-  const { drawerOpen, value, update } = useNav();
-  const transition = useTransition(drawerOpen, {
-    from: { opacity: 0, transform: 'translateX(100%)' },
-    enter: { opacity: 1, transform: 'translateX(0%)' },
-    leave: { opacity: 0, transform: 'translateX(100%)' },
-    config: {
-      ...config.default,
-      duration: 200,
-    },
-  });
-
-  return (
-    <>
-      <div className="ml-auto">
-        <MenuButton open={false} onClick={() => update({ drawerOpen: true })} />
-      </div>
-      <Dialog.Root
-        open={drawerOpen}
-        onOpenChange={(open) => update({ drawerOpen: open })}
-      >
-        <Dialog.Portal forceMount={true}>
-          {transition((styles, isOpen) => {
-            return isOpen ? (
-              <>
-                <Dialog.Overlay
-                  forceMount={true}
-                  asChild={true}
-                  className="fixed inset-0 bg-black/50"
-                >
-                  <animated.div style={{ opacity: styles.opacity }} />
-                </Dialog.Overlay>
-                <Dialog.Content
-                  forceMount={true}
-                  asChild={true}
-                  className="absolute top-0 right-0 py-4 px-6 w-10/12 border-l border-vega-dark-200 h-screen bg-white dark:bg-black text-black dark:text-white"
-                >
-                  <animated.div style={{ transform: styles.transform }}>
-                    <div className="absolute top-3 right-3">
-                      <MenuButton
-                        open={true}
-                        onClick={() => update({ drawerOpen: false })}
-                      />
-                    </div>
-                    <div className="pt-10">
-                      <div className="pb-6 mb-6 border-b border-vega-dark-200">
-                        <NetworkSwitcher />
-                      </div>
-                      <NavigationMenu.Root
-                        value={value}
-                        onValueChange={(value) => update({ value })}
-                      >
-                        {children}
-                        <NavigationMenu.Viewport className="absolute w-full h-full top-0 left-0 bg-black" />
-                      </NavigationMenu.Root>
-                      <div className="pt-6 mt-6 border-t border-vega-dark-200">
-                        <ThemeSwitcher />
-                      </div>
-                    </div>
-                  </animated.div>
-                </Dialog.Content>
-              </>
-            ) : null;
-          })}
-        </Dialog.Portal>
-      </Dialog.Root>
-    </>
-  );
-};
-
-export const NavigationList = ({ children }: { children: ReactNode }) => {
-  return (
-    <NavigationMenu.List className="flex flex-col md:flex-row gap-2">
-      {children}
-    </NavigationMenu.List>
-  );
-};
-
-export const NavigationItem = ({ children }: { children: ReactNode }) => {
-  return (
-    <NavigationMenu.Item className="relative mb-4 md:mb-0 last:mb-0 md:mr-4 last:mr-0 whitespace-nowrap">
-      {children}
-    </NavigationMenu.Item>
-  );
-};
-
-export const NavigationLink = ({
-  children,
-  path,
-}: {
-  children: ReactNode;
-  path: string;
-}) => {
-  const update = useNav((store) => store.update);
-  const borderClasses = classNames(
-    'absolute h-[2px] w-full bottom-[-1px] left-0',
-    'bg-black dark:bg-vega-yellow'
-  );
-
-  return (
-    <NavigationMenu.Link
-      asChild={true}
-      onClick={() => update({ drawerOpen: false, value: '' })}
-    >
-      <NavLink to={path} className="inline-block md:pt-2 text-lg">
-        {({ isActive }) => {
-          const linkTextClasses = classNames('hover:text-white', {
-            'text-white': isActive,
-            'text-vega-dark-300': !isActive,
-          });
-          return (
-            <span className="block relative pb-1 md:pb-2">
-              <span className={linkTextClasses}>{children}</span>
-              {isActive && <span className={borderClasses} />}
-            </span>
-          );
-        }}
-      </NavLink>
-    </NavigationMenu.Link>
-  );
-};
-
-export const NavigationTrigger = ({ children }: { children: ReactNode }) => {
-  // eslint-disable-next-line
-  const preventHover = (event: any) => {
-    const e = event as Event;
-    if (window.innerWidth < BREAKPOINT) e.preventDefault();
-  };
-  return (
-    <NavigationMenu.Trigger
-      onPointerMove={preventHover}
-      onPointerLeave={preventHover}
-      onPointerEnter={preventHover}
-      className="w-full flex items-center justify-between text-vega-dark-300 hover:text-white text-lg md:py-2"
-    >
-      {children}
-      <span className="md:rotate-90 md:ml-3">
-        <Icon name="arrow-right" size={3} />
-      </span>
-    </NavigationMenu.Trigger>
-  );
-};
-
-export const NavigationContent = ({
-  children,
-  backText,
-}: {
-  children: ReactNode;
-  backText: string;
-}) => {
-  return (
-    <NavigationMenu.Content>
-      <NavigationContentWrapper backText={backText}>
-        {children}
-      </NavigationContentWrapper>
-    </NavigationMenu.Content>
-  );
-};
-
-const NavigationContentWrapper = ({
-  backText,
-  children,
-}: {
-  backText: string;
-  children: ReactNode;
-}) => {
-  const drawerConfig = {
-    from: { transform: 'translateX(100%)' },
-    to: { transform: 'translateX(0%)' },
-    config: {
-      ...config,
-      duration: 200,
-    },
-  };
-  const menuConfig = {
-    from: { opacity: 0, transform: 'translateY(40px)' },
-    to: { opacity: 1, transform: 'translateY(0)' },
-    config: {
-      ...config,
-      duration: 100,
-    },
-  };
-  const styles = useSpring(
-    window.innerWidth > BREAKPOINT ? menuConfig : drawerConfig
-  );
-
-  return (
-    <animated.div
-      style={styles}
-      className="pt-20 md:py-2 px-4 z-30 md:absolute md:mt-3 md:border border-vega-dark-200 bg-black dark:md:bg-vega-dark-100 md:rounded-xl"
-    >
-      <div className="flex items-center md:hidden mb-6 text-vega-dark-300 hover:text-white">
-        <Icon name="arrow-left" size={3} />
-        <span className="ml-2">{backText}</span>
-      </div>
-      <ul className="md:min-w-[250px]">{children}</ul>
-    </animated.div>
-  );
-};
-
-const MenuButton = ({
-  open,
-  onClick,
-}: {
-  open: boolean;
-  onClick: () => void;
-}) => (
-  <button
-    className={classNames(
-      'flex flex-col justify-around gap-3 p-2 relative z-30 h-[34px]',
-      {
-        'z-50': open,
-      }
-    )}
-    onClick={onClick}
-    data-testid="button-menu-drawer"
-  >
-    <div
-      className={classNames('w-[26px] h-[2px] transition-all', {
-        'translate-y-0 rotate-0 bg-white': !open,
-        // 'bg-black': !drawerOpen && navbarTheme === 'yellow',
-        'translate-y-[7.5px] rotate-45 bg-black dark:bg-white': open,
-      })}
-    />
-    <div
-      className={classNames('w-[26px] h-[2px] transition-all', {
-        'translate-y-0 rotate-0 bg-white': !open,
-        // 'bg-black': !drawerOpen && navbarTheme === 'yellow',
-        '-translate-y-[7.5px] -rotate-45 bg-black dark:bg-white': open,
-      })}
-    />
-  </button>
-);
@@ -1,13 +1,6 @@
 import Head from 'next/head';
 import type { AppProps } from 'next/app';
-import {
-  Navbar,
-  NavigationContent,
-  NavigationItem,
-  NavigationLink,
-  NavigationList,
-  NavigationTrigger,
-} from '../components/navbar';
+import { Navbar } from '../components/navbar';
 import { t } from '@vegaprotocol/react-helpers';
 import {
  useEagerConnect as useVegaEagerConnect,
@@ -35,19 +28,12 @@ import { Footer } from '../components/footer';
 import { useMemo, useState } from 'react';
 import DialogsContainer from './dialogs-container';
 import ToastsManager from './toasts-manager';
-import {
-  HashRouter,
-  Link,
-  NavLink,
-  useLocation,
-  useSearchParams,
-} from 'react-router-dom';
+import { HashRouter, useLocation, useSearchParams } from 'react-router-dom';
 import { Connectors } from '../lib/vega-connectors';
 import { ViewingBanner } from '../components/viewing-banner';
 import { Banner } from '../components/banner';
 import classNames from 'classnames';
 import { AppLoader } from '../components/app-loader';
-import { Links, Routes } from './client-router';

 const DEFAULT_TITLE = t('Welcome to Vega trading!');

@@ -82,12 +68,6 @@ const TransactionsHandler = () => {
 };

 function AppBody({ Component }: AppProps) {
-  const { marketId } = useGlobalStore((store) => ({
-    marketId: store.marketId,
-  }));
-  const tradingPath = marketId
-    ? Links[Routes.MARKET](marketId)
-    : Links[Routes.MARKET]();
  const location = useLocation();
  const { VEGA_ENV } = useEnvironment();

@@ -104,66 +84,10 @@ function AppBody({ Component }: AppProps) {
      </Head>
      <Title />
      <div className={gridClasses}>
-        <Banner />
        <Navbar
-        // navbarTheme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'}
-        >
-          <NavigationList>
-            <NavigationItem>
-              <NavigationLink path={Links[Routes.MARKETS]()}>
-                Markets
-              </NavigationLink>
-            </NavigationItem>
-
-            <NavigationItem>
-              <NavigationLink path={tradingPath}>Trading</NavigationLink>
-            </NavigationItem>
-
-            <NavigationItem>
-              <NavigationLink path={Links[Routes.PORTFOLIO]()}>
-                Portfolio
-              </NavigationLink>
-            </NavigationItem>
-
-            <NavigationItem>
-              <NavigationTrigger>Dropdown</NavigationTrigger>
-              <NavigationContent backText="Token">
-                <NavigationItem>
-                  <NavigationLink path={tradingPath}>Trading</NavigationLink>
-                </NavigationItem>
-
-                <NavigationItem>
-                  <NavigationLink path={Links[Routes.PORTFOLIO]()}>
-                    Portfolio
-                  </NavigationLink>
-                </NavigationItem>
-
-                <NavigationItem>
-                  <NavigationLink path="https://google.com">
-                    Redeem Vested Tokens
-                  </NavigationLink>
-                </NavigationItem>
-              </NavigationContent>
-            </NavigationItem>
-
-            <NavigationItem>
-              <NavigationTrigger>Another</NavigationTrigger>
-              <NavigationContent backText="Another">
-                <NavigationItem>
-                  <NavigationLink path="https://google.com">Foo</NavigationLink>
-                </NavigationItem>
-
-                <NavigationItem>
-                  <NavigationLink path="https://google.com">Bar</NavigationLink>
-                </NavigationItem>
-
-                <NavigationItem>
-                  <NavigationLink path="https://google.com">Quz</NavigationLink>
-                </NavigationItem>
-              </NavigationContent>
-            </NavigationItem>
-          </NavigationList>
-        </Navbar>
+          navbarTheme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'}
+        />
+        <Banner />
        <ViewingBanner />
        <main data-testid={location.pathname}>
          <Component />
@@ -4,7 +4,6 @@ import type { AgGridReact } from 'ag-grid-react';
 import { useRef, useMemo, memo } from 'react';
 import type { AccountFields } from './accounts-data-provider';
 import { aggregatedAccountsDataProvider } from './accounts-data-provider';
-import type { PinnedAsset } from './accounts-table';
 import { AccountTable } from './accounts-table';

 interface AccountManagerProps {
@@ -13,7 +12,6 @@ interface AccountManagerProps {
  onClickWithdraw?: (assetId?: string) => void;
  onClickDeposit?: (assetId?: string) => void;
  isReadOnly: boolean;
-  pinnedAsset?: PinnedAsset;
 }

 export const AccountManager = ({
@@ -22,15 +20,11 @@ export const AccountManager = ({
  onClickDeposit,
  partyId,
  isReadOnly,
-  pinnedAsset,
 }: AccountManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const variables = useMemo(() => ({ partyId }), [partyId]);

-  const { data, loading, error, reload } = useDataProvider<
-    AccountFields[],
-    never
-  >({
+  const { data, loading, error } = useDataProvider<AccountFields[], never>({
    dataProvider: aggregatedAccountsDataProvider,
    variables,
  });
@@ -38,13 +32,12 @@ export const AccountManager = ({
    <div className="relative h-full">
      <AccountTable
        ref={gridRef}
-        rowData={error ? [] : data}
+        rowData={data}
        onClickAsset={onClickAsset}
        onClickDeposit={onClickDeposit}
        onClickWithdraw={onClickWithdraw}
        isReadOnly={isReadOnly}
        noRowsOverlayComponent={() => null}
-        pinnedAsset={pinnedAsset}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -52,8 +45,7 @@ export const AccountManager = ({
          noDataCondition={(data) => !(data && data.length)}
          error={error}
          loading={loading}
-          noDataMessage={pinnedAsset ? ' ' : t('No accounts')}
-          reload={reload}
+          noDataMessage={t('No accounts')}
        />
      </div>
    </div>
@@ -72,74 +72,52 @@ describe('AccountsTable', () => {
    cells.forEach((cell, i) => {
      expect(cell).toHaveTextContent(expectedValues[i]);
    });
-    const rows = await screen.findAllByRole('row');
-    expect(rows.length).toBe(6);
  });
+});

-  it('should add first asset as pinned', async () => {
-    await act(async () => {
-      render(
-        <AccountTable
-          rowData={singleRowData}
-          onClickAsset={() => null}
-          isReadOnly={false}
-          pinnedAsset={{
+it('should get correct account data', () => {
+  const result = getAccountData([singleRow]);
+  const expected = [
+    {
+      asset: {
+        __typename: 'Asset',
+        decimals: 5,
+        id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+        symbol: 'tBTC',
+      },
+      available: '0',
+      balance: '0',
+      breakdown: [
+        {
+          __typename: 'AccountBalance',
+          asset: {
+            __typename: 'Asset',
            decimals: 5,
            id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
            symbol: 'tBTC',
-            name: 'tBTC',
-          }}
-        />
-      );
-    });
-    const rows = await screen.findAllByRole('row');
-    expect(rows.length).toBe(9);
-  });
-
-  it('should get correct account data', () => {
-    const result = getAccountData([singleRow]);
-    const expected = [
-      {
-        asset: {
-          __typename: 'Asset',
-          decimals: 5,
-          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-          symbol: 'tBTC',
-        },
-        available: '0',
-        balance: '0',
-        breakdown: [
-          {
-            __typename: 'AccountBalance',
-            asset: {
-              __typename: 'Asset',
-              decimals: 5,
-              id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-              symbol: 'tBTC',
-            },
-            available: '0',
-            balance: '125600000',
-            deposited: '125600000',
-            market: {
-              __typename: 'Market',
-              id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
-              tradableInstrument: {
-                __typename: 'TradableInstrument',
-                instrument: {
-                  __typename: 'Instrument',
-                  name: 'BTCUSD Monthly (30 Jun 2022)',
-                },
+          },
+          available: '0',
+          balance: '125600000',
+          deposited: '125600000',
+          market: {
+            __typename: 'Market',
+            id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
+            tradableInstrument: {
+              __typename: 'TradableInstrument',
+              instrument: {
+                __typename: 'Instrument',
+                name: 'BTCUSD Monthly (30 Jun 2022)',
              },
            },
-            type: 'ACCOUNT_TYPE_MARGIN',
-            used: '125600000',
          },
-        ],
-        deposited: '125600000',
-        type: 'ACCOUNT_TYPE_GENERAL',
-        used: '125600000',
-      },
-    ];
-    expect(result).toEqual(expected);
-  });
+          type: 'ACCOUNT_TYPE_MARGIN',
+          used: '125600000',
+        },
+      ],
+      deposited: '125600000',
+      type: 'ACCOUNT_TYPE_GENERAL',
+      used: '125600000',
+    },
+  ];
+  expect(result).toEqual(expected);
 });
@@ -1,4 +1,4 @@
-import { forwardRef, useMemo, useState } from 'react';
+import { forwardRef, useState } from 'react';
 import {
  addDecimalsFormatNumber,
  isNumeric,
@@ -14,8 +14,6 @@ import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
 import BreakdownTable from './breakdown-table';
 import type { AccountFields } from './accounts-data-provider';
-import type { Asset } from '@vegaprotocol/types';
-import BigNumber from 'bignumber.js';

 export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
  successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void;
@@ -25,8 +23,6 @@ export interface Datasource extends IDatasource {
  getRows(params: GetRowsParams): void;
 }

-export type PinnedAsset = Pick<Asset, 'symbol' | 'name' | 'id' | 'decimals'>;
-
 export interface AccountTableProps extends AgGridReactProps {
  rowData?: AccountFields[] | null;
  datasource?: Datasource;
@@ -34,33 +30,12 @@ export interface AccountTableProps extends AgGridReactProps {
  onClickWithdraw?: (assetId: string) => void;
  onClickDeposit?: (assetId: string) => void;
  isReadOnly: boolean;
-  pinnedAsset?: PinnedAsset;
 }

 export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
  ({ onClickAsset, onClickWithdraw, onClickDeposit, ...props }, ref) => {
    const [openBreakdown, setOpenBreakdown] = useState(false);
    const [breakdown, setBreakdown] = useState<AccountFields[] | null>(null);
-    const pinnedAssetId = props.pinnedAsset?.id;
-
-    const pinnedAssetRow = useMemo(() => {
-      const currentPinnedAssetRow = props.rowData?.find(
-        (row) => row.asset.id === pinnedAssetId
-      );
-      if (!currentPinnedAssetRow) {
-        if (props.pinnedAsset) {
-          return {
-            asset: props.pinnedAsset,
-            available: '0',
-            used: '0',
-            deposited: '0',
-            balance: '0',
-          };
-        }
-      }
-      return currentPinnedAssetRow;
-    }, [pinnedAssetId, props.pinnedAsset, props.rowData]);
-
    return (
      <>
        <AgGrid
@@ -76,7 +51,6 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
            sortable: true,
          }}
          {...props}
-          pinnedTopRowData={pinnedAssetRow ? [pinnedAssetRow] : undefined}
        >
          <AgGridColumn
            headerName={t('Asset')}
@@ -164,55 +138,37 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
              cellRenderer={({
                data,
              }: VegaICellRendererParams<AccountFields>) => {
-                if (!data) return null;
-                else {
-                  if (
-                    data.asset.id === pinnedAssetId &&
-                    new BigNumber(data.deposited).isLessThanOrEqualTo(0)
-                  ) {
-                    return (
-                      <ButtonLink
-                        data-testid="deposit"
-                        onClick={() => {
-                          onClickDeposit && onClickDeposit(data.asset.id);
-                        }}
-                      >
-                        {t('Deposit to trade')}
-                      </ButtonLink>
-                    );
-                  }
-                  return (
-                    <>
-                      <ButtonLink
-                        data-testid="breakdown"
-                        onClick={() => {
-                          setOpenBreakdown(!openBreakdown);
-                          setBreakdown(data.breakdown || null);
-                        }}
-                      >
-                        {t('Breakdown')}
-                      </ButtonLink>
-                      <span className="mx-1" />
-                      <ButtonLink
-                        data-testid="deposit"
-                        onClick={() => {
-                          onClickDeposit && onClickDeposit(data.asset.id);
-                        }}
-                      >
-                        {t('Deposit')}
-                      </ButtonLink>
-                      <span className="mx-1" />
-                      <ButtonLink
-                        data-testid="withdraw"
-                        onClick={() =>
-                          onClickWithdraw && onClickWithdraw(data.asset.id)
-                        }
-                      >
-                        {t('Withdraw')}
-                      </ButtonLink>
-                    </>
-                  );
-                }
+                return data ? (
+                  <>
+                    <ButtonLink
+                      data-testid="breakdown"
+                      onClick={() => {
+                        setOpenBreakdown(!openBreakdown);
+                        setBreakdown(data.breakdown || null);
+                      }}
+                    >
+                      {t('Breakdown')}
+                    </ButtonLink>
+                    <span className="mx-1" />
+                    <ButtonLink
+                      data-testid="deposit"
+                      onClick={() => {
+                        onClickDeposit && onClickDeposit(data.asset.id);
+                      }}
+                    >
+                      {t('Deposit')}
+                    </ButtonLink>
+                    <span className="mx-1" />
+                    <ButtonLink
+                      data-testid="withdraw"
+                      onClick={() =>
+                        onClickWithdraw && onClickWithdraw(data.asset.id)
+                      }
+                    >
+                      {t('Withdraw')}
+                    </ButtonLink>
+                  </>
+                ) : null;
              }}
            />
          )}
@@ -25,7 +25,6 @@ export const DealTicketContainer = ({
    data: marketData,
    error: marketDataError,
    loading: marketDataLoading,
-    reload,
  } = useThrottledDataProvider(
    {
      dataProvider: marketDataProvider,
@@ -40,7 +39,6 @@ export const DealTicketContainer = ({
      data={market && marketData}
      loading={marketLoading || marketDataLoading}
      error={marketError || marketDataError}
-      reload={reload}
    >
      {market && marketData ? (
        <DealTicket
@@ -8,10 +8,10 @@ export const useNodeHealth = () => {
  const url = useEnvironment((store) => store.VEGA_URL);
  const headerStore = useHeaderStore();
  const headers = url ? headerStore[url] : undefined;
-  const { data, error, loading, startPolling, stopPolling } =
-    useStatisticsQuery({
-      fetchPolicy: 'no-cache',
-    });
+  const { data, error, loading, stopPolling } = useStatisticsQuery({
+    pollInterval: 1000,
+    fetchPolicy: 'no-cache',
+  });

  const blockDiff = useMemo(() => {
    if (!data?.statistics.blockHeight) {
@@ -28,13 +28,8 @@ export const useNodeHealth = () => {
  useEffect(() => {
    if (error) {
      stopPolling();
-      return;
    }
-
-    if (!('Cypress' in window)) {
-      startPolling(1000);
-    }
-  }, [error, startPolling, stopPolling]);
+  }, [error, stopPolling]);

  return {
    error,
@@ -19,7 +19,7 @@ export const FillsManager = ({
 }: FillsManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const scrolledToTop = useRef(true);
-  const { data, error, loading, addNewRows, getRows, reload } = useFillsList({
+  const { data, error, loading, addNewRows, getRows } = useFillsList({
    partyId,
    marketId,
    gridRef,
@@ -55,7 +55,6 @@ export const FillsManager = ({
          data={data}
          noDataMessage={t('No fills')}
          noDataCondition={(data) => !(data && data.length)}
-          reload={reload}
        />
      </div>
    </div>
@@ -78,7 +78,7 @@ export const useFillsList = ({

  const variables = useMemo(() => ({ partyId, marketId }), [partyId, marketId]);

-  const { data, error, loading, load, totalCount, reload } = useDataProvider<
+  const { data, error, loading, load, totalCount } = useDataProvider<
    (TradeEdge | null)[],
    Trade[]
  >({
@@ -95,5 +95,5 @@ export const useFillsList = ({
    load,
    newRows
  );
-  return { data, error, loading, addNewRows, getRows, reload };
+  return { data, error, loading, addNewRows, getRows };
 };
@@ -29,19 +29,14 @@ export const ProposalsList = () => {
      proposalType: Types.ProposalType.TYPE_NEW_MARKET,
    };
  }, []);
-  const { data, loading, error, reload } = useDataProvider({
+  const { data, loading, error } = useDataProvider({
    dataProvider: proposalsListDataProvider,
    variables,
  });
  const filteredData = getNewMarketProposals(data || []);
  const { columnDefs, defaultColDef } = useColumnDefs();
  return (
-    <AsyncRenderer
-      loading={loading}
-      error={error}
-      data={filteredData}
-      reload={reload}
-    >
+    <AsyncRenderer loading={loading} error={error} data={filteredData}>
      <AgGrid
        ref={gridRef}
        domLayout="autoHeight"
@@ -35,7 +35,6 @@ query LedgerEntries(
      node {
        ...LedgerEntry
      }
-      cursor
    }
    pageInfo {
      startCursor
@@ -14,7 +14,7 @@ export type LedgerEntriesQueryVariables = Types.Exact<{
 }>;


-export type LedgerEntriesQuery = { __typename?: 'Query', ledgerEntries: { __typename?: 'AggregatedLedgerEntriesConnection', edges: Array<{ __typename?: 'AggregatedLedgerEntriesEdge', cursor: string, node: { __typename?: 'AggregatedLedgerEntry', vegaTime: any, quantity: string, assetId?: string | null, transferType?: Types.TransferType | null, toAccountType?: Types.AccountType | null, toAccountMarketId?: string | null, toAccountPartyId?: string | null, toAccountBalance: string, fromAccountType?: Types.AccountType | null, fromAccountMarketId?: string | null, fromAccountPartyId?: string | null, fromAccountBalance: string } } | null>, pageInfo: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } } };
+export type LedgerEntriesQuery = { __typename?: 'Query', ledgerEntries: { __typename?: 'AggregatedLedgerEntriesConnection', edges: Array<{ __typename?: 'AggregatedLedgerEntriesEdge', node: { __typename?: 'AggregatedLedgerEntry', vegaTime: any, quantity: string, assetId?: string | null, transferType?: Types.TransferType | null, toAccountType?: Types.AccountType | null, toAccountMarketId?: string | null, toAccountPartyId?: string | null, toAccountBalance: string, fromAccountType?: Types.AccountType | null, fromAccountMarketId?: string | null, fromAccountPartyId?: string | null, fromAccountBalance: string } } | null>, pageInfo: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } } };

 export const LedgerEntryFragmentDoc = gql`
    fragment LedgerEntry on AggregatedLedgerEntry {
@@ -43,7 +43,6 @@ export const LedgerEntriesDocument = gql`
      node {
        ...LedgerEntry
      }
-      cursor
    }
    pageInfo {
      startCursor
@@ -128,11 +128,7 @@ export const ledgerEntriesProvider = makeDerivedDataProvider<
      const marketReceiver = markets.find(
        (market: Market) => market.id === entry.toAccountMarketId
      );
-      const cursor = edge?.cursor;
-      return {
-        node: { ...entry, asset, marketSender, marketReceiver },
-        cursor,
-      };
+      return { node: { ...entry, asset, marketSender, marketReceiver } };
    });
  }
 );
@@ -176,13 +172,14 @@ export const useLedgerEntriesDataProvider = ({
      data: (AggregatedLedgerEntriesEdge | null)[] | null;
      totalCount?: number;
    }) => {
+      dataRef.current = data;
      totalCountRef.current = totalCount;
      return updateGridData(dataRef, data, gridRef);
    },
    [gridRef]
  );

-  const { data, error, loading, load, totalCount, reload } = useDataProvider({
+  const { data, error, loading, load, totalCount } = useDataProvider({
    dataProvider: ledgerEntriesProvider,
    update,
    insert,
@@ -196,5 +193,5 @@ export const useLedgerEntriesDataProvider = ({
    totalCountRef,
    load
  );
-  return { loading, error, data, getRows, reload };
+  return { loading, error, data, getRows };
 };
@@ -16,7 +16,6 @@ export const ledgerEntriesQuery = (
      edges: ledgerEntries.map((node) => ({
        __typename: 'AggregatedLedgerEntriesEdge',
        node,
-        cursor: 'cursor-1',
      })),
      pageInfo: {
        startCursor:
@@ -21,12 +21,11 @@ export const LedgerManager = ({ partyId }: LedgerManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const [filter, setFilter] = useState<Filter | undefined>();

-  const { data, error, loading, getRows, reload } =
-    useLedgerEntriesDataProvider({
-      partyId,
-      filter,
-      gridRef,
-    });
+  const { data, error, loading, getRows } = useLedgerEntriesDataProvider({
+    partyId,
+    filter,
+    gridRef,
+  });

  const onFilterChanged = useCallback(
    (event: FilterChangedEvent) => {
@@ -39,11 +38,7 @@ export const LedgerManager = ({ partyId }: LedgerManagerProps) => {
    },
    [filter]
  );
-  const getRowId = useCallback(
-    ({ data }: { data: Types.AggregatedLedgerEntry }) =>
-      `${data.vegaTime}-${data.fromAccountPartyId}-${data.toAccountPartyId}`,
-    []
-  );
+
  return (
    <div className="h-full relative">
      <LedgerTable
@@ -51,7 +46,6 @@ export const LedgerManager = ({ partyId }: LedgerManagerProps) => {
        rowModelType="infinite"
        datasource={{ getRows }}
        onFilterChanged={onFilterChanged}
-        getRowId={getRowId}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -60,7 +54,6 @@ export const LedgerManager = ({ partyId }: LedgerManagerProps) => {
          data={data}
          noDataMessage={t('No entries')}
          noDataCondition={(data) => !(data && data.length)}
-          reload={reload}
        />
      </div>
    </div>
@@ -85,7 +85,7 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
    [marketId, updateOrderbookData]
  );

-  const { data, error, loading, flush, reload } = useDataProvider({
+  const { data, error, loading, flush } = useDataProvider({
    dataProvider: marketDepthProvider,
    update,
    variables,
@@ -156,7 +156,6 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
      loading={loading || marketDataLoading || marketLoading}
      error={error || marketDataError || marketError}
      data={data}
-      reload={reload}
    >
      <Orderbook
        {...orderbookData}
@@ -69,14 +69,14 @@ export const MarketInfoContainer = ({
    [marketId, yTimestamp]
  );

-  const { data, loading, error, reload } = useDataProvider({
+  const { data, loading, error } = useDataProvider({
    dataProvider: marketInfoDataProvider,
    skipUpdates: true,
    variables,
  });

  return (
-    <AsyncRenderer data={data} loading={loading} error={error} reload={reload}>
+    <AsyncRenderer data={data} loading={loading} error={error}>
      {data && data.market ? (
        <Info market={data.market} onSelect={(id) => onSelect?.(id)} />
      ) : (
@@ -10,7 +10,7 @@ interface MarketsContainerProps {
 }

 export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
-  const { data, error, loading, reload } = useDataProvider({
+  const { data, error, loading } = useDataProvider({
    dataProvider,
    skipUpdates: true,
  });
@@ -18,8 +18,7 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
  return (
    <div className="h-full relative">
      <MarketListTable
-        rowData={error ? [] : data}
-        noRowsOverlayComponent={() => null}
+        rowData={data}
        onRowClicked={(rowEvent: RowClickedEvent) => {
          const { data, event } = rowEvent;
          // filters out clicks on the symbol column because it should display asset details
@@ -37,7 +36,6 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
          error={error}
          data={data}
          noDataMessage={t('No markets')}
-          reload={reload}
        />
      </div>
    </div>
@@ -155,7 +155,6 @@ export const ordersProvider = makeDataProvider({
    append,
    first: 100,
  },
-  additionalContext: { isEnlargedTimeout: true },
 });

 export const ordersWithMarketProvider = makeDerivedDataProvider<
@@ -83,15 +83,14 @@ export const OrderListManager = ({
  const create = useVegaTransactionStore((state) => state.create);
  const hasActiveOrder = useHasActiveOrder(marketId);

-  const { data, error, loading, addNewRows, getRows, reload } =
-    useOrderListData({
-      partyId,
-      marketId,
-      sort,
-      filter,
-      gridRef,
-      scrolledToTop,
-    });
+  const { data, error, loading, addNewRows, getRows } = useOrderListData({
+    partyId,
+    marketId,
+    sort,
+    filter,
+    gridRef,
+    scrolledToTop,
+  });

  const onBodyScrollEnd = (event: BodyScrollEndEvent) => {
    if (event.top === 0) {
@@ -129,7 +128,7 @@ export const OrderListManager = ({
  return (
    <>
      <div className="h-full relative grid grid-rows-[1fr,min-content]">
-        <div className="relative">
+        <div className="h-full relative">
          <OrderListTable
            ref={gridRef}
            rowModelType="infinite"
@@ -150,8 +149,6 @@ export const OrderListManager = ({
            setEditOrder={setEditOrder}
            onMarketClick={onMarketClick}
            isReadOnly={isReadOnly}
-            hasActiveOrder={hasActiveOrder}
-            blockLoadDebounceMillis={100}
          />
          <div className="pointer-events-none absolute inset-0">
            <AsyncRenderer
@@ -160,7 +157,6 @@ export const OrderListManager = ({
              data={data}
              noDataMessage={t('No orders')}
              noDataCondition={(data) => !(data && data.length)}
-              reload={reload}
            />
          </div>
        </div>
@@ -119,7 +119,7 @@ export const useOrderListData = ({
    [gridRef]
  );

-  const { data, error, loading, load, totalCount, reload } = useDataProvider({
+  const { data, error, loading, load, totalCount } = useDataProvider({
    dataProvider: ordersWithMarketProvider,
    update,
    insert,
@@ -133,5 +133,5 @@ export const useOrderListData = ({
    load,
    newRows
  );
-  return { loading, error, data, addNewRows, getRows, reload };
+  return { loading, error, data, addNewRows, getRows };
 };
@@ -33,24 +33,20 @@ export type OrderListTableProps = OrderListProps & {
  setEditOrder: (order: Order) => void;
  onMarketClick?: (marketId: string) => void;
  isReadOnly: boolean;
-  hasActiveOrder?: boolean;
 };

 export const OrderListTable = forwardRef<AgGridReact, OrderListTableProps>(
-  ({ cancel, setEditOrder, onMarketClick, hasActiveOrder, ...props }, ref) => {
+  ({ cancel, setEditOrder, onMarketClick, ...props }, ref) => {
    return (
      <AgGrid
        ref={ref}
-        overlayNoRowsTemplate={t('No orders')}
+        overlayNoRowsTemplate="No orders"
        defaultColDef={{
          flex: 1,
          resizable: true,
          filterParams: { buttons: ['reset'] },
        }}
-        style={{
-          width: '100%',
-          height: hasActiveOrder ? 'calc(100% - 46px)' : '100%',
-        }}
+        style={{ width: '100%', height: '100%' }}
        getRowId={({ data }) => data.id}
        {...props}
      >
@@ -18,11 +18,7 @@ export const PositionsManager = ({
  isReadOnly,
 }: PositionsManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
-  const { data, error, loading, reload } = usePositionsData(
-    partyId,
-    gridRef,
-    true
-  );
+  const { data, error, loading } = usePositionsData(partyId, gridRef, true);
  const create = useVegaTransactionStore((store) => store.create);
  const onClose = ({
    marketId,
@@ -55,7 +51,7 @@ export const PositionsManager = ({
  return (
    <div className="h-full relative">
      <PositionsTable
-        rowData={error ? [] : data}
+        rowData={data}
        ref={gridRef}
        onMarketClick={onMarketClick}
        onClose={onClose}
@@ -69,7 +65,6 @@ export const PositionsManager = ({
          data={data}
          noDataMessage={t('No positions')}
          noDataCondition={(data) => !(data && data.length)}
-          reload={reload}
        />
      </div>
    </div>
@@ -25,7 +25,7 @@ export const usePositionsData = (
    },
    [gridRef, clientSideModel]
  );
-  const { data, error, loading, reload } = useDataProvider({
+  const { data, error, loading } = useDataProvider({
    dataProvider: positionsMetricsProvider,
    update,
    variables,
@@ -45,6 +45,5 @@ export const usePositionsData = (
    error,
    loading,
    getRows,
-    reload,
  };
 };
@@ -80,7 +80,6 @@ export const useDataProvider = <
    }
  }, []);
  const reload = useCallback((force = false) => {
-    initialized.current = false;
    if (reloadRef.current) {
      reloadRef.current(force);
    }
@@ -17,7 +17,7 @@ const getLastRow = (
      lastRow = totalCount;
    }
  } else if (blockLength < endRow - startRow) {
-    lastRow = blockLength + startRow;
+    lastRow = blockLength;
  }
  return lastRow;
 };
@@ -82,7 +82,7 @@ export const TradesContainer = ({ marketId }: TradesContainerProps) => {
    []
  );

-  const { data, error, loading, load, totalCount, reload } = useDataProvider({
+  const { data, error, loading, load, totalCount } = useDataProvider({
    dataProvider: tradesWithMarketProvider,
    update,
    insert,
@@ -107,7 +107,7 @@ export const TradesContainer = ({ marketId }: TradesContainerProps) => {
  };

  return (
-    <AsyncRenderer loading={loading} error={error} data={data} reload={reload}>
+    <AsyncRenderer loading={loading} error={error} data={data}>
      <TradesTable
        ref={gridRef}
        rowModelType={data?.length ? 'infinite' : 'clientSide'}
@@ -1,23 +0,0 @@
-import { render, act, screen } from '@testing-library/react';
-import { AsyncRenderer } from './async-renderer';
-
-describe('AsyncRenderer', () => {
-  it('timeout error should render button', async () => {
-    const reload = jest.fn();
-    await act(() => {
-      render(
-        <AsyncRenderer
-          reload={reload}
-          error={new Error('Timeout exceeded')}
-          loading={false}
-          data={undefined}
-        />
-      );
-    });
-    expect(screen.getByRole('button')).toBeInTheDocument();
-    await act(() => {
-      screen.getByRole('button').click();
-    });
-    expect(reload).toHaveBeenCalled();
-  });
-});
@@ -1,7 +1,6 @@
 import { Splash } from '../splash';
 import type { ReactNode } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
-import { Button } from '../button';

 interface AsyncRendererProps<T> {
  loading: boolean;
@@ -13,7 +12,6 @@ interface AsyncRendererProps<T> {
  children?: ReactNode | null;
  render?: (data: T) => ReactNode;
  noDataCondition?(data?: T): boolean;
-  reload?: () => void;
 }

 export function AsyncRenderer<T = object>({
@@ -26,30 +24,15 @@ export function AsyncRenderer<T = object>({
  noDataCondition,
  children,
  render,
-  reload,
 }: AsyncRendererProps<T>) {
  if (error) {
    if (!data) {
      return (
-        <div className="h-full flex items-center justify-center">
-          <div className="h-12 flex flex-col  items-center">
-            <Splash>
-              {errorMessage
-                ? errorMessage
-                : t(`Something went wrong: ${error.message}`)}
-            </Splash>
-            {reload && error.message === 'Timeout exceeded' && (
-              <Button
-                size="sm"
-                className="pointer-events-auto"
-                type="button"
-                onClick={reload}
-              >
-                {t('Try again')}
-              </Button>
-            )}
-          </div>
-        </div>
+        <Splash>
+          {errorMessage
+            ? errorMessage
+            : t(`Something went wrong: ${error.message}`)}
+        </Splash>
      );
    }
  }
@@ -53,7 +53,7 @@ export const NavDropdownMenuContent = forwardRef<
  <DropdownMenuPrimitive.Content
    {...contentProps}
    ref={forwardedRef}
-    className="z-10 bg-vega-dark-100 mt-4 py-4 rounded-xl border border-vega-dark-200 text-white"
+    className="bg-vega-dark-100 mt-4 py-4 rounded-xl border border-vega-dark-200 text-white"
    align="start"
    sideOffset={10}
  />
@@ -1,2 +1 @@
 export * from './nav';
-export * from './nav2';
@@ -1,287 +0,0 @@
-import { NavLink } from 'react-router-dom';
-import { create } from 'zustand';
-import * as NavigationMenu from '@radix-ui/react-navigation-menu';
-import type { ReactNode } from 'react';
-import * as Dialog from '@radix-ui/react-dialog';
-import { Icon, ThemeSwitcher } from '@vegaprotocol/ui-toolkit';
-import { NetworkSwitcher } from '@vegaprotocol/environment';
-import classNames from 'classnames';
-import { animated, useTransition, useSpring, config } from 'react-spring';
-
-const BREAKPOINT = 760;
-const useNav = create<{
-  drawerOpen: boolean;
-  value: string;
-  update: (state: Partial<{ drawerOpen: boolean; value: string }>) => void;
-}>((set) => ({
-  drawerOpen: false,
-  value: '',
-  update: (state) => set(state),
-}));
-
-export const Navbar = ({ children }: { children: ReactNode }) => {
-  return (
-    <div className="px-4 border-b border-vega-light-200 dark:border-vega-dark-200">
-      <div className="flex items-center gap-2">
-        <div className="py-3 mr-4">THE ICON</div>
-        {window.innerWidth > BREAKPOINT ? (
-          <Menu>{children}</Menu>
-        ) : (
-          <Drawer>{children}</Drawer>
-        )}
-      </div>
-    </div>
-  );
-};
-
-const Menu = ({ children }: { children: ReactNode }) => {
-  const { value, update } = useNav();
-  return (
-    <>
-      <div className="mr-4">
-        <NetworkSwitcher />
-      </div>
-      <NavigationMenu.Root
-        value={value}
-        onValueChange={(value) => update({ value })}
-        className="relative self-end"
-      >
-        {children}
-      </NavigationMenu.Root>
-      <div className="flex items-center gap-2 ml-auto">
-        <ThemeSwitcher />
-      </div>
-    </>
-  );
-};
-
-const Drawer = ({ children }: { children: ReactNode }) => {
-  const { drawerOpen, value, update } = useNav();
-  const transition = useTransition(drawerOpen, {
-    from: { opacity: 0, transform: 'translateX(100%)' },
-    enter: { opacity: 1, transform: 'translateX(0%)' },
-    leave: { opacity: 0, transform: 'translateX(100%)' },
-    config: {
-      ...config.default,
-      duration: 200,
-    },
-  });
-
-  return (
-    <>
-      <div className="ml-auto">
-        <MenuButton open={false} onClick={() => update({ drawerOpen: true })} />
-      </div>
-      <Dialog.Root
-        open={drawerOpen}
-        onOpenChange={(open) => update({ drawerOpen: open })}
-      >
-        <Dialog.Portal forceMount={true}>
-          {transition((styles, isOpen) => {
-            return isOpen ? (
-              <>
-                <Dialog.Overlay
-                  forceMount={true}
-                  asChild={true}
-                  className="fixed inset-0 bg-black/50"
-                >
-                  <animated.div style={{ opacity: styles.opacity }} />
-                </Dialog.Overlay>
-                <Dialog.Content
-                  forceMount={true}
-                  asChild={true}
-                  className="absolute top-0 right-0 py-4 px-6 w-10/12 border-l border-vega-dark-200 h-screen bg-white dark:bg-black text-black dark:text-white"
-                >
-                  <animated.div style={{ transform: styles.transform }}>
-                    <div className="absolute top-3 right-3">
-                      <MenuButton
-                        open={true}
-                        onClick={() => update({ drawerOpen: false })}
-                      />
-                    </div>
-                    <div className="pt-10">
-                      <div className="pb-6 mb-6 border-b border-vega-dark-200">
-                        <NetworkSwitcher />
-                      </div>
-                      <NavigationMenu.Root
-                        value={value}
-                        onValueChange={(value) => update({ value })}
-                      >
-                        {children}
-                        <NavigationMenu.Viewport className="absolute w-full h-full top-0 left-0 bg-black" />
-                      </NavigationMenu.Root>
-                      <div className="pt-6 mt-6 border-t border-vega-dark-200">
-                        <ThemeSwitcher />
-                      </div>
-                    </div>
-                  </animated.div>
-                </Dialog.Content>
-              </>
-            ) : null;
-          })}
-        </Dialog.Portal>
-      </Dialog.Root>
-    </>
-  );
-};
-
-export const NavigationList = ({ children }: { children: ReactNode }) => {
-  return (
-    <NavigationMenu.List className="flex flex-col md:flex-row gap-2">
-      {children}
-    </NavigationMenu.List>
-  );
-};
-
-export const NavigationItem = ({ children }: { children: ReactNode }) => {
-  return (
-    <NavigationMenu.Item className="relative mb-4 md:mb-0 last:mb-0 md:mr-4 last:mr-0 whitespace-nowrap">
-      {children}
-    </NavigationMenu.Item>
-  );
-};
-
-export const NavigationLink = ({
-  children,
-  path,
-}: {
-  children: ReactNode;
-  path: string;
-}) => {
-  const update = useNav((store) => store.update);
-  const borderClasses = classNames(
-    'absolute h-[2px] w-full bottom-[-1px] left-0',
-    'bg-black dark:bg-vega-yellow'
-  );
-
-  return (
-    <NavigationMenu.Link
-      asChild={true}
-      onClick={() => update({ drawerOpen: false, value: '' })}
-    >
-      <NavLink to={path} className="inline-block md:pt-2 text-lg">
-        {({ isActive }) => {
-          const linkTextClasses = classNames('hover:text-white', {
-            'text-white': isActive,
-            'text-vega-dark-300': !isActive,
-          });
-          return (
-            <span className="block relative pb-1 md:pb-2">
-              <span className={linkTextClasses}>{children}</span>
-              {isActive && <span className={borderClasses} />}
-            </span>
-          );
-        }}
-      </NavLink>
-    </NavigationMenu.Link>
-  );
-};
-
-export const NavigationTrigger = ({ children }: { children: ReactNode }) => {
-  // eslint-disable-next-line
-  const preventHover = (event: any) => {
-    const e = event as Event;
-    if (window.innerWidth < BREAKPOINT) e.preventDefault();
-  };
-  return (
-    <NavigationMenu.Trigger
-      onPointerMove={preventHover}
-      onPointerLeave={preventHover}
-      onPointerEnter={preventHover}
-      className="w-full flex items-center justify-between text-vega-dark-300 hover:text-white text-lg md:py-2"
-    >
-      {children}
-      <span className="md:rotate-90 md:ml-3">
-        <Icon name="arrow-right" size={3} />
-      </span>
-    </NavigationMenu.Trigger>
-  );
-};
-
-export const NavigationContent = ({
-  children,
-  backText,
-}: {
-  children: ReactNode;
-  backText: string;
-}) => {
-  return (
-    <NavigationMenu.Content>
-      <NavigationContentWrapper backText={backText}>
-        {children}
-      </NavigationContentWrapper>
-    </NavigationMenu.Content>
-  );
-};
-
-const NavigationContentWrapper = ({
-  backText,
-  children,
-}: {
-  backText: string;
-  children: ReactNode;
-}) => {
-  const drawerConfig = {
-    from: { transform: 'translateX(100%)' },
-    to: { transform: 'translateX(0%)' },
-    config: {
-      ...config,
-      duration: 200,
-    },
-  };
-  const menuConfig = {
-    from: { opacity: 0, transform: 'translateY(40px)' },
-    to: { opacity: 1, transform: 'translateY(0)' },
-    config: {
-      ...config,
-      duration: 100,
-    },
-  };
-  const styles = useSpring(
-    window.innerWidth > BREAKPOINT ? menuConfig : drawerConfig
-  );
-
-  return (
-    <animated.div
-      style={styles}
-      className="pt-20 md:py-2 px-4 z-30 md:absolute md:mt-3 md:border border-vega-dark-200 bg-black dark:md:bg-vega-dark-100 md:rounded-xl"
-    >
-      <div className="flex items-center md:hidden mb-6 text-vega-dark-300 hover:text-white">
-        <Icon name="arrow-left" size={3} />
-        <span className="ml-2">{backText}</span>
-      </div>
-      <ul className="md:min-w-[250px]">{children}</ul>
-    </animated.div>
-  );
-};
-
-const MenuButton = ({
-  open,
-  onClick,
-}: {
-  open: boolean;
-  onClick: () => void;
-}) => (
-  <button
-    className={classNames(
-      'flex flex-col justify-around gap-3 p-2 relative h-[34px]'
-    )}
-    onClick={onClick}
-    data-testid="button-menu-drawer"
-  >
-    <div
-      className={classNames('w-[26px] h-[2px] transition-all', {
-        'translate-y-0 rotate-0 bg-white': !open,
-        // 'bg-black': !drawerOpen && navbarTheme === 'yellow',
-        'translate-y-[7.5px] rotate-45 bg-black dark:bg-white': open,
-      })}
-    />
-    <div
-      className={classNames('w-[26px] h-[2px] transition-all', {
-        'translate-y-0 rotate-0 bg-white': !open,
-        // 'bg-black': !drawerOpen && navbarTheme === 'yellow',
-        '-translate-y-[7.5px] -rotate-45 bg-black dark:bg-white': open,
-      })}
-    />
-  </button>
-);
@@ -27,7 +27,6 @@
    "@radix-ui/react-dialog": "^1.0.2",
    "@radix-ui/react-dropdown-menu": "^2.0.2",
    "@radix-ui/react-icons": "^1.1.1",
-    "@radix-ui/react-navigation-menu": "^1.1.1",
    "@radix-ui/react-popover": "^1.0.3",
    "@radix-ui/react-radio-group": "^1.1.1",
    "@radix-ui/react-select": "^1.2.0",
@@ -74,7 +73,6 @@
    "react-i18next": "^11.11.4",
    "react-intersection-observer": "^9.2.2",
    "react-router-dom": "6.3.0",
-    "react-spring": "^9.6.1",
    "react-syntax-highlighter": "^15.4.5",
    "react-use-websocket": "^3.0.0",
    "react-virtualized-auto-sizer": "^1.0.6",
@@ -4323,27 +4323,6 @@
    aria-hidden "^1.1.1"
    react-remove-scroll "2.5.5"

-"@radix-ui/react-navigation-menu@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.1.1.tgz#84f24d90e6448a0c83d3431c6eefbea73dc7522e"
-  integrity sha512-Khgf+LwqYfUpbFAHcFPDMj6ZrWxnwCgC96liLYwE48x9YJbXGlutOWzZaSzrgl82xS+PwoPLQunfDe/i4ZITRA==
-  dependencies:
-    "@babel/runtime" "^7.13.10"
-    "@radix-ui/primitive" "1.0.0"
-    "@radix-ui/react-collection" "1.0.1"
-    "@radix-ui/react-compose-refs" "1.0.0"
-    "@radix-ui/react-context" "1.0.0"
-    "@radix-ui/react-direction" "1.0.0"
-    "@radix-ui/react-dismissable-layer" "1.0.2"
-    "@radix-ui/react-id" "1.0.0"
-    "@radix-ui/react-presence" "1.0.0"
-    "@radix-ui/react-primitive" "1.0.1"
-    "@radix-ui/react-use-callback-ref" "1.0.0"
-    "@radix-ui/react-use-controllable-state" "1.0.0"
-    "@radix-ui/react-use-layout-effect" "1.0.0"
-    "@radix-ui/react-use-previous" "1.0.0"
-    "@radix-ui/react-visually-hidden" "1.0.1"
-
 "@radix-ui/react-popover@^1.0.3":
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/@radix-ui/react-popover/-/react-popover-1.0.3.tgz#65ae2ee1fca2d7fd750308549eb8e0857c6160fe"
@@ -4597,92 +4576,6 @@
  dependencies:
    "@babel/runtime" "^7.13.10"

-"@react-spring/animated@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.6.1.tgz#ccc626d847cbe346f5f8815d0928183c647eb425"
-  integrity sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ==
-  dependencies:
-    "@react-spring/shared" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
-"@react-spring/core@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.6.1.tgz#ebe07c20682b360b06af116ea24e2b609e778c10"
-  integrity sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ==
-  dependencies:
-    "@react-spring/animated" "~9.6.1"
-    "@react-spring/rafz" "~9.6.1"
-    "@react-spring/shared" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
-"@react-spring/konva@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.6.1.tgz#66e63da0e9681e42395e995402a7e73ba6892461"
-  integrity sha512-MevnU+tnG1LPsmMRpfJfevfLtI0ObIvrwYc+Xg+kmYJe00vwMRSdulQOztKANKalFXBewwk72XrQCeRLXFaUIg==
-  dependencies:
-    "@react-spring/animated" "~9.6.1"
-    "@react-spring/core" "~9.6.1"
-    "@react-spring/shared" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
-"@react-spring/native@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.6.1.tgz#b66e237f2faaa4f88569d5a03b6fb0136bcdf2b9"
-  integrity sha512-ZIfSytxFGLw4gYOb8gsmwG0+JZYxuM/Y1XPCXCkhuoMn+RmOYrr0kQ4gLczbmf+TRxth7OT1c8vBYz0+SCGcIQ==
-  dependencies:
-    "@react-spring/animated" "~9.6.1"
-    "@react-spring/core" "~9.6.1"
-    "@react-spring/shared" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
-"@react-spring/rafz@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.6.1.tgz#d71aafb92b78b24e4ff84639f52745afc285c38d"
-  integrity sha512-v6qbgNRpztJFFfSE3e2W1Uz+g8KnIBs6SmzCzcVVF61GdGfGOuBrbjIcp+nUz301awVmREKi4eMQb2Ab2gGgyQ==
-
-"@react-spring/shared@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.6.1.tgz#4e2e4296910656c02bd9fd54c559702bc836ac4e"
-  integrity sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw==
-  dependencies:
-    "@react-spring/rafz" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
-"@react-spring/three@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.6.1.tgz#095fcd1dc6509127c33c14486d88289b89baeb9d"
-  integrity sha512-Tyw2YhZPKJAX3t2FcqvpLRb71CyTe1GvT3V+i+xJzfALgpk10uPGdGaQQ5Xrzmok1340DAeg2pR/MCfaW7b8AA==
-  dependencies:
-    "@react-spring/animated" "~9.6.1"
-    "@react-spring/core" "~9.6.1"
-    "@react-spring/shared" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
-"@react-spring/types@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.6.1.tgz#913d3a68c5cbc1124fdb18eff919432f7b6abdde"
-  integrity sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q==
-
-"@react-spring/web@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.6.1.tgz#3e4c03b724d2b545dc2fa2649eb6109318ab9178"
-  integrity sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw==
-  dependencies:
-    "@react-spring/animated" "~9.6.1"
-    "@react-spring/core" "~9.6.1"
-    "@react-spring/shared" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
-"@react-spring/zdog@~9.6.1":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.6.1.tgz#5292c374e23e3846db3eb9d7557ed5a7bb40dada"
-  integrity sha512-0jSGm2OFW/+/+4dkRp46KzEkcLVfzV2k6DO1om0dLDtQ4q6FpX4dmDTlRc7Apzin6VtfQONMFIGITtbqoS28MQ==
-  dependencies:
-    "@react-spring/animated" "~9.6.1"
-    "@react-spring/core" "~9.6.1"
-    "@react-spring/shared" "~9.6.1"
-    "@react-spring/types" "~9.6.1"
-
 "@repeaterjs/repeater@^3.0.4":
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca"
@@ -19368,18 +19261,6 @@ react-smooth@^2.0.1:
    fast-equals "^2.0.0"
    react-transition-group "2.9.0"

-react-spring@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.6.1.tgz#e715b2fa523c1a3acfdcf1aaa93e081620b8cc8e"
-  integrity sha512-BeP80R4SLb1bZHW/Q62nECoScHw/fH+jzGkD7dc892HNGa+lbGIJXURc6U7N8JfZ8peEO46nPxR57aUMuYzquQ==
-  dependencies:
-    "@react-spring/core" "~9.6.1"
-    "@react-spring/konva" "~9.6.1"
-    "@react-spring/native" "~9.6.1"
-    "@react-spring/three" "~9.6.1"
-    "@react-spring/web" "~9.6.1"
-    "@react-spring/zdog" "~9.6.1"
-
 react-style-singleton@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"
Author	SHA1	Message	Date
Matthew Russell	adcb63019a	fix: flakely test had welcome dialog blocking trading interface	2023-02-15 19:19:45 -08:00
Matthew Russell	b59e01c71a	chore: rename wrapper classes	2023-02-15 13:26:56 -08:00
Matthew Russell	c2ef40ba64	chore: add newlines to reduce diff	2023-02-15 13:22:03 -08:00
Matthew Russell	26658e56d8	chore: update mock	2023-02-15 11:48:50 -08:00
Matthew Russell	337c558806	chore: add fallbacks for etherscan url and ethereum provider	2023-02-15 11:48:50 -08:00
Matthew Russell	97c324c790	fix: env var name for token url	2023-02-15 11:48:50 -08:00
Matthew Russell	8d6ea15b29	feat: update lp dashboard and multisigner app	2023-02-15 11:48:50 -08:00
Matthew Russell	2e307b2bb9	chore: re add timeout for subscription test	2023-02-15 11:48:50 -08:00
Matthew Russell	0ae6bbcb09	chore: fix tests after readding sub test	2023-02-15 11:48:49 -08:00
Matthew Russell	ba777b567b	chore: remove unused files	2023-02-15 11:48:49 -08:00
Matthew Russell	09294c2029	chore: re-add app-loader, move isValidUrl to react-helpers	2023-02-15 11:48:49 -08:00
Matthew Russell	37651c0cb9	chore: remove unused files	2023-02-15 11:48:49 -08:00
Matthew Russell	c28cef72a6	chore: make additional envs optional	2023-02-15 11:48:49 -08:00
Matthew Russell	bed754ff7b	chore: add storage key const	2023-02-15 11:48:49 -08:00
Matthew Russell	0ffcff2a4c	chore: fix types for compile issue	2023-02-15 11:48:49 -08:00
Matthew Russell	daccb88524	chore: add compile error helpers	2023-02-15 11:48:48 -08:00
Matthew Russell	af8889c97f	feat: add node guard component, tidy up app-loader	2023-02-15 11:48:48 -08:00
Matthew Russell	9f1dc0f483	chore: stop poll of query errors	2023-02-15 11:48:48 -08:00
Matthew Russell	8e63a4f653	test: add tests for row data and node switcher	2023-02-15 11:48:48 -08:00
Matthew Russell	d78ee77c5b	chore: use more basic apollo provider rather then render prop, add hook tests	2023-02-15 11:48:48 -08:00
Matthew Russell	072930372e	wip: fix me	2023-02-15 11:48:48 -08:00
Matthew Russell	076c7b42a0	chore: update tests to not use environment provider, delete unused web3-container component	2023-02-15 11:48:48 -08:00
Matthew Russell	44c884bdaf	test: update environment tests	2023-02-15 11:48:47 -08:00
Matthew Russell	5ac0b6bc35	chore: update useNodeHealth tests	2023-02-15 11:48:47 -08:00
Matthew Russell	9fe2c643c6	feat: fix response time	2023-02-15 11:48:47 -08:00
Matthew Russell	6a072a93ce	chore: remove extra block column	2023-02-15 11:48:47 -08:00
Matthew Russell	2ac6bc72a1	feat: handle if node config fetch fails	2023-02-15 11:48:47 -08:00
Matthew Russell	8763a5bb93	chore: port validation for env vars	2023-02-15 11:48:47 -08:00
Matthew Russell	5c718a2e37	feat: re-add layout rows	2023-02-15 11:48:47 -08:00
Matthew Russell	df393a4de8	chore: fix polling not working	2023-02-15 11:48:46 -08:00
Matthew Russell	f35fda8f53	feat: switch apps to use new env provider and node switcher	2023-02-15 11:48:45 -08:00
Matthew Russell	609e7bdc4d	chore: update use node health and query to include vega tme	2023-02-15 11:47:55 -08:00
Matthew Russell	0dcb026dea	feat: add header store	2023-02-15 11:47:52 -08:00
Matthew Russell	da66da170a	refactor: env provider to use zustand	2023-02-15 11:47:13 -08:00