Skip to content

Commit

Permalink
market fee sharing feature bug bitshares#2770
Browse files Browse the repository at this point in the history
  • Loading branch information
@gades
gades committed Jun 17, 2019
1 parent 977f3e5 commit f3afb6f
Showing 1 changed file with 83 additions and 63 deletions.
146 changes: 83 additions & 63 deletions app/components/Account/AccountVesting.jsx
View file
Expand Up @@ -27,18 +27,23 @@ class VestingBalance extends React.Component {
}

let cvbAsset,
vestingPeriod,
earned,
secondsPerDay = 60 * 60 * 24,
availablePercent,
balance;
let vestingPeriod = null;
let earned = null;
let availablePercent = null;
if (vb) {
balance = vb.balance.amount;
cvbAsset = ChainStore.getAsset(vb.balance.asset_id);
earned = vb.policy[1].coin_seconds_earned;
vestingPeriod = vb.policy[1].vesting_seconds;
availablePercent =
vestingPeriod === 0 ? 1 : earned / (vestingPeriod * balance);

if (vb.policy && vb.policy[0] !== 2) {
earned = vb.policy[1].coin_seconds_earned;
vestingPeriod = vb.policy[1].vesting_seconds;
availablePercent =
vestingPeriod === 0
? 1
: earned / (vestingPeriod * balance);
}
}

if (!cvbAsset) {
Expand Down Expand Up @@ -78,66 +83,81 @@ class VestingBalance extends React.Component {
/>
</td>
</tr>
<tr>
<td>
<Translate content="account.member.earned" />
</td>
<td>
{utils.format_number(
utils.get_asset_amount(
earned / secondsPerDay,
cvbAsset
),
0
)}
&nbsp;
<Translate content="account.member.coindays" />
</td>
</tr>
<tr>
<td>
<Translate content="account.member.required" />
</td>
<td>
{utils.format_number(
utils.get_asset_amount(
(vb.balance.amount * vestingPeriod) /
secondsPerDay,
cvbAsset
),
0
)}
&nbsp;
<Translate content="account.member.coindays" />
</td>
</tr>
<tr>
<td>
<Translate content="account.member.remaining" />
</td>
<td>
{utils.format_number(
(vestingPeriod * (1 - availablePercent)) /
secondsPerDay || 0,
2
)}
&nbsp;days
</td>
</tr>
{earned && (
<tr>
<td>
<Translate content="account.member.earned" />
</td>
<td>
{utils.format_number(
utils.get_asset_amount(
earned / secondsPerDay,
cvbAsset
),
0
)}
&nbsp;
<Translate content="account.member.coindays" />
</td>
</tr>
)}
{earned && (
<tr>
<td>
<Translate content="account.member.required" />
</td>
<td>
{utils.format_number(
utils.get_asset_amount(
(vb.balance.amount *
vestingPeriod) /
secondsPerDay,
cvbAsset
),
0
)}
&nbsp;
<Translate content="account.member.coindays" />
</td>
</tr>
)}
{earned && (
<tr>
<td>
<Translate content="account.member.remaining" />
</td>
<td>
{utils.format_number(
(vestingPeriod *
(1 - availablePercent)) /
secondsPerDay || 0,
2
)}
&nbsp;days
</td>
</tr>
)}
<tr>
<td>
<Translate content="account.member.available" />
</td>
<td>
{utils.format_number(availablePercent * 100, 2)}
% /{" "}
<FormattedAsset
amount={
availablePercent * vb.balance.amount
}
asset={cvbAsset.get("id")}
/>
</td>
{earned ? (
<td>
{utils.format_number(
availablePercent * 100,
2
)}
% /{" "}
<FormattedAsset
amount={
availablePercent * vb.balance.amount
}
asset={cvbAsset.get("id")}
/>
</td>
) : (
<td>{utils.format_number(100, 2)}%</td>
)}
</tr>
<tr>
<td colSpan="2" style={{textAlign: "right"}}>
Expand Down

0 comments on commit f3afb6f

Please sign in to comment.