fix: update test_teams.py

Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>

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/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-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/trading/components/competitions/games-container.tsx

@@ -1,6 +1,11 @@
 import { type TransferNode } from '@vegaprotocol/types';
-import { ActiveRewardCard } from '../rewards-container/active-rewards';
+import {
+  ActiveRewardCard,
+  isActiveReward,
+} 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,
@@ -10,8 +15,35 @@ 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();
 
-  if (!data || data.length === 0) {
+  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) {
     return (
       <p className="mb-6 text-muted">
         {t('There are currently no games available.')}
@@ -21,7 +53,7 @@ export const GamesContainer = ({
 
   return (
     <div className="mb-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-      {data.map((game, i) => {
+      {enrichedTransfers.map((game, i) => {
         // TODO: Remove `kind` prop from ActiveRewardCard
         const { transfer } = game;
         if (

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-[2rem]">
+            <span className="text-muted text-sm h-[3rem]">
               {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
             </span>
           )}

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

@@ -288,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 • ")
+           ).to_have_text("Price maker fees paid • tDAI")
     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")

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

@@ -86,6 +86,7 @@ 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/trading.json

@@ -110,6 +110,7 @@
   "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.",

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

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

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

@@ -28,6 +28,7 @@ import {
   InsurancePoolInfoPanel,
   KeyDetailsInfoPanel,
   LiquidationStrategyInfoPanel,
+  LiquidityFeesSettings,
   LiquidityInfoPanel,
   LiquidityMonitoringParametersInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -300,6 +301,11 @@ 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,6 +44,8 @@ import type {
 } from '@vegaprotocol/types';
 import {
   ConditionOperatorMapping,
+  LiquidityFeeMethodMapping,
+  LiquidityFeeMethodMappingDescription,
   MarketStateMapping,
   MarketTradingModeMapping,
 } from '@vegaprotocol/types';
@@ -54,6 +56,7 @@ import {
   TOKEN_PROPOSAL,
   useEnvironment,
   useLinks,
+  DocsLinks,
 } from '@vegaprotocol/environment';
 import type { Provider } from '../../oracle-schema';
 import { OracleBasicProfile } from '../../components/oracle-basic-profile';
@@ -110,6 +113,44 @@ 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,7 +16,6 @@ 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.'
     ),
@@ -154,5 +153,9 @@ 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-1">{t('Specifications')}</div>
+            <div className="col-span-2">{t('Specifications')}</div>
           </div>
           <div className="max-h-60 overflow-auto">
             {oracleMarkets?.map((market) => (

libs/markets/src/lib/markets.graphql

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

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

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

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

@@ -1,12 +1,13 @@
-import type {
-  ConditionOperator,
-  EntityScope,
-  GovernanceTransferKind,
-  GovernanceTransferType,
-  IndividualScope,
-  PeggedReference,
-  ProposalChange,
-  TransferStatus,
+import {
+  type LiquidityFeeMethod,
+  type ConditionOperator,
+  type EntityScope,
+  type GovernanceTransferKind,
+  type GovernanceTransferType,
+  type IndividualScope,
+  type PeggedReference,
+  type ProposalChange,
+  type TransferStatus,
 } from './__generated__/types';
 import type { AccountType } from './__generated__/types';
 import type {
@@ -734,3 +735,23 @@ 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.`,
+};