Merge branch 'master' into stake-in-yearn-vault

SeaSaltyFunk · Dec 10, 2021 · 351a01a · 351a01a
2 parents a7ef0e9 + cf63564
commit 351a01a
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 31 deletions.
diff --git a/components/ffCurveGauge/ffCurveGauge.js b/components/ffCurveGauge/ffCurveGauge.js
@@ -423,7 +423,7 @@ export default function ffCurveGauge({ asset }) {
                         disabled={depositLoading || !depositApprovalNotRequired}
                         onClick={onDeposit}
                       >
-                        <Typography className={classes.actionButtonText}>{depositLoading ? `Depositing` : `Deposit`}</Typography>
+                        <Typography className={classes.actionButtonText}>{depositLoading ? `Staking` : `Stake`}</Typography>
                         {depositLoading && <CircularProgress size={10} className={classes.loadingCircle} />}
                       </Button>
                     </div>
@@ -438,7 +438,7 @@ export default function ffCurveGauge({ asset }) {
                         disabled={depositLoading}
                         onClick={onWithdraw}
                       >
-                        <Typography className={classes.actionButtonText}>{depositLoading ? `Withdrawing` : `Withdraw`}</Typography>
+                        <Typography className={classes.actionButtonText}>{depositLoading ? `Unstaking` : `Unstake`}</Typography>
                         {depositLoading && <CircularProgress size={10} className={classes.loadingCircle} />}
                       </Button>
                     </div>

diff --git a/components/ffVest/ffVest.module.css b/components/ffVest/ffVest.module.css
@@ -58,7 +58,6 @@
 .vestPeriodToggle {
   background: none;
   font-size: 12px !important;
-  margin-top: 10px;
   transform: scale(0.84);
   opacity: 0.6;
 }
@@ -258,6 +257,20 @@
   height: 130px;
 }
 
+.inline {
+  display: flex;
+  align-items: center;
+  margin-top: 10px;
+}
+
+.expiresIn {
+  background: none;
+
+  -webkit-transform: scale(0.84);
+  transform: scale(0.84);
+  opacity: 0.6;
+}
+
 @media screen and (max-width: 1200px) {
   .container {
     top: 180px;

diff --git a/components/ffVest/lockDuration.js b/components/ffVest/lockDuration.js
@@ -37,7 +37,7 @@ export default function ffLockDuration({ ibff, veIBFF, veIBFFOld }) {
   }, []);
 
   useEffect(() => {
-    if(veIBFF.vestingInfo.lockEnds) {
+    if(veIBFF && veIBFF.vestingInfo && veIBFF.vestingInfo.lockEnds) {
       setSelectedDate(moment.unix(veIBFF.vestingInfo.lockEnds).format('YYYY-MM-DD'))
       setSelectedValue(null)
     }
@@ -67,7 +67,7 @@ export default function ffLockDuration({ ibff, veIBFF, veIBFFOld }) {
         break;
       default:
     }
-    const newDate = moment.unix(veIBFF.vestingInfo.lockEnds).add(days, 'days').format('YYYY-MM-DD');
+    const newDate = moment().add(days, 'days').format('YYYY-MM-DD');
 
     setSelectedDate(newDate);
   }
@@ -98,12 +98,15 @@ export default function ffLockDuration({ ibff, veIBFF, veIBFFOld }) {
                   shrink: true,
                 }}
               />
-              <RadioGroup className={classes.vestPeriodToggle} row aria-label="position" name="position" onChange={handleChange} value={selectedValue}>
-                <FormControlLabel value="week" control={<Radio color="primary" />} label="1 week" labelPlacement="left" />
-                <FormControlLabel value="month" control={<Radio color="primary" />} label="1 month" labelPlacement="left" />
-                <FormControlLabel value="year" control={<Radio color="primary" />} label="1 year" labelPlacement="left" />
-                <FormControlLabel value="years" control={<Radio color="primary" />} label="4 years" labelPlacement="left" />
-              </RadioGroup>
+              <div className={ classes.inline }>
+                <Typography className={ classes.expiresIn }>Expires in </Typography>
+                <RadioGroup className={classes.vestPeriodToggle} row aria-label="position" name="position" onChange={handleChange} value={selectedValue}>
+                  <FormControlLabel value="week" control={<Radio color="primary" />} label="1 week" labelPlacement="left" />
+                  <FormControlLabel value="month" control={<Radio color="primary" />} label="1 month" labelPlacement="left" />
+                  <FormControlLabel value="year" control={<Radio color="primary" />} label="1 year" labelPlacement="left" />
+                  <FormControlLabel value="years" control={<Radio color="primary" />} label="4 years" labelPlacement="left" />
+                </RadioGroup>
+              </div>
             </div>
           </div>
         </Grid>

diff --git a/components/navigation/navigation.js b/components/navigation/navigation.js
@@ -512,7 +512,7 @@ function Navigation(props) {
           </Grid>
         </Grid>
       </div>
-      <Typography className={classes.smallVersion}>Version 0.7.0</Typography>
+      <Typography className={classes.smallVersion}>Version 0.7.1</Typography>
       { warningOpen &&
         <FFWarning close={ closeWarning } />
       }

diff --git a/stores/fixedForexStore.js b/stores/fixedForexStore.js
@@ -1389,30 +1389,30 @@ class Store {
 
   _getVestingInfo = async (web3, account, veIBFF) => {
     try {
-      const veIBFFContract = new web3.eth.Contract(abis.veIBFFABI, FF_VEKP3R_ADDRESS);
-      const lockedInfo = await veIBFFContract.methods.locked(account.address).call();
-      const totalSupply = await veIBFFContract.methods.totalSupply().call();
 
-      const fourYears = 126144000; // 60 * 60 * 24 * 365 * 4
-      const now = Math.floor(Date.now() / 1000);
-      const maxLock = BigNumber(now).plus(fourYears).toNumber();
-      const percentOfFourYearsLocked = 1 - BigNumber(maxLock).minus(lockedInfo.end).div(fourYears).toFixed(veIBFF.decimals);
-      const locked = BigNumber(lockedInfo.amount)
-        .div(10 ** veIBFF.decimals)
-        .toFixed(veIBFF.decimals);
+      const veIBFFContract = new web3.eth.Contract(abis.veIBFFABI, FF_VEKP3R_ADDRESS)
+      const lockedInfo = await veIBFFContract.methods.locked(account.address).call()
+      const totalSupply = await veIBFFContract.methods.totalSupply().call()
+      const balanceOf = await veIBFFContract.methods.balanceOf(account.address).call()
+
+      console.log(balanceOf)
+
+      // const fourYears = 126144000    // 60 * 60 * 24 * 365 * 4
+      // const now = Math.floor(Date.now() / 1000)
+      // const maxLock = BigNumber(now).plus(fourYears).toNumber()
+      // const percentOfFourYearsLocked = 1-BigNumber(maxLock).minus(lockedInfo.end).div(fourYears).toFixed(veIBFF.decimals)
+      const locked = BigNumber(lockedInfo.amount).div(10**veIBFF.decimals).toFixed(veIBFF.decimals)
 
       return {
         locked: locked,
         lockEnds: lockedInfo.end,
-        lockValue: BigNumber(locked).times(percentOfFourYearsLocked).toFixed(veIBFF.decimals),
-        votePower: BigNumber(locked).times(percentOfFourYearsLocked).toFixed(veIBFF.decimals),
-        totalSupply: BigNumber(totalSupply)
-          .div(10 ** veIBFF.decimals)
-          .toFixed(veIBFF.decimals),
-      };
-    } catch (ex) {
-      console.log(ex);
-      return null;
+        lockValue: BigNumber(balanceOf).div(10**veIBFF.decimals).toFixed(veIBFF.decimals),
+        votePower: BigNumber(balanceOf).div(10**veIBFF.decimals).toFixed(veIBFF.decimals),
+        totalSupply: BigNumber(totalSupply).div(10**veIBFF.decimals).toFixed(veIBFF.decimals),
+      }
+    } catch(ex) {
+      console.log(ex)
+      return null
     }
   };