From 7b96dfdcd0c8bf9b972072713a6ba14730263e26 Mon Sep 17 00:00:00 2001 From: Sigve Kvalsvik Date: Fri, 13 Oct 2017 10:05:02 +0200 Subject: [PATCH] Fix issue #294 (#575) * Update README.md * Issue 315 - Add Chart Clamp To Settings Dropdown (#373) * Add Chart Clamp To Settings Dropdown * Removed Unused Variable Merging as is and then we'll see about handling the redraw bug in the next sprint. * More intuitive vesting stats in UI - issue #294 * pending_vested_fees->pending_immediate_fees * Fees terminology I took a stab at this. * Remove fees_pending and fees_vested text, update fee texts #294 --- app/assets/locales/locale-cn.json | 2 -- app/assets/locales/locale-de.json | 2 -- app/assets/locales/locale-en.json | 8 +++----- app/assets/locales/locale-es.json | 2 -- app/assets/locales/locale-fr.json | 2 -- app/assets/locales/locale-it.json | 2 -- app/assets/locales/locale-ko.json | 2 -- app/assets/locales/locale-ru.json | 2 -- app/assets/locales/locale-tr.json | 2 -- app/components/Account/AccountMembership.jsx | 1 - app/components/Account/Statistics.jsx | 8 -------- app/help/en/components/AccountMembership.md | 8 ++++---- 12 files changed, 7 insertions(+), 34 deletions(-) diff --git a/app/assets/locales/locale-cn.json b/app/assets/locales/locale-cn.json index e851ec2d54..b58922a5d8 100644 --- a/app/assets/locales/locale-cn.json +++ b/app/assets/locales/locale-cn.json @@ -91,8 +91,6 @@ "ref_percentage": "推荐人奖励", "network_percentage": "网络收取", "fees_paid": "手续费总支出", - "fees_pending": "待结费用", - "fees_vested": "待解冻金额", "in_orders": "委单冻结金额 %(core_asset)s ", "unknown": "未知的会员", "lifetime": "终身会员", diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json index 7e7dbcc341..4a7b8c7401 100644 --- a/app/assets/locales/locale-de.json +++ b/app/assets/locales/locale-de.json @@ -104,8 +104,6 @@ "fee_allocation": "Gebührenverteilung", "membership": "Mitgliedschaft", "fees_paid": "Lifetime bazahlte Gebühren", - "fees_pending": "unbestätigte Gebühren", - "fees_vested": "Anstehnde Gebühren in Sperrfristguthaben", "referrals": "Empfehlungen", "rewards": "Belohnungen", "cashback": "Skonto", diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index f2151c04ab..e4afe68cc1 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -134,7 +134,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", @@ -145,9 +145,7 @@ "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": "Total fees paid", "referrals": "Referrals", "rewards": "Cashback Rewards", "cashback": "Vesting balance amount", @@ -160,7 +158,7 @@ "subscribe": "Buy Annual Subscription", "expires": "expires", "membership_expiration": "Membership Expiration", - "fees_cashback": "Fees and cashback", + "fees_cashback": "Fee statistics", "coindays": "coin days", "earned": "Coin days earned", "required": "Coin days required", diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json index 7e87a944e7..03a7a5d3d6 100644 --- a/app/assets/locales/locale-es.json +++ b/app/assets/locales/locale-es.json @@ -80,8 +80,6 @@ "fee_allocation": "Asignación de Comisiones", "membership": "Membresía", "fees_paid": "Membresía vitalicia paga", - "fees_pending": "Comisiones pendientes", - "fees_vested": "Comisiones pendientes de consolidación", "referrals": "Referidos", "rewards": "Reembolso de Honorarios", "cashback": "Reembolso", diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json index f78b1184cd..5fa7de800a 100644 --- a/app/assets/locales/locale-fr.json +++ b/app/assets/locales/locale-fr.json @@ -72,8 +72,6 @@ "ref_percentage": "Pourcentage de frais pour le recruteur", "network_percentage": "Pourcentage de frais pour le reseau", "fees_paid": "Frais payé", - "fees_pending": "Frais en attente", - "fees_vested": "Frais en attente bloqué", "in_orders": "Total de %(core_asset)s en ordres", "referrals": "Recrutements", "rewards": "Gains totaux", diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json index 18070832db..f26a4d8f59 100644 --- a/app/assets/locales/locale-it.json +++ b/app/assets/locales/locale-it.json @@ -141,8 +141,6 @@ "fee_allocation": "Allocazione commissioni", "membership": "Membership", "fees_paid": "Commissioni membership a vita pagate", - "fees_pending": "Commissioni in sospeso", - "fees_vested": "Commissioni vested in sospeso", "referrals": "Referral", "rewards": "Cashback Rewards", "cashback": "Saldo del bilancio vesting", diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json index dc929317db..1868edd5c7 100644 --- a/app/assets/locales/locale-ko.json +++ b/app/assets/locales/locale-ko.json @@ -80,8 +80,6 @@ "fee_allocation": "수수료 분배", "membership": "멤버쉽", "fees_paid": "지불된 평생회원 수수료", - "fees_pending": "보류중인 수수료", - "fees_vested": "보류중인 확정 수수료", "referrals": "피추천인", "rewards": "캐쉬백 리워드", "cashback": "캐쉬백", diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index 1137f6d4de..f7006f16f6 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -138,8 +138,6 @@ "fee_allocation":"Распределение комиссии", "membership":"Членство", "fees_paid":"Комиссии, выплаченные за время существования счета", - "fees_pending":"Обрабатывающиеся комиссии", - "fees_vested":"Комиссии, прошедшие вестинг", "referrals":"Рефералы", "rewards":"Кэшбэк Вознаграждения", "cashback":"Сумма вестингового остатка", diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json index 367115883a..789b07a5ba 100644 --- a/app/assets/locales/locale-tr.json +++ b/app/assets/locales/locale-tr.json @@ -127,8 +127,6 @@ "fee_allocation": "Ücret Tahsisi", "membership": "Üyelik", "fees_paid": "Ödenmiş ücretler", - "fees_pending": "Bekleyen ücretler", - "fees_vested": "Hak edilmiş ücretler", "referrals": "Tavsiye edenler", "rewards": "Nakit-İade Ödülleri", "cashback": "Tutulan bakiye miktarı", diff --git a/app/components/Account/AccountMembership.jsx b/app/components/Account/AccountMembership.jsx index 920094fd86..1fd3de0c0b 100644 --- a/app/components/Account/AccountMembership.jsx +++ b/app/components/Account/AccountMembership.jsx @@ -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 diff --git a/app/components/Account/Statistics.jsx b/app/components/Account/Statistics.jsx index 31190c23b8..1c37fabb1f 100644 --- a/app/components/Account/Statistics.jsx +++ b/app/components/Account/Statistics.jsx @@ -18,14 +18,6 @@ class Statistics extends React.Component { - - - - - - - - ); } diff --git a/app/help/en/components/AccountMembership.md b/app/help/en/components/AccountMembership.md index 743b38bf3b..f15101f2c1 100644 --- a/app/help/en/components/AccountMembership.md +++ b/app/help/en/components/AccountMembership.md @@ -13,12 +13,12 @@ The _registrar_ is the account that paid the transaction fee to register {accoun divide the remaining {referrerTotalFee}% between themselves and their own _Affiliate Referrer_ program. {account}'s registrar chose to share {referrerFee}% of the total fee with the _Affiliate Referrer_ and keep {registrarFee}% of the total fee for themselves. - - + + #### Pending Fees -Fees paid by {account} are only divided among the network, referrers, and registrars once every maintenance interval ({maintenanceInterval} seconds). The +Fees paid by {account} are divided among the network, referrers, and registrars once every maintenance interval ({maintenanceInterval} seconds). The next maintenance time is {nextMaintenanceTime}. - + #### Vesting Fees Most fees are made available immediately, but fees over {vestingThreshold}