Rewards available change from .rewards() to .earned()

Fixed pool info being called from the correct contract. Stubbed home screen navigation. Signed-off-by: Anton Nell <[email protected]>
yfii · Jul 18, 2020 · cfc3934 · cfc3934
1 parent 0c9ae5c
commit cfc3934
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/src/App.js b/src/App.js
@@ -108,6 +108,9 @@ class App extends Component {
                   <Footer />
                   <Stake />
                 </Route>
+                <Route path="/staking">
+                  <RewardsPools />
+                </Route>
                 <Route path="/">
                   <RewardsPools />
                 </Route>

diff --git a/src/components/home/home.jsx b/src/components/home/home.jsx
@@ -7,12 +7,9 @@ import {
 } from '@material-ui/core';
 import { withNamespaces } from 'react-i18next';
 import { colors } from '../../theme'
-import FlashOnIcon from '@material-ui/icons/FlashOn';
 import AttachMoneyIcon from '@material-ui/icons/AttachMoney';
-import SecurityIcon from '@material-ui/icons/Security';
-import BarChartIcon from '@material-ui/icons/BarChart';
-import PieChartIcon from '@material-ui/icons/PieChart';
-import DetailsIcon from '@material-ui/icons/Details';
+import HowToVoteIcon from '@material-ui/icons/HowToVote';
+import WbIncandescentIcon from '@material-ui/icons/WbIncandescent';
 
 const styles = theme => ({
   root: {
@@ -190,27 +187,18 @@ class Home extends Component {
 
     return (
       <div className={ classes.root }>
-        <Card className={ `${classes.card} ${classes.earn}` } onClick={ () => { this.nav(location.pathname+'earn') } }>
+        <Card className={ `${classes.card} ${classes.earn}` } onClick={ () => { this.nav(location.pathname+'staking') } }>
           <AttachMoneyIcon className={ `${classes.icon} icon` } />
-          <Typography variant={'h3'} className={ `${classes.title} title` }>{ t("Home.Earn") }</Typography>
+          <Typography variant={'h3'} className={ `${classes.title} title` }>Stake</Typography>
         </Card>
-        <Card className={ `${classes.card} ${classes.zap}` } onClick={ () => { this.nav(location.pathname+'zap') } }>
-          <FlashOnIcon className={ `${classes.icon} icon` } />
-          <Typography variant={'h3'} className={ `${classes.title} title` }>{ t("Home.Zap") }</Typography>
+        <Card className={ `${classes.card} ${classes.zap}` } onClick={ () => { this.nav(location.pathname+'propose') } }>
+          <WbIncandescentIcon className={ `${classes.icon} icon` } />
+          <Typography variant={'h3'} className={ `${classes.title} title` }>Propose</Typography>
         </Card>
-        <Card className={ `${classes.card} ${classes.apr}` } onClick={ () => { this.nav(location.pathname+'apr') } }>
-          <BarChartIcon className={ `${classes.icon} icon` } />
-          <Typography variant={'h3'} className={ `${classes.title} title` }>{ t("Home.Apr") }</Typography>
+        <Card className={ `${classes.card} ${classes.apr}` } onClick={ () => { this.nav(location.pathname+'vote') } }>
+          <HowToVoteIcon className={ `${classes.icon} icon` } />
+          <Typography variant={'h3'} className={ `${classes.title} title` }>Vote</Typography>
         </Card>
-        <Card className={ `${classes.card} ${classes.cover}` } onClick={ () => { this.nav(location.pathname+'cover') }}>
-          <SecurityIcon className={ `${classes.icon} icon` } />
-          <Typography variant={'h3'} className={ `${classes.title} title` }>{ t("Home.Cover") }</Typography>
-        </Card>
-        <Card className={ `${classes.card} ${classes.pool}` } onClick={ () => { this.nav(location.pathname+'pool') }}>
-          <PieChartIcon className={ `${classes.icon} icon` } />
-          <Typography variant={'h3'} className={ `${classes.title} title` }>{ t("Home.Pool") }</Typography>
-        </Card>
-
       </div>
     )
   };

diff --git a/src/stores/store.jsx b/src/stores/store.jsx
@@ -325,7 +325,7 @@ class Store {
   }
 
   _getstakedBalance = async (web3, asset, account, callback) => {
-    let erc20Contract = new web3.eth.Contract(config.yCurveFiRewardsABI, config.yCurveFiRewardsAddress)
+    let erc20Contract = new web3.eth.Contract(asset.rewardsABI, asset.rewardsAddress)
 
     try {
       var balance = await erc20Contract.methods.balanceOf(account.address).call({ from: account.address });
@@ -337,12 +337,12 @@ class Store {
   }
 
   _getRewardsAvailable = async (web3, asset, account, callback) => {
-    let erc20Contract = new web3.eth.Contract(config.yCurveFiRewardsABI, config.yCurveFiRewardsAddress)
+    let erc20Contract = new web3.eth.Contract(asset.rewardsABI, asset.rewardsAddress)
 
     try {
-      var rewards = await erc20Contract.methods.rewards(account.address).call({ from: account.address });
-      rewards = parseFloat(rewards)/10**asset.decimals
-      callback(null, parseFloat(rewards))
+      var earned = await erc20Contract.methods.earned(account.address).call({ from: account.address });
+      earned = parseFloat(earned)/10**asset.decimals
+      callback(null, parseFloat(earned))
     } catch(ex) {
       return callback(ex)
     }