Merge pull request #677 from Sifchain/staging

[hotfix] v2.7.3

app/CHANGELOG.md

@@ -1,7 +1,8 @@
 ## Release 2022.05.24
 
-- Re-enable UST and LUNA
 - Enable cancelling unbonding requests
+- Re-enable UST and LUNA
+- Fix pool share & pool value display
 
 ## Release 2022.05.12
 

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "private": true,
   "scripts": {
     "bump": "bump patch --tag --commit 'testnet release '",

app/src/business/usecases/clp/syncPools.ts

@@ -146,7 +146,7 @@ export function SyncPools(
         throw new Error("Missing liquidity provider");
       }
 
-      const lp = LiquidityProvider(
+      const lp = new LiquidityProvider(
         asset,
         Amount(lpItem.liquidityProvider.liquidityProviderUnits),
         address,

app/src/views/PoolPage/PoolItem.tsx

@@ -16,7 +16,7 @@ import {
   Competition,
   CompetitionsLookup,
 } from "../LeaderboardPage/useCompetitionData";
-import { COLUMNS_LOOKUP, PoolRewardProgram } from "./usePoolPageData";
+import { COLUMNS_LOOKUP } from "./usePoolPageData";
 import { useUserPoolData } from "./useUserPoolData";
 
 export default defineComponent({
@@ -60,10 +60,6 @@ export default defineComponent({
       type: Object as PropType<AccountPool>,
       required: false,
     },
-    bonusRewardPrograms: {
-      type: Array as PropType<PoolRewardProgram[]>,
-      required: true,
-    },
     competitionsLookup: {
       type: Object as PropType<CompetitionsLookup>,
       required: false,

app/src/views/PoolPage/PoolPage.tsx

@@ -8,23 +8,13 @@ import {
   useRemoveLiquidityMutation,
 } from "@/domains/clp/mutation/liquidity";
 import { useCurrentRewardPeriod } from "@/domains/clp/queries/params";
-import { useNativeChain } from "@/hooks/useChains";
 import { flagsStore, isAssetFlaggedDisabled } from "@/store/modules/flags";
 import BigNumber from "bignumber.js";
 import { formatDistance } from "date-fns";
 import { computed, defineComponent } from "vue";
 import { RouterView } from "vue-router";
-import {
-  CompetitionsBySymbolLookup,
-  useLeaderboardCompetitions,
-} from "../LeaderboardPage/useCompetitionData";
 import PoolItem from "./PoolItem";
-import {
-  COLUMNS,
-  PoolPageColumnId,
-  PoolRewardProgram,
-  usePoolPageData,
-} from "./usePoolPageData";
+import { COLUMNS, PoolPageColumnId, usePoolPageData } from "./usePoolPageData";
 
 export default defineComponent({
   name: "PoolsPage",
@@ -47,7 +37,6 @@ export default defineComponent({
       }),
       cancelLiquidityUnlockMutation: useCancelLiquidityUnlockMutation(),
       currentRewardPeriod,
-      competitionsRes: useLeaderboardCompetitions(),
       rewardProgramsRes: data.rewardProgramsRes,
       allPoolsData: data.allPoolsData,
       isLoading: computed(
@@ -56,39 +45,6 @@ export default defineComponent({
     };
   },
   computed: {
-    poolRewardProgramLookup(): Record<string, PoolRewardProgram[]> {
-      const lookup: Record<string, PoolRewardProgram[]> = {};
-
-      this.rewardProgramsRes.data.value?.forEach((program) => {
-        if (program.isUniversal) return;
-
-        if (
-          new Date() < new Date(program.startDateTimeISO ?? "") ||
-          new Date() > new Date(program.endDateTimeISO ?? "")
-        ) {
-          return;
-        }
-
-        program.incentivizedPoolSymbols.forEach((symbol) => {
-          const asset = useNativeChain().findAssetWithLikeSymbol(symbol);
-
-          if (asset) {
-            let list = lookup[asset.symbol];
-            if (!list) list = lookup[asset.symbol] = [];
-            list.push(program);
-          }
-        });
-      });
-
-      for (const symbol in lookup) {
-        lookup[symbol.slice(1)] = lookup[symbol];
-      }
-
-      return lookup;
-    },
-    symbolCompetitionsLookup(): CompetitionsBySymbolLookup | null {
-      return this.competitionsRes.data?.value || null;
-    },
     sanitizedPoolData(): ReturnType<
       typeof usePoolPageData
     >["allPoolsData"]["value"] {
@@ -231,11 +187,6 @@ export default defineComponent({
             }
           >
             {this.sanitizedPoolData.map((item) => {
-              const rewardsPrograms =
-                this.poolRewardProgramLookup[
-                  item.pool.externalAmount!.symbol
-                ] ?? [];
-
               const itemLp = item.liquidityProvider?.liquidityProvider;
               const filteredUnlock =
                 item.liquidityProvider?.liquidityProvider?.unlocks.filter(
@@ -313,12 +264,6 @@ export default defineComponent({
                             }),
                         }
                   }
-                  bonusRewardPrograms={rewardsPrograms}
-                  competitionsLookup={
-                    this.symbolCompetitionsLookup?.[
-                      item.pool.externalAmount!.symbol
-                    ]
-                  }
                   pool={item.pool}
                   poolStat={item.poolStat}
                   accountPool={item.accountPool}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sifchain-ui",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "private": true,
   "license": "UNLICENSED",
   "packageManager": "[email protected]",