chore(explorer): remove voting column from proposal table

.github/workflows/console-test-run.yml

@@ -10,7 +10,7 @@ on:
     inputs:
       console-test-branch:
         type: choice
-        description: 'main: v0.73.13, develop: v0.74.0'
+        description: 'main: v0.73.5, develop: v0.73.5'
         options:
           - main
           - develop

apps/explorer/src/app/components/txs/details/proposal/summary.tsx

@@ -64,9 +64,7 @@ export const ProposalSummary = ({
   return (
     <div className="w-auto max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5">
       {id && <ProposalStatusIcon id={id} />}
-      {rationale?.title && (
-        <h1 className="text-xl pb-1 break-all">{rationale.title}</h1>
-      )}
+      {rationale?.title && <h1 className="text-xl pb-1">{rationale.title}</h1>}
       {rationale?.description && (
         <div className="pt-2 text-sm leading-tight">
           <ReactMarkdown

apps/explorer/src/app/components/txs/details/proposal/tx-update-party-profile.tsx

@@ -1,46 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { TxDetailsShared } from '../shared/tx-details-shared';
-import { TableWithTbody } from '../../../table';
-import type { components } from '../../../../../types/explorer';
-
-import type { BlockExplorerTransactionResult } from '../../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../../routes/blocks/tendermint-blocks-response';
-import { TableCell, TableRow } from '../../../table';
-
-type Update = components['schemas']['v1UpdatePartyProfile'];
-
-interface TxDetailsUpdatePartyProfileProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * Party profiles can be an alias and arbitrary key/values pairs.
- * This component displays the alias, if any, but not the metadata. When there is
- * some wider usage, we can decide how to render it. For now, it's available in the
- * full TX details.
- */
-export const TxDetailsUpdatePartyProfile = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsUpdatePartyProfileProps) => {
-  if (!txData?.command.updatePartyProfile) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const update: Update = txData.command.updatePartyProfile;
-
-  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {update.alias && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('New alias')}</TableCell>
-          <TableCell>{update.alias}</TableCell>
-        </TableRow>
-      )}
-    </TableWithTbody>
-  );
-};

apps/explorer/src/app/components/txs/details/transfer/Transfer.graphql

@@ -1,18 +0,0 @@
-query ExplorerTransferStatus($id: ID!) {
-  transfer(id: $id) {
-    transfer {
-      reference
-      timestamp
-      status
-      reason
-      fromAccountType
-      from
-      to
-      toAccountType
-      asset {
-        id
-      }
-      amount
-    }
-  }
-}

apps/explorer/src/app/components/txs/details/transfer/__generated__/Transfer.ts

@@ -1,61 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerTransferStatusQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerTransferStatusQuery = { __typename?: 'Query', transfer?: { __typename?: 'TransferNode', transfer: { __typename?: 'Transfer', reference?: string | null, timestamp: any, status: Types.TransferStatus, reason?: string | null, fromAccountType: Types.AccountType, from: string, to: string, toAccountType: Types.AccountType, amount: string, asset?: { __typename?: 'Asset', id: string } | null } } | null };
-
-
-export const ExplorerTransferStatusDocument = gql`
-    query ExplorerTransferStatus($id: ID!) {
-  transfer(id: $id) {
-    transfer {
-      reference
-      timestamp
-      status
-      reason
-      fromAccountType
-      from
-      to
-      toAccountType
-      asset {
-        id
-      }
-      amount
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerTransferStatusQuery__
- *
- * To run a query within a React component, call `useExplorerTransferStatusQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerTransferStatusQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerTransferStatusQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerTransferStatusQuery(baseOptions: Apollo.QueryHookOptions<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>(ExplorerTransferStatusDocument, options);
-      }
-export function useExplorerTransferStatusLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>(ExplorerTransferStatusDocument, options);
-        }
-export type ExplorerTransferStatusQueryHookResult = ReturnType<typeof useExplorerTransferStatusQuery>;
-export type ExplorerTransferStatusLazyQueryHookResult = ReturnType<typeof useExplorerTransferStatusLazyQuery>;
-export type ExplorerTransferStatusQueryResult = Apollo.QueryResult<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>;

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx

@@ -111,7 +111,7 @@ export function TransferParticipants({
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 16 9"
-                className="fill-white dark:fill-black"
+                className="fill-vega-light-100 dark:fill-black"
               >
                 <path d="M0,0L8,9l8,-9Z" />
               </svg>
@@ -120,7 +120,7 @@ export function TransferParticipants({
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 16 9"
-                className="fill-vega-light-200 dark:fill-vega-dark-200"
+                className="fill-vega-light-100 dark:fill-vega-dark-200"
               >
                 <path d="M0,0L8,9l8,-9Z" />
               </svg>

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx

@@ -1,223 +1,97 @@
 import { t } from '@vegaprotocol/i18n';
 import { AssetLink, MarketLink } from '../../../../links';
+import { headerClasses, wrapperClasses } from '../transfer-details';
 import type { components } from '../../../../../../types/explorer';
 import type { Recurring } from '../transfer-details';
-import {
-  DispatchMetricLabels,
-  DistributionStrategy,
-} from '@vegaprotocol/types';
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { formatNumber } from '@vegaprotocol/utils';
+import { DispatchMetricLabels } from '@vegaprotocol/types';
+
 export type Metric = components['schemas']['vegaDispatchMetric'];
 export type Strategy = components['schemas']['vegaDispatchStrategy'];
 
-export const wrapperClasses = 'border pv-2 w-full flex-auto basis-full';
-export const headerClasses =
-  'bg-solid bg-vega-light-150 dark:bg-vega-dark-150 text-center text-xl py-2 font-alpha calt';
-
 const metricLabels: Record<Metric, string> = {
   DISPATCH_METRIC_UNSPECIFIED: 'Unknown metric',
   ...DispatchMetricLabels,
 };
 
-// Maps the two (non-null) values of entityScope to the icon that represents it
-const entityScopeIcons: Record<
-  string,
-  typeof VegaIconNames[keyof typeof VegaIconNames]
-> = {
-  ENTITY_SCOPE_INDIVIDUALS: VegaIconNames.MAN,
-  ENTITY_SCOPE_TEAMS: VegaIconNames.TEAM,
-};
-
-const distributionStrategyLabel: Record<DistributionStrategy, string> = {
-  [DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA]: 'Pro Rata',
-  [DistributionStrategy.DISTRIBUTION_STRATEGY_RANK]: 'Ranked',
-};
-
 interface TransferRewardsProps {
   recurring: Recurring;
 }
 
 /**
- * Renders recurring transfers/game details in a way that is, perhaps, easy to understand
+ * Renderer for a transfer. These can vary quite
+ * widely, essentially every field can be null.
  *
  * @param transfer A recurring transfer object
  */
 export function TransferRewards({ recurring }: TransferRewardsProps) {
+  const metric =
+    recurring?.dispatchStrategy?.metric || 'DISPATCH_METRIC_UNSPECIFIED';
+
   if (!recurring || !recurring.dispatchStrategy) {
     return null;
   }
 
-  // Destructure to make things a bit more readable
-  const {
-    entityScope,
-    individualScope,
-    teamScope,
-    distributionStrategy,
-    lockPeriod,
-    markets,
-    stakingRequirement,
-    windowLength,
-    notionalTimeWeightedAveragePositionRequirement,
-    rankTable,
-    nTopPerformers,
-  } = recurring.dispatchStrategy;
-
   return (
     <div className={wrapperClasses}>
-      <h2 className={headerClasses}>{getRewardTitle(entityScope)}</h2>
-      <ul className="relative block rounded-lg py-6 text-left p-6">
-        {entityScope && entityScopeIcons[entityScope] ? (
+      <h2 className={headerClasses}>{t('Reward metrics')}</h2>
+      <ul className="relative block rounded-lg py-6 text-center p-6">
+        {recurring.dispatchStrategy.assetForMetric ? (
           <li>
-            <strong>{t('Scope')}</strong>:{' '}
-            <VegaIcon name={entityScopeIcons[entityScope]} />
-            &nbsp;
-            {individualScope ? individualScopeLabels[individualScope] : null}
-            {getScopeLabel(entityScope, teamScope)}
+            <strong>{t('Asset')}</strong>:{' '}
+            <AssetLink assetId={recurring.dispatchStrategy.assetForMetric} />
           </li>
         ) : null}
-        {recurring.dispatchStrategy &&
-          recurring.dispatchStrategy.assetForMetric && (
-            <li>
-              <strong>{t('Asset for metric')}</strong>:{' '}
-              <AssetLink assetId={recurring.dispatchStrategy.assetForMetric} />
-            </li>
-          )}
-        {recurring.dispatchStrategy.metric &&
-          metricLabels[recurring.dispatchStrategy.metric] && (
-            <li>
-              <strong>{t('Metric')}</strong>:{' '}
-              {metricLabels[recurring.dispatchStrategy.metric]}
-            </li>
-          )}
-        {lockPeriod && (
-          <li>
-            <strong>{t('Reward lock')}</strong>:&nbsp;
-            {recurring.dispatchStrategy.lockPeriod}{' '}
-            {recurring.dispatchStrategy.lockPeriod === '1'
-              ? t('epoch')
-              : t('epochs')}
-          </li>
-        )}
-
-        {markets && markets.length > 0 ? (
+        <li>
+          <strong>{t('Metric')}</strong>: {metricLabels[metric]}
+        </li>
+        {recurring.dispatchStrategy.markets &&
+        recurring.dispatchStrategy.markets.length > 0 ? (
           <li>
             <strong>{t('Markets in scope')}</strong>:
-            <ul className="inline-block ml-1">
-              {markets.map((m) => (
-                <li key={m} className="inline-block mr-2">
+            <ul>
+              {recurring.dispatchStrategy.markets.map((m) => (
+                <li key={m}>
                   <MarketLink id={m} />
                 </li>
               ))}
             </ul>
           </li>
         ) : null}
-
-        {stakingRequirement && stakingRequirement !== '0' ? (
-          <li>
-            <strong>{t('Staking requirement')}</strong>: {stakingRequirement}
-          </li>
-        ) : null}
-
-        {windowLength && windowLength !== '0' ? (
-          <li>
-            <strong>{t('Window length')}</strong>:{' '}
-            {recurring.dispatchStrategy.windowLength}{' '}
-            {recurring.dispatchStrategy.windowLength === '1'
-              ? t('epoch')
-              : t('epochs')}
-          </li>
-        ) : null}
-
-        {notionalTimeWeightedAveragePositionRequirement &&
-        notionalTimeWeightedAveragePositionRequirement !== '' ? (
-          <li>
-            <strong>{t('Notional TWAP')}</strong>:{' '}
-            {notionalTimeWeightedAveragePositionRequirement}
-          </li>
-        ) : null}
-
-        {nTopPerformers && (
-          <li>
-            <strong>{t('Elligible team members:')}</strong> top{' '}
-            {`${formatNumber(Number(nTopPerformers) * 100, 0)}%`}
-          </li>
-        )}
-
-        {distributionStrategy &&
-          distributionStrategy !== 'DISTRIBUTION_STRATEGY_UNSPECIFIED' && (
-            <li>
-              <strong>{t('Distribution strategy')}</strong>:{' '}
-              {distributionStrategyLabel[distributionStrategy]}
-            </li>
-          )}
+        <li>
+          <strong>{t('Factor')}</strong>: {recurring.factor}
+        </li>
       </ul>
-      <div className="px-6 pt-1 pb-5">
-        {rankTable && rankTable.length > 0 ? (
-          <table className="border-collapse border border-gray-400 ">
-            <thead>
-              <tr>
-                <th className="border border-gray-300 bg-gray-300 px-3">
-                  <strong>{t('Start rank')}</strong>
-                </th>
-                <th className="border border-gray-300 bg-gray-300 px-3">
-                  <strong>{t('Share of reward pool')}</strong>
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              {rankTable.map((row, i) => {
-                return (
-                  <tr key={`rank-${i}`}>
-                    <td className="border border-slate-300 text-center">
-                      {row.startRank}
-                    </td>
-                    <td className="border border-slate-300 text-center">
-                      {row.shareRatio}
-                    </td>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </table>
-        ) : null}
-      </div>
     </div>
   );
 }
 
-export function getScopeLabel(
-  scope: components['schemas']['vegaEntityScope'] | undefined,
-  teamScope: readonly string[] | undefined
-): string {
-  if (scope === 'ENTITY_SCOPE_TEAMS') {
-    if (teamScope && teamScope.length !== 0) {
-      return ` ${teamScope.length} teams`;
-    } else {
-      return t('All teams');
-    }
-  } else if (scope === 'ENTITY_SCOPE_INDIVIDUALS') {
-    return t('Individuals');
-  } else {
-    return '';
-  }
-}
-export function getRewardTitle(
-  scope?: components['schemas']['vegaEntityScope']
-) {
-  if (scope === 'ENTITY_SCOPE_TEAMS') {
-    return t('Game');
-  }
-  return t('Reward metrics');
+interface TransferRecurringStrategyProps {
+  strategy: Strategy;
 }
 
-const individualScopeLabels: Record<
-  components['schemas']['vegaIndividualScope'],
-  string
-> = {
-  // Unspecified and All are not rendered
-  INDIVIDUAL_SCOPE_UNSPECIFIED: '',
-  INDIVIDUAL_SCOPE_ALL: '',
-  INDIVIDUAL_SCOPE_IN_TEAM: '(in team)',
-  INDIVIDUAL_SCOPE_NOT_IN_TEAM: '(not in team)',
-};
+/**
+ * Simple renderer for a dispatch strategy in a recurring transfer
+ *
+ * @param strategy Dispatch strategy object
+ */
+export function TransferRecurringStrategy({
+  strategy,
+}: TransferRecurringStrategyProps) {
+  if (!strategy) {
+    return null;
+  }
+
+  return (
+    <>
+      {strategy.assetForMetric ? (
+        <li>
+          <strong>{t('Asset for metric')}</strong>:{' '}
+          <AssetLink assetId={strategy.assetForMetric} />
+        </li>
+      ) : null}
+      <li>
+        <strong>{t('Metric')}</strong>: {strategy.metric}
+      </li>
+    </>
+  );
+}

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-status.tsx

@@ -1,84 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { headerClasses, wrapperClasses } from '../transfer-details';
-import { Icon, Loader } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@vegaprotocol/ui-toolkit';
-import type { ApolloError } from '@apollo/client';
-import { TransferStatus, TransferStatusMapping } from '@vegaprotocol/types';
-import { IconNames } from '@blueprintjs/icons';
-
-interface TransferStatusProps {
-  status: TransferStatus | undefined;
-  error: ApolloError | undefined;
-  loading: boolean;
-}
-
-/**
- * Renderer for a transfer. These can vary quite
- * widely, essentially every field can be null.
- *
- * @param transfer A recurring transfer object
- */
-export function TransferStatusView({ status, loading }: TransferStatusProps) {
-  if (!status) {
-    status = TransferStatus.STATUS_PENDING;
-  }
-
-  return (
-    <div className={wrapperClasses}>
-      <h2 className={headerClasses}>{t('Status')}</h2>
-      <div className="relative block rounded-lg py-6 text-center p-6">
-        {loading ? (
-          <div className="leading-10 mt-12">
-            <Loader size={'small'} />
-          </div>
-        ) : (
-          <>
-            <p className="leading-10 my-2">
-              <Icon
-                name={getIconForStatus(status)}
-                className={getColourForStatus(status)}
-              />
-            </p>
-            <p className="leading-10 my-2">{TransferStatusMapping[status]}</p>
-          </>
-        )}
-      </div>
-    </div>
-  );
-}
-
-/**
- * Simple mapping from status to icon name
- * @param status TransferStatus
- * @returns IconName
- */
-export function getIconForStatus(status: TransferStatus): IconName {
-  switch (status) {
-    case TransferStatus.STATUS_PENDING:
-      return IconNames.TIME;
-    case TransferStatus.STATUS_DONE:
-      return IconNames.TICK;
-    case TransferStatus.STATUS_REJECTED:
-      return IconNames.CROSS;
-    default:
-      return IconNames.TIME;
-  }
-}
-
-/**
- * Simple mapping from status to colour
- * @param status TransferStatus
- * @returns string Tailwind classname
- */
-export function getColourForStatus(status: TransferStatus): string {
-  switch (status) {
-    case TransferStatus.STATUS_PENDING:
-      return 'text-yellow-500';
-    case TransferStatus.STATUS_DONE:
-      return 'text-green-500';
-    case TransferStatus.STATUS_REJECTED:
-      return 'text-red-500';
-    default:
-      return 'text-yellow-500';
-  }
-}

apps/explorer/src/app/components/txs/details/transfer/transfer-details.tsx

@@ -2,15 +2,12 @@ import type { components } from '../../../../../types/explorer';
 import { TransferRepeat } from './blocks/transfer-repeat';
 import { TransferRewards } from './blocks/transfer-rewards';
 import { TransferParticipants } from './blocks/transfer-participants';
-import { useExplorerTransferStatusQuery } from './__generated__/Transfer';
-import { TransferStatusView } from './blocks/transfer-status';
-import { TransferStatus } from '@vegaprotocol/types';
 
 export type Recurring = components['schemas']['commandsv1RecurringTransfer'];
 export type Metric = components['schemas']['vegaDispatchMetric'];
 
 export const wrapperClasses =
-  'border border-vega-light-150 dark:border-vega-dark-200 pv-2 w-full sm:w-1/3 basis-1/3';
+  'border border-vega-light-150 dark:border-vega-dark-200 rounded-md pv-2 mb-5 w-full sm:w-1/4 min-w-[200px] ';
 export const headerClasses =
   'bg-solid bg-vega-light-150 dark:bg-vega-dark-150 border-vega-light-150 text-center text-xl py-2 font-alpha calt';
 
@@ -19,7 +16,6 @@ export type Transfer = components['schemas']['commandsv1Transfer'];
 interface TransferDetailsProps {
   transfer: Transfer;
   from: string;
-  id: string;
 }
 
 /**
@@ -28,24 +24,13 @@ interface TransferDetailsProps {
  *
  * @param transfer A recurring transfer object
  */
-export function TransferDetails({ transfer, from, id }: TransferDetailsProps) {
+export function TransferDetails({ transfer, from }: TransferDetailsProps) {
   const recurring = transfer.recurring;
 
-  // Currently all this is passed in to TransferStatus, but the extra details
-  // may be useful in the future.
-  const { data, error, loading } = useExplorerTransferStatusQuery({
-    variables: { id },
-  });
-
-  const status = error
-    ? TransferStatus.STATUS_REJECTED
-    : data?.transfer?.transfer.status;
-
   return (
-    <div className="flex flex-wrap">
+    <div className="flex gap-5 flex-wrap">
       <TransferParticipants from={from} transfer={transfer} />
       {recurring ? <TransferRepeat recurring={transfer.recurring} /> : null}
-      <TransferStatusView status={status} error={error} loading={loading} />
       {recurring && recurring.dispatchStrategy ? (
         <TransferRewards recurring={transfer.recurring} />
       ) : null}

apps/explorer/src/app/components/txs/details/transfer/transfer-rewards.spec.tsx

@@ -1,172 +0,0 @@
-import {
-  getScopeLabel,
-  getRewardTitle,
-  TransferRewards,
-} from './blocks/transfer-rewards';
-import { render } from '@testing-library/react';
-import type { components } from '../../../../../types/explorer';
-import type { Recurring } from './transfer-details';
-import {
-  DispatchMetric,
-  DistributionStrategy,
-  EntityScope,
-  IndividualScope,
-} from '@vegaprotocol/types';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-
-describe('getScopeLabel', () => {
-  it('should return the correct label for ENTITY_SCOPE_TEAMS with teamScope', () => {
-    const scope = 'ENTITY_SCOPE_TEAMS';
-    const teamScope = ['team1', 'team2', 'team3'];
-    const expectedLabel = ' 3 teams';
-
-    const result = getScopeLabel(scope, teamScope);
-
-    expect(result).toEqual(expectedLabel);
-  });
-
-  it('should return the correct label for ENTITY_SCOPE_TEAMS without teamScope', () => {
-    const scope = 'ENTITY_SCOPE_TEAMS';
-    const teamScope = undefined;
-    const expectedLabel = 'All teams';
-
-    const result = getScopeLabel(scope, teamScope);
-
-    expect(result).toEqual(expectedLabel);
-  });
-
-  it('should return the correct label for ENTITY_SCOPE_INDIVIDUALS', () => {
-    const scope = 'ENTITY_SCOPE_INDIVIDUALS';
-    const teamScope = undefined;
-    const expectedLabel = 'Individuals';
-
-    const result = getScopeLabel(scope, teamScope);
-
-    expect(result).toEqual(expectedLabel);
-  });
-
-  it('should return an empty string for unknown scope', () => {
-    const scope = 'UNKNOWN_SCOPE';
-    const teamScope = undefined;
-    const expectedLabel = '';
-
-    const result = getScopeLabel(
-      scope as unknown as components['schemas']['vegaEntityScope'],
-      teamScope
-    );
-
-    expect(result).toEqual(expectedLabel);
-  });
-});
-
-describe('getRewardTitle', () => {
-  it('should return the correct title for ENTITY_SCOPE_TEAMS', () => {
-    const scope = 'ENTITY_SCOPE_TEAMS';
-    const expectedTitle = 'Game';
-
-    const result = getRewardTitle(scope);
-
-    expect(result).toEqual(expectedTitle);
-  });
-
-  it('should return the correct title for other scopes', () => {
-    const scope = 'ENTITY_SCOPE_INDIVIDUALS';
-    const expectedTitle = 'Reward metrics';
-
-    const result = getRewardTitle(scope);
-
-    expect(result).toEqual(expectedTitle);
-  });
-});
-
-describe('TransferRewards', () => {
-  it('should render nothing if recurring dispatchStrategy is not provided', () => {
-    const { container } = render(
-      <TransferRewards recurring={null as unknown as Recurring} />
-    );
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('should render nothing if recurring.dispatchStrategy is not provided', () => {
-    const { container } = render(
-      <TransferRewards recurring={{} as unknown as Recurring} />
-    );
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('should render the reward details correctly', () => {
-    const recurring = {
-      dispatchStrategy: {
-        metric: DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION,
-        assetForMetric: '123',
-        entityScope: EntityScope.ENTITY_SCOPE_TEAMS,
-        individualScope: IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM,
-        teamScope: [],
-        distributionStrategy:
-          DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA,
-        lockPeriod: 'lockPeriod',
-        markets: ['market1', 'market2'],
-        stakingRequirement: '1',
-        windowLength: 'windowLength',
-        notionalTimeWeightedAveragePositionRequirement:
-          'notionalTimeWeightedAveragePositionRequirement',
-        rankTable: [
-          { startRank: 1, shareRatio: 0.2 },
-          { startRank: 2, shareRatio: 0.3 },
-        ],
-        nTopPerformers: 'nTopPerformers',
-      },
-    };
-
-    const { getByText } = render(
-      <MemoryRouter>
-        <MockedProvider>
-          <TransferRewards recurring={recurring} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-
-    expect(getByText('Game')).toBeInTheDocument();
-    expect(getByText('Scope')).toBeInTheDocument();
-    expect(getByText('Asset for metric')).toBeInTheDocument();
-    expect(getByText('Metric')).toBeInTheDocument();
-    expect(getByText('Reward lock')).toBeInTheDocument();
-    expect(getByText('Markets in scope')).toBeInTheDocument();
-    expect(getByText('Staking requirement')).toBeInTheDocument();
-    expect(getByText('Window length')).toBeInTheDocument();
-    expect(getByText('Notional TWAP')).toBeInTheDocument();
-    expect(getByText('Elligible team members:')).toBeInTheDocument();
-    expect(getByText('Distribution strategy')).toBeInTheDocument();
-    expect(getByText('Start rank')).toBeInTheDocument();
-    expect(getByText('Share of reward pool')).toBeInTheDocument();
-  });
-
-  it('should not render a rank table if recurring.dispatchStrategy.rankTable is not provided', () => {
-    const recurring = {
-      dispatchStrategy: {
-        entityScope: EntityScope.ENTITY_SCOPE_INDIVIDUALS,
-        individualScope: IndividualScope.INDIVIDUAL_SCOPE_ALL,
-        teamScope: ['team1', 'team2', 'team3'],
-        distributionStrategy:
-          DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA,
-        lockPeriod: 'lockPeriod',
-        markets: ['market1', 'market2'],
-        stakingRequirement: 'stakingRequirement',
-        windowLength: 'windowLength',
-        notionalTimeWeightedAveragePositionRequirement:
-          'notionalTimeWeightedAveragePositionRequirement',
-        nTopPerformers: 'nTopPerformers',
-      },
-    };
-
-    const { container } = render(
-      <MemoryRouter>
-        <MockedProvider>
-          <TransferRewards recurring={recurring} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(container.querySelector('table')).toBeNull();
-  });
-});

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

@@ -34,7 +34,6 @@ import { TxDetailsUpdateReferralSet } from './tx-update-referral-set';
 import { TxDetailsJoinTeam } from './tx-join-team';
 import { TxDetailsUpdateMarginMode } from './tx-update-margin-mode';
 import { TxBatchProposal } from './tx-batch-proposal';
-import { TxDetailsUpdatePartyProfile } from './proposal/tx-update-party-profile';
 
 interface TxDetailsWrapperProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -140,8 +139,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
       return TxDetailsUpdateMarginMode;
     case 'Batch Proposal':
       return TxBatchProposal;
-    case 'Update Party Profile':
-      return TxDetailsUpdatePartyProfile;
     default:
       return TxDetailsGeneric;
   }

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

@@ -12,8 +12,6 @@ import { ProposalSignatureBundleNewAsset } from './proposal/signature-bundle-new
 import { ProposalSignatureBundleUpdateAsset } from './proposal/signature-bundle-update';
 import { MarketLink } from '../../links';
 import { formatNumber } from '@vegaprotocol/utils';
-import { TransferDetails } from './transfer/transfer-details';
-import { proposalToTransfer } from '../lib/proposal-to-transfer';
 
 export type Proposal = components['schemas']['v1ProposalSubmission'];
 export type ProposalTerms = components['schemas']['vegaProposalTerms'];
@@ -106,12 +104,6 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
     ? ProposalSignatureBundleNewAsset
     : ProposalSignatureBundleUpdateAsset;
 
-  let transfer, from;
-  if (proposal.terms?.newTransfer?.changes) {
-    transfer = proposalToTransfer(proposal.terms?.newTransfer.changes);
-    from = proposal.terms.newTransfer.changes.source;
-  }
-
   return (
     <>
       <TableWithTbody className="mb-8" allowWrap={true}>
@@ -157,26 +149,14 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
           </>
         ) : null}
       </TableWithTbody>
-
       <ProposalSummary
         id={deterministicId}
         rationale={proposal.rationale}
         terms={proposal?.terms}
       />
-
       {proposalRequiresSignatureBundle(proposal) && (
         <SignatureBundleComponent id={deterministicId} tx={tx} />
       )}
-
-      {transfer && (
-        <div className="mt-8">
-          <TransferDetails
-            transfer={transfer}
-            from={from || ''}
-            id={deterministicId}
-          />
-        </div>
-      )}
     </>
   );
 };

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

@@ -13,7 +13,6 @@ import {
   SPECIAL_CASE_NETWORK_ID,
 } from '../../links/party-link/party-link';
 import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
-import Hash from '../../links/hash';
 
 type Transfer = components['schemas']['commandsv1Transfer'];
 
@@ -61,7 +60,7 @@ export const TxDetailsTransfer = ({
   }
 
   const from = txData.submitter;
-  const id = txSignatureToDeterministicId(txData.signature.value);
+
   return (
     <>
       <TableWithTbody className="mb-8" allowWrap={true}>
@@ -72,7 +71,7 @@ export const TxDetailsTransfer = ({
         <TableRow modifier="bordered" data-testid="id">
           <TableCell {...sharedHeaderProps}>{t('Transfer ID')}</TableCell>
           <TableCell>
-            <Hash text={id} />
+            {txSignatureToDeterministicId(txData.signature.value)}
           </TableCell>
         </TableRow>
         <TxDetailsShared
@@ -106,7 +105,7 @@ export const TxDetailsTransfer = ({
           </TableRow>
         ) : null}
       </TableWithTbody>
-      <TransferDetails from={from} transfer={transfer} id={id} />
+      <TransferDetails from={from} transfer={transfer} />
     </>
   );
 };

apps/explorer/src/app/components/txs/lib/proposal-to-transfer.ts

@@ -1,29 +0,0 @@
-import type { components } from '../../../../types/explorer';
-
-type TransferProposal = components['schemas']['vegaNewTransferConfiguration'];
-type ActualTransfer = components['schemas']['commandsv1Transfer'];
-
-/**
- * Converts a governance proposal for a transfer in to a transfer command that the
- * TransferDetails component can then render. The types are very similar, but do not
- * map precisely to each other due to some missing fields and some different field
- * names.
- *
- * @param proposal Governance proposal for a transfer
- * @returns transfer a Transfer object as if it had been submitted
- */
-export function proposalToTransfer(proposal: TransferProposal): ActualTransfer {
-  return {
-    amount: proposal.amount,
-    asset: proposal.asset,
-    // On a transfer, 'from' is determined by the submitter, so there is no 'from' field
-    // fromAccountType does exist and is just named differently on the proposal
-    fromAccountType: proposal.sourceType,
-    oneOff: proposal.oneOff,
-    recurring: proposal.recurring,
-    // There is no reference applied on governance initiated transfers
-    reference: '',
-    to: proposal.destination,
-    toAccountType: proposal.destinationType,
-  };
-}

apps/explorer/src/app/components/txs/tx-filter.tsx

@@ -44,7 +44,6 @@ export type FilterOption =
   | 'Submit Order'
   | 'Transfer Funds'
   | 'Undelegate'
-  | 'Update Party Profile'
   | 'Update Referral Set'
   | 'Update Margin Mode'
   | 'Validator Heartbeat'
@@ -80,7 +79,6 @@ export const filterOptions: Record<string, FilterOption[]> = {
     'Apply Referral Code',
     'Create Referral Set',
     'Join Team',
-    'Update Party Profile',
     'Update Referral Set',
   ],
   'External Data': ['Chain Event', 'Submit Oracle Data'],

apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts

@@ -241,16 +241,6 @@ describe('generateEpochAssetRewardsList', () => {
               amount: '5',
             },
           },
-          {
-            // This should not be included in the result
-            node: {
-              epoch: 2,
-              assetId: '3',
-              decimals: 18,
-              rewardType: AccountType.ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY,
-              amount: '5',
-            },
-          },
         ],
       },
       epoch: {

apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.ts

@@ -83,12 +83,6 @@ export const generateEpochTotalRewardsList = ({
         (Number(rewardItem?.amount) || 0) + Number(reward.amount)
       ).toString();
 
-      // only RowAccountTypes are relevant for this table, others should
-      // be discarded
-      if (!Object.keys(RowAccountTypes).includes(reward.rewardType)) {
-        return acc;
-      }
-
       rewards?.set(reward.rewardType, {
         rewardType: reward.rewardType,
         amount,

apps/trading/.env.mainnet

@@ -1,4 +1,4 @@
-NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.rpc.grove.city/v1/af6a2d529a11f8158bc8ca2a
+NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/af6a2d529a11f8158bc8ca2a
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613

apps/trading/client-pages/competitions/competitions-create-team.tsx

@@ -1,10 +1,5 @@
-import { Link, useSearchParams } from 'react-router-dom';
-import {
-  Intent,
-  TradingAnchorButton,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { useSearchParams } from 'react-router-dom';
+import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { useT } from '../../lib/use-t';
@@ -35,19 +30,6 @@ export const CompetitionsCreateTeam = () => {
       <LayoutWithGradient>
         <div className="mx-auto md:w-2/3 max-w-xl">
           <Box className="flex flex-col gap-4">
-            <Link
-              to={Links.COMPETITIONS()}
-              className="text-xs inline-flex items-center gap-1 group"
-            >
-              <VegaIcon
-                name={VegaIconNames.CHEVRON_LEFT}
-                size={12}
-                className="text-vega-clight-100 dark:text-vega-cdark-100"
-              />{' '}
-              <span className="group-hover:underline">
-                {t('Go back to the competitions')}
-              </span>
-            </Link>
             <h1 className="calt text-2xl lg:text-3xl xl:text-4xl">
               {isSolo ? t('Create solo team') : t('Create a team')}
             </h1>
@@ -96,17 +78,15 @@ const CreateTeamFormContainer = ({ isSolo }: { isSolo: boolean }) => {
         <p className="text-sm">{t('Team creation transaction successful')}</p>
         {code && (
           <>
-            <dl>
-              <dt className="text-sm">{t('Your team ID:')}</dt>
-              <dl>
-                <span
-                  className="font-mono break-all bg-rainbow bg-clip-text text-transparent text-2xl"
-                  data-testid="team-id-display"
-                >
-                  {code}
-                </span>
-              </dl>
-            </dl>
+            <p className="text-sm">
+              Your team ID is:{' '}
+              <span
+                className="font-mono break-all"
+                data-testid="team-id-display"
+              >
+                {code}
+              </span>
+            </p>
             <TradingAnchorButton
               href={Links.COMPETITIONS_TEAM(code)}
               intent={Intent.Info}

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

@@ -3,8 +3,8 @@ import { ErrorBoundary } from '@sentry/react';
 import { CompetitionsHeader } from '../../components/competitions/competitions-header';
 import { Intent, Loader, TradingButton } from '@vegaprotocol/ui-toolkit';
 
-import { useGameCards } from '../../lib/hooks/use-game-cards';
-import { useCurrentEpochInfoQuery } from '../../lib/hooks/__generated__/Epoch';
+import { useGames } from '../../lib/hooks/use-games';
+import { useCurrentEpochInfoQuery } from '../referrals/hooks/__generated__/Epoch';
 import { Link, useNavigate } from 'react-router-dom';
 import { Links } from '../../lib/links';
 import {
@@ -28,7 +28,7 @@ export const CompetitionsHome = () => {
   const { data: epochData } = useCurrentEpochInfoQuery();
   const currentEpoch = Number(epochData?.epoch.id);
 
-  const { data: gamesData, loading: gamesLoading } = useGameCards({
+  const { data: gamesData, loading: gamesLoading } = useGames({
     onlyActive: true,
     currentEpoch,
   });

apps/trading/client-pages/competitions/competitions-team.tsx

@@ -12,6 +12,7 @@ import {
   type TeamStats as ITeamStats,
   type Team as TeamType,
   type Member,
+  type TeamGame,
 } from '../../lib/hooks/use-team';
 import { DApp, EXPLORER_PARTIES, useLinks } from '@vegaprotocol/environment';
 import { TeamAvatar } from '../../components/competitions/team-avatar';
@@ -22,11 +23,6 @@ import { LayoutWithGradient } from '../../components/layouts-inner';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { JoinTeam } from './join-team';
 import { UpdateTeamButton } from './update-team-button';
-import {
-  type TeamGame,
-  useGames,
-  areTeamGames,
-} from '../../lib/hooks/use-games';
 
 export const CompetitionsTeam = () => {
   const t = useT();
@@ -42,12 +38,8 @@ export const CompetitionsTeam = () => {
 const TeamPageContainer = ({ teamId }: { teamId: string | undefined }) => {
   const t = useT();
   const { pubKey } = useVegaWallet();
-  const { data, team, partyTeam, stats, members, loading, refetch } = useTeam(
-    teamId,
-    pubKey || undefined
-  );
-
-  const { data: games, loading: gamesLoading } = useGames(teamId);
+  const { data, team, partyTeam, stats, members, games, loading, refetch } =
+    useTeam(teamId, pubKey || undefined);
 
   // only show spinner on first load so when users join teams its smoother
   if (!data && loading) {
@@ -72,8 +64,7 @@ const TeamPageContainer = ({ teamId }: { teamId: string | undefined }) => {
       partyTeam={partyTeam}
       stats={stats}
       members={members}
-      games={areTeamGames(games) ? games : undefined}
-      gamesLoading={gamesLoading}
+      games={games}
       refetch={refetch}
     />
   );
@@ -85,7 +76,6 @@ const TeamPage = ({
   stats,
   members,
   games,
-  gamesLoading,
   refetch,
 }: {
   team: TeamType;
@@ -93,7 +83,6 @@ const TeamPage = ({
   stats?: ITeamStats;
   members?: Member[];
   games?: TeamGame[];
-  gamesLoading?: boolean;
   refetch: () => void;
 }) => {
   const t = useT();
@@ -124,11 +113,7 @@ const TeamPage = ({
             onClick={() => setShowGames(true)}
             data-testid="games-toggle"
           >
-            {t('Results {{games}}', {
-              replace: {
-                games: gamesLoading ? '' : games ? `(${games.length})` : '(0)',
-              },
-            })}
+            {t('Games ({{count}})', { count: games ? games.length : 0 })}
           </ToggleButton>
           <ToggleButton
             active={!showGames}
@@ -140,35 +125,17 @@ const TeamPage = ({
             })}
           </ToggleButton>
         </div>
-        {showGames ? (
-          <Games games={games} gamesLoading={gamesLoading} />
-        ) : (
-          <Members members={members} />
-        )}
+        {showGames ? <Games games={games} /> : <Members members={members} />}
       </section>
     </LayoutWithGradient>
   );
 };
 
-const Games = ({
-  games,
-  gamesLoading,
-}: {
-  games?: TeamGame[];
-  gamesLoading?: boolean;
-}) => {
+const Games = ({ games }: { games?: TeamGame[] }) => {
   const t = useT();
 
-  if (gamesLoading) {
-    return (
-      <div className="w-[15px]">
-        <Loader size="small" />
-      </div>
-    );
-  }
-
   if (!games?.length) {
-    return <p>{t('No game results available')}</p>;
+    return <p>{t('No games')}</p>;
   }
 
   return (

apps/trading/client-pages/competitions/competitions-update-team.tsx

@@ -3,14 +3,7 @@ import { usePageTitle } from '../../lib/hooks/use-page-title';
 import { Box } from '../../components/competitions/box';
 import { useT } from '../../lib/use-t';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-import {
-  Intent,
-  Loader,
-  Splash,
-  TradingAnchorButton,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { RainbowButton } from '../../components/rainbow-button';
 import { Link, Navigate, useParams } from 'react-router-dom';
 import { Links } from '../../lib/links';
@@ -18,7 +11,6 @@ import { useReferralSetTransaction } from '../../lib/hooks/use-referral-set-tran
 import { type FormFields, TeamForm, TransactionType } from './team-form';
 import { useTeam } from '../../lib/hooks/use-team';
 import { LayoutWithGradient } from '../../components/layouts-inner';
-import { useEffect, useState } from 'react';
 
 export const CompetitionsUpdateTeam = () => {
   const t = useT();
@@ -37,19 +29,6 @@ export const CompetitionsUpdateTeam = () => {
       <LayoutWithGradient>
         <div className="mx-auto md:w-2/3 max-w-xl">
           <Box className="flex flex-col gap-4">
-            <Link
-              to={Links.COMPETITIONS_TEAM(teamId)}
-              className="text-xs inline-flex items-center gap-1 group"
-            >
-              <VegaIcon
-                name={VegaIconNames.CHEVRON_LEFT}
-                size={12}
-                className="text-vega-clight-100 dark:text-vega-cdark-100"
-              />{' '}
-              <span className="group-hover:underline">
-                {t('Go back to the team profile')}
-              </span>
-            </Link>
             <h1 className="calt text-2xl lg:text-3xl xl:text-5xl">
               {t('Update a team')}
             </h1>
@@ -78,8 +57,7 @@ const UpdateTeamFormContainer = ({
   pubKey: string;
 }) => {
   const t = useT();
-  const [refetching, setRefetching] = useState<boolean>(false);
-  const { team, loading, error, refetch } = useTeam(teamId, pubKey);
+  const { team, loading, error } = useTeam(teamId, pubKey);
 
   const { err, status, onSubmit } = useReferralSetTransaction({
     onSuccess: () => {
@@ -87,15 +65,7 @@ const UpdateTeamFormContainer = ({
     },
   });
 
-  // refetch when saved
-  useEffect(() => {
-    if (refetch && status === 'confirmed') {
-      refetch();
-      setRefetching(true);
-    }
-  }, [refetch, status]);
-
-  if (loading && !refetching) {
+  if (loading) {
     return <Loader size="small" />;
   }
   if (error) {
@@ -114,33 +84,6 @@ const UpdateTeamFormContainer = ({
     return <Navigate to={Links.COMPETITIONS_TEAM(teamId)} />;
   }
 
-  if (status === 'confirmed') {
-    return (
-      <div
-        className="flex flex-col items-start gap-2"
-        data-testid="team-creation-success-message"
-      >
-        <p className="text-sm">
-          <VegaIcon
-            name={VegaIconNames.TICK}
-            size={18}
-            className="text-vega-green-500"
-          />{' '}
-          {t('Changes successfully saved to your team.')}
-        </p>
-
-        <TradingAnchorButton
-          href={Links.COMPETITIONS_TEAM(teamId)}
-          intent={Intent.Info}
-          size="small"
-          data-testid="view-team-button"
-        >
-          {t('View team')}
-        </TradingAnchorButton>
-      </div>
-    );
-  }
-
   const defaultValues: FormFields = {
     id: team.teamId,
     name: team.name,

apps/trading/client-pages/competitions/team-form.tsx

@@ -46,7 +46,7 @@ const prepareTransaction = (
         createReferralSet: {
           isTeam: true,
           team: {
-            name: fields.name.trim(),
+            name: fields.name,
             teamUrl: fields.url,
             avatarUrl: fields.avatarUrl,
             closed: fields.private,
@@ -62,7 +62,7 @@ const prepareTransaction = (
           id: fields.id,
           isTeam: true,
           team: {
-            name: fields.name.trim(),
+            name: fields.name,
             teamUrl: fields.url,
             avatarUrl: fields.avatarUrl,
             closed: fields.private,
@@ -116,17 +116,7 @@ export const TeamForm = ({
       <input type="hidden" {...register('id')} />
       <TradingFormGroup label={t('Team name')} labelFor="name">
         <TradingInput
-          {...register('name', {
-            required: t('Required'),
-            validate: {
-              notEmpty: (value) => {
-                if (/^\s*$/.test(value)) {
-                  return t('Team name cannot be empty');
-                }
-                return true;
-              },
-            },
-          })}
+          {...register('name', { required: t('Required') })}
           data-testid="team-name-input"
         />
         {errors.name?.message && (

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

@@ -1,20 +1,27 @@
-import { TinyScroll } from '@vegaprotocol/ui-toolkit';
+import { useEffect } from 'react';
+import { titlefy } from '@vegaprotocol/utils';
 import { ErrorBoundary } from '../../components/error-boundary';
 import { FeesContainer } from '../../components/fees-container';
 import { useT } from '../../lib/use-t';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
+import { usePageTitleStore } from '../../stores';
 
 export const Fees = () => {
   const t = useT();
   const title = t('Fees');
-  usePageTitle(title);
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+
+  useEffect(() => {
+    updateTitle(titlefy([title]));
+  }, [updateTitle, title]);
 
   return (
     <ErrorBoundary feature="fees">
-      <TinyScroll className="p-4 max-h-full overflow-auto">
-        <h1 className="md:px-4 pb-4 text-2xl">{title}</h1>
+      <div className="container p-4 mx-auto">
+        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
         <FeesContainer />
-      </TinyScroll>
+      </div>
     </ErrorBoundary>
   );
 };

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

@@ -56,6 +56,7 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
         <Last24hPriceChange
           marketId={market.id}
           decimalPlaces={market.decimalPlaces}
+          fallback={<span>-</span>}
         />
       </HeaderStat>
       <HeaderStat heading={t('Volume (24h)')} testId="market-volume">

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

@@ -72,14 +72,7 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
     <div className="h-full flex flex-col lg:grid grid-rows-[min-content_min-content_1fr_min-content]">
       <div className="flex flex-col w-full overflow-hidden">
         <div className="flex flex-nowrap overflow-x-auto max-w-full border-t border-default">
-          {[
-            'chart',
-            'orderbook',
-            'trades',
-            'liquidity',
-            'fundingPayments',
-            'funding',
-          ]
+          {['chart', 'orderbook', 'trades', 'liquidity', 'fundingPayments']
             // filter to control available views for the current market
             // e.g. only perpetuals should get the funding views
             .filter((_key) => {
@@ -170,12 +163,9 @@ const ViewButton = ({
   onClick: () => void;
 }) => {
   const label = useViewLabel(view);
-  const className = classNames(
-    'py-2 px-4 capitalize text-sm whitespace-nowrap',
-    {
-      'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
-    }
-  );
+  const className = classNames('py-2 px-4 min-w-[100px] capitalize text-sm', {
+    'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
+  });
 
   return (
     <button data-testid={view} onClick={onClick} className={className}>
@@ -191,8 +181,8 @@ const useViewLabel = (view: TradingView) => {
     chart: t('Chart'),
     depth: t('Depth'),
     liquidity: t('Liquidity'),
-    funding: t('Funding history'),
-    fundingPayments: t('Funding payments'),
+    funding: t('Funding'),
+    fundingPayments: t('Funding'),
     orderbook: t('Orderbook'),
     trades: t('Trades'),
     positions: t('Positions'),

apps/trading/client-pages/markets/markets-page.tsx

@@ -1,3 +1,5 @@
+import React, { useEffect } from 'react';
+import { titlefy } from '@vegaprotocol/utils';
 import {
   LocalStoragePersistTabs as Tabs,
   Tab,
@@ -5,6 +7,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { OpenMarkets } from './open-markets';
 import { Proposed } from './proposed';
+import { usePageTitleStore } from '../../stores';
 import { Closed } from './closed';
 import {
   DApp,
@@ -14,14 +17,19 @@ import {
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '../../components/error-boundary';
 import { MarketsSettings } from './markets-settings';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
 
 export const MarketsPage = () => {
   const t = useT();
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+
   const governanceLink = useLinks(DApp.Governance);
   const externalLink = governanceLink(TOKEN_NEW_MARKET_PROPOSAL);
 
-  usePageTitle(t('Markets'));
+  useEffect(() => {
+    updateTitle(titlefy([t('Markets')]));
+  }, [updateTitle, t]);
 
   return (
     <div className="h-full pt-0.5 pb-3 px-1.5">

apps/trading/client-pages/markets/mobile-buttons.tsx

@@ -1,235 +0,0 @@
-import { Route, Routes } from 'react-router-dom';
-import {
-  Intent,
-  MobileActionsDropdown,
-  Tooltip,
-  TradingButton,
-  TradingDropdownItem,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import { type BarView, ViewType, useSidebar } from '../../components/sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
-import { useT } from '../../lib/use-t';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { useEffect } from 'react';
-import classNames from 'classnames';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-
-const ViewInitializer = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const { setViews, getView } = useSidebar();
-  const view = getView(currentRouteId);
-  const { screenSize } = useScreenDimensions();
-  const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
-  useEffect(() => {
-    if (largeScreen && view === undefined) {
-      setViews({ type: ViewType.Order }, currentRouteId);
-    }
-  }, [setViews, view, currentRouteId, largeScreen]);
-  return null;
-};
-
-export const MarketsMobileSidebar = () => {
-  const t = useT();
-  const currentRouteId = useGetCurrentRouteId();
-  const { pubKeys, isReadOnly } = useVegaWallet();
-  const openVegaWalletDialog = useVegaWalletDialogStore(
-    (store) => store.openVegaWalletDialog
-  );
-
-  return (
-    <Routes>
-      <Route
-        path=":marketId"
-        element={
-          <>
-            <ViewInitializer />
-            <div className="grid grid-cols-3 grow md:grow-0 md:flex lg:flex-col items-center gap-2 lg:gap-4 p-1">
-              {!pubKeys || isReadOnly ? (
-                <>
-                  <TradingButton
-                    intent={Intent.Primary}
-                    size="medium"
-                    onClick={() => {
-                      openVegaWalletDialog();
-                    }}
-                  >
-                    {t('Connect')}
-                  </TradingButton>
-                  <MobileButton
-                    view={ViewType.Order}
-                    tooltip={t('Trade')}
-                    routeId={currentRouteId}
-                  />
-                  <MobileBarActionsDropdown currentRouteId={currentRouteId} />
-                </>
-              ) : (
-                <>
-                  <MobileButton
-                    view={ViewType.Order}
-                    tooltip={t('Trade')}
-                    routeId={currentRouteId}
-                  />
-                  <MobileButton
-                    view={ViewType.Deposit}
-                    tooltip={t('Deposit')}
-                    routeId={currentRouteId}
-                  />
-                  <MobileBarActionsDropdown currentRouteId={currentRouteId} />
-                </>
-              )}
-            </div>
-          </>
-        }
-      />
-    </Routes>
-  );
-};
-
-export const MobileButton = ({
-  view,
-  tooltip: label,
-  disabled = false,
-  onClick,
-  routeId,
-}: {
-  view?: ViewType;
-  tooltip: string;
-  disabled?: boolean;
-  onClick?: () => void;
-  routeId: string;
-}) => {
-  const { setViews, getView } = useSidebar((store) => ({
-    setViews: store.setViews,
-    getView: store.getView,
-  }));
-  const currView = getView(routeId);
-  const onSelect = (view: BarView['type']) => {
-    if (view === currView?.type) {
-      setViews(null, routeId);
-    } else {
-      setViews({ type: view }, routeId);
-    }
-  };
-
-  const buttonClasses = classNames(
-    'flex items-center p-1 rounded',
-    'disabled:cursor-not-allowed disabled:text-vega-clight-500 dark:disabled:text-vega-cdark-500',
-    {
-      'text-vega-clight-200 dark:text-vega-cdark-200 enabled:hover:bg-vega-clight-500 dark:enabled:hover:bg-vega-cdark-500':
-        !view || view !== currView?.type,
-      'bg-vega-yellow enabled:hover:bg-vega-yellow-550 text-black':
-        view && view === currView?.type,
-    }
-  );
-
-  return (
-    <Tooltip description={label} align="center" side="right" sideOffset={10}>
-      <TradingButton
-        className={buttonClasses}
-        data-testid={view}
-        onClick={onClick || (() => onSelect(view as BarView['type']))}
-        disabled={disabled}
-      >
-        {label}
-      </TradingButton>
-    </Tooltip>
-  );
-};
-
-export const MobileDropdownItem = ({
-  view,
-  icon,
-  tooltip,
-  disabled = false,
-  onClick,
-  routeId,
-}: {
-  view?: ViewType;
-  icon: VegaIconNames;
-  tooltip: string;
-  disabled?: boolean;
-  onClick?: () => void;
-  routeId: string;
-}) => {
-  const { setViews, getView } = useSidebar((store) => ({
-    setViews: store.setViews,
-    getView: store.getView,
-  }));
-  const currView = getView(routeId);
-  const onSelect = (view: BarView['type']) => {
-    if (view === currView?.type) {
-      setViews(null, routeId);
-    } else {
-      setViews({ type: view }, routeId);
-    }
-  };
-
-  const buttonClasses = classNames(
-    'flex items-center p-1 rounded',
-    'disabled:cursor-not-allowed disabled:text-vega-clight-500 dark:disabled:text-vega-cdark-500',
-    {
-      'text-vega-clight-200 dark:text-vega-cdark-200 enabled:hover:bg-vega-clight-500 dark:enabled:hover:bg-vega-cdark-500':
-        !view || view !== currView?.type,
-      'bg-vega-yellow enabled:hover:bg-vega-yellow-550 text-black':
-        view && view === currView?.type,
-    }
-  );
-
-  return (
-    <Tooltip description={tooltip} align="center" side="right" sideOffset={10}>
-      <TradingDropdownItem
-        className={buttonClasses}
-        data-testid={view}
-        onClick={onClick || (() => onSelect(view as BarView['type']))}
-        disabled={disabled}
-      >
-        <VegaIcon name={icon} size={20} />
-        {tooltip}
-      </TradingDropdownItem>
-    </Tooltip>
-  );
-};
-
-export const MobileBarActionsDropdown = ({
-  currentRouteId,
-}: {
-  currentRouteId: string;
-}) => {
-  const t = useT();
-  return (
-    <MobileActionsDropdown>
-      <MobileDropdownItem
-        view={ViewType.Deposit}
-        icon={VegaIconNames.DEPOSIT}
-        tooltip={t('Deposit')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Withdraw}
-        icon={VegaIconNames.WITHDRAW}
-        tooltip={t('Withdraw')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Transfer}
-        icon={VegaIconNames.TRANSFER}
-        tooltip={t('Transfer')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Info}
-        icon={VegaIconNames.BREAKDOWN}
-        tooltip={t('Market specification')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Settings}
-        icon={VegaIconNames.COG}
-        tooltip={t('Settings')}
-        routeId={currentRouteId}
-      />
-    </MobileActionsDropdown>
-  );
-};

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

@@ -2,7 +2,6 @@ import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { SidebarButton, ViewType } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
-import { MobileButton } from '../markets/mobile-buttons';
 
 export const PortfolioSidebar = () => {
   const t = useT();
@@ -31,28 +30,3 @@ export const PortfolioSidebar = () => {
     </>
   );
 };
-
-export const PortfolioMobileSidebar = () => {
-  const t = useT();
-  const currentRouteId = useGetCurrentRouteId();
-
-  return (
-    <div className="grid grid-cols-3 grow md:grow-0 md:flex lg:flex-col items-center gap-2 lg:gap-4 p-1">
-      <MobileButton
-        view={ViewType.Deposit}
-        tooltip={t('Deposit')}
-        routeId={currentRouteId}
-      />
-      <MobileButton
-        view={ViewType.Withdraw}
-        tooltip={t('Withdraw')}
-        routeId={currentRouteId}
-      />
-      <MobileButton
-        view={ViewType.Transfer}
-        tooltip={t('Transfer')}
-        routeId={currentRouteId}
-      />
-    </div>
-  );
-};

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

@@ -1,8 +1,10 @@
 import { useEffect } from 'react';
 import type { ReactNode } from 'react';
 import { LayoutPriority } from 'allotment';
+import { titlefy } from '@vegaprotocol/utils';
 import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
+import { usePageTitleStore } from '../../stores';
 import {
   AccountsContainer,
   AccountsSettings,
@@ -39,7 +41,6 @@ import { WithdrawalsMenu } from '../../components/withdrawals-menu';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '../../components/error-boundary';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
 
 const WithdrawalsIndicator = () => {
   const { ready } = useIncompleteWithdrawals();
@@ -68,7 +69,14 @@ const SidebarViewInitializer = () => {
 
 export const Portfolio = () => {
   const t = useT();
-  usePageTitle(t('Portfolio'));
+
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+
+  useEffect(() => {
+    updateTitle(titlefy([t('Portfolio')]));
+  }, [updateTitle, t]);
 
   const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
   const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';

apps/trading/client-pages/referrals/hooks/use-referral-program.ts

@@ -1,4 +1,4 @@
-import { formatNumber } from '@vegaprotocol/utils';
+import { getNumberFormat } from '@vegaprotocol/utils';
 import sortBy from 'lodash/sortBy';
 import omit from 'lodash/omit';
 import { useReferralProgramQuery } from './__generated__/CurrentReferralProgram';
@@ -107,7 +107,9 @@ export const useReferralProgram = () => {
       discountFactor: Number(t.referralDiscountFactor),
       discount: BigNumber(t.referralDiscountFactor).times(100).toFixed(2) + '%',
       minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
-      volume: formatNumber(t.minimumRunningNotionalTakerVolume, 0),
+      volume: getNumberFormat(0).format(
+        Number(t.minimumRunningNotionalTakerVolume)
+      ),
       epochs: Number(t.minimumEpochs),
     };
   });

apps/trading/client-pages/referrals/hooks/use-referral-toasts.tsx

@@ -11,7 +11,7 @@ import { useEffect } from 'react';
 import { useT } from '../../../lib/use-t';
 import { matchPath, useLocation, useNavigate } from 'react-router-dom';
 import { Routes } from '../../../lib/links';
-import { useCurrentEpochInfoQuery } from '../../../lib/hooks/__generated__/Epoch';
+import { useCurrentEpochInfoQuery } from './__generated__/Epoch';
 
 const REFETCH_INTERVAL = 60 * 60 * 1000; // 1h
 const NON_ELIGIBLE_REFERRAL_SET_TOAST_ID = 'non-eligible-referral-set';

apps/trading/client-pages/referrals/referral-statistics.tsx

@@ -14,9 +14,9 @@ import {
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import {
   addDecimalsFormatNumber,
-  formatNumber,
   getDateFormat,
   getDateTimeFormat,
+  getNumberFormat,
   getUserLocale,
   removePaginationWrapper,
 } from '@vegaprotocol/utils';
@@ -34,10 +34,9 @@ import {
 } from './hooks/use-referral';
 import { ApplyCodeForm, ApplyCodeFormContainer } from './apply-code-form';
 import { useReferralProgram } from './hooks/use-referral-program';
-import { useCurrentEpochInfoQuery } from '../../lib/hooks/__generated__/Epoch';
+import { useCurrentEpochInfoQuery } from './hooks/__generated__/Epoch';
 import { QUSDTooltip } from './qusd-tooltip';
 import { CodeTile, StatTile, Tile } from './tile';
-import { areTeamGames, useGames } from '../../lib/hooks/use-games';
 
 export const ReferralStatistics = () => {
   const { pubKey } = useVegaWallet();
@@ -324,7 +323,7 @@ export const Statistics = ({
       }
       description={<QUSDTooltip />}
     >
-      {formatNumber(totalCommissionValue, 0)}
+      {getNumberFormat(0).format(Number(totalCommissionValue))}
     </StatTile>
   );
 
@@ -564,8 +563,8 @@ export const RefereesTable = ({
               )
                 .map((r) => ({
                   ...r,
-                  volume: formatNumber(r.volume, 0),
-                  commission: formatNumber(r.commission, 0),
+                  volume: getNumberFormat(0).format(r.volume),
+                  commission: getNumberFormat(0).format(r.commission),
                 }))
                 .reverse()}
             />
@@ -577,8 +576,7 @@ export const RefereesTable = ({
 };
 
 const Team = ({ teamId }: { teamId?: string }) => {
-  const { team, members } = useTeam(teamId);
-  const { data: games } = useGames(teamId);
+  const { team, games, members } = useTeam(teamId);
 
   if (!team) return null;
 
@@ -587,10 +585,7 @@ const Team = ({ teamId }: { teamId?: string }) => {
       <TeamAvatar teamId={team.teamId} imgUrl={team.avatarUrl} />
       <div className="flex flex-col items-start gap-1 lg:gap-3">
         <h1 className="calt text-2xl lg:text-3xl xl:text-5xl">{team.name}</h1>
-        <TeamStats
-          members={members}
-          games={areTeamGames(games) ? games : undefined}
-        />
+        <TeamStats members={members} games={games} />
       </div>
     </Tile>
   );

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

@@ -1,18 +1,24 @@
-import { TinyScroll } from '@vegaprotocol/ui-toolkit';
+import { useEffect } from 'react';
+import { titlefy } from '@vegaprotocol/utils';
 import { useT } from '../../lib/use-t';
 import { RewardsContainer } from '../../components/rewards-container';
+import { usePageTitleStore } from '../../stores';
 import { ErrorBoundary } from '../../components/error-boundary';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
+import { TinyScroll } from '@vegaprotocol/ui-toolkit';
 
 export const Rewards = () => {
   const t = useT();
   const title = t('Rewards');
-  usePageTitle(title);
-
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+  useEffect(() => {
+    updateTitle(titlefy([title]));
+  }, [updateTitle, title]);
   return (
     <ErrorBoundary feature="rewards">
       <TinyScroll className="p-4 max-h-full overflow-auto">
-        <h1 className="md:px-4 pb-4 text-2xl">{title}</h1>
+        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
         <RewardsContainer />
       </TinyScroll>
     </ErrorBoundary>

apps/trading/components/bootstrapper/bootstrapper.tsx

@@ -153,8 +153,5 @@ const cacheConfig: InMemoryCacheConfig = {
     OrderUpdate: {
       keyFields: false,
     },
-    Game: {
-      keyFields: false,
-    },
   },
 };

apps/trading/components/competitions/competitions-leaderboard.tsx

@@ -1,6 +1,6 @@
 import { Link } from 'react-router-dom';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { formatNumber } from '@vegaprotocol/utils';
+import { getNumberFormat } from '@vegaprotocol/utils';
 import { type useTeams } from '../../lib/hooks/use-teams';
 import { useT } from '../../lib/use-t';
 import { Table } from '../table';
@@ -15,7 +15,8 @@ export const CompetitionsLeaderboard = ({
 }) => {
   const t = useT();
 
-  const num = (n?: number | string) => (!n ? '-' : formatNumber(n, 0));
+  const num = (n?: number | string) =>
+    !n ? '-' : getNumberFormat(0).format(Number(n));
 
   if (!data || data.length === 0) {
     return <Splash>{t('Could not find any teams')}</Splash>;
@@ -32,9 +33,9 @@ export const CompetitionsLeaderboard = ({
         { name: 'status', displayName: t('Status') },
         { name: 'volume', displayName: t('Volume') },
       ]}
-      data={data.map((td) => {
+      data={data.map((td, i) => {
         // leaderboard place or medal
-        let rank: number | React.ReactNode = td.rank;
+        let rank: number | React.ReactNode = i + 1;
         if (rank === 1) rank = <Rank variant="gold" />;
         if (rank === 2) rank = <Rank variant="silver" />;
         if (rank === 3) rank = <Rank variant="bronze" />;
@@ -56,10 +57,7 @@ export const CompetitionsLeaderboard = ({
               className="hover:underline"
               to={Links.COMPETITIONS_TEAM(td.teamId)}
             >
-              {
-                // Its possible for a tx to be submitted with an empty space as team name
-                td.name.trim() !== '' ? td.name : t('[empty]')
-              }
+              {td.name}
             </Link>
           ),
           earned: num(td.totalQuantumRewards),

apps/trading/components/competitions/games-container.tsx

@@ -1,11 +1,6 @@
 import { type TransferNode } from '@vegaprotocol/types';
-import {
-  ActiveRewardCard,
-  isActiveReward,
-} from '../rewards-container/active-rewards';
+import { ActiveRewardCard } from '../rewards-container/active-rewards';
 import { useT } from '../../lib/use-t';
-import { useAssetsMapProvider } from '@vegaprotocol/assets';
-import { useMarketsMapProvider } from '@vegaprotocol/markets';
 
 export const GamesContainer = ({
   data,
@@ -15,35 +10,8 @@ export const GamesContainer = ({
   currentEpoch: number;
 }) => {
   const t = useT();
-  // Re-load markets and assets in the games container to ensure that the
-  // the cards are updated (not grayed out) when the user navigates to the games page
-  const { data: assets } = useAssetsMapProvider();
-  const { data: markets } = useMarketsMapProvider();
 
-  const enrichedTransfers = data
-    .filter((node) => isActiveReward(node, currentEpoch))
-    .map((node) => {
-      if (node.transfer.kind.__typename !== 'RecurringTransfer') {
-        return node;
-      }
-
-      const asset =
-        assets &&
-        assets[
-          node.transfer.kind.dispatchStrategy?.dispatchMetricAssetId || ''
-        ];
-
-      const marketsInScope =
-        node.transfer.kind.dispatchStrategy?.marketIdsInScope?.map(
-          (id) => markets && markets[id]
-        );
-
-      return { ...node, asset, markets: marketsInScope };
-    });
-
-  if (!enrichedTransfers || !enrichedTransfers.length) return null;
-
-  if (!enrichedTransfers || enrichedTransfers.length === 0) {
+  if (!data || data.length === 0) {
     return (
       <p className="mb-6 text-muted">
         {t('There are currently no games available.')}
@@ -53,7 +21,7 @@ export const GamesContainer = ({
 
   return (
     <div className="mb-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-      {enrichedTransfers.map((game, i) => {
+      {data.map((game, i) => {
         // TODO: Remove `kind` prop from ActiveRewardCard
         const { transfer } = game;
         if (
@@ -68,7 +36,6 @@ export const GamesContainer = ({
             transferNode={game}
             currentEpoch={currentEpoch}
             kind={transfer.kind}
-            allMarkets={markets || undefined}
           />
         );
       })}

apps/trading/components/competitions/team-avatar.tsx

@@ -1,6 +1,4 @@
-import { isValidUrl } from '@vegaprotocol/utils';
 import classNames from 'classnames';
-import { useEffect, useState } from 'react';
 
 const NUM_AVATARS = 20;
 const AVATAR_PATHNAME_PATTERN = '/team-avatars/{id}.png';
@@ -13,26 +11,6 @@ export const getFallbackAvatar = (teamId: string) => {
   return AVATAR_PATHNAME_PATTERN.replace('{id}', avatarId);
 };
 
-const useAvatar = (teamId: string, url: string) => {
-  const fallback = getFallbackAvatar(teamId);
-  const [avatar, setAvatar] = useState<string>(fallback);
-
-  useEffect(() => {
-    if (!isValidUrl(url)) return;
-    fetch(url, { cache: 'force-cache' })
-      .then((response) => {
-        if (response.ok) {
-          setAvatar(url);
-        }
-      })
-      .catch(() => {
-        /** noop */
-      });
-  });
-
-  return avatar;
-};
-
 export const TeamAvatar = ({
   teamId,
   imgUrl,
@@ -44,7 +22,7 @@ export const TeamAvatar = ({
   alt?: string;
   size?: 'large' | 'small';
 }) => {
-  const img = useAvatar(teamId, imgUrl);
+  const img = imgUrl && imgUrl.length > 0 ? imgUrl : getFallbackAvatar(teamId);
   return (
     // eslint-disable-next-line @next/next/no-img-element
     <img

apps/trading/components/competitions/team-card.tsx

@@ -1,4 +1,4 @@
-import { type TeamStats } from '../../lib/hooks/use-team';
+import { type TeamGame, type TeamStats } from '../../lib/hooks/use-team';
 import { type TeamsFieldsFragment } from '../../lib/hooks/__generated__/Teams';
 import { TeamAvatar, getFallbackAvatar } from './team-avatar';
 import { FavoriteGame, Stat } from './team-stats';
@@ -13,7 +13,6 @@ import { take } from 'lodash';
 import { DispatchMetricLabels } from '@vegaprotocol/types';
 import classNames from 'classnames';
 import { UpdateTeamButton } from '../../client-pages/competitions/update-team-button';
-import { type TeamGame } from '../../lib/hooks/use-games';
 
 export const TeamCard = ({
   rank,

apps/trading/components/competitions/team-stats.tsx

@@ -11,11 +11,11 @@ import { formatNumberRounded } from '@vegaprotocol/utils';
 import {
   type TeamStats as ITeamStats,
   type Member,
+  type TeamGame,
 } from '../../lib/hooks/use-team';
 import { useT } from '../../lib/use-t';
 import { DispatchMetricLabels, type DispatchMetric } from '@vegaprotocol/types';
 import classNames from 'classnames';
-import { type TeamGame } from '../../lib/hooks/use-games';
 
 export const TeamStats = ({
   stats,

apps/trading/components/layouts/layout-with-sidebar.tsx

@@ -16,7 +16,7 @@ export const LayoutWithSidebar = ({
   const sidebarOpen = sidebarView !== null;
   const gridClasses = classNames(
     'h-full relative z-0 grid',
-    'grid-rows-[min-content_1fr_50px]',
+    'grid-rows-[min-content_1fr_40px]',
     'lg:grid-rows-[min-content_1fr]',
     'lg:grid-cols-[1fr_280px_40px]',
     'xxxl:grid-cols-[1fr_320px_40px]'

apps/trading/components/market-header/mobile-market-header.tsx

@@ -29,35 +29,28 @@ export const MobileMarketHeader = () => {
   if (!marketId) return null;
 
   return (
-    <div className="pl-3 pr-2 grid grid-cols-2 h-10 bg-vega-clight-700 dark:bg-vega-cdark-700">
+    <div className="pl-3 pr-2 flex justify-between gap-2 h-10 bg-vega-clight-700 dark:bg-vega-cdark-700">
       <FullScreenPopover
         open={openMarket}
         onOpenChange={(x) => {
           setOpenMarket(x);
         }}
         trigger={
-          <button
-            data-testid="popover-trigger"
-            className="min-w-0 flex gap-1 items-center"
-          >
-            <h1 className="whitespace-nowrap overflow-hidden text-ellipsis items-center">
-              <span className="">
-                {data
-                  ? data.tradableInstrument.instrument.code
-                  : t('Select market')}
-              </span>
-            </h1>
-            <VegaIcon
-              name={VegaIconNames.CHEVRON_DOWN}
-              size={16}
+          <h1 className="flex gap-1 sm:gap-2 md:gap-4 items-center text-base leading-3 md:text-lg whitespace-nowrap">
+            {data
+              ? data.tradableInstrument.instrument.code
+              : t('Select market')}
+            <span
               className={classNames(
-                'origin-center transition-transform ease-in-out duration-300 flex',
+                'transition-transform ease-in-out duration-300 flex',
                 {
                   'rotate-180': openMarket,
                 }
               )}
-            />
-          </button>
+            >
+              <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={16} />
+            </span>
+          </h1>
         }
       >
         <MarketSelector
@@ -71,40 +64,34 @@ export const MobileMarketHeader = () => {
           setOpenPrice(x);
         }}
         trigger={
-          <button
-            data-testid="popover-trigger"
-            className="min-w-0 flex gap-2 items-center justify-end"
-          >
+          <span className="flex gap-2 items-end md:text-md whitespace-nowrap leading-3">
             {data && (
               <>
-                <span className="min-w-0 flex flex-col items-end gap-0">
-                  <span className="text-sm">
-                    <MarketMarkPrice
-                      marketId={data.id}
-                      decimalPlaces={data.decimalPlaces}
-                    />
-                  </span>
-                  <span className="text-xs">
-                    <Last24hPriceChange
-                      marketId={data.id}
-                      decimalPlaces={data.decimalPlaces}
-                      fallback={<span />} // dont render anything so price is vertically centered
-                    />
-                  </span>
+                <span className="text-xs">
+                  <Last24hPriceChange
+                    marketId={data.id}
+                    decimalPlaces={data.decimalPlaces}
+                  />
+                </span>
+                <span className="flex items-center gap-1">
+                  <MarketMarkPrice
+                    marketId={data.id}
+                    decimalPlaces={data.decimalPlaces}
+                  />
+                  <VegaIcon
+                    name={VegaIconNames.CHEVRON_DOWN}
+                    size={16}
+                    className={classNames(
+                      'transition-transform ease-in-out duration-300',
+                      {
+                        'rotate-180': openPrice,
+                      }
+                    )}
+                  />
                 </span>
-                <VegaIcon
-                  name={VegaIconNames.CHEVRON_DOWN}
-                  size={16}
-                  className={classNames(
-                    'min-w-0 transition-transform ease-in-out duration-300',
-                    {
-                      'rotate-180': openPrice,
-                    }
-                  )}
-                />
               </>
             )}
-          </button>
+          </span>
         }
       >
         {data && (
@@ -117,11 +104,11 @@ export const MobileMarketHeader = () => {
   );
 };
 
-interface PopoverProps extends PopoverPrimitive.PopoverProps {
+export interface PopoverProps extends PopoverPrimitive.PopoverProps {
   trigger: React.ReactNode | string;
 }
 
-const FullScreenPopover = ({
+export const FullScreenPopover = ({
   trigger,
   children,
   open,
@@ -129,7 +116,7 @@ const FullScreenPopover = ({
 }: PopoverProps) => {
   return (
     <PopoverPrimitive.Root open={open} onOpenChange={onOpenChange}>
-      <PopoverPrimitive.Trigger asChild={true}>
+      <PopoverPrimitive.Trigger data-testid="popover-trigger">
         {trigger}
       </PopoverPrimitive.Trigger>
       <PopoverPrimitive.Portal>

apps/trading/components/rewards-container/active-rewards.tsx

@@ -468,7 +468,7 @@ export const ActiveRewardCard = ({
             }
           </div>
           {dispatchStrategy?.dispatchMetric && (
-            <span className="text-muted text-sm h-[3rem]">
+            <span className="text-muted text-sm h-[2rem]">
               {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
             </span>
           )}

apps/trading/components/sidebar/sidebar.tsx

@@ -17,7 +17,6 @@ import { useVegaWallet, useViewAsDialog } from '@vegaprotocol/wallet';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '../error-boundary';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 
 export enum ViewType {
   Order = 'Order',
@@ -27,10 +26,9 @@ export enum ViewType {
   Transfer = 'Transfer',
   Settings = 'Settings',
   ViewAs = 'ViewAs',
-  Close = 'Close',
 }
 
-export type BarView =
+type SidebarView =
   | {
       type: ViewType.Deposit;
       assetId?: string;
@@ -51,9 +49,6 @@ export type BarView =
     }
   | {
       type: ViewType.Settings;
-    }
-  | {
-      type: ViewType.Close;
     };
 
 export const Sidebar = ({ options }: { options?: ReactNode }) => {
@@ -62,52 +57,26 @@ export const Sidebar = ({ options }: { options?: ReactNode }) => {
   const navClasses = 'flex lg:flex-col items-center gap-2 lg:gap-4 p-1';
   const setViewAsDialogOpen = useViewAsDialog((state) => state.setOpen);
   const { pubKeys } = useVegaWallet();
-  const { isMobile } = useScreenDimensions();
-  const { getView } = useSidebar((store) => ({
-    setViews: store.setViews,
-    getView: store.getView,
-  }));
-  const currView = getView(currentRouteId);
   return (
-    <div className="flex h-full lg:flex-col gap-1" data-testid="sidebar">
-      {options && (
-        <nav className={classNames(navClasses, 'flex grow')}>{options}</nav>
-      )}
-      <nav
-        className={classNames(
-          navClasses,
-          'ml-auto lg:mt-auto lg:ml-0 shrink-0'
-        )}
-      >
-        {!isMobile ? (
-          <>
-            <SidebarButton
-              view={ViewType.ViewAs}
-              onClick={() => {
-                setViewAsDialogOpen(true);
-              }}
-              icon={VegaIconNames.EYE}
-              tooltip={t('View as party')}
-              disabled={Boolean(pubKeys)}
-              routeId={currentRouteId}
-            />
-            <SidebarButton
-              view={ViewType.Settings}
-              icon={VegaIconNames.COG}
-              tooltip={t('Settings')}
-              routeId={currentRouteId}
-            />
-          </>
-        ) : (
-          currView && (
-            <SidebarButton
-              view={ViewType.Close}
-              icon={VegaIconNames.ARROW_LEFT}
-              tooltip={t('Back')}
-              routeId={currentRouteId}
-            />
-          )
-        )}
+    <div className="flex h-full p-1 lg:flex-col gap-2" data-testid="sidebar">
+      {options && <nav className={navClasses}>{options}</nav>}
+      <nav className={classNames(navClasses, 'ml-auto lg:mt-auto lg:ml-0')}>
+        <SidebarButton
+          view={ViewType.ViewAs}
+          onClick={() => {
+            setViewAsDialogOpen(true);
+          }}
+          icon={VegaIconNames.EYE}
+          tooltip={t('View as party')}
+          disabled={Boolean(pubKeys)}
+          routeId={currentRouteId}
+        />
+        <SidebarButton
+          view={ViewType.Settings}
+          icon={VegaIconNames.COG}
+          tooltip={t('Settings')}
+          routeId={currentRouteId}
+        />
         <NodeHealthContainer />
       </nav>
     </div>
@@ -134,7 +103,7 @@ export const SidebarButton = ({
     getView: store.getView,
   }));
   const currView = getView(routeId);
-  const onSelect = (view: BarView['type']) => {
+  const onSelect = (view: SidebarView['type']) => {
     if (view === currView?.type) {
       setViews(null, routeId);
     } else {
@@ -164,7 +133,7 @@ export const SidebarButton = ({
       <button
         className={buttonClasses}
         data-testid={view}
-        onClick={onClick || (() => onSelect(view as BarView['type']))}
+        onClick={onClick || (() => onSelect(view as SidebarView['type']))}
         disabled={disabled}
       >
         <VegaIcon name={icon} size={20} />
@@ -211,10 +180,6 @@ export const SidebarContent = () => {
     }
   }
 
-  if (view.type === ViewType.Close) {
-    return <CloseSidebar />;
-  }
-
   if (view.type === ViewType.Info) {
     if (params.marketId) {
       return (
@@ -302,9 +267,9 @@ const CloseSidebar = () => {
 };
 
 export const useSidebar = create<{
-  views: { [key: string]: BarView | null };
-  setViews: (view: BarView | null, routeId: string) => void;
-  getView: (routeId: string) => BarView | null | undefined;
+  views: { [key: string]: SidebarView | null };
+  setViews: (view: SidebarView | null, routeId: string) => void;
+  getView: (routeId: string) => SidebarView | null | undefined;
 }>()((set, get) => ({
   views: {},
   setViews: (x, routeId) =>

apps/trading/e2e/.env

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.74.1
+VEGA_VERSION=v0.74.0-preview.10
 LOCAL_SERVER=false

apps/trading/e2e/.env.develop

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.74.1
+VEGA_VERSION=v0.74.0-preview.6
 LOCAL_SERVER=false

apps/trading/e2e/.env.main

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:main
-VEGA_VERSION=v0.73.13
+VEGA_VERSION=v0.73.10
 LOCAL_SERVER=false

apps/trading/e2e/poetry.lock

@@ -1161,7 +1161,7 @@ profile = ["pytest-profiling", "snakeviz"]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git/"
 reference = "HEAD"
-resolved_reference = "a8afded34874a01cfd1bb771052aa12a062960b9"
+resolved_reference = "026976549c21e59f6f9c48f06ab15a210c5a5bf3"
 
 [[package]]
 name = "websocket-client"

apps/trading/e2e/tests/deal_ticket/test_trading_deal_ticket_submit_account.py

@@ -15,8 +15,7 @@ deal_ticket_deposit_dialog_button = "deal-ticket-deposit-dialog-button"
 @pytest.fixture(scope="module")
 def vega(request):
     with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(
-            vega_instance))  # Register the cleanup function
+        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
         yield vega_instance
 
 
@@ -25,7 +24,6 @@ def continuous_market(vega):
     return setup_continuous_market(vega)
 
 
-@pytest.mark.skip("tbd - issue only on the sim, should work in vega 0.74.0")
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_should_display_info_and_button_for_deposit(continuous_market, page: Page):
     page.goto(f"/#/markets/{continuous_market}")

apps/trading/e2e/tests/market_lifecycle/test_market_lifecycle.py

@@ -35,9 +35,9 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
     # 6002-MDET-003
     expect(page.get_by_test_id("market-price")).to_have_text("Mark Price0.00")
     # 6002-MDET-004
-    expect(page.get_by_test_id("market-change")).to_have_text("Change (24h)-")
+    expect(page.get_by_test_id("market-change")).to_have_text("Change (24h)0.00%0.00")
     # 6002-MDET-005
-    expect(page.get_by_test_id("market-volume")).to_have_text("Volume (24h)-")
+    expect(page.get_by_test_id("market-volume")).to_have_text("Volume (24h)- (- BTC)")
     # 6002-MDET-008
     expect(page.get_by_test_id("market-settlement-asset")).to_have_text(
         "Settlement assettDAI"

apps/trading/e2e/tests/perpetual_market/test_perpetuals.py

@@ -4,7 +4,7 @@ from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from vega_sim.service import MarketStateUpdateType
 from datetime import datetime, timedelta
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from actions.utils import change_keys
 from actions.vega import submit_multiple_orders
 from fixtures.market import setup_perps_market
@@ -17,9 +17,8 @@ col_amount = '[col-id="amount"]'
 class TestPerpetuals:
     @pytest.fixture(scope="class")
     def vega(self, request):
-        with init_vega(request) as vega_instance:
-            request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-            yield vega_instance
+        with init_vega(request) as vega:
+            yield vega
 
     @pytest.fixture(scope="class")
     def perps_market(self, vega: VegaServiceNull):

apps/trading/e2e/tests/teams/test_teams.py

@@ -129,8 +129,7 @@ def setup_teams_and_games(vega: VegaServiceNull):
     )
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-    # this recurring transfer has been commented out as there appears to be a bug where individual rewards earned are showing on the teams page
-    """ vega.recurring_transfer(
+    vega.recurring_transfer(
         from_key_name=PARTY_C.name,
         from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
         to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
@@ -144,7 +143,7 @@ def setup_teams_and_games(vega: VegaServiceNull):
         amount=100,
         factor=1.0,
         window_length=15
-    ) """
+    )
     next_epoch(vega)
     print(f"[EPOCH: {vega.statistics().epoch_seq}] starting order activity")
 
@@ -213,17 +212,15 @@ def create_team(vega: VegaServiceNull):
 
 
 def test_team_page_games_table(team_page: Page):
-    team_page.pause()
     team_page.get_by_test_id("games-toggle").click()
-    expect(team_page.get_by_test_id("games-toggle")).to_have_text("Results (10)")
-    expect(team_page.get_by_test_id("rank-0")).to_have_text("1")
+    expect(team_page.get_by_test_id("games-toggle")).to_have_text("Games (1)")
+    expect(team_page.get_by_test_id("rank-0")).to_have_text("2")
     expect(team_page.get_by_test_id("epoch-0")).to_have_text("19")
     expect(team_page.get_by_test_id("type-0")
            ).to_have_text("Price maker fees paid")
-    #TODO skipped as the amount is wrong
-    #expect(team_page.get_by_test_id("amount-0")).to_have_text("74") # 50,000,000 on 74.1
+    expect(team_page.get_by_test_id("amount-0")).to_have_text("74")
     expect(team_page.get_by_test_id("participatingTeams-0")).to_have_text("2")
-    expect(team_page.get_by_test_id("participatingMembers-0")).to_have_text("3")
+    expect(team_page.get_by_test_id("participatingMembers-0")).to_have_text("4")
 
 
 def test_team_page_members_table(team_page: Page):
@@ -240,12 +237,12 @@ def test_team_page_headline(team_page: Page, setup_teams_and_games):
     expect(team_page.get_by_test_id("team-name")).to_have_text(team_name)
     expect(team_page.get_by_test_id("members-count-stat")).to_have_text("4")
 
-    expect(team_page.get_by_test_id("total-games-stat")).to_have_text("2")
+    expect(team_page.get_by_test_id("total-games-stat")).to_have_text("1")
 
     # TODO this still seems wrong as its always 0
     expect(team_page.get_by_test_id("total-volume-stat")).to_have_text("0")
 
-    expect(team_page.get_by_test_id("rewards-paid-stat")).to_have_text("1.2k")
+    expect(team_page.get_by_test_id("rewards-paid-stat")).to_have_text("78")
 
 
 def test_switch_teams(team_page: Page, vega: VegaServiceNull):
@@ -262,7 +259,6 @@ def test_switch_teams(team_page: Page, vega: VegaServiceNull):
 def test_leaderboard(competitions_page: Page, setup_teams_and_games):
     team_name = setup_teams_and_games["team_name"]
     competitions_page.reload()
-    competitions_page.pause()
     expect(
         competitions_page.get_by_test_id("rank-0").locator(".text-yellow-300")
     ).to_have_count(1)
@@ -270,15 +266,15 @@ def test_leaderboard(competitions_page: Page, setup_teams_and_games):
         competitions_page.get_by_test_id(
             "rank-1").locator(".text-vega-clight-500")
     ).to_have_count(1)
-    expect(competitions_page.get_by_test_id("team-0")).to_have_text(team_name)
+    expect(competitions_page.get_by_test_id("team-1")).to_have_text(team_name)
     expect(competitions_page.get_by_test_id("status-1")).to_have_text("Open")
 
     #  FIXME: the numbers are different we need to clarify this with the backend
     # expect(competitions_page.get_by_test_id("earned-1")).to_have_text("160")
-    expect(competitions_page.get_by_test_id("games-1")).to_have_text("2")
+    expect(competitions_page.get_by_test_id("games-1")).to_have_text("1")
 
     # TODO  still odd that this is 0
-    expect(competitions_page.get_by_test_id("volume-0")).to_have_text("0")
+    expect(competitions_page.get_by_test_id("volume-0")).to_have_text("-")
 
 
 def test_game_card(competitions_page: Page):
@@ -292,7 +288,7 @@ def test_game_card(competitions_page: Page):
     expect(game_1.get_by_test_id("distribution-strategy")
            ).to_have_text("Pro rata")
     expect(game_1.get_by_test_id("dispatch-metric-info")
-           ).to_have_text("Price maker fees paid • tDAI")
+           ).to_have_text("Price maker fees paid • ")
     expect(game_1.get_by_test_id("assessed-over")).to_have_text("15 epochs")
     expect(game_1.get_by_test_id("scope")).to_have_text("In team")
     expect(game_1.get_by_test_id("staking-requirement")).to_have_text("0.00")

apps/trading/lib/hooks/Games.graphql

@@ -1,35 +0,0 @@
-fragment TeamEntity on TeamGameEntity {
-  rank
-  volume
-  rewardMetric
-  rewardEarned
-  totalRewardsEarned
-  team {
-    teamId
-    membersParticipating {
-      individual
-      rank
-    }
-  }
-}
-
-fragment GameFields on Game {
-  id
-  epoch
-  numberOfParticipants
-  entities {
-    ... on TeamGameEntity {
-      ...TeamEntity
-    }
-  }
-}
-
-query Games($epochFrom: Int) {
-  games(epochFrom: $epochFrom, entityScope: ENTITY_SCOPE_TEAMS) {
-    edges {
-      node {
-        ...GameFields
-      }
-    }
-  }
-}

apps/trading/lib/hooks/Team.graphql

@@ -29,6 +29,28 @@ fragment TeamRefereeFields on TeamReferee {
   joinedAtEpoch
 }
 
+fragment TeamEntity on TeamGameEntity {
+  rank
+  volume
+  rewardMetric
+  rewardEarned
+  totalRewardsEarned
+  team {
+    teamId
+  }
+}
+
+fragment TeamGameFields on Game {
+  id
+  epoch
+  numberOfParticipants
+  entities {
+    ... on TeamGameEntity {
+      ...TeamEntity
+    }
+  }
+}
+
 fragment TeamMemberStatsFields on TeamMemberStatistics {
   partyId
   totalQuantumVolume
@@ -65,6 +87,13 @@ query Team($teamId: ID!, $partyId: ID, $aggregationEpochs: Int) {
       }
     }
   }
+  games(entityScope: ENTITY_SCOPE_TEAMS) {
+    edges {
+      node {
+        ...TeamGameFields
+      }
+    }
+  }
   teamMembersStatistics(
     teamId: $teamId
     aggregationEpochs: $aggregationEpochs

apps/trading/lib/hooks/__generated__/Games.ts

@@ -1,83 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type TeamEntityFragment = { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: Types.DispatchMetric, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string, membersParticipating: Array<{ __typename?: 'IndividualGameEntity', individual: string, rank: number }> } };
-
-export type GameFieldsFragment = { __typename?: 'Game', id: string, epoch: number, numberOfParticipants: number, entities: Array<{ __typename?: 'IndividualGameEntity' } | { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: Types.DispatchMetric, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string, membersParticipating: Array<{ __typename?: 'IndividualGameEntity', individual: string, rank: number }> } }> };
-
-export type GamesQueryVariables = Types.Exact<{
-  epochFrom?: Types.InputMaybe<Types.Scalars['Int']>;
-}>;
-
-
-export type GamesQuery = { __typename?: 'Query', games: { __typename?: 'GamesConnection', edges?: Array<{ __typename?: 'GameEdge', node: { __typename?: 'Game', id: string, epoch: number, numberOfParticipants: number, entities: Array<{ __typename?: 'IndividualGameEntity' } | { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: Types.DispatchMetric, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string, membersParticipating: Array<{ __typename?: 'IndividualGameEntity', individual: string, rank: number }> } }> } } | null> | null } };
-
-export const TeamEntityFragmentDoc = gql`
-    fragment TeamEntity on TeamGameEntity {
-  rank
-  volume
-  rewardMetric
-  rewardEarned
-  totalRewardsEarned
-  team {
-    teamId
-    membersParticipating {
-      individual
-      rank
-    }
-  }
-}
-    `;
-export const GameFieldsFragmentDoc = gql`
-    fragment GameFields on Game {
-  id
-  epoch
-  numberOfParticipants
-  entities {
-    ... on TeamGameEntity {
-      ...TeamEntity
-    }
-  }
-}
-    ${TeamEntityFragmentDoc}`;
-export const GamesDocument = gql`
-    query Games($epochFrom: Int) {
-  games(epochFrom: $epochFrom, entityScope: ENTITY_SCOPE_TEAMS) {
-    edges {
-      node {
-        ...GameFields
-      }
-    }
-  }
-}
-    ${GameFieldsFragmentDoc}`;
-
-/**
- * __useGamesQuery__
- *
- * To run a query within a React component, call `useGamesQuery` and pass it any options that fit your needs.
- * When your component renders, `useGamesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGamesQuery({
- *   variables: {
- *      epochFrom: // value for 'epochFrom'
- *   },
- * });
- */
-export function useGamesQuery(baseOptions?: Apollo.QueryHookOptions<GamesQuery, GamesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<GamesQuery, GamesQueryVariables>(GamesDocument, options);
-      }
-export function useGamesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GamesQuery, GamesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<GamesQuery, GamesQueryVariables>(GamesDocument, options);
-        }
-export type GamesQueryHookResult = ReturnType<typeof useGamesQuery>;
-export type GamesLazyQueryHookResult = ReturnType<typeof useGamesLazyQuery>;
-export type GamesQueryResult = Apollo.QueryResult<GamesQuery, GamesQueryVariables>;

apps/trading/lib/hooks/__generated__/Team.ts

@@ -9,6 +9,10 @@ export type TeamStatsFieldsFragment = { __typename?: 'TeamStatistics', teamId: s
 
 export type TeamRefereeFieldsFragment = { __typename?: 'TeamReferee', teamId: string, referee: string, joinedAt: any, joinedAtEpoch: number };
 
+export type TeamEntityFragment = { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: Types.DispatchMetric, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string } };
+
+export type TeamGameFieldsFragment = { __typename?: 'Game', id: string, epoch: number, numberOfParticipants: number, entities: Array<{ __typename?: 'IndividualGameEntity' } | { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: Types.DispatchMetric, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string } }> };
+
 export type TeamMemberStatsFieldsFragment = { __typename?: 'TeamMemberStatistics', partyId: string, totalQuantumVolume: string, totalQuantumRewards: string, totalGamesPlayed: number };
 
 export type TeamQueryVariables = Types.Exact<{
@@ -18,7 +22,7 @@ export type TeamQueryVariables = Types.Exact<{
 }>;
 
 
-export type TeamQuery = { __typename?: 'Query', teams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean, allowList: Array<string> } }> } | null, partyTeams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean, allowList: Array<string> } }> } | null, teamsStatistics?: { __typename?: 'TeamsStatisticsConnection', edges: Array<{ __typename?: 'TeamStatisticsEdge', node: { __typename?: 'TeamStatistics', teamId: string, totalQuantumVolume: string, totalQuantumRewards: string, totalGamesPlayed: number, gamesPlayed: Array<string>, quantumRewards: Array<{ __typename?: 'QuantumRewardsPerEpoch', epoch: number, totalQuantumRewards: string }> } }> } | null, teamReferees?: { __typename?: 'TeamRefereeConnection', edges: Array<{ __typename?: 'TeamRefereeEdge', node: { __typename?: 'TeamReferee', teamId: string, referee: string, joinedAt: any, joinedAtEpoch: number } }> } | null, teamMembersStatistics?: { __typename?: 'TeamMembersStatisticsConnection', edges: Array<{ __typename?: 'TeamMemberStatisticsEdge', node: { __typename?: 'TeamMemberStatistics', partyId: string, totalQuantumVolume: string, totalQuantumRewards: string, totalGamesPlayed: number } }> } | null };
+export type TeamQuery = { __typename?: 'Query', teams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean, allowList: Array<string> } }> } | null, partyTeams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean, allowList: Array<string> } }> } | null, teamsStatistics?: { __typename?: 'TeamsStatisticsConnection', edges: Array<{ __typename?: 'TeamStatisticsEdge', node: { __typename?: 'TeamStatistics', teamId: string, totalQuantumVolume: string, totalQuantumRewards: string, totalGamesPlayed: number, gamesPlayed: Array<string>, quantumRewards: Array<{ __typename?: 'QuantumRewardsPerEpoch', epoch: number, totalQuantumRewards: string }> } }> } | null, teamReferees?: { __typename?: 'TeamRefereeConnection', edges: Array<{ __typename?: 'TeamRefereeEdge', node: { __typename?: 'TeamReferee', teamId: string, referee: string, joinedAt: any, joinedAtEpoch: number } }> } | null, games: { __typename?: 'GamesConnection', edges?: Array<{ __typename?: 'GameEdge', node: { __typename?: 'Game', id: string, epoch: number, numberOfParticipants: number, entities: Array<{ __typename?: 'IndividualGameEntity' } | { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: Types.DispatchMetric, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string } }> } } | null> | null }, teamMembersStatistics?: { __typename?: 'TeamMembersStatisticsConnection', edges: Array<{ __typename?: 'TeamMemberStatisticsEdge', node: { __typename?: 'TeamMemberStatistics', partyId: string, totalQuantumVolume: string, totalQuantumRewards: string, totalGamesPlayed: number } }> } | null };
 
 export const TeamFieldsFragmentDoc = gql`
     fragment TeamFields on Team {
@@ -54,6 +58,30 @@ export const TeamRefereeFieldsFragmentDoc = gql`
   joinedAtEpoch
 }
     `;
+export const TeamEntityFragmentDoc = gql`
+    fragment TeamEntity on TeamGameEntity {
+  rank
+  volume
+  rewardMetric
+  rewardEarned
+  totalRewardsEarned
+  team {
+    teamId
+  }
+}
+    `;
+export const TeamGameFieldsFragmentDoc = gql`
+    fragment TeamGameFields on Game {
+  id
+  epoch
+  numberOfParticipants
+  entities {
+    ... on TeamGameEntity {
+      ...TeamEntity
+    }
+  }
+}
+    ${TeamEntityFragmentDoc}`;
 export const TeamMemberStatsFieldsFragmentDoc = gql`
     fragment TeamMemberStatsFields on TeamMemberStatistics {
   partyId
@@ -92,6 +120,13 @@ export const TeamDocument = gql`
       }
     }
   }
+  games(entityScope: ENTITY_SCOPE_TEAMS) {
+    edges {
+      node {
+        ...TeamGameFields
+      }
+    }
+  }
   teamMembersStatistics(teamId: $teamId, aggregationEpochs: $aggregationEpochs) {
     edges {
       node {
@@ -103,6 +138,7 @@ export const TeamDocument = gql`
     ${TeamFieldsFragmentDoc}
 ${TeamStatsFieldsFragmentDoc}
 ${TeamRefereeFieldsFragmentDoc}
+${TeamGameFieldsFragmentDoc}
 ${TeamMemberStatsFieldsFragmentDoc}`;
 
 /**

apps/trading/lib/hooks/use-game-cards.ts

@@ -1,48 +0,0 @@
-import compact from 'lodash/compact';
-import { useActiveRewardsQuery } from '../../components/rewards-container/__generated__/Rewards';
-import { isActiveReward } from '../../components/rewards-container/active-rewards';
-import {
-  EntityScope,
-  IndividualScope,
-  type TransferNode,
-} from '@vegaprotocol/types';
-
-const isScopedToTeams = (node: TransferNode) =>
-  node.transfer.kind.__typename === 'RecurringTransfer' &&
-  // scoped to teams
-  (node.transfer.kind.dispatchStrategy?.entityScope ===
-    EntityScope.ENTITY_SCOPE_TEAMS ||
-    // or to individuals
-    (node.transfer.kind.dispatchStrategy?.entityScope ===
-      EntityScope.ENTITY_SCOPE_INDIVIDUALS &&
-      // but they have to be in a team
-      node.transfer.kind.dispatchStrategy.individualScope ===
-        IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM));
-
-export const useGameCards = ({
-  currentEpoch,
-  onlyActive,
-}: {
-  currentEpoch: number;
-  onlyActive: boolean;
-}) => {
-  const { data, loading, error } = useActiveRewardsQuery({
-    variables: {
-      isReward: true,
-    },
-    fetchPolicy: 'cache-and-network',
-  });
-
-  const games = compact(data?.transfersConnection?.edges?.map((n) => n?.node))
-    .map((n) => n as TransferNode)
-    .filter((node) => {
-      const active = onlyActive ? isActiveReward(node, currentEpoch) : true;
-      return active && isScopedToTeams(node);
-    });
-
-  return {
-    data: games,
-    loading,
-    error,
-  };
-};

apps/trading/lib/hooks/use-games.ts

@@ -1,80 +1,48 @@
+import compact from 'lodash/compact';
+import { useActiveRewardsQuery } from '../../components/rewards-container/__generated__/Rewards';
+import { isActiveReward } from '../../components/rewards-container/active-rewards';
 import {
-  useGamesQuery,
-  type GameFieldsFragment,
-  type TeamEntityFragment,
-} from './__generated__/Games';
-import orderBy from 'lodash/orderBy';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
-import { useCurrentEpochInfoQuery } from './__generated__/Epoch';
-import { type ApolloError } from '@apollo/client';
+  EntityScope,
+  IndividualScope,
+  type TransferNode,
+} from '@vegaprotocol/types';
 
-const TAKE_EPOCHS = 30; // TODO: should this be DEFAULT_AGGREGATION_EPOCHS?
+const isScopedToTeams = (node: TransferNode) =>
+  node.transfer.kind.__typename === 'RecurringTransfer' &&
+  // scoped to teams
+  (node.transfer.kind.dispatchStrategy?.entityScope ===
+    EntityScope.ENTITY_SCOPE_TEAMS ||
+    // or to individuals
+    (node.transfer.kind.dispatchStrategy?.entityScope ===
+      EntityScope.ENTITY_SCOPE_INDIVIDUALS &&
+      // but they have to be in a team
+      node.transfer.kind.dispatchStrategy.individualScope ===
+        IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM));
 
-const findTeam = (entities: GameFieldsFragment['entities'], teamId: string) => {
-  const team = entities.find(
-    (ent) => ent.__typename === 'TeamGameEntity' && ent.team.teamId === teamId
-  );
-  if (team?.__typename === 'TeamGameEntity') return team; // drops __typename === 'IndividualGameEntity' from team object
-  return undefined;
-};
-
-export type Game = GameFieldsFragment & {
-  /** The team entity data accessible only if scoped to particular team.  */
-  team?: TeamEntityFragment;
-};
-export type TeamGame = Game & { team: NonNullable<Game['team']> };
-
-const isTeamGame = (game: Game): game is TeamGame => game.team !== undefined;
-export const areTeamGames = (games?: Game[]): games is TeamGame[] =>
-  Boolean(games && games.filter((g) => isTeamGame(g)).length > 0);
-
-type GamesData = {
-  data?: Game[];
-  loading: boolean;
-  error?: ApolloError;
-};
-
-export const useGames = (teamId?: string, epochFrom?: number): GamesData => {
-  const {
-    data: epochData,
-    loading: epochLoading,
-    error: epochError,
-  } = useCurrentEpochInfoQuery({
-    skip: Boolean(epochFrom),
-  });
-
-  let from = epochFrom;
-  if (!from && epochData) {
-    from = Number(epochData.epoch.id) - TAKE_EPOCHS;
-    if (from < 1) from = 1; // make sure it's not negative
-  }
-
-  const { data, loading, error } = useGamesQuery({
+export const useGames = ({
+  currentEpoch,
+  onlyActive,
+}: {
+  currentEpoch: number;
+  onlyActive: boolean;
+}) => {
+  const { data, loading, error } = useActiveRewardsQuery({
     variables: {
-      epochFrom: from,
+      isReward: true,
     },
-    skip: !from,
     fetchPolicy: 'cache-and-network',
-    context: { isEnlargedTimeout: true },
   });
 
-  const allGames = removePaginationWrapper(data?.games.edges);
-  const allOrScoped = allGames
-    .map((g) => ({
-      ...g,
-      team: teamId ? findTeam(g.entities, teamId) : undefined,
-    }))
-    .filter((g) => {
-      // passthrough if not scoped to particular team
-      if (!teamId) return true;
-      return isTeamGame(g);
+  const games = compact(data?.transfersConnection?.edges?.map((n) => n?.node))
+    .map((n) => n as TransferNode)
+    .filter((node) => {
+      const active = onlyActive ? isActiveReward(node, currentEpoch) : true;
+      return active && isScopedToTeams(node);
     });
 
-  const games = orderBy(allOrScoped, 'epoch', 'desc');
-
   return {
     data: games,
-    loading: loading || epochLoading,
-    error: error || epochError,
+    loading,
+    error,
   };
 };

apps/trading/lib/hooks/use-my-team.ts

@@ -4,7 +4,6 @@ import first from 'lodash/first';
 import { useTeamsQuery } from './__generated__/Teams';
 import { useTeam } from './use-team';
 import { useTeams } from './use-teams';
-import { areTeamGames, useGames } from './use-games';
 
 export const useMyTeam = () => {
   const { pubKey } = useVegaWallet();
@@ -20,8 +19,7 @@ export const useMyTeam = () => {
 
   const team = first(compact(maybeMyTeam?.teams?.edges.map((n) => n.node)));
   const rank = teams.findIndex((t) => t.teamId === team?.teamId) + 1;
-  const { stats } = useTeam(team?.teamId);
-  const { data: games } = useGames(team?.teamId);
+  const { games, stats } = useTeam(team?.teamId);
 
-  return { team, stats, games: areTeamGames(games) ? games : undefined, rank };
+  return { team, stats, games, rank };
 };

apps/trading/lib/hooks/use-team.ts

@@ -1,8 +1,11 @@
+import compact from 'lodash/compact';
+import orderBy from 'lodash/orderBy';
 import {
   useTeamQuery,
   type TeamFieldsFragment,
   type TeamStatsFieldsFragment,
   type TeamRefereeFieldsFragment,
+  type TeamEntityFragment,
   type TeamMemberStatsFieldsFragment,
 } from './__generated__/Team';
 import { DEFAULT_AGGREGATION_EPOCHS } from './use-teams';
@@ -15,6 +18,8 @@ export type Member = TeamRefereeFieldsFragment & {
   totalQuantumVolume: string;
   totalQuantumRewards: string;
 };
+export type TeamEntity = TeamEntityFragment;
+export type TeamGame = ReturnType<typeof useTeam>['games'][number];
 export type MemberStats = TeamMemberStatsFieldsFragment;
 
 export const useTeam = (teamId?: string, partyId?: string) => {
@@ -75,11 +80,33 @@ export const useTeam = (teamId?: string, partyId?: string) => {
     });
   }
 
+  // Find games where the current team participated in
+  const gamesWithTeam = compact(data?.games.edges).map((edge) => {
+    const team = edge.node.entities.find((e) => {
+      if (e.__typename !== 'TeamGameEntity') return false;
+      if (e.team.teamId !== teamId) return false;
+      return true;
+    });
+
+    if (!team) return null;
+
+    return {
+      id: edge.node.id,
+      epoch: edge.node.epoch,
+      numberOfParticipants: edge.node.numberOfParticipants,
+      entities: edge.node.entities,
+      team: team as TeamEntity, // TS can't infer that all the game entities are teams
+    };
+  });
+
+  const games = orderBy(compact(gamesWithTeam), 'epoch', 'desc');
+
   return {
     ...queryResult,
     stats: teamStatsEdge?.node,
     team,
     members,
+    games,
     partyTeam,
   };
 };

apps/trading/lib/hooks/use-teams.tsx

@@ -3,19 +3,10 @@ import { useMemo } from 'react';
 import { useTeamsQuery } from './__generated__/Teams';
 import { useTeamsStatisticsQuery } from './__generated__/TeamsStatistics';
 import compact from 'lodash/compact';
-import { type TeamStatsFieldsFragment } from './__generated__/Team';
 
 // 192
 export const DEFAULT_AGGREGATION_EPOCHS = 192;
 
-const EMPTY_STATS: Partial<TeamStatsFieldsFragment> = {
-  totalQuantumVolume: '0',
-  totalQuantumRewards: '0',
-  totalGamesPlayed: 0,
-  gamesPlayed: [],
-  quantumRewards: [],
-};
-
 export const useTeams = (aggregationEpochs = DEFAULT_AGGREGATION_EPOCHS) => {
   const {
     data: teamsData,
@@ -42,12 +33,10 @@ export const useTeams = (aggregationEpochs = DEFAULT_AGGREGATION_EPOCHS) => {
   const data = useMemo(() => {
     const data = teams.map((t) => ({
       ...t,
-      ...(stats.find((s) => s.teamId === t.teamId) || EMPTY_STATS),
+      ...stats.find((s) => s.teamId === t.teamId),
     }));
 
-    return orderBy(data, (d) => Number(d.totalQuantumRewards || 0), 'desc').map(
-      (d, i) => ({ ...d, rank: i + 1 })
-    );
+    return orderBy(data, (d) => Number(d.totalQuantumRewards || 0), 'desc');
   }, [teams, stats]);
 
   return {

apps/trading/pages/client-router.tsx

@@ -24,10 +24,7 @@ import { compact } from 'lodash';
 import { useFeatureFlags } from '@vegaprotocol/environment';
 import { LiquidityHeader } from '../components/liquidity-header';
 import { MarketHeader, MobileMarketHeader } from '../components/market-header';
-import {
-  PortfolioMobileSidebar,
-  PortfolioSidebar,
-} from '../client-pages/portfolio/portfolio-sidebar';
+import { PortfolioSidebar } from '../client-pages/portfolio/portfolio-sidebar';
 import { LiquiditySidebar } from '../client-pages/liquidity/liquidity-sidebar';
 import { MarketsSidebar } from '../client-pages/markets/markets-sidebar';
 import { useT } from '../lib/use-t';
@@ -36,10 +33,9 @@ import { CompetitionsTeams } from '../client-pages/competitions/competitions-tea
 import { CompetitionsTeam } from '../client-pages/competitions/competitions-team';
 import { CompetitionsCreateTeam } from '../client-pages/competitions/competitions-create-team';
 import { CompetitionsUpdateTeam } from '../client-pages/competitions/competitions-update-team';
-import { MarketsMobileSidebar } from '../client-pages/markets/mobile-buttons';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 
-// These must remain dynamically imported as pennant cannot be compiled by Next.js due to ESM
+// These must remain dynamically imported as pennant cannot be compiled by nextjs due to ESM
 // Using dynamic imports is a workaround for this until pennant is published as ESM
 const MarketPage = lazy(() => import('../client-pages/market'));
 const Portfolio = lazy(() => import('../client-pages/portfolio'));
@@ -58,17 +54,6 @@ export const useRouterConfig = (): RouteObject[] => {
   const { screenSize } = useScreenDimensions();
   const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
   const marketHeader = largeScreen ? <MarketHeader /> : <MobileMarketHeader />;
-  const marketsSidebar = largeScreen ? (
-    <MarketsSidebar />
-  ) : (
-    <MarketsMobileSidebar />
-  );
-  const portfolioSidebar = largeScreen ? (
-    <PortfolioSidebar />
-  ) : (
-    <PortfolioMobileSidebar />
-  );
-
   const routeConfig = compact([
     {
       index: true,
@@ -85,7 +70,7 @@ export const useRouterConfig = (): RouteObject[] => {
     featureFlags.REFERRALS
       ? {
           path: AppRoutes.REFERRALS,
-          element: <LayoutWithSidebar sidebar={portfolioSidebar} />,
+          element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
           children: [
             {
               element: (
@@ -118,7 +103,7 @@ export const useRouterConfig = (): RouteObject[] => {
     featureFlags.TEAM_COMPETITION
       ? {
           path: AppRoutes.COMPETITIONS,
-          element: <LayoutWithSidebar sidebar={portfolioSidebar} />,
+          element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
           children: [
             // pages with planets and stars
             {
@@ -149,7 +134,7 @@ export const useRouterConfig = (): RouteObject[] => {
       : undefined,
     {
       path: 'fees/*',
-      element: <LayoutWithSidebar sidebar={portfolioSidebar} />,
+      element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
       children: [
         {
           index: true,
@@ -159,7 +144,7 @@ export const useRouterConfig = (): RouteObject[] => {
     },
     {
       path: 'rewards/*',
-      element: <LayoutWithSidebar sidebar={portfolioSidebar} />,
+      element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
       children: [
         {
           index: true,
@@ -170,7 +155,7 @@ export const useRouterConfig = (): RouteObject[] => {
     {
       path: 'markets/*',
       element: (
-        <LayoutWithSidebar header={marketHeader} sidebar={marketsSidebar} />
+        <LayoutWithSidebar header={marketHeader} sidebar={<MarketsSidebar />} />
       ),
       children: [
         {
@@ -191,7 +176,7 @@ export const useRouterConfig = (): RouteObject[] => {
     },
     {
       path: 'portfolio/*',
-      element: <LayoutWithSidebar sidebar={portfolioSidebar} />,
+      element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
       children: [
         {
           index: true,

libs/accounts/src/lib/TransferFee.graphql

@@ -1,18 +0,0 @@
-query TransferFee(
-  $fromAccount: ID!
-  $fromAccountType: AccountType!
-  $toAccount: ID!
-  $amount: String!
-  $assetId: String!
-) {
-  estimateTransferFee(
-    fromAccount: $fromAccount
-    fromAccountType: $fromAccountType
-    toAccount: $toAccount
-    amount: $amount
-    assetId: $assetId
-  ) {
-    fee
-    discount
-  }
-}

libs/accounts/src/lib/__generated__/TransferFee.ts

@@ -1,63 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type TransferFeeQueryVariables = Types.Exact<{
-  fromAccount: Types.Scalars['ID'];
-  fromAccountType: Types.AccountType;
-  toAccount: Types.Scalars['ID'];
-  amount: Types.Scalars['String'];
-  assetId: Types.Scalars['String'];
-}>;
-
-
-export type TransferFeeQuery = { __typename?: 'Query', estimateTransferFee?: { __typename?: 'EstimatedTransferFee', fee: string, discount: string } | null };
-
-
-export const TransferFeeDocument = gql`
-    query TransferFee($fromAccount: ID!, $fromAccountType: AccountType!, $toAccount: ID!, $amount: String!, $assetId: String!) {
-  estimateTransferFee(
-    fromAccount: $fromAccount
-    fromAccountType: $fromAccountType
-    toAccount: $toAccount
-    amount: $amount
-    assetId: $assetId
-  ) {
-    fee
-    discount
-  }
-}
-    `;
-
-/**
- * __useTransferFeeQuery__
- *
- * To run a query within a React component, call `useTransferFeeQuery` and pass it any options that fit your needs.
- * When your component renders, `useTransferFeeQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useTransferFeeQuery({
- *   variables: {
- *      fromAccount: // value for 'fromAccount'
- *      fromAccountType: // value for 'fromAccountType'
- *      toAccount: // value for 'toAccount'
- *      amount: // value for 'amount'
- *      assetId: // value for 'assetId'
- *   },
- * });
- */
-export function useTransferFeeQuery(baseOptions: Apollo.QueryHookOptions<TransferFeeQuery, TransferFeeQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<TransferFeeQuery, TransferFeeQueryVariables>(TransferFeeDocument, options);
-      }
-export function useTransferFeeLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TransferFeeQuery, TransferFeeQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<TransferFeeQuery, TransferFeeQueryVariables>(TransferFeeDocument, options);
-        }
-export type TransferFeeQueryHookResult = ReturnType<typeof useTransferFeeQuery>;
-export type TransferFeeLazyQueryHookResult = ReturnType<typeof useTransferFeeLazyQuery>;
-export type TransferFeeQueryResult = Apollo.QueryResult<TransferFeeQuery, TransferFeeQueryVariables>;

libs/accounts/src/lib/transfer-container.tsx

@@ -25,6 +25,7 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
   const t = useT();
   const { pubKey, pubKeys, isReadOnly } = useVegaWallet();
   const { params } = useNetworkParams([
+    NetworkParams.transfer_fee_factor,
     NetworkParams.transfer_minTransferQuantumMultiple,
   ]);
 
@@ -71,6 +72,7 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
         pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
         isReadOnly={isReadOnly}
         assetId={assetId}
+        feeFactor={params.transfer_fee_factor}
         minQuantumMultiple={params.transfer_minTransferQuantumMultiple}
         submitTransfer={transfer}
         accounts={sortedAccounts}

libs/accounts/src/lib/transfer-form.spec.tsx

@@ -15,30 +15,6 @@ import {
 } from './transfer-form';
 import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
 import { removeDecimal } from '@vegaprotocol/utils';
-import type { TransferFeeQuery } from './__generated__/TransferFee';
-
-const feeFactor = 0.001;
-const mockUseTransferFeeQuery = jest.fn(
-  ({
-    variables: { amount },
-  }: {
-    variables: { amount: string };
-  }): { data: TransferFeeQuery } => {
-    return {
-      data: {
-        estimateTransferFee: {
-          discount: '0',
-          fee: (Number(amount) * feeFactor).toFixed(),
-        },
-      },
-    };
-  }
-);
-
-jest.mock('./__generated__/TransferFee', () => ({
-  useTransferFeeQuery: (props: { variables: { amount: string } }) =>
-    mockUseTransferFeeQuery(props),
-}));
 
 describe('TransferForm', () => {
   const renderComponent = (props: TransferFormProps) => {
@@ -80,6 +56,7 @@ describe('TransferForm', () => {
   const props = {
     pubKey,
     pubKeys: [pubKey, '2'.repeat(64)],
+    feeFactor: '0.001',
     submitTransfer: jest.fn(),
     accounts: [
       {
@@ -102,6 +79,7 @@ describe('TransferForm', () => {
       pubKey,
       'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
     ],
+    feeFactor: '0.001',
     submitTransfer: jest.fn(),
     accounts: [],
     minQuantumMultiple: '1',
@@ -118,6 +96,10 @@ describe('TransferForm', () => {
   });
 
   it.each([
+    {
+      targetText: 'Transfer fee',
+      tooltipText: /transfer\.fee\.factor/,
+    },
     {
       targetText: 'Amount to be transferred',
       tooltipText: /without the fee/,
@@ -127,6 +109,9 @@ describe('TransferForm', () => {
       tooltipText: /total amount taken from your account/,
     },
   ])('Tooltip for "$targetText" shows', async (o) => {
+    // 1003-TRAN-015
+    // 1003-TRAN-016
+    // 1003-TRAN-017
     // 1003-TRAN-018
     // 1003-TRAN-019
     renderComponent(props);
@@ -139,10 +124,6 @@ describe('TransferForm', () => {
     // Select asset
     await selectAsset(asset);
 
-    await userEvent.selectOptions(
-      screen.getByLabelText('From account'),
-      `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
-    );
     // set valid amount
     const amountInput = screen.getByLabelText('Amount');
     await userEvent.type(amountInput, amount);
@@ -233,7 +214,9 @@ describe('TransferForm', () => {
     // set valid amount
     await userEvent.clear(amountInput);
     await userEvent.type(amountInput, amount);
-    expect(screen.getByTestId('transfer-fee')).toHaveTextContent('1');
+    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(
+      new BigNumber(props.feeFactor).times(amount).toFixed()
+    );
 
     await submit();
 
@@ -402,44 +385,47 @@ describe('TransferForm', () => {
       });
     });
   });
+  describe('IncludeFeesCheckbox', () => {
+    it('validates fields when checkbox is not checked', async () => {
+      renderComponent(props);
 
-  it('validates fields', async () => {
-    renderComponent(props);
+      // check current pubkey not shown
+      const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
+      const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
+      expect(keySelect.children).toHaveLength(pubKeyOptions.length);
+      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
+        pubKeyOptions
+      );
 
-    // check current pubkey not shown
-    const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
-    const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
-    expect(keySelect.children).toHaveLength(pubKeyOptions.length);
-    expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
-      pubKeyOptions
-    );
+      await submit();
+      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
 
-    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+      // Select a pubkey
+      await userEvent.selectOptions(
+        screen.getByLabelText('To Vega key'),
+        props.pubKeys[1]
+      );
 
-    // Select a pubkey
-    await userEvent.selectOptions(
-      screen.getByLabelText('To Vega key'),
-      props.pubKeys[1]
-    );
+      // Select asset
+      await selectAsset(asset);
 
-    // Select asset
-    await selectAsset(asset);
+      await userEvent.selectOptions(
+        screen.getByLabelText('From account'),
+        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+      );
 
-    await userEvent.selectOptions(
-      screen.getByLabelText('From account'),
-      `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
-    );
+      const amountInput = screen.getByLabelText('Amount');
 
-    const amountInput = screen.getByLabelText('Amount');
-
-    await userEvent.type(amountInput, amount);
-    const expectedFee = new BigNumber(amount).times(feeFactor).toFixed();
-    const total = new BigNumber(amount).plus(expectedFee).toFixed();
-    // 1003-TRAN-021
-    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-    expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
-    expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
+      await userEvent.type(amountInput, amount);
+      const expectedFee = new BigNumber(amount)
+        .times(props.feeFactor)
+        .toFixed();
+      const total = new BigNumber(amount).plus(expectedFee).toFixed();
+      // 1003-TRAN-021
+      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
+      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
+      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
+    });
   });
 
   describe('AddressField', () => {
@@ -471,29 +457,24 @@ describe('TransferForm', () => {
 
   describe('TransferFee', () => {
     const props = {
-      amount: '20000',
-      discount: '0',
-      fee: '20',
-      decimals: 2,
+      amount: '200',
+      feeFactor: '0.001',
+      fee: '0.2',
+      transferAmount: '200',
+      decimals: 8,
     };
-    it('calculates and renders amounts and fee', () => {
+    it('calculates and renders the transfer fee', () => {
       render(<TransferFee {...props} />);
-      expect(screen.queryByTestId('discount')).not.toBeInTheDocument();
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent('0.2');
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent('200.00');
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(
-        '200.20'
-      );
-    });
 
-    it('calculates and renders amounts, fee and discount', () => {
-      render(<TransferFee {...props} discount="10" />);
-      expect(screen.getByTestId('discount')).toHaveTextContent('0.1');
-      expect(screen.getByTestId('transfer-fee')).toHaveTextContent('0.2');
-      expect(screen.getByTestId('transfer-amount')).toHaveTextContent('200.00');
-      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(
-        '200.10'
+      const expected = new BigNumber(props.amount)
+        .times(props.feeFactor)
+        .toFixed();
+      const total = new BigNumber(props.amount).plus(expected).toFixed();
+      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expected);
+      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
+        props.amount
       );
+      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
     });
   });
 });

libs/accounts/src/lib/transfer-form.tsx

@@ -4,9 +4,8 @@ import {
   useRequired,
   useVegaPublicKey,
   addDecimal,
+  formatNumber,
   toBigNum,
-  removeDecimal,
-  addDecimalsFormatNumber,
 } from '@vegaprotocol/utils';
 import { useT } from './use-t';
 import {
@@ -22,11 +21,10 @@ import type { Transfer } from '@vegaprotocol/wallet';
 import { normalizeTransfer } from '@vegaprotocol/wallet';
 import BigNumber from 'bignumber.js';
 import type { ReactNode } from 'react';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { AssetOption, Balance } from '@vegaprotocol/assets';
 import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
-import { useTransferFeeQuery } from './__generated__/TransferFee';
 
 interface FormFields {
   toVegaKey: string;
@@ -53,6 +51,7 @@ export interface TransferFormProps {
     asset: Asset;
   }>;
   assetId?: string;
+  feeFactor: string | null;
   minQuantumMultiple: string | null;
   submitTransfer: (transfer: Transfer) => void;
 }
@@ -62,6 +61,7 @@ export const TransferForm = ({
   pubKeys,
   isReadOnly,
   assetId: initialAssetId,
+  feeFactor,
   submitTransfer,
   accounts,
   minQuantumMultiple,
@@ -136,22 +136,11 @@ export const TransferForm = ({
 
   // Max amount given selected asset and from account
   const max = accountBalance ? new BigNumber(accountBalance) : new BigNumber(0);
-  const normalizedAmount =
-    (amount && asset && removeDecimal(amount, asset.decimals)) || '0';
 
-  const transferFeeQuery = useTransferFeeQuery({
-    variables: {
-      fromAccount: pubKey || '',
-      fromAccountType: accountType || AccountType.ACCOUNT_TYPE_GENERAL,
-      amount: normalizedAmount,
-      assetId: asset?.id || '',
-      toAccount: selectedPubKey,
-    },
-    skip: !pubKey || !amount || !asset || !selectedPubKey || fromVested,
-  });
-  const transferFee = transferFeeQuery.loading
-    ? transferFeeQuery.data || transferFeeQuery.previousData
-    : transferFeeQuery.data;
+  const fee = useMemo(
+    () => feeFactor && new BigNumber(feeFactor).times(amount).toString(),
+    [amount, feeFactor]
+  );
 
   const onSubmit = useCallback(
     (fields: FormFields) => {
@@ -443,14 +432,12 @@ export const TransferForm = ({
           </TradingInputError>
         )}
       </TradingFormGroup>
-      {(transferFee?.estimateTransferFee || fromVested) && amount && asset && (
+      {amount && fee && (
         <TransferFee
-          amount={normalizedAmount}
-          fee={fromVested ? '0' : transferFee?.estimateTransferFee?.fee}
-          discount={
-            fromVested ? '0' : transferFee?.estimateTransferFee?.discount
-          }
-          decimals={asset.decimals}
+          amount={amount}
+          feeFactor={feeFactor}
+          fee={fromVested ? '0' : fee}
+          decimals={asset?.decimals}
         />
       )}
       <TradingButton type="submit" fill={true} disabled={isReadOnly}>
@@ -462,44 +449,39 @@ export const TransferForm = ({
 
 export const TransferFee = ({
   amount,
+  feeFactor,
   fee,
-  discount,
   decimals,
 }: {
   amount: string;
+  feeFactor: string | null;
   fee?: string;
-  discount?: string;
-  decimals: number;
+  decimals?: number;
 }) => {
   const t = useT();
-  if (!amount || !fee) return null;
-  if (isNaN(Number(amount)) || isNaN(Number(fee))) {
+  if (!feeFactor || !amount || !fee) return null;
+  if (isNaN(Number(feeFactor)) || isNaN(Number(amount)) || isNaN(Number(fee))) {
     return null;
   }
 
-  const totalValue = (
-    BigInt(amount) +
-    BigInt(fee) -
-    BigInt(discount || '0')
-  ).toString();
+  const totalValue = new BigNumber(amount).plus(fee).toString();
 
   return (
     <div className="mb-4 flex flex-col gap-2 text-xs">
       <div className="flex flex-wrap items-center justify-between gap-1">
-        <div>{t('Transfer fee')}</div>
+        <Tooltip
+          description={t(
+            `The transfer fee is set by the network parameter transfer.fee.factor, currently set to {{feeFactor}}`,
+            { feeFactor }
+          )}
+        >
+          <div>{t('Transfer fee')}</div>
+        </Tooltip>
+
         <div data-testid="transfer-fee" className="text-muted">
-          {addDecimalsFormatNumber(fee, decimals)}
+          {formatNumber(fee, decimals)}
         </div>
       </div>
-      {discount && discount !== '0' && (
-        <div className="flex flex-wrap items-center justify-between gap-1">
-          <div>{t('Discount')}</div>
-          <div data-testid="discount" className="text-muted">
-            {addDecimalsFormatNumber(discount, decimals)}
-          </div>
-        </div>
-      )}
-
       <div className="flex flex-wrap items-center justify-between gap-1">
         <Tooltip
           description={t(
@@ -510,7 +492,7 @@ export const TransferFee = ({
         </Tooltip>
 
         <div data-testid="transfer-amount" className="text-muted">
-          {addDecimalsFormatNumber(amount, decimals)}
+          {formatNumber(amount, decimals)}
         </div>
       </div>
       <div className="flex flex-wrap items-center justify-between gap-1">
@@ -523,7 +505,7 @@ export const TransferFee = ({
         </Tooltip>
 
         <div data-testid="total-transfer-fee" className="text-muted">
-          {addDecimalsFormatNumber(totalValue, decimals)}
+          {formatNumber(totalValue, decimals)}
         </div>
       </div>
     </div>

libs/apollo-client/src/cache-config.ts

@@ -48,8 +48,5 @@ export const DEFAULT_CACHE_CONFIG: InMemoryCacheConfig = {
     statistics: {
       keyFields: false,
     },
-    Game: {
-      keyFields: false,
-    },
   },
 };

libs/datagrid/src/lib/use-datagrid-events.ts

@@ -7,7 +7,7 @@ import {
   type FirstDataRenderedEvent,
   type SortChangedEvent,
   type GridReadyEvent,
-  type GridApi,
+  GridApi,
 } from 'ag-grid-community';
 import { useCallback, useEffect, useRef } from 'react';
 

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -281,7 +281,7 @@ export const DealTicket = ({
       marginFactor: margin?.marginFactor || '1',
       marginMode:
         margin?.marginMode || Schema.MarginMode.MARGIN_MODE_CROSS_MARGIN,
-      includeRequiredPositionMarginInAvailableCollateral: true,
+      includeCollateralIncreaseInAvailableCollateral: true,
     },
     !normalizedOrder ||
       (normalizedOrder.type !== Schema.OrderType.TYPE_MARKET &&

libs/deal-ticket/src/components/deal-ticket/margin-mode-selector.tsx

@@ -89,7 +89,7 @@ export const MarginChange = ({
       openVolume,
       marketId,
       orderMarginAccountBalance: orderMarginAccountBalance || '0',
-      includeRequiredPositionMarginInAvailableCollateral: true,
+      includeCollateralIncreaseInAvailableCollateral: true,
       orders,
     },
     skip

libs/environment/src/hooks/use-links.ts

@@ -86,7 +86,6 @@ export const DocsLinks = VEGA_DOCS_URL
       POST_REDUCE_ONLY: `${VEGA_DOCS_URL}/concepts/trading-on-vega/orders#conditional-order-parameters`,
       QUANTUM: `${VEGA_DOCS_URL}/concepts/assets/asset-framework#quantum`,
       REFERRALS: `${VEGA_DOCS_URL}/tutorials/proposals/referral-program-proposal`,
-      LIQUIDITY_FEE_PERCENTAGE: `${VEGA_DOCS_URL}/concepts/liquidity/rewards-penalties#determining-the-liquidity-fee-percentage`,
     }
   : undefined;
 

libs/i18n/src/locales/en/accounts.json

@@ -35,6 +35,7 @@
   "The total amount of each asset on this key. Includes used and available collateral.": "The total amount of each asset on this key. Includes used and available collateral.",
   "The total amount taken from your account. The amount to be transferred plus the fee.": "The total amount taken from your account. The amount to be transferred plus the fee.",
   "The total amount to be transferred (without the fee)": "The total amount to be transferred (without the fee)",
+  "The transfer fee is set by the network parameter transfer.fee.factor, currently set to {{feeFactor}}": "The transfer fee is set by the network parameter transfer.fee.factor, currently set to {{feeFactor}}",
   "To account": "To account",
   "To Vega key": "To Vega key",
   "Total": "Total",

libs/i18n/src/locales/en/markets.json

@@ -2,7 +2,7 @@
   "{{liquidityPriceRange}} of mid price": "{{liquidityPriceRange}} of mid price",
   "{{probability}} probability price bounds": "{{probability}} probability price bounds",
   "24 hour change is unavailable at this time. The price change in the last 120 hours is:": "24 hour change is unavailable at this time. The price change in the last 120 hours is:",
-  "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
+  "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}}": "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}}",
   "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.": "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.",
   "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.": "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.",
   "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.": "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.",
@@ -49,9 +49,6 @@
   "Market": "Market",
   "Market data": "Market data",
   "Market governance": "Market governance",
-  "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:",
-  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:",
-  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
   "Market ID": "Market ID",
   "Market price": "Market price",
   "Market specification": "Market specification",

libs/i18n/src/locales/en/trading.json

@@ -90,7 +90,6 @@
   "Earned by me": "Earned by me",
   "Eligible teams": "Eligible teams",
   "Enactment date reached and usual auction exit checks pass": "Enactment date reached and usual auction exit checks pass",
-  "[empty]": "[empty]",
   "Ends in": "Ends in",
   "Entity scope": "Entity scope",
   "{{entity}} scope": "{{entity}} scope",
@@ -111,7 +110,6 @@
   "Fills": "Fills",
   "Final commission rate": "Final commission rate",
   "Find out more": "Find out more",
-  "For more info, visit the documentation": "For more info, visit the documentation",
   "Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.": "Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.",
   "From epoch": "From epoch",
   "Fully decentralised high performance peer-to-network trading.": "Fully decentralised high performance peer-to-network trading.",
@@ -123,7 +121,6 @@
   "Funding rate": "Funding rate",
   "Futures": "Futures",
   "Games ({{count}})": "Games ({{count}})",
-  "Results ({{count}})": "Results ({{count}})",
   "Generate a referral code to share with your friends and start earning commission.": "Generate a referral code to share with your friends and start earning commission.",
   "Generate code": "Generate code",
   "Get rewards for providing liquidity.": "Get rewards for providing liquidity.",
@@ -200,7 +197,6 @@
   "No funding history data": "No funding history data",
   "No future markets.": "No future markets.",
   "No games": "No games",
-  "No game results available": "No game results available",
   "No ledger entries to export": "No ledger entries to export",
   "No market": "No market",
   "No markets": "No markets",
@@ -320,7 +316,6 @@
   "Target stake": "Target stake",
   "Team": "Team",
   "Team name": "Team name",
-  "Team name cannot be empty": "Team name cannot be empty",
   "Team creation transaction successful": "Team creation transaction successful",
   "Team joined": "Team joined",
   "Team switch successful. You will switch team at the end of the epoch.": "Team switch successful. You will switch team at the end of the epoch.",
@@ -451,9 +446,5 @@
   "Choose a team": "Choose a team",
   "Join a team": "Join a team",
   "Solo team / lone wolf": "Solo team / lone wolf",
-  "Choose a team to get involved": "Choose a team to get involved",
-  "Go back to the team's profile": "Go back to the team's profile",
-  "Go back to the competitions": "Go back to the competitions",
-  "Your team ID:": "Your team ID:",
-  "Changes successfully saved to your team.": "Changes successfully saved to your team."
+  "Choose a team to get involved": "Choose a team to get involved"
 }

libs/liquidity/src/lib/liquidity-table.tsx

@@ -94,7 +94,7 @@ export const LiquidityTable = ({
       return `${addDecimalsFormatNumberQuantum(
         value,
         assetDecimalPlaces ?? 0,
-        quantum ?? 1
+        quantum ?? 0
       )}`;
     };
 
@@ -165,7 +165,7 @@ export const LiquidityTable = ({
       return `${addDecimalsFormatNumberQuantum(
         newValue,
         assetDecimalPlaces ?? 0,
-        quantum ?? 1
+        quantum ?? 0
       )}`;
     };
 
@@ -227,7 +227,7 @@ export const LiquidityTable = ({
             addDecimalsFormatNumberQuantum(
               pendingCommitmentAmount,
               assetDecimalPlaces ?? 0,
-              quantum ?? 1
+              quantum ?? 0
             );
 
           if (
@@ -238,7 +238,7 @@ export const LiquidityTable = ({
               addDecimalsFormatNumberQuantum(
                 currentCommitmentAmount,
                 assetDecimalPlaces ?? 0,
-                quantum ?? 1
+                quantum ?? 0
               );
 
             return (
@@ -286,7 +286,7 @@ export const LiquidityTable = ({
             addDecimalsFormatNumberQuantum(
               pendingCommitmentAmount,
               assetDecimalPlaces ?? 0,
-              quantum ?? 1
+              quantum ?? 0
             );
 
           if (
@@ -297,7 +297,7 @@ export const LiquidityTable = ({
               addDecimalsFormatNumberQuantum(
                 currentCommitmentAmount,
                 assetDecimalPlaces ?? 0,
-                quantum ?? 1
+                quantum ?? 0
               );
 
             return (

libs/market-depth/src/lib/depth-chart.tsx

@@ -1,7 +1,7 @@
 import { DepthChart } from 'pennant';
 import throttle from 'lodash/throttle';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { addDecimal, formatNumber } from '@vegaprotocol/utils';
+import { addDecimal, getNumberFormat } from '@vegaprotocol/utils';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketDepthProvider } from './market-depth-provider';
@@ -216,12 +216,13 @@ export const DepthChartContainer = ({ marketId }: DepthChartManagerProps) => {
 
   const volumeFormat = useCallback(
     (volume: number) =>
-      formatNumber(volume, market?.positionDecimalPlaces || 0),
+      getNumberFormat(market?.positionDecimalPlaces || 0).format(volume),
     [market?.positionDecimalPlaces]
   );
 
   const priceFormat = useCallback(
-    (price: number) => formatNumber(price, market?.decimalPlaces || 0),
+    (price: number) =>
+      getNumberFormat(market?.decimalPlaces || 0).format(price),
     [market?.decimalPlaces]
   );
 

libs/markets/src/lib/components/last-24h-price-change/last-24h-price-change.tsx

@@ -1,8 +1,7 @@
-import { type ReactNode } from 'react';
 import {
   addDecimalsFormatNumber,
   formatNumberPercentage,
-  getDateTimeFormat,
+  isNumeric,
   priceChange,
   priceChangePercentage,
 } from '@vegaprotocol/utils';
@@ -15,57 +14,29 @@ import { useT } from '../../use-t';
 
 interface Props {
   marketId?: string;
-  decimalPlaces: number;
-  fallback?: ReactNode;
+  decimalPlaces?: number;
+  initialValue?: string[];
+  isHeader?: boolean;
+  noUpdate?: boolean;
+  // render prop for no price change
+  fallback?: React.ReactNode;
 }
 
 export const Last24hPriceChange = ({
   marketId,
   decimalPlaces,
+  initialValue,
   fallback,
 }: Props) => {
   const t = useT();
-  const { oneDayCandles, fiveDaysCandles, error } = useCandles({
+  const { oneDayCandles, error, fiveDaysCandles } = useCandles({
     marketId,
   });
-
-  const nonIdeal = fallback || <span>{'-'}</span>;
-
-  if (error || !oneDayCandles || !fiveDaysCandles) {
-    return nonIdeal;
-  }
-
-  if (fiveDaysCandles.length < 24) {
-    return (
-      <Tooltip
-        description={
-          <span className="justify-start">
-            {t(
-              'Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:',
-              {
-                start: getDateTimeFormat().format(
-                  new Date(fiveDaysCandles[0].periodStart)
-                ),
-                end: getDateTimeFormat().format(
-                  new Date(
-                    fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
-                  )
-                ),
-              }
-            )}
-            <PriceChangeCell
-              candles={fiveDaysCandles.map((c) => c.close) || []}
-              decimalPlaces={decimalPlaces}
-            />
-          </span>
-        }
-      >
-        <span>{nonIdeal}</span>
-      </Tooltip>
-    );
-  }
-
-  if (oneDayCandles.length < 24) {
+  if (
+    fiveDaysCandles &&
+    fiveDaysCandles.length > 0 &&
+    (!oneDayCandles || oneDayCandles?.length === 0)
+  ) {
     return (
       <Tooltip
         description={
@@ -80,12 +51,16 @@ export const Last24hPriceChange = ({
           </span>
         }
       >
-        <span>{nonIdeal}</span>
+        <span>{fallback}</span>
       </Tooltip>
     );
   }
 
-  const candles = oneDayCandles?.map((c) => c.close) || [];
+  if (error || !isNumeric(decimalPlaces)) {
+    return <span>{fallback}</span>;
+  }
+
+  const candles = oneDayCandles?.map((c) => c.close) || initialValue || [];
   const change = priceChange(candles);
   const changePercentage = priceChangePercentage(candles);
 

libs/markets/src/lib/components/last-24h-volume/last-24h-volume.tsx

@@ -2,7 +2,6 @@ import { calcCandleVolume, calcCandleVolumePrice } from '../../market-utils';
 import {
   addDecimalsFormatNumber,
   formatNumber,
-  getDateTimeFormat,
   isNumeric,
 } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
@@ -27,17 +26,15 @@ export const Last24hVolume = ({
   quoteUnit,
 }: Props) => {
   const t = useT();
-  const { oneDayCandles, fiveDaysCandles, error } = useCandles({
+  const { oneDayCandles, fiveDaysCandles } = useCandles({
     marketId,
   });
 
-  const nonIdeal = <span>{'-'}</span>;
-
-  if (error || !oneDayCandles || !fiveDaysCandles) {
-    return nonIdeal;
-  }
-
-  if (fiveDaysCandles.length < 24) {
+  if (
+    fiveDaysCandles &&
+    fiveDaysCandles.length > 0 &&
+    (!oneDayCandles || oneDayCandles?.length === 0)
+  ) {
     const candleVolume = calcCandleVolume(fiveDaysCandles);
     const candleVolumePrice = calcCandleVolumePrice(
       fiveDaysCandles,
@@ -58,59 +55,14 @@ export const Last24hVolume = ({
           <div>
             <span className="flex flex-col">
               {t(
-                'Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}',
-                {
-                  start: getDateTimeFormat().format(
-                    new Date(fiveDaysCandles[0].periodStart)
-                  ),
-                  end: getDateTimeFormat().format(
-                    new Date(
-                      fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
-                    )
-                  ),
-                  candleVolumeValue,
-                  candleVolumePrice,
-                  quoteUnit,
-                }
-              )}
-            </span>
-          </div>
-        }
-      >
-        <span>{nonIdeal}</span>
-      </Tooltip>
-    );
-  }
-
-  if (oneDayCandles.length < 24) {
-    const candleVolume = calcCandleVolume(fiveDaysCandles);
-    const candleVolumePrice = calcCandleVolumePrice(
-      fiveDaysCandles,
-      marketDecimals,
-      positionDecimalPlaces
-    );
-    const candleVolumeValue =
-      candleVolume && isNumeric(positionDecimalPlaces)
-        ? addDecimalsFormatNumber(
-            candleVolume,
-            positionDecimalPlaces,
-            formatDecimals
-          )
-        : '-';
-    return (
-      <Tooltip
-        description={
-          <div>
-            <span className="flex flex-col">
-              {t(
-                '24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of ({{candleVolumePrice}} {{quoteUnit}})',
+                '24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} ({{candleVolumePrice}} {{quoteUnit}})',
                 { candleVolumeValue, candleVolumePrice, quoteUnit }
               )}
             </span>
           </div>
         }
       >
-        <span>{nonIdeal}</span>
+        <span>-</span>
       </Tooltip>
     );
   }

libs/markets/src/lib/components/market-info/MarketInfo.graphql

@@ -171,10 +171,6 @@ query MarketInfo($marketId: ID!) {
         infrastructureFee
         liquidityFee
       }
-      liquidityFeeSettings {
-        feeConstant
-        method
-      }
     }
     priceMonitoringSettings {
       parameters {

libs/markets/src/lib/components/market-info/market-info-accordion.tsx

@@ -28,7 +28,6 @@ import {
   InsurancePoolInfoPanel,
   KeyDetailsInfoPanel,
   LiquidationStrategyInfoPanel,
-  LiquidityFeesSettings,
   LiquidityInfoPanel,
   LiquidityMonitoringParametersInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -301,11 +300,6 @@ export const MarketInfoAccordion = ({
             }
             content={<LiquiditySLAParametersInfoPanel market={market} />}
           />
-          <AccordionItem
-            itemId="lp-fee-settings"
-            title={t('Liquidity fee settings')}
-            content={<LiquidityFeesSettings market={market} />}
-          />
           <AccordionItem
             itemId="liquidity"
             title={t('Liquidity')}

libs/markets/src/lib/components/market-info/market-info-panels.tsx

@@ -44,8 +44,6 @@ import type {
 } from '@vegaprotocol/types';
 import {
   ConditionOperatorMapping,
-  LiquidityFeeMethodMapping,
-  LiquidityFeeMethodMappingDescription,
   MarketStateMapping,
   MarketTradingModeMapping,
 } from '@vegaprotocol/types';
@@ -56,7 +54,6 @@ import {
   TOKEN_PROPOSAL,
   useEnvironment,
   useLinks,
-  DocsLinks,
 } from '@vegaprotocol/environment';
 import type { Provider } from '../../oracle-schema';
 import { OracleBasicProfile } from '../../components/oracle-basic-profile';
@@ -113,44 +110,6 @@ export const CurrentFeesInfoPanel = ({ market }: MarketInfoProps) => {
   );
 };
 
-export const LiquidityFeesSettings = ({ market }: MarketInfoProps) => {
-  const t = useT();
-  return (
-    <>
-      <MarketInfoTable
-        data={{
-          feeConstant: market.fees.liquidityFeeSettings?.feeConstant,
-          method: market.fees.liquidityFeeSettings && (
-            <Tooltip
-              description={
-                LiquidityFeeMethodMappingDescription[
-                  market.fees.liquidityFeeSettings?.method
-                ]
-              }
-            >
-              <span>
-                {
-                  LiquidityFeeMethodMapping[
-                    market.fees.liquidityFeeSettings?.method
-                  ]
-                }
-              </span>
-            </Tooltip>
-          ),
-        }}
-      />
-      <p className="text-xs">
-        <ExternalLink
-          href={DocsLinks?.LIQUIDITY_FEE_PERCENTAGE}
-          className="mt-2"
-        >
-          {t('Fore more info, visit the documentation')}
-        </ExternalLink>
-      </p>
-    </>
-  );
-};
-
 export const MarketPriceInfoPanel = ({ market }: MarketInfoProps) => {
   const t = useT();
   const assetSymbol = getAsset(market).symbol;

libs/markets/src/lib/components/market-info/tooltip-mapping.tsx

@@ -16,6 +16,7 @@ export const useTooltipMapping: () => Record<string, ReactNode> = () => {
     infrastructureFee: t(
       'Fees paid to validators as a reward for running the infrastructure of the network.'
     ),
+
     markPrice: t(
       'A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.'
     ),
@@ -153,9 +154,5 @@ export const useTooltipMapping: () => Record<string, ReactNode> = () => {
     minProbabilityOfTradingLPOrders: t(
       'The lower bound for the probability of trading calculation, used to measure liquidity available on a market to determine if LPs are meeting their commitment. This is a network parameter.'
     ),
-    method: t(`The method used to calculate the market's liquidity fee.`),
-    feeConstant: t(
-      'The constant liquidity fee used when using the constant fee method .'
-    ),
   };
 };

libs/markets/src/lib/components/oracle-full-profile/oracle-full-profile.tsx

@@ -240,7 +240,7 @@ export const OracleFullProfile = ({
           <div className="font-alpha calt dark:text-vega-light-300 text-vega-dark-300 mb-2 grid grid-cols-4 gap-1 uppercase">
             <div className="col-span-1">{t('Market')}</div>
             <div className="col-span-1">{t('Status')}</div>
-            <div className="col-span-2">{t('Specifications')}</div>
+            <div className="col-span-1">{t('Specifications')}</div>
           </div>
           <div className="max-h-60 overflow-auto">
             {oracleMarkets?.map((market) => (

libs/markets/src/lib/hooks/use-candles.spec.ts

@@ -15,6 +15,7 @@ const mockData = [
     periodStart: today.toISOString(),
     __typename: 'Candle',
   },
+  null,
   {
     high: '6309988',
     low: '6296335',

libs/markets/src/lib/hooks/use-candles.ts

@@ -18,12 +18,7 @@ export const useCandles = ({ marketId }: { marketId?: string }) => {
     skip: !marketId,
   });
 
-  const fiveDaysCandles = data?.filter((c) => {
-    if (c.open === '' || c.close === '' || c.high === '' || c.close === '') {
-      return false;
-    }
-    return true;
-  });
+  const fiveDaysCandles = data?.filter(Boolean);
 
   const oneDayCandles = fiveDaysCandles?.filter((candle) =>
     isCandleLessThan24hOld(candle, yesterday)

libs/markets/src/lib/markets.graphql

@@ -12,10 +12,6 @@ fragment MarketFields on Market {
       infrastructureFee
       liquidityFee
     }
-    liquidityFeeSettings {
-      feeConstant
-      method
-    }
   }
   tradableInstrument {
     instrument {

libs/markets/src/lib/markets.mock.ts

@@ -52,11 +52,6 @@ export const createMarketFragment = (
         infrastructureFee: '',
         liquidityFee: '',
       },
-      liquidityFeeSettings: {
-        __typename: 'LiquidityFeeSettings',
-        method: Schema.LiquidityFeeMethod.METHOD_MARGINAL_COST,
-        feeConstant: '',
-      },
     },
     tradableInstrument: {
       instrument: {

libs/positions/src/lib/Positions.graphql

@@ -48,7 +48,7 @@ query EstimatePosition(
   $orderMarginAccountBalance: String!
   $marginMode: MarginMode!
   $marginFactor: String
-  $includeRequiredPositionMarginInAvailableCollateral: Boolean
+  $includeCollateralIncreaseInAvailableCollateral: Boolean
 ) {
   estimatePosition(
     marketId: $marketId
@@ -60,7 +60,7 @@ query EstimatePosition(
     orderMarginAccountBalance: $orderMarginAccountBalance
     marginMode: $marginMode
     marginFactor: $marginFactor
-    includeRequiredPositionMarginInAvailableCollateral: $includeRequiredPositionMarginInAvailableCollateral
+    includeCollateralIncreaseInAvailableCollateral: $includeCollateralIncreaseInAvailableCollateral
     # Everywhere in the codebase we expect price values of the underlying to have the right
     # number of digits for formatting with market.decimalPlaces. By default the estimatePosition
     # query will return a full value requiring formatting using asset.decimals. For consistency

libs/positions/src/lib/__generated__/Positions.ts

@@ -29,7 +29,7 @@ export type EstimatePositionQueryVariables = Types.Exact<{
   orderMarginAccountBalance: Types.Scalars['String'];
   marginMode: Types.MarginMode;
   marginFactor?: Types.InputMaybe<Types.Scalars['String']>;
-  includeRequiredPositionMarginInAvailableCollateral?: Types.InputMaybe<Types.Scalars['Boolean']>;
+  includeCollateralIncreaseInAvailableCollateral?: Types.InputMaybe<Types.Scalars['Boolean']>;
 }>;
 
 
@@ -130,7 +130,7 @@ export function usePositionsSubscriptionSubscription(baseOptions: Apollo.Subscri
 export type PositionsSubscriptionSubscriptionHookResult = ReturnType<typeof usePositionsSubscriptionSubscription>;
 export type PositionsSubscriptionSubscriptionResult = Apollo.SubscriptionResult<PositionsSubscriptionSubscription>;
 export const EstimatePositionDocument = gql`
-    query EstimatePosition($marketId: ID!, $openVolume: String!, $averageEntryPrice: String!, $orders: [OrderInfo!], $marginAccountBalance: String!, $generalAccountBalance: String!, $orderMarginAccountBalance: String!, $marginMode: MarginMode!, $marginFactor: String, $includeRequiredPositionMarginInAvailableCollateral: Boolean) {
+    query EstimatePosition($marketId: ID!, $openVolume: String!, $averageEntryPrice: String!, $orders: [OrderInfo!], $marginAccountBalance: String!, $generalAccountBalance: String!, $orderMarginAccountBalance: String!, $marginMode: MarginMode!, $marginFactor: String, $includeCollateralIncreaseInAvailableCollateral: Boolean) {
   estimatePosition(
     marketId: $marketId
     openVolume: $openVolume
@@ -141,7 +141,7 @@ export const EstimatePositionDocument = gql`
     orderMarginAccountBalance: $orderMarginAccountBalance
     marginMode: $marginMode
     marginFactor: $marginFactor
-    includeRequiredPositionMarginInAvailableCollateral: $includeRequiredPositionMarginInAvailableCollateral
+    includeCollateralIncreaseInAvailableCollateral: $includeCollateralIncreaseInAvailableCollateral
     scaleLiquidationPriceToMarketDecimals: true
   ) {
     collateralIncreaseEstimate {
@@ -185,7 +185,7 @@ export const EstimatePositionDocument = gql`
  *      orderMarginAccountBalance: // value for 'orderMarginAccountBalance'
  *      marginMode: // value for 'marginMode'
  *      marginFactor: // value for 'marginFactor'
- *      includeRequiredPositionMarginInAvailableCollateral: // value for 'includeRequiredPositionMarginInAvailableCollateral'
+ *      includeCollateralIncreaseInAvailableCollateral: // value for 'includeCollateralIncreaseInAvailableCollateral'
  *   },
  * });
  */

libs/positions/src/lib/use-open-volume.ts

@@ -1,7 +1,7 @@
 import { useState, useCallback } from 'react';
 import {
+  OpenVolumeData,
   openVolumeDataProvider,
-  type OpenVolumeData,
 } from './positions-data-providers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 

libs/proposals/src/components/protocol-upgrade-in-progress-notification.tsx

@@ -4,6 +4,7 @@ import {
   ExternalLink,
   Intent,
   NotificationBanner,
+  SHORT,
 } from '@vegaprotocol/ui-toolkit';
 import type { StoredNextProtocolUpgradeData } from '../lib';
 import {
@@ -69,7 +70,7 @@ export const ProtocolUpgradeInProgressNotification = () => {
   if (!upgradeInProgress) return null;
 
   return (
-    <NotificationBanner intent={Intent.Danger}>
+    <NotificationBanner intent={Intent.Danger} className={SHORT}>
       <div className="uppercase">
         {t('The network is being upgraded to {{vegaReleaseTag}}', {
           vegaReleaseTag,

libs/types/src/__generated__/types.ts

@@ -14,32 +14,6 @@ export type Scalars = {
   Timestamp: any;
 };
 
-/** Margins for a hypothetical position not related to any existing party */
-export type AbstractMarginLevels = {
-  __typename?: 'AbstractMarginLevels';
-  /** Asset for the current margins */
-  asset: Asset;
-  /**
-   * If the margin of the party is greater than this level, then collateral will be released from the margin account into
-   * the general account of the party for the given asset.
-   */
-  collateralReleaseLevel: Scalars['String'];
-  /** This is the minimum margin required for a party to place a new order on the network, expressed as unsigned integer */
-  initialLevel: Scalars['String'];
-  /** Minimal margin for the position to be maintained in the network (unsigned integer) */
-  maintenanceLevel: Scalars['String'];
-  /** Margin factor, only relevant for isolated margin mode, else 0 */
-  marginFactor: Scalars['String'];
-  /** Margin mode of the party, cross margin or isolated margin */
-  marginMode: MarginMode;
-  /** Market in which the margin is required for this party */
-  market: Market;
-  /** When in isolated margin, the required order margin level, otherwise, 0 */
-  orderMarginLevel: Scalars['String'];
-  /** If the margin is between maintenance and search, the network will initiate a collateral search, expressed as unsigned integer */
-  searchLevel: Scalars['String'];
-};
-
 /** An account record */
 export type AccountBalance = {
   __typename?: 'AccountBalance';
@@ -385,8 +359,6 @@ export enum AuctionTrigger {
 
 export type BatchProposal = {
   __typename?: 'BatchProposal';
-  /** Terms of all the proposals in the batch */
-  batchTerms?: Maybe<BatchProposalTerms>;
   /** RFC3339Nano time and date when the proposal reached the network */
   datetime: Scalars['Timestamp'];
   /** Details of the rejection reason */
@@ -417,10 +389,10 @@ export type BatchProposal = {
   votes: ProposalVotes;
 };
 
-/** The terms for the batch proposal */
+/** The rationale for the proposal */
 export type BatchProposalTerms = {
   __typename?: 'BatchProposalTerms';
-  /** Actual changes being introduced by the batch proposal - actions the proposal triggers if passed and enacted. */
+  /** Actual changes being introduced by the proposal - actions the proposal triggers if passed and enacted. */
   changes: Array<Maybe<BatchProposalTermsChange>>;
   /**
    * RFC3339Nano time and date when voting closes for this proposal.
@@ -559,22 +531,6 @@ export type CompositePriceConfiguration = {
   decayWeight: Scalars['String'];
 };
 
-export type CompositePriceSource = {
-  __typename?: 'CompositePriceSource';
-  /** The source of the price */
-  PriceSource: Scalars['String'];
-  /** The last time the price source was updated in RFC3339Nano */
-  lastUpdated: Scalars['Timestamp'];
-  /** The current value of the composite source price */
-  price: Scalars['String'];
-};
-
-export type CompositePriceState = {
-  __typename?: 'CompositePriceState';
-  /** Underlying state of the composite price */
-  priceSources?: Maybe<Array<CompositePriceSource>>;
-};
-
 export enum CompositePriceType {
   /** Composite price is set to the last trade (legacy) */
   COMPOSITE_PRICE_TYPE_LAST_TRADE = 'COMPOSITE_PRICE_TYPE_LAST_TRADE',
@@ -2209,9 +2165,9 @@ export type MarginEdge = {
 export type MarginEstimate = {
   __typename?: 'MarginEstimate';
   /** Margin level estimate assuming no slippage */
-  bestCase: AbstractMarginLevels;
+  bestCase: MarginLevels;
   /** Margin level estimate assuming slippage cap is applied */
-  worstCase: AbstractMarginLevels;
+  worstCase: MarginLevels;
 };
 
 /** Margins for a given a party */
@@ -2483,8 +2439,6 @@ export type MarketData = {
   liquidityProviderSla?: Maybe<Array<LiquidityProviderSLA>>;
   /** The mark price (an unsigned integer) */
   markPrice: Scalars['String'];
-  /** State of the underlying internal composite price */
-  markPriceState?: Maybe<CompositePriceState>;
   /** The methodology used for the calculation of the mark price */
   markPriceType: CompositePriceType;
   /** Market of the associated mark price */
@@ -3099,8 +3053,6 @@ export type ObservableMarketData = {
   liquidityProviderSla?: Maybe<Array<ObservableLiquidityProviderSLA>>;
   /** The mark price (an unsigned integer) */
   markPrice: Scalars['String'];
-  /** State of the underlying internal composite price */
-  markPriceState?: Maybe<CompositePriceState>;
   /** The methodology used to calculated mark price */
   markPriceType: CompositePriceType;
   /** The market growth factor for the last market time window */
@@ -4069,8 +4021,6 @@ export type PerpetualData = {
   fundingRate?: Maybe<Scalars['String']>;
   /** Internal composite price used as input to the internal VWAP */
   internalCompositePrice: Scalars['String'];
-  /** The internal state of the underlying internal composite price */
-  internalCompositePriceState?: Maybe<CompositePriceState>;
   /** The methodology used to calculated internal composite price for perpetual markets */
   internalCompositePriceType: CompositePriceType;
   /** Time-weighted average price calculated from data points for this period from the internal data source. */
@@ -4081,8 +4031,6 @@ export type PerpetualData = {
   seqNum: Scalars['Int'];
   /** Time at which the funding period started */
   startTime: Scalars['Timestamp'];
-  /** The last value from the external oracle */
-  underlyingIndexPrice: Scalars['String'];
 };
 
 export type PerpetualProduct = {
@@ -4380,7 +4328,7 @@ export type ProposalDetail = {
   __typename?: 'ProposalDetail';
   /** Batch proposal ID that is provided by Vega once proposal reaches the network */
   batchId?: Maybe<Scalars['ID']>;
-  /** Terms of all the proposals in the batch */
+  /** Terms of the proposal for a batch proposal */
   batchTerms?: Maybe<BatchProposalTerms>;
   /** RFC3339Nano time and date when the proposal reached the Vega network */
   datetime: Scalars['Timestamp'];
@@ -4406,7 +4354,7 @@ export type ProposalDetail = {
   requiredParticipation: Scalars['String'];
   /** State of the proposal */
   state: ProposalState;
-  /** Terms of the proposal */
+  /** Terms of the proposal for proposal */
   terms?: Maybe<ProposalTerms>;
 };
 
@@ -5067,7 +5015,7 @@ export type QueryestimateOrderArgs = {
 export type QueryestimatePositionArgs = {
   averageEntryPrice: Scalars['String'];
   generalAccountBalance: Scalars['String'];
-  includeRequiredPositionMarginInAvailableCollateral?: InputMaybe<Scalars['Boolean']>;
+  includeCollateralIncreaseInAvailableCollateral?: InputMaybe<Scalars['Boolean']>;
   marginAccountBalance: Scalars['String'];
   marginFactor?: InputMaybe<Scalars['String']>;
   marginMode: MarginMode;

libs/types/src/global-types-mappings.ts

@@ -1,13 +1,12 @@
-import {
-  type LiquidityFeeMethod,
-  type ConditionOperator,
-  type EntityScope,
-  type GovernanceTransferKind,
-  type GovernanceTransferType,
-  type IndividualScope,
-  type PeggedReference,
-  type ProposalChange,
-  type TransferStatus,
+import type {
+  ConditionOperator,
+  EntityScope,
+  GovernanceTransferKind,
+  GovernanceTransferType,
+  IndividualScope,
+  PeggedReference,
+  ProposalChange,
+  TransferStatus,
 } from './__generated__/types';
 import type { AccountType } from './__generated__/types';
 import type {
@@ -735,23 +734,3 @@ export const ProposalProductTypeShortName: Record<ProposalProductType, string> =
     SpotProduct: 'Spot',
     PerpetualProduct: 'Perp',
   };
-
-export const LiquidityFeeMethodMapping: { [e in LiquidityFeeMethod]: string } =
-  {
-    /** Fee is set by the market to a constant value irrespective of any liquidity provider's nominated fee */
-    METHOD_CONSTANT: 'Constant',
-    /** Fee is smallest value of all bids, such that liquidity providers with nominated fees less than or equal to this value still have sufficient commitment to fulfil the market's target stake. */
-    METHOD_MARGINAL_COST: 'Marginal cost',
-    METHOD_UNSPECIFIED: 'Unspecified',
-    /** Fee is the weighted average of all liquidity providers' nominated fees, weighted by their commitment */
-    METHOD_WEIGHTED_AVERAGE: 'Weighted average',
-  };
-
-export const LiquidityFeeMethodMappingDescription: {
-  [e in LiquidityFeeMethod]: string;
-} = {
-  METHOD_CONSTANT: `This liquidity fee is a constant value, set in the market parameters, and overrides the liquidity providers' nominated fees.`,
-  METHOD_MARGINAL_COST: `This liquidity fee factor is determined by sorting all LP fee bids from lowest to highest, with LPs' commitments tallied up to the point of fulfilling the market's target stake. The last LP's bid becomes the fee factor.`,
-  METHOD_UNSPECIFIED: 'Unspecified',
-  METHOD_WEIGHTED_AVERAGE: `This liquidity fee is the weighted average of all liquidity providers' nominated fees, weighted by their commitment.`,
-};

libs/ui-toolkit/src/components/dialog/dialog.tsx

@@ -38,7 +38,7 @@ export function Dialog({
   );
   const wrapperClasses = classNames(
     // Dimensions
-    'max-w-[95vw] sm:max-w-[90vw] p-4 md:p-8',
+    'w-screen sm:max-w-[90vw] p-4 md:p-8',
     // Need to apply background and text colors again as content is rendered in a portal
     'dark:bg-black bg-white dark:text-white',
     getIntentBorder(intent),

libs/ui-toolkit/src/components/notification-banner/notification-banner.tsx

@@ -4,6 +4,8 @@ import { Intent } from '../../utils/intent';
 import { Icon, VegaIcon, VegaIconNames } from '../icon';
 import type { HTMLAttributes } from 'react';
 
+export const SHORT = '!px-1 !py-1 min-h-fit';
+
 interface NotificationBannerProps {
   intent?: Intent;
   children?: React.ReactNode;
@@ -21,7 +23,7 @@ export const NotificationBanner = ({
   return (
     <div
       className={classNames(
-        'flex items-center border-b pl-3 pr-2',
+        'flex items-center border-b px-2',
         'text-xs leading-tight font-normal',
         {
           'bg-vega-light-100 dark:bg-vega-dark-100 ': intent === Intent.None,