shielded rewards updates. (#232)

SrikanthSoparla · web-flow · commit 867c8ab2bb8f · 2025-06-18T20:58:17.000+05:30
diff --git a/src/Router.js b/src/Router.js
@@ -33,7 +33,7 @@ const routes = [{
     path: '/tokens',
     component: Tokens,
 }, {
-    path: '/tokensShielded',
+    path: '/shieldedTokens',
     component: Tokens,
 // },  {
 //     path: '/externalTransfer/withdraw',
diff --git a/src/actions/accounts/index.js b/src/actions/accounts/index.js
@@ -33,6 +33,9 @@ import {
     BALANCE_LIST_FETCH_SUCCESS,
     BALANCE_LIST_FETCH_ERROR,
     SHIELDED_BALANCE_PROGRESS_SET,
+    FETCH_SHIELDED_REWARDS_IN_PROGRESS,
+    FETCH_SHIELDED_REWARDS_SUCCESS,
+    FETCH_SHIELDED_REWARDS_ERROR,
 } from '../../constants/accounts';
 import Axios from 'axios';
 import { urlFetchRevealedPubkey, urlFetchRewards, urlFetchUnBondingDelegations, urlFetchVestingBalance, urlFetchBlockHeight, urlFetchTokensList, urlFetchBalanceList } from '../../constants/url';
@@ -45,6 +48,7 @@ import { config } from '../../config';
 import { getSdk } from '@namada/sdk/web';
 import init from '@namada/sdk/web-init';
 import { workerShieldedSync } from 'workers/balanceServices';
+import { fetchShieldedRewards } from 'workers/services';
 // import { Tokens } from '@namada/types';
 
 export const setAccountAddress = (value, shieldedAddress, shieldedDetails) => {
@@ -661,3 +665,43 @@ export const reSyncBalance = (viewingKey, timestamp, tnam, znam, chainId = confi
         }
     }
 };
+
+const shieldedRewardsFetchInProgress = () => ({
+    type: FETCH_SHIELDED_REWARDS_IN_PROGRESS,
+});
+
+const shieldedRewardsFetchSuccess = (value) => ({
+    type: FETCH_SHIELDED_REWARDS_SUCCESS,
+    value,
+});
+
+const shieldedRewardsFetchError = (error) => ({
+    type: FETCH_SHIELDED_REWARDS_ERROR,
+    message: error || 'Failed to fetch shielded Rewards',
+});
+
+
+export const getShieldedRewards = (viewingKey, chainId = config.CHAIN_ID, cb) => async (dispatch) => {
+    dispatch(shieldedRewardsFetchInProgress());
+    try {
+        const rewards =  await fetchShieldedRewards(
+            viewingKey,
+            chainId,
+            config.RPC_URL,
+        );
+        dispatch(shieldedRewardsFetchSuccess(rewards));
+        if (cb) {
+            cb(rewards);
+        }
+    } catch (error) {
+        console.error('❌ Shielded rewards error:', {
+            message: error.message || 'Unknown error',
+            error,
+            chainId,
+        });
+        dispatch(shieldedRewardsFetchError(error.message || 'Unknown error'));
+        if (cb) {
+            cb(null);
+        }
+    }
+};
diff --git a/src/constants/accounts.js b/src/constants/accounts.js
@@ -45,6 +45,10 @@ export const FETCH_SHIELDED_BALANCE_SUCCESS = 'FETCH_SHIELDED_BALANCE_SUCCESS';
 export const SHIELDED_BALANCE_PROGRESS_SET = 'SHIELDED_BALANCE_PROGRESS_SET';
 export const FETCH_SHIELDED_BALANCE_ERROR = 'FETCH_SHIELDED_BALANCE_ERROR';
 
+export const FETCH_SHIELDED_REWARDS_IN_PROGRESS = 'FETCH_SHIELDED_REWARDS_IN_PROGRESS';
+export const FETCH_SHIELDED_REWARDS_SUCCESS = 'FETCH_SHIELDED_REWARDS_SUCCESS';
+export const FETCH_SHIELDED_REWARDS_ERROR = 'FETCH_SHIELDED_REWARDS_ERROR';
+
 // export const FETCH_SHIELDED_SYNC_IN_PROGRESS = 'FETCH_SHIELDED_SYNC_IN_PROGRESS';
 // export const FETCH_SHIELDED_SYNC_SUCCESS = 'FETCH_SHIELDED_SYNC_SUCCESS';
 // export const FETCH_SHIELDED_SYNC_ERROR = 'FETCH_SHIELDED_SYNC_ERROR';
diff --git a/src/containers/Home/TokenDetails/index.js b/src/containers/Home/TokenDetails/index.js
@@ -82,6 +82,8 @@ const TokenDetails = (props) => {
         }, 0);
     rewards = rewards ? rewards / 10 ** config.COIN_DECIMALS : 0;
 
+    const shieldedRewards = props.shieldedRewards && props.shieldedRewards / 10 ** config.COIN_DECIMALS;
+
     const handleTransfer = () => {
         const value = {
             name: 'Transparent Namada',
@@ -167,6 +169,21 @@ const TokenDetails = (props) => {
                     {/*         /!* <Compound disable={tokens <= 0}/> *!/ */}
                 </div>
             </div>
+            {/* <div className="chip_info">Add commentMore actions
+                <p>{variables[props.lang].shielded_rewards}</p>
+                {props.shieldedRewardsInProgress ? (
+                    <ChipSkeleton/>
+                ) : (
+                    <div className="chip">
+                        <img alt="total tokens" src={rewardsIcon}/>
+                        <p>{shieldedRewards > 0 ? shieldedRewards.toFixed(4) : 0}</p>
+                    </div>
+                )}
+
+                <div className="buttons_div">
+                    <ClaimButton disable={rewards <= 0}/>
+                </div>
+            </div> */}
             {/* <div className="chip_info"> */}
             {/*     <p>{variables[props.lang]['un_staked_tokens']}</p> */}
             {/*     <div className="chip"> */}
@@ -194,6 +211,8 @@ TokenDetails.propTypes = {
     setIBCTransferType: PropTypes.func.isRequired,
     fetchGasEstimation: PropTypes.func.isRequired,
     showTransparentTokensTransferDialog: PropTypes.func.isRequired,
+    shieldedRewards: PropTypes.object.isRequired,
+    shieldedRewardsInProgress: PropTypes.bool.isRequired,
     shieldedBalance: PropTypes.array,
     shieldedBalanceInProgress: PropTypes.bool,
     unBondingDelegations: PropTypes.arrayOf(
@@ -222,6 +241,8 @@ const stateToProps = (state) => {
         unBondingDelegationsInProgress: state.accounts.unBondingDelegations.inProgress,
         rewards: state.accounts.rewards.result,
         rewardsInProgress: state.accounts.rewards.inProgress,
+        shieldedRewards: state.accounts.shieldedRewards.result,
+        shieldedRewardsInProgress: state.accounts.shieldedRewards.inProgress,
         lang: state.language,
         revealPublicKey: state.accounts.revealPublicKey.result,
     };
diff --git a/src/containers/NavBar/ConnectDialog/NamadaConnectButton.js b/src/containers/NavBar/ConnectDialog/NamadaConnectButton.js
@@ -15,6 +15,7 @@ import {
     fetchBalanceList,
     shieldedBalanceFetchSuccess,
     reSyncBalance,
+    getShieldedRewards,
 } from '../../../actions/accounts';
 import { connect } from 'react-redux';
 import { showMessage } from '../../../actions/snackbar';
@@ -60,6 +61,7 @@ const KeplrConnectButton = (props) => {
             // const address2 = `${shieldedAddress?.[1]?.address ?? ""}`;
             if (shieldedAddress && shieldedAddress.length && shieldedAddress[1]) {
                 props.getShieldedBalance(shieldedAddress[1]?.viewingKey, shieldedAddress[1]?.timestamp, addressList?.address, shieldedAddress[1]?.address);
+                // props.getShieldedRewards(shieldedAddress[1]?.viewingKey);
             }
             // props.fetchVestingBalance(addressList && addressList.address);
             // if (!props.proposalTab) {
@@ -99,6 +101,7 @@ KeplrConnectButton.propTypes = {
     getDelegatedValidatorsDetails: PropTypes.func.isRequired,
     getDelegations: PropTypes.func.isRequired,
     getShieldedBalance: PropTypes.func.isRequired,
+    getShieldedRewards: PropTypes.func.isRequired,
     getUnBondingDelegations: PropTypes.func.isRequired,
     hideConnectDialog: PropTypes.func.isRequired,
     lang: PropTypes.string.isRequired,
@@ -127,6 +130,7 @@ const actionsToProps = {
     hideConnectDialog,
     getBalance,
     getShieldedBalance,
+    getShieldedRewards,
     getUnBondingDelegations,
     fetchRewards,
     setAccountDetails,
diff --git a/src/containers/NavBar/Tabs.js b/src/containers/NavBar/Tabs.js
@@ -42,7 +42,7 @@ class Tabs extends Component {
             if (this.props.router.location.pathname.split('/')[2] && this.props.router.location.pathname.split('/')[2] === 'withdraw') {
                 this.props.setExternalTransferSubTabs('namada_to_ibc_chain_transparent_transfer');
             }
-        } else if (this.state.value !== route && (route === 'tokensShielded')) {
+        } else if (this.state.value !== route && (route === 'shieldedTokens')) {
             this.props.setAssetsTabs('shielded');
             this.setState({
                 value: 'tokens',
@@ -74,7 +74,7 @@ class Tabs extends Component {
                 if (this.props.router.location.pathname.split('/')[2] && this.props.router.location.pathname.split('/')[2] === 'withdraw') {
                     this.props.setExternalTransferSubTabs('namada_to_ibc_chain_transparent_transfer');
                 }
-            } else if (value !== this.state.value && (value === 'tokensShielded')) {
+            } else if (value !== this.state.value && (value === 'shieldedTokens')) {
                 this.props.setAssetsTabs('shielded');
                 this.setState({
                     value: 'tokens',
diff --git a/src/containers/NavBar/index.js b/src/containers/NavBar/index.js
@@ -22,6 +22,7 @@ import {
     getBalance,
     getDelegations,
     getShieldedBalance,
+    getShieldedRewards,
     getUnBondingDelegations,
     reSyncBalance,
     setAccountAddress,
@@ -369,6 +370,7 @@ class NavBar extends Component {
                 const index = shieldedAddress.findIndex((val) => val.address === address);
                 if (shieldedAddress[index + 1]) {
                     this.props.getShieldedBalance(shieldedAddress[index + 1]?.viewingKey, shieldedAddress[index + 1]?.timestamp, address, shieldedAddress[index + 1]?.address);
+                    // this.props.getShieldedRewards(shieldedAddress[index + 1]?.viewingKey);
                 }
             }
             this.props.fetchTokensList();
@@ -622,6 +624,7 @@ NavBar.propTypes = {
     getUnBondingDelegations: PropTypes.func.isRequired,
     getValidators: PropTypes.func.isRequired,
     getShieldedBalance: PropTypes.func.isRequired,
+    getShieldedRewards: PropTypes.func.isRequired,
     fetchUnBondingValidators: PropTypes.func.isRequired,
     shieldedBalanceFetchSuccess: PropTypes.func.isRequired,
     handleClose: PropTypes.func.isRequired,
@@ -748,6 +751,7 @@ const actionToProps = {
     fetchTokensList,
     fetchBalanceList,
     getShieldedBalance,
+    getShieldedRewards,
     fetchUnBondingValidators,
     shieldedBalanceFetchSuccess,
     fetchGasPrice,
diff --git a/src/containers/Stake/DelegateDialog/SuccessDialog.js b/src/containers/Stake/DelegateDialog/SuccessDialog.js
@@ -105,7 +105,7 @@ const SuccessDialog = (props) => {
                                 : props.router && props.router.location && (props.router.location.pathname === '/externalTransfer' ||
                                 props.router.location.pathname === '/internalTransfer' || props.router.location.pathname === '/externalTransfer/withdraw' ||
                                 props.router.location.pathname === '/externalShielding' || props.router.location.pathname === '/internalShielding' ||
-                                props.router.location.pathname === '/tokens' || props.router.location.pathname === '/tokensShielded')
+                                props.router.location.pathname === '/tokens' || props.router.location.pathname === '/shieldedTokens')
                                     ? <h1>{variables[props.lang].tokens_trans_success}</h1>
                                     : props.router && props.router.params && props.router.params.proposalID
                                         ? <h1>{variables[props.lang].vote_success}</h1>
@@ -127,7 +127,7 @@ const SuccessDialog = (props) => {
                     : props.router && props.router.location && (props.router.location.pathname === '/externalTransfer' ||
                     props.router.location.pathname === '/internalTransfer' || props.router.location.pathname === '/externalTransfer/withdraw' ||
                     props.router.location.pathname === '/externalShielding' || props.router.location.pathname === '/internalShielding' ||
-                    props.router.location.pathname === '/tokens' || props.router.location.pathname === '/tokensShielded')
+                    props.router.location.pathname === '/tokens' || props.router.location.pathname === '/shieldedTokens')
                         ? <>
                             <div className="row">
                                 <p>{variables[props.lang]['transaction_hash']}</p>
diff --git a/src/containers/Tokens/Tabs.js b/src/containers/Tokens/Tabs.js
@@ -23,7 +23,7 @@ const AssetTabs = (props) => {
     const handleChange = (newValue) => {
         props.onChange(newValue);
         if (newValue === 'shielded') {
-            props.router.navigate('/tokensShielded');
+            props.router.navigate('/shieldedTokens');
         } else {
             props.router.navigate('/tokens');
         }
diff --git a/src/reducers/accounts/index.js b/src/reducers/accounts/index.js
@@ -34,6 +34,9 @@ import {
     BALANCE_LIST_FETCH_SUCCESS,
     BALANCE_LIST_FETCH_ERROR,
     SHIELDED_BALANCE_PROGRESS_SET,
+    FETCH_SHIELDED_REWARDS_IN_PROGRESS,
+    FETCH_SHIELDED_REWARDS_SUCCESS,
+    FETCH_SHIELDED_REWARDS_ERROR,
 } from '../../constants/accounts';
 
 const address = (state = {
@@ -389,6 +392,37 @@ const revealPublicKey = (state = {
     }
 };
 
+const shieldedRewards = (state = {
+    result: 0,
+    inProgress: false,
+}, action) => {
+    switch (action.type) {
+    case FETCH_SHIELDED_REWARDS_IN_PROGRESS:
+        return {
+            ...state,
+            inProgress: true,
+        };
+    case FETCH_SHIELDED_REWARDS_SUCCESS:
+        return {
+            ...state,
+            inProgress: false,
+            result: action.value,
+        };
+    case FETCH_SHIELDED_REWARDS_ERROR:
+        return {
+            ...state,
+            inProgress: false,
+        };
+    case DISCONNECT_SET:
+        return {
+            ...state,
+            result: {},
+        };
+    default:
+        return state;
+    }
+};
+
 export default combineReducers({
     address,
     delegations,
@@ -402,4 +436,5 @@ export default combineReducers({
     rewards,
     revealPublicKey,
     shieldedBalance,
+    shieldedRewards,
 });
diff --git a/src/utils/variables.js b/src/utils/variables.js
@@ -50,6 +50,7 @@ const variables = {
         pending: 'Pending',
         closed: 'Rejected',
         rewards: 'Rewards',
+        shielded_rewards: 'Shielded Rewards',
         claim: 'Claim',
         send: 'Send',
         compound: 'Compound',
diff --git a/src/workers/MaspTxWroker.js b/src/workers/MaspTxWroker.js
@@ -75,16 +75,16 @@ export class Worker {
     };
   }
 
-//   async shieldedRewards(m: ShieldedRewards): Promise<ShieldedRewardsDone> {
-//     if (!this.sdk) {
-//       throw new Error("SDK is not initialized");
-//     }
+  async shieldedRewards(m) {
+    if (!this.sdk) {
+      throw new Error("SDK is not initialized");
+    }
 
-//     return {
-//       type: "shielded-rewards-done",
-//       payload: await shieldedRewards(this.sdk, m.payload),
-//     };
-//   }
+    return {
+      type: "shielded-rewards-done",
+      payload: await shieldedRewards(this.sdk, m.payload),
+    };
+  }
 
 //   async shieldedRewardsPerToken(
 //     m: ShieldedRewardsPerToken
@@ -222,6 +222,16 @@ async function generateIbcShieldingMemo(
   return memo;
 }
 
+async function shieldedRewards(
+  sdk,
+  payload,
+) {
+  const { viewingKey, chainId } = payload;
+  await fetchMaspParams(sdk, chainId);
+
+  return await sdk.rpc.shieldedRewards(viewingKey, chainId);
+}
+
 function newSdk(
   cryptoMemory,
   payload
@@ -248,8 +258,8 @@ export const registerTransferHandlers = () => {
 //   registerBNTransferHandler<ShieldedRewardsPerTokenDone>(
 //     "shielded-rewards-per-token-done"
 //   );
-//   registerBNTransferHandler<ShieldedRewards>("shielded-rewards");
-//   registerBNTransferHandler<ShieldedRewardsDone>("shielded-rewards-done");
+  registerBNTransferHandler("shielded-rewards");
+  registerBNTransferHandler("shielded-rewards-done");
 //   registerBNTransferHandler<Broadcast>("broadcast");
 };
 
diff --git a/src/workers/services.js b/src/workers/services.js

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ const AssetTabs = (props) => {`
`23`	`23`	`const handleChange = (newValue) => {`
`24`	`24`	`props.onChange(newValue);`
`25`	`25`	`if (newValue === 'shielded') {`
`26`		`- props.router.navigate('/tokensShielded');`
	`26`	`+ props.router.navigate('/shieldedTokens');`
`27`	`27`	`} else {`
`28`	`28`	`props.router.navigate('/tokens');`
`29`	`29`	`}`