[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
sora-xor · Oct 20, 2022 · fa2213f · fa2213f
1 parent 0784824
commit fa2213f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -20,7 +20,7 @@
         :value="poolAssetBalanceFormatted"
         :fiat-value="poolAssetBalanceFiat"
       />
-      <info-line :value="aprFormatted">
+      <info-line v-if="pricesAvailable" :value="aprFormatted">
         <template #info-line-prefix>
           <div class="apr">
             <span class="apr-label">{{ TranslationConsts.APR }}</span>
@@ -31,7 +31,7 @@
           </div>
         </template>
       </info-line>
-      <info-line :label="t('demeterFarming.info.totalLiquidityLocked')" :value="tvlFormatted" />
+      <info-line v-if="pricesAvailable" :label="t('demeterFarming.info.totalLiquidityLocked')" :value="tvlFormatted" />
       <info-line :label="t('demeterFarming.info.rewardToken')" :value="rewardAssetSymbol" />
 
       <info-line

diff --git a/src/modules/demeterFarming/components/StakeDialog.vue b/src/modules/demeterFarming/components/StakeDialog.vue
@@ -10,8 +10,12 @@
       </s-row>
 
       <div v-if="isAdding" class="stake-dialog-info">
-        <info-line :label="TranslationConsts.APR" :value="aprFormatted" />
-        <info-line :label="t('demeterFarming.info.totalLiquidityLocked')" :value="tvlFormatted" />
+        <info-line v-if="pricesAvailable" :label="TranslationConsts.APR" :value="aprFormatted" />
+        <info-line
+          v-if="pricesAvailable"
+          :label="t('demeterFarming.info.totalLiquidityLocked')"
+          :value="tvlFormatted"
+        />
         <info-line :label="t('demeterFarming.info.rewardToken')" :value="rewardAssetSymbol" />
       </div>
 

diff --git a/src/modules/demeterFarming/components/StatusBadge.vue b/src/modules/demeterFarming/components/StatusBadge.vue
@@ -7,7 +7,7 @@
 
     <div class="status-badge-title">
       <div>{{ title }}</div>
-      <div class="status-badge-title--mini">{{ aprFormatted }} APR</div>
+      <div v-if="pricesAvailable" class="status-badge-title--mini">{{ aprFormatted }} APR</div>
     </div>
   </div>
 </template>

diff --git 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<AccountAsset>;
   @getter.assets.assetDataByAddress getAsset!: (addr?: string) => Nullable<AccountAsset>;
 
+  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];