diff --git a/api_mockdata/get_state.js b/api_mockdata/get_state.js
index b7d53dca685012bdbcaeae78bdbf33460654afaa..16b8628b20d789a5d78a84e8014b8044280c12ab 100644
--- a/api_mockdata/get_state.js
+++ b/api_mockdata/get_state.js
@@ -20,7 +20,7 @@ module.exports = {
pending_rewarded_vesting_shares: '274189427.875310 VESTS',
pending_rewarded_vesting_steem: '133161.266 STEEM',
sbd_interest_rate: 0,
- sbd_print_rate: 10000,
+ hbd_print_rate: 10000,
maximum_block_size: 65536,
current_aslot: 18899348,
recent_slots_filled: '340282366920938463463374607431768211455',
diff --git a/api_mockdata/get_state_empty.js b/api_mockdata/get_state_empty.js
index 412c1206351670642e399f2515edb06a75597ec3..9dde803371c9b057e2ac320ccf6db4080b80350e 100644
--- a/api_mockdata/get_state_empty.js
+++ b/api_mockdata/get_state_empty.js
@@ -27,7 +27,7 @@ module.exports = {
pending_rewarded_vesting_shares: '273210850.970058 VESTS',
pending_rewarded_vesting_steem: '132683.599 STEEM',
sbd_interest_rate: 0,
- sbd_print_rate: 10000,
+ bbd_print_rate: 10000,
maximum_block_size: 65536,
current_aslot: 18902088,
recent_slots_filled: '340282366920938463463374607431768211455',
diff --git a/src/app/components/elements/Voting.jsx b/src/app/components/elements/Voting.jsx
index 9eac080513b4ba32285637065864b8aa86b13bb1..556f0d322c7d0d2cdf58d717010fe66d479a160a 100644
--- a/src/app/components/elements/Voting.jsx
+++ b/src/app/components/elements/Voting.jsx
@@ -12,7 +12,7 @@ import {
INVEST_TOKEN_SHORT,
} from 'app/client_config';
import FormattedAsset from 'app/components/elements/FormattedAsset';
-import { pricePerSteem } from 'app/utils/StateFunctions';
+import { pricePerHive } from 'app/utils/StateFunctions';
import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
import {
formatDecimal,
@@ -39,7 +39,7 @@ const ABOUT_FLAG = (
const MAX_VOTES_DISPLAY = 20;
const VOTE_WEIGHT_DROPDOWN_THRESHOLD = 1.0 * 1000.0 * 1000.0;
-const SBD_PRINT_RATE_MAX = 10000;
+const HBD_PRINT_RATE_MAX = 10000;
const MAX_WEIGHT = 10000;
const MIN_PAYOUT = 0.02;
@@ -70,8 +70,8 @@ class Voting extends React.Component {
post: PropTypes.object,
enable_slider: PropTypes.bool,
voting: PropTypes.bool,
- price_per_steem: PropTypes.number,
- sbd_print_rate: PropTypes.number,
+ price_per_hive: PropTypes.number,
+ hbd_print_rate: PropTypes.number,
};
static defaultProps = {
@@ -223,8 +223,8 @@ class Voting extends React.Component {
enable_slider,
is_comment,
post,
- price_per_steem,
- sbd_print_rate,
+ price_per_hive,
+ hbd_print_rate,
username,
} = this.props;
@@ -363,7 +363,7 @@ class Voting extends React.Component {
const payout_at = post.get('payout_at');
const promoted = amt(post.get('promoted'));
const max_payout = amt(post.get('max_accepted_payout'));
- const percent_sbd = post.get('percent_hbd') / 20000;
+ const percent_hbd = post.get('percent_hbd') / 20000;
// pending payout, and completed author/curator payout
const pending_payout = amt(post.get('pending_payout_value'));
@@ -372,10 +372,10 @@ class Voting extends React.Component {
const total_payout = pending_payout + author_payout + curator_payout;
// estimated pending payout breakdowns
- const _sbd = pending_payout * percent_sbd;
- const pending_sp = (pending_payout - _sbd) / price_per_steem;
- const pending_sbd = _sbd * (sbd_print_rate / SBD_PRINT_RATE_MAX);
- const pending_steem = (_sbd - pending_sbd) / price_per_steem;
+ const _hbd = pending_payout * percent_hbd;
+ const pending_hp = (pending_payout - _hbd) / price_per_hive;
+ const pending_hbd = _hbd * (hbd_print_rate / HBD_PRINT_RATE_MAX);
+ const pending_hive = (_hbd - pending_hbd) / price_per_hive;
const payout_limit_hit = total_payout >= max_payout;
const shown_payout =
@@ -408,11 +408,11 @@ class Voting extends React.Component {
value:
tt('voting_jsx.breakdown') +
': ' +
- (fmt(pending_sbd, DEBT_TOKEN_SHORT) + ', ') +
- (sbd_print_rate != SBD_PRINT_RATE_MAX
- ? fmt(pending_steem, LIQUID_TOKEN_UPPERCASE) + ', '
+ (fmt(pending_hbd, DEBT_TOKEN_SHORT) + ', ') +
+ (hbd_print_rate != HBD_PRINT_RATE_MAX
+ ? fmt(pending_hive, LIQUID_TOKEN_UPPERCASE) + ', '
: '') +
- fmt(pending_sp, INVEST_TOKEN_SHORT),
+ fmt(pending_hp, INVEST_TOKEN_SHORT),
});
}
@@ -630,11 +630,10 @@ export default connect(
const net_vests = current ? current.get('effective_vests') : 0.0;
const vote_status_key = `transaction_vote_active_${author}_${permlink}`;
const voting = state.global.get(vote_status_key);
- const price_per_steem =
- pricePerSteem(state) || ownProps.price_per_steem;
- const sbd_print_rate = state.global.getIn(
- ['props', 'sbd_print_rate'],
- ownProps.sbd_print_rate
+ const price_per_hive = pricePerHive(state) || ownProps.price_per_hive;
+ const hbd_print_rate = state.global.getIn(
+ ['props', 'hbd_print_rate'],
+ ownProps.hbd_print_rate
);
const enable_slider = net_vests > VOTE_WEIGHT_DROPDOWN_THRESHOLD;
@@ -656,8 +655,8 @@ export default connect(
enable_slider,
is_comment,
voting,
- price_per_steem,
- sbd_print_rate,
+ price_per_hive,
+ hbd_print_rate,
};
},
diff --git a/src/app/components/elements/Voting.test.jsx b/src/app/components/elements/Voting.test.jsx
index 33b9430ed2db59be413ef7505dcce1b81ac12448..bb1ab1c0c6402c2f61793c3d9f53bab0fa91f3e7 100644
--- a/src/app/components/elements/Voting.test.jsx
+++ b/src/app/components/elements/Voting.test.jsx
@@ -17,7 +17,7 @@ window.localStorage = global.localStorage;
configure({ adapter: new Adapter() });
const mockGlobal = Map({
- props: Map({ sbd_print_rate: 99 }),
+ props: Map({ hbd_print_rate: 99 }),
feed_price: Map({
base: '5 HBD',
quote: '10 HIVE',
@@ -67,8 +67,8 @@ describe('Voting', () => {
flag={true}
vote={(w, p) => {}}
post={voteTestObj}
- price_per_steem={1}
- sbd_print_rate={10000}
+ price_per_hive={1}
+ hbd_print_rate={10000}
store={mockStore}
/>
).dive();
@@ -94,8 +94,8 @@ describe('Voting', () => {
myVote={-666}
vote={(w, p) => {}}
post={voteTestObj}
- price_per_steem={1}
- sbd_print_rate={10000}
+ price_per_hive={1}
+ hbd_print_rate={10000}
store={mockStore}
/>
).dive();
@@ -124,8 +124,8 @@ describe('Voting', () => {
flag={false}
vote={(w, p) => {}}
post={voteTestObj}
- price_per_steem={1}
- sbd_print_rate={10000}
+ price_per_hive={1}
+ hbd_print_rate={10000}
store={mockStore}
/>
).dive();
@@ -148,8 +148,8 @@ describe('Voting', () => {
flag={false}
vote={(w, p) => {}}
post={voteTestObj}
- price_per_steem={1}
- sbd_print_rate={10000}
+ price_per_hive={1}
+ hbd_print_rate={10000}
store={mockStore}
/>
).dive();
@@ -182,8 +182,8 @@ describe('Voting', () => {
<Voting
vote={(w, p) => {}}
post={post_obj}
- price_per_steem={1}
- sbd_print_rate={10000}
+ price_per_hive={1}
+ hbd_print_rate={10000}
/>
</IntlProvider>
</Provider>
@@ -210,8 +210,8 @@ describe('Voting', () => {
<Voting
vote={(w, p) => {}}
post={post_obj}
- price_per_steem={1}
- sbd_print_rate={10000}
+ price_per_hive={1}
+ hbd_print_rate={10000}
/>
</IntlProvider>
</Provider>
@@ -238,8 +238,8 @@ describe('Voting', () => {
<Voting
vote={(w, p) => {}}
post={post_obj}
- price_per_steem={1}
- sbd_print_rate={5000}
+ price_per_hive={1}
+ hbd_print_rate={5000}
/>
</IntlProvider>
</Provider>
diff --git a/src/app/utils/StateFunctions.js b/src/app/utils/StateFunctions.js
index 5d6b4a7ee612fa77e20c8453a5256aff667a72f4..852f32b9d5c8fa4eac2648750b44a4d8ae64e95c 100644
--- a/src/app/utils/StateFunctions.js
+++ b/src/app/utils/StateFunctions.js
@@ -57,10 +57,10 @@ export function filterTags(tags) {
.filter((value, index, self) => value && self.indexOf(value) === index);
}
-export function pricePerSteem(state) {
+export function pricePerHive(state) {
const feed_price = state.global.get('feed_price');
if (feed_price && feed_price.has('base') && feed_price.has('quote')) {
- return formatter.pricePerSteem(feed_price.toJS());
+ return formatter.pricePerHive(feed_price.toJS());
}
return undefined;
}
diff --git a/src/shared/UniversalRender.jsx b/src/shared/UniversalRender.jsx
index a83c10b907a08e52ffcc716745c1628a69effa96..1664aae4fc16ff734e5d47085f8390ea2de7fd5e 100644
--- a/src/shared/UniversalRender.jsx
+++ b/src/shared/UniversalRender.jsx
@@ -470,7 +470,7 @@ async function apiFetchState(url) {
try {
const dgpo = await api.getDynamicGlobalPropertiesAsync();
- onchain['props'] = { sbd_print_rate: dgpo['sbd_print_rate'] };
+ onchain['props'] = { hbd_print_rate: dgpo['hbd_print_rate'] };
} catch (error) {
console.error('Error fetching dgpo:', error);
}