feat: metrics adjusted to e11 -- simplification, removal of sections not applicable to lack of MF

Author: aziolek

client/src/api/calls/epochInfo.ts

@@ -11,6 +11,7 @@ export type Response = {
   operationalCost: string;
   patronsRewards: string | null;
   ppf: string | null;
+  stakingMatchedReservedForV2: string | null;
   stakingProceeds: string;
   totalEffectiveDeposit: string;
   totalRewards: string;

client/src/components/Metrics/MetricsEpoch/MetricsEpoch.tsx

@@ -105,7 +105,12 @@ const MetricsEpoch = (): ReactElement => {
         <MetricsEpochGridTotalUsers className={styles.totalUsers} isLoading={isLoading} />
         <MetricsEpochGridCurrentDonors className={styles.currentDonors} isLoading={isLoading} />
         <MetricsEpochGridPatrons className={styles.patrons} isLoading={isLoading} />
-        <MetricsEpochGridAverageLeverage className={styles.averageLeverage} isLoading={isLoading} />
+        {epoch < 11 && (
+          <MetricsEpochGridAverageLeverage
+            className={styles.averageLeverage}
+            isLoading={isLoading}
+          />
+        )}
         <MetricsEpochGridRewardsUnused className={styles.rewardsUnused} isLoading={isLoading} />
         <MetricsEpochGridUnallocatedValue
           className={styles.unallocatedValue}
@@ -116,17 +121,21 @@ const MetricsEpoch = (): ReactElement => {
           isLoading={isLoading}
           totalUserDonations={sumOfDonations}
         />
-        <MetricsEpochGridTotalMatchingFund
-          className={styles.totalMatching}
-          isLoading={isLoading}
-          matchingFund={matchedRewards}
-        />
-        <MetricsEpochGridDonationsVsMatching
-          className={styles.donationsVsMatching}
-          isLoading={isLoading}
-          matchingFund={matchedRewards}
-          totalUserDonations={sumOfDonations}
-        />
+        {epoch < 11 && (
+          <>
+            <MetricsEpochGridTotalMatchingFund
+              className={styles.totalMatching}
+              isLoading={isLoading}
+              matchingFund={matchedRewards}
+            />
+            <MetricsEpochGridDonationsVsMatching
+              className={styles.donationsVsMatching}
+              isLoading={isLoading}
+              matchingFund={matchedRewards}
+              totalUserDonations={sumOfDonations}
+            />
+          </>
+        )}
         <MetricsEpochGridDonationsVsPersonalAllocations
           className={styles.donationsVsPersonal}
           isLoading={isLoading}

client/src/components/Metrics/MetricsEpoch/MetricsEpochGridFundsUsage/MetricsEpochGridFundsUsage.tsx

@@ -29,6 +29,9 @@ const MetricsEpochGridFundsUsage: FC<MetricsEpochGridFundsUsageProps> = ({
     Number(Number(formatUnitsBigInt(value, 'wei')).toFixed(3));
 
   const leftover = epochInfo ? epochInfo.leftover : BigInt(0);
+  const stakingMatchedReservedForV2 = epochInfo ? epochInfo.stakingMatchedReservedForV2 : BigInt(0);
+
+  const leftoverToUse = epoch === 11 ? leftover - stakingMatchedReservedForV2 : leftover;
 
   const projectCosts = epochInfo ? epochInfo.operationalCost : BigInt(0);
   const donatedToProjects = epochInfo ? epochInfo.donatedToProjects : BigInt(0);
@@ -72,7 +75,8 @@ const MetricsEpochGridFundsUsage: FC<MetricsEpochGridFundsUsageProps> = ({
     staking +
     ppf / 2n +
     communityFund +
-    leftover;
+    stakingMatchedReservedForV2 +
+    leftoverToUse;
 
   const isTestnet = window.Cypress ? !!window.isTestnetCypress : networkConfig.isTestnet;
 
@@ -98,13 +102,13 @@ const MetricsEpochGridFundsUsage: FC<MetricsEpochGridFundsUsageProps> = ({
       }).primary,
     },
     {
-      label: t('leftover', { epochNumber: epoch + 1 }),
-      value: getNumberValue(leftover),
+      label: t('leftover'),
+      value: getNumberValue(leftoverToUse),
       valueLabel: getValuesToDisplay({
         cryptoCurrency: 'ethereum',
         getFormattedEthValueProps,
         showCryptoSuffix: true,
-        valueCrypto: leftover,
+        valueCrypto: leftoverToUse,
       }).primary,
     },
     {
@@ -157,6 +161,16 @@ const MetricsEpochGridFundsUsage: FC<MetricsEpochGridFundsUsageProps> = ({
         valueCrypto: ppf / 2n,
       }).primary,
     },
+    {
+      label: t('stakingMatchedReservedForV2'),
+      value: getNumberValue(stakingMatchedReservedForV2),
+      valueLabel: getValuesToDisplay({
+        cryptoCurrency: 'ethereum',
+        getFormattedEthValueProps,
+        showCryptoSuffix: true,
+        valueCrypto: stakingMatchedReservedForV2,
+      }).primary,
+    },
   ].filter(({ value }) => value > 0);
 
   return (

client/src/hooks/queries/useEpochInfo.ts

@@ -14,6 +14,7 @@ type EpochInfo = {
   patronsRewards: bigint;
   ppf: bigint;
   staking: bigint;
+  stakingMatchedReservedForV2: bigint;
   stakingProceeds: bigint;
   totalEffectiveDeposit: bigint;
   totalRewards: bigint;
@@ -63,6 +64,9 @@ export default function useEpochInfo(
         ? parseUnitsBigInt(response.patronsRewards, 'wei')
         : BigInt(0),
       ppf: response.ppf ? parseUnitsBigInt(response.ppf, 'wei') : BigInt(0),
+      stakingMatchedReservedForV2: response.stakingMatchedReservedForV2
+        ? parseUnitsBigInt(response.stakingMatchedReservedForV2, 'wei')
+        : BigInt(0),
       stakingProceeds: parseUnitsBigInt(response.stakingProceeds, 'wei'),
       totalEffectiveDeposit: parseUnitsBigInt(response.totalEffectiveDeposit, 'wei'),
       totalRewards: parseUnitsBigInt(response.totalRewards, 'wei'),

client/src/locales/en/translation.json

@@ -552,7 +552,8 @@
       "totalUsers": "Total users",
       "fundsUsage": "Epoch {{epoch}} funds usage ",
       "epochTotal": "Epoch {{epoch}} Total",
-      "leftover": "Moved to E{{epochNumber}}",
+      "leftover": "Moved to next epoch",
+      "stakingMatchedReservedForV2": "Reserved for v2 MF",
       "staking": "Staking",
       "communityFund": "Community Fund",
       "ppf": "PPF",
@@ -737,4 +738,4 @@
       "title": "Manual allocation"
     }
   }
-}
+}

client/src/locales/es/translation.json

@@ -552,7 +552,8 @@
       "totalUsers": "Usuarios totales",
       "fundsUsage": "Uso de fondos de la época {{epoch}} ",
       "epochTotal": "Época {{epoch}} Total",
-      "leftover": "Movido a E {{epochNumber}}",
+      "leftover": "Transferido a la siguiente época",
+      "stakingMatchedReservedForV2": "Reservado para el MF de v2",
       "staking": "Bloqueado",
       "communityFund": "Fondo Comunitario",
       "ppf": "PPF",
@@ -737,4 +738,4 @@
       "title": "Asignación manual"
     }
   }
-}
+}