From fa2213fb9e0ae1689f0d03b65d0e6ca590ed0820 Mon Sep 17 00:00:00 2001 From: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Thu, 20 Oct 2022 08:52:16 +0300 Subject: [PATCH] [Demeter Farming] dont show APR& TVL if no prices from subquery (#839) * dont show apr & tvl if no prices from subquery' * fix roi * revert env.json --- .../demeterFarming/components/CalculatorDialog.vue | 2 +- src/modules/demeterFarming/components/PoolCard.vue | 4 ++-- src/modules/demeterFarming/components/StakeDialog.vue | 8 ++++++-- src/modules/demeterFarming/components/StatusBadge.vue | 2 +- src/modules/demeterFarming/mixins/AccountPoolMixin.ts | 4 ++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/modules/demeterFarming/components/CalculatorDialog.vue b/src/modules/demeterFarming/components/CalculatorDialog.vue index a479e9117..50f949c60 100644 --- a/src/modules/demeterFarming/components/CalculatorDialog.vue +++ b/src/modules/demeterFarming/components/CalculatorDialog.vue @@ -152,7 +152,7 @@ export default class CalculatorDialog extends Mixins(StakeDialogMixin) { get calculatedRoiPercent(): FPNumber { const depositInPoolsAsset = new FPNumber(this.poolAssetValue || 0); - if (depositInPoolsAsset.isZero()) return FPNumber.ZERO; + if (depositInPoolsAsset.isZero() || this.poolAssetPrice.isZero()) return FPNumber.ZERO; // for liquidity pool we multiply deposit in pool asset by 2 const multiplier = this.isFarm ? 2 : 1; diff --git a/src/modules/demeterFarming/components/PoolCard.vue b/src/modules/demeterFarming/components/PoolCard.vue index 1c662c143..d9022b279 100644 --- a/src/modules/demeterFarming/components/PoolCard.vue +++ b/src/modules/demeterFarming/components/PoolCard.vue @@ -20,7 +20,7 @@ :value="poolAssetBalanceFormatted" :fiat-value="poolAssetBalanceFiat" /> - + - +
- - + +
diff --git a/src/modules/demeterFarming/components/StatusBadge.vue b/src/modules/demeterFarming/components/StatusBadge.vue index 708202fa6..a23526f88 100644 --- a/src/modules/demeterFarming/components/StatusBadge.vue +++ b/src/modules/demeterFarming/components/StatusBadge.vue @@ -7,7 +7,7 @@
{{ title }}
-
{{ aprFormatted }} APR
+
{{ aprFormatted }} APR
diff --git a/src/modules/demeterFarming/mixins/AccountPoolMixin.ts b/src/modules/demeterFarming/mixins/AccountPoolMixin.ts index 3035e0a7e..96da2e178 100644 --- a/src/modules/demeterFarming/mixins/AccountPoolMixin.ts +++ b/src/modules/demeterFarming/mixins/AccountPoolMixin.ts @@ -20,6 +20,10 @@ export default class AccountPoolMixin extends Mixins(mixins.FormattedAmountMixin @getter.assets.xor xor!: Nullable; @getter.assets.assetDataByAddress getAsset!: (addr?: string) => Nullable; + get pricesAvailable(): boolean { + return Object.keys(this.fiatPriceAndApyObject).length > 0; + } + // Override it component for another use case get networkFee(): CodecString { return this.networkFees[Operation.DemeterFarmingGetRewards];