status-im/snt-voting
2
0
Fork 0
mirror of https://github.com/status-im/snt-voting.git synced 2025-02-23 23:58:13 +00:00
Code Issues Projects Releases Wiki Activity

Allow voting using new contract interface

Browse Source
This commit is contained in:
Richard Ramos 2018-09-26 08:58:38 -04:00
parent ee4af31922
commit cc825a2e7b
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ const styles = {
flex: 1, flex: 1,
}, },
}; };
function Transition(props) { function Transition(props) {
return <Slide direction="up" {...props} />; return <Slide direction="up" {...props} />;
}; };
@ -58,7 +59,7 @@ class Poll extends PureComponent {
this.state = { this.state = {
t: 0, t: 0,
value: props.votes, value: props.votes,
originalValue: props.votes, originalVotes: {}, // TODO: props.votes
balance: 0, balance: 0,
isSubmitting: false, isSubmitting: false,
open: false, open: false,
@ -86,13 +87,14 @@ class Poll extends PureComponent {
this.setState({isSubmitting: true}); this.setState({isSubmitting: true});
const { customVote, poll, unvote } = PollManager.methods; const { vote, poll, unvote } = PollManager.methods;
const { updatePoll, idPoll } = this.props; const { updatePoll, idPoll } = this.props;
const { value } = this.state; const { votes } = this.state;
const { toWei } = web3.utils; const { toWei } = web3.utils;
const balance4Voting = toWei(toString(value * value)); const ballots = Object.values(votes).map(el => el * el);
const toSend = balance4Voting == 0 ? unvote(idPoll) : customVote(idPoll, balance4Voting); const balance4Voting = ballots.reduce((prev, curr) => prev + curr, 0);
const toSend = balance4Voting == 0 ? unvote(idPoll) : vote(idPoll, ballots);
toSend.estimateGas() toSend.estimateGas()
.then(gasEstimated => { .then(gasEstimated => {
@ -101,7 +103,7 @@ class Poll extends PureComponent {
}) })
.then(res => { .then(res => {
console.log('sucess:', res); console.log('sucess:', res);
this.setState({ isSubmitting: false, originalValue: value }); this.setState({ isSubmitting: false, originalVotes: Object.assign({}, votes)});
return updatePoll(idPoll); return updatePoll(idPoll);
}) })
.catch(res => { .catch(res => {
@ -111,6 +113,7 @@ class Poll extends PureComponent {
.finally(() => { .finally(() => {
this.setState({isSubmitting: false}); this.setState({isSubmitting: false});
}); });
} }
render(){ render(){
@ -126,17 +129,20 @@ class Poll extends PureComponent {
_numBallots, _numBallots,
} = this.props; } = this.props;
const { value, originalValue, isSubmitting, error, votes } = this.state; const { originalVotes, isSubmitting, error, votes } = this.state;
const { fromWei } = web3.utils;
const cantVote = balance == 0 || !_canVote; const cantVote = balance == 0 || !_canVote;
const disableVote = cantVote || isSubmitting; const disableVote = cantVote || isSubmitting;
const buttonText = originalValue != 0 && value != originalValue ? 'Change Vote' : 'Vote'; const originalVotesQty = Object.values(originalVotes).reduce((x,y) => x+y, 0);
const idea = getIdeaFromStr(_description) const votesQty = Object.values(votes).reduce((x,y) => x+y, 0);
const ideaSite = ideaSites && ideaSites.filter(site => site.includes(idea));
const buttonText = originalVotesQty != 0 && originalVotesQty != votesQty ? 'Change Vote' : 'Vote';
// Extracting description
const decodedDesc = rlp.decode(_description); const decodedDesc = rlp.decode(_description);
const title = decodedDesc[0].toString(); const title = decodedDesc[0].toString();
const ballots = decodedDesc[1]; const ballots = decodedDesc[1];
const idea = getIdeaFromStr(title);
const ideaSite = ideaSites && ideaSites.filter(site => site.includes(idea));
// Calculating votes availables // Calculating votes availables
const maxVotes = Math.floor(Math.sqrt(balance)); const maxVotes = Math.floor(Math.sqrt(balance));
@ -154,7 +160,6 @@ class Poll extends PureComponent {
maxValuesForBallots[i] = Math.floor(Math.sqrt(balance - votedSNT + votes[i]*votes[i])); // votes[i] // Math.floor(Math.sqrt(balance - (votedSNT*votedSNT) + (votes[i]*votes[i]))); maxValuesForBallots[i] = Math.floor(Math.sqrt(balance - votedSNT + votes[i]*votes[i])); // votes[i] // Math.floor(Math.sqrt(balance - (votedSNT*votedSNT) + (votes[i]*votes[i])));
} }
return ( return (
<Card> <Card>
<CardContent> <CardContent>
@ -172,18 +177,18 @@ class Poll extends PureComponent {
return <div key={i}> return <div key={i}>
<Typography variant="display1">{opt.toString()}</Typography> <Typography variant="display1">{opt.toString()}</Typography>
{!cantVote } {!cantVote }
<BallotSlider votes={votes[0]} maxVotes={maxVotes} maxVotesAvailable={maxValuesForBallots[i]} updateVotes={this.updateVotes(i)} /> <BallotSlider classes={classes} votes={votes[0]} maxVotes={maxVotes} maxVotesAvailable={maxValuesForBallots[i]} updateVotes={this.updateVotes(i)} />
</div> </div>
}) })
} }
{cantVote && <Typography variant="body2" color="error"> {cantVote && <Typography variant="body2" color="error">
{balance == 0 && <span>Voting disabled for proposals made when there was no SNT in the account</span>} {balance == 0 && <span>Voting disabled for proposals made when there was no SNT in the account</span>}
{balance != 0 && !_canVote && <span>You can not vote on this poll</span>} {balance != 0 && !_canVote && <span>You can not vote on this poll</span>}
</Typography>} </Typography>}
{error && <Typography variant="body2" color="error">{error}</Typography>} {error && <Typography variant="body2" color="error">{error}</Typography>}
{ideaSite && ideaSite.length > 0 && <Typography onClick={this.handleClickOpen} variant="subheading" color="primary">{ideaSite}</Typography>} {ideaSite && ideaSite.length > 0 && <Typography onClick={this.handleClickOpen} variant="subheading" color="primary">{ideaSite}</Typography>}
@ -203,6 +208,7 @@ class Poll extends PureComponent {
</Typography> </Typography>
</Toolbar> </Toolbar>
</AppBar> </AppBar>
<div <div
style={{ overflow: "auto", height: '100%', width: '100%', position: "fixed", top: 0, left: 0, zIndex: 1, overflowScrolling: "touch", WebkitOverflowScrolling: "touch" }} style={{ overflow: "auto", height: '100%', width: '100%', position: "fixed", top: 0, left: 0, zIndex: 1, overflowScrolling: "touch", WebkitOverflowScrolling: "touch" }}
> >
@ -257,12 +263,12 @@ class BallotSlider extends Component {
}; };
render(){ render(){
const {maxVotes, maxVotesAvailable} = this.props; const {maxVotes, maxVotesAvailable, classes} = this.props;
const {value} = this.state; const {value} = this.state;
const nextVote = value + 1; const nextVote = value + 1;
return <Fragment> return <Fragment>
<Slider style={{ width: '95%' }} value={value} min={0} max={maxVotes} step={1} onChange={this.handleChange} /> <Slider classes={{ thumb: classes.thumb }} style={{ width: '95%' }} value={value} min={0} max={maxVotes} step={1} onChange={this.handleChange} />
<b>Votes: {value} ({value * value} SNT)</b> <b>Votes: {value} ({value * value} SNT)</b>
{ nextVote <= maxVotesAvailable ? <small>- Additional vote will cost {nextVote*nextVote - value*value} SNT</small> : <small>- Not enough balance available to buy additional votes</small> } { nextVote <= maxVotesAvailable ? <small>- Additional vote will cost {nextVote*nextVote - value*value} SNT</small> : <small>- Not enough balance available to buy additional votes</small> }
</Fragment> </Fragment>