fixed formatting

Co-authored-by: asiaznik <artur@vegaprotocol.io>

.github/workflows/cypress-run.yml

@@ -87,7 +87,7 @@ jobs:
         run: ls -alsh /home/runner/.vegacapsule/testnet/logs/
 
       - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
+        if: ${{ failure() }}
         with:
           name: logs-${{ matrix.project }}
           path: /home/runner/.vegacapsule/testnet/logs

apps/explorer-e2e/src/fixtures/net_parameter_format_lookup.json

@@ -22,7 +22,6 @@
     "governance.proposal.updateAsset.minProposerBalance",
     "governance.proposal.updateAsset.minVoterBalance",
     "governance.proposal.updateAsset.requiredParticipation",
-    "governance.proposal.updateMarket.minProposerEquityLikeShare",
     "market.fee.factors.infrastructureFee",
     "market.fee.factors.makerFee",
     "market.liquidity.bondPenaltyParameter",
@@ -77,6 +76,7 @@
     "governance.proposal.updateMarket.requiredParticipationLP",
     "governance.proposal.updateNetParam.requiredMajority",
     "governance.proposal.updateNetParam.requiredParticipation",
+    "governance.proposal.updateMarket.minProposerEquityLikeShare",
     "validators.vote.required"
   ],
   "duration": [

apps/explorer-e2e/src/integration/blocks.cy.js

@@ -1,33 +1,27 @@
 context('Blocks page', { tags: '@regression' }, function () {
-  before('visit token home page', function () {
-    cy.visit('/');
-  });
-
   describe('Verify elements on page', function () {
-    const blockNavigation = 'a[href="/blocks"]';
+    beforeEach(() => {
+      cy.visit('/blocks');
+    });
     const blockHeight = '[data-testid="block-height"]';
     const blockTime = '[data-testid="block-time"]';
     const blockHeader = '[data-testid="block-header"]';
     const previousBlockBtn = '[data-testid="previous-block"]';
     const infiniteScrollWrapper = '[data-testid="infinite-scroll-wrapper"]';
 
-    beforeEach('navigate to blocks page', function () {
-      cy.get(blockNavigation).click();
-    });
-
     it('Blocks page is displayed', function () {
       validateBlocksDisplayed();
     });
 
     it('Blocks page is displayed on mobile', function () {
-      cy.common_switch_to_mobile_and_click_toggle();
-      cy.get(blockNavigation).click();
+      cy.switchToMobile();
       validateBlocksDisplayed();
     });
 
     it('Block validator page is displayed', function () {
       waitForBlocksResponse();
-      cy.get(blockHeight).eq(0).click();
+      cy.get(blockHeight).eq(0).find('a').click({ force: true });
+
       cy.get('[data-testid="block-validator"]').should('not.be.empty');
       cy.get(blockTime).should('not.be.empty');
       //TODO: Add assertion for transactions when txs are added
@@ -35,7 +29,7 @@ context('Blocks page', { tags: '@regression' }, function () {
 
     it('Navigate to previous block', function () {
       waitForBlocksResponse();
-      cy.get(blockHeight).eq(0).click();
+      cy.get(blockHeight).eq(0).find('a').click({ force: true });
       cy.get(blockHeader)
         .invoke('text')
         .then(($blockHeaderTxt) => {

apps/explorer-e2e/src/integration/network.cy.js

@@ -2,17 +2,14 @@ context('Network parameters page', { tags: '@smoke' }, function () {
   before('navigate to network parameter page', function () {
     cy.fixture('net_parameter_format_lookup').as('networkParameterFormat');
   });
-
   describe('Verify elements on page', function () {
-    const networkParametersNavigation = 'a[href="/network-parameters"]';
+    beforeEach(() => {
+      cy.visit('/network-parameters');
+    });
+
     const networkParametersHeader = '[data-testid="network-param-header"]';
     const tableRows = '[data-testid="key-value-table-row"]';
 
-    before('navigate to network parameter page', function () {
-      cy.visit('/');
-      cy.get(networkParametersNavigation).click();
-    });
-
     it('should show network parameter heading at top of page', function () {
       cy.get(networkParametersHeader)
         .should('have.text', 'Network Parameters')
@@ -201,55 +198,8 @@ context('Network parameters page', { tags: '@smoke' }, function () {
       });
     });
 
-    it('should be able to switch network parameter page - between light and dark mode', function () {
-      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
-      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
-      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
-      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
-      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
-      const themeSwitcher = '[data-testid="theme-switcher"]';
-      const jsonFields = '.hljs';
-      const sideMenuBackground = '.absolute';
-
-      // Engage dark mode if not already set
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .then((background_color) => {
-          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
-            cy.get(themeSwitcher).click();
-        });
-
-      // Engage white mode
-      cy.get(themeSwitcher).click();
-
-      // White Mode
-      cy.get(networkParametersNavigation)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSideMenuBackgroundColor);
-
-      // Dark Mode
-      cy.get(themeSwitcher).click();
-      cy.get(networkParametersNavigation)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSideMenuBackgroundColor);
-    });
-
-    it.skip('should be able to see network parameters - on mobile', function () {
-      cy.common_switch_to_mobile_and_click_toggle();
-      cy.get(networkParametersNavigation).click();
+    it('should be able to see network parameters - on mobile', function () {
+      cy.switchToMobile();
       cy.get_network_parameters().then((network_parameters) => {
         network_parameters = Object.entries(network_parameters);
         network_parameters.forEach((network_parameter) => {

apps/explorer/src/app/app.tsx

@@ -1,16 +1,20 @@
-import classnames from 'classnames';
 import { NetworkLoader, useInitializeEnv } from '@vegaprotocol/environment';
-import { Nav } from './components/nav';
 import { Header } from './components/header';
 import { Main } from './components/main';
 import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-websocket-provider';
 import { Footer } from './components/footer/footer';
-import { AnnouncementBanner, ExternalLink } from '@vegaprotocol/ui-toolkit';
+import {
+  AnnouncementBanner,
+  ExternalLink,
+  Icon,
+} from '@vegaprotocol/ui-toolkit';
 import {
   AssetDetailsDialog,
   useAssetDetailsDialogStore,
 } from '@vegaprotocol/assets';
 import { DEFAULT_CACHE_CONFIG } from '@vegaprotocol/apollo-client';
+import classNames from 'classnames';
+import { useState } from 'react';
 
 const DialogsContainer = () => {
   const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
@@ -25,35 +29,58 @@ const DialogsContainer = () => {
   );
 };
 
-function App() {
-  const layoutClasses = classnames(
-    'grid grid-rows-[auto_1fr_auto] grid-cols-[1fr] md:grid-rows-[auto_minmax(700px,_1fr)_auto] md:grid-cols-[300px_1fr]',
-    'min-h-[100vh] mx-auto my-0',
-    'border-neutral-700 dark:border-neutral-300 lg:border-l lg:border-r',
-    'bg-white dark:bg-black',
-    'antialiased text-black dark:text-white',
-    'overflow-hidden relative'
-  );
+const MainnetSimAd = () => {
+  const [shouldDisplayBanner, setShouldDisplayBanner] = useState<boolean>(true);
 
+  // Return an empty div so that the grid layout in _app.page.ts
+  // renders correctly
+  if (!shouldDisplayBanner) {
+    return <div />;
+  }
+
+  return (
+    <AnnouncementBanner>
+      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
+        <button
+          className="flex items-center"
+          onClick={() => setShouldDisplayBanner(false)}
+        >
+          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
+        </button>
+        <div>
+          <span className="pr-4">Mainnet sim 3 is coming soon!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
+        </div>
+      </div>
+    </AnnouncementBanner>
+  );
+};
+
+function App() {
   return (
     <TendermintWebsocketProvider>
       <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
-        <AnnouncementBanner>
-          <div className="font-alpha calt uppercase text-center text-lg text-white">
-            <span className="pr-4">Mainnet sim 2 is live!</span>
-            <ExternalLink href="https://fairground.wtf/">
-              Come help stress test the network
-            </ExternalLink>
+        <div
+          className={classNames(
+            'max-w-[1500px] min-h-[100vh]',
+            'mx-auto my-0',
+            'grid grid-rows-[auto_1fr_auto] grid-cols-1',
+            'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
+            'antialiased text-black dark:text-white',
+            'overflow-hidden relative'
+          )}
+        >
+          <div>
+            <Header />
+            <MainnetSimAd />
+          </div>
+          <div>
+            <Main />
+          </div>
+          <div>
+            <Footer />
           </div>
-        </AnnouncementBanner>
-
-        <div className={layoutClasses}>
-          <Header />
-          <Nav />
-          <Main />
-          <Footer />
         </div>
-
         <DialogsContainer />
       </NetworkLoader>
     </TendermintWebsocketProvider>

apps/explorer/src/app/components/footer/footer.tsx

@@ -16,7 +16,7 @@ export const Footer = () => {
 
   return (
     <>
-      <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-xs md:text-md md:flex md:col-span-2 px-4 py-2 gap-4 border-t border-neutral-700 dark:border-neutral-300">
+      <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-xs md:text-md md:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
         <div className="flex justify-between gap-2 align-middle">
           {GIT_COMMIT_HASH && (
             <div className="content-center flex border-r border-neutral-700 dark:border-neutral-300 pr-4">

apps/explorer/src/app/components/header/header.spec.tsx

@@ -19,12 +19,10 @@ const renderComponent = () => (
 );
 
 describe('Header', () => {
-  it('should render heading', () => {
+  it('should render navigation', () => {
     render(renderComponent());
 
-    expect(screen.getByTestId('explorer-header')).toHaveTextContent(
-      'Vega Explorer'
-    );
+    expect(screen.getByTestId('navigation')).toHaveTextContent('Explorer');
   });
   it('should render search', () => {
     render(renderComponent());

apps/explorer/src/app/components/header/header.tsx

@@ -1,43 +1,108 @@
-import classnames from 'classnames';
-import { Link } from 'react-router-dom';
-import { ThemeSwitcher, Icon } from '@vegaprotocol/ui-toolkit';
+import { matchPath, useLocation } from 'react-router-dom';
+import {
+  ThemeSwitcher,
+  Navigation,
+  NavigationList,
+  NavigationItem,
+  NavigationLink,
+  NavigationBreakpoint,
+  NavigationTrigger,
+  NavigationContent,
+} from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { Search } from '../search';
 import { Routes } from '../../routes/route-names';
 import { NetworkSwitcher } from '@vegaprotocol/environment';
-import { useNavStore } from '../nav';
+import type { Navigable } from '../../routes/router-config';
+import routerConfig from '../../routes/router-config';
+import { useMemo } from 'react';
+import compact from 'lodash/compact';
+import { Search } from '../search';
+
+const routeToNavigationItem = (r: Navigable) => (
+  <NavigationItem key={r.name}>
+    <NavigationLink to={r.path}>{r.text}</NavigationLink>
+  </NavigationItem>
+);
 
 export const Header = () => {
-  const [open, toggle] = useNavStore((state) => [state.open, state.toggle]);
-  const headerClasses = classnames(
-    'md:col-span-2',
-    'grid grid-rows-2 md:grid-rows-1 grid-cols-[1fr_auto] md:grid-cols-[auto_1fr_auto] items-center',
-    'p-4 gap-2 md:gap-4',
-    'border-b border-neutral-700 dark:border-neutral-300 bg-black',
-    'dark text-white'
+  const mainItems = compact(
+    [Routes.TX, Routes.BLOCKS, Routes.ORACLES, Routes.VALIDATORS].map((n) =>
+      routerConfig.find((r) => r.path === n)
+    )
   );
+
+  const groupedItems = compact(
+    [
+      Routes.PARTIES,
+      Routes.ASSETS,
+      Routes.MARKETS,
+      Routes.GOVERNANCE,
+      Routes.NETWORK_PARAMETERS,
+      Routes.GENESIS,
+    ].map((n) => routerConfig.find((r) => r.path === n))
+  );
+
+  const { pathname } = useLocation();
+
+  /**
+   * Because the grouped items are displayed in a sub menu under an "Other" item
+   * we need to determine whether any underlying item is active to highlight the
+   * trigger in the same fashion as any other top-level `NavigationLink`.
+   * This function checks whether the current location pathname is one of the
+   * underlying NavigationLinks.
+   */
+  const isOnOther = useMemo(() => {
+    for (const path of groupedItems.map((r) => r.path)) {
+      const matched = matchPath(`${path}/*`, pathname);
+      if (matched) return true;
+    }
+    return false;
+  }, [groupedItems, pathname]);
+
   return (
-    <header className={headerClasses}>
-      <div className="flex h-full items-center sm:items-stretch gap-4">
-        <Link to={Routes.HOME}>
-          <h1
-            className="text-white text-3xl font-alpha uppercase calt mb-0"
-            data-testid="explorer-header"
-          >
-            {t('Vega Explorer')}
-          </h1>
-        </Link>
-        <NetworkSwitcher />
-      </div>
-      <button
-        data-testid="open-menu"
-        className="md:hidden text-white"
-        onClick={() => toggle()}
+    <Navigation
+      appName="Explorer"
+      theme="system"
+      breakpoints={[490, 900]}
+      actions={
+        <>
+          <ThemeSwitcher />
+          <Search />
+        </>
+      }
+      onResize={(width, el) => {
+        if (width < 1157) {
+          // switch to magnifying glass trigger when width < 1157
+          el.classList.remove('nav-search-full');
+          el.classList.add('nav-search-compact');
+        } else {
+          el.classList.remove('nav-search-compact');
+          el.classList.add('nav-search-full');
+        }
+      }}
+    >
+      <NavigationList hide={[NavigationBreakpoint.Small]}>
+        <NavigationItem>
+          <NetworkSwitcher />
+        </NavigationItem>
+      </NavigationList>
+      <NavigationList
+        hide={[NavigationBreakpoint.Small, NavigationBreakpoint.Narrow]}
       >
-        <Icon name={open ? 'cross' : 'menu'} />
-      </button>
-      <Search />
-      <ThemeSwitcher className="-my-4" />
-    </header>
+        {mainItems.map(routeToNavigationItem)}
+        {groupedItems && (
+          <NavigationItem>
+            <NavigationTrigger isActive={Boolean(isOnOther)}>
+              {t('Other')}
+            </NavigationTrigger>
+            <NavigationContent>
+              <NavigationList>
+                {groupedItems.map(routeToNavigationItem)}
+              </NavigationList>
+            </NavigationContent>
+          </NavigationItem>
+        )}
+      </NavigationList>
+    </Navigation>
   );
 };

apps/explorer/src/app/components/markets/market-details.tsx

@@ -4,9 +4,8 @@ import {
   getMarketExpiryDateFormatted,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoNoCandlesQuery } from '@vegaprotocol/market-info';
+import type { MarketInfoWithData } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
-import pick from 'lodash/pick';
 import {
   MarketStateMapping,
   MarketTradingModeMapping,
@@ -17,11 +16,7 @@ import BigNumber from 'bignumber.js';
 import { useMemo } from 'react';
 import { Link } from 'react-router-dom';
 
-export const MarketDetails = ({
-  market,
-}: {
-  market: MarketInfoNoCandlesQuery['market'];
-}) => {
+export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   const quoteUnit = market?.tradableInstrument.instrument.product.quoteName;
   const assetId = useMemo(
     () => market?.tradableInstrument.instrument.product?.settlementAsset.id,
@@ -32,7 +27,9 @@ export const MarketDetails = ({
   if (!market) return null;
 
   const keyDetails = {
-    ...pick(market, 'decimalPlaces', 'positionDecimalPlaces', 'tradingMode'),
+    decimalPlaces: market.decimalPlaces,
+    positionDecimalPlaces: market.positionDecimalPlaces,
+    tradingMode: market.tradingMode,
     state: MarketStateMapping[market.state],
   };
   const assetDecimals =

apps/explorer/src/app/components/nav/index.tsx

@@ -1 +0,0 @@
-export * from './nav';

apps/explorer/src/app/components/nav/nav.tsx

@@ -1,181 +0,0 @@
-import { NavLink, useLocation } from 'react-router-dom';
-import type { Navigable } from '../../routes/router-config';
-import routerConfig from '../../routes/router-config';
-import classnames from 'classnames';
-import { create } from 'zustand';
-import {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-} from 'react';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import first from 'lodash/first';
-import last from 'lodash/last';
-import { BREAKPOINT_MD } from '../../config/breakpoints';
-
-type NavStore = {
-  open: boolean;
-  toggle: () => void;
-  hide: () => void;
-};
-
-export const useNavStore = create<NavStore>((set, get) => ({
-  open: false,
-  toggle: () => set({ open: !get().open }),
-  hide: () => set({ open: false }),
-}));
-
-const NavLinks = ({ links }: { links: Navigable[] }) => {
-  const navLinks = links.map((r) => (
-    <li key={r.name}>
-      <NavLink
-        to={r.path}
-        className={({ isActive }) =>
-          classnames(
-            'block mb-2 px-2',
-            'text-lg hover:bg-vega-pink dark:hover:bg-vega-yellow hover:text-white dark:hover:text-black',
-            {
-              'bg-vega-pink text-white dark:bg-vega-yellow dark:text-black':
-                isActive,
-            }
-          )
-        }
-      >
-        {r.text}
-      </NavLink>
-    </li>
-  ));
-
-  return <ul className="pr-8 md:pr-0">{navLinks}</ul>;
-};
-
-export const Nav = () => {
-  const [open, hide] = useNavStore((state) => [state.open, state.hide]);
-  const location = useLocation();
-
-  const navRef = useRef<HTMLElement>(null);
-  const btnRef = useRef<HTMLButtonElement>(null);
-
-  const focusable = useMemo(
-    () =>
-      navRef.current
-        ? [
-            ...(navRef.current.querySelectorAll(
-              'a, button'
-            ) as NodeListOf<HTMLElement>),
-          ]
-        : [],
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [navRef.current] // do not remove `navRef.current` from deps
-  );
-
-  const closeNav = useCallback(() => {
-    hide();
-    console.log(focusable);
-    focusable.forEach((fe) =>
-      fe.setAttribute(
-        'tabindex',
-        window.innerWidth > BREAKPOINT_MD ? '0' : '-1'
-      )
-    );
-  }, [focusable, hide]);
-
-  // close navigation when location changes
-  useEffect(() => {
-    closeNav();
-  }, [closeNav, location]);
-
-  useLayoutEffect(() => {
-    if (open) {
-      focusable.forEach((fe) => fe.setAttribute('tabindex', '0'));
-    }
-
-    document.body.style.overflow = open ? 'hidden' : '';
-    const offset =
-      document.querySelector('header')?.getBoundingClientRect().top || 0;
-    if (navRef.current) {
-      navRef.current.style.height = `calc(100vh - ${offset}px)`;
-    }
-
-    // focus current by default
-    if (navRef.current && open) {
-      (navRef.current.querySelector('a[aria-current]') as HTMLElement)?.focus();
-    }
-
-    const closeOnEsc = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') {
-        closeNav();
-      }
-    };
-
-    // tabbing loop
-    const focusLast = (e: FocusEvent) => {
-      e.preventDefault();
-      const isNavElement =
-        e.relatedTarget && navRef.current?.contains(e.relatedTarget as Node);
-      if (!isNavElement && open) {
-        last(focusable)?.focus();
-      }
-    };
-    const focusFirst = (e: FocusEvent) => {
-      e.preventDefault();
-      const isNavElement =
-        e.relatedTarget && navRef.current?.contains(e.relatedTarget as Node);
-      if (!isNavElement && open) {
-        first(focusable)?.focus();
-      }
-    };
-
-    const resetOnDesktop = () => {
-      focusable.forEach((fe) =>
-        fe.setAttribute(
-          'tabindex',
-          window.innerWidth > BREAKPOINT_MD ? '0' : '-1'
-        )
-      );
-    };
-
-    window.addEventListener('resize', resetOnDesktop);
-
-    first(focusable)?.addEventListener('focusout', focusLast);
-    last(focusable)?.addEventListener('focusout', focusFirst);
-
-    document.addEventListener('keydown', closeOnEsc);
-    return () => {
-      window.removeEventListener('resize', resetOnDesktop);
-      document.removeEventListener('keydown', closeOnEsc);
-      first(focusable)?.removeEventListener('focusout', focusLast);
-      last(focusable)?.removeEventListener('focusout', focusFirst);
-    };
-  }, [closeNav, focusable, open]);
-
-  return (
-    <nav
-      ref={navRef}
-      className={classnames(
-        'absolute top-0 z-20 overflow-y-auto',
-        'transition-[right]',
-        {
-          'right-[-200vw] h-full': !open,
-          'right-0 h-[100vh]': open,
-        },
-        'w-full p-4  border-neutral-700 dark:border-neutral-300',
-        'bg-white dark:bg-black',
-        'md:static md:border-r'
-      )}
-    >
-      <NavLinks links={routerConfig} />
-      <button
-        ref={btnRef}
-        className="absolute top-0 right-0 p-4 md:hidden"
-        onClick={() => {
-          closeNav();
-        }}
-      >
-        <Icon name="cross" />
-      </button>
-    </nav>
-  );
-};

apps/explorer/src/app/components/order-summary/order-cancellation.tsx

@@ -0,0 +1,26 @@
+import { t } from '@vegaprotocol/i18n';
+
+interface CancelSummaryProps {
+  orderId?: string;
+  marketId?: string;
+}
+
+/**
+ * Simple component for rendering a reasonable string from an order cancellation
+ */
+export const CancelSummary = ({ orderId, marketId }: CancelSummaryProps) => {
+  return <span className="font-bold">{getLabel(orderId, marketId)}</span>;
+};
+
+export function getLabel(
+  orderId: string | undefined,
+  marketId: string | undefined
+): string {
+  if (!orderId && !marketId) {
+    return t('All orders');
+  } else if (marketId && !orderId) {
+    return t('All in market');
+  }
+
+  return '-';
+}

apps/explorer/src/app/components/search/search.tsx

@@ -5,11 +5,31 @@ import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 import { getSearchType, SearchTypes, toHex } from './detect-search';
 import { Routes } from '../../routes/route-names';
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
+import classNames from 'classnames';
 
 interface FormFields {
   search: string;
 }
 
+const MagnifyingGlass = () => (
+  <svg
+    className="w-4 h-4"
+    viewBox="0 0 18 18"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <line
+      x1="12.8202"
+      y1="13.1798"
+      x2="17.0629"
+      y2="17.4224"
+      stroke="currentColor"
+    />
+    <circle cx="8" cy="8" r="7.5" stroke="currentColor" />
+  </svg>
+);
+
 export const Search = () => {
   const { register, handleSubmit } = useForm<FormFields>();
   const navigate = useNavigate();
@@ -49,39 +69,95 @@ export const Search = () => {
     [navigate]
   );
 
-  return (
-    <form
-      onSubmit={handleSubmit(onSubmit)}
-      className="w-full md:max-w-[620px] justify-self-end"
-    >
-      <label htmlFor="search" className="sr-only">
-        {t('Search by block number or transaction hash')}
-      </label>
-      <div className="flex items-stretch gap-2">
-        <div className="flex grow relative">
-          <Input
-            {...register('search')}
-            id="search"
-            data-testid="search"
-            className="text-white"
-            hasError={Boolean(error?.message)}
-            type="text"
-            placeholder={t(
-              'Enter block number, public key or transaction hash'
-            )}
-          />
-          {error?.message && (
-            <div className="bg-white border border-t-0 border-accent absolute top-[100%] flex-1 w-full pb-2 px-2 rounded-b text-black">
-              <InputError data-testid="search-error" intent="danger">
-                {error.message}
-              </InputError>
-            </div>
+  const searchForm = (
+    <form className="block min-w-[290px]" onSubmit={handleSubmit(onSubmit)}>
+      <div className="flex relative items-stretch gap-2 text-xs">
+        <label htmlFor="search" className="sr-only">
+          {t('Search by block number or transaction hash')}
+        </label>
+        <button
+          className={classNames(
+            'absolute top-[50%] translate-y-[-50%] left-2',
+            'text-vega-light-300 dark:text-vega-dark-300'
           )}
-        </div>
-        <Button type="submit" size="sm" data-testid="search-button">
+        >
+          <MagnifyingGlass />
+        </button>
+        <Input
+          {...register('search')}
+          id="search"
+          data-testid="search"
+          className={classNames(
+            'peer',
+            'pl-8 py-2 text-xs',
+            'border rounded border-vega-light-200 dark:border-vega-dark-200'
+          )}
+          hasError={Boolean(error?.message)}
+          type="text"
+          placeholder={t('Enter block number, public key or transaction hash')}
+        />
+        {error?.message && (
+          <div
+            className={classNames(
+              'hidden peer-focus:block',
+              'bg-white dark:bg-black',
+              'border rounded-b border-t-0 border-vega-light-200 dark:border-vega-dark-200',
+              'absolute top-[100%] flex-1 w-full pb-2 px-2 text-black dark:text-white'
+            )}
+          >
+            <InputError
+              data-testid="search-error"
+              intent="danger"
+              className="text-xs"
+            >
+              {error.message}
+            </InputError>
+          </div>
+        )}
+        <Button
+          className="hidden [.search-dropdown_&]:block"
+          type="submit"
+          size="xs"
+          data-testid="search-button"
+        >
           {t('Search')}
         </Button>
       </div>
     </form>
   );
+
+  const searchTrigger = (
+    <DropdownMenu.Root>
+      <DropdownMenu.Trigger asChild>
+        <button className="text-vega-light-300 dark:text-vega-dark-300 data-open:text-black dark:data-open:text-white flex items-center">
+          <MagnifyingGlass />
+        </button>
+      </DropdownMenu.Trigger>
+      <DropdownMenu.Portal>
+        <DropdownMenu.Content
+          className={classNames(
+            'search-dropdown',
+            'p-2 min-w-[290px] z-20',
+            'text-vega-light-300 dark:text-vega-dark-300',
+            'bg-white dark:bg-black',
+            'border rounded border-vega-light-200 dark:border-vega-dark-200',
+            'shadow-[8px_8px_16px_0_rgba(0,0,0,0.4)]'
+          )}
+          align="end"
+          sideOffset={10}
+        >
+          {searchForm}
+        </DropdownMenu.Content>
+      </DropdownMenu.Portal>
+    </DropdownMenu.Root>
+  );
+
+  return (
+    <>
+      <div className="hidden [.nav-search-full_&]:block">{searchForm}</div>
+      <div className="hidden [.nav-search-compact_&]:block">
+        {searchTrigger}
+      </div>
+    </>
+  );
 };

apps/explorer/src/app/components/txs/details/batch-submission/batch-cancel.tsx

@@ -2,6 +2,7 @@ import type { BatchCancellationInstruction } from '../../../../routes/types/bloc
 import { TxOrderType } from '../../tx-order-type';
 import { MarketLink } from '../../../links';
 import OrderSummary from '../../../order-summary/order-summary';
+import { CancelSummary } from '../../../order-summary/order-cancellation';
 
 interface BatchCancelProps {
   index: number;
@@ -19,7 +20,14 @@ export const BatchCancel = ({ index, submission }: BatchCancelProps) => {
         <TxOrderType orderType={'OrderCancellation'} />
       </td>
       <td>
-        <OrderSummary id={submission.orderId} modifier="cancelled" />
+        {submission.orderId ? (
+          <OrderSummary id={submission.orderId} modifier="cancelled" />
+        ) : (
+          <CancelSummary
+            orderId={submission.orderId}
+            marketId={submission.marketId}
+          />
+        )}
       </td>
       <td>
         <MarketLink id={submission.marketId} />

apps/explorer/src/app/components/txs/details/tx-order-cancel.tsx

@@ -5,6 +5,8 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import DeterministicOrderDetails from '../../order-details/deterministic-order-details';
+import { CancelSummary } from '../../order-summary/order-cancellation';
+import Hash from '../../links/hash';
 
 interface TxDetailsOrderCancelProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -24,8 +26,8 @@ export const TxDetailsOrderCancel = ({
     return <>{t('Awaiting Block Explorer transaction details')}</>;
   }
 
-  const marketId: string = txData.command.orderCancellation.marketId || '-';
-  const orderId: string = txData.command.orderCancellation.orderId || '-';
+  const marketId: string = txData.command.orderCancellation.marketId;
+  const orderId: string = txData.command.orderCancellation.orderId;
 
   return (
     <>
@@ -38,18 +40,24 @@ export const TxDetailsOrderCancel = ({
         <TableRow modifier="bordered">
           <TableCell>{t('Order')}</TableCell>
           <TableCell>
-            <code>{orderId}</code>
-          </TableCell>
-        </TableRow>
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market')}</TableCell>
-          <TableCell>
-            <MarketLink id={marketId} />
+            {orderId ? (
+              <Hash text={orderId} />
+            ) : (
+              <CancelSummary orderId={orderId} marketId={marketId} />
+            )}
           </TableCell>
         </TableRow>
+        {marketId ? (
+          <TableRow modifier="bordered">
+            <TableCell>{t('Market')}</TableCell>
+            <TableCell>
+              <MarketLink id={marketId} />
+            </TableCell>
+          </TableRow>
+        ) : null}
       </TableWithTbody>
 
-      {orderId !== '-' ? <DeterministicOrderDetails id={orderId} /> : null}
+      {orderId ? <DeterministicOrderDetails id={orderId} /> : null}
     </>
   );
 };

apps/explorer/src/app/routes/governance/proposals-page.tsx

@@ -12,6 +12,7 @@ export const Proposals = () => {
 
   const { data, loading, error } = useDataProvider({
     dataProvider: proposalsDataProvider,
+    variables: {},
   });
 
   useDocumentTitle([t('Governance Proposals')]);

apps/explorer/src/app/routes/markets/market-page.tsx

@@ -1,14 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { MarketDetails } from '../../components/markets/market-details';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoNoCandlesDataProvider } from '@vegaprotocol/market-info';
+import { marketInfoProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
 export const MarketPage = () => {
@@ -16,24 +16,17 @@ export const MarketPage = () => {
 
   const { marketId } = useParams<{ marketId: string }>();
 
-  const variables = useMemo(
-    () => ({
-      marketId,
-    }),
-    [marketId]
-  );
-
   const { data, loading, error } = useDataProvider({
-    dataProvider: marketInfoNoCandlesDataProvider,
+    dataProvider: marketInfoProvider,
     skipUpdates: true,
-    variables,
+    variables: {
+      marketId: marketId || '',
+      skip: !marketId,
+    },
   });
 
   useDocumentTitle(
-    compact([
-      'Market details',
-      data?.market?.tradableInstrument.instrument.name,
-    ])
+    compact(['Market details', data?.tradableInstrument.instrument.name])
   );
 
   const [dialogOpen, setDialogOpen] = useState<boolean>(false);
@@ -43,10 +36,10 @@ export const MarketPage = () => {
       <section className="relative">
         <PageTitle
           data-testid="markets-heading"
-          title={data?.market?.tradableInstrument.instrument.name || ''}
+          title={data?.tradableInstrument.instrument.name || ''}
           actions={
             <Button
-              disabled={!data?.market}
+              disabled={!data}
               size="xs"
               onClick={() => setDialogOpen(true)}
             >
@@ -60,14 +53,14 @@ export const MarketPage = () => {
           loading={loading}
           error={error}
         >
-          <MarketDetails market={data?.market} />
+          {data && <MarketDetails market={data} />}
         </AsyncRenderer>
       </section>
       <JsonViewerDialog
         open={dialogOpen}
         onChange={(isOpen) => setDialogOpen(isOpen)}
-        title={data?.market?.tradableInstrument.instrument.name || ''}
-        content={data?.market}
+        title={data?.tradableInstrument.instrument.name || ''}
+        content={data}
       />
     </>
   );

apps/explorer/src/app/routes/markets/markets-page.tsx

@@ -13,6 +13,7 @@ export const MarketsPage = () => {
 
   const { data, loading, error } = useDataProvider({
     dataProvider: marketsProvider,
+    variables: undefined,
     skipUpdates: true,
   });
 

apps/explorer/src/app/routes/network-parameters/network-parameters.tsx

@@ -31,6 +31,7 @@ const PERCENTAGE_PARAMS = [
   'governance.proposal.updateMarket.requiredParticipationLP',
   'governance.proposal.updateNetParam.requiredMajority',
   'governance.proposal.updateNetParam.requiredParticipation',
+  'governance.proposal.updateMarket.minProposerEquityLikeShare',
   'validators.vote.required',
 ];
 

apps/explorer/src/app/routes/router-config.tsx

@@ -23,14 +23,18 @@ import { NetworkParameters } from './network-parameters';
 import type { RouteObject } from 'react-router-dom';
 import { MarketPage, MarketsPage } from './markets';
 
-export type Navigable = { path: string; name: string; text: string };
+export type Navigable = {
+  path: string;
+  name: string;
+  text: string;
+};
 type Route = RouteObject & Navigable;
 
 const partiesRoutes: Route[] = flags.parties
   ? [
       {
         path: Routes.PARTIES,
-        name: 'Parties',
+        name: t('Parties'),
         text: t('Parties'),
         element: <Party />,
         children: [
@@ -52,7 +56,7 @@ const assetsRoutes: Route[] = flags.assets
       {
         path: Routes.ASSETS,
         text: t('Assets'),
-        name: 'Assets',
+        name: t('Assets'),
         children: [
           {
             index: true,
@@ -71,7 +75,7 @@ const genesisRoutes: Route[] = flags.genesis
   ? [
       {
         path: Routes.GENESIS,
-        name: 'Genesis',
+        name: t('Genesis'),
         text: t('Genesis Parameters'),
         element: <Genesis />,
       },
@@ -82,7 +86,7 @@ const governanceRoutes: Route[] = flags.governance
   ? [
       {
         path: Routes.GOVERNANCE,
-        name: 'Governance proposals',
+        name: t('Governance proposals'),
         text: t('Governance Proposals'),
         element: <Proposals />,
       },
@@ -93,7 +97,7 @@ const marketsRoutes: Route[] = flags.markets
   ? [
       {
         path: Routes.MARKETS,
-        name: 'Markets',
+        name: t('Markets'),
         text: t('Markets'),
         children: [
           {
@@ -113,17 +117,18 @@ const networkParametersRoutes: Route[] = flags.networkParameters
   ? [
       {
         path: Routes.NETWORK_PARAMETERS,
-        name: 'NetworkParameters',
+        name: t('NetworkParameters'),
         text: t('Network Parameters'),
         element: <NetworkParameters />,
       },
     ]
   : [];
+
 const validators: Route[] = flags.validators
   ? [
       {
         path: Routes.VALIDATORS,
-        name: 'Validators',
+        name: t('Validators'),
         text: t('Validators'),
         element: <ValidatorsPage />,
       },
@@ -133,14 +138,14 @@ const validators: Route[] = flags.validators
 const routerConfig: Route[] = [
   {
     path: Routes.HOME,
-    name: 'Home',
+    name: t('Home'),
     text: t('Home'),
     element: <Home />,
     index: true,
   },
   {
     path: Routes.TX,
-    name: 'Txs',
+    name: t('Txs'),
     text: t('Transactions'),
     element: <Txs />,
     children: [
@@ -160,7 +165,7 @@ const routerConfig: Route[] = [
   },
   {
     path: Routes.BLOCKS,
-    name: 'Blocks',
+    name: t('Blocks'),
     text: t('Blocks'),
     element: <BlockPage />,
     children: [
@@ -176,7 +181,7 @@ const routerConfig: Route[] = [
   },
   {
     path: Routes.ORACLES,
-    name: 'Oracles',
+    name: t('Oracles'),
     text: t('Oracles'),
     element: <OraclePage />,
     children: [

apps/explorer/src/app/routes/validators/validators-page.tsx

@@ -176,25 +176,14 @@ export const ValidatorsPage = () => {
               const validatorName =
                 v.name && v.name.length > 0 ? v.name : truncateMiddle(v.id);
               return (
-                <li className="mb-5" key={v.id}>
+                <li className="mb-5 relative" key={v.id}>
                   <div
                     data-testid="validator-tile"
                     validator-id={v.id}
-                    className="border border-vega-light-200 dark:border-vega-dark-200 rounded p-2 overflow-hidden relative flex gap-2 items-start justify-between"
+                    className="border border-vega-light-200 dark:border-vega-dark-200 rounded p-2 overflow-hidden"
                   >
-                    {v.avatarUrl && (
-                      <div className="w-20">
-                        <ExternalLink href={validatorPage}>
-                          <img
-                            className="w-full"
-                            src={v.avatarUrl}
-                            alt={validatorName}
-                          />
-                        </ExternalLink>
-                      </div>
-                    )}
                     <div className="w-full">
-                      <h2 className="font-alpha text-2xl">
+                      <h2 className="font-alpha text-2xl leading-[60px]">
                         <ExternalLink href={validatorPage}>
                           {validatorName}
                         </ExternalLink>
@@ -315,6 +304,23 @@ export const ValidatorsPage = () => {
                             </div>
                           </div>
                         </KeyValueTableRow>
+                        {v.avatarUrl && (
+                          <KeyValueTableRow>
+                            <div>{t('Avatar')}</div>
+                            <div>
+                              <ExternalLink
+                                href={validatorPage}
+                                className="mx-auto"
+                              >
+                                <img
+                                  className="max-w-[75px] md:max-w-[200px] max-h-[80px]"
+                                  src={v.avatarUrl}
+                                  alt={validatorName}
+                                />
+                              </ExternalLink>
+                            </div>
+                          </KeyValueTableRow>
+                        )}
                       </KeyValueTable>
                     </div>
                   </div>

apps/explorer/src/app/setup-tests.ts

@@ -3,3 +3,13 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
+
+Object.defineProperty(window, 'ResizeObserver', {
+  writable: false,
+  value: jest.fn().mockImplementation(() => ({
+    observe: jest.fn(),
+    unobserve: jest.fn(),
+    connect: jest.fn(),
+    disconnect: jest.fn(),
+  })),
+});

apps/governance-e2e/src/fixtures/mocks/tranches.ts

@@ -0,0 +1,83 @@
+export const trancheData = {
+  '0': {
+    tranche_id: 0,
+    users: [],
+    initial_balance: 0,
+    current_balance: 0,
+    cliff_start: 0,
+    duration: 0,
+  },
+  '1': {
+    tranche_id: 1,
+    users: [],
+    initial_balance: 0,
+    current_balance: 0,
+    cliff_start: 1670422330,
+    duration: 1670453883,
+  },
+  '107': {
+    tranche_id: 107,
+    users: [],
+    initial_balance: 0,
+    current_balance: 0,
+    cliff_start: 0,
+    duration: 0,
+  },
+  '110': {
+    tranche_id: 110,
+    users: [],
+    initial_balance: 0,
+    current_balance: 0,
+    cliff_start: 0,
+    duration: 0,
+  },
+  '154': {
+    tranche_id: 154,
+    users: [],
+    initial_balance: 0,
+    current_balance: 0,
+    cliff_start: 0,
+    duration: 0,
+  },
+  '2': {
+    tranche_id: 2,
+    users: [
+      '0x8716c75bb3abe54b959adc529e6355f0422454ed',
+      '0xc704da0e96a6b910ffa8d3f9f667d3d35db8e5a1',
+      '0xbb82d4d6e4381ae98f8c33629285867b54d91a03',
+      '0x82ffe4ed818a6c7d4f0f044998611f24ec916c43',
+      '0xb0594132540ebc14f17863f8296f4546a7afe4e7',
+      '0x9015a3db9a922521007a9b495cafda14d8d4128e',
+      '0x5426f7f717fdbe331bb5a99b908ad2fb75dff711',
+      '0xf73e7ad8aa300a7f86bcc4d55e6c4ea25546e057',
+    ],
+    initial_balance: 111300000000000000000,
+    current_balance: 111297025049610000000,
+    cliff_start: 1677578461,
+    duration: 15209600,
+  },
+  '3': {
+    tranche_id: 3,
+    users: [
+      '0xbb82d4d6e4381ae98f8c33629285867b54d91a03',
+      '0x82ffe4ed818a6c7d4f0f044998611f24ec916c43',
+      '0xb0594132540ebc14f17863f8296f4546a7afe4e7',
+      '0x9015a3db9a922521007a9b495cafda14d8d4128e',
+      '0x77a0b7e247b7b8ec99e068a24c401783d6c4dfff',
+      '0x5426f7f717fdbe331bb5a99b908ad2fb75dff711',
+      '0xc704da0e96a6b910ffa8d3f9f667d3d35db8e5a1',
+    ],
+    initial_balance: 21000000000000000000,
+    current_balance: 21000000000000000000,
+    cliff_start: 1677578461,
+    duration: 18628800,
+  },
+  '66': {
+    tranche_id: 66,
+    users: [],
+    initial_balance: 0,
+    current_balance: 0,
+    cliff_start: 0,
+    duration: 0,
+  },
+};

apps/governance-e2e/src/fixtures/proposals/new-market.json

@@ -22,7 +22,7 @@
               "filters": [
                 {
                   "key": {
-                    "name": "prices.ETH.value",
+                    "name": "prices.BTC.value",
                     "type": "TYPE_INTEGER",
                     "numberDecimalPlaces": "0"
                   },
@@ -38,30 +38,34 @@
           }
         },
         "dataSourceSpecForTradingTermination": {
-          "signers": [
-            {
-              "pubKey": {
-                "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-              }
-            }
-          ],
-          "filters": [
-            {
-              "key": {
-                "name": "trading.terminated.ETH5",
-                "type": "TYPE_BOOLEAN"
-              },
-              "conditions": [
+          "external": {
+            "oracle": {
+              "signers": [
                 {
-                  "operator": "OPERATOR_EQUALS",
-                  "value": "true"
+                  "pubKey": {
+                    "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                  }
+                }
+              ],
+              "filters": [
+                {
+                  "key": {
+                    "name": "trading.terminated.ETH5",
+                    "type": "TYPE_BOOLEAN"
+                  },
+                  "conditions": [
+                    {
+                      "operator": "OPERATOR_EQUALS",
+                      "value": "true"
+                    }
+                  ]
                 }
               ]
             }
-          ]
+          }
         },
         "dataSourceSpecBinding": {
-          "settlementPriceProperty": "prices.BTC.value",
+          "settlementDataProperty": "prices.BTC.value",
           "tradingTerminationProperty": "trading.terminated.ETH5"
         }
       }

apps/governance-e2e/src/fixtures/proposals/update-market-old.json

@@ -0,0 +1,86 @@
+{
+  "lpPriceRange": "11",
+  "instrument": {
+    "code": "Token.24h",
+    "future": {
+      "quoteName": "fBTC",
+      "dataSourceSpecForSettlementData": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "prices.BTC.value",
+                  "type": "TYPE_INTEGER"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN",
+                    "value": "0"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecForTradingTermination": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "trading.terminated.ETH5",
+                  "type": "TYPE_BOOLEAN"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                    "value": "1648684800000000000"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecBinding": {
+        "settlementDataProperty": "prices.BTC.value",
+        "tradingTerminationProperty": "trading.terminated.ETH5"
+      }
+    }
+  },
+  "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
+  "priceMonitoringParameters": {
+    "triggers": [
+      {
+        "horizon": "43200",
+        "probability": "0.9999999",
+        "auctionExtension": "600"
+      }
+    ]
+  },
+  "logNormal": {
+    "tau": 0.0001140771161,
+    "riskAversionParameter": 0.001,
+    "params": {
+      "mu": 0,
+      "r": 0.016,
+      "sigma": 0.3
+    }
+  }
+}

apps/governance-e2e/src/fixtures/proposals/update-market.json

@@ -1,62 +1,76 @@
 {
+  "lpPriceRange": "10",
   "instrument": {
     "code": "TEST.24h",
     "future": {
       "quoteName": "fUSDC",
-      "settlementDataDecimals": 5,
       "dataSourceSpecForSettlementData": {
-        "signers": [
-          {
-            "pubKey": {
-              "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-            }
-          }
-        ],
-        "filters": [
-          {
-            "key": {
-              "name": "prices.ETH.value",
-              "type": "TYPE_INTEGER"
-            },
-            "conditions": [
+        "external": {
+          "oracle": {
+            "signers": [
               {
-                "operator": "OPERATOR_GREATER_THAN",
-                "value": "0"
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "prices.ETH.value",
+                  "type": "TYPE_INTEGER",
+                  "numberDecimalPlaces": "0"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN",
+                    "value": "0"
+                  }
+                ]
               }
             ]
           }
-        ]
+        }
       },
       "dataSourceSpecForTradingTermination": {
-        "signers": [
-          {
-            "pubKey": {
-              "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-            }
-          }
-        ],
-        "filters": [
-          {
-            "key": {
-              "name": "trading.terminated.ETH5",
-              "type": "TYPE_BOOLEAN"
-            },
-            "conditions": [
+        "external": {
+          "oracle": {
+            "signers": [
               {
-                "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
-                "value": "1648684800000000000"
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "trading.terminated.ETH5",
+                  "type": "TYPE_BOOLEAN"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_EQUALS",
+                    "value": "true"
+                  }
+                ]
               }
             ]
           }
-        ]
+        }
       },
       "dataSourceSpecBinding": {
-        "settlementPriceProperty": "prices.ETH.value",
+        "settlementDataProperty": "prices.ETH.value",
         "tradingTerminationProperty": "trading.terminated.ETH5"
       }
     }
   },
-  "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
+  "metadata": [
+    "sector:energy",
+    "sector:food",
+    "source:docs.vega.xyz",
+    "test:update"
+  ],
   "priceMonitoringParameters": {
     "triggers": [
       {
@@ -66,6 +80,14 @@
       }
     ]
   },
+  "liquidityMonitoringParameters": {
+    "targetStakeParameters": {
+      "timeWindow": "3600",
+      "scalingFactor": 10
+    },
+    "triggeringRatio": "0.7",
+    "auctionExtension": "1"
+  },
   "logNormal": {
     "tau": 0.0001140771161,
     "riskAversionParameter": 0.001,

apps/governance-e2e/src/integration/flow/proposal-forms.cy.js

@@ -26,6 +26,10 @@ const enactmentDeadlineError =
   '[data-testid="enactment-before-voting-deadline"]';
 const proposalDownloadBtn = '[data-testid="proposal-download-json"]';
 const feedbackError = '[data-testid="Error"]';
+const viewProposalBtn = 'view-proposal-btn';
+const liquidityVoteStatus = 'liquidity-votes-status';
+const tokenVoteStatus = 'token-votes-status';
+const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
@@ -45,6 +49,7 @@ context(
   { tags: '@slow' },
   function () {
     before('connect wallets and set approval limit', function () {
+      cy.createMarket();
       cy.visit('/');
       cy.vega_wallet_set_specified_approval_amount('1000');
     });
@@ -65,7 +70,7 @@ context(
       // 3002-PROP-007
       cy.get(newProposalDescription).type('E2E test for proposals');
 
-      cy.get(proposalParameterSelect).find('option').should('have.length', 116);
+      cy.get(proposalParameterSelect).find('option').should('have.length', 117);
       cy.get(proposalParameterSelect).select(
         // 3007-PNEC-002
         'governance_proposal_asset_minEnact'
@@ -175,9 +180,8 @@ context(
       cy.get(enactmentDeadlineError).should('not.exist');
     });
 
-    // Skipping because unclear what the required json is yet for new market proposal, will update once docs have been updated
-    // 3003-todo-PMAN-001
-    it.skip('Able to submit valid new market proposal', function () {
+    // 3003-PMAN-001
+    it('Able to submit valid new market proposal', function () {
       cy.go_to_make_new_proposal(governanceProposalType.NEW_MARKET);
       cy.get(newProposalTitle).type('Test new market proposal');
       cy.get(newProposalDescription).type('E2E test for proposals');
@@ -199,6 +203,7 @@ context(
       cy.get(newProposalTitle).type('Test new market proposal');
       cy.get(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/new-market').then((newMarketProposal) => {
+        newMarketProposal.invalid = 'I am an invalid field';
         let newMarketPayload = JSON.stringify(newMarketProposal);
         cy.get(newProposalTerms).type(newMarketPayload, {
           parseSpecialCharSequences: false,
@@ -209,11 +214,66 @@ context(
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       cy.get(feedbackError).should(
         'have.text',
-        'Invalid params: the transaction is malformed'
+        'Invalid params: the transaction is not a valid Vega command: unknown field "invalid" in vega.NewMarket'
       );
     });
 
-    it.skip('Able to submit update market proposal', function () {
+    // Will fail if run after 'Able to submit update market proposal and vote for proposal'
+    // 3002-PROP-022
+    it('Unable to submit update market proposal without equity-like share in the market', function () {
+      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
+      cy.get(newProposalTitle).type('Test update market proposal - rejected');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.get(proposalMarketSelect).select('Test market 1');
+      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
+        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
+      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
+      cy.getByTestId('dialog-content')
+        .find('p')
+        .should('have.text', 'PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
+      cy.ensure_specified_unstaked_tokens_are_associated('1');
+    });
+
+    // 3002-PROP-020
+    it('Unable to submit update market proposal without minimum amount of tokens', function () {
+      cy.vega_wallet_teardown();
+      cy.vega_wallet_faucet_assets_without_check(
+        'fUSDC',
+        '1000000',
+        vegaWalletPublicKey
+      );
+      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
+      cy.get(newProposalTitle).type('Test update market proposal - rejected');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.get(proposalMarketSelect).select('Test market 1');
+      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
+        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
+      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
+      cy.get(feedbackError).should(
+        'have.text',
+        'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)'
+      );
+    });
+
+    // 3001-VOTE-092
+    it('Able to submit update market proposal and vote for proposal', function () {
+      cy.vega_wallet_faucet_assets_without_check(
+        'fUSDC',
+        '1000000',
+        vegaWalletPublicKey
+      );
       cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
       cy.get(newProposalTitle).type('Test update market proposal');
       cy.get(newProposalDescription).type('E2E test for proposals');
@@ -222,6 +282,10 @@ context(
         cy.get('dd').eq(0).should('have.text', 'Test market 1');
         cy.get('dd').eq(1).should('have.text', 'TEST.24h');
         cy.get('dd').eq(2).should('not.be.empty');
+        cy.get('dd').eq(2).invoke('text').as('EnactedMarketId');
+      });
+      cy.get('@EnactedMarketId').then((marketId) => {
+        cy.VegaWalletSubmitLiquidityProvision(marketId, '1');
       });
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
@@ -232,6 +296,34 @@ context(
       });
       cy.get(newProposalSubmitButton).should('be.visible').click();
       cy.wait_for_proposal_submitted();
+      cy.navigate_to('proposals');
+      cy.get('@EnactedMarketId').then((marketId) => {
+        cy.contains(marketId)
+          .parentsUntil(proposalListItem)
+          .within(() => {
+            cy.getByTestId(viewProposalBtn).click();
+          });
+      });
+      cy.getByTestId(liquidityVoteStatus).should(
+        'contain.text',
+        'Currently expected to fail'
+      );
+      cy.getByTestId(tokenVoteStatus).should(
+        'contain.text',
+        'Currently expected to fail'
+      );
+      cy.vote_for_proposal('for');
+      cy.getByTestId(liquidityVoteStatus).should(
+        'contain.text',
+        'Currently expected to pass'
+      );
+      cy.getByTestId(tokenVoteStatus).should(
+        'contain.text',
+        'Currently expected to pass'
+      );
+      cy.get_proposal_information_from_table('Expected to pass')
+        .contains('👍 by Token vote')
+        .should('be.visible');
     });
 
     // 3001-VOTE-026 3001-VOTE-027  3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
@@ -298,7 +390,7 @@ context(
           .parentsUntil(proposalListItem)
           .within(() => {
             cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
-            cy.getByTestId('view-proposal-btn').click();
+            cy.getByTestId(viewProposalBtn).click();
           });
       });
       cy.get_proposal_information_from_table('Proposed enactment') // 3001-VOTE-044

apps/governance-e2e/src/integration/flow/staking-flow.cy.js

@@ -14,13 +14,14 @@ const stakeShare = '[data-testid="stake-percentage"]';
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
 const vegaWalletUnstakedBalance =
-  '[data-testid="vega-wallet-balance-unstaked"]';
+  '[data-testid="vega-wallet-balance-unstaked"]:visible';
 const vegaWalletStakedBalances =
   '[data-testid="vega-wallet-balance-staked-validators"]';
 const ethWalletAssociatedBalances =
   '[data-testid="eth-wallet-associated-balances"]';
-const ethWalletTotalAssociatedBalance = '[data-testid="currency-locked"]';
-const ethWalletContainer = '[data-testid="ethereum-wallet"]';
+const ethWalletTotalAssociatedBalance =
+  '[data-testid="currency-locked"]:visible';
+const ethWalletContainer = '[data-testid="ethereum-wallet"]:visible';
 const vegaWallet = '[data-testid="vega-wallet"]';
 const partValidatorId = '…';
 const txTimeout = Cypress.env('txTimeout');

apps/governance-e2e/src/integration/view/home.cy.js

@@ -1,60 +1,10 @@
-const navSection = 'nav';
-const navSupply = '[href="/token/tranches"]';
-const navToken = '[href="/token"]';
-const navStaking = '[href="/validators"]';
-const navRewards = '[href="/rewards"]';
-const navWithdraw = '[href="/token/withdraw"]';
-const navGovernance = '[href="/proposals"]';
-const navRedeem = '[href="/token/redeem"]';
-
 context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
   before('visit token home page', function () {
     cy.visit('/');
+    cy.get('nav', { timeout: 10000 }).should('be.visible');
   });
 
   describe('with wallets disconnected', function () {
-    before('wait for page to load', function () {
-      cy.get(navSection, { timeout: 10000 }).should('be.visible');
-    });
-
-    describe('Navigation tabs', function () {
-      it('should have proposals tab', function () {
-        cy.get(navSection).within(() => {
-          cy.get(navGovernance).should('be.visible');
-        });
-      });
-      it('should have validators tab', function () {
-        cy.get(navSection).within(() => {
-          cy.get(navStaking).should('be.visible');
-        });
-      });
-      it('should have rewards tab', function () {
-        cy.get(navSection).within(() => {
-          cy.get(navRewards).should('be.visible');
-        });
-      });
-
-      describe('Token dropdown', function () {
-        before('click on token dropdown', function () {
-          cy.get(navSection).within(() => {
-            cy.getByTestId('state-trigger').realClick();
-          });
-        });
-        it('should have token dropdown', function () {
-          cy.get(navToken).should('be.visible');
-        });
-        it('should have supply & vesting dropdown', function () {
-          cy.get(navSupply).should('be.visible');
-        });
-        it('should have withdraw dropdown', function () {
-          cy.get(navWithdraw).should('be.visible');
-        });
-        it('should have redeem dropdown', function () {
-          cy.get(navRedeem).should('be.visible');
-        });
-      });
-    });
-
     describe('Links and buttons', function () {
       it('should have link for proposal page', function () {
         cy.getByTestId('home-proposals').within(() => {

apps/governance-e2e/src/integration/view/pages.cy.js

@@ -0,0 +1,284 @@
+context(
+  'Landing pages - verifies required elements',
+  { tags: '@smoke' },
+  () => {
+    const navbar = 'nav .navbar';
+    const mobileNav = '[data-testid="menu-drawer"]';
+
+    const topLevelLinks = [
+      {
+        name: 'Proposals',
+        selector: '[href="/proposals"]',
+        tests: () => {
+          it('should be able to see a working link for - find out more about Vega governance', function () {
+            const governanceDocsUrl = 'https://vega.xyz/governance';
+            const proposalDocumentationLink =
+              '[data-testid="proposal-documentation-link"]';
+            // 3001-VOTE-001
+            cy.get(proposalDocumentationLink)
+              .should('be.visible')
+              .and('have.text', 'Find out more about Vega governance')
+              .and('have.attr', 'href')
+              .and('equal', governanceDocsUrl);
+
+            // 3002-PROP-001
+            cy.request(governanceDocsUrl)
+              .its('body')
+              .then((body) => {
+                if (!body.includes('Govern the network')) {
+                  assert.include(
+                    body,
+                    'Govern the network',
+                    `Checking that governance link destination includes 'Govern the network' text`
+                  );
+                }
+              });
+          });
+
+          it('should be able to see button for - new proposal', function () {
+            // 3001-VOTE-002
+            const newProposalLink = '[data-testid="new-proposal-link"]';
+            cy.get(newProposalLink)
+              .should('be.visible')
+              .and('have.text', 'New proposal')
+              .and('have.attr', 'href')
+              .and('equal', '/proposals/propose');
+          });
+        },
+      },
+      {
+        name: 'Validators',
+        selector: '[href="/validators"]',
+        tests: () => {
+          it('Should have Staking Guide link visible', function () {
+            // 2001-STKE-003
+            cy.get('[data-testid="staking-guide-link"]')
+              .should('be.visible')
+              .and('have.text', 'Read more about staking on Vega')
+              .and(
+                'have.attr',
+                'href',
+                'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
+              );
+          });
+        },
+      },
+      {
+        name: 'Rewards',
+        selector: '[href="/rewards"]',
+        header: 'Rewards and fees',
+        tests: () => {
+          it('should have epoch warning', () => {
+            cy.get('[data-testid="callout"]')
+              .should('be.visible')
+              .and(
+                'have.text',
+                'Rewards are credited 5 minutes after the epoch ends.This delay is set by a network parameter'
+              );
+          });
+          it('should have toggle for seeing total vs individual rewards', () => {
+            cy.get('[data-testid="epoch-reward-view-toggle-total"]').should(
+              'be.visible'
+            );
+          });
+        },
+      },
+    ];
+
+    const secondLevelLinks = [
+      {
+        trigger: true,
+        name: 'Token',
+        selector: '[data-testid="state-trigger"]',
+      },
+      {
+        name: 'Token',
+        selector: '[href="/token"]',
+        header: 'The $VEGA token',
+      },
+      {
+        name: 'Supply & Vesting',
+        selector: '[href="/token/tranches"]',
+        header: 'Vesting tranches',
+      },
+      {
+        name: 'Withdraw',
+        selector: '[href="/token/withdraw"]',
+        header: 'Withdrawals',
+        tests: () => {
+          it('should have connect Vega wallet button', function () {
+            cy.get('[data-testid="connect-to-vega-wallet-btn"]')
+              .should('be.visible')
+              .and('have.text', 'Connect Vega wallet');
+          });
+        },
+      },
+      {
+        name: 'Redeem',
+        selector: '[href="/token/redeem"]',
+        header: 'Vesting',
+        tests: () => {
+          // 1005-VEST-018
+          it('should have connect Eth wallet button', function () {
+            cy.get('[data-testid="connect-to-eth-btn"]')
+              .should('be.visible')
+              .and('have.text', 'Connect Ethereum wallet');
+          });
+        },
+      },
+      {
+        name: 'Associate',
+        selector: '[href="/token/associate"]',
+        header: 'Associate $VEGA tokens with Vega Key',
+      },
+      {
+        name: 'Disassociate',
+        selector: '[href="/token/disassociate"]',
+        header: 'Disassociate $VEGA tokens from a Vega key',
+      },
+    ];
+
+    const expand = () => {
+      const trigger = secondLevelLinks.find((l) => l.trigger).selector;
+      cy.get(trigger).then((el) => {
+        if (el.attr('aria-expanded') === 'false') {
+          el.trigger('click');
+        }
+      });
+    };
+
+    const collapse = () => {
+      const trigger = secondLevelLinks.find((l) => l.trigger).selector;
+      cy.get(trigger).then((el) => {
+        if (el.attr('aria-expanded') === 'true') {
+          el.trigger('click');
+        }
+      });
+    };
+
+    const ensureHeader = (text) => {
+      cy.get('main header h1').should('have.text', text);
+    };
+
+    before(() => {
+      // goes to HOME
+      cy.visit('/');
+      // and waits for it to load
+      cy.get(navbar, { timeout: 10000 }).should('be.visible');
+    });
+
+    describe('Navigation (desktop)', () => {
+      for (const { name, selector } of topLevelLinks) {
+        it(`should have ${name} nav link`, () => {
+          cy.get(navbar).within(() => {
+            cy.get(selector).should('be.visible');
+            cy.get(selector).should('have.text', name);
+          });
+        });
+      }
+
+      for (const { name, selector, trigger } of secondLevelLinks) {
+        it(`should have ${name} ${
+          trigger ? 'as trigger button' : ''
+        } second level nav link`, () => {
+          cy.get(navbar).within(() => {
+            cy.get(selector).should('be.visible');
+            cy.get(selector).should('have.text', name);
+            if (trigger) cy.get(selector).click();
+          });
+        });
+      }
+
+      after(() => {
+        collapse();
+      });
+    });
+
+    describe('Navigation (mobile)', () => {
+      beforeEach(() => {
+        // iphone xr
+        cy.viewport(414, 896);
+      });
+
+      it('should have burger button', () => {
+        cy.get('[data-testid="button-menu-drawer"]').should('be.visible');
+        cy.get('[data-testid="button-menu-drawer"]').click();
+        cy.get(mobileNav).should('be.visible');
+      });
+
+      for (const { name, selector } of topLevelLinks) {
+        it(`should have ${name} nav link`, () => {
+          cy.get(mobileNav).within(() => {
+            cy.get(selector).should('be.visible');
+            cy.get(selector).should('have.text', name);
+          });
+        });
+      }
+
+      for (const { name, selector, trigger } of secondLevelLinks) {
+        it(`should have ${name} ${
+          trigger ? 'as trigger button' : ''
+        } second level nav link`, () => {
+          cy.get(mobileNav).within(() => {
+            cy.get(selector).should('be.visible');
+            cy.get(selector).should('have.text', name);
+          });
+        });
+      }
+
+      after(() => {
+        cy.get('[data-testid="button-menu-drawer"]').click();
+        cy.viewport(
+          Cypress.config('viewportWidth'),
+          Cypress.config('viewportHeight')
+        );
+      });
+    });
+
+    describe('Elements', () => {
+      for (const { name, selector, header, tests } of topLevelLinks) {
+        describe(`${name} page`, () => {
+          it(`navigates to ${name}`, () => {
+            cy.get(navbar).within(() => {
+              cy.log(`goes to ${name}`);
+              cy.get(selector).click();
+              cy.log(`ensures ${name} is highlighted`);
+              cy.get(selector).should('have.attr', 'aria-current');
+            });
+          });
+          it('displays header', () => {
+            ensureHeader(header || name);
+          });
+
+          if (tests) tests.apply(this);
+        });
+      }
+
+      for (const { name, selector, header, tests } of secondLevelLinks.filter(
+        (l) => !l.trigger
+      )) {
+        describe(`${name} page`, () => {
+          it(`navigates to ${name}`, () => {
+            cy.get(navbar).within(() => {
+              expand();
+              cy.log(`goes to ${name}`);
+              cy.get(selector).click();
+              expand();
+              cy.log(`ensures ${name} is highlighted`);
+              cy.get(selector).should('have.attr', 'aria-current');
+            });
+          });
+          it('displays header', () => {
+            ensureHeader(header || name);
+          });
+
+          if (tests) tests.apply(this);
+        });
+      }
+
+      after(() => {
+        collapse();
+      });
+    });
+  }
+);

apps/governance-e2e/src/integration/view/proposal.cy.js

@@ -1,68 +0,0 @@
-const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
-const newProposalButton = '[data-testid="new-proposal-link"]';
-const newProposalLink = '[data-testid="new-proposal-link"]';
-const governanceDocsUrl = 'https://vega.xyz/governance';
-const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
-
-context(
-  'Governance Page - verify elements on page',
-  { tags: '@smoke' },
-  function () {
-    before('navigate to governance page', function () {
-      cy.visit('/').navigate_to('proposals');
-    });
-
-    describe('with no network change proposals', function () {
-      it('should have governance tab highlighted', function () {
-        cy.verify_tab_highlighted('proposals');
-      });
-
-      it('should have GOVERNANCE header visible', function () {
-        cy.verify_page_header('Proposals');
-      });
-
-      it('should be able to see a working link for - find out more about Vega governance', function () {
-        // 3001-VOTE-001
-        cy.get(proposalDocumentationLink)
-          .should('be.visible')
-          .and('have.text', 'Find out more about Vega governance')
-          .and('have.attr', 'href')
-          .and('equal', governanceDocsUrl);
-
-        // 3002-PROP-001
-        cy.request(governanceDocsUrl)
-          .its('body')
-          .then((body) => {
-            if (!body.includes('Govern the network')) {
-              assert.include(
-                body,
-                'Govern the network',
-                `Checking that governance link destination includes 'Govern the network' text`
-              );
-            }
-          });
-      });
-
-      it('should be able to see button for - new proposal', function () {
-        // 3001-VOTE-002
-        cy.get(newProposalLink)
-          .should('be.visible')
-          .and('have.text', 'New proposal')
-          .and('have.attr', 'href')
-          .and('equal', '/proposals/propose');
-      });
-
-      // Skipping this test for now, the new proposal button no longer takes a user directly
-      // to a proposal form, instead it takes them to a page where they can select a proposal type.
-      // Keeping this test here for now as it can be repurposed to test the new proposal forms.
-      it.skip('should be able to see a connect wallet button - if vega wallet disconnected and new proposal button selected', function () {
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.get(connectToVegaWalletButton)
-          .should('be.visible')
-          .and('have.text', 'Connect Vega wallet');
-        cy.navigate_to('proposals');
-        cy.wait_for_spinner();
-      });
-    });
-  }
-);

apps/governance-e2e/src/integration/view/pubkey-view.cy.js

@@ -50,7 +50,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
   });
 
   it('Able to disconnect via wallet', function () {
-    cy.getByTestId('manage-vega-wallet').click();
+    cy.get('aside [data-testid="manage-vega-wallet"]').click();
     cy.getByTestId('disconnect').click();
     cy.getByTestId(banner).should('not.exist');
   });

apps/governance-e2e/src/integration/view/rewards.cy.js

@@ -1,35 +0,0 @@
-const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
-const warning = '[data-testid="callout"]';
-
-context(
-  'Rewards Page - verify elements on page',
-  { tags: '@regression' },
-  function () {
-    before('navigate to rewards page', function () {
-      cy.visit('/').navigate_to('rewards');
-    });
-
-    describe('with wallets disconnected', function () {
-      it('should have REWARDS tab highlighted', function () {
-        cy.verify_tab_highlighted('rewards');
-      });
-
-      it('should have rewards header visible', function () {
-        cy.verify_page_header('Rewards and fees');
-      });
-
-      it('should have epoch warning', function () {
-        cy.get(warning)
-          .should('be.visible')
-          .and(
-            'have.text',
-            'Rewards are credited 5 minutes after the epoch ends.This delay is set by a network parameter'
-          );
-      });
-
-      it('should have toggle for seeing total vs individual rewards', function () {
-        cy.get(viewToggle).should('be.visible');
-      });
-    });
-  }
-);

apps/governance-e2e/src/integration/view/token.cy.js

@@ -17,8 +17,7 @@ const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
 
 context('Verify elements on Token page', { tags: '@smoke' }, function () {
   before('Visit token page', function () {
-    cy.visit('/');
-    cy.navigate_to('token');
+    cy.visit('/token');
   });
   describe('THE $VEGA TOKEN table', function () {
     it('should have TOKEN ADDRESS', function () {

apps/governance-e2e/src/integration/view/tranches.cy.js

@@ -0,0 +1,91 @@
+import { trancheData } from '../../fixtures/mocks/tranches';
+
+const tranches = trancheData;
+
+context(
+  'Tranches page - verify elements on the page',
+  { tags: '@smoke' },
+  function () {
+    before('visit homepage', function () {
+      cy.intercept('GET', '**/tranches/stats', { tranches });
+      cy.visit('/token/tranches');
+    });
+
+    // 1005-VEST-001
+    // 1005-VEST-002
+    it('Able to view tranches', function () {
+      cy.getByTestId('tranche-item')
+        .should('have.length', 2)
+        .first()
+        .within(() => {
+          cy.get('a')
+            .should('have.text', 'Tranche 2') // 1005-VEST-003
+            .and('have.attr', 'href', '/token/tranches/2');
+          cy.get('span').eq(1).should('have.text', '111.30'); // 1005-VEST-005
+          cy.contains('Unlocking starts') // 1005-VEST-008
+            .parent()
+            .should('contain.text', '28 Feb 2023');
+          cy.contains('Fully unlocked')
+            .parent()
+            .should('contain.text', '23 Aug 2023');
+          cy.getByTestId('progress-bar').should('exist');
+          cy.getByTestId('currency-locked') // 1005-VEST-006
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('currency-unlocked') // 1005-VEST-007
+            .invoke('text')
+            .should('not.be.empty');
+        });
+    });
+
+    it('Able to see individual tranche data', function () {
+      cy.get('[href="/token/tranches/2"]').click();
+      cy.getByTestId('redeemed-tranche-tokens').within(() => {
+        cy.get('span').eq(1).should('have.text', 0);
+      });
+      cy.getByTestId('key-value-table').within(() => {
+        cy.getByTestId('link')
+          .should('have.length', 8)
+          .each((ethLink) => {
+            cy.wrap(ethLink)
+              .should('have.attr', 'href')
+              .and('contain', 'https://sepolia.etherscan.io/address/');
+          });
+        cy.getByTestId('redeem-link')
+          .should('have.length', 8)
+          .each((redeemLink) => {
+            cy.wrap(redeemLink)
+              .should('have.attr', 'href')
+              .and('contain', '/token/redeem/');
+          });
+      });
+    });
+
+    it('Able to view tranches with less than 10 vega', function () {
+      cy.navigate_to('supply');
+      cy.getByTestId('show-all-tranches').click();
+      cy.getByTestId('tranche-item')
+        .should('have.length', 8)
+        .first()
+        .within(() => {
+          cy.get('a')
+            .should('have.text', 'Tranche 0')
+            .and('have.attr', 'href', '/token/tranches/0');
+          cy.get('span').eq(1).should('have.text', '0.00');
+          cy.contains('Unlocking starts')
+            .parent()
+            .should('contain.text', '01 Jan 1970');
+          cy.contains('Fully unlocked')
+            .parent()
+            .should('contain.text', '01 Jan 1970');
+          cy.getByTestId('progress-bar').should('exist');
+          cy.getByTestId('currency-locked')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('currency-unlocked')
+            .invoke('text')
+            .should('not.be.empty');
+        });
+    });
+  }
+);

apps/governance-e2e/src/integration/view/validators.cy.js

@@ -1,5 +1,4 @@
 /// <reference types="cypress" />
-const guideLink = '[data-testid="staking-guide-link"]';
 const validatorTitle = '[data-testid="validator-node-title"]';
 const validatorId = '[data-testid="validator-id"]';
 const validatorPubKey = '[data-testid="validator-public-key"]';
@@ -25,31 +24,7 @@ const stakeNumberRegex = /^\d*\.?\d*$/;
 
 context('Staking Page - verify elements on page', function () {
   before('navigate to staking page', function () {
-    cy.visit('/').navigate_to('validators');
-  });
-
-  describe('with wallets disconnected', { tags: '@smoke' }, function () {
-    describe('description section', function () {
-      it('Should have validators tab highlighted', function () {
-        cy.verify_tab_highlighted('validators');
-      });
-
-      it('Should have validators ON VEGA header visible', function () {
-        cy.verify_page_header('Validators');
-      });
-
-      it('Should have Staking Guide link visible', function () {
-        // 2001-STKE-003
-        cy.get(guideLink)
-          .should('be.visible')
-          .and('have.text', 'Read more about staking on Vega')
-          .and(
-            'have.attr',
-            'href',
-            'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
-          );
-      });
-    });
+    cy.visit('/validators');
   });
 
   describe(

apps/governance-e2e/src/integration/view/vesting.cy.js

@@ -1,44 +1,111 @@
-const connectButton = '[data-testid="connect-to-eth-btn"]';
+const lockedTokensInVestingContract = '6,499,972.30';
 
 context(
   'Vesting Page - verify elements on page',
   { tags: '@smoke' },
   function () {
-    describe('with wallets disconnected', function () {
-      before('navigate to vesting page', function () {
-        cy.visit('/').navigate_to('vesting');
-      });
-      it('should have vesting tab highlighted', function () {
-        cy.verify_tab_highlighted('token');
-      });
-
-      it('should have VESTING header visible', function () {
-        cy.verify_page_header('Vesting');
-      });
-
-      it('should have connect Eth wallet info', function () {
-        cy.get(connectButton).should('be.visible');
-      });
-
-      it('should have connect Eth wallet button', function () {
-        cy.get(connectButton)
-          .should('be.visible')
-          .and('have.text', 'Connect Ethereum wallet');
-      });
+    before('navigate to vesting page', function () {
+      cy.visit('/token/redeem');
     });
 
-    describe('with eth wallet connected', function () {
+    describe('With Eth wallet connected', function () {
       before('connect eth wallet', function () {
         cy.ethereum_wallet_connect();
-        cy.visit('/');
+        cy.getByTestId('view-connected-eth-btn').click();
       });
 
-      // 1005-VEST-001
-      // 1005-VEST-002
-      it('Able to view tranches', function () {
-        cy.navigate_to('supply');
-        cy.url().should('include', '/token/tranches');
-        cy.get('h1').should('contain.text', 'Vesting tranches');
+      // 1005-VEST-020 1005-VEST-021
+      it('Tokens in vesting contract for eth wallet is displayed on wallet window', function () {
+        cy.getByTestId('vega-in-vesting-contract').within(() => {
+          cy.getByTestId('currency-title')
+            .should('contain.text', 'VEGA')
+            .and('contain.text', 'In vesting contract');
+          cy.get('[data-testid="currency-value"]:visible').should(
+            'have.text',
+            lockedTokensInVestingContract
+          );
+          cy.get('[data-testid="currency-locked"]:visible').should(
+            'have.text',
+            lockedTokensInVestingContract
+          );
+          cy.get('[data-testid="currency-unlocked"]:visible').should(
+            'have.text',
+            '0.00'
+          );
+        });
+      });
+      // 1005-VEST-022 1005-VEST-023
+      it('Tokens amount displayed in vesting page', function () {
+        cy.getByTestId(
+          'redemption-description',
+          Cypress.env('txTimeout')
+        ).should('exist');
+        const redemptionText =
+          'The connected Ethereum wallet (0xEe7D…d94F) has 6,499,972.30 $VEGA tokens in 1 tranche(s) of the vesting contract.';
+
+        cy.getByTestId('redemption-description').should(
+          'have.text',
+          redemptionText
+        );
+        cy.getByTestId('vesting-table').within(() => {
+          cy.getByTestId('key-value-table-row')
+            .eq(0)
+            .within(() => {
+              cy.get('dt').should('have.text', 'Vesting VEGA');
+              cy.get('dd').should('have.text', lockedTokensInVestingContract);
+            });
+          cy.getByTestId('key-value-table-row')
+            .eq(1)
+            .within(() => {
+              cy.get('dt').should('have.text', 'Locked');
+              cy.get('dd').should('have.text', lockedTokensInVestingContract);
+            });
+          cy.getByTestId('key-value-table-row')
+            .eq(2)
+            .within(() => {
+              cy.get('dt').should('have.text', 'Unlocked');
+              cy.get('dd').should('have.text', '0.00');
+            });
+          cy.getByTestId('key-value-table-row')
+            .eq(3)
+            .within(() => {
+              cy.get('dt').should('have.text', 'Associated');
+              cy.get('dd').should('have.text', '0.00');
+            });
+        });
+      });
+
+      // 1005-VEST-024 1005-VEST-025 1005-VEST-026 1005-VEST-036 1005-VEST-037
+      it('Tokens locked in individual tranches are displayed', function () {
+        cy.getByTestId('tranche-table-footer').should(
+          'have.text',
+          'All the tokens in this tranche are locked and must be assigned to a tranche before they can be redeemed.'
+        );
+        cy.getByTestId('tranche-item').within(() => {
+          cy.get('a')
+            .should('have.text', 'Tranche 0')
+            .and('have.attr', 'href', '/token/tranches/0');
+          cy.get('span')
+            .eq(1)
+            .should('have.text', lockedTokensInVestingContract);
+          cy.contains('Unlocking starts') // 1005-VEST-008
+            .parent()
+            .should('contain.text', '01 Jan 1970');
+          cy.contains('Fully unlocked')
+            .parent()
+            .should('contain.text', '01 Jan 1970');
+          cy.getByTestId('progress-bar').should('exist');
+          cy.getByTestId('currency-locked') // 1005-VEST-006
+            .should('have.text', lockedTokensInVestingContract);
+          cy.getByTestId('currency-unlocked') // 1005-VEST-007
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('tranche-item-footer').should(
+            'have.text',
+            'All the tokens in this tranche are locked and can not be redeemed yet.'
+          );
+        });
+        cy.connectVegaWallet();
       });
     });
   }

apps/governance-e2e/src/integration/view/wallet-eth.cy.js

@@ -1,18 +1,19 @@
-const walletContainer = '[data-testid="ethereum-wallet"]';
+const walletContainer = 'aside [data-testid="ethereum-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
-const connectToEthButton = '[data-testid="connect-to-eth-wallet-button"]';
+const connectToEthButton =
+  '[data-testid="connect-to-eth-wallet-button"]:visible';
 const connectorList = '[data-testid="web3-connector-list"]';
 const associate = '[href="/token/associate"]';
 const disassociate = '[href="/token/disassociate"]';
 const disconnect = '[data-testid="disconnect-from-eth-wallet-button"]';
 const accountNo = '[data-testid="ethereum-account-truncated"]';
-const currencyTitle = '[data-testid="currency-title"]';
-const currencyValue = '[data-testid="currency-value"]';
-const vegaInVesting = '[data-testid="vega-in-vesting-contract"]';
-const vegaInWallet = '[data-testid="vega-in-wallet"]';
-const progressBar = '[data-testid="progress-bar"]';
-const currencyLocked = '[data-testid="currency-locked"]';
-const currencyUnlocked = '[data-testid="currency-unlocked"]';
+const currencyTitle = '[data-testid="currency-title"]:visible';
+const currencyValue = '[data-testid="currency-value"]:visible';
+const vegaInVesting = '[data-testid="vega-in-vesting-contract"]:visible';
+const vegaInWallet = '[data-testid="vega-in-wallet"]:visible';
+const progressBar = '[data-testid="progress-bar"]:visible';
+const currencyLocked = '[data-testid="currency-locked"]:visible';
+const currencyUnlocked = '[data-testid="currency-unlocked"]:visible';
 const dialog = '[role="dialog"]';
 const dialogHeader = '[data-testid="dialog-title"]';
 const dialogCloseBtn = '[data-testid="dialog-close"]';

apps/governance-e2e/src/integration/view/wallet-vega.cy.js

@@ -1,6 +1,6 @@
 import { truncateByChars } from '@vegaprotocol/utils';
 
-const walletContainer = '[data-testid="vega-wallet"]';
+const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectButton = '[data-testid="connect-vega-wallet"]';
 const getVegaLink = '[data-testid="link"]';
@@ -14,7 +14,6 @@ const restWallet = '#wallet';
 const restPassphrase = '#passphrase';
 const restConnectBtn = '[type="submit"]';
 const accountNo = '[data-testid="vega-account-truncated"]';
-const walletName = '[data-testid="wallet-name"]';
 const currencyTitle = '[data-testid="currency-title"]';
 const currencyValue = '[data-testid="currency-value"]';
 const vegaUnstaked = '[data-testid="vega-wallet-balance-unstaked"] .text-right';
@@ -28,44 +27,24 @@ const vegaWalletCurrencyTitle = '[data-testid="currency-title"]';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const txTimeout = Cypress.env('txTimeout');
 
-const faucetAssets = {
-  BTCFake: 'fBTC',
-  DAIFake: 'fDAI',
-  EUROFake: 'fEURO',
-  USDCFake: 'fUSDC',
-};
-
 context(
   'Vega Wallet - verify elements on widget',
   { tags: '@regression' },
-  function () {
-    before('visit token home page', function () {
+  () => {
+    before('visit token home page', () => {
       cy.visit('/');
+      cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
     });
 
-    describe('with wallets disconnected', function () {
-      before('wait for widget to load', function () {
-        cy.get(walletContainer, { timeout: 10000 }).should('be.visible');
-      });
-
-      it('should have VEGA WALLET header visible', function () {
+    describe('with wallets disconnected', () => {
+      it('should have required elements visible', function () {
         cy.get(walletContainer).within(() => {
           cy.get(walletHeader)
             .should('be.visible')
             .and('have.text', 'Vega Wallet');
-        });
-      });
-
-      it('should have Connect Vega button visible', function () {
-        cy.get(walletContainer).within(() => {
           cy.get(connectButton)
             .should('be.visible')
             .and('have.text', 'Connect Vega wallet to use associated $VEGA');
-        });
-      });
-
-      it('should have Get a Vega wallet link visible', function () {
-        cy.get(walletContainer).within(() => {
           cy.get(getVegaLink)
             .should('be.visible')
             .and('have.text', 'Get a Vega wallet')
@@ -74,14 +53,14 @@ context(
       });
     });
 
-    describe('when connect button clicked', function () {
-      before('click connect vega wallet button', function () {
+    describe('when connect button clicked', () => {
+      before('click connect vega wallet button', () => {
         cy.get(walletContainer).within(() => {
           cy.get(connectButton).click();
         });
       });
 
-      it('should have Connect Vega header visible', function () {
+      it('should have Connect Vega header visible', () => {
         cy.get(dialog).within(() => {
           cy.get(walletDialogHeader)
             .should('be.visible')
@@ -175,14 +154,6 @@ context(
         }
       );
 
-      it.skip('should have wallet name visible', function () {
-        cy.get(walletContainer).within(() => {
-          cy.get(walletName)
-            .should('be.visible')
-            .and('have.text', `${Cypress.env('vegaWalletName')} key 1`);
-        });
-      });
-
       it('should have Vega Associated currency title visible', function () {
         cy.get(walletContainer).within(() => {
           cy.get(currencyTitle)
@@ -299,113 +270,71 @@ context(
       });
 
       // 2002-SINC-016
-      describe('when assets exist in vegawallet', function () {
-        before('send-faucet assets to connected vega wallet', function () {
-          cy.vega_wallet_faucet_assets_without_check(
-            faucetAssets.USDCFake,
-            '1000000',
-            vegaWalletPublicKey
-          );
-          cy.vega_wallet_faucet_assets_without_check(
-            faucetAssets.BTCFake,
-            '600000',
-            vegaWalletPublicKey
-          );
-          cy.vega_wallet_faucet_assets_without_check(
-            faucetAssets.EUROFake,
-            '800000',
-            vegaWalletPublicKey
-          );
-          cy.vega_wallet_faucet_assets_without_check(
-            faucetAssets.DAIFake,
-            '200000',
-            vegaWalletPublicKey
-          );
+      describe('Vega wallet with assets', function () {
+        const assets = [
+          {
+            id: 'fUSDC',
+            name: 'USDC (fake)',
+            amount: '1000000',
+            expectedAmount: '10.00',
+          },
+          {
+            id: 'fDAI',
+            name: 'DAI (fake)',
+            amount: '200000',
+            expectedAmount: '2.00',
+          },
+          {
+            id: 'fBTC',
+            name: 'BTC (fake)',
+            amount: '600000',
+            expectedAmount: '6.00',
+          },
+          {
+            id: 'fEURO',
+            name: 'EURO (fake)',
+            amount: '800000',
+            expectedAmount: '8.00',
+          },
+        ];
+
+        before('faucet assets to connected vega wallet', function () {
+          for (const { id, amount } of assets) {
+            cy.vega_wallet_faucet_assets_without_check(
+              id,
+              amount,
+              vegaWalletPublicKey
+            );
+          }
           cy.reload();
           cy.wait_for_spinner();
           cy.connectVegaWallet();
           cy.ethereum_wallet_connect();
         });
 
-        it('should see fUSDC assets - within vega wallet', function () {
-          let currency = { id: faucetAssets.USDCFake, name: 'USDC (fake)' };
-          cy.get(walletContainer).within(() => {
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id, txTimeout)
-              .should('be.visible');
+        for (const { id, name, expectedAmount } of assets) {
+          it(`should see ${id} within vega wallet`, () => {
+            cy.get(walletContainer).within(() => {
+              cy.get(vegaWalletCurrencyTitle)
+                .contains(id, txTimeout)
+                .should('be.visible');
 
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .siblings()
-              .invoke('text')
-              .should('not.be.empty');
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .contains(currency.name);
+              cy.get(vegaWalletCurrencyTitle)
+                .contains(id)
+                .parent()
+                .siblings()
+                .within((el) => {
+                  const value = parseFloat(el.text());
+                  cy.wrap(value).should('be.gte', parseFloat(expectedAmount));
+                });
+
+              cy.get(vegaWalletCurrencyTitle)
+                .contains(id)
+                .parent()
+                .contains(name);
+            });
           });
-        });
-
-        it('should see fBTC assets - within vega wallet', function () {
-          let currency = { id: faucetAssets.BTCFake, name: 'BTC (fake)' };
-          cy.get(walletContainer).within(() => {
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id, txTimeout)
-              .should('be.visible');
-
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .siblings()
-              .within(() => cy.contains_exactly('6.00').should('be.visible'));
-
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .contains(currency.name);
-          });
-        });
-
-        it('should see fEURO assets - within vega wallet', function () {
-          let currency = { id: faucetAssets.EUROFake, name: 'EURO (fake)' };
-          cy.get(walletContainer).within(() => {
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id, txTimeout)
-              .should('be.visible');
-
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .siblings()
-              .within(() => cy.contains_exactly('8.00').should('be.visible'));
-
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .contains(currency.name);
-          });
-        });
-
-        it('should see fDAI assets - within vega wallet', function () {
-          let currency = { id: faucetAssets.DAIFake, name: 'DAI (fake)' };
-          cy.get(walletContainer).within(() => {
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id, txTimeout)
-              .should('be.visible');
-
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .siblings()
-              .within(() => cy.contains_exactly('2.00').should('be.visible'));
-
-            cy.get(vegaWalletCurrencyTitle)
-              .contains(currency.id)
-              .parent()
-              .contains(currency.name);
-          });
-        });
+        }
       });
     });
   }

apps/governance-e2e/src/integration/view/withdraw.cy.js

@@ -1,27 +0,0 @@
-const connectToVegaBtn = '[data-testid="connect-to-vega-wallet-btn"]';
-
-context(
-  'Withdraw Page - verify elements on page',
-  { tags: '@smoke' },
-  function () {
-    before('navigate to withdrawals page', function () {
-      cy.visit('/').navigate_to('withdraw');
-    });
-
-    describe('with wallets disconnected', function () {
-      it('should have withdraw tab highlighted', function () {
-        cy.verify_tab_highlighted('token');
-      });
-
-      it('should have WITHDRAW header visible', function () {
-        cy.verify_page_header('Withdrawals');
-      });
-
-      it('should have connect Vega wallet button', function () {
-        cy.get(connectToVegaBtn)
-          .should('be.visible')
-          .and('have.text', 'Connect Vega wallet');
-      });
-    });
-  }
-);

apps/governance-e2e/src/support/common.functions.js

@@ -22,25 +22,32 @@ const navigation = {
 };
 
 const topLevelRoutes = ['proposals', 'validators', 'rewards'];
+const tokenDropDown = 'state-trigger';
 
 Cypress.Commands.add('navigate_to', (page) => {
-  const tokenDropDown = 'state-trigger';
-
   if (!topLevelRoutes.includes(page)) {
-    cy.getByTestId(tokenDropDown, { timeout: 10000 }).click();
-    cy.getByTestId('token-dropdown').within(() => {
-      cy.get(navigation[page]).click();
+    // FIXME: Timeout madness
+    cy.getByTestId(tokenDropDown, { timeout: 60000 }).eq(0).click();
+    cy.get('[data-testid="token-dropdown"]:visible').within(() => {
+      cy.get(navigation[page]).eq(0).click();
     });
   } else {
     return cy.get(navigation.section, { timeout: 10000 }).within(() => {
-      cy.get(navigation[page]).click();
+      cy.get(navigation[page]).eq(0).click();
     });
   }
 });
 
 Cypress.Commands.add('verify_tab_highlighted', (page) => {
   return cy.get(navigation.section).within(() => {
-    cy.get(navigation[page]).should('have.attr', 'aria-current');
+    if (!topLevelRoutes.includes(page)) {
+      cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
+      cy.get('[data-testid="token-dropdown"]:visible').within(() => {
+        cy.get(navigation[page]).should('have.attr', 'aria-current');
+      });
+    } else {
+      cy.get(navigation[page]).should('have.attr', 'aria-current');
+    }
   });
 });
 
@@ -59,7 +66,7 @@ export function associateTokenStartOfTests() {
   cy.highlight(`Associating tokens for first time`);
   cy.ethereum_wallet_connect();
   cy.connectVegaWallet();
-  cy.get('[href="/token/associate"]').first().click();
+  cy.get('[href="/token/associate"]:visible').first().click();
   cy.getByTestId('associate-radio-wallet', { timeout: 30000 }).click();
   cy.getByTestId('token-amount-input', epochTimeout).type('1');
   cy.getByTestId('token-input-submit-button', txTimeout)

apps/governance-e2e/src/support/governance.functions.js

@@ -82,9 +82,10 @@ Cypress.Commands.add(
 Cypress.Commands.add(
   'get_submitted_proposal_from_proposal_list',
   (proposalTitle) => {
-    cy.get_proposal_id_from_list(proposalTitle);
-    cy.get('@proposalIdText').then((proposalId) => {
-      return cy.get(`#${proposalId}`);
+    cy.get_proposal_id_from_list(proposalTitle).then(() => {
+      cy.get('@proposalIdText').then((proposalId) => {
+        return cy.get(`#${proposalId}`);
+      });
     });
   }
 );

apps/governance-e2e/src/support/staking.functions.js

@@ -3,10 +3,10 @@ const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
 const tokenInputApprove = '[data-testid="token-input-approve-button"]';
 const addStakeRadioButton = '[data-testid="add-stake-radio"]';
 const removeStakeRadioButton = '[data-testid="remove-stake-radio"]';
-const ethWalletAssociateButton = '[href="/token/associate"]';
-const ethWalletDissociateButton = '[href="/token/disassociate"]';
+const ethWalletAssociateButton = '[href="/token/associate"]:visible';
+const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
 const vegaWalletUnstakedBalance =
-  '[data-testid="vega-wallet-balance-unstaked"]';
+  '[data-testid="vega-wallet-balance-unstaked"]:visible';
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
 const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const associateContractRadioButton = '[data-testid="associate-radio-contract"]';

apps/governance-e2e/src/support/wallet-eth.functions.js

@@ -1,5 +1,6 @@
-const ethWalletContainer = '[data-testid="ethereum-wallet"]';
-const connectToEthButton = '[data-testid="connect-to-eth-wallet-button"]';
+const ethWalletContainer = '[data-testid="ethereum-wallet"]:visible';
+const connectToEthButton =
+  '[data-testid="connect-to-eth-wallet-button"]:visible';
 const capsuleWalletConnectButton = '[data-testid="web3-connector-Unknown"]';
 
 Cypress.Commands.add('ethereum_wallet_connect', () => {

apps/governance-e2e/src/support/wallet-teardown.functions.js

@@ -7,7 +7,7 @@ import {
 } from '@vegaprotocol/smart-contracts';
 import { ethers, Wallet } from 'ethers';
 
-const vegaWalletContainer = '[data-testid="vega-wallet"]';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -95,7 +95,7 @@ Cypress.Commands.add('faucet_asset', function (assetEthAddress) {
 });
 
 Cypress.Commands.add('vega_wallet_teardown', function () {
-  cy.get('[data-testid="associated-amount"]')
+  cy.get('aside [data-testid="associated-amount"]')
     .should('be.visible')
     .invoke('text')
     .as('associatedAmount');

apps/governance/src/components/nav/nav-draw.tsx

@@ -1,126 +0,0 @@
-import classNames from 'classnames';
-import { NavLink } from 'react-router-dom';
-import {
-  AppStateActionType,
-  useAppState,
-} from '../../contexts/app-state/app-state-context';
-import * as Dialog from '@radix-ui/react-dialog';
-import { EthWallet } from '../eth-wallet';
-import { VegaWallet } from '../vega-wallet';
-import { useTranslation } from 'react-i18next';
-
-interface Route {
-  name: string;
-  path: string;
-}
-
-const DrawerSection = ({ children }: { children: React.ReactNode }) => (
-  <div className="px-4 my-4">{children}</div>
-);
-
-const IconLine = ({ inverted }: { inverted: boolean }) => (
-  <span className={`block w-6 h-[2px] ${inverted ? 'bg-black' : 'bg-white'}`} />
-);
-
-const DrawerNavLinks = ({
-  isInverted,
-  routes,
-}: {
-  isInverted?: boolean;
-  routes: Route[];
-}) => {
-  const { appDispatch } = useAppState();
-  const { t } = useTranslation();
-  const linkProps = {
-    end: true,
-    onClick: () =>
-      appDispatch({ type: AppStateActionType.SET_DRAWER, isOpen: false }),
-  };
-  const navClasses = classNames('flex flex-col');
-
-  return (
-    <nav className={navClasses}>
-      {routes.map(({ name, path }) => {
-        return (
-          <NavLink
-            {...linkProps}
-            to={{ pathname: path }}
-            className={({ isActive }) =>
-              classNames({
-                'bg-vega-yellow text-black': !isInverted && isActive,
-                'bg-transparent text-white hover:text-vega-yellow':
-                  !isInverted && !isActive,
-                'bg-black text-white': isInverted && isActive,
-                'bg-transparent text-black hover:text-white':
-                  isInverted && !isActive,
-                'border-t border-white p-4': true,
-              })
-            }
-          >
-            {t(name)}
-          </NavLink>
-        );
-      })}
-    </nav>
-  );
-};
-
-export const NavDrawer = ({
-  inverted,
-  routes,
-}: {
-  inverted: boolean;
-  routes: Route[];
-}) => {
-  const { appState, appDispatch } = useAppState();
-
-  const drawerContentClasses = classNames(
-    'drawer-content', // needed for css animation
-    // Positions the modal in the center of screen
-    'fixed w-[80vw] max-w-[420px] top-0 right-0',
-    'flex flex-col flex-nowrap justify-between h-full bg-banner overflow-y-scroll border-l border-white',
-    'bg-black text-neutral-200'
-  );
-  return (
-    <>
-      <button
-        onClick={() =>
-          appDispatch({
-            type: AppStateActionType.SET_DRAWER,
-            isOpen: true,
-          })
-        }
-        className="flex flex-col flex-nowrap gap-1"
-      >
-        <IconLine inverted={inverted} />
-        <IconLine inverted={inverted} />
-        <IconLine inverted={inverted} />
-      </button>
-
-      <Dialog.Root
-        open={appState.drawerOpen}
-        onOpenChange={(isOpen) =>
-          appDispatch({
-            type: AppStateActionType.SET_DRAWER,
-            isOpen,
-          })
-        }
-      >
-        <Dialog.Portal>
-          <Dialog.Overlay className="fixed inset-0 bg-white/15" />
-          <Dialog.Content className={drawerContentClasses}>
-            <div>
-              <DrawerSection>
-                <EthWallet />
-              </DrawerSection>
-              <DrawerSection>
-                <VegaWallet />
-              </DrawerSection>
-            </div>
-            <DrawerNavLinks routes={routes} />
-          </Dialog.Content>
-        </Dialog.Portal>
-      </Dialog.Root>
-    </>
-  );
-};

apps/governance/src/components/nav/nav-dropdown.tsx

@@ -1,50 +0,0 @@
-import { useState } from 'react';
-import Routes, { TOKEN_DROPDOWN_ROUTES } from '../../routes/routes';
-import { useTranslation } from 'react-i18next';
-import type { NavbarTheme } from './nav-link';
-import { AppNavLink } from './nav-link';
-import {
-  NavDropdownMenu,
-  NavDropdownMenuContent,
-  NavDropdownMenuItem,
-  NavDropdownMenuTrigger,
-} from '@vegaprotocol/ui-toolkit';
-
-export const NavDropDown = ({ navbarTheme }: { navbarTheme: NavbarTheme }) => {
-  const { t } = useTranslation();
-  const [isOpen, setOpen] = useState(false);
-  return (
-    <NavDropdownMenu open={isOpen} onOpenChange={(open) => setOpen(open)}>
-      <AppNavLink
-        name={
-          <NavDropdownMenuTrigger
-            className="w-auto flex items-center -m-3 p-3 cursor-pointer"
-            data-testid="state-trigger"
-            onClick={() => setOpen(!isOpen)}
-          >
-            {t('Token')}
-          </NavDropdownMenuTrigger>
-        }
-        testId="token-dd"
-        path={Routes.TOKEN}
-        navbarTheme={navbarTheme}
-      />
-
-      <NavDropdownMenuContent data-testid="token-dropdown">
-        {TOKEN_DROPDOWN_ROUTES.map((r) => (
-          <NavDropdownMenuItem key={r.name} onClick={() => setOpen(false)}>
-            <AppNavLink
-              testId={r.name}
-              name={t(r.name)}
-              path={r.path}
-              navbarTheme={'inherit'}
-              subNav={true}
-              end={true}
-              fullWidth={true}
-            />
-          </NavDropdownMenuItem>
-        ))}
-      </NavDropdownMenuContent>
-    </NavDropdownMenu>
-  );
-};

apps/governance/src/components/nav/nav-link.tsx

@@ -1,57 +0,0 @@
-import classNames from 'classnames';
-import { NavLink } from 'react-router-dom';
-import type { HTMLAttributeAnchorTarget, ReactNode } from 'react';
-import { getNavLinkClassNames } from '@vegaprotocol/ui-toolkit';
-
-export type NavbarTheme = 'inherit' | 'dark' | 'yellow';
-
-interface AppNavLinkProps {
-  name: ReactNode | string;
-  path: string;
-  navbarTheme: NavbarTheme;
-  testId?: string;
-  target?: HTMLAttributeAnchorTarget;
-  end?: boolean;
-  fullWidth?: boolean;
-  subNav?: boolean;
-}
-
-export const AppNavLink = ({
-  name,
-  path,
-  navbarTheme,
-  target,
-  testId,
-  end = false,
-  fullWidth = false,
-  subNav = false,
-}: AppNavLinkProps) => {
-  const borderClasses = classNames(
-    'absolute h-0.5 w-full bottom-[-1px] left-0',
-    {
-      'bg-black dark:bg-vega-yellow': navbarTheme !== 'yellow',
-      'bg-black': navbarTheme === 'yellow',
-    }
-  );
-  return (
-    <NavLink
-      key={path}
-      data-testid={testId}
-      to={{ pathname: path }}
-      className={getNavLinkClassNames(navbarTheme, fullWidth, subNav)}
-      target={target}
-      end={end}
-    >
-      {({ isActive }) => {
-        return (
-          <div className={subNav ? 'inline-block relative pb-1' : undefined}>
-            {name}
-            {isActive && (
-              <span data-testid="link-active" className={borderClasses} />
-            )}
-          </div>
-        );
-      }}
-    </NavLink>
-  );
-};

apps/governance/src/components/nav/nav.css

@@ -1,25 +0,0 @@
-@keyframes slideIn {
-  from {
-    transform: translateX(100%);
-  }
-  to {
-    transform: translateX(0);
-  }
-}
-
-@keyframes slideOut {
-  from {
-    transform: translateX(0);
-  }
-  to {
-    transform: translateX(100%);
-  }
-}
-
-.drawer-content[data-state='open'] {
-  animation: slideIn 150ms ease-out forwards;
-}
-
-.drawer-content[data-state='closed'] {
-  animation: slideOut 150ms ease-in forwards;
-}

apps/governance/src/components/nav/nav.spec.tsx

@@ -1,56 +0,0 @@
-import { render, screen, within } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-import { Nav } from './nav';
-
-jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  NetworkSwitcher: () => <div data-testid="network-switcher" />,
-  useEnvironment: () => ({ VEGA_ENV: 'MAINNET' }),
-}));
-
-const renderComponent = (initialEntries?: string[]) => {
-  return render(
-    <MemoryRouter initialEntries={initialEntries}>
-      <Nav />
-    </MemoryRouter>
-  );
-};
-
-describe('nav', () => {
-  it('Renders logo with link to home', () => {
-    renderComponent();
-    expect(screen.getByTestId('logo-link')).toHaveProperty(
-      'href',
-      'http://localhost/'
-    );
-  });
-  it('Renders network switcher', () => {
-    renderComponent();
-    expect(screen.getByTestId('network-switcher')).toBeInTheDocument();
-  });
-  it('Renders all top level routes', () => {
-    renderComponent();
-    expect(screen.getByTestId('Proposals')).toHaveProperty(
-      'href',
-      'http://localhost/proposals'
-    );
-    expect(screen.getByTestId('Validators')).toHaveProperty(
-      'href',
-      'http://localhost/validators'
-    );
-    expect(screen.getByTestId('Rewards')).toHaveProperty(
-      'href',
-      'http://localhost/rewards'
-    );
-  });
-  it('Shows active state on dropdown trigger when on home route for subroutes', () => {
-    const { getByTestId } = renderComponent(['/token']);
-    const dd = getByTestId('token-dd');
-    expect(within(dd).getByTestId('link-active')).toBeInTheDocument();
-  });
-  it('Shows active state on dropdown trigger when on sub route of dropdown', () => {
-    const { getByTestId } = renderComponent(['/token/withdraw']);
-    const dd = getByTestId('token-dd');
-    expect(within(dd).getByTestId('link-active')).toBeInTheDocument();
-  });
-});

apps/governance/src/components/nav/nav.tsx

@@ -1,81 +1,85 @@
-import { Link } from 'react-router-dom';
 import { NetworkSwitcher } from '@vegaprotocol/environment';
-import { useEffect, useState } from 'react';
-import { TOP_LEVEL_ROUTES } from '../../routes/routes';
+import { TOKEN_DROPDOWN_ROUTES, 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 } from '@vegaprotocol/ui-toolkit';
-import { AppNavLink } from './nav-link';
-import { NavDropDown } from './nav-dropdown';
-
-const useDebouncedResize = () => {
-  const [windowWidth, setWindowWidth] = useState(window.innerWidth);
-
-  useEffect(() => {
-    const handleResizeDebounced = debounce(() => {
-      setWindowWidth(window.innerWidth);
-    }, 300);
-
-    window.addEventListener('resize', handleResizeDebounced);
-
-    return () => {
-      window.removeEventListener('resize', handleResizeDebounced);
-    };
-  }, []);
-  return {
-    windowWidth,
-  };
-};
-
-type NavbarTheme = 'inherit' | 'dark' | 'yellow';
-interface NavbarProps {
-  navbarTheme?: NavbarTheme;
-}
-
-export const Nav = ({ navbarTheme = 'inherit' }: NavbarProps) => {
-  const { windowWidth } = useDebouncedResize();
-  const isDesktop = windowWidth > 995;
+import type { NavigationProps } from '@vegaprotocol/ui-toolkit';
+import { useNavigationDrawer } from '@vegaprotocol/ui-toolkit';
+import {
+  Navigation,
+  NavigationBreakpoint,
+  NavigationContent,
+  NavigationItem,
+  NavigationLink,
+  NavigationList,
+  NavigationTrigger,
+} from '@vegaprotocol/ui-toolkit';
+import { EthWallet } from '../eth-wallet';
+import { VegaWallet } from '../vega-wallet';
+import { useLocation, useMatch } from 'react-router-dom';
+import { useEffect } from 'react';
 
+export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
   const { t } = useTranslation();
-  const isYellow = navbarTheme === 'yellow';
+  const setDrawerOpen = useNavigationDrawer((state) => state.setDrawerOpen);
+
+  const location = useLocation();
+  const isOnToken = useMatch('token/*');
+  useEffect(() => {
+    setDrawerOpen(false);
+  }, [location, setDrawerOpen]);
+
+  const topLevel = TOP_LEVEL_ROUTES.map(({ name, path }) => (
+    <NavigationItem key={name}>
+      <NavigationLink to={path}>{name}</NavigationLink>
+    </NavigationItem>
+  ));
+
+  const secondLevel = TOKEN_DROPDOWN_ROUTES.map(({ name, path, end }) => (
+    <NavigationItem key={name}>
+      <NavigationLink to={path} end={Boolean(end)}>
+        {name}
+      </NavigationLink>
+    </NavigationItem>
+  ));
 
   return (
-    <ToolkitNav
-      navbarTheme={navbarTheme}
-      icon={
-        <Link to="/" data-testid="logo-link">
-          <img
-            alt="Vega"
-            src={navbarTheme === 'yellow' ? logoBlackText : logoWhiteText}
-            height={30}
-            width={250}
-          />
-        </Link>
-      }
-      title={undefined}
-      titleContent={<NetworkSwitcher />}
-    >
-      {isDesktop ? (
-        <nav className="flex items-center flex-1 px-4">
-          {TOP_LEVEL_ROUTES.map((r) => (
-            <AppNavLink
-              key={r.path}
-              testId={r.name}
-              name={t(r.name)}
-              path={r.path}
-              navbarTheme={navbarTheme}
-            />
-          ))}
-          <NavDropDown navbarTheme={navbarTheme} />
-        </nav>
-      ) : (
-        <nav className="flex items-center flex-1 px-2 justify-end">
-          <NavDrawer inverted={isYellow} routes={TOP_LEVEL_ROUTES} />
-        </nav>
-      )}
-    </ToolkitNav>
+    <Navigation appName="Governance" theme={theme} breakpoints={[458, 959]}>
+      <NavigationList
+        className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
+        hide={[NavigationBreakpoint.Small]}
+      >
+        <NavigationItem className="[.drawer-content_&]:w-full">
+          <NetworkSwitcher className="[.drawer-content_&]:w-full" />
+        </NavigationItem>
+      </NavigationList>
+      <NavigationList
+        hide={[NavigationBreakpoint.Narrow, NavigationBreakpoint.Small]}
+      >
+        {topLevel}
+        <NavigationItem>
+          <NavigationTrigger
+            data-testid="state-trigger"
+            isActive={Boolean(isOnToken)}
+          >
+            {t('Token')}
+          </NavigationTrigger>
+          <NavigationContent>
+            <NavigationList data-testid="token-dropdown">
+              {secondLevel}
+            </NavigationList>
+          </NavigationContent>
+        </NavigationItem>
+      </NavigationList>
+      <NavigationList
+        hide={true}
+        className="[.drawer-content_&]:border-t [.drawer-content_&]:border-t-vega-light-200 dark:[.drawer-content_&]:border-t-vega-dark-200 [.drawer-content_&]:pt-8 [.drawer-content_&]:mt-4"
+      >
+        <NavigationItem className="[.drawer-content_&]:w-full">
+          <EthWallet />
+        </NavigationItem>
+        <NavigationItem className="[.drawer-content_&]:w-full">
+          <VegaWallet />
+        </NavigationItem>
+      </NavigationList>
+    </Navigation>
   );
 };

apps/governance/src/components/page-templates/template-sidebar.tsx

@@ -21,13 +21,13 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
     <>
       <AnnouncementBanner>
         <div className="font-alpha calt uppercase text-center text-lg text-white">
-          <span className="pr-4">Mainnet sim 2 is live!</span>
+          <span className="pr-4">Mainnet sim 3 is coming soon!</span>
           <ExternalLink href="https://fairground.wtf/">
             Come help stress test the network
           </ExternalLink>
         </div>
       </AnnouncementBanner>
-      <Nav navbarTheme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
+      <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
       {isReadOnly ? (
         <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
       ) : null}

apps/governance/src/contexts/app-state/app-state-context.ts

@@ -37,9 +37,6 @@ export interface AppState {
   /** Whether or not the connect to Ethereum wallet overlay is open */
   ethConnectOverlay: boolean;
 
-  /** Whether or not the mobile drawer is open. Only relevant on screens smaller than 960 */
-  drawerOpen: boolean;
-
   /**  Whether or not the transaction modal is open */
   transactionOverlay: boolean;
   /**

apps/governance/src/contexts/app-state/app-state-provider.tsx

@@ -17,7 +17,6 @@ const initialAppState: AppState = {
   vegaWalletOverlay: false,
   vegaWalletManageOverlay: false,
   ethConnectOverlay: false,
-  drawerOpen: false,
   transactionOverlay: false,
   bannerMessage: '',
 };
@@ -36,7 +35,6 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
       return {
         ...state,
         vegaWalletOverlay: action.isOpen,
-        drawerOpen: action.isOpen ? false : state.drawerOpen,
       };
     }
     case AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY: {
@@ -44,20 +42,17 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
         ...state,
         vegaWalletManageOverlay: action.isOpen,
         vegaWalletOverlay: action.isOpen ? false : state.vegaWalletOverlay,
-        drawerOpen: action.isOpen ? false : state.drawerOpen,
       };
     }
     case AppStateActionType.SET_ETH_WALLET_OVERLAY: {
       return {
         ...state,
         ethConnectOverlay: action.isOpen,
-        drawerOpen: action.isOpen ? false : state.drawerOpen,
       };
     }
     case AppStateActionType.SET_DRAWER: {
       return {
         ...state,
-        drawerOpen: action.isOpen,
         vegaWalletOverlay: false,
       };
     }

apps/governance/src/hooks/use-pending-balances-manager.ts

@@ -9,26 +9,28 @@ export type PendingTxsStore = {
   resetPendingTxs: () => void;
 };
 
-export const usePendingBalancesStore = create<PendingTxsStore>((set, get) => ({
-  pendingBalances: [],
-  addPendingTxs: (event: Event[]) => {
-    set({
-      pendingBalances: uniqBy(
-        [...get().pendingBalances, ...event],
-        'transactionHash'
-      ),
-    });
-  },
-  removePendingTx: (event: Event) => {
-    set({
-      pendingBalances: [
-        ...get().pendingBalances.filter(
-          ({ transactionHash }) => transactionHash !== event.transactionHash
+export const usePendingBalancesStore = create<PendingTxsStore>()(
+  (set, get) => ({
+    pendingBalances: [],
+    addPendingTxs: (event: Event[]) => {
+      set({
+        pendingBalances: uniqBy(
+          [...get().pendingBalances, ...event],
+          'transactionHash'
         ),
-      ],
-    });
-  },
-  resetPendingTxs: () => {
-    set({ pendingBalances: [] });
-  },
-}));
+      });
+    },
+    removePendingTx: (event: Event) => {
+      set({
+        pendingBalances: [
+          ...get().pendingBalances.filter(
+            ({ transactionHash }) => transactionHash !== event.transactionHash
+          ),
+        ],
+      });
+    },
+    resetPendingTxs: () => {
+      set({ pendingBalances: [] });
+    },
+  })
+);

apps/governance/src/lib/balances/balances-store.ts

@@ -38,7 +38,7 @@ export interface RefreshBalances {
   vestingAssociatedBalance: BigNumber;
 }
 
-export const useBalances = create<BalancesStore>((set) => ({
+export const useBalances = create<BalancesStore>()((set) => ({
   associationBreakdown: {
     stakingAssociations: {},
     vestingAssociations: {},

apps/governance/src/lib/tranches/tranches-store.tsx

@@ -1,7 +1,7 @@
 import { toBigNum } from '@vegaprotocol/utils';
 import type { TrancheServiceResponse } from '@vegaprotocol/smart-contracts';
 import type BigNumber from 'bignumber.js';
-import create from 'zustand';
+import { create } from 'zustand';
 import { ENV } from '../../config';
 
 export interface Tranche {
@@ -36,7 +36,7 @@ export type TranchesStore = {
 
 const secondsToDate = (seconds: number) => new Date(seconds * 1000);
 
-export const useTranches = create<TranchesStore>((set) => ({
+export const useTranches = create<TranchesStore>()((set) => ({
   tranches: null,
   loading: false,
   error: null,

apps/governance/src/routes/proposals/components/list-asset/list-asset.spec.tsx

@@ -54,7 +54,6 @@ const mockAppState: AppState = {
   vegaWalletOverlay: false,
   vegaWalletManageOverlay: false,
   ethConnectOverlay: false,
-  drawerOpen: false,
   transactionOverlay: false,
   bannerMessage: '',
 };

apps/governance/src/routes/proposals/components/vote-details/vote-details.tsx

@@ -56,7 +56,7 @@ export const VoteDetails = ({
       {proposalType === ProposalType.PROPOSAL_UPDATE_MARKET && (
         <section>
           <SubHeading title={t('liquidityVotes')} />
-          <p>
+          <p data-testid="liquidity-votes-status">
             <span>
               <CurrentProposalStatus proposal={proposal} />
             </span>
@@ -105,7 +105,7 @@ export const VoteDetails = ({
       )}
       <section data-testid="votes-table">
         <SubHeading title={t('tokenVotes')} />
-        <p>
+        <p data-testid="token-votes-status">
           <span>
             <CurrentProposalStatus proposal={proposal} />
           </span>

apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts

@@ -17,7 +17,6 @@ const mockAppState: AppState = {
   vegaWalletOverlay: false,
   vegaWalletManageOverlay: false,
   ethConnectOverlay: false,
-  drawerOpen: false,
   transactionOverlay: false,
   bannerMessage: '',
 };

apps/governance/src/routes/redemption/redemption.tsx

@@ -84,6 +84,7 @@ const RedemptionRouter = () => {
             fill={true}
             variant="primary"
             onClick={() => navigate(`${RoutesConfig.REDEEM}/${account}`)}
+            data-testid="view-connected-eth-btn"
           >
             {t('View connected Eth Wallet')}
           </Button>

apps/governance/src/routes/routes.ts

@@ -37,6 +37,7 @@ export const TOKEN_DROPDOWN_ROUTES = [
   {
     name: 'Token',
     path: Routes.TOKEN,
+    end: true,
   },
   {
     name: 'Supply & Vesting',

apps/governance/src/routes/tranches/tranche.tsx

@@ -73,6 +73,7 @@ export const Tranche = () => {
                     className="underline"
                     title={t('View vesting information')}
                     to={`${Routes.REDEEM}/${user}`}
+                    data-testid="redeem-link"
                   >
                     {t('View vesting information')}
                   </RouterLink>

apps/governance/src/routes/tranches/tranches.tsx

@@ -50,7 +50,10 @@ export const Tranches = () => {
       )}
 
       <section className="text-center mt-4">
-        <ButtonLink onClick={() => setShowAll(!showAll)}>
+        <ButtonLink
+          data-testid="show-all-tranches"
+          onClick={() => setShowAll(!showAll)}
+        >
           {showAll
             ? t(
                 'Showing tranches with <{{trancheMinimum}} VEGA, click to hide these tranches',

apps/governance/src/stores/transactions.ts

@@ -1,5 +1,4 @@
 import type ethers from 'ethers';
-import type { GetState, SetState } from 'zustand';
 import { create } from 'zustand';
 
 export interface TxData {
@@ -16,27 +15,25 @@ interface TransactionStore {
   remove: (tx: TxData) => void;
 }
 
-export const useTransactionStore = create(
-  (set: SetState<TransactionStore>, get: GetState<TransactionStore>) => ({
-    transactions: [],
-    add: (tx) => {
-      const { transactions } = get();
-      set({ transactions: [...transactions, tx] });
-    },
-    update: (tx) => {
-      const { transactions } = get();
-      set({
-        transactions: [
-          ...transactions.filter((t) => t.tx.hash !== tx.tx.hash),
-          tx,
-        ],
-      });
-    },
-    remove: (tx) => {
-      const { transactions } = get();
-      set({
-        transactions: transactions.filter((t) => t.tx.hash !== tx.tx.hash),
-      });
-    },
-  })
-);
+export const useTransactionStore = create<TransactionStore>()((set, get) => ({
+  transactions: [],
+  add: (tx) => {
+    const { transactions } = get();
+    set({ transactions: [...transactions, tx] });
+  },
+  update: (tx) => {
+    const { transactions } = get();
+    set({
+      transactions: [
+        ...transactions.filter((t) => t.tx.hash !== tx.tx.hash),
+        tx,
+      ],
+    });
+  },
+  remove: (tx) => {
+    const { transactions } = get();
+    set({
+      transactions: transactions.filter((t) => t.tx.hash !== tx.tx.hash),
+    });
+  },
+}));

apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx

@@ -1,5 +1,4 @@
 import { useParams } from 'react-router-dom';
-import { useMemo } from 'react';
 import { makeDerivedDataProvider } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
@@ -43,7 +42,7 @@ const useMarketDetails = (marketId: string | undefined) => {
   const { data, loading, error } = useDataProvider({
     dataProvider: lpDataProvider,
     skipUpdates: true,
-    variables: useMemo(() => ({ marketId }), [marketId]),
+    variables: { marketId: marketId || '' },
   });
 
   const liquidityProviders = data?.liquidityProviders || [];

apps/liquidity-provision-dashboard/src/app/components/detail/last-24h-volume/last-24h-volume.tsx

@@ -39,14 +39,11 @@ export const Last24hVolume = ({
     [marketId, yTimestamp]
   );
 
-  const variables24hAgo = useMemo(
-    () => ({
-      marketId: marketId,
-      interval: Schema.Interval.INTERVAL_I1D,
-      since: yTimestamp,
-    }),
-    [marketId, yTimestamp]
-  );
+  const variables24hAgo = {
+    marketId: marketId,
+    interval: Schema.Interval.INTERVAL_I1D,
+    since: yTimestamp,
+  };
 
   const throttledSetCandles = useRef(
     throttle((data: Candle[]) => {
@@ -64,7 +61,7 @@ export const Last24hVolume = ({
     [throttledSetCandles]
   );
 
-  const { data, error } = useDataProvider<Candle[], Candle>({
+  const { data, error } = useDataProvider({
     dataProvider: marketCandlesProvider,
     variables: variables,
     update,
@@ -88,7 +85,7 @@ export const Last24hVolume = ({
     [throttledSetVolumeChange]
   );
 
-  useDataProvider<Candle[], Candle>({
+  useDataProvider({
     dataProvider: marketCandlesProvider,
     update: updateCandle24hAgo,
     variables: variables24hAgo,

apps/trading-e2e/src/integration/capsule.cy.ts

@@ -41,6 +41,7 @@ const completeWithdrawalBtn = 'complete-withdrawal';
 const submitTransferBtn = '[type="submit"]';
 const transferForm = 'transfer-form';
 const depositSubmit = 'deposit-submit';
+const approveSubmit = 'approve-submit';
 
 // Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
 describe('capsule - without MultiSign', { tags: '@slow' }, () => {
@@ -73,13 +74,13 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
     cy.getByTestId('deposit-button').click();
     connectEthereumWallet('Unknown');
     cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
-    cy.getByTestId('approve-warning').should(
+    cy.getByTestId('approve-default').should(
       'contain.text',
-      `Deposits of ${btcSymbol} not approved`
+      `Before you can make a deposit of your chosen asset, ${btcSymbol}, you need to approve its use in your Ethereum wallet`
     );
-    cy.getByTestId(depositSubmit).click();
-    cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
-    cy.get('[data-testid="Return to deposit"]').click();
+    cy.getByTestId(approveSubmit).click();
+    cy.getByTestId('approve-pending').should('exist');
+    cy.getByTestId('approve-confirmed').should('exist');
     cy.get(amountField).clear().type('10');
     cy.getByTestId(depositSubmit).click();
     cy.getByTestId(toastContent, txTimeout).should(

apps/trading-e2e/src/integration/deposit.cy.ts

@@ -31,7 +31,13 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
   it('handles empty fields', () => {
     cy.getByTestId('deposit-submit').click();
     cy.getByTestId(formFieldError).should('contain.text', 'Required');
-    cy.getByTestId(formFieldError).should('have.length', 2);
+    // once Ethereum wallet is connected and key selected the only field that will
+    // error is the asset select
+    cy.getByTestId(formFieldError).should('have.length', 1);
+    cy.get('[data-testid="input-error-text"][aria-describedby="asset"]').should(
+      'have.length',
+      1
+    );
   });
 
   it('unable to select assets not enabled', () => {
@@ -41,12 +47,13 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
     cy.get(assetSelectField + ' option:contains(Asset 4)').should('not.exist');
   });
 
-  it('invalid public key', () => {
-    cy.get(toAddressField)
-      .clear()
-      .type('INVALID_DEPOSIT_TO_ADDRESS')
-      .next(`[data-testid="${formFieldError}"]`)
-      .should('have.text', 'Invalid Vega key');
+  it('invalid public key when entering address manually', () => {
+    cy.getByTestId('enter-pubkey-manually').click();
+    cy.get(toAddressField).clear().type('INVALID_DEPOSIT_TO_ADDRESS');
+    cy.get(`[data-testid="${formFieldError}"][aria-describedby="to"]`).should(
+      'have.text',
+      'Invalid Vega key'
+    );
   });
 
   it('invalid amount', () => {

apps/trading-e2e/src/integration/market-info.cy.ts

@@ -26,20 +26,20 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
 
   it('market price', () => {
     cy.getByTestId(marketTitle).contains('Market price').click();
-    validateMarketDataRow(0, 'Mark Price', '0.05749');
-    validateMarketDataRow(1, 'Best Bid Price', '6.81765 ');
-    validateMarketDataRow(2, 'Best Offer Price', '6.81769 ');
+    validateMarketDataRow(0, 'Mark Price', '46,126.90058');
+    validateMarketDataRow(1, 'Best Bid Price', '44,126.90058 ');
+    validateMarketDataRow(2, 'Best Offer Price', '48,126.90058 ');
     validateMarketDataRow(3, 'Quote Unit', 'BTC');
   });
 
   it('market volume displayed', () => {
     cy.getByTestId(marketTitle).contains('Market volume').click();
-    validateMarketDataRow(0, '24 Hour Volume', '-');
+    validateMarketDataRow(0, '24 Hour Volume', '1');
     validateMarketDataRow(1, 'Open Interest', '0');
-    validateMarketDataRow(2, 'Best Bid Volume', '5');
-    validateMarketDataRow(3, 'Best Offer Volume', '1');
-    validateMarketDataRow(4, 'Best Static Bid Volume', '5');
-    validateMarketDataRow(5, 'Best Static Offer Volume', '1');
+    validateMarketDataRow(2, 'Best Bid Volume', '1');
+    validateMarketDataRow(3, 'Best Offer Volume', '3');
+    validateMarketDataRow(4, 'Best Static Bid Volume', '2');
+    validateMarketDataRow(5, 'Best Static Offer Volume', '4');
   });
 
   it('insurance pool displayed', () => {
@@ -149,9 +149,9 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
       .contains(/Liquidity(?! m)/)
       .click();
 
-    validateMarketDataRow(0, 'Target Stake', '0.56789 tBTC');
-    validateMarketDataRow(1, 'Supplied Stake', '0.56767 tBTC');
-    validateMarketDataRow(2, 'Market Value Proxy', '6.77678 tBTC');
+    validateMarketDataRow(0, 'Target Stake', '10.00 tBTC');
+    validateMarketDataRow(1, 'Supplied Stake', '0.01 tBTC');
+    validateMarketDataRow(2, 'Market Value Proxy', '20.00 tBTC');
 
     cy.getByTestId('view-liquidity-link').should(
       'have.text',
@@ -163,8 +163,8 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
     cy.getByTestId(marketTitle).contains('Liquidity price range').click();
 
     validateMarketDataRow(0, 'Liquidity Price Range', '2.00% of mid price');
-    validateMarketDataRow(1, 'Lowest Price', '0.05634 BTC');
-    validateMarketDataRow(2, 'Highest Price', '0.05864 BTC');
+    validateMarketDataRow(1, 'Lowest Price', '45,204.362 BTC');
+    validateMarketDataRow(2, 'Highest Price', '47,049.438 BTC');
   });
 
   it('oracle displayed', () => {

apps/trading-e2e/src/integration/navbar.cy.ts

@@ -17,14 +17,10 @@ describe('Desktop view', { tags: '@smoke' }, () => {
 
     links.forEach((link, index) => {
       it(`${link} should be correctly rendered`, () => {
-        cy.getByTestId('navbar')
-          .find(`[data-testid="navbar-links"] a[data-testid=${link}]`)
+        cy.get('nav')
+          .find(`a[data-testid=${link}]:visible`)
           .then((element) => {
-            cy.contains('Loading...').should('not.exist');
             cy.wrap(element).click();
-            cy.wrap(element)
-              .get('span.absolute.md\\:h-1.w-full')
-              .should('exist');
             cy.location('hash').should('equal', hashes[index]);
           });
       });

apps/trading-e2e/src/integration/trading-accounts.cy.ts

@@ -38,7 +38,7 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="deposited"]')
-      .should('have.text', '1,001.00');
+      .should('have.text', '100,001.01');
   });
   describe('sorting by ag-grid columns should work well', () => {
     it('sorting by asset', () => {
@@ -58,24 +58,24 @@ describe('accounts', { tags: '@smoke' }, () => {
       cy.getByTestId('Collateral').click();
       const marketsSortedDefault = [
         '1,000.00002',
-        '1,001.00',
-        '1,000.01',
+        '100,001.01',
         '1,000.01',
+        '1,000.00',
         '1,000.00001',
       ];
       const marketsSortedAsc = [
+        '1,000.00',
         '1,000.00001',
         '1,000.00002',
         '1,000.01',
-        '1,000.01',
-        '1,001.00',
+        '100,001.01',
       ];
       const marketsSortedDesc = [
-        '1,001.00',
-        '1,000.01',
+        '100,001.01',
         '1,000.01',
         '1,000.00002',
         '1,000.00001',
+        '1,000.00',
       ];
       checkSorting(
         'deposited',
@@ -87,9 +87,9 @@ describe('accounts', { tags: '@smoke' }, () => {
 
     it('sorting by used', () => {
       cy.getByTestId('Collateral').click();
-      const marketsSortedDefault = ['0.00', '1.00', '0.01', '0.01', '0.00'];
-      const marketsSortedAsc = ['0.00', '0.00', '0.01', '0.01', '1.00'];
-      const marketsSortedDesc = ['1.00', '0.01', '0.01', '0.00', '0.00'];
+      const marketsSortedDefault = ['0.00', '1.01', '0.01', '0.00', '0.00'];
+      const marketsSortedAsc = ['0.00', '0.00', '0.00', '0.01', '1.01'];
+      const marketsSortedDesc = ['1.01', '0.01', '0.00', '0.00', '0.00'];
       checkSorting(
         'used',
         marketsSortedDefault,
@@ -102,24 +102,24 @@ describe('accounts', { tags: '@smoke' }, () => {
       cy.getByTestId('Collateral').click();
       const marketsSortedDefault = [
         '1,000.00002',
-        '1,000.00',
+        '100,000.00',
         '1,000.00',
         '1,000.00',
         '1,000.00001',
       ];
       const marketsSortedAsc = [
-        '1,000.00',
         '1,000.00',
         '1,000.00',
         '1,000.00001',
         '1,000.00002',
+        '100,000.00',
       ];
       const marketsSortedDesc = [
+        '100,000.00',
         '1,000.00002',
         '1,000.00001',
         '1,000.00',
         '1,000.00',
-        '1,000.00',
       ];
 
       checkSorting(

apps/trading-e2e/src/integration/trading-deal-ticket.cy.ts

@@ -2,7 +2,11 @@ import * as Schema from '@vegaprotocol/types';
 import { aliasGQLQuery, mockConnectWallet } from '@vegaprotocol/cypress';
 import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { accountsQuery, estimateOrderQuery } from '@vegaprotocol/mock';
+import {
+  accountsQuery,
+  estimateOrderQuery,
+  amendGeneralAccountBalance,
+} from '@vegaprotocol/mock';
 import { createOrder } from '../support/create-order';
 
 const orderSizeField = 'order-size';
@@ -583,6 +587,10 @@ describe('suspended market validation', { tags: '@regression' }, () => {
       Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
       Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
     );
+    const accounts = accountsQuery();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Accounts', accounts);
+    });
     cy.mockSubscription();
     cy.visit('/#/markets/market-0');
     cy.wait('@Markets');
@@ -632,30 +640,10 @@ describe('account validation', { tags: '@regression' }, () => {
     beforeEach(() => {
       cy.setVegaWallet();
       cy.mockTradingPage();
+      const accounts = accountsQuery();
+      amendGeneralAccountBalance(accounts, 'market-0', '0');
       cy.mockGQL((req) => {
-        aliasGQLQuery(
-          req,
-          'Accounts',
-          accountsQuery({
-            party: {
-              accountsConnection: {
-                edges: [
-                  {
-                    node: {
-                      type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-                      balance: '0',
-                      market: null,
-                      asset: {
-                        __typename: 'Asset',
-                        id: 'asset-0',
-                      },
-                    },
-                  },
-                ],
-              },
-            },
-          })
-        );
+        aliasGQLQuery(req, 'Accounts', accounts);
       });
       cy.mockSubscription();
       cy.visit('/#/markets/market-0');
@@ -669,7 +657,7 @@ describe('account validation', { tags: '@regression' }, () => {
         'have.text',
         'You need ' +
           'tDAI' +
-          ' in your wallet to trade in this market. See all your collateral.Make a deposit'
+          ' in your wallet to trade in this market.See all your collateral.Make a deposit'
       );
       cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
     });
@@ -679,19 +667,13 @@ describe('account validation', { tags: '@regression' }, () => {
     beforeEach(() => {
       cy.setVegaWallet();
       cy.mockTradingPage();
+      const accounts = accountsQuery();
+      amendGeneralAccountBalance(accounts, 'market-0', '100000000');
       cy.mockGQL((req) => {
-        aliasGQLQuery(
-          req,
-          'EstimateOrder',
-          estimateOrderQuery({
-            estimateOrder: {
-              marginLevels: {
-                __typename: 'MarginLevels',
-                initialLevel: '1000000000',
-              },
-            },
-          })
-        );
+        aliasGQLQuery(req, 'Accounts', accounts);
+      });
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'EstimateOrder', estimateOrderQuery());
       });
       cy.mockSubscription();
       cy.visit('/#/markets/market-0');
@@ -707,7 +689,7 @@ describe('account validation', { tags: '@regression' }, () => {
       );
       cy.getByTestId('dealticket-warning-margin').should(
         'contain.text',
-        '9,999.99 tDAI is currently required. You have only 1,000.00 tDAI available.Deposit tDAI'
+        'You may not have enough margin available to open this position. 2,354.72283 tDAI is currently required. You have only 1,000.01 tDAI available.'
       );
       cy.getByTestId('deal-ticket-deposit-dialog-button').click();
       cy.getByTestId('dialog-content')

apps/trading-e2e/src/integration/trading-orders.cy.ts

@@ -31,7 +31,7 @@ describe('orders list', { tags: '@smoke' }, () => {
     cy.visit('/#/markets/market-0');
     cy.getByTestId('Orders').click();
     cy.wait('@Orders').then(() => {
-      expect(subscriptionMocks.OrdersUpdate).to.be.calledTwice;
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
     });
     cy.wait('@Markets');
   });
@@ -136,7 +136,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
     cy.visit('/#/markets/market-0');
     cy.getByTestId('Orders').click();
     cy.wait('@Orders').then(() => {
-      expect(subscriptionMocks.OrdersUpdate).to.be.calledTwice;
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
     });
   });
   const orderId = '1234567890';
@@ -354,7 +354,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
     cy.visit('/#/markets/market-0');
     cy.getByTestId('Orders').click();
     cy.wait('@Orders').then(() => {
-      expect(subscriptionMocks.OrdersUpdate).to.be.calledTwice;
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
     });
     cy.mockVegaWalletTransaction();
   });

apps/trading-e2e/src/integration/trading-positions.cy.ts

@@ -164,10 +164,10 @@ describe('positions', { tags: '@smoke' }, () => {
 
       cy.get('[col-id="liquidationPrice"]').should('contain.text', '0'); // liquidation price
 
-      cy.get('[col-id="currentLeverage"]').should('contain.text', '138.446.1');
+      cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
 
       cy.get('[col-id="marginAccountBalance"]') // margin allocated
-        .should('contain.text', '1,000');
+        .should('contain.text', '0.01');
 
       cy.get('[col-id="unrealisedPNL"]').each(($unrealisedPnl) => {
         cy.wrap($unrealisedPnl).invoke('text').should('not.be.empty');

apps/trading-e2e/src/integration/wallets.cy.ts

@@ -17,6 +17,13 @@ describe('connect hosted wallet', { tags: '@smoke' }, () => {
   });
 
   it('can connect', () => {
+    // 0002-WCON-002
+    // 0002-WCON-003
+    // 0002-WCON-039
+    // 0002-WCON-017
+    // 0002-WCON-018
+    // 0002-WCON-019
+
     // Mock authentication
     cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
       body: {
@@ -41,6 +48,9 @@ describe('connect hosted wallet', { tags: '@smoke' }, () => {
       },
     });
     cy.getByTestId(connectVegaBtn).click();
+    cy.contains(
+      'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
+    );
     cy.contains('Connect Vega wallet');
     cy.contains('Hosted Fairground wallet');
 
@@ -51,9 +61,13 @@ describe('connect hosted wallet', { tags: '@smoke' }, () => {
     cy.getByTestId(form).find('#passphrase').click().type('pass');
     cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
     cy.getByTestId(manageVegaBtn).should('exist');
+    cy.getByTestId('manage-vega-wallet').click();
+    cy.getByTestId('keypair-list').should('exist');
   });
 
   it('doesnt connect with invalid credentials', () => {
+    // 0002-WCON-020
+
     // Mock incorrect username/password
     cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
       body: {
@@ -99,6 +113,10 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
   });
 
   it('can connect', () => {
+    // 0002-WCON-002
+    // 0002-WCON-005
+    // 0002-WCON-007
+
     mockConnectWallet();
     cy.getByTestId(connectVegaBtn).click();
     cy.getByTestId('connectors-list')
@@ -110,16 +128,40 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
   });
 
   it('can change selected public key and disconnect', () => {
+    // 0002-WCON-022
+    // 0002-WCON-023
+    // 0002-WCON-025
+    // 0002-WCON-026
+    // 0002-WCON-021
+    // 0002-WCON-027
+    // 0002-WCON-030
+    // 0002-WCON-029
+    // 0002-WCON-008
+    // 0002-WCON-035
+    // 0002-WCON-014
+    // 0002-WCON-010
+
+    mockConnectWallet();
     const key2 = Cypress.env('VEGA_PUBLIC_KEY2');
     const truncatedKey2 = Cypress.env('TRUNCATED_VEGA_PUBLIC_KEY2');
     cy.connectVegaWallet();
     cy.getByTestId('manage-vega-wallet').click();
     cy.getByTestId('keypair-list').should('exist');
     cy.getByTestId(`key-${key2}`).should('contain.text', truncatedKey2);
+    cy.getByTestId(`key-${key2}`)
+      .find('[data-testid="copy-vega-public-key"]')
+      .should('be.visible');
     cy.get(`[data-testid="key-${key2}"] > .mr-2`).click();
+    cy.getByTestId('keypair-list')
+      .find('[data-state="checked"]')
+      .should('be.visible');
     cy.getByTestId('disconnect').click();
     cy.getByTestId('connect-vega-wallet').should('exist');
     cy.getByTestId('manage-vega-wallet').should('not.exist');
+    cy.getByTestId('connect-vega-wallet').click();
+    cy.contains(
+      'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
+    );
   });
 });
 
@@ -151,7 +193,7 @@ describe('ethereum wallet', { tags: '@smoke' }, () => {
     cy.getByTestId('Deposits').click();
     cy.getByTestId('deposit-button').click();
     connectEthereumWallet('MetaMask');
-    cy.get('#ethereum-address').should('have.value', ethWalletAddress);
+    cy.getByTestId('ethereum-address').should('have.text', ethWalletAddress);
     cy.getByTestId('disconnect-ethereum-wallet')
       .should('have.text', 'Disconnect')
       .click();

apps/trading-e2e/src/integration/withdraw-key-to-key.cy.ts

@@ -76,6 +76,9 @@ describe(
       cy.getByTestId(closeDialog).click();
       cy.getByTestId('Trading').first().click();
       cy.getByTestId(collateralTab).click();
+      cy.getByTestId(openTransferDialog).should('not.exist');
+      cy.getByTestId('Portfolio').eq(0).click();
+      cy.getByTestId(collateralTab).click();
       cy.getByTestId(openTransferDialog).click();
       cy.getByTestId(dialogTransferText).should(
         'contain.text',

apps/trading-e2e/src/support/order-update-subscription.ts

@@ -7,13 +7,13 @@ import type { onMessage } from '@vegaprotocol/cypress';
 import type { PartialDeep } from 'type-fest';
 import { orderUpdateSubscription } from '@vegaprotocol/mock';
 
-let sendOrderUpdate: (data: OrdersUpdateSubscription) => void;
+const sendOrderUpdate: ((data: OrdersUpdateSubscription) => void)[] = [];
 const getOnOrderUpdate = () => {
   const onOrderUpdate: onMessage<
     OrdersUpdateSubscription,
     OrdersUpdateSubscriptionVariables
   > = (send) => {
-    sendOrderUpdate = send;
+    sendOrderUpdate.push(send);
   };
   return onOrderUpdate;
 };
@@ -31,5 +31,5 @@ export function updateOrder(
   if (!sendOrderUpdate) {
     throw new Error('OrderSub not called');
   }
-  sendOrderUpdate(update);
+  sendOrderUpdate.forEach((send) => send(update));
 }

apps/trading-e2e/src/support/trading.ts

@@ -28,7 +28,6 @@ import {
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
 import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
-import type { MarketInfoQuery } from '@vegaprotocol/market-info';
 
 type MarketPageMockData = {
   state: Schema.MarketState;
@@ -69,18 +68,6 @@ const marketsDataOverride = (
   },
 });
 
-const marketInfoOverride = (
-  data: MarketPageMockData
-): PartialDeep<MarketInfoQuery> => ({
-  market: {
-    state: data.state,
-    tradingMode: data.tradingMode,
-    data: {
-      trigger: data.trigger,
-    },
-  },
-});
-
 const mockTradingPage = (
   req: CyHttpMessages.IncomingHttpRequest,
   state: Schema.MarketState = Schema.MarketState.STATE_ACTIVE,
@@ -109,11 +96,7 @@ const mockTradingPage = (
   aliasGQLQuery(req, 'Margins', marginsQuery());
   aliasGQLQuery(req, 'Assets', assetsQuery());
   aliasGQLQuery(req, 'Asset', assetQuery());
-  aliasGQLQuery(
-    req,
-    'MarketInfo',
-    marketInfoQuery(marketInfoOverride({ state, tradingMode, trigger }))
-  );
+  aliasGQLQuery(req, 'MarketInfo', marketInfoQuery());
   aliasGQLQuery(req, 'Trades', tradesQuery());
   aliasGQLQuery(req, 'Chart', chartQuery());
   aliasGQLQuery(req, 'Candles', candlesQuery());

apps/trading/client-pages/home/home.tsx

@@ -12,6 +12,7 @@ export const Home = () => {
   // should be the oldest market that is currently trading in     us mode(i.e. not in auction).
   const { data, error, loading } = useDataProvider({
     dataProvider: marketsWithDataProvider,
+    variables: undefined,
   });
   const update = useGlobalStore((store) => store.update);
   const marketId = useGlobalStore((store) => store.marketId);

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -47,7 +47,8 @@ export const Liquidity = () => {
 const useReloadLiquidityData = (marketId: string | undefined) => {
   const { reload } = useDataProvider({
     dataProvider: liquidityProvisionsDataProvider,
-    variables: useMemo(() => ({ marketId }), [marketId]),
+    variables: { marketId: marketId || '' },
+    skip: !marketId,
   });
   useEffect(() => {
     const interval = setInterval(reload, 10000);
@@ -77,7 +78,8 @@ export const LiquidityContainer = ({
   const { data, loading, error } = useDataProvider({
     dataProvider: lpAggregatedDataProvider,
     update,
-    variables: useMemo(() => ({ marketId }), [marketId]),
+    variables: { marketId: marketId || '' },
+    skip: !marketId,
   });
 
   const assetDecimalPlaces =
@@ -161,7 +163,8 @@ export const LiquidityViewContainer = ({
   } = useDataProvider({
     dataProvider: lpAggregatedDataProvider,
     update,
-    variables: useMemo(() => ({ marketId }), [marketId]),
+    variables: { marketId: marketId || '' },
+    skip: !marketId,
   });
 
   const targetStake = marketData?.targetStake;

apps/trading/client-pages/market/market.tsx

@@ -7,10 +7,6 @@ import {
   useThrottledDataProvider,
 } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
-import type {
-  MarketData,
-  MarketDataUpdateFieldsFragment,
-} from '@vegaprotocol/market-list';
 
 import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
@@ -35,13 +31,10 @@ const TitleUpdater = ({
 }) => {
   const pageTitle = usePageTitleStore((store) => store.pageTitle);
   const updateTitle = usePageTitleStore((store) => store.updateTitle);
-  const { data: marketData } = useThrottledDataProvider<
-    MarketData,
-    MarketDataUpdateFieldsFragment
-  >(
+  const { data: marketData } = useThrottledDataProvider(
     {
       dataProvider: marketDataProvider,
-      variables: useMemo(() => ({ marketId }), [marketId]),
+      variables: { marketId: marketId || '' },
       skip: !marketId,
     },
     1000

apps/trading/client-pages/market/trade-grid.tsx

@@ -179,7 +179,10 @@ const MainGrid = ({
             </Tab>
             <Tab id="accounts" name={t('Collateral')}>
               <VegaWalletContainer>
-                <TradingViews.Collateral pinnedAsset={pinnedAsset} />
+                <TradingViews.Collateral
+                  pinnedAsset={pinnedAsset}
+                  hideButtons
+                />
               </VegaWalletContainer>
             </Tab>
           </Tabs>

apps/trading/client-pages/portfolio/deposits-container.tsx

@@ -2,10 +2,16 @@ import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useDepositDialog, DepositsTable } from '@vegaprotocol/deposits';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import {
+  useDataProvider,
+  useBottomPlaceholder,
+} from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useRef } from 'react';
+import type { AgGridReact } from 'ag-grid-react';
 
 export const DepositsContainer = () => {
+  const gridRef = useRef<AgGridReact | null>(null);
   const { pubKey, isReadOnly } = useVegaWallet();
   const { data, loading, error, reload } = useDataProvider({
     dataProvider: depositsProvider,
@@ -13,13 +19,15 @@ export const DepositsContainer = () => {
     skip: !pubKey,
   });
   const openDepositDialog = useDepositDialog((state) => state.open);
-
+  const bottomPlaceholderProps = useBottomPlaceholder({ gridRef });
   return (
-    <div className="h-full grid grid-rows-[1fr,min-content]">
+    <div className="h-full">
       <div className="h-full relative">
         <DepositsTable
           rowData={data || []}
           noRowsOverlayComponent={() => null}
+          ref={gridRef}
+          {...bottomPlaceholderProps}
         />
         <div className="pointer-events-none absolute inset-0">
           <AsyncRenderer
@@ -33,8 +41,9 @@ export const DepositsContainer = () => {
         </div>
       </div>
       {!isReadOnly && (
-        <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
+        <div className="h-auto flex justify-end px-[11px] py-2 bottom-0 right-3 absolute dark:bg-black/75 bg-white/75 rounded">
           <Button
+            variant="primary"
             size="sm"
             onClick={() => openDepositDialog()}
             data-testid="deposit-button"

apps/trading/client-pages/portfolio/portfolio.tsx

@@ -49,7 +49,10 @@ export const Portfolio = () => {
               </Tab>
               <Tab id="positions" name={t('Positions')}>
                 <VegaWalletContainer>
-                  <PositionsContainer onMarketClick={onMarketClick} />
+                  <PositionsContainer
+                    onMarketClick={onMarketClick}
+                    noBottomPlaceholder
+                  />
                 </VegaWalletContainer>
               </Tab>
               <Tab id="orders" name={t('Orders')}>

apps/trading/client-pages/portfolio/withdrawals-container.tsx

@@ -20,36 +20,35 @@ export const WithdrawalsContainer = () => {
 
   return (
     <VegaWalletContainer>
-      <div className="h-full relative grid grid-rows-[1fr,min-content]">
-        <div className="h-full relative">
-          <WithdrawalsTable
-            data-testid="withdrawals-history"
-            rowData={data}
-            noRowsOverlayComponent={() => null}
+      <div className="h-full relative">
+        <WithdrawalsTable
+          data-testid="withdrawals-history"
+          rowData={data}
+          noRowsOverlayComponent={() => null}
+        />
+        <div className="pointer-events-none absolute inset-0">
+          <AsyncRenderer
+            data={data}
+            loading={loading}
+            error={error}
+            noDataCondition={(data) => !(data && data.length)}
+            noDataMessage={t('No withdrawals')}
+            reload={reload}
           />
-          <div className="pointer-events-none absolute inset-0">
-            <AsyncRenderer
-              data={data}
-              loading={loading}
-              error={error}
-              noDataCondition={(data) => !(data && data.length)}
-              noDataMessage={t('No withdrawals')}
-              reload={reload}
-            />
-          </div>
         </div>
-        {!isReadOnly && (
-          <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
-            <Button
-              size="sm"
-              onClick={() => openWithdrawDialog()}
-              data-testid="withdraw-dialog-button"
-            >
-              {t('Make withdrawal')}
-            </Button>
-          </div>
-        )}
       </div>
+      {!isReadOnly && (
+        <div className="h-auto flex justify-end px-[11px] py-2 bottom-0 right-3 absolute dark:bg-black/75 bg-white/75 rounded">
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => openWithdrawDialog()}
+            data-testid="withdraw-dialog-button"
+          >
+            {t('Make withdrawal')}
+          </Button>
+        </div>
+      )}
     </VegaWalletContainer>
   );
 };

apps/trading/components/accounts-container/accounts-container.tsx

@@ -11,8 +11,10 @@ import { useDepositDialog } from '@vegaprotocol/deposits';
 
 export const AccountsContainer = ({
   pinnedAsset,
+  hideButtons,
 }: {
   pinnedAsset?: PinnedAsset;
+  hideButtons?: boolean;
 }) => {
   const { pubKey, isReadOnly } = useVegaWallet();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -36,27 +38,30 @@ export const AccountsContainer = ({
   }
 
   return (
-    <div className="h-full relative grid grid-rows-[1fr,min-content]">
-      <div>
-        <AccountManager
-          partyId={pubKey}
-          onClickAsset={onClickAsset}
-          onClickWithdraw={openWithdrawalDialog}
-          onClickDeposit={openDepositDialog}
-          isReadOnly={isReadOnly}
-          pinnedAsset={pinnedAsset}
-        />
-      </div>
-      {!isReadOnly && (
-        <div className="flex gap-2 justify-end p-2 px-[11px]">
+    <div className="h-full relative">
+      <AccountManager
+        partyId={pubKey}
+        onClickAsset={onClickAsset}
+        onClickWithdraw={openWithdrawalDialog}
+        onClickDeposit={openDepositDialog}
+        isReadOnly={isReadOnly}
+        pinnedAsset={pinnedAsset}
+      />
+      {!isReadOnly && !hideButtons && (
+        <div className="flex gap-2 justify-end p-2 px-[11px] absolute lg:fixed bottom-0 right-3 dark:bg-black/75 bg-white/75 rounded">
           <Button
+            variant="primary"
             size="sm"
             data-testid="open-transfer-dialog"
             onClick={() => openTransferDialog()}
           >
             {t('Transfer')}
           </Button>
-          <Button size="sm" onClick={() => openDepositDialog()}>
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => openDepositDialog()}
+          >
             {t('Deposit')}
           </Button>
         </div>

apps/trading/components/banner/banner.tsx

@@ -30,7 +30,7 @@ export const Banner = () => {
           <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
         </button>
         <div>
-          <span className="pr-4">Mainnet sim 2 is live!</span>
+          <span className="pr-4">Mainnet sim 3 is coming soon!</span>
           <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
         </div>
       </div>

apps/trading/components/footer/footer.tsx

@@ -14,7 +14,7 @@ export const Footer = () => {
   const { blockDiff, datanodeBlockHeight } = useNodeHealth();
 
   return (
-    <footer className="px-4 py-1 text-xs border-t border-default text-vega-light-300 dark:text-vega-dark-300">
+    <footer className="px-4 py-1 text-xs border-t border-default text-vega-light-300 dark:text-vega-dark-300 lg:fixed bottom-0 left-0 border-r bg-white dark:bg-black">
       {/* Pull left to align with top nav, due to button padding */}
       <div className="-ml-2">
         {VEGA_URL && (

apps/trading/components/last-24h-price-change/last-24h-price-change.tsx

@@ -1,5 +1,4 @@
 import type { RefObject } from 'react';
-import { useMemo } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { isNumeric } from '@vegaprotocol/utils';
 import {
@@ -9,7 +8,6 @@ import {
 import { PriceChangeCell } from '@vegaprotocol/datagrid';
 import * as Schema from '@vegaprotocol/types';
 import type { CandleClose } from '@vegaprotocol/types';
-import type { Candle } from '@vegaprotocol/market-list';
 import { marketCandlesProvider } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';
 
@@ -30,19 +28,14 @@ export const Last24hPriceChange = ({
 }: Props) => {
   const [ref, inView] = useInView({ root: inViewRoot?.current });
   const yesterday = useYesterday();
-  const variables = useMemo(
-    () => ({
-      marketId: marketId,
-      interval: Schema.Interval.INTERVAL_I1H,
-      since: new Date(yesterday).toISOString(),
-    }),
-    [marketId, yesterday]
-  );
-
-  const { data, error } = useThrottledDataProvider<Candle[], Candle>(
+  const { data, error } = useThrottledDataProvider(
     {
       dataProvider: marketCandlesProvider,
-      variables,
+      variables: {
+        marketId: marketId || '',
+        interval: Schema.Interval.INTERVAL_I1H,
+        since: new Date(yesterday).toISOString(),
+      },
       skip: !marketId || !inView,
     },
     THROTTLE_UPDATE_TIME

apps/trading/components/last-24h-volume/last-24h-volume.tsx

@@ -10,8 +10,6 @@ import {
   useYesterday,
 } from '@vegaprotocol/react-helpers';
 import * as Schema from '@vegaprotocol/types';
-import { useMemo } from 'react';
-import type { Candle } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';
 
 interface Props {
@@ -32,19 +30,14 @@ export const Last24hVolume = ({
   const yesterday = useYesterday();
   const [ref, inView] = useInView({ root: inViewRoot?.current });
 
-  const variables = useMemo(
-    () => ({
-      marketId: marketId,
-      interval: Schema.Interval.INTERVAL_I1H,
-      since: new Date(yesterday).toISOString(),
-    }),
-    [marketId, yesterday]
-  );
-
-  const { data } = useThrottledDataProvider<Candle[], Candle>(
+  const { data } = useThrottledDataProvider(
     {
       dataProvider: marketCandlesProvider,
-      variables,
+      variables: {
+        marketId: marketId || '',
+        interval: Schema.Interval.INTERVAL_I1H,
+        since: new Date(yesterday).toISOString(),
+      },
       skip: !(inView && marketId),
     },
     THROTTLE_UPDATE_TIME

apps/trading/components/liquidity-supplied/liquidity-supplied.tsx

@@ -4,10 +4,7 @@ import {
   useDataProvider,
   useNetworkParams,
 } from '@vegaprotocol/react-helpers';
-import type {
-  MarketData,
-  MarketDataUpdateFieldsFragment,
-} from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import {
@@ -70,7 +67,7 @@ export const MarketLiquiditySupplied = ({
     [noUpdate]
   );
 
-  useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
+  useDataProvider({
     dataProvider: marketDataProvider,
     update,
     variables,

apps/trading/components/market-mark-price/market-mark-price.tsx

@@ -1,13 +1,8 @@
 import type { RefObject } from 'react';
-import { useMemo } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { useThrottledDataProvider } from '@vegaprotocol/react-helpers';
 import { PriceCell } from '@vegaprotocol/datagrid';
-import type {
-  MarketData,
-  MarketDataUpdateFieldsFragment,
-} from '@vegaprotocol/market-list';
 import { marketDataProvider } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';
 
@@ -27,15 +22,10 @@ export const MarketMarkPrice = ({
   asPriceCell,
 }: Props) => {
   const [ref, inView] = useInView({ root: inViewRoot?.current });
-  const variables = useMemo(() => ({ marketId }), [marketId]);
-
-  const { data } = useThrottledDataProvider<
-    MarketData,
-    MarketDataUpdateFieldsFragment
-  >(
+  const { data } = useThrottledDataProvider(
     {
       dataProvider: marketDataProvider,
-      variables,
+      variables: { marketId: marketId || '' },
       skip: !inView,
     },
     THROTTLE_UPDATE_TIME

apps/trading/components/market-state/market-state.tsx

@@ -1,15 +1,11 @@
 import throttle from 'lodash/throttle';
-import type {
-  MarketData,
-  MarketDataUpdateFieldsFragment,
-  Market,
-} from '@vegaprotocol/market-list';
+import type { MarketData, Market } from '@vegaprotocol/market-list';
 import { marketDataProvider } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
-import { useCallback, useMemo, useRef, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import * as constants from '../constants';
 
 export const MarketState = ({ market }: { market: Market | null }) => {
@@ -33,14 +29,10 @@ export const MarketState = ({ market }: { market: Market | null }) => {
     [throttledSetMarketState]
   );
 
-  const variables = useMemo(
-    () => ({ marketId: market?.id || '' }),
-    [market?.id]
-  );
-  useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
+  useDataProvider({
     dataProvider: marketDataProvider,
     update,
-    variables,
+    variables: { marketId: market?.id || '' },
     skip: !market?.id,
   });
 

apps/trading/components/market-volume/market-volume.tsx

@@ -1,24 +1,16 @@
-import { useCallback, useMemo, useRef, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import throttle from 'lodash/throttle';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
-import type {
-  MarketData,
-  MarketDataUpdateFieldsFragment,
-} from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import * as constants from '../constants';
 
 export const MarketVolume = ({ marketId }: { marketId: string }) => {
   const [marketVolume, setMarketVolume] = useState<string>('-');
-  const variables = useMemo(
-    () => ({
-      marketId: marketId,
-    }),
-    [marketId]
-  );
+  const variables = { marketId };
   const { data } = useDataProvider({
     dataProvider: marketProvider,
     variables,
@@ -46,7 +38,7 @@ export const MarketVolume = ({ marketId }: { marketId: string }) => {
     [data?.positionDecimalPlaces, throttledSetMarketVolume]
   );
 
-  useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
+  useDataProvider({
     dataProvider: marketDataProvider,
     update,
     variables,

apps/trading/components/navbar/navbar.tsx

@@ -1,6 +1,4 @@
-import { useState } from 'react';
-import classNames from 'classnames';
-import { NavLink, Link } from 'react-router-dom';
+import type { ComponentProps } from 'react';
 import {
   DApp,
   NetworkSwitcher,
@@ -11,32 +9,22 @@ import { t } from '@vegaprotocol/i18n';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
 import {
-  Drawer,
-  getNavLinkClassNames,
-  getActiveNavLinkClassNames,
-  Nav,
-  NewTab,
   ThemeSwitcher,
+  Navigation,
+  NavigationList,
+  NavigationItem,
+  NavigationLink,
+  ExternalLink,
+  Icon,
+  NavigationBreakpoint,
 } from '@vegaprotocol/ui-toolkit';
-import { Vega } from '../icons/vega';
-import type { HTMLAttributeAnchorTarget } from 'react';
+
 import { Links, Routes } from '../../pages/client-router';
 
-type NavbarTheme = 'inherit' | 'dark' | 'yellow';
-interface NavbarProps {
-  navbarTheme?: NavbarTheme;
-}
-
-const LinkList = ({
-  navbarTheme,
-  className = 'flex',
-  dataTestId = 'navbar-links',
-  onNavigate,
+export const Navbar = ({
+  theme = 'system',
 }: {
-  navbarTheme: NavbarTheme;
-  className?: string;
-  dataTestId?: string;
-  onNavigate?: () => void;
+  theme: ComponentProps<typeof Navigation>['theme'];
 }) => {
   const tokenLink = useLinks(DApp.Token);
   const { marketId } = useGlobalStore((store) => ({
@@ -46,178 +34,67 @@ const LinkList = ({
     ? Links[Routes.MARKET](marketId)
     : Links[Routes.MARKET]();
   return (
-    <div className={className} data-testid={dataTestId}>
-      <AppNavLink
-        name={t('Markets')}
-        path={Links[Routes.MARKETS]()}
-        navbarTheme={navbarTheme}
-        onClick={onNavigate}
-        end
-      />
-      <AppNavLink
-        name={t('Trading')}
-        path={tradingPath}
-        navbarTheme={navbarTheme}
-        onClick={onNavigate}
-        end
-      />
-      <AppNavLink
-        name={t('Portfolio')}
-        path={Links[Routes.PORTFOLIO]()}
-        navbarTheme={navbarTheme}
-        onClick={onNavigate}
-      />
-      <a
-        href={tokenLink(TOKEN_GOVERNANCE)}
-        target="_blank"
-        rel="noreferrer"
-        className={classNames(
-          'w-full md:w-auto',
-          getActiveNavLinkClassNames(false, navbarTheme)
-        )}
-      >
-        <span className="flex items-center justify-between w-full gap-2 pr-3 md:pr-0">
-          {t('Governance')}
-          <NewTab />
-        </span>
-      </a>
-    </div>
-  );
-};
-
-const MobileMenuBar = ({ navbarTheme }: { navbarTheme: NavbarTheme }) => {
-  const [drawerOpen, setDrawerOpen] = useState(false);
-  const [container, setContainer] = useState<HTMLElement | null>(null);
-
-  const menuButton = (
-    <button
-      className={classNames(
-        'flex flex-col justify-around gap-3 p-2 relative z-30 h-[34px]',
-        {
-          'z-50': drawerOpen,
-        }
-      )}
-      onClick={() => setDrawerOpen(!drawerOpen)}
-      data-testid="button-menu-drawer"
-    >
-      <div
-        className={classNames('w-[26px] h-[2px] transition-all', {
-          'translate-y-0 rotate-0 bg-white': !drawerOpen,
-          'bg-black': !drawerOpen && navbarTheme === 'yellow',
-          'translate-y-[7.5px] rotate-45 bg-black dark:bg-white': drawerOpen,
-        })}
-      />
-      <div
-        className={classNames('w-[26px] h-[2px] transition-all', {
-          'translate-y-0 rotate-0 bg-white': !drawerOpen,
-          'bg-black': !drawerOpen && navbarTheme === 'yellow',
-          '-translate-y-[7.5px] -rotate-45 bg-black dark:bg-white': drawerOpen,
-        })}
-      />
-    </button>
-  );
-
-  return (
-    <div className="flex overflow-hidden md:hidden" ref={setContainer}>
-      <Drawer
-        dataTestId="menu-drawer"
-        open={drawerOpen}
-        onChange={setDrawerOpen}
-        container={container}
-        trigger={menuButton}
-      >
-        <div className="border-l border-default px-4 py-2 gap-4 flex flex-col w-full h-full bg-white dark:bg-black dark:text-white justify-start">
-          <div className="w-full h-1"></div>
-          <div className="px-2 pt-10 w-full flex flex-col items-stretch">
-            <NetworkSwitcher />
-            <div className="w-full pt-8 h-1 border-b border-default"></div>
-          </div>
-          <LinkList
-            className="flex flex-col"
-            navbarTheme={navbarTheme}
-            dataTestId="mobile-navbar-links"
-            onNavigate={() => setDrawerOpen(false)}
-          />
-          <div className="flex flex-col px-2 justify-between">
-            <div className="w-full h-1 border-t border-default py-5"></div>
-            <ThemeSwitcher withMobile />
-          </div>
-        </div>
-      </Drawer>
-    </div>
-  );
-};
-
-export const Navbar = ({ navbarTheme = 'inherit' }: NavbarProps) => {
-  const titleContent = (
-    <div className="hidden md:block">
-      <NetworkSwitcher />
-    </div>
-  );
-  return (
-    <Nav
-      navbarTheme={navbarTheme}
-      title={t('Console')}
-      titleContent={titleContent}
-      icon={
-        <Link to="/">
-          <Vega className="w-13" />
-        </Link>
+    <Navigation
+      appName="Console"
+      theme={theme}
+      actions={
+        <>
+          <ThemeSwitcher />
+          <VegaWalletConnectButton />
+        </>
       }
+      breakpoints={[521, 1067]}
     >
-      <LinkList className="hidden md:flex md:px-2" navbarTheme={navbarTheme} />
-      <div className="flex items-center gap-2 ml-auto overflow-hidden">
-        <VegaWalletConnectButton />
-        <ThemeSwitcher className="hidden md:block" />
-        <MobileMenuBar navbarTheme={navbarTheme} />
-      </div>
-    </Nav>
-  );
-};
-
-interface AppNavLinkProps {
-  name: string;
-  path: string;
-  navbarTheme: NavbarTheme;
-  testId?: string;
-  target?: HTMLAttributeAnchorTarget;
-  end?: boolean;
-  onClick?: () => void;
-}
-
-const AppNavLink = ({
-  name,
-  path,
-  navbarTheme,
-  target,
-  testId = name,
-  end,
-  onClick,
-}: AppNavLinkProps) => {
-  const borderClasses = classNames(
-    'absolute h-[2px] md:h-1 w-full bottom-[-1px] left-0',
-    {
-      'bg-black dark:bg-vega-yellow': navbarTheme !== 'yellow',
-      'bg-black dark:bg-vega-yellow md:dark:bg-black': navbarTheme === 'yellow',
-    }
-  );
-  return (
-    <NavLink
-      data-testid={testId}
-      to={{ pathname: path }}
-      className={getNavLinkClassNames(navbarTheme)}
-      onClick={onClick}
-      target={target}
-      end={end}
-    >
-      {({ isActive }) => {
-        return (
-          <>
-            {name}
-            {isActive && <span className={borderClasses} />}
-          </>
-        );
-      }}
-    </NavLink>
+      <NavigationList
+        className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
+        hide={[NavigationBreakpoint.Small]}
+      >
+        <NavigationItem className="[.drawer-content_&]:w-full">
+          <NetworkSwitcher className="[.drawer-content_&]:w-full" />
+        </NavigationItem>
+      </NavigationList>
+      <NavigationList
+        hide={[NavigationBreakpoint.Narrow, NavigationBreakpoint.Small]}
+      >
+        <NavigationItem>
+          <NavigationLink data-testid="Markets" to={Links[Routes.MARKETS]()}>
+            {t('Markets')}
+          </NavigationLink>
+        </NavigationItem>
+        <NavigationItem>
+          <NavigationLink data-testid="Trading" to={tradingPath}>
+            {t('Trading')}
+          </NavigationLink>
+        </NavigationItem>
+        <NavigationItem>
+          <NavigationLink
+            data-testid="Portfolio"
+            to={Links[Routes.PORTFOLIO]()}
+          >
+            {t('Portfolio')}
+          </NavigationLink>
+        </NavigationItem>
+        <NavigationItem>
+          <ExternalLink href={tokenLink(TOKEN_GOVERNANCE)}>
+            <span className="flex items-center gap-2">
+              <span>{t('Governance')}</span>{' '}
+              <Icon name="arrow-top-right" size={3} />
+            </span>
+          </ExternalLink>
+        </NavigationItem>
+      </NavigationList>
+      <NavigationList
+        className="[.drawer-content_&]:border-t [.drawer-content_&]:border-t-vega-light-200 dark:[.drawer-content_&]:border-t-vega-dark-200 [.drawer-content_&]:pt-8 [.drawer-content_&]:mt-4"
+        hide={[
+          NavigationBreakpoint.Small,
+          NavigationBreakpoint.Narrow,
+          NavigationBreakpoint.Full,
+        ]}
+      >
+        <NavigationItem className="[.drawer-content_&]:w-full text-black dark:text-white">
+          <ThemeSwitcher withMobile />
+        </NavigationItem>
+      </NavigationList>
+    </Navigation>
   );
 };

apps/trading/components/select-market/select-market.tsx

@@ -106,14 +106,13 @@ export const SelectMarketPopover = ({
     loading: marketsLoading,
     reload: marketListReload,
   } = useMarketList();
-  const variables = useMemo(() => ({ partyId: pubKey }), [pubKey]);
   const {
     data: positions,
     loading: positionsLoading,
     reload,
   } = useDataProvider({
     dataProvider: positionsDataProvider,
-    variables,
+    variables: { partyId: pubKey || '' },
     skip: !pubKey,
   });
   const onSelectMarket = useCallback(

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx

@@ -54,7 +54,7 @@ const MobileWalletButton = ({
     ? 'hidden'
     : isYellow
     ? 'fill-black'
-    : 'fill-white';
+    : 'fill-black dark:fill-white';
   const [container, setContainer] = useState<HTMLElement | null>(null);
 
   const walletButton = (

apps/trading/components/welcome-dialog/welcome-dialog.tsx

@@ -20,6 +20,7 @@ export const WelcomeDialog = () => {
   const [riskAccepted] = useLocalStorage(constants.RISK_ACCEPTED_KEY);
   const { data } = useDataProvider({
     dataProvider: activeMarketsProvider,
+    variables: undefined,
   });
 
   const { update, shouldDisplayWelcomeDialog } = useGlobalStore((store) => ({