fix: hide farm if inactive and zero balance

near · Mar 21, 2022 · 8bf34c9 · 8bf34c9
1 parent 24e4988
commit 8bf34c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/frontend/src/components/staking/components/Validator.js b/packages/frontend/src/components/staking/components/Validator.js
@@ -1,3 +1,4 @@
+import BN from 'bn.js';
 import React, { useState, useEffect } from 'react';
 import { Translate } from 'react-localize-redux';
 import { useDispatch, useSelector } from 'react-redux';
@@ -28,10 +29,10 @@ const renderFarmUi = ({ farmList, contractMetadataByContractId, openModal, token
     }
 
     return farmList.map((farm, i) => {
-        const { token_id, balance, farm_id } = farm;
+        const { token_id, balance, farm_id, active } = farm;
         const currentTokenContractMetadata = contractMetadataByContractId[token_id];
 
-        if (!currentTokenContractMetadata) {
+        if (!currentTokenContractMetadata || (!active && new BN(balance).isZero())) {
             return;
         }
         const fiatValueMetadata = tokenPriceMetadata.tokenFiatValues[token_id];

diff --git a/packages/frontend/src/redux/actions/staking.js b/packages/frontend/src/redux/actions/staking.js
@@ -532,7 +532,7 @@ export const getValidatorFarmData = (validator, accountId) => async (dispatch, g
     const poolSummary = await validator.contract.get_pool_summary();
     const farms = await validator.contract.get_farms({ from_index: 0, limit: 300 });
 
-    const list = await Promise.all(farms.map(({ token_id, farm_id }) => {
+    const list = await Promise.all(farms.map(({ token_id, farm_id, active }) => {
         try {
             dispatch(fetchToken({ contractName: token_id }));
             return validator.contract
@@ -542,13 +542,15 @@ export const getValidatorFarmData = (validator, accountId) => async (dispatch, g
                     token_id,
                     balance,
                     farm_id,
+                    active
                 }));
         } catch (error) {
             console.error(error);
             return ({
                 token_id,
                 farm_id,
-                balance: 0
+                balance: 0,
+                active
             });
         }