diff --git a/app/components/proposal-manager/proposal-manager.js b/app/components/proposal-manager/proposal-manager.js
index 00f2fec..026560b 100644
--- a/app/components/proposal-manager/proposal-manager.js
+++ b/app/components/proposal-manager/proposal-manager.js
@@ -97,6 +97,46 @@ class InnerForm extends PureComponent {
onBlur={handleBlur}
value={values.url}
/>
+
+
+
+
+
+
+
+
@@ -105,14 +145,14 @@ class InnerForm extends PureComponent {
}
const ProposalManager = withFormik({
- mapPropsToValues: props => ({ title: '', description: '', url: '' }),
+ mapPropsToValues: props => ({ title: '', description: '', url: '', data: '0x00', value: '0', topic: '0x00', to: '0x0000000000000000000000000000000000000000' }),
validate(values) {},
handleSubmit(values, { setSubmitting}){
let dataObj = {
title: values.title,
description: values.description,
- url: values.url
+ url: values.url,
};
const { toHex } = web3.utils;
@@ -123,10 +163,10 @@ const ProposalManager = withFormik({
const hexHash = toHex(hash);
//TODO create toggle for address approval
submitProposal(
- "0x00",
- "0x0000000000000000000000000000000000000000",
- 0,
- "0x00",
+ values.topic,
+ values.to,
+ values.value,
+ values.data,
hexHash
)
.send({from: web3.eth.defaultAccount, gasLimit: 1000000})
diff --git a/contracts/democracy/PollManager.sol b/contracts/democracy/PollManager.sol
index 727633c..8b065c6 100644
--- a/contracts/democracy/PollManager.sol
+++ b/contracts/democracy/PollManager.sol
@@ -12,13 +12,12 @@ contract PollManager is Controlled {
event PollCreated(uint256 pollId, uint8 numOptions);
event PollCanceled(uint256 pollId);
event Voted(address voter, uint8[] votes);
-
MiniMeTokenFactory public tokenFactory;
MiniMeTokenInterface public token;
Poll[] public polls;
-
+
struct Vote {
mapping(uint8 => uint8) distribution;
bool voted;
@@ -48,6 +47,7 @@ contract PollManager is Controlled {
uint8 _numOptions
)
public
+ onlyController
returns (uint pollId)
{
pollId = polls.length++;