Fix kredits balance handling #104
@@ -9,7 +9,7 @@ export default Controller.extend({
|
|||||||
|
|
||||||
contributors: alias('kredits.contributors'),
|
contributors: alias('kredits.contributors'),
|
||||||
contributorsWithKredits: filter('contributors', function(contributor) {
|
contributorsWithKredits: filter('contributors', function(contributor) {
|
||||||
return contributor.get('balance') !== 0;
|
return contributor.get('balanceRaw').gt(0);
|
||||||
}),
|
}),
|
||||||
contributorsSorting: Object.freeze(['balance:desc']),
|
contributorsSorting: Object.freeze(['balance:desc']),
|
||||||
contributorsSorted: sort('contributorsWithKredits', 'contributorsSorting'),
|
contributorsSorted: sort('contributorsWithKredits', 'contributorsSorting'),
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
import { computed } from '@ember/object';
|
import { computed } from '@ember/object';
|
||||||
import EmberObject from '@ember/object';
|
import EmberObject from '@ember/object';
|
||||||
import bignumber from 'kredits-web/utils/cps/bignumber';
|
import bignumber from 'kredits-web/utils/cps/bignumber';
|
||||||
|
|
|||||||
|
import kreditsValue from 'kredits-web/utils/cps/kredits';
|
||||||
|
|
||||||
export default EmberObject.extend({
|
export default EmberObject.extend({
|
||||||
// Contract
|
// Contract
|
||||||
id: bignumber('idRaw', 'toString'),
|
id: bignumber('idRaw', 'toString'),
|
||||||
account: null,
|
account: null,
|
||||||
balance: bignumber('balanceRaw', 'toNumber'),
|
balance: kreditsValue('balanceRaw'),
|
||||||
isCore: false,
|
isCore: false,
|
||||||
ipfsHash: null,
|
ipfsHash: null,
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import { computed } from '@ember/object';
|
|||||||
import { alias, notEmpty } from '@ember/object/computed';
|
import { alias, notEmpty } from '@ember/object/computed';
|
||||||
import { isEmpty } from '@ember/utils';
|
import { isEmpty } from '@ember/utils';
|
||||||
|
|
||||||
|
import formatKredits from 'kredits-web/utils/format-kredits';
|
||||||
|
|
||||||
import config from 'kredits-web/config/environment';
|
import config from 'kredits-web/config/environment';
|
||||||
import Contributor from 'kredits-web/models/contributor'
|
import Contributor from 'kredits-web/models/contributor'
|
||||||
import Proposal from 'kredits-web/models/proposal'
|
import Proposal from 'kredits-web/models/proposal'
|
||||||
@@ -109,7 +111,9 @@ export default Service.extend({
|
|||||||
},
|
},
|
||||||
|
No need for No need for `Promise.resolve`: `return formatKredits(total);`
|
|||||||
|
|
||||||
totalSupply: computed(function() {
|
totalSupply: computed(function() {
|
||||||
return this.kredits.Token.functions.totalSupply();
|
return this.kredits.Token.functions.totalSupply().then(total => {
|
||||||
|
return formatKredits(total);
|
||||||
|
})
|
||||||
}),
|
}),
|
||||||
|
|
||||||
loadInitialData() {
|
loadInitialData() {
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { computed } from '@ember/object';
|
||||||
|
how do I do that import here? somehow I did not get this working. how do I do that import here? somehow I did not get this working.
Without Without `.js` or a relative import: `import formatKredits from '../format-kredits';`
ahhh, probably the only option that I did not try...thx. ahhh, probably the only option that I did not try...thx.
|
|||||||
|
import ethers from 'npm:ethers';
|
||||||
|
import formatKredits from 'kredits-web/utils/format-kredits';
|
||||||
|
|
||||||
|
export default function(dependentKey, options = {}) {
|
||||||
|
return computed(dependentKey, {
|
||||||
|
get () {
|
||||||
|
const value = this.get(dependentKey);
|
||||||
|
return formatKredits(value, options);
|
||||||
|
},
|
||||||
|
set (key, value) {
|
||||||
|
const bnValue = ethers.utils.bigNumberify(value);
|
||||||
|
this.set(dependentKey, bnValue);
|
||||||
|
return formatKredits(bnValue, options);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import ethers from 'npm:ethers';
|
||||||
|
|
||||||
|
export default function(value, options = {}) {
|
||||||
|
let etherValue = ethers.utils.formatEther(value);
|
||||||
|
if (!options.decimals) {
|
||||||
|
etherValue = parseInt(etherValue).toString();
|
||||||
|
}
|
||||||
|
return etherValue;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user
No longer needed, right?
Ah sorry, we still need it for the id?!