@@ -243,10 +243,10 @@ export default class App extends React.Component {
diff --git a/web-front/src/components/rewardPools/rewardPools.jsx b/web-front/src/components/rewardPools/rewardPools.jsx
index 1832cd2..04389cf 100644
--- a/web-front/src/components/rewardPools/rewardPools.jsx
+++ b/web-front/src/components/rewardPools/rewardPools.jsx
@@ -198,21 +198,21 @@ const styles = theme => ({
display:'flex',
justifyContent:'center',
alignItems:'center',
- '& a':{
- color:'rgba(67,73,118,1)',
- textDecoration:'underline',
- // display:'block',
- // width:'10px',
- // height:'10px',
- // margin:'0 0 12px 14px',
- // backgroundImage:'url('+require('../../assets/pool-link-icon.svg')+')',
- // backgroundSize:'auto',
- // backgroundRepeat:'no-repeat',
- '&:hover':{
- color:'#BA59FF'
- // backgroundImage:'url('+require('../../assets/pool-linked-icon.svg')+')',
- }
- },
+ // '& a':{
+ // color:'rgba(67,73,118,1)',
+ // textDecoration:'underline',
+ // // display:'block',
+ // // width:'10px',
+ // // height:'10px',
+ // // margin:'0 0 12px 14px',
+ // // backgroundImage:'url('+require('../../assets/pool-link-icon.svg')+')',
+ // // backgroundSize:'auto',
+ // // backgroundRepeat:'no-repeat',
+ // '&:hover':{
+ // color:'#BA59FF'
+ // // backgroundImage:'url('+require('../../assets/pool-linked-icon.svg')+')',
+ // }
+ // },
},
poolName: {
height: '25px',
@@ -222,6 +222,13 @@ const styles = theme => ({
lineHeight: '19px',
marginBottom: '8px'
},
+ underLine:{
+ color:'rgba(67,73,118,1)',
+ textDecoration:'underline',
+ '&:hover':{
+ color:'#BA59FF'
+ }
+ },
tokensList: {
color: '#A4A7BE',
marginBottom: '10px',
@@ -349,6 +356,14 @@ const styles = theme => ({
margin: '20px auto 15px'
}
},
+ svgCenterdUSD: {
+ width: '80px',
+ height: '80px',
+ margin: '20px auto 20px',
+ [theme.breakpoints.down('md')]: {
+ margin: '20px auto 20px'
+ }
+ },
// poolAPY
poolApy:{
width:'874px',
@@ -567,12 +582,14 @@ class RewardPools extends Component {
:
+ rp.id !== 'dUSD'?
|
{ROI[rp.id] ? this.formatAPYNumber(ROI[rp.id]*100)+'%' : '...'} |
0.00% |
{ROI[rp.id] ? this.formatAPYNumber(ROI[rp.id]*100)+'%' : '...'} |
+ :<>
))
}
|
@@ -663,7 +680,7 @@ class RewardPools extends Component {
{
rewardPool.map(rp=>(
))
@@ -691,28 +708,44 @@ class RewardPools extends Component {
return (
{/*
*/}
-
Uniswap {rewardPool.id}
-
{rewardPool.website}
-
-
- {/* */}
- {/* */}
-
- {/* */}
- {/* */}
- {/* {rewardPool.tokens.length > 0 && "Supported Tokens: " + tokensList}
- {rewardPool.tokens.length == 0 && "No supported tokens currently"} */}
-
- {/*
- {
-
-
- {ROI[rewardPool.tokens[0].ROI] ? this.formatAPYNumber(ROI[rewardPool.tokens[0].ROI]*100)+'%' : '...'}
-
-
- }
-
*/}
-
{ if (rewardPool.tokens.length > 0) { this.navigateStake(rewardPool) } }}>
+ {/* {
+ rewardPool.id === 'dUSD'?
+ <>
+
{rewardPool.id}
+
{rewardPool.website}
+
+
+
+
+
{ if (rewardPool.tokens.length > 0) { this.navigateStake(rewardPool) } }}>
+
+
+ :
+ <> */}
+
{rewardPool.id}
+
{rewardPool.website}
+
+
+ {/* */}
+ {/* */}
+
+ {/* */}
+ {/* */}
+ {/* {rewardPool.tokens.length > 0 && "Supported Tokens: " + tokensList}
+ {rewardPool.tokens.length == 0 && "No supported tokens currently"} */}
+
+ {/*
+ {
+
+
+ {ROI[rewardPool.tokens[0].ROI] ? this.formatAPYNumber(ROI[rewardPool.tokens[0].ROI]*100)+'%' : '...'}
+
+
+ }
+
*/}
+
{ if (rewardPool.tokens.length > 0) { this.navigateStake(rewardPool) } }}>
+ {/*
+ } */}
)
}
}
diff --git a/web-front/src/components/stake/stake.jsx b/web-front/src/components/stake/stake.jsx
index b9761d7..8c167e2 100644
--- a/web-front/src/components/stake/stake.jsx
+++ b/web-front/src/components/stake/stake.jsx
@@ -211,10 +211,30 @@ const styles = (theme) => ({
// marginBottom:'0'
// }
},
+ lastdUSDField:{
+ display: "flex",
+ alignItems: "center",
+ flex: "1",
+ flexDirection: "column",
+ borderRight: "0",
+ paddingTop:"15px",
+ [theme.breakpoints.down("md")]: {
+ paddingTop:"10px",
+ }
+ },
+ overviewTitledUSD: {
+ color: "#A4A7BE",
+ fontSize: "14px",
+ marginBottom: "7px",
+ [theme.breakpoints.down("md")]: {
+ fontSize: "12px",
+ marginBottom: "4px",
+ },
+ },
overviewTitle: {
color: "#A4A7BE",
fontSize: "14px",
- marginBottom: "13px",
+ marginBottom: "17px",
[theme.breakpoints.down("md")]: {
fontSize: "12px",
marginBottom: "8px",
@@ -750,36 +770,39 @@ class Stake extends Component {
// })
// })
// .catch(e => console.log("Oops, error", e))
- setTimeout(async () => {
- const { account } = this.state;
- if (
- !Object.getOwnPropertyNames(account).length ||
- account.address === undefined
- ) {
- this.setState(() => ({
- modalOpen: true,
- }));
- }
- if (store.getStore("web3context") !== null) {
- const asset = this.state.pool;
- const web3 = new Web3(store.getStore("web3context").library.provider);
- const LockContract = new web3.eth.Contract(
- asset.tokens[0].rewardsABI,
- asset.tokens[0].rewardsAddress
- );
- // return;
- const Locked = await LockContract.methods.lockedDetails().call();
-
- if (Locked[0]) {
- this.setState({
- unstakeLock: true,
- timeStamp: Locked[1],
- });
- } else {
- console.log(Locked);
+ const asset = this.state.pool;
+ if(asset.id !== 'dUSD'){
+ setTimeout(async () => {
+ const { account } = this.state;
+ if (
+ !Object.getOwnPropertyNames(account).length ||
+ account.address === undefined
+ ) {
+ this.setState(() => ({
+ modalOpen: true,
+ }));
}
- }
- }, 1000);
+ if (store.getStore("web3context") !== null) {
+ // const asset = this.state.pool;
+ const web3 = new Web3(store.getStore("web3context").library.provider);
+ const LockContract = new web3.eth.Contract(
+ asset.tokens[0].rewardsABI,
+ asset.tokens[0].rewardsAddress
+ );
+ // return;
+ const Locked = await LockContract.methods.lockedDetails().call();
+
+ if (Locked[0]) {
+ this.setState({
+ unstakeLock: true,
+ timeStamp: Locked[1],
+ });
+ } else {
+ console.log(Locked);
+ }
+ }
+ }, 1000);
+ }
}
componentWillUnmount() {
emitter.removeListener(CONNECTION_CONNECTED, this.connectionConnected);
@@ -965,7 +988,12 @@ class Stake extends Component {
-
+ {
+ (pool.id !== 'dUSD')?
+
+ :
+
+ }
@@ -1023,29 +1051,56 @@ class Stake extends Component {
{pool.tokens[0].symbol}
-
-
+
+
- {/* {pool.tokens[0].rewardsSymbol == '$' ? pool.tokens[0].rewardsSymbol : ''} {pool.tokens[0].rewardsAvailable ? pool.tokens[0].rewardsAvailable.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,') : "0"} {pool.tokens[0].rewardsSymbol != '$' ? pool.tokens[0].rewardsSymbol : ''} */}
-
- {pool.tokens[0].rewardsSymbol == "$"
- ? pool.tokens[0].rewardsSymbol
- : ""}
- {pool.tokens[0].rewardsAvailable
- ?
- // (
- // pool.tokens[0].rewardsAvailable /
- // 10 ** pool.tokens[0].rewardsDecimal
- // )
- // .toFixed(2)
- // .replace(/(\d)(?=(\d{3})+\.)/g, "$1,")
- this.formatNumber(pool.tokens[0].rewardsAvailable, pool.tokens[0].decimals, 4)
- : "0"}
- {pool.tokens[0].rewardsSymbol != "$"
- ? pool.tokens[0].rewardsSymbol
- : ""}
-
+ {
+ // dUSD-SFG/DF
+
+ (pool.id === 'dUSD')?
+ <>
+
+ {pool.tokens[0].rewardsSymbol[0] == "$"
+ ? pool.tokens[0].rewardsSymbol[0]
+ : ""}
+ {pool.tokens[0].rewardsAvailable[0]
+ ?
+ this.formatNumber(pool.tokens[0].rewardsAvailable[0], pool.tokens[0].decimals, 4)
+ : "0"}
+ {pool.tokens[0].rewardsSymbol[0] != "$"
+ ? pool.tokens[0].rewardsSymbol[0]
+ : ""}
+
+
+ {pool.tokens[0].rewardsSymbol[1] == "$"
+ ? pool.tokens[0].rewardsSymbol[1]
+ : ""}
+ {pool.tokens[0].rewardsAvailable[1]
+ ?
+ this.formatNumber(pool.tokens[0].rewardsAvailable[1], pool.tokens[0].decimals, 4)
+ : "0"}
+ {pool.tokens[0].rewardsSymbol[1] != "$"
+ ? pool.tokens[0].rewardsSymbol[1]
+ : ""}
+
+
+
+ // dUSD-SFG/DF
+ :
+
+ {pool.tokens[0].rewardsSymbol == "$"
+ ? pool.tokens[0].rewardsSymbol
+ : ""}
+ {pool.tokens[0].rewardsAvailable
+ ?
+ this.formatNumber(pool.tokens[0].rewardsAvailable, pool.tokens[0].decimals, 4)
+ : "0"}
+ {pool.tokens[0].rewardsSymbol != "$"
+ ? pool.tokens[0].rewardsSymbol
+ : ""}
+
+ }
{/*
@@ -1092,47 +1147,92 @@ class Stake extends Component {
voteLock,
unstakeLock,
} = this.state;
-
return (
-
-
*/}
- 
-