status-im
/
contracts
mirror of https://github.com/status-im/contracts.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allowing voting / unvoting

This commit is contained in:
Richard Ramos 2018-06-27 21:42:17 -04:00
parent c2ba506f5e
commit ff338bb7b0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/components/simple-voting/PollsList.js
View File

@ -25,15 +25,15 @@ class Poll extends Component {
this.setState({isSubmitting: true});
const { customVote, poll } = PollManager.methods;
const { customVote, poll, unvote } = PollManager.methods;
const { idPoll, value } = this.state;
const balance4Voting = value * value;
const toSend = customVote(idPoll, balance4Voting);
const toSend = balance4Voting === 0 ? unvote(idPoll) : customVote(idPoll, balance4Voting);
toSend.estimateGas()
.then(gasEstimated => {
console.log("customVote gas estimated: " + gasEstimated);
console.log("voting gas estimated: " + gasEstimated);
return toSend.send({gas: gasEstimated + 1000});
})
.then(res => {
@ -67,7 +67,6 @@ class Poll extends Component {
})
}
render(){
const { _description,
_totalCensus,
@ -86,7 +85,7 @@ class Poll extends Component {
return (
<Card>
<CardContent>
<Typography variant="headline">Proposal: {_description}</Typography>
<Typography variant="headline">{_description}</Typography>
<Typography variant="subheading" color="textSecondary">
Number of voters: {_voters}
</Typography>

2
contracts/polls/PollManager.sol
View File

@ -137,7 +137,7 @@ contract PollManager is Controlled {
uint balance = MiniMeToken(p.token).balanceOf(msg.sender);
require(balance != 0 && balance >= _amount);
require(balance != 0 && balance >= _amount && _amount != 0);
require(MiniMeToken(p.token).transferFrom(msg.sender, address(this), _amount));
p.votes[msg.sender] = _amount;