fix: use aggregation epochs and update tests

apps/trading/.env

@@ -26,6 +26,7 @@ NX_ICEBERG_ORDERS=true
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
 # NX_DISABLE_CLOSE_POSITION=false
+NX_TEAM_COMPETITION=true
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/trading/.env.devnet

@@ -28,3 +28,8 @@ NX_REFERRALS=true
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
+
+NX_TEAM_COMPETITION=true
+
+NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
+NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=

apps/trading/.env.testnet

@@ -26,6 +26,7 @@ NX_ISOLATED_MARGIN=true
 NX_ICEBERG_ORDERS=true
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
+NX_TEAM_COMPETITION=true
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

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

@@ -94,7 +94,12 @@ const TeamPage = ({
       <header className="flex gap-3 lg:gap-4 pt-5 lg:pt-10">
         <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>
+          <h1
+            className="calt text-2xl lg:text-3xl xl:text-5xl"
+            data-testid="team-name"
+          >
+            {team.name}
+          </h1>
           <JoinTeam team={team} partyTeam={partyTeam} refetch={refetch} />
           <UpdateTeamButton team={team} />
         </div>
@@ -102,10 +107,18 @@ const TeamPage = ({
       <TeamStats stats={stats} members={members} games={games} />
       <section>
         <div className="flex gap-4 lg:gap-8 mb-4 border-b border-default">
-          <ToggleButton active={showGames} onClick={() => setShowGames(true)}>
+          <ToggleButton
+            active={showGames}
+            onClick={() => setShowGames(true)}
+            data-testid="games-toggle"
+          >
             {t('Games ({{count}})', { count: games ? games.length : 0 })}
           </ToggleButton>
-          <ToggleButton active={!showGames} onClick={() => setShowGames(false)}>
+          <ToggleButton
+            active={!showGames}
+            onClick={() => setShowGames(false)}
+            data-testid="members-toggle"
+          >
             {t('Members ({{count}})', {
               count: members ? members.length : 0,
             })}
@@ -131,16 +144,22 @@ const Games = ({ games }: { games?: TeamGame[] }) => {
         {
           name: 'epoch',
           displayName: t('Epoch'),
-          headerClassName: 'hidden md:block',
-          className: 'hidden md:block',
+          headerClassName: 'hidden md:table-cell',
+          className: 'hidden md:table-cell',
         },
         { name: 'type', displayName: t('Type') },
         { name: 'amount', displayName: t('Amount earned') },
         {
-          name: 'teams',
+          name: 'participatingTeams',
           displayName: t('No. of participating teams'),
-          headerClassName: 'hidden md:block',
-          className: 'hidden md:block',
+          headerClassName: 'hidden md:table-cell',
+          className: 'hidden md:table-cell',
+        },
+        {
+          name: 'participatingMembers',
+          displayName: t('No. of participating members'),
+          headerClassName: 'hidden md:table-cell',
+          className: 'hidden md:table-cell',
         },
       ]}
       data={games.map((game) => ({
@@ -148,7 +167,8 @@ const Games = ({ games }: { games?: TeamGame[] }) => {
         epoch: game.epoch,
         type: DispatchMetricLabels[game.team.rewardMetric as DispatchMetric],
         amount: formatNumber(game.team.totalRewardsEarned),
-        teams: game.numberOfParticipants,
+        participatingTeams: game.entities.length,
+        participatingMembers: game.numberOfParticipants,
       }))}
       noCollapse={true}
     />

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

@@ -30,35 +30,42 @@ export const TeamStats = ({
     <>
       <StatSection>
         <StatList>
-          <Stat value={members ? members.length : 0} label={t('Members')} />
+          <Stat
+            value={members ? members.length : 0}
+            label={t('Members')}
+            valueTestId="members-count-stat"
+          />
           <Stat
             value={stats ? stats.totalGamesPlayed : 0}
             label={t('Total games')}
             tooltip={t('Total number of games this team has participated in')}
+            valueTestId="total-games-stat"
           />
           <StatSectionSeparator />
           <Stat
             value={
               stats
                 ? formatNumberRounded(
-                    new BigNumber(stats.totalQuantumVolume),
+                    new BigNumber(stats.totalQuantumVolume || 0),
                     '1e3'
                   )
                 : 0
             }
             label={t('Total volume')}
+            valueTestId="total-volume-stat"
           />
           <Stat
             value={
               stats
                 ? formatNumberRounded(
-                    new BigNumber(stats.totalQuantumRewards),
+                    new BigNumber(stats.totalQuantumRewards || 0),
                     '1e3'
                   )
                 : 0
             }
-            label={t('Rewards paid')}
+            label={t('Rewards paid out')}
             tooltip={'Total amount of rewards paid out to this team in qUSD'}
+            valueTestId="rewards-paid-stat"
           />
         </StatList>
       </StatSection>
@@ -159,14 +166,18 @@ const Stat = ({
   value,
   label,
   tooltip,
+  valueTestId,
 }: {
   value: ReactNode;
   label: ReactNode;
   tooltip?: string;
+  valueTestId?: string;
 }) => {
   return (
     <div>
-      <dd className="text-3xl lg:text-4xl">{value}</dd>
+      <dd className="text-3xl lg:text-4xl" data-testid={valueTestId}>
+        {value}
+      </dd>
       <dt className="text-sm text-muted">
         {tooltip ? (
           <Tooltip description={tooltip} underline={false}>

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

@@ -12,6 +12,7 @@ import {
   VegaIconNames,
   TradingInput,
   TinyScroll,
+  truncateMiddle,
 } from '@vegaprotocol/ui-toolkit';
 import { IconNames } from '@blueprintjs/icons';
 import {
@@ -30,6 +31,9 @@ import {
   DispatchMetricLabels,
   EntityScopeLabelMapping,
   MarketState,
+  type DispatchStrategy,
+  IndividualScopeMapping,
+  IndividualScopeDescriptionMapping,
 } from '@vegaprotocol/types';
 import { Card } from '../card/card';
 import { useMemo, useState } from 'react';
@@ -308,6 +312,9 @@ export const ActiveRewardCard = ({
         MarketState.STATE_CLOSED,
       ].includes(m.state)
   );
+  if (marketSettled) {
+    return null;
+  }
 
   const assetInSettledMarket =
     allMarkets &&
@@ -326,10 +333,6 @@ export const ActiveRewardCard = ({
       return false;
     });
 
-  if (marketSettled) {
-    return null;
-  }
-
   // Gray out the cards that are related to suspended markets
   const suspended = transferNode.markets?.some(
     (m) =>
@@ -359,6 +362,7 @@ export const ActiveRewardCard = ({
       : getGradientClasses(dispatchStrategy.dispatchMetric);
 
   const entityScope = dispatchStrategy.entityScope;
+
   return (
     <div>
       <div
@@ -474,83 +478,127 @@ export const ActiveRewardCard = ({
               </span>
             }
           </div>
-
           {dispatchStrategy?.dispatchMetric && (
             <span className="text-muted text-sm h-[2rem]">
               {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
             </span>
           )}
-
           <span className="border-[0.5px] border-gray-700" />
-
-          <div className="flex justify-between flex-wrap items-center gap-3 text-xs">
-            <span className="flex flex-col gap-1">
-              <span className="flex items-center gap-1 text-muted">
-                {t('Entity scope')}{' '}
-              </span>
-
-              <span className="flex items-center gap-1">
-                {kind.dispatchStrategy?.teamScope && (
-                  <Tooltip
-                    description={
-                      <span>{kind.dispatchStrategy?.teamScope}</span>
-                    }
-                  >
-                    <span className="flex items-center p-1 rounded-full border border-gray-600">
-                      {<VegaIcon name={VegaIconNames.TEAM} size={16} />}
-                    </span>
-                  </Tooltip>
-                )}
-                {kind.dispatchStrategy?.individualScope && (
-                  <Tooltip
-                    description={
-                      <span>{kind.dispatchStrategy?.individualScope}</span>
-                    }
-                  >
-                    <span className="flex items-center p-1 rounded-full border border-gray-600">
-                      {<VegaIcon name={VegaIconNames.MAN} size={16} />}
-                    </span>
-                  </Tooltip>
-                )}
-                {/* Shows transfer status */}
-                {/* <StatusIndicator
-                  status={transfer.status}
-                  reason={transfer.reason}
-                /> */}
-              </span>
-            </span>
-
-            <span className="flex flex-col gap-1">
-              <span className="flex items-center gap-1 text-muted">
-                {t('Staked VEGA')}{' '}
-              </span>
-              <span className="flex items-center gap-1">
-                {addDecimalsFormatNumber(
-                  kind.dispatchStrategy?.stakingRequirement || 0,
-                  transfer.asset?.decimals || 0
-                )}
-              </span>
-            </span>
-
-            <span className="flex flex-col gap-1">
-              <span className="flex items-center gap-1 text-muted">
-                {t('Average position')}{' '}
-              </span>
-              <span className="flex items-center gap-1">
-                {addDecimalsFormatNumber(
-                  kind.dispatchStrategy
-                    ?.notionalTimeWeightedAveragePositionRequirement || 0,
-                  transfer.asset?.decimals || 0
-                )}
-              </span>
-            </span>
-          </div>
+          {kind.dispatchStrategy && (
+            <RewardRequirements
+              dispatchStrategy={kind.dispatchStrategy}
+              assetDecimalPlaces={transfer.asset?.decimals}
+            />
+          )}
         </div>
       </div>
     </div>
   );
 };
 
+const RewardRequirements = ({
+  dispatchStrategy,
+  assetDecimalPlaces = 0,
+}: {
+  dispatchStrategy: DispatchStrategy;
+  assetDecimalPlaces: number | undefined;
+}) => {
+  const t = useT();
+
+  return (
+    <dl className="flex justify-between flex-wrap items-center gap-3 text-xs">
+      <div className="flex flex-col gap-1">
+        <dt className="flex items-center gap-1 text-muted">
+          {t('{{entity}} scope', {
+            entity: EntityScopeLabelMapping[dispatchStrategy.entityScope],
+          })}
+        </dt>
+        <dd className="flex items-center gap-1">
+          <RewardEntityScope dispatchStrategy={dispatchStrategy} />
+        </dd>
+      </div>
+
+      <div className="flex flex-col gap-1">
+        <dt className="flex items-center gap-1 text-muted">
+          {t('Staked VEGA')}
+        </dt>
+        <dd className="flex items-center gap-1">
+          {addDecimalsFormatNumber(
+            dispatchStrategy?.stakingRequirement || 0,
+            assetDecimalPlaces
+          )}
+        </dd>
+      </div>
+
+      <div className="flex flex-col gap-1">
+        <dt className="flex items-center gap-1 text-muted">
+          {t('Average position')}
+        </dt>
+        <dd className="flex items-center gap-1">
+          {addDecimalsFormatNumber(
+            dispatchStrategy?.notionalTimeWeightedAveragePositionRequirement ||
+              0,
+            assetDecimalPlaces
+          )}
+        </dd>
+      </div>
+    </dl>
+  );
+};
+
+const RewardEntityScope = ({
+  dispatchStrategy,
+}: {
+  dispatchStrategy: DispatchStrategy;
+}) => {
+  const t = useT();
+
+  if (dispatchStrategy.entityScope === EntityScope.ENTITY_SCOPE_TEAMS) {
+    return (
+      <Tooltip
+        description={
+          dispatchStrategy.teamScope?.length ? (
+            <div className="text-xs">
+              <p className="mb-1">{t('Eligible teams')}</p>
+              <ul>
+                {dispatchStrategy.teamScope.map((teamId) => {
+                  if (!teamId) return null;
+                  return <li key={teamId}>{truncateMiddle(teamId)}</li>;
+                })}
+              </ul>
+            </div>
+          ) : (
+            t('All teams are eligible')
+          )
+        }
+      >
+        <span>
+          {dispatchStrategy.teamScope?.length
+            ? t('Some teams')
+            : t('All teams')}
+        </span>
+      </Tooltip>
+    );
+  }
+
+  if (
+    dispatchStrategy.entityScope === EntityScope.ENTITY_SCOPE_INDIVIDUALS &&
+    dispatchStrategy.individualScope
+  ) {
+    return (
+      <Tooltip
+        description={
+          IndividualScopeDescriptionMapping[dispatchStrategy.individualScope]
+        }
+      >
+        <span>{IndividualScopeMapping[dispatchStrategy.individualScope]}</span>
+      </Tooltip>
+    );
+  }
+
+  return null;
+};
+
 const getGradientClasses = (d: DispatchMetric | undefined) => {
   switch (d) {
     case DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION:

apps/trading/e2e/.env

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

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

@@ -5,6 +5,7 @@ from vega_sim.null_service import VegaServiceNull
 from conftest import init_vega
 from actions.utils import next_epoch
 from fixtures.market import setup_continuous_market
+from conftest import auth_setup, init_page, init_vega, risk_accepted_setup
 from wallet_config import PARTY_A, PARTY_B, PARTY_C, PARTY_D, MM_WALLET
 
 
@@ -13,7 +14,16 @@ def vega(request):
     with init_vega(request) as vega:
         yield vega
 
+@pytest.fixture(scope="module")
+def team_page(vega, browser, request, setup_teams_and_games):
+    with init_page(vega, browser, request) as page:
+        risk_accepted_setup(page)
+        auth_setup(vega, page)
+        team_id = setup_teams_and_games["team_id"]
+        page.goto(f"/#/competitions/teams/{team_id}")
+        yield page
 
+@pytest.fixture(scope="module")
 def setup_teams_and_games(vega: VegaServiceNull):
     tDAI_market = setup_continuous_market(vega)
     tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
@@ -50,6 +60,16 @@ def setup_teams_and_games(vega: VegaServiceNull):
 
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
+
+    current_epoch = vega.statistics().epoch_seq
+    game_start = current_epoch + 1
+    game_end = current_epoch + 11
+
+    current_epoch = vega.statistics().epoch_seq
+    print(f"[EPOCH: {current_epoch}] creating recurring transfer")
+    print(f"Game start: {game_start}")
+    print(f"Game game end: {game_end}")
+
     vega.recurring_transfer(
         from_key_name=PARTY_A.name,
         from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
@@ -62,39 +82,50 @@ def setup_teams_and_games(vega: VegaServiceNull):
         n_top_performers=1,
         amount=100,
         factor=1.0,
+        start_epoch=game_start,
+        end_epoch=game_end,
+        window_length=10
     )
-    vega.submit_order(
-        trading_key=PARTY_B.name,
-        market_id=tDAI_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    vega.submit_order(
-        trading_key=PARTY_A.name,
-        market_id=tDAI_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    next_epoch(vega=vega)
-    return tDAI_market, tDAI_asset_id, team_id, team_name
 
+    next_epoch(vega)
+    print(f"[EPOCH: {vega.statistics().epoch_seq}] starting order activity")
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_teams(vega: VegaServiceNull, page: Page):
-    market_id, asset_id, team_id, team_name = setup_teams_and_games(vega)
-    page.goto(f"/#/competitions/teams/{team_id}")
-    # page.pause()
-    expect(page.get_by_role("heading", level=1)).to_have_text(team_name)
-    expect(page.get_by_text("Members (3)")).to_be_visible()
+    # Team statistics will only return data when team has been active
+    # for DEFAULT_AGGREGATION_EPOCHS epochs
+    #
+    # https://vegaprotocol.slack.com/archives/C02KVKMAE82/p1706635625851769?thread_ts=1706631542.576449&cid=C02KVKMAE82
+
+    # Create trading activity for 10 epochs (which is the default)
+    for i in range(10):
+        vega.submit_order(
+            trading_key=PARTY_B.name,
+            market_id=tDAI_market,
+            order_type="TYPE_MARKET",
+            time_in_force="TIME_IN_FORCE_IOC",
+            side="SIDE_BUY",
+            volume=1,
+        )
+        vega.submit_order(
+            trading_key=PARTY_A.name,
+            market_id=tDAI_market,
+            order_type="TYPE_MARKET",
+            time_in_force="TIME_IN_FORCE_IOC",
+            side="SIDE_BUY",
+            volume=1,
+        )
+        next_epoch(vega)
+        print(f"[EPOCH: {vega.statistics().epoch_seq}] {i} epoch passed")
+
+    return {
+        "market_id": tDAI_market,
+        "asset_id": tDAI_asset_id,
+        "team_id": team_id,
+        "team_name": team_name,
+    }
 
 
 def create_team(vega: VegaServiceNull):
     team_name = "Foobar"
-
     vega.create_referral_set(
         key_name=PARTY_A.name,
         name=team_name,
@@ -104,3 +135,66 @@ def create_team(vega: VegaServiceNull):
     )
 
     return team_name
+
+def test_team_page_games_table(team_page: Page):
+    team_page.get_by_test_id("games-toggle").click()
+    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("1")
+    expect(team_page.get_by_test_id("epoch-0")).to_have_text("18")
+    expect(team_page.get_by_test_id("type-0")).to_have_text("Price maker fees paid")
+    expect(team_page.get_by_test_id("amount-0")).to_have_text("100,000,000")
+    expect(team_page.get_by_test_id("participatingTeams-0")).to_have_text(
+        "1"
+    )
+    expect(team_page.get_by_test_id("participatingMembers-0")).to_have_text(
+        "2"
+    )
+
+def test_team_page_members_table(team_page: Page):
+    team_page.get_by_test_id("members-toggle").click()
+    expect(team_page.get_by_test_id("members-toggle")).to_have_text("Members (3)")
+    expect(team_page.get_by_test_id("referee-0")).to_be_visible()
+    expect(team_page.get_by_test_id("joinedAt-0")).to_be_visible()
+    expect(team_page.get_by_test_id("joinedAtEpoch-0")).to_have_text("8")
+
+def test_team_page_headline(team_page: Page, setup_teams_and_games
+):
+    team_name = setup_teams_and_games["team_name"]
+    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("3")
+
+    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(
+        "100m"
+    )
+
+@pytest.fixture(scope="module")
+def competitions_page(vega, browser, request):
+    with init_page(vega, browser, request) as page:
+        risk_accepted_setup(page)
+        auth_setup(vega, page)
+        yield page
+
+def test_leaderboard(competitions_page: Page, setup_teams_and_games):
+    team_name = setup_teams_and_games["team_name"]
+    competitions_page.goto(f"/#/competitions/")
+    expect(competitions_page.get_by_test_id("rank-0").locator(".text-yellow-300")).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("status-0")).to_have_text("Open")
+
+    expect(competitions_page.get_by_test_id("earned-0")).to_have_text("100,000,000")
+    expect(competitions_page.get_by_test_id("games-0")).to_have_text("1")
+
+    # TODO  still odd that this is 0
+    expect(competitions_page.get_by_test_id("volume-0")).to_have_text("-")
+
+#TODO def test_games(competitions_page: Page):
+#TODO currently no games appear which i think is a bug

apps/trading/lib/hooks/Team.graphql

@@ -51,7 +51,7 @@ fragment TeamGameFields on Game {
   }
 }
 
-query Team($teamId: ID!, $partyId: ID) {
+query Team($teamId: ID!, $partyId: ID, $aggregationEpochs: Int) {
   teams(teamId: $teamId) {
     edges {
       node {
@@ -66,7 +66,7 @@ query Team($teamId: ID!, $partyId: ID) {
       }
     }
   }
-  teamsStatistics(teamId: $teamId) {
+  teamsStatistics(teamId: $teamId, aggregationEpochs: $aggregationEpochs) {
     edges {
       node {
         ...TeamStatsFields

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

@@ -16,6 +16,7 @@ export type TeamGameFieldsFragment = { __typename?: 'Game', id: string, epoch: n
 export type TeamQueryVariables = Types.Exact<{
   teamId: Types.Scalars['ID'];
   partyId?: Types.InputMaybe<Types.Scalars['ID']>;
+  aggregationEpochs?: Types.InputMaybe<Types.Scalars['Int']>;
 }>;
 
 
@@ -80,7 +81,7 @@ export const TeamGameFieldsFragmentDoc = gql`
 }
     ${TeamEntityFragmentDoc}`;
 export const TeamDocument = gql`
-    query Team($teamId: ID!, $partyId: ID) {
+    query Team($teamId: ID!, $partyId: ID, $aggregationEpochs: Int) {
   teams(teamId: $teamId) {
     edges {
       node {
@@ -95,7 +96,7 @@ export const TeamDocument = gql`
       }
     }
   }
-  teamsStatistics(teamId: $teamId) {
+  teamsStatistics(teamId: $teamId, aggregationEpochs: $aggregationEpochs) {
     edges {
       node {
         ...TeamStatsFields
@@ -136,6 +137,7 @@ ${TeamGameFieldsFragmentDoc}`;
  *   variables: {
  *      teamId: // value for 'teamId'
  *      partyId: // value for 'partyId'
+ *      aggregationEpochs: // value for 'aggregationEpochs'
  *   },
  * });
  */

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

@@ -25,9 +25,8 @@ export const useGames = ({
   const games = compact(data?.transfersConnection?.edges?.map((n) => n?.node))
     .map((n) => n as TransferNode)
     .filter((node) => {
-      const recurring = node.transfer.kind.__typename !== 'RecurringTransfer';
       const active = onlyActive ? isActiveReward(node, currentEpoch) : true;
-      return active && recurring && isScopedToTeams(node);
+      return active && isScopedToTeams(node);
     });
 
   return {

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

@@ -7,6 +7,7 @@ import {
   type TeamRefereeFieldsFragment,
   type TeamEntityFragment,
 } from './__generated__/Team';
+import { DEFAULT_AGGREGATION_EPOCHS } from './use-teams';
 
 export type Team = TeamFieldsFragment;
 export type TeamStats = TeamStatsFieldsFragment;
@@ -16,7 +17,11 @@ export type TeamGame = ReturnType<typeof useTeam>['games'][number];
 
 export const useTeam = (teamId?: string, partyId?: string) => {
   const { data, loading, error, refetch } = useTeamQuery({
-    variables: { teamId: teamId || '', partyId },
+    variables: {
+      teamId: teamId || '',
+      partyId,
+      aggregationEpochs: DEFAULT_AGGREGATION_EPOCHS,
+    },
     skip: !teamId,
     fetchPolicy: 'cache-and-network',
   });
@@ -47,6 +52,7 @@ export const useTeam = (teamId?: string, partyId?: string) => {
       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
     };
   });

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

@@ -22,7 +22,7 @@ type UseTeamsArgs = {
   order?: 'asc' | 'desc';
 };
 
-const DEFAULT_AGGREGATION_EPOCHS = 10;
+export const DEFAULT_AGGREGATION_EPOCHS = 10;
 
 export const useTeams = ({
   aggregationEpochs = DEFAULT_AGGREGATION_EPOCHS,

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

@@ -12,6 +12,8 @@
   "Active": "Active",
   "Activity Streak": "Activity Streak",
   "All": "All",
+  "All teams": "All teams",
+  "All teams are eligible": "All teams are eligible",
   "Amount earned": "Amount earned",
   "An unknown error occurred.": "An unknown error occurred.",
   "Anonymous": "Anonymous",
@@ -85,9 +87,11 @@
   "Docs": "Docs",
   "Earn commission & stake rewards": "Earn commission & stake rewards",
   "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",
   "Ends in": "Ends in",
   "Entity scope": "Entity scope",
+  "{{entity}} scope": "{{entity}} scope",
   "Environment not configured": "Environment not configured",
   "Epoch": "Epoch",
   "epochs in referral set": "epochs in referral set",
@@ -209,6 +213,7 @@
   "No third party has access to your funds.": "No third party has access to your funds.",
   "No volume discount program active": "No volume discount program active",
   "No withdrawals": "No withdrawals",
+  "No. of participating members": "No. of participating members",
   "No. of participating teams": "No. of participating teams",
   "Node: {{VEGA_URL}} is unsuitable": "Node: {{VEGA_URL}} is unsuitable",
   "Non-custodial and pseudonymous": "Non-custodial and pseudonymous",
@@ -408,7 +413,7 @@
   "myVolume_other": "My volume (last {{count}} epochs)",
   "numberEpochs": "{{count}} epochs",
   "numberEpochs_one": "{{count}} epoch",
-  "Rewards paid": "Rewards paid",
+  "Rewards paid out": "Rewards paid out",
   "{{reward}}x": "{{reward}}x",
   "userActive": "{{active}} trader: {{count}} epochs so far",
   "volumeLastEpochs": "Volume (last {{count}} epochs)",

libs/types/src/__generated__/types.ts

@@ -1879,12 +1879,8 @@ export type LiquidityFeeSettings = {
 /** Configuration of a market liquidity monitoring parameters */
 export type LiquidityMonitoringParameters = {
   __typename?: 'LiquidityMonitoringParameters';
-  /** Specifies by how many seconds an auction should be extended if leaving the auction were to trigger a liquidity auction */
-  auctionExtensionSecs: Scalars['Int'];
   /** Specifies parameters related to target stake calculation */
   targetStakeParameters: TargetStakeParameters;
-  /** Specifies the triggering ratio for entering liquidity auction */
-  triggeringRatio: Scalars['String'];
 };
 
 /** A special order type for liquidity providers */
@@ -4002,10 +3998,10 @@ export type Perpetual = {
   fundingRateScalingFactor: Scalars['String'];
   /** Upper bound for the funding-rate such that the funding-rate will never be higher than this value */
   fundingRateUpperBound: Scalars['String'];
-  /** Optional configuration driving the index price calculation for perpetual product */
-  indexPriceConfig?: Maybe<CompositePriceConfiguration>;
   /** Continuously compounded interest rate used in funding rate calculation, in the range [-1, 1] */
   interestRate: Scalars['String'];
+  /** Optional configuration driving the internal composite price calculation for perpetual product */
+  internalCompositePriceConfig?: Maybe<CompositePriceConfiguration>;
   /** Controls how much the upcoming funding payment liability contributes to party's margin, in the range [0, 1] */
   marginFundingFactor: Scalars['String'];
   /** Quote name of the instrument */
@@ -4023,14 +4019,14 @@ export type PerpetualData = {
   fundingPayment?: Maybe<Scalars['String']>;
   /** Percentage difference between the time-weighted average price of the external and internal data point. */
   fundingRate?: Maybe<Scalars['String']>;
-  /** The index price used for external VWAP calculation */
-  indexPrice: Scalars['String'];
-  /** The methodology used to calculated index price for perps */
-  indexPriceType: CompositePriceType;
+  /** Internal composite price used as input to the internal VWAP */
+  internalCompositePrice: Scalars['String'];
+  /** 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. */
   internalTwap?: Maybe<Scalars['String']>;
-  /** RFC3339Nano time indicating the next time index price will be calculated for perps where applicable */
-  nextIndexPriceCalc: Scalars['String'];
+  /** RFC3339Nano time indicating the next time internal composite price will be calculated for perpetual markets, where applicable */
+  nextInternalCompositePriceCalc: Scalars['String'];
   /** Funding period sequence number */
   seqNum: Scalars['Int'];
   /** Time at which the funding period started */
@@ -5507,6 +5503,8 @@ export type ReferralSet = {
   id: Scalars['ID'];
   /** Party that created the set. */
   referrer: Scalars['ID'];
+  /** Current number of members in the referral set. */
+  totalMembers: Scalars['Int'];
   /** Timestamp as RFC3339Nano when the referral set was updated. */
   updatedAt: Scalars['Timestamp'];
 };
@@ -6333,6 +6331,8 @@ export type Team = {
   teamId: Scalars['ID'];
   /** Link to the team's homepage. */
   teamUrl: Scalars['String'];
+  /** Current number of members in the team. */
+  totalMembers: Scalars['Int'];
 };
 
 /** Connection type for retrieving cursor-based paginated team data */

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

@@ -3,6 +3,7 @@ import type {
   EntityScope,
   GovernanceTransferKind,
   GovernanceTransferType,
+  IndividualScope,
   PeggedReference,
   ProposalChange,
   TransferStatus,
@@ -700,6 +701,20 @@ export const EntityScopeLabelMapping: { [e in EntityScope]: string } = {
   ENTITY_SCOPE_TEAMS: 'Team',
 };
 
+export const IndividualScopeMapping: { [e in IndividualScope]: string } = {
+  INDIVIDUAL_SCOPE_ALL: 'All',
+  INDIVIDUAL_SCOPE_IN_TEAM: 'In team',
+  INDIVIDUAL_SCOPE_NOT_IN_TEAM: 'Not in team',
+};
+
+export const IndividualScopeDescriptionMapping: {
+  [e in IndividualScope]: string;
+} = {
+  INDIVIDUAL_SCOPE_ALL: 'All parties are eligble',
+  INDIVIDUAL_SCOPE_IN_TEAM: 'Parties in teams are eligible',
+  INDIVIDUAL_SCOPE_NOT_IN_TEAM: 'Only parties not in teams are eligible',
+};
+
 export enum DistributionStrategyMapping {
   /** Rewards funded using the pro-rata strategy should be distributed pro-rata by each entity's reward metric scaled by any active multipliers that party has */
   DISTRIBUTION_STRATEGY_PRO_RATA = 'Pro rata',