Display paired token rewards per pool for an LP address (#860)

* feat: display paired token rewards under pool details * testnet release 2.14.29
Sifchain · Dec 20, 2023 · fc36970 · fc36970 · vercel · Dec 20, 2023
1 parent 045ca3a
commit fc36970
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.14.28",
+  "version": "2.14.29",
   "private": true,
   "scripts": {
     "bump": "bump patch --tag --commit 'testnet release '",

diff --git a/app/src/business/services/DataService/DataService.ts b/app/src/business/services/DataService/DataService.ts
@@ -63,6 +63,7 @@ export type UserRewards = {
 export type LPUserReward = {
   poolLPDistributionReceivedInRowan: number;
   poolRewardsReceivedInRowan: number;
+  poolRewardsReceivedInPairedToken: number;
 };
 
 export type LPUserRewards = {
@@ -72,6 +73,7 @@ export type LPUserRewards = {
   totalRewardsReceivedInRowan: string;
   poolLPDistributionReceivedInRowan: string;
   poolRewardsReceivedInRowan: string;
+  poolRewardsReceivedInPairedToken: number;
 };
 
 export type LPUserRewardsResponse = {
@@ -298,14 +300,17 @@ export default class DataService {
                 poolLPDistributionReceivedInRowan: Math.random() * 10000,
 
                 poolRewardsReceivedInRowan: Math.random() * 10000,
+                poolRewardsReceivedInPairedToken: Math.random() * 10000,
               },
               ujuno: {
                 poolLPDistributionReceivedInRowan: Math.random() * 10000,
                 poolRewardsReceivedInRowan: Math.random() * 10000,
+                poolRewardsReceivedInPairedToken: Math.random() * 10000,
               },
               uatom: {
                 poolLPDistributionReceivedInRowan: Math.random() * 10000,
                 poolRewardsReceivedInRowan: Math.random() * 10000,
+                poolRewardsReceivedInPairedToken: Math.random() * 10000,
               },
             },
           },
@@ -332,6 +337,9 @@ export default class DataService {
                 poolRewardsReceivedInRowan: Number(
                   entry.poolRewardsReceivedInRowan,
                 ),
+                poolRewardsReceivedInPairedToken: Number(
+                  entry.poolRewardsReceivedInPairedToken,
+                ),
               },
             }),
             {},

diff --git a/app/src/views/PoolPage/PoolItem.tsx b/app/src/views/PoolPage/PoolItem.tsx
@@ -226,6 +226,21 @@ export default defineComponent({
         ],
         ...(this.lppdRewards
           ? [
+              Boolean(this.lppdRewards.poolRewardsReceivedInPairedToken) && [
+                <span class="flex items-center gap-1">
+                  Your total rewards paid in the pool in the paired token
+                </span>,
+                <span class="flex items-center font-mono">
+                  {prettyNumber(
+                    this.lppdRewards.poolRewardsReceivedInPairedToken,
+                  )}
+                  <TokenIcon
+                    assetValue={this.externalAmount.asset}
+                    size={14}
+                    class="ml-[3px]"
+                  />
+                </span>,
+              ],
               Boolean(
                 this.isLPDActive &&
                   this.lppdRewards.poolLPDistributionReceivedInRowan,

diff --git a/app/src/views/PoolPage/usePoolPageData.tsx b/app/src/views/PoolPage/usePoolPageData.tsx
@@ -180,9 +180,11 @@ export const usePoolPageData = () => {
           );
 
         const pool = useCore().store.pools[poolKey];
-
-        const denomOrSymbol =
-          pool.externalAmount.ibcDenom ?? pool.externalAmount.symbol;
+        const ibcDenom =
+          tokenRegistryEntriesQuery.data.value?.registry?.entries.find(
+            (y) => y.baseDenom === pool.externalAmount.symbol,
+          )?.denom;
+        const denomOrSymbol = ibcDenom ?? pool.externalAmount.symbol;
 
         const lppdPoolRewards = lppdRewards?.value?.hasRewards
           ? lppdRewards.value.rewards.byPool[denomOrSymbol]