fix: check for batch proposal in trading mode tooltip

chore(trading): enable isolated margin on testnet

apps/trading/.env.testnet

@@ -22,7 +22,7 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
-NX_ISOLATED_MARGIN=false
+NX_ISOLATED_MARGIN=true
 NX_ICEBERG_ORDERS=true
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true

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

@@ -1,5 +1,5 @@
 import { useT } from '../../lib/use-t';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber, formatNumber } from '@vegaprotocol/utils';
 import classNames from 'classnames';
 import {
   type VegaIconSize,
@@ -24,6 +24,9 @@ import {
   type DispatchStrategy,
   IndividualScopeMapping,
   IndividualScopeDescriptionMapping,
+  AccountType,
+  DistributionStrategy,
+  IndividualScope,
   type Asset,
 } from '@vegaprotocol/types';
 import { Card } from '../card/card';
@@ -62,22 +65,27 @@ export const applyFilter = (
   filter: Filter
 ) => {
   const { transfer } = node;
-  if (
-    transfer.kind.__typename !== 'RecurringTransfer' ||
-    !transfer.kind.dispatchStrategy?.dispatchMetric
-  ) {
+
+  // if the transfer is a staking reward then it should be displayed
+  if (transfer.toAccountType === AccountType.ACCOUNT_TYPE_GLOBAL_REWARD) {
+    return true;
+  }
+
+  if (transfer.kind.__typename !== 'RecurringTransfer') {
     return false;
   }
 
   if (
-    DispatchMetricLabels[transfer.kind.dispatchStrategy.dispatchMetric]
-      .toLowerCase()
-      .includes(filter.searchTerm.toLowerCase()) ||
+    (transfer.kind.dispatchStrategy?.dispatchMetric &&
+      DispatchMetricLabels[transfer.kind.dispatchStrategy.dispatchMetric]
+        .toLowerCase()
+        .includes(filter.searchTerm.toLowerCase())) ||
     transfer.asset?.symbol
       .toLowerCase()
       .includes(filter.searchTerm.toLowerCase()) ||
     (
-      EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope] ||
+      (transfer.kind.dispatchStrategy &&
+        EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope]) ||
       'Unspecified'
     )
       .toLowerCase()
@@ -93,6 +101,7 @@ export const applyFilter = (
   ) {
     return true;
   }
+
   return false;
 };
 
@@ -174,6 +183,29 @@ export const ActiveRewardCard = ({
     return null;
   }
 
+  if (
+    !transferNode.transfer.kind.dispatchStrategy &&
+    transferNode.transfer.toAccountType ===
+      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD
+  ) {
+    return (
+      <StakingRewardCard
+        colour={CardColour.WHITE}
+        rewardAmount={addDecimalsFormatNumber(
+          transferNode.transfer.amount,
+          transferNode.transfer.asset?.decimals || 0,
+          6
+        )}
+        rewardAsset={transferNode.transfer.asset || undefined}
+        endsIn={
+          transferNode.transfer.kind.endEpoch != null
+            ? transferNode.transfer.kind.endEpoch - currentEpoch
+            : undefined
+        }
+      />
+    );
+  }
+
   let colour =
     DispatchMetricColourMap[
       transferNode.transfer.kind.dispatchStrategy.dispatchMetric
@@ -318,7 +350,7 @@ const RewardCard = ({
             </div>
           </div>
 
-          <span className="border-[0.5px] border-gray-700" />
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
           {/** DISPATCH METRIC */}
           {dispatchMetricInfo ? (
             dispatchMetricInfo
@@ -355,11 +387,11 @@ const RewardCard = ({
           </div>
           {/** DISPATCH METRIC DESCRIPTION */}
           {dispatchStrategy?.dispatchMetric && (
-            <span className="text-muted text-sm h-[3rem]">
+            <p className="text-muted text-sm h-[3rem]">
               {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
-            </span>
+            </p>
           )}
-          <span className="border-[0.5px] border-gray-700" />
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
           {/** REQUIREMENTS */}
           {dispatchStrategy && (
             <RewardRequirements
@@ -374,6 +406,190 @@ const RewardCard = ({
   );
 };
 
+const StakingRewardCard = ({
+  colour,
+  rewardAmount,
+  rewardAsset,
+  endsIn,
+}: {
+  colour: CardColour;
+  rewardAmount: string;
+  /** The asset linked to the dispatch strategy via `dispatchMetricAssetId` property. */
+  rewardAsset?: Asset;
+  /** The number of epochs until the transfer stops. */
+  endsIn?: number;
+  /** The VEGA asset details, required to format the min staking amount. */
+  vegaAsset?: BasicAssetDetails;
+}) => {
+  const t = useT();
+  return (
+    <div>
+      <div
+        className={classNames(
+          'bg-gradient-to-r col-span-full p-0.5 lg:col-auto h-full',
+          'rounded-lg',
+          CardColourStyles[colour].gradientClassName
+        )}
+        data-testid="active-rewards-card"
+      >
+        <div
+          className={classNames(
+            CardColourStyles[colour].mainClassName,
+            'bg-gradient-to-b bg-vega-clight-800 dark:bg-vega-cdark-800 h-full w-full rounded-md p-4 flex flex-col gap-4'
+          )}
+        >
+          <div className="flex justify-between gap-4">
+            {/** ENTITY SCOPE */}
+            <div className="flex flex-col gap-2 items-center text-center">
+              <EntityIcon entityScope={EntityScope.ENTITY_SCOPE_INDIVIDUALS} />
+              {
+                <span className="text-muted text-xs" data-testid="entity-scope">
+                  {EntityScopeLabelMapping[
+                    EntityScope.ENTITY_SCOPE_INDIVIDUALS
+                  ] || t('Unspecified')}
+                </span>
+              }
+            </div>
+
+            {/** AMOUNT AND DISTRIBUTION STRATEGY */}
+            <div className="flex flex-col gap-2 items-center text-center">
+              {/** AMOUNT */}
+              <h3 className="flex flex-col gap-1 text-2xl shrink-1 text-center">
+                <span className="font-glitch" data-testid="reward-value">
+                  {rewardAmount}
+                </span>
+
+                <span className="font-alpha">{rewardAsset?.symbol || ''}</span>
+              </h3>
+
+              {/** DISTRIBUTION STRATEGY */}
+              <Tooltip
+                description={t(
+                  DistributionStrategyDescriptionMapping[
+                    DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA
+                  ]
+                )}
+                underline={true}
+              >
+                <span className="text-xs" data-testid="distribution-strategy">
+                  {
+                    DistributionStrategyMapping[
+                      DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA
+                    ]
+                  }
+                </span>
+              </Tooltip>
+            </div>
+
+            {/** DISTRIBUTION DELAY */}
+            <div className="flex flex-col gap-2 items-center text-center">
+              <CardIcon
+                iconName={VegaIconNames.LOCK}
+                tooltip={t(
+                  'Number of epochs after distribution to delay vesting of rewards by'
+                )}
+              />
+              <span
+                className="text-muted text-xs whitespace-nowrap"
+                data-testid="locked-for"
+              >
+                {t('numberEpochs', '{{count}} epochs', {
+                  count: 0,
+                })}
+              </span>
+            </div>
+          </div>
+
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
+          {/** DISPATCH METRIC */}
+          {
+            <span data-testid="dispatch-metric-info">
+              {t('Staking rewards')}
+            </span>
+          }
+          <div className="flex items-center gap-8 flex-wrap">
+            {/** ENDS IN */}
+            {endsIn != null && (
+              <span className="flex flex-col">
+                <span className="text-muted text-xs">{t('Ends in')} </span>
+                <span data-testid="ends-in" data-endsin={endsIn}>
+                  {endsIn >= 0
+                    ? t('numberEpochs', '{{count}} epochs', {
+                        count: endsIn,
+                      })
+                    : t('Ended')}
+                </span>
+              </span>
+            )}
+
+            {/** WINDOW LENGTH */}
+            <span className="flex flex-col">
+              <span className="text-muted text-xs">{t('Assessed over')}</span>
+              <span data-testid="assessed-over">
+                {t('numberEpochs', '{{count}} epochs', {
+                  count: 1,
+                })}
+              </span>
+            </span>
+          </div>
+          {/** DISPATCH METRIC DESCRIPTION */}
+          {
+            <p className="text-muted text-sm h-[3rem]">
+              {t(
+                'Global staking reward for staking $VEGA on the network via the Governance app'
+              )}
+            </p>
+          }
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
+          {/** REQUIREMENTS */}
+          <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('Team scope')}
+              </dt>
+              <dd className="flex items-center gap-1" data-testid="scope">
+                <Tooltip
+                  description={
+                    IndividualScopeDescriptionMapping[
+                      IndividualScope.INDIVIDUAL_SCOPE_ALL
+                    ]
+                  }
+                >
+                  <span>{t('Individual')}</span>
+                </Tooltip>
+              </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"
+                data-testid="staking-requirement"
+              >
+                {formatNumber(1, 2)}
+              </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"
+                data-testid="average-position"
+              >
+                {formatNumber(0, 2)}
+              </dd>
+            </div>
+          </dl>
+        </div>
+      </div>
+    </div>
+  );
+};
+
 export const DispatchMetricInfo = ({
   reward,
 }: {

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

@@ -16,6 +16,7 @@ import {
   EntityScope,
   IndividualScope,
   MarketState,
+  AccountType,
 } from '@vegaprotocol/types';
 import { type ApolloError } from '@apollo/client';
 import compact from 'lodash/compact';
@@ -46,8 +47,9 @@ export type EnrichedRewardTransfer = RewardTransfer & {
  */
 export const isReward = (node: TransferNode): node is RewardTransfer => {
   if (
-    node.transfer.kind.__typename === 'RecurringTransfer' &&
-    node.transfer.kind.dispatchStrategy != null
+    (node.transfer.kind.__typename === 'RecurringTransfer' &&
+      node.transfer.kind.dispatchStrategy != null) ||
+    node.transfer.toAccountType === AccountType.ACCOUNT_TYPE_GLOBAL_REWARD
   ) {
     return true;
   }
@@ -79,13 +81,13 @@ export const isActiveReward = (node: RewardTransfer, currentEpoch: number) => {
  */
 export const isScopedToTeams = (node: EnrichedRewardTransfer) =>
   // scoped to teams
-  node.transfer.kind.dispatchStrategy.entityScope ===
+  node.transfer.kind.dispatchStrategy?.entityScope ===
     EntityScope.ENTITY_SCOPE_TEAMS ||
   // or to individuals
-  (node.transfer.kind.dispatchStrategy.entityScope ===
+  (node.transfer.kind.dispatchStrategy?.entityScope ===
     EntityScope.ENTITY_SCOPE_INDIVIDUALS &&
     // but they have to be in a team
-    node.transfer.kind.dispatchStrategy.individualScope ===
+    node.transfer.kind.dispatchStrategy?.individualScope ===
       IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM);
 
 /** Retrieves rewards (transfers) */
@@ -142,6 +144,7 @@ export const useRewards = ({
     .filter((node) => (scopeToTeams ? isScopedToTeams(node) : true))
     // enrich with dispatch asset and markets in scope details
     .map((node) => {
+      if (!node.transfer.kind.dispatchStrategy) return node;
       const dispatchAsset =
         (assets &&
           assets[node.transfer.kind.dispatchStrategy.dispatchMetricAssetId]) ||
@@ -170,7 +173,7 @@ export const useRewards = ({
         ...node,
         dispatchAsset,
         isAssetTraded: isAssetTraded != null ? isAssetTraded : undefined,
-        markets: marketsInScope.length > 0 ? marketsInScope : undefined,
+        markets: marketsInScope?.length > 0 ? marketsInScope : undefined,
       };
     });
 

libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx

@@ -1,11 +1,7 @@
 import { useMemo } from 'react';
 import { parseISO, isValid, isAfter } from 'date-fns';
 import classNames from 'classnames';
-import {
-  useProposalOfMarketQuery,
-  type ProposalOfMarketQuery,
-  type SingleProposal,
-} from '@vegaprotocol/proposals';
+import { useProposalOfMarketQuery } from '@vegaprotocol/proposals';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
@@ -40,15 +36,21 @@ export const TradingModeTooltip = ({
         marketTradingMode,
   });
 
-  // We only fetch Proposals (and not BatchProposals)
-  const proposal = proposalData?.proposal as SingleProposal<
-    ProposalOfMarketQuery['proposal']
-  >;
-
   if (!market || !marketData) {
     return null;
   }
-  const enactmentDate = parseISO(proposal?.terms.enactmentDatetime);
+
+  let enactmentDate;
+  const proposal = proposalData?.proposal;
+
+  if (proposal?.__typename === 'Proposal') {
+    enactmentDate = parseISO(proposal.terms.enactmentDatetime);
+  } else if (proposal?.__typename === 'BatchProposal') {
+    const change = proposal.batchTerms?.changes.find(
+      (c) => c?.change.__typename === 'NewMarket'
+    );
+    enactmentDate = change ? parseISO(change.enactmentDatetime) : undefined;
+  }
 
   const compiledGrid =
     !skipGrid && compileGridData(t, market, marketData, onSelect);
@@ -67,14 +69,16 @@ export const TradingModeTooltip = ({
       return (
         <section data-testid="trading-mode-tooltip">
           <p
-            className={classNames('flex flex-col', {
+            className={classNames('flex flex-col items-start gap-2', {
               'mb-4': Boolean(compiledGrid),
             })}
           >
-            {isValid(enactmentDate) && isAfter(new Date(), enactmentDate) ? (
+            {enactmentDate &&
+            isValid(enactmentDate) &&
+            isAfter(new Date(), enactmentDate) ? (
               <>
                 <span
-                  className="justify-center font-bold my-2"
+                  className="justify-center font-bold"
                   data-testid="opening-auction-sub-status"
                 >
                   {`${Schema.MarketTradingModeMapping[marketTradingMode]}: ${t(
@@ -91,7 +95,7 @@ export const TradingModeTooltip = ({
               <>
                 {isValid(enactmentDate) && (
                   <span
-                    className="justify-center font-bold my-2"
+                    className="justify-center font-bold"
                     data-testid="opening-auction-sub-status"
                   >
                     {`${
@@ -109,10 +113,7 @@ export const TradingModeTooltip = ({
               </>
             )}
             {DocsLinks && (
-              <ExternalLink
-                href={DocsLinks.AUCTION_TYPE_OPENING}
-                className="ml-1"
-              >
+              <ExternalLink href={DocsLinks.AUCTION_TYPE_OPENING}>
                 {t('Find out more')}
               </ExternalLink>
             )}

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

@@ -136,6 +136,7 @@
   "Governance vote for this market is valid and has been accepted": "Governance vote for this market is valid and has been accepted",
   "Governance vote has passed and market is awaiting opening auction exit": "Governance vote has passed and market is awaiting opening auction exit",
   "Governance vote passed to close the market": "Governance vote passed to close the market",
+  "Global staking reward for staking $VEGA on the network via the Governance app": "Global staking reward for staking $VEGA on the network via the Governance app",
   "Help identify bugs and improve the service by sharing anonymous usage data.": "Help identify bugs and improve the service by sharing anonymous usage data.",
   "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.": "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.",
   "Hide closed markets": "Hide closed markets",
@@ -368,12 +369,12 @@
   "TradingView": "TradingView",
   "Transfer": "Transfer",
   "Type": "Type",
+  "Staking rewards": "Staking rewards",
   "Unknown": "Unknown",
   "Unknown settlement date": "Unknown settlement date",
   "Update team": "Update team",
   "URL": "URL",
   "Use a comma separated list to allow only specific public keys to join the team": "Use a comma separated list to allow only specific public keys to join the team",
-  "Vega chart": "Vega chart",
   "Vega Reward pot": "Vega Reward pot",
   "Vega Wallet <0>full featured</0>": "Vega Wallet <0>full featured</0>",
   "Vega chart": "Vega chart",

libs/proposals/src/lib/proposals-hooks/Proposal.graphql

@@ -45,6 +45,19 @@ query ProposalOfMarket($marketId: ID!) {
         enactmentDatetime
       }
     }
+    ... on BatchProposal {
+      id
+      batchTerms {
+        changes {
+          enactmentDatetime
+          change {
+            ... on NewMarket {
+              __typename
+            }
+          }
+        }
+      }
+    }
   }
 }
 

libs/proposals/src/lib/proposals-hooks/__generated__/Proposal.ts

@@ -25,7 +25,7 @@ export type ProposalOfMarketQueryVariables = Types.Exact<{
 }>;
 
 
-export type ProposalOfMarketQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null } } | null };
+export type ProposalOfMarketQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal', id?: string | null, batchTerms?: { __typename?: 'BatchProposalTerms', changes: Array<{ __typename?: 'BatchProposalTermsChange', enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } | null> } | null } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null } } | null };
 
 export type SuccessorMarketProposalDetailsQueryVariables = Types.Exact<{
   proposalId: Types.Scalars['ID'];
@@ -152,6 +152,19 @@ export const ProposalOfMarketDocument = gql`
         enactmentDatetime
       }
     }
+    ... on BatchProposal {
+      id
+      batchTerms {
+        changes {
+          enactmentDatetime
+          change {
+            ... on NewMarket {
+              __typename
+            }
+          }
+        }
+      }
+    }
   }
 }
     `;

libs/types/src/__generated__/types.ts

@@ -256,6 +256,8 @@ export type AggregatedLedgerEntry = {
   toAccountPartyId?: Maybe<Scalars['ID']>;
   /** Account type, if query was grouped by receiver account type - else null */
   toAccountType?: Maybe<AccountType>;
+  /** Transfer ID associated with this aggregated ledger entry */
+  transferId: Scalars['ID'];
   /** Type of the transfer for this ledger entry */
   transferType?: Maybe<TransferType>;
   /** RFC3339Nano time from at which this ledger entries records were relevant */