fix: key farmRewards by accountId

near · May 16, 2022 · 303e615 · 303e615
1 parent 2549cac
commit 303e615
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/packages/frontend/src/components/staking/StakingContainer.js b/packages/frontend/src/components/staking/StakingContainer.js
@@ -214,8 +214,8 @@ export function StakingContainer({ history, match }) {
 
         validators
             .filter((validator) => validator.version === FARMING_VALIDATOR_VERSION)
-            .forEach((validator) => dispatch(getValidatorFarmData(validator, accountId)));
-    }, [accountId, validators]);
+            .forEach((validator) => dispatch(getValidatorFarmData(validator, currentAccount.accountId)));
+    }, [currentAccount, validators]);
 
     const handleAction = async (action, validator, amount) => {
         let id = Mixpanel.get_distinct_id();

diff --git a/packages/frontend/src/components/staking/components/Validator.js b/packages/frontend/src/components/staking/components/Validator.js
@@ -147,7 +147,7 @@ export default function Validator({
         dispatch(getValidatorFarmData(validator, currentAccountId));
     }, [validator, currentAccountId]);
 
-    const farmList = validatorFarmData?.farmRewards || [];
+    const farmList = validatorFarmData?.farmRewards?.[currentAccountId] || [];
     const tokenPriceMetadata = { tokenFiatValues, tokenWhitelist };
     const hasUnwhitelistedTokens = useMemo(
         () =>

diff --git a/packages/frontend/src/redux/actions/staking.js b/packages/frontend/src/redux/actions/staking.js
@@ -574,7 +574,7 @@ export const getValidatorFarmData = (validator, accountId) => async (dispatch, g
 
     const farmData = {
         poolSummary: {...poolSummary},
-        farmRewards: farmList,
+        farmRewards: {[accountId]: farmList},
     };
     await dispatch(staking.setValidatorFarmData(validator.accountId, farmData));
 };

diff --git a/packages/frontend/src/redux/crossStateSelectors/selectCollectedAvailableForClaimData.js b/packages/frontend/src/redux/crossStateSelectors/selectCollectedAvailableForClaimData.js
@@ -2,7 +2,7 @@ import BN from 'bn.js';
 import { isEmpty, some } from 'lodash';
 import { createSelector } from 'reselect';
 
-import { selectValidatorsFarmData } from '../slices/staking';
+import { selectStakingCurrentAccountAccountId, selectValidatorsFarmData } from '../slices/staking';
 import {
     selectTokensFiatValueUSD,
     selectTokenWhiteList,
@@ -18,9 +18,10 @@ const collectFarmingData = (args) => {
             contractMetadataByContractId,
             tokenFiatValues,
             tokenWhitelist,
+            accountId
         } = args;
         const filteredFarms = Object.values(validatorsFarmData)
-            .reduce((acc, {farmRewards}) => [...acc, ...farmRewards], []);
+            .reduce((acc, {farmRewards}) => [...acc, ...(farmRewards?.[accountId] || [])], []);
 
         const collectedBalance = filteredFarms.reduce((acc, farm) => ({
             ...acc,
@@ -51,18 +52,21 @@ export default createSelector(
         selectAllContractMetadata,
         selectTokensFiatValueUSD,
         selectTokenWhiteList,
+        selectStakingCurrentAccountAccountId
     ],
     (
         validatorsFarmData,
         contractMetadataByContractId,
         tokenFiatValues,
-        tokenWhitelist
+        tokenWhitelist,
+        accountId
     ) => {
         return collectFarmingData({
             validatorsFarmData,
             contractMetadataByContractId,
             tokenFiatValues,
-            tokenWhitelist
+            tokenWhitelist,
+            accountId
         });
     }
 );
diff --git a/packages/frontend/src/redux/reducers/staking/index.js b/packages/frontend/src/redux/reducers/staking/index.js
@@ -82,7 +82,12 @@ const stakingHandlers = handleActions({
         farmingValidators: {
             ...state.farmingValidators,
             [payload.validatorId]: {
-                ...payload.farmData
+                ...payload.farmData,
+                farmRewards: {
+                    ...state.farmingValidators?.[payload.validatorId]
+                        ?.farmRewards,
+                    ...payload.farmData.farmRewards,
+                }
             },
         }
     }),