refactor: rework to GenericDistribution

Author: gleiser-oliveira

apps/evm/src/clients/api/queries/useGetPools/getPools/formatOutput/formatDistributions/formatRewardDistribution/index.ts

@@ -1,9 +1,8 @@
 import type BigNumber from 'bignumber.js';
 
 import type {
-  IntrinsicApyDistribution,
+  GenericDistribution,
   MerklDistribution,
-  OffChainApyDistribution,
   RewardDistributorDistribution,
   Token,
   TokenDistribution,
@@ -19,7 +18,7 @@ interface MerklRewardDetails {
   tags: string[];
 }
 
-interface IntrinsicApyRewardDetails {
+interface GenericDistributionRewardDetails {
   name: string;
   description: string;
 }
@@ -34,7 +33,9 @@ type FormatDistributionInput<TType extends ApiRewardType> = {
   rewardTokenPriceDollars: BigNumber;
   dailyDistributedRewardTokens: BigNumber;
   balanceDollars: BigNumber;
-  rewardDetails: TType extends 'merkl' ? MerklRewardDetails : IntrinsicApyRewardDetails | null;
+  rewardDetails: TType extends 'merkl'
+    ? MerklRewardDetails
+    : GenericDistributionRewardDetails | null;
 };
 
 const formatRewardDistribution = <TType extends ApiRewardType>({
@@ -78,22 +79,12 @@ const formatRewardDistribution = <TType extends ApiRewardType>({
     return distribution;
   }
 
-  if (rewardType === 'intrinsic' && rewardDetails) {
-    const distribution: IntrinsicApyDistribution = {
+  if ((rewardType === 'intrinsic' || rewardType === 'off-chain') && rewardDetails) {
+    const distribution: GenericDistribution = {
       ...baseProps,
-      type: 'intrinsic',
-      isActive,
-      rewardDetails: rewardDetails as IntrinsicApyRewardDetails,
-    };
-
-    return distribution;
-  }
-
-  if (rewardType === 'off-chain') {
-    const distribution: OffChainApyDistribution = {
-      ...baseProps,
-      type: 'off-chain',
+      type: rewardType,
       isActive,
+      rewardDetails: rewardDetails as GenericDistributionRewardDetails,
     };
 
     return distribution;

apps/evm/src/types/index.ts

@@ -86,8 +86,8 @@ export interface MerklDistribution {
   };
 }
 
-export interface IntrinsicApyDistribution {
-  type: 'intrinsic';
+export interface GenericDistribution {
+  type: 'intrinsic' | 'off-chain';
   token: Token;
   apyPercentage: BigNumber;
   dailyDistributedTokens: BigNumber;
@@ -98,17 +98,12 @@ export interface IntrinsicApyDistribution {
   };
 }
 
-export type OffChainApyDistribution = Omit<IntrinsicApyDistribution, 'type' | 'rewardDetails'> & {
-  type: 'off-chain';
-};
-
 export type TokenDistribution =
   | RewardDistributorDistribution
   | PrimeDistribution
   | PrimeSimulationDistribution
   | MerklDistribution
-  | IntrinsicApyDistribution
-  | OffChainApyDistribution;
+  | GenericDistribution;
 
 export interface PointDistribution {
   title: string;