Merge branch 'main' into chore/update-develop-with-mainnet-fixes

Merge pull request #4880 from vegaprotocol/chore/update-develop-with-mainnet-fixes
chore(trading,governance): update develop with mainnet fixes
2023-09-26 15:06:07 -04:00 · 2023-09-26 14:06:20 -04:00 · 2023-09-26 13:47:47 -04:00 · 2023-09-26 13:45:33 -04:00 · 2023-09-26 12:08:12 -04:00 · 2023-09-26 11:57:47 -04:00
57 changed files with 602 additions and 364 deletions
@@ -4,7 +4,7 @@ import { AssetTypeMapping, AssetStatusMapping } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
@@ -4,7 +4,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueGetterParams,
@@ -2,7 +2,7 @@ import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
@@ -105,7 +105,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
              ? new BigNumber(0)
              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
            return (
-              <div className="uppercase flex h-full items-center justify-center pt-2">
+              <div className="flex items-center justify-center h-full pt-2 uppercase">
                <VoteProgress
                  threshold={requiredMajorityPercentage}
                  progress={yesPercentage}
@@ -1,4 +1,4 @@
-import { useMemo, useEffect, useState, useCallback } from 'react';
+import { useMemo, useEffect, useState, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
@@ -86,12 +86,18 @@ export const EpochIndividualRewards = ({
    [epochId, page, refetch, delegationsPagination, pubKey]
  );

+  const prevEpochIdRef = useRef<number | null>(null);
+
  useEffect(() => {
-    // when the epoch changes, we want to refetch the data to update the current page
-    if (data) {
+    if (prevEpochIdRef.current === null) {
+      prevEpochIdRef.current = epochId;
+    } else if (epochId !== prevEpochIdRef.current) {
+      // When the epoch changes, we want to refetch the data to update the current page
      refetchData();
    }
-  }, [epochId, data, refetchData]);
+
+    prevEpochIdRef.current = epochId;
+  }, [epochId, refetchData]);

  return (
    <AsyncRenderer
@@ -3,7 +3,7 @@ import { forwardRef, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { Button, Icon } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -85,17 +85,17 @@ const TopThirdCellRenderer = (
      }}
      className="grid grid-cols-[60px_1fr] w-full h-full py-4 px-0 text-sm text-white text-center overflow-scroll"
    >
-      <div className="text-xs text-left px-3">
+      <div className="px-3 text-xs text-left">
        {params?.data?.rankingDisplay}
      </div>
-      <div className="whitespace-normal px-3">
+      <div className="px-3 whitespace-normal">
        <div className="mb-4">
          <Button
            data-testid="show-all-validators"
            rightIcon={
              <Icon
                name="arrow-right"
-                className="fill-current mr-2 align-text-top"
+                className="mr-2 align-text-top fill-current"
              />
            }
            className="inline-flex items-center"
@@ -103,7 +103,7 @@ const TopThirdCellRenderer = (
            {t('Reveal top validators')}
          </Button>
        </div>
-        <p className="font-semibold text-white mb-0">
+        <p className="mb-0 font-semibold text-white">
          {t(
            'Validators with too great a stake share will have the staking rewards for their delegators penalised.'
          )}
@@ -1,7 +1,7 @@
 import { forwardRef, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -1,106 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { mockConnectWallet } from '@vegaprotocol/cypress';
-import {
-  orderPriceField,
-  placeOrderBtn,
-  toggleLimit,
-  toggleLong,
-  toggleMarket,
-  toggleShort,
-} from '../support/deal-ticket';
-
-describe('deal ticket basics', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.clearAllLocalStorage();
-    cy.setOnBoardingViewed();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must show place order button and connect wallet if wallet is not connected', () => {
-    // 0003-WTXN-001
-    cy.getByTestId('connect-vega-wallet'); // Not connected
-    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('order-connect-wallet').should('exist');
-  });
-
-  it('must be able to select order direction - long/short', function () {
-    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().next('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().next('input').should('be.checked');
-  });
-
-  it('must be able to select order type - limit/market', function () {
-    // 7002-SORD-005
-    // 7002-SORD-006
-    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().next('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().next('input').should('be.checked');
-  });
-
-  it('order connect vega wallet button should connect', () => {
-    mockConnectWallet();
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
-    cy.getByTestId('dialog-content').should('be.visible');
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).next('input').should('be.checked');
-    cy.getByTestId(orderPriceField).should('have.value', '101');
-  });
-
-  it('sidebar should be open after reload', () => {
-    cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-    cy.getByTestId('Order').click();
-    cy.getByTestId('deal-ticket-form').should('not.exist');
-    cy.reload();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-  });
-});
-
-describe(
-  'market states not accepting orders',
-  { tags: '@smoke', testIsolation: true },
-  function () {
-    //7002-SORD-062
-    //7002-SORD-063
-    //7002-SORD-066
-
-    const states = [
-      Schema.MarketState.STATE_REJECTED,
-      Schema.MarketState.STATE_CANCELLED,
-      Schema.MarketState.STATE_CLOSED,
-      Schema.MarketState.STATE_SETTLED,
-      Schema.MarketState.STATE_TRADING_TERMINATED,
-    ];
-
-    states.forEach((marketState) => {
-      describe(marketState, function () {
-        beforeEach(function () {
-          cy.mockTradingPage(marketState);
-          cy.mockSubscription();
-          cy.setVegaWallet();
-          cy.visit('/#/markets/market-0');
-        });
-        it('must display that market is not accepting orders', function () {
-          cy.getByTestId('deal-ticket-error-message-summary').should(
-            'have.text',
-            `This market is ${marketState
-              .split('_')
-              .pop()
-              ?.toLowerCase()} and not accepting orders`
-          );
-          // 7002-SORD-060
-          cy.getByTestId('place-order').should('be.enabled');
-        });
-      });
-    });
-  }
-);
@@ -4,7 +4,7 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
+import { AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import type { Asset } from '@vegaprotocol/types';
@@ -1,5 +1,5 @@
 import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, PriceFlashCell } from '@vegaprotocol/datagrid';
+import { AgGrid, PriceFlashCell } from '@vegaprotocol/datagrid';
 import type { MarketMaybeWithData } from '@vegaprotocol/markets';
 import { useColumnDefs } from './use-column-defs';

@@ -8,6 +8,7 @@ export const getRowId = ({ data }: { data: { id: string } }) => data.id;
 const defaultColDef = {
  sortable: true,
  filter: true,
+  resizable: true,
  filterParams: { buttons: ['reset'] },
 };

@@ -7,13 +7,21 @@ import {
 import type { FieldValues } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 import classNames from 'classnames';
-import { useSearchParams } from 'react-router-dom';
-import { useEffect, useState } from 'react';
+import { Navigate, useSearchParams } from 'react-router-dom';
+import { useEffect, useRef, useState } from 'react';
 import { Button } from './buttons';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import {
+  useTransactionEventSubscription,
+  useVegaWallet,
+} from '@vegaprotocol/wallet';
+import { useReferral } from './hooks/use-referral';
+import { Routes } from '../../lib/links';

 export const ApplyCodeForm = () => {
-  const [finalized, setFinalized] = useState<boolean>(false);
+  const [status, setStatus] = useState<
+    'requested' | 'failed' | 'successful' | null
+  >(null);
+  const txHash = useRef<string | null>(null);
  const { isReadOnly, pubKey, sendTx } = useVegaWallet();
  const {
    register,
@@ -24,6 +32,9 @@ export const ApplyCodeForm = () => {
  } = useForm();
  const [params] = useSearchParams();

+  const { data: referee } = useReferral(pubKey, 'referee');
+  const { data: referrer } = useReferral(pubKey, 'referrer');
+
  useEffect(() => {
    const code = params.get('code');
    if (code) setValue('code', code);
@@ -34,23 +45,67 @@ export const ApplyCodeForm = () => {
      return;
    }

+    setStatus('requested');
+
    sendTx(pubKey, {
      applyReferralCode: {
        id: code as string,
      },
    })
      .then((res) => {
-        setFinalized(true);
+        if (!res) {
+          setError('code', {
+            type: 'required',
+            message: 'The transaction could not be sent',
+          });
+        }
+        if (res) {
+          txHash.current = res.transactionHash.toLowerCase();
+        }
      })
      .catch((err) => {
-        setError('code', {
-          type: 'required',
-          message: 'Your code has been rejected',
-        });
+        if (err.message.includes('user rejected')) {
+          setStatus(null);
+        } else {
+          setError('code', {
+            type: 'required',
+            message: 'Your code has been rejected',
+          });
+        }
      });
  };

-  if (finalized) {
+  useTransactionEventSubscription({
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+    fetchPolicy: 'no-cache',
+    onData: ({ data: result }) =>
+      result.data?.busEvents?.forEach((event) => {
+        if (event.event.__typename === 'TransactionResult') {
+          const hash = event.event.hash.toLowerCase();
+          if (txHash.current && txHash.current === hash) {
+            const err = event.event.error;
+            const status = event.event.status;
+            if (err) {
+              setStatus(null);
+              setError('code', {
+                type: 'required',
+                message: err,
+              });
+            }
+            if (status && !err) {
+              setStatus('successful');
+            }
+          }
+        }
+      }),
+  });
+
+  if (referee || referrer) {
+    return <Navigate to={Routes.REFERRALS} />;
+  }
+
+  if (status === 'successful') {
    return (
      <div className="w-1/2 mx-auto">
        <h3 className="mb-5 text-xl text-center uppercase calt flex flex-row gap-2 justify-center items-center">
@@ -63,6 +118,27 @@ export const ApplyCodeForm = () => {
    );
  }

+  const getButtonProps = () => {
+    if (isReadOnly || !pubKey) {
+      return {
+        disabled: true,
+        children: 'Apply',
+      };
+    }
+
+    if (status === 'requested') {
+      return {
+        disabled: true,
+        children: 'Confirm in wallet...',
+      };
+    }
+
+    return {
+      disabled: false,
+      children: 'Apply',
+    };
+  };
+
  return (
    <div className="w-1/2 mx-auto">
      <h3 className="mb-5 text-xl text-center uppercase calt">
@@ -86,13 +162,7 @@ export const ApplyCodeForm = () => {
            })}
          />
        </label>
-        <Button
-          disabled={isReadOnly || !pubKey}
-          className="w-full"
-          type="submit"
-        >
-          Apply
-        </Button>
+        <Button className="w-full" type="submit" {...getButtonProps()} />
      </form>
      {errors.code && (
        <InputError>{errors.code.message?.toString()}</InputError>
@@ -38,18 +38,36 @@ export const RainbowButton = ({

 const RAINBOW_TAB_STYLE = classNames(
  'inline-block',
-  'bg-vega-clight-500 dark:bg-vega-cdark-500 hover:bg-vega-clight-400 dark:hover:bg-vega-cdark-400',
-  'data-[state="active"]:text-white data-[state="active"]:bg-rainbow data-[state="active"]:hover:bg-none data-[state="active"]:hover:bg-vega-pink-500 dark:data-[state="active"]:hover:bg-vega-pink-500',
-  '[&.active]:text-white [&.active]:bg-rainbow [&.active]:hover:bg-none [&.active]:hover:bg-vega-pink-500 dark:[&.active]:hover:bg-vega-pink-500',
+  'bg-vega-clight-500 dark:bg-vega-cdark-500',
+  'hover:bg-vega-clight-400 dark:hover:bg-vega-cdark-400',
+  'data-[state="active"]:text-white data-[state="active"]:bg-rainbow',
+  'data-[state="active"]:hover:bg-none data-[state="active"]:hover:bg-vega-pink-500 dark:data-[state="active"]:hover:bg-vega-pink-500',
+  '[&.active]:text-white [&.active]:bg-rainbow',
+  '[&.active]:hover:bg-none [&.active]:hover:bg-vega-pink-500 dark:[&.active]:hover:bg-vega-pink-500',
  'px-5 py-3',
  'first:rounded-tl-lg last:rounded-tr-lg'
 );

+const DISABLED_RAINBOW_TAB_STYLE = classNames(
+  'pointer-events-none',
+  'text-vega-clight-100 dark:text-vega-cdark-100',
+  'data-[state="active"]:text-white',
+  '[&.active]:text-white'
+);
+
 export const RainbowTabButton = forwardRef<
  HTMLButtonElement,
-  ButtonHTMLAttributes<HTMLButtonElement>
->(({ children, ...props }, ref) => (
-  <button ref={ref} className={RAINBOW_TAB_STYLE} {...props}>
+  { disabled?: boolean } & ButtonHTMLAttributes<HTMLButtonElement>
+>(({ children, className, disabled = false, ...props }, ref) => (
+  <button
+    ref={ref}
+    className={classNames(
+      RAINBOW_TAB_STYLE,
+      { 'pointer-events-none': disabled },
+      className
+    )}
+    {...props}
+  >
    {children}
  </button>
 ));
@@ -58,9 +76,19 @@ RainbowTabButton.displayName = 'RainbowTabButton';
 export const RainbowTabLink = ({
  to,
  children,
+  className,
+  disabled = false,
  ...props
-}: ComponentProps<typeof NavLink>) => (
-  <NavLink to={to} className={RAINBOW_TAB_STYLE} {...props}>
+}: { disabled?: boolean } & ComponentProps<typeof NavLink>) => (
+  <NavLink
+    to={to}
+    className={classNames(
+      RAINBOW_TAB_STYLE,
+      disabled && DISABLED_RAINBOW_TAB_STYLE,
+      typeof className === 'string' ? className : undefined
+    )}
+    {...props}
+  >
    {children}
  </NavLink>
 );
@@ -9,8 +9,14 @@ import { TiersContainer } from './tiers';
 import { RainbowTabLink } from './buttons';
 import { Outlet } from 'react-router-dom';
 import { Routes } from '../../lib/links';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useReferral } from './hooks/use-referral';

 export const Referrals = () => {
+  const { pubKey } = useVegaWallet();
+  const { data: referee } = useReferral(pubKey, 'referee');
+  const { data: referrer } = useReferral(pubKey, 'referrer');
+
  return (
    <>
      <LandingBanner />
@@ -19,7 +25,10 @@ export const Referrals = () => {
          <RainbowTabLink end to={Routes.REFERRALS}>
            Your referrals
          </RainbowTabLink>
-          <RainbowTabLink to={Routes.REFERRALS_APPLY_CODE}>
+          <RainbowTabLink
+            disabled={Boolean(referee || referrer)}
+            to={Routes.REFERRALS_APPLY_CODE}
+          >
            Apply a code
          </RainbowTabLink>
        </div>
@@ -9,5 +9,11 @@ export const AnnouncementBanner = () => {
    return null;
  }

-  return <Banner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />;
+  return (
+    <Banner
+      app="console"
+      configUrl={ANNOUNCEMENTS_CONFIG_URL}
+      background="url('/banner-bg.jpg')"
+    />
+  );
 };
@@ -53,7 +53,7 @@ export const HeaderStat = ({
      <div data-testid="item-header" id={id}>
        {heading}
      </div>
-      <Tooltip description={description}>
+      <Tooltip description={description} underline>
        <div
          data-testid="item-value"
          aria-labelledby={id}
@@ -55,7 +55,6 @@ const MarketSidebarButtons = () => {

  return (
    <>
-      <SidebarDivider />
      <SidebarButton
        view={ViewType.Order}
        icon={VegaIconNames.TICKET}
@@ -72,6 +71,33 @@ const MarketSidebarButtons = () => {
  );
 };

+const AssetSidebarButtons = () => {
+  const currentRouteId = useGetCurrentRouteId();
+
+  return (
+    <>
+      <SidebarButton
+        view={ViewType.Deposit}
+        icon={VegaIconNames.DEPOSIT}
+        tooltip={t('Deposit')}
+        routeId={currentRouteId}
+      />
+      <SidebarButton
+        view={ViewType.Withdraw}
+        icon={VegaIconNames.WITHDRAW}
+        tooltip={t('Withdraw')}
+        routeId={currentRouteId}
+      />
+      <SidebarButton
+        view={ViewType.Transfer}
+        icon={VegaIconNames.TRANSFER}
+        tooltip={t('Transfer')}
+        routeId={currentRouteId}
+      />
+    </>
+  );
+};
+
 export const Sidebar = () => {
  const currentRouteId = useGetCurrentRouteId();
  const navClasses = 'flex lg:flex-col items-center gap-2 lg:gap-4 p-1';
@@ -80,41 +106,34 @@ export const Sidebar = () => {
  return (
    <div className="flex h-full p-1 lg:flex-col gap-2" data-testid="sidebar">
      <nav className={navClasses}>
-        {/* sidebar options that always show */}
-        <SidebarButton
-          view={ViewType.Deposit}
-          icon={VegaIconNames.DEPOSIT}
-          tooltip={t('Deposit')}
-          routeId={currentRouteId}
-        />
-        <SidebarButton
-          view={ViewType.Withdraw}
-          icon={VegaIconNames.WITHDRAW}
-          tooltip={t('Withdraw')}
-          routeId={currentRouteId}
-        />
-        <SidebarButton
-          view={ViewType.Transfer}
-          icon={VegaIconNames.TRANSFER}
-          tooltip={t('Transfer')}
-          routeId={currentRouteId}
-        />
-        {/* buttons for specific routes */}
        <Routes>
+          <Route path="markets/all" element={<AssetSidebarButtons />} />
+          <Route path="portfolio">
+            <Route
+              // Show deposit/withdraw/transfer sidebar options only on portflio dashboard (index)
+              index={true}
+              element={<AssetSidebarButtons />}
+            />
+          </Route>
          <Route
-            path="markets/all"
-            // render nothing for markets/all, otherwise markets/:marketId will match with markets/all
-            element={null}
+            path="markets/:marketId"
+            element={
+              <>
+                <AssetSidebarButtons />
+                <SidebarDivider />
+                <MarketSidebarButtons />
+              </>
+            }
          />
-          <Route
-            // render nothing for portfolio
-            path="portfolio"
-            element={null}
-          />
-          <Route path="markets/:marketId" element={<MarketSidebarButtons />} />
          <Route
            path="liquidity/:marketId"
-            element={<MarketSidebarButtons />}
+            element={
+              <>
+                <AssetSidebarButtons />
+                <SidebarDivider />
+                <MarketSidebarButtons />
+              </>
+            }
          />
        </Routes>
      </nav>
@@ -4,33 +4,24 @@ export default function Document() {
  return (
    <>
      <Head>
-        {/* 
+        {/*
          meta tags
-          - next advised against using _document for this, so they exist in our 
+          - next advised against using _document for this, so they exist in our
          - single page index.page.tsx
        */}

-        {/* icons */}
-        <link
-          rel="icon"
-          type="image/x-icon"
-          href="https://static.vega.xyz/favicon.ico"
-        />
-        <link
-          rel="apple-touch-icon"
-          content="https://static.vega.xyz/favicon.ico"
-        />
-
-        {/* fonts */}
+        {/* preload fonts */}
        <link
          rel="preload"
-          href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
+          href="/AlphaLyrae-Medium.woff2"
          as="font"
          type="font/woff2"
        />

-        {/* styles */}
-        <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
+        {/* icons */}
+        <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+        <link rel="apple-touch-icon" content="/favicon.ico" />
+
        {/* eslint-disable-next-line @next/next/no-css-tags */}
        <link rel="stylesheet" href="/preloader.css" media="all" />

@@ -19,17 +19,11 @@ export default function Index() {
        <meta name="og:url" content="https://console.vega.xyz/" />
        <meta name="og:title" content="Vega Protocol - Console" />
        <meta name="og:site_name" content="Vega Protocol - Console" />
-        <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
-        <meta
-          name="twitter:card"
-          content="https://static.vega.xyz/favicon.ico"
-        />
+        <meta name="og:image" content="./favicon.ico" />
+        <meta name="twitter:card" content="./favicon.ico" />
        <meta name="twitter:title" content="Vega Protocol - Console" />
        <meta name="twitter:description" content="Vega Protocol - Console" />
-        <meta
-          name="twitter:image"
-          content="https://static.vega.xyz/favicon.ico"
-        />
+        <meta name="twitter:image" content="./favicon.ico" />
        <meta name="twitter:image:alt" content="VEGA logo" />
        <meta name="twitter:site" content="@vegaprotocol" />
      </Head>
@@ -1,6 +1,13 @@
@import 'ag-grid-community/styles/ag-grid.css';
@import 'ag-grid-community/styles/ag-theme-balham.css';

+/** Load AlphaLyrae font */
+@font-face {
+  font-family: AlphaLyrae;
+  src: url('/AlphaLyrae-Medium.woff2') format('woff2'),
+    url('/AlphaLyrae-Medium.woff') format('woff');
+}
+
@tailwind base;
@tailwind components;
@tailwind utilities;
@@ -103,8 +110,8 @@ html [data-theme='light'] {
  --pennant-color-depth-sell-fill: theme(colors.market.red.DEFAULT);
  --pennant-color-depth-sell-stroke: theme(colors.market.red.650);

-  --pennant-color-volume-buy: theme(colors.market.green.300);
-  --pennant-color-volume-sell: theme(colors.market.red.300);
+  --pennant-color-volume-buy: theme(colors.market.green.DEFAULT);
+  --pennant-color-volume-sell: theme(colors.market.red.DEFAULT);
 }

 html [data-theme='dark'] {
@@ -125,7 +132,7 @@ html [data-theme='dark'] {
  --pennant-color-depth-sell-stroke: theme(colors.market.red.DEFAULT);

  --pennant-color-volume-buy: theme(colors.market.green.600);
-  --pennant-color-volume-sell: theme(colors.market.red.650);
+  --pennant-color-volume-sell: theme(colors.market.red.DEFAULT);
 }

 /**
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-entrypoint="${1:-nginx}"
-
-if [[ "$entrypoint" = "nginx" ]]; then
-  nginx -g 'daemon off;'
-elif [[ "$entrypoint" = "ipfs" ]]; then
-  ipfs config profile apply server
-  ipfs config --json Addresses.Gateway '"/ip4/127.0.0.1/tcp/80"'
-  ipfs daemon
-elif [[ "-c" ]]; then
-  shift
-  /bin/sh -c "$@"
-fi
@@ -18,7 +18,7 @@ import {
  VegaIconNames,
  TooltipCellComponent,
 } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
  IGetRowsParams,
  IRowNode,
@@ -13,7 +13,7 @@ import type {
  VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
 import { ProgressBarCell } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, PriceCell } from '@vegaprotocol/datagrid';
+import { AgGrid, PriceCell } from '@vegaprotocol/datagrid';
 import type { ColDef } from 'ag-grid-community';
 import { accountValuesComparator } from './accounts-table';
 import { MarginHealthChart } from './margin-health-chart';
@@ -14,6 +14,7 @@ import {
 export type AnnouncementBannerProps = {
  app: AppNameType;
  configUrl: string;
+  background?: string;
 };

 // run only if below the allowed maximum delay ~24.8 days (https://developer.mozilla.org/en-US/docs/Web/API/setTimeout#maximum_delay_value)
@@ -36,6 +37,7 @@ const doesEndInTheFuture = (now: Date, data: Announcement) => {
 export const AnnouncementBanner = ({
  app,
  configUrl,
+  background,
 }: AnnouncementBannerProps) => {
  const [isVisible, setVisible] = useState(false);
  const { data, reload } = useAnnouncement(app, configUrl);
@@ -79,10 +81,10 @@ export const AnnouncementBanner = ({
  }

  return (
-    <Banner className="relative px-10">
+    <Banner className="relative px-10" background={background}>
      <div
        data-testid="app-announcement"
-        className="relative font-alpha flex gap-2 justify-center text-center text-lg text-white"
+        className="relative flex justify-center text-lg text-center text-white font-alpha gap-2"
      >
        <span>{data.text}</span>{' '}
        {data.urlText && data.url && (
@@ -90,7 +92,7 @@ export const AnnouncementBanner = ({
        )}
      </div>
      <button
-        className="absolute right-0 top-0 p-4 w-10 h-full flex items-center justify-center text-white"
+        className="absolute top-0 right-0 flex items-center justify-center w-10 h-full p-4 text-white"
        data-testid="app-announcement-close"
        onClick={() => {
          setVisible(false);
@@ -1,4 +1,4 @@
-export * from './lib/ag-grid/ag-grid-lazy';
+export * from './lib/ag-grid/ag-grid';

 export * from './lib/column-definitions';

@@ -1,17 +0,0 @@
-import { forwardRef, lazy } from 'react';
-import type { AgGridReactProps, AgGridReact } from 'ag-grid-react';
-
-type Props = AgGridReactProps & {
-  style?: React.CSSProperties;
-  gridRef?: React.Ref<AgGridReact>;
-};
-
-export const AgGridLazyInternal = lazy(() =>
-  import('./ag-grid-lazy-themed').then((module) => ({
-    default: module.AgGridThemed,
-  }))
-);
-
-export const AgGridLazy = forwardRef<AgGridReact, Props>((props, ref) => (
-  <AgGridLazyInternal {...props} gridRef={ref} />
-));
@@ -0,0 +1,12 @@
+import { forwardRef } from 'react';
+import type { AgGridReactProps, AgGridReact } from 'ag-grid-react';
+import { AgGridThemed } from './ag-grid-themed';
+
+type Props = AgGridReactProps & {
+  style?: React.CSSProperties;
+  gridRef?: React.Ref<AgGridReact>;
+};
+
+export const AgGrid = forwardRef<AgGridReact, Props>((props, ref) => (
+  <AgGridThemed {...props} gridRef={ref} />
+));
@@ -1,13 +1,12 @@
 import { act, render, waitFor } from '@testing-library/react';
-import {
-  useDataGridEvents,
-  GRID_EVENT_DEBOUNCE_TIME,
-} from './use-datagrid-events';
-import { AgGridThemed } from './ag-grid/ag-grid-lazy-themed';
+import { useDataGridEvents } from './use-datagrid-events';
+import { AgGridThemed } from './ag-grid/ag-grid-themed';
 import type { MutableRefObject } from 'react';
 import { useRef } from 'react';
 import type { AgGridReact } from 'ag-grid-react';

+const GRID_EVENT_DEBOUNCE_TIME = 500;
+
 const gridProps = {
  rowData: [{ id: 1 }],
  columnDefs: [
@@ -12,6 +12,7 @@ import { formatRange, formatValue } from '@vegaprotocol/utils';
 import { marketMarginDataProvider } from '@vegaprotocol/accounts';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import * as AccordionPrimitive from '@radix-ui/react-accordion';
+import * as Schema from '@vegaprotocol/types';

 import {
  MARGIN_DIFF_TOOLTIP_TEXT,
@@ -37,14 +38,16 @@ export interface DealTicketFeeDetailsProps {
  assetSymbol: string;
  order: OrderSubmissionBody['orderSubmission'];
  market: Market;
+  isMarketInAuction?: boolean;
 }

 export const DealTicketFeeDetails = ({
  assetSymbol,
  order,
  market,
+  isMarketInAuction,
 }: DealTicketFeeDetailsProps) => {
-  const feeEstimate = useEstimateFees(order);
+  const feeEstimate = useEstimateFees(order, isMarketInAuction);
  const asset = getAsset(market);
  const { decimals: assetDecimals, quantum } = asset;

@@ -63,7 +66,7 @@ export const DealTicketFeeDetails = ({
        <>
          <span>
            {t(
-              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
+              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}. Fees estimated are "taker" fees and will only be payable if the order trades aggressively. Rebate equal to the maker portion will be paid to the trader if the order trades passively.`
            )}
          </span>
          <FeesBreakdown
@@ -86,6 +89,7 @@ export interface DealTicketMarginDetailsProps {
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  assetSymbol: string;
  positionEstimate: EstimatePositionQuery['estimatePosition'];
+  side: Schema.Side;
 }

 export const DealTicketMarginDetails = ({
@@ -95,6 +99,7 @@ export const DealTicketMarginDetails = ({
  market,
  onMarketClick,
  positionEstimate,
+  side,
 }: DealTicketMarginDetailsProps) => {
  const [breakdownDialog, setBreakdownDialog] = useState(false);
  const { pubKey: partyId } = useVegaWallet();
@@ -163,10 +168,7 @@ export const DealTicketMarginDetails = ({
            : '0',
          assetDecimals
        )}
-        formattedValue={formatRange(
-          deductionFromCollateralBestCase > 0
-            ? deductionFromCollateralBestCase.toString()
-            : '0',
+        formattedValue={formatValue(
          deductionFromCollateralWorstCase > 0
            ? deductionFromCollateralWorstCase.toString()
            : '0',
@@ -185,8 +187,7 @@ export const DealTicketMarginDetails = ({
          marginEstimate?.worstCase.initialLevel,
          assetDecimals
        )}
-        formattedValue={formatRange(
-          marginEstimate?.bestCase.initialLevel,
+        formattedValue={formatValue(
          marginEstimate?.worstCase.initialLevel,
          assetDecimals,
          quantum
@@ -198,6 +199,7 @@ export const DealTicketMarginDetails = ({
  }

  let liquidationPriceEstimate = emptyValue;
+  let liquidationPriceEstimateRange = emptyValue;

  if (liquidationEstimate) {
    const liquidationEstimateBestCaseIncludingBuyOrders = BigInt(
@@ -207,8 +209,7 @@ export const DealTicketMarginDetails = ({
      liquidationEstimate.bestCase.including_sell_orders.replace(/\..*/, '')
    );
    const liquidationEstimateBestCase =
-      liquidationEstimateBestCaseIncludingBuyOrders >
-      liquidationEstimateBestCaseIncludingSellOrders
+      side === Schema.Side.SIDE_BUY
        ? liquidationEstimateBestCaseIncludingBuyOrders
        : liquidationEstimateBestCaseIncludingSellOrders;

@@ -219,14 +220,19 @@ export const DealTicketMarginDetails = ({
      liquidationEstimate.worstCase.including_sell_orders.replace(/\..*/, '')
    );
    const liquidationEstimateWorstCase =
-      liquidationEstimateWorstCaseIncludingBuyOrders >
-      liquidationEstimateWorstCaseIncludingSellOrders
+      side === Schema.Side.SIDE_BUY
        ? liquidationEstimateWorstCaseIncludingBuyOrders
        : liquidationEstimateWorstCaseIncludingSellOrders;

    // The estimate order query API gives us the liquidation price in formatted by asset decimals.
    // We need to calculate it with asset decimals, but display it with market decimals precision until the API changes.
-    liquidationPriceEstimate = formatRange(
+    liquidationPriceEstimate = formatValue(
+      liquidationEstimateWorstCase.toString(),
+      assetDecimals,
+      undefined,
+      market.decimalPlaces
+    );
+    liquidationPriceEstimateRange = formatRange(
      (liquidationEstimateBestCase < liquidationEstimateWorstCase
        ? liquidationEstimateBestCase
        : liquidationEstimateWorstCase
@@ -249,7 +255,7 @@ export const DealTicketMarginDetails = ({
  const quoteName = getQuoteName(market);

  return (
-    <div className="flex flex-col gap-2 w-full">
+    <div className="flex flex-col w-full gap-2">
      <Accordion>
        <AccordionPanel
          itemId="margin"
@@ -265,7 +271,7 @@ export const DealTicketMarginDetails = ({
              <div
                data-testid={`deal-ticket-fee-margin-required`}
                key={'value-dropdown'}
-                className="flex items-center gap-2 justify-between w-full"
+                className="flex items-center justify-between w-full gap-2"
              >
                <div className="flex items-center gap-1">
                  <Tooltip description={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}>
@@ -282,11 +288,9 @@ export const DealTicketMarginDetails = ({
                      assetDecimals
                    ) ?? '-'
                  }
-                  noUnderline
                >
                  <div className="font-mono text-right">
-                    {formatRange(
-                      marginRequiredBestCase,
+                    {formatValue(
                      marginRequiredWorstCase,
                      assetDecimals,
                      quantum
@@ -298,7 +302,7 @@ export const DealTicketMarginDetails = ({
            </AccordionPrimitive.Trigger>
          }
        >
-          <div className="flex flex-col gap-2 w-full">
+          <div className="flex flex-col w-full gap-2">
            <KeyValue
              label={t('Total margin available')}
              indent
@@ -344,7 +348,7 @@ export const DealTicketMarginDetails = ({
      {projectedMargin}
      <KeyValue
        label={t('Liquidation')}
-        value={liquidationPriceEstimate}
+        value={liquidationPriceEstimateRange}
        formattedValue={liquidationPriceEstimate}
        symbol={quoteName}
        labelDescription={LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT}
@@ -23,6 +23,7 @@ import { OrdersDocument } from '@vegaprotocol/orders';
 import { formatForInput } from '@vegaprotocol/utils';
 import type { PartialDeep } from 'type-fest';
 import type { Market } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/markets';

 jest.mock('zustand');
 jest.mock('./deal-ticket-fee-details', () => ({
@@ -40,18 +41,25 @@ const submit = jest.fn();

 function generateJsx(
  mocks: MockedResponse[] = [],
-  marketOverrides: PartialDeep<Market> = {}
+  marketOverrides: PartialDeep<Market> = {},
+  marketDataOverrides: Partial<MarketData> = {}
 ) {
  const joinedMarket: Market = {
    ...market,
    ...marketOverrides,
  } as Market;
+
+  const joinedMarketData: MarketData = {
+    ...marketData,
+    ...marketDataOverrides,
+  } as MarketData;
+
  return (
    <MockedProvider mocks={[...mocks]}>
      <VegaWalletContext.Provider value={{ pubKey, isReadOnly: false } as any}>
        <DealTicket
          market={joinedMarket}
-          marketData={marketData}
+          marketData={joinedMarketData}
          marketPrice={marketPrice}
          submit={submit}
          onDeposit={jest.fn()}
@@ -462,6 +470,10 @@ describe('DealTicket', () => {
  });

  it('can edit deal ticket', async () => {
+    // 7002-SORD-004
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
    render(generateJsx());

    // BUY is selected by default
@@ -483,11 +495,31 @@ describe('DealTicket', () => {

    // Switch to limit order
    await userEvent.click(screen.getByTestId('order-type-Limit'));
+    expect(screen.getByTestId('order-type-Limit').dataset.state).toEqual(
+      'checked'
+    );

    // Check all TIF options shown
    expect(screen.getByTestId('order-tif').children).toHaveLength(
      Object.keys(Schema.OrderTimeInForce).length
    );
+    // Switch to market order
+    await userEvent.click(screen.getByTestId('order-type-Market'));
+    expect(screen.getByTestId('order-type-Market').dataset.state).toEqual(
+      'checked'
+    );
+
+    // Switch to short order
+    await userEvent.click(screen.getByTestId('order-side-SIDE_SELL'));
+    expect(screen.getByTestId('order-side-SIDE_SELL').dataset.state).toEqual(
+      'checked'
+    );
+
+    // Switch to long order
+    await userEvent.click(screen.getByTestId('order-side-SIDE_BUY'));
+    expect(screen.getByTestId('order-side-SIDE_BUY').dataset.state).toEqual(
+      'checked'
+    );
  });

  it('validates size field', async () => {
@@ -654,4 +686,33 @@ describe('DealTicket', () => {
      new Date(screen.getByTestId<HTMLInputElement>(datePicker).value).getTime()
    ).toEqual(now);
  });
+
+  describe('market states not accepting orders', () => {
+    const states = [
+      Schema.MarketState.STATE_REJECTED,
+      Schema.MarketState.STATE_CANCELLED,
+      Schema.MarketState.STATE_CLOSED,
+      Schema.MarketState.STATE_SETTLED,
+      Schema.MarketState.STATE_TRADING_TERMINATED,
+    ];
+
+    it.each(states)('handles state %s correctly', async (marketState) => {
+      const marketOverrides = { state: marketState };
+      const marketDataOverrides = { marketState: marketState };
+      render(generateJsx([], marketOverrides, marketDataOverrides));
+
+      const text = `This market is ${marketState
+        .split('_')
+        .pop()
+        ?.toLowerCase()} and not accepting orders`;
+
+      await waitFor(() => {
+        expect(
+          screen.getByTestId('deal-ticket-error-message-summary')
+        ).toHaveTextContent(text);
+      });
+
+      expect(screen.getByTestId('place-order')).toBeEnabled();
+    });
+  });
 });
@@ -36,7 +36,12 @@ import {
  formatValue,
 } from '@vegaprotocol/utils';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
-import { getAsset, getDerivedPrice, getQuoteName } from '@vegaprotocol/markets';
+import {
+  getAsset,
+  getDerivedPrice,
+  getQuoteName,
+  isMarketInAuction,
+} from '@vegaprotocol/markets';
 import {
  validateExpiration,
  validateMarketState,
@@ -182,6 +187,7 @@ export const DealTicket = ({
  const iceberg = watch('iceberg');
  const peakSize = watch('peakSize');
  const expiresAt = watch('expiresAt');
+  const postOnly = watch('postOnly');

  useEffect(() => {
    const size = storedFormValues?.[dealTicketType]?.size;
@@ -198,7 +204,7 @@ export const DealTicket = ({
  }, [storedFormValues, dealTicketType, rawPrice, setValue]);

  useEffect(() => {
-    const subscription = watch((value, { name, type }) => {
+    const subscription = watch((value) => {
      updateStoredFormValues(market.id, value);
    });
    return () => subscription.unsubscribe();
@@ -211,6 +217,7 @@ export const DealTicket = ({
      size: rawSize,
      timeInForce,
      type,
+      postOnly,
    },
    market.id,
    market.decimalPlaces,
@@ -219,8 +226,7 @@ export const DealTicket = ({

  const price =
    normalizedOrder &&
-    marketPrice &&
-    getDerivedPrice(normalizedOrder, marketPrice);
+    getDerivedPrice(normalizedOrder, marketPrice ?? undefined);

  const notionalSize = getNotionalSize(
    price,
@@ -459,7 +465,7 @@ export const DealTicket = ({
          )}
        />
      )}
-      <div className="mb-4 flex flex-col gap-2 w-full">
+      <div className="flex flex-col w-full mb-4 gap-2">
        <KeyValue
          label={t('Notional')}
          value={formatValue(notionalSize, market.decimalPlaces)}
@@ -473,6 +479,7 @@ export const DealTicket = ({
          }
          assetSymbol={assetSymbol}
          market={market}
+          isMarketInAuction={isMarketInAuction(marketData.marketTradingMode)}
        />
      </div>
      <Controller
@@ -675,6 +682,7 @@ export const DealTicket = ({
        )}
      </Button>
      <DealTicketMarginDetails
+        side={normalizedOrder.side}
        onMarketClick={onMarketClick}
        assetSymbol={asset.symbol}
        marginAccountBalance={marginAccountBalance}
@@ -47,7 +47,7 @@ export const KeyValue = ({
      <Tooltip description={labelDescription}>
        <div className="text-muted">{label}</div>
      </Tooltip>
-      <Tooltip description={`${value ?? '-'} ${symbol || ''}`} noUnderline>
+      <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
        {valueElement}
      </Tooltip>
    </div>
@@ -0,0 +1,78 @@
+import { renderHook } from '@testing-library/react';
+import { useEstimateFees } from './use-estimate-fees';
+import { Side, OrderTimeInForce, OrderType } from '@vegaprotocol/types';
+
+import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
+
+const data: EstimateFeesQuery = {
+  estimateFees: {
+    totalFeeAmount: '12',
+    fees: {
+      infrastructureFee: '2',
+      liquidityFee: '4',
+      makerFee: '6',
+    },
+  },
+};
+
+const mockUseEstimateFeesQuery = jest.fn((...args) => ({
+  data,
+}));
+
+jest.mock('./__generated__/EstimateOrder', () => ({
+  ...jest.requireActual('@vegaprotocol/data-provider'),
+  useEstimateFeesQuery: jest.fn((...args) => mockUseEstimateFeesQuery(...args)),
+}));
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  useVegaWallet: () => ({ pubKey: 'pubKey' }),
+}));
+
+describe('useEstimateFees', () => {
+  it('returns 0 as estimated values if order is postOnly', () => {
+    const { result } = renderHook(() =>
+      useEstimateFees({
+        marketId: 'marketId',
+        side: Side.SIDE_BUY,
+        size: '1',
+        price: '1',
+        timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
+        type: OrderType.TYPE_LIMIT,
+        postOnly: true,
+      })
+    );
+    expect(result.current).toEqual({
+      totalFeeAmount: '0',
+      fees: {
+        infrastructureFee: '0',
+        liquidityFee: '0',
+        makerFee: '0',
+      },
+    });
+    expect(mockUseEstimateFeesQuery.mock.lastCall?.[0].skip).toBeTruthy();
+  });
+
+  it('divide values by 2 if market is in auction', () => {
+    const { result } = renderHook(() =>
+      useEstimateFees(
+        {
+          marketId: 'marketId',
+          side: Side.SIDE_BUY,
+          size: '1',
+          price: '1',
+          timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
+          type: OrderType.TYPE_LIMIT,
+        },
+        true
+      )
+    );
+    expect(result.current).toEqual({
+      totalFeeAmount: '6',
+      fees: {
+        infrastructureFee: '1',
+        liquidityFee: '2',
+        makerFee: '3',
+      },
+    });
+  });
+});
@@ -1,13 +1,16 @@
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';

+import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
 import { useEstimateFeesQuery } from './__generated__/EstimateOrder';

-export const useEstimateFees = (
-  order?: OrderSubmissionBody['orderSubmission']
-) => {
-  const { pubKey } = useVegaWallet();
+const divideByTwo = (n: string) => (BigInt(n) / BigInt(2)).toString();

+export const useEstimateFees = (
+  order?: OrderSubmissionBody['orderSubmission'],
+  isMarketInAuction?: boolean
+): EstimateFeesQuery['estimateFees'] | undefined => {
+  const { pubKey } = useVegaWallet();
  const { data } = useEstimateFeesQuery({
    variables: order && {
      marketId: order.marketId,
@@ -19,7 +22,28 @@ export const useEstimateFees = (
      type: order.type,
    },
    fetchPolicy: 'no-cache',
-    skip: !pubKey || !order?.size || !order?.price,
+    skip: !pubKey || !order?.size || !order?.price || order.postOnly,
  });
-  return data?.estimateFees;
+  if (order?.postOnly) {
+    return {
+      totalFeeAmount: '0',
+      fees: {
+        infrastructureFee: '0',
+        liquidityFee: '0',
+        makerFee: '0',
+      },
+    };
+  }
+  return isMarketInAuction && data?.estimateFees
+    ? {
+        totalFeeAmount: divideByTwo(data.estimateFees.totalFeeAmount),
+        fees: {
+          infrastructureFee: divideByTwo(
+            data.estimateFees.fees.infrastructureFee
+          ),
+          liquidityFee: divideByTwo(data.estimateFees.fees.liquidityFee),
+          makerFee: divideByTwo(data.estimateFees.fees.makerFee),
+        },
+      }
+    : data?.estimateFees;
 };
@@ -6,7 +6,7 @@ import {
  isNumeric,
 } from '@vegaprotocol/utils';
 import type { ColDef } from 'ag-grid-community';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
@@ -15,7 +15,7 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import {
-  AgGridLazy as AgGrid,
+  AgGrid,
  positiveClassNames,
  negativeClassNames,
  MarketNameCell,
@@ -299,7 +299,7 @@ const FeesBreakdownTooltip = ({
  return (
    <div
      data-testid="fee-breakdown-tooltip"
-      className="max-w-sm bg-vega-light-100 dark:bg-vega-dark-100 border border-vega-light-200 dark:border-vega-dark-200 px-4 py-2 z-20 rounded text-sm break-word text-black dark:text-white"
+      className="z-20 max-w-sm px-4 py-2 text-sm text-black border rounded bg-vega-light-100 dark:bg-vega-dark-100 border-vega-light-200 dark:border-vega-dark-200 break-word dark:text-white"
    >
      {role === MAKER && (
        <>
@@ -7,7 +7,7 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
 import type {
  ColDef,
@@ -175,7 +175,7 @@ export const Orderbook = ({
  );

  return (
-    <div className="h-full text-xs grid grid-rows-[1fr_min-content]">
+    <div className="h-full text-xs grid grid-rows-[1fr_min-content] overflow-hidden">
      <div>
        <ReactVirtualizedAutoSizer>
          {({ width, height }) => {
@@ -60,6 +60,7 @@ export const FeesBreakdown = ({
    .plus(fees.infrastructureFee)
    .plus(fees.liquidityFee)
    .toString();
+  if (totalFees === '0') return null;
  const formatValue = (value: string | number | null | undefined): string => {
    return value && !isNaN(Number(value))
      ? addDecimalsFormatNumber(value, decimals)
@@ -33,7 +33,7 @@ export const getDerivedPrice = (
    type: Schema.OrderType;
    price?: string | undefined;
  },
-  marketPrice: string
+  marketPrice?: string
 ) => {
  // If order type is market we should use either the mark price
  // or the uncrossing price. If order type is limit use the price
@@ -17,7 +17,7 @@ import {
 import type { ForwardedRef } from 'react';
 import { memo, forwardRef, useMemo } from 'react';
 import {
-  AgGridLazy as AgGrid,
+  AgGrid,
  SetFilter,
  DateRangeFilter,
  negativeClassNames,
@@ -18,7 +18,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { memo, useMemo } from 'react';
 import {
-  AgGridLazy as AgGrid,
+  AgGrid,
  SetFilter,
  DateRangeFilter,
  negativeClassNames,
@@ -8,7 +8,7 @@ import type {
  VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
 import {
-  AgGridLazy as AgGrid,
+  AgGrid,
  COL_DEFS,
  PriceFlashCell,
  signedNumberCssClassRules,
@@ -100,7 +100,8 @@ describe('ProposalsList', () => {
    const container = within(
      document.querySelector(rowContainerSelector) as HTMLElement
    );
-    expect(container.getAllByRole('row')).toHaveLength(
+
+    expect(await container.findAllByRole('row')).toHaveLength(
      // @ts-ignore data is mocked
      mock?.result?.data.proposalsConnection.edges.length
    );
@@ -1,5 +1,5 @@
 import type { FC } from 'react';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import { t } from '@vegaprotocol/i18n';
 import * as Types from '@vegaprotocol/types';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
@@ -19,6 +19,7 @@ export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
 const defaultColDef = {
  sortable: true,
  filter: true,
+  resizable: true,
  filterParams: { buttons: ['reset'] },
 };

@@ -4,7 +4,7 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, NumericCell } from '@vegaprotocol/datagrid';
+import { AgGrid, NumericCell } from '@vegaprotocol/datagrid';
 import {
  addDecimal,
  addDecimalsFormatNumber,
@@ -4,14 +4,27 @@ import type { ReactNode } from 'react';
 export interface BannerProps {
  children?: ReactNode;
  className?: string;
+  background?: string;
 }

-export const AnnouncementBanner = ({ className, children }: BannerProps) => {
-  const bannerClasses = classnames(
-    "bg-[url('https://static.vega.xyz/assets/img/banner-bg.jpg')] bg-cover bg-center bg-no-repeat",
-    'p-4',
-    className
-  );
+export const AnnouncementBanner = ({
+  className,
+  children,
+  background = 'url("https://static.vega.xyz/assets/img/banner-bg.jpg")',
+}: BannerProps) => {
+  const bannerClasses = classnames('p-4', className);

-  return <div className={bannerClasses}>{children}</div>;
+  return (
+    <div
+      className={bannerClasses}
+      style={{
+        background,
+        backgroundRepeat: 'no-repeat',
+        backgroundPosition: 'center',
+        backgroundSize: 'cover',
+      }}
+    >
+      {children}
+    </div>
+  );
 };
@@ -19,14 +19,14 @@ export interface TooltipProps {
  align?: 'start' | 'center' | 'end';
  side?: 'top' | 'right' | 'bottom' | 'left';
  sideOffset?: number;
-  noUnderline?: boolean;
+  underline?: boolean;
 }

-export const TOOLTIP_TRIGGER_CLASS_NAME = (noUnderline?: boolean) =>
-  classNames(
-    { 'underline underline-offset-2': !noUnderline },
-    'decoration-neutral-400 dark:decoration-neutral-400 decoration-dashed'
-  );
+export const TOOLTIP_TRIGGER_CLASS_NAME = (underline?: boolean) =>
+  classNames({
+    'underline underline-offset-2 decoration-neutral-400 dark:decoration-neutral-400 decoration-dashed':
+      underline,
+  });

 // Conditionally rendered tooltip if description content is provided.
 export const Tooltip = ({
@@ -36,12 +36,12 @@ export const Tooltip = ({
  sideOffset,
  align = 'start',
  side = 'bottom',
-  noUnderline,
+  underline,
 }: TooltipProps) =>
  description ? (
    <Provider delayDuration={200} skipDelayDuration={100}>
      <Root open={open}>
-        <Trigger asChild className={TOOLTIP_TRIGGER_CLASS_NAME(noUnderline)}>
+        <Trigger asChild className={TOOLTIP_TRIGGER_CLASS_NAME(underline)}>
          {children}
        </Trigger>
        {description && (
@@ -169,8 +169,7 @@ const ConnectDialogContainer = ({

  const isDesktopWalletRunning = useIsWalletServiceRunning(
    walletUrl,
-    connectors['jsonRpc'],
-    appChainId
+    connectors['jsonRpc']
  );

  const snapStatus = useSnapStatus(
@@ -465,6 +465,11 @@ export const isTransferTransaction = (
  transaction: Transaction
 ): transaction is TransferBody => 'transfer' in transaction;

+export const isReferralRelatedTransaction = (
+  transaction: Transaction
+): transaction is CreateReferralSet | ApplyReferralCode =>
+  'createReferralSet' in transaction || 'applyReferralCode' in transaction;
+
 export interface TransactionResponse {
  transactionHash: string;
  signature: string; // still to be added by core
@@ -0,0 +1,41 @@
+import { renderHook, waitFor } from '@testing-library/react';
+import { JsonRpcConnector } from './connectors';
+import { useIsWalletServiceRunning } from './use-is-wallet-service-running';
+
+describe('useIsWalletServiceRunning', () => {
+  it('returns true if wallet is running', async () => {
+    const url = 'https://foo.bar.com';
+    const connector = new JsonRpcConnector();
+    const spyOnCheckCompat = jest
+      .spyOn(connector, 'checkCompat')
+      .mockResolvedValue(true);
+    const { result } = renderHook(() =>
+      useIsWalletServiceRunning(url, connector)
+    );
+
+    expect(result.current).toBe(null);
+
+    await waitFor(() => {
+      expect(spyOnCheckCompat).toHaveBeenCalled();
+      expect(result.current).toBe(true);
+    });
+  });
+
+  it('returns false if wallet is not running', async () => {
+    const url = 'https://foo.bar.com';
+    const connector = new JsonRpcConnector();
+    const spyOnCheckCompat = jest
+      .spyOn(connector, 'checkCompat')
+      .mockRejectedValue(false);
+    const { result } = renderHook(() =>
+      useIsWalletServiceRunning(url, connector)
+    );
+
+    expect(result.current).toBe(null);
+
+    await waitFor(() => {
+      expect(spyOnCheckCompat).toHaveBeenCalled();
+      expect(result.current).toBe(false);
+    });
+  });
+});
@@ -0,0 +1,39 @@
+import { useEffect, useState } from 'react';
+import type { JsonRpcConnector } from './connectors';
+
+export const useIsWalletServiceRunning = (
+  url: string,
+  connector: JsonRpcConnector | undefined
+) => {
+  const [isRunning, setIsRunning] = useState<boolean | null>(null);
+
+  useEffect(() => {
+    if (!connector) return;
+
+    if (url && url !== connector.url) {
+      connector.url = url;
+    }
+
+    const check = async () => {
+      try {
+        // we are not checking wallet compatibility here, only that the wallet is running
+        await connector.checkCompat();
+        setIsRunning(true);
+      } catch {
+        setIsRunning(false);
+      }
+    };
+
+    // check immediately
+    check();
+
+    // check every second for quick feedback to the user
+    const interval = setInterval(check, 1000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [connector, url]);
+
+  return isRunning;
+};
@@ -1,47 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import type { JsonRpcConnector } from './connectors';
-import { ClientErrors } from './connectors';
-
-export const useIsWalletServiceRunning = (
-  url: string,
-  connector: JsonRpcConnector | undefined,
-  appChainId: string
-) => {
-  const [run, setRun] = useState<boolean | null>(null);
-
-  const checkState = useCallback(async () => {
-    if (!connector) return false;
-
-    if (url && url !== connector.url) {
-      connector.url = url;
-    }
-
-    try {
-      await connector.checkCompat();
-      const chainIdResult = await connector.getChainId();
-      if (chainIdResult.chainID !== appChainId) {
-        throw ClientErrors.WRONG_NETWORK;
-      }
-    } catch (e) {
-      return false;
-    }
-    return true;
-  }, [connector, url, appChainId]);
-
-  useEffect(() => {
-    if (!connector) return;
-
-    let interval: NodeJS.Timeout;
-    checkState().then((value) => {
-      setRun(value);
-      interval = setInterval(async () => {
-        setRun(await checkState());
-      }, 1000 * 10);
-    });
-    return () => {
-      clearInterval(interval);
-    };
-  }, [checkState, connector]);
-
-  return run;
-};
@@ -25,6 +25,7 @@ import {
  VegaTxStatus,
  isStopOrdersSubmissionTransaction,
  isStopOrdersCancellationTransaction,
+  isReferralRelatedTransaction,
 } from '@vegaprotocol/wallet';
 import type { Toast, ToastContent } from '@vegaprotocol/ui-toolkit';
 import { ToastHeading } from '@vegaprotocol/ui-toolkit';
@@ -97,6 +98,7 @@ const isTransactionTypeSupported = (tx: VegaStoredTxState) => {
  const editOrder = isOrderAmendmentTransaction(tx.body);
  const batchMarketInstructions = isBatchMarketInstructionsTransaction(tx.body);
  const transfer = isTransferTransaction(tx.body);
+  const referral = isReferralRelatedTransaction(tx.body);
  return (
    withdraw ||
    submitOrder ||
@@ -105,7 +107,8 @@ const isTransactionTypeSupported = (tx: VegaStoredTxState) => {
    cancelStopOrder ||
    editOrder ||
    batchMarketInstructions ||
-    transfer
+    transfer ||
+    referral
  );
 };

@@ -20,7 +20,7 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import { EtherscanLink } from '@vegaprotocol/environment';
 import type { WithdrawalFieldsFragment } from './__generated__/Withdrawal';
 import {
Author	SHA1	Message	Date
Matthew Russell	60d7cf3029	Merge branch 'main' into chore/update-develop-with-mainnet-fixes	2023-09-26 15:06:07 -04:00
Matthew Russell	2b8abde938	Merge pull request #4880 from vegaprotocol/chore/update-develop-with-mainnet-fixes chore(trading,governance): update develop with mainnet fixes	2023-09-26 14:06:20 -04:00
Matthew Russell	2005f19d50	fix(trading): prevent deposit sidebar showing on corresponding standalone page (#4840 )	2023-09-26 13:47:47 -04:00
Maciek	d78de10855	chore(trading): remove underlines on tooltips (#4884 )	2023-09-26 13:45:33 -04:00
Matthew Russell	bb402c02f6	chore(trading): make volume bars color match candle color (#4881 )	2023-09-26 12:08:12 -04:00
Bartłomiej Głownia	8a9b1c7874	feat(deal-ticket): amend fee estimates for postOnly orders and when market is in auction (#4843 )	2023-09-26 11:57:47 -04:00
Matthew Russell	a7e8b0eb01	fix(market-depth): ensure scroll bar doesn't show on orderbook (#4882 )	2023-09-26 11:54:42 -04:00
Bartłomiej Głownia	89b3c06107	feat(deal-ticket): show worst case instead of ranges in estimated values (#4870 )	2023-09-26 11:53:45 -04:00
Radosław Szpiech	cd5c73d3fd	chore(trading): temporary disable console-test to unblock CI queue (#4885 )	2023-09-26 10:45:27 +01:00
Joe Tsang	b3a5ab022d	chore(ci): update genesis file (#4887 )	2023-09-26 10:44:55 +01:00
Matthew Russell	ba438549bc	Merge branch 'main' into chore/update-develop-with-mainnet-fixes	2023-09-25 21:30:40 -04:00
Mikołaj Młodzikowski	496d1f5c68	feat(ci): parse if there are any changes	2023-09-25 18:10:01 -04:00
Mikołaj Młodzikowski	e914e7bb70	fix(ci): provide proper ipfs process	2023-09-25 18:09:31 -04:00
Matthew Russell	71a36c2382	fix(trading): remove upgrade banner [main] (#4877 )	2023-09-25 17:27:01 -04:00
Matthew Russell	1c6a307bcd	fix(wallet): reduce time to check for wallet running [main] (#4876 )	2023-09-25 17:26:40 -04:00
Matthew Russell	ef4a740b91	fix(trading): allotment breaking [main] (#4875 )	2023-09-25 17:26:06 -04:00
m.ray Matthew Russell candida-d Bartłomiej Głownia Joe Tsang Joe	a6303456c5	feat(trading): liquidity SLA in market info (#4649 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com> Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com> Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com> Co-authored-by: Joe Tsang <30622993+jtsang586@users.noreply.github.com> Co-authored-by: Joe <joe@vega.xyz>	2023-09-25 14:44:55 +01:00
Sam Keen	2d4be5fcb3	fix(governance): mainnet rewards query looping (#4865 )	2023-09-25 09:59:38 +00:00
Sam Keen	9cbd6baccd	fix(governance): removed loop caused by rewards epoch refresh (#4864 )	2023-09-25 09:34:47 +00:00
Maciek	525773773a	chore(trading): 4811 make market table columns resizable (#4856 )	2023-09-25 10:14:18 +02:00
Ben	45d6f43e74	chore(trading): deal ticket test to jest (#4842 )	2023-09-22 15:25:50 +01:00
Art	41760f2956	chore(trading): disable apply code when applied (#4855 )	2023-09-22 12:06:02 +01:00
m.rayandMatthew Russell	835f2b793f	chore(trading): remove static assets console coming from vega.xyz (#4825 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-09-19 23:54:07 -07:00
Matthew Russell	d50b988b4a	Merge branch 'release/mainnet-trading' of github.com:vegaprotocol/frontend-monorepo into release/mainnet-trading	2023-09-18 09:03:44 -07:00
Madalina Raicu	a6aec899c8	chore: update tag metamask snaps to true	2023-09-18 15:08:46 +01:00