fix NaN value after setting to zero

localize state
This commit is contained in:
Barry Gitarts 2018-07-17 16:02:32 -04:00
parent c47908a454
commit 52a70f5365
2 changed files with 16 additions and 17 deletions

View File

@ -11,7 +11,6 @@ import Slide from '@material-ui/core/Slide';
import Typography from '@material-ui/core/Typography';
import Slider from '@material-ui/lab/Slider';
import PollManager from 'Embark/contracts/PollManager';
import MiniMeTokenInterface from 'Embark/contracts/MiniMeTokenInterface';
import IconButton from '@material-ui/core/IconButton';
import CloseIcon from '@material-ui/icons/Close';
import web3 from "Embark/web3"
@ -104,21 +103,9 @@ class Poll extends PureComponent {
}
componentDidMount() {
this.getBalance();
this.getVote();
}
getBalance() {
const { fromWei } = web3.utils;
const { appendToPoll, idPoll } = this.props;
MiniMeTokenInterface.options.address = this.props._token;
MiniMeTokenInterface.methods.balanceOfAt(web3.eth.defaultAccount, this.props._startBlock - 1)
.call()
.then(balance => {
appendToPoll(idPoll, {balance: fromWei(balance)})
});
}
getVote() {
const { fromWei } = web3.utils;
const { idPoll } = this.props;

View File

@ -1,16 +1,28 @@
import web3 from "Embark/web3"
import MiniMeTokenInterface from 'Embark/contracts/MiniMeTokenInterface';
const excluded = {
PROPER_LIGHT_CLIENT_SUPPORT : 3,
IMPLEMENT_SECURITY_PRACTICES : 14,
SHIP_1_0 : 16
};
export const getPolls = (number, pollMethod) => {
export const getBalance = async (idPoll, token, startBlock) => {
const { fromWei } = web3.utils;
const { balanceOfAt } = MiniMeTokenInterface.methods;
MiniMeTokenInterface.options.address = token;
const balance = await balanceOfAt(web3.eth.defaultAccount, startBlock - 1).call();
return fromWei(balance);
}
export const getPolls = async (number, pollMethod) => {
const polls = [];
for (let i = number-1; i >= 0; i--) {
const poll = pollMethod(i).call();
polls.push(poll);
const poll = await pollMethod(i).call();
const balance = await getBalance(i, poll._token, poll._startBlock);
polls.push({ ...poll, balance });
}
return Promise.all(polls.reverse());
return polls.reverse();
}
const excludedPolls = new Set(Object.values(excluded));