diff --git a/app/components/proposal-manager/proposal-manager.js b/app/components/proposal-manager/proposal-manager.js index c71d7a5..00f2fec 100644 --- a/app/components/proposal-manager/proposal-manager.js +++ b/app/components/proposal-manager/proposal-manager.js @@ -21,14 +21,14 @@ class InnerForm extends PureComponent { } componentDidMount(){ - this.loadPrice(); + this._loadPrice(); } componentWillReceiveProps(){ - this.loadPrice(); + this._loadPrice(); } - async loadPrice(){ + _loadPrice(){ __embarkContext.execWhenReady(async () => { try { let _b = await ProposalCuration.methods.getSubmitPrice(web3.eth.defaultAccount).call(); diff --git a/app/components/voting-dapp/voting.js b/app/components/voting-dapp/voting.js index fdad98f..18013c2 100644 --- a/app/components/voting-dapp/voting.js +++ b/app/components/voting-dapp/voting.js @@ -15,9 +15,20 @@ class Voting extends Component { }; } + componentWillReceiveProps(){ + __embarkContext.execWhenReady(async () => { + this._loadProposalData(); + }); + } + componentDidMount(){ __embarkContext.execWhenReady(async () => { - ProposalManager.options.address = await ProposalCuration.methods.proposalManager().call(); + this._loadProposalData(); + }); + } + + async _loadProposalData() { + ProposalManager.options.address = await ProposalCuration.methods.proposalManager().call(); let _proposal = await ProposalManager.methods.getVoteInfo(this.props.proposalId, web3.eth.defaultAccount).call(); let blockNum = await web3.eth.getBlockNumber(); let _data = await ProposalManager.methods.proposals(this.props.proposalId).call(); @@ -28,7 +39,6 @@ class Voting extends Component { block: blockNum, finalResult: _data.result }); - }); } async determineFinalResult(e){ @@ -39,9 +49,7 @@ class Voting extends Component { if(receipt.status == '0x1'){ this.setState({ - decision: choice, - block: blockNum, - finalResult: receipt.events.ProposalResult.finalResult + finalResult: receipt.events.ProposalResult.returnValues.finalResult }); } } @@ -71,7 +79,6 @@ class Voting extends Component { } render(){ - console.log(this.state); return