Skip to content

Commit

Permalink
More intuitive vesting stats in UI - issue bitshares#294
Browse files Browse the repository at this point in the history
  • Loading branch information
happyconcepts committed Oct 1, 2017
1 parent 6900473 commit cb2f2f0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions app/assets/locales/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"title": "Vesting balances",
"balance_number": "Balance #%(id)s",
"no_balances": "This account has no vesting balances",
"explain": "Vesting balances contain any fees earned through the referral program or from worker pay for example. They have a certain vesting period and are continually unlocked during that vesting period until all funds are available"
"explain": "Vesting balances contain any fees earned through the referral program or from worker pay, for example. They have a certain vesting period and are continually unlocked during that vesting period until all of the balances are available"
},
"member": {
"stats": "Membership",
Expand All @@ -136,9 +136,9 @@
"network_percentage": "Network",
"fee_allocation": "Fee Allocation",
"membership": "Membership",
"fees_paid": "Lifetime fees paid",
"fees_pending": "Pending fees",
"fees_vested": "Pending vested fees",
"fees_paid": "Fees paid, Lifetime",
"fees_pending": "Fees pending division",
"fees_vested": "Fees pending, other",
"referrals": "Referrals",
"rewards": "Cashback Rewards",
"cashback": "Vesting balance amount",
Expand Down
1 change: 0 additions & 1 deletion app/components/Account/AccountMembership.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ class AccountMembership extends React.Component {
let lifetime_cost = gprops.getIn(["parameters", "current_fees", "parameters", 8, 1, "membership_lifetime_fee"]) * gprops.getIn(["parameters", "current_fees", "scale"]) / 10000;
let annual_cost = gprops.getIn(["parameters", "current_fees", "parameters", 8, 1, "membership_annual_fee"]) * gprops.getIn(["parameters", "current_fees", "scale"]) / 10000;


let member_status = ChainStore.getAccountMemberStatus(this.props.account);
let membership = "account.member." + member_status;
let expiration = null
Expand Down

0 comments on commit cb2f2f0

Please sign in to comment.