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

app/components/simple-voting/AddPoll.js

@@ -108,8 +108,10 @@ const AddPoll = withFormik({
     const { addPoll } = PollManager.methods;
     const currentBlock = await getBlockNumber();
     const endTime = currentBlock + (oneDayinBlocks * 90);
-
     const toSend = addPoll(endTime, singleChoiceDef(description, ['YES']));
+
+    setSubmitting(true);
+
     toSend.estimateGas()
       .then(gasEstimated => {
         console.log("addPoll gas estimated: "+gasEstimated);
@@ -122,6 +124,8 @@ const AddPoll = withFormik({
       })
       .catch(res => {
         console.log('fail:', res);
+      })
+      .finally(() => {
         setSubmitting(false);
       });
 

config/contracts.json

@@ -24,13 +24,13 @@
         "deploy": false
       },
       "DelegationProxyFactory": {
-        "deploy": true
+        "deploy": false
       },
       "ProposalManager": {
         "deploy": false
       },
       "TrustNetwork": {
-        "deploy": true,
+        "deploy": false,
         "args": ["$DelegationProxyFactory"]
       },
       "Factory": {
@@ -72,7 +72,7 @@
         "args": ["$SNT", "$TrustNetwork"]
       },
       "Democracy": {
-        "deploy": true,
+        "deploy": false,
         "args": [
           "$SNT",
           "$DelegationProxyFactory"