Skip to content

Commit

Permalink
Update and combine APR formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@malm0d
malm0d committed Aug 11, 2023
1 parent a2ab9ab commit 866d209
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 45 deletions.
12 changes: 6 additions & 6 deletions build/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"main.css": "/static/css/main.6181a8df.chunk.css",
"main.js": "/static/js/main.35d7dc3c.chunk.js",
"main.js.map": "/static/js/main.35d7dc3c.chunk.js.map",
"main.js": "/static/js/main.226f29c0.chunk.js",
"main.js.map": "/static/js/main.226f29c0.chunk.js.map",
"static/css/1.1e464657.chunk.css": "/static/css/1.1e464657.chunk.css",
"static/js/1.2e788835.chunk.js": "/static/js/1.2e788835.chunk.js",
"static/js/1.2e788835.chunk.js.map": "/static/js/1.2e788835.chunk.js.map",
"static/js/1.618ae3d2.chunk.js": "/static/js/1.618ae3d2.chunk.js",
"static/js/1.618ae3d2.chunk.js.map": "/static/js/1.618ae3d2.chunk.js.map",
"runtime~main.js": "/static/js/runtime~main.229c360f.js",
"runtime~main.js.map": "/static/js/runtime~main.229c360f.js.map",
"static/media/purse.png": "/static/media/purse.43f5489d.png",
Expand All @@ -14,9 +14,9 @@
"static/media/pancakeswap.png": "/static/media/pancakeswap.bdd7c45a.png",
"static/media/Blockchain.png": "/static/media/Blockchain.6e74b3ec.png",
"static/media/asterisk.png": "/static/media/asterisk.d69fefca.png",
"static/css/main.6181a8df.chunk.css.map": "/static/css/main.6181a8df.chunk.css.map",
"static/css/1.1e464657.chunk.css.map": "/static/css/1.1e464657.chunk.css.map",
"static/css/main.6181a8df.chunk.css.map": "/static/css/main.6181a8df.chunk.css.map",
"index.html": "/index.html",
"precache-manifest.6b2b42504b231df52cfd5d307ca6ce33.js": "/precache-manifest.6b2b42504b231df52cfd5d307ca6ce33.js",
"precache-manifest.87f2b58b753ec02e64b7170e3a134678.js": "/precache-manifest.87f2b58b753ec02e64b7170e3a134678.js",
"service-worker.js": "/service-worker.js"
}
2 changes: 1 addition & 1 deletion build/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="purse.png"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>PURSE Token</title><link href="/static/css/1.1e464657.chunk.css" rel="stylesheet"><link href="/static/css/main.6181a8df.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={2:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/1.2e788835.chunk.js"></script><script src="/static/js/main.35d7dc3c.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="purse.png"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>PURSE Token</title><link href="/static/css/1.1e464657.chunk.css" rel="stylesheet"><link href="/static/css/main.6181a8df.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={2:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/1.618ae3d2.chunk.js"></script><script src="/static/js/main.226f29c0.chunk.js"></script></body></html>
14 changes: 7 additions & 7 deletions ...ifest.6b2b42504b231df52cfd5d307ca6ce33.js → ...ifest.87f2b58b753ec02e64b7170e3a134678.js
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
self.__precacheManifest = [
{
"revision": "35d7dc3c128a6c3e882d",
"revision": "226f29c0f3efc10c1e35",
"url": "/static/css/main.6181a8df.chunk.css"
},
{
"revision": "35d7dc3c128a6c3e882d",
"url": "/static/js/main.35d7dc3c.chunk.js"
"revision": "226f29c0f3efc10c1e35",
"url": "/static/js/main.226f29c0.chunk.js"
},
{
"revision": "2e788835aaf157b21ef9",
"revision": "618ae3d2a8b599e4d499",
"url": "/static/css/1.1e464657.chunk.css"
},
{
"revision": "2e788835aaf157b21ef9",
"url": "/static/js/1.2e788835.chunk.js"
"revision": "618ae3d2a8b599e4d499",
"url": "/static/js/1.618ae3d2.chunk.js"
},
{
"revision": "229c360febb4351a89df",
Expand Down Expand Up @@ -48,7 +48,7 @@ self.__precacheManifest = [
"url": "/static/media/asterisk.d69fefca.png"
},
{
"revision": "366e7da931347386915b8404192a0416",
"revision": "e184c169d729a4b57e012a8b0c9b403e",
"url": "/index.html"
}
];
2 changes: 1 addition & 1 deletion build/service-worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");

importScripts(
"/precache-manifest.6b2b42504b231df52cfd5d307ca6ce33.js"
"/precache-manifest.87f2b58b753ec02e64b7170e3a134678.js"
);

workbox.clientsClaim();
Expand Down
4 changes: 2 additions & 2 deletions build/static/js/1.2e788835.chunk.js → build/static/js/1.618ae3d2.chunk.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/js/1.2e788835.chunk.js.map → build/static/js/1.618ae3d2.chunk.js.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/static/js/main.35d7dc3c.chunk.js → build/static/js/main.226f29c0.chunk.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/js/main.226f29c0.chunk.js.map
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion build/static/js/main.35d7dc3c.chunk.js.map
View file

This file was deleted.

59 changes: 35 additions & 24 deletions src/components/Stake.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ class Stake extends Component {
{ maximumFractionDigits: 5 }
);

let combinedAPR = (
parseFloat(purseStakingAPR) + parseFloat(retroactiveAPR)
);

return (
<div id="content" className="mt-4">
<label className="textWhite center mb-5" style={{fontSize:"40px", textAlign:"center"}}><big><b>PURSE Staking</b></big></label>
Expand Down Expand Up @@ -472,36 +476,43 @@ class Stake extends Component {
contentStyle={{ padding: '3px' }}
>
<span className="textInfo">
Percentage of Past 30 Days Distribution Sum x 12 / Total Staked (Pool).
Percentage of past 30 days distribution sum x 12 / Total staked (Pool) + <br/>
Percentage of total rewards disbursed and to disburse / Total staked (Pool)
</span>
</Popup>
</div>
<div className="textWhiteSmall mb-2" style={{ color : "#B0C4DE" }}>
<b>{purseStakingAPR+" %"}</b>
</div>
</div>
<div style={{ marginLeft: "50px" }}>
<div className="textWhiteSmall mb-1">
<b>APR (Retroactive Rewards):&nbsp;&nbsp;</b>
<Popup
trigger={open => (
<span style={{ position: "relative", top: '-1.5px' }}><BsInfoCircleFill size={10}/></span>
)}
on="hover"
position="right"
offsetY={-23}
offsetX={0}
contentStyle={{ padding: '3px' }}
>
<span className="textInfo">
Percentage of Total rewards disbursed & to disburse / Total Staked (Pool).
</span>
</Popup>
</div>
<div className="textWhiteSmall mb-2" style={{ color : "#B0C4DE"}}>
<b>{retroactiveAPR+" %"}</b>
<b>
{
isNaN(combinedAPR) ?
"0 %" :
`${combinedAPR.toLocaleString('en-US', { maximumFractionDigits: 5 })} %`
}
</b>
</div>
</div>
{/*<div style={{ marginLeft: "50px" }}>*/}
{/* <div className="textWhiteSmall mb-1">*/}
{/* <b>APR (Retroactive Rewards):&nbsp;&nbsp;</b>*/}
{/* <Popup*/}
{/* trigger={open => (*/}
{/* <span style={{ position: "relative", top: '-1.5px' }}><BsInfoCircleFill size={10}/></span>*/}
{/* )}*/}
{/* on="hover"*/}
{/* position="right"*/}
{/* offsetY={-23}*/}
{/* offsetX={0}*/}
{/* contentStyle={{ padding: '3px' }}*/}
{/* >*/}
{/* <span className="textInfo">*/}
{/* Percentage of Total rewards disbursed & to disburse / Total Staked (Pool).*/}
{/* </span>*/}
{/* </Popup>*/}
{/* </div>*/}
{/* <div className="textWhiteSmall mb-2" style={{ color : "#B0C4DE"}}>*/}
{/* <b>{retroactiveAPR+" %"}</b>*/}
{/* </div>*/}
{/*</div>*/}
</div>
<div style={{paddingRight:"2px", width:"50%", minWidth:"250px"}}>
<div className="textWhiteSmall mb-1"><b>Past 30 Days Distribution Sum:</b></div>
Expand Down

0 comments on commit 866d209

Please sign in to comment.