From edce31e574450d67fed434e3d826171de112de45 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Thu, 28 Jun 2018 09:30:37 -0400 Subject: [PATCH 1/4] Increasing gasLimit --- app/components/simple-voting/PollsList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/simple-voting/PollsList.js b/app/components/simple-voting/PollsList.js index fa714cd..2550faf 100644 --- a/app/components/simple-voting/PollsList.js +++ b/app/components/simple-voting/PollsList.js @@ -34,7 +34,7 @@ class Poll extends Component { toSend.estimateGas() .then(gasEstimated => { console.log("voting gas estimated: " + gasEstimated); - return toSend.send({gas: gasEstimated + 1000}); + return toSend.send({gas: gasEstimated + 100000}); }) .then(res => { console.log('sucess:', res); From cac0ecf2f7fef92ba9688e4d2e66df19a30262ca Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Thu, 28 Jun 2018 10:16:12 -0400 Subject: [PATCH 2/4] Updated blockchain.json with syncModes --- config/blockchain.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/blockchain.json b/config/blockchain.json index 638c816..3e17281 100644 --- a/config/blockchain.json +++ b/config/blockchain.json @@ -24,7 +24,7 @@ "testnet": { "enabled": true, "networkType": "testnet", - "light": true, + "syncMode": "light", "rpcHost": "localhost", "rpcPort": 8545, "rpcCorsDomain": "http://localhost:8000", @@ -35,7 +35,7 @@ "livenet": { "enabled": true, "networkType": "livenet", - "light": true, + "syncMode": "light", "rpcHost": "localhost", "rpcPort": 8545, "rpcCorsDomain": "http://localhost:8000", From 2b0b83482700a98987bdbb43f0ff466c328b9f2a Mon Sep 17 00:00:00 2001 From: Barry Gitarts Date: Thu, 28 Jun 2018 10:56:14 -0400 Subject: [PATCH 3/4] fixup! Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp --- app/components/simple-voting/AddPoll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/simple-voting/AddPoll.js b/app/components/simple-voting/AddPoll.js index 35a5ca5..c9f64b5 100644 --- a/app/components/simple-voting/AddPoll.js +++ b/app/components/simple-voting/AddPoll.js @@ -89,7 +89,7 @@ const AddPoll = withFormik({ }, async handleSubmit(values, { setSubmitting, setErrors, props }) { const { description } = values; - const { eth: { getBlockNumber }, utils: { asciiToHex } } = window.web3; + const { eth: { getBlockNumber } } = window.web3; const { addPoll } = PollManager.methods; const currentBlock = await getBlockNumber(); const endTime = currentBlock + (oneDayinBlocks * 90); From 037c97682629c4db82e0e7462211614270db0dc3 Mon Sep 17 00:00:00 2001 From: Barry Gitarts Date: Thu, 28 Jun 2018 11:03:59 -0400 Subject: [PATCH 4/4] add transistion for AddPoll --- app/components/Voting.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/components/Voting.js b/app/components/Voting.js index b7e2b9c..6bed214 100644 --- a/app/components/Voting.js +++ b/app/components/Voting.js @@ -5,6 +5,7 @@ import AppBar from './standard/AppBar'; import AddPoll from './simple-voting/AddPoll'; import PollsList from './simple-voting/PollsList'; import StatusLogo from '../ui/components/StatusLogo'; +import Collapse from '@material-ui/core/Collapse'; class Voting extends PureComponent { state = { addPoll: false }; @@ -20,7 +21,9 @@ class Voting extends PureComponent {
- {addPoll && } + + + {rawPolls && } )