SOV-3360: corrected dummy rbtc claiming (#2580)

fix: corrected dummy rbtc claiming
DistributedCollective · Oct 19, 2023 · 5aa7298 · 5aa7298
1 parent 20c77bf
commit 5aa7298
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx b/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx
@@ -44,6 +44,29 @@ export const FeesEarnedTab: React.FC<IFeesEarnedTabProps> = ({
 
   const isClaimDisabled = useMemo(() => tx.loading, [tx.loading]);
 
+  const fees = useMemo(
+    () =>
+      earnedFees.reduce((p, c) => {
+        const asset = c.asset;
+        const index = p.findIndex(i => i.asset === asset);
+        if (index === -1) {
+          p.push({
+            asset,
+            value: c.value,
+            rbtcValue: c.rbtcValue,
+            contractAddress: c.contractAddress,
+          });
+        } else {
+          p[index].value = bignumber(p[index].value).add(c.value).toString();
+          p[index].rbtcValue = bignumber(p[index].rbtcValue)
+            .add(c.rbtcValue)
+            .toNumber();
+        }
+        return p;
+      }, [] as IEarnedFee[]),
+    [earnedFees],
+  );
+
   return (
     <div className="tw-flex tw-flex-col tw-w-full tw-justify-center tw-items-center">
       <div className={styles['tab-main-section']}>
@@ -100,7 +123,7 @@ export const FeesEarnedTab: React.FC<IFeesEarnedTabProps> = ({
                 </tr>
               </thead>
               <tbody>
-                {earnedFees.map(earnedFee => (
+                {fees.map(earnedFee => (
                   <FeesEarnedClaimRow
                     amountToClaim={earnedFee.value}
                     contractAddress={earnedFee.contractAddress}

diff --git a/src/app/pages/RewardPage/hooks/useGetFeesEarned.ts b/src/app/pages/RewardPage/hooks/useGetFeesEarned.ts
@@ -131,7 +131,10 @@ export const useGetFeesEarned = (): {
       const results = tokens.map(
         token =>
           ({
-            asset: assetByTokenAddress(token) || assetByLoanTokenAddress(token),
+            asset:
+              assetByTokenAddress(token) ||
+              assetByLoanTokenAddress(token) ||
+              Asset.RBTC,
             contractAddress: token,
             value: amounts.returnData[token].toString(),
             rbtcValue: 0,