status-im/visual-identity
2
0
Fork 0
mirror of https://github.com/status-im/visual-identity.git synced 2025-02-12 20:46:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp

Browse Source
This commit is contained in:
Richard Ramos 2018-06-28 11:14:35 -04:00
commit e2f9d8c59c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/components/Voting.js
View File

@ -5,6 +5,7 @@ import AppBar from './standard/AppBar';
import AddPoll from './simple-voting/AddPoll'; import AddPoll from './simple-voting/AddPoll';
import PollsList from './simple-voting/PollsList'; import PollsList from './simple-voting/PollsList';
import StatusLogo from '../ui/components/StatusLogo'; import StatusLogo from '../ui/components/StatusLogo';
import Collapse from '@material-ui/core/Collapse';
class Voting extends PureComponent { class Voting extends PureComponent {
state = { addPoll: false }; state = { addPoll: false };
@ -20,7 +21,9 @@ class Voting extends PureComponent {
<div style={{ margin: '30px', textAlign: 'center' }}> <div style={{ margin: '30px', textAlign: 'center' }}>
<img src="images/logo.png" width="200" /> <img src="images/logo.png" width="200" />
</div> </div>
{addPoll && <AddPoll togglePoll={togglePoll} />} <Collapse in={addPoll}>
<AddPoll togglePoll={togglePoll} />
</Collapse>
{rawPolls && <PollsList rawPolls={rawPolls} />} {rawPolls && <PollsList rawPolls={rawPolls} />}
</Fragment> </Fragment>
) )

2
app/components/simple-voting/AddPoll.js
View File

@ -89,7 +89,7 @@ const AddPoll = withFormik({
}, },
async handleSubmit(values, { setSubmitting, setErrors, props }) { async handleSubmit(values, { setSubmitting, setErrors, props }) {
const { description } = values; const { description } = values;
const { eth: { getBlockNumber }, utils: { asciiToHex } } = window.web3; const { eth: { getBlockNumber } } = window.web3;
const { addPoll } = PollManager.methods; const { addPoll } = PollManager.methods;
const currentBlock = await getBlockNumber(); const currentBlock = await getBlockNumber();
const endTime = currentBlock + (oneDayinBlocks * 90); const endTime = currentBlock + (oneDayinBlocks * 90);