Commit aabddea7 authored by roadscape's avatar roadscape
Browse files

Merge branch 'bridge-api' into bridge-api-keychain

parents 3cb364bf 9c6f75b7
...@@ -114,9 +114,7 @@ class UserWallet extends React.Component { ...@@ -114,9 +114,7 @@ class UserWallet extends React.Component {
.split(' ') .split(' ')
.shift(); .shift();
return ( return (
virtualSupply * (virtualSupply * currentInflationRate * vestingRewardPercent) /
currentInflationRate *
vestingRewardPercent /
totalVestingFunds totalVestingFunds
); );
}; };
...@@ -541,7 +539,11 @@ class UserWallet extends React.Component { ...@@ -541,7 +539,11 @@ class UserWallet extends React.Component {
); );
} }
const spApr = this.getCurrentApr(gprops); let spApr;
try {
// TODO: occasionally fails. grops not loaded yet?
spApr = this.getCurrentApr(gprops);
} catch (e) {}
return ( return (
<div className="UserWallet"> <div className="UserWallet">
...@@ -620,11 +622,13 @@ class UserWallet extends React.Component { ...@@ -620,11 +622,13 @@ class UserWallet extends React.Component {
)} )}
</span> </span>
) : null} ) : null}
<FormattedHTMLMessage {spApr && (
className="secondary" <FormattedHTMLMessage
id="tips_js.steem_power_apr" className="secondary"
params={{ value: spApr.toFixed(2) }} id="tips_js.steem_power_apr"
/>{' '} params={{ value: spApr.toFixed(2) }}
/>
)}{' '}
</div> </div>
<div className="column small-12 medium-4"> <div className="column small-12 medium-4">
{isMyAccount ? ( {isMyAccount ? (
......
...@@ -43,6 +43,7 @@ export function serverApiRecordEvent(type, val, rate_limit_ms = 5000) { ...@@ -43,6 +43,7 @@ export function serverApiRecordEvent(type, val, rate_limit_ms = 5000) {
let last_page, last_views, last_page_promise; let last_page, last_views, last_page_promise;
export function recordPageView(page, referer, account) { export function recordPageView(page, referer, account) {
return; // TODO: disabled until overseer update
if (last_page_promise && page === last_page) return last_page_promise; if (last_page_promise && page === last_page) return last_page_promise;
if (!process.env.BROWSER) return Promise.resolve(0); if (!process.env.BROWSER) return Promise.resolve(0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment