the dao.

MyEtherWallet · Apr 30, 2016 · f31aeba · f31aeba
1 parent a388d7c
commit f31aeba
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 31 deletions.
diff --git a/app/scripts/controllers/thedaoCtrl.js b/app/scripts/controllers/thedaoCtrl.js
@@ -5,7 +5,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
 	walletService.password = '';
 	$scope.showAdvance = false;
 	$scope.showRaw = false;
-	$scope.slockitContract = "0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa";
+	$scope.slockitContract = "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413";
 	$scope.slockitBalance = "0x70a08231";
 	$scope.slockitSupply = "0x18160ddd";
 	$scope.tx = {
@@ -79,4 +79,4 @@ var theDaoCtrl = function($scope, $sce, walletService) {
 		uiFuncs.sendTx($scope,$sce);
 	}
 };
-module.exports = theDaoCtrl;
+module.exports = theDaoCtrl;
diff --git a/app/scripts/services/globalService.js b/app/scripts/services/globalService.js
@@ -28,13 +28,13 @@ var globalService = function($http, $httpParamSerializerJQLike) {
       name: "Offline Transaction",
             url:"offline-transaction"
     },
-//    thedao: {
-//      id: 5,
-//      name: "\"The DAO\"",
-//            url: "the-dao"
-//    },
-    digix: {
+    thedao: {
       id: 5,
+      name: "\"The DAO\"",
+            url: "the-dao"
+    },
+    digix: {
+      id: 6,
       name: "Digix",
             url: "digix"
     },
@@ -44,7 +44,7 @@ var globalService = function($http, $httpParamSerializerJQLike) {
 //            url: "contracts"
 //    },
     help: {
-      id: 6,
+      id: 7,
       name: "Help",
             url: "help"
     }

diff --git a/app/views/thedao.tpl b/app/views/thedao.tpl
@@ -3,7 +3,7 @@
   <section class="row">
   <div class="col-md-9 col-sm-8">
     <h2> "The DAO" </h2>
-    <p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Wait a minute, refresh the page, and your tokens will be displayed in the lower left.</p>
+    <p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Your tokens will be displayed in the lower left almost immediately.</p>
     <p>It should be noted that in order to participate in the voting process later, you will need a <em>small</em> amount of ETH to cover the cost of gas.</p>
     <p>Helpful links: <a href="http://daohub.org/" target="_blank">DAOHub</a> &middot; <a href="https://blog.slock.it/the-art-of-the-dao-experiments-with-the-generic-dao-framework-4782f7862131#.bibozinlb" target="_blank">The Art of the DAO</a> &middot; <a href="https://forum.daohub.org/c/theDAO" target="_blank">DAO Hub Forums (Support, too!)</a></p>
     </div>
@@ -32,7 +32,7 @@
             <strong class="text-success" style="margin-left: 1em"> {{btcBalance}} BTC </strong>
         </p>
         <p> "The DAO" Details: <br />
-          <strong class="text-primary" style="margin-left: 1em"> Your Tokens: <br /> {{token.balance}}</strong>
+          <strong class="text-primary" style="margin-left: 1em"> Your Tokens: {{token.balance}}</strong>
         </p>
 
         </p>
@@ -44,7 +44,7 @@
       <h4>Get DAO Tokens</h4>
       <div class="form-group col-xs-10">
         <label> To Address: </label>
-        <input class="form-control readonly"   type="text" placeholder="0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8" ng-model="tx.to" ng-change="validateAddress()" readonly/>
+        <input class="form-control readonly"   type="text" placeholder="0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413" ng-model="tx.to" ng-change="validateAddress()" readonly/>
         <div ng-bind-html="validateAddressStatus"></div>
       </div>
       <div class="col-xs-2 address-identicon-container">

diff --git a/dist/index.html b/dist/index.html
@@ -853,7 +853,7 @@ <h4> Are you <span class="text-underline">sure</span> you want to do this?</h4>
   <section class="row">
   <div class="col-md-9 col-sm-8">
     <h2> "The DAO" </h2>
-    <p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Wait a minute, refresh the page, and your tokens will be displayed in the lower left.</p>
+    <p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Your tokens will be displayed in the lower left almost immediately.</p>
     <p>It should be noted that in order to participate in the voting process later, you will need a <em>small</em> amount of ETH to cover the cost of gas.</p>
     <p>Helpful links: <a href="http://daohub.org/" target="_blank">DAOHub</a> &middot; <a href="https://blog.slock.it/the-art-of-the-dao-experiments-with-the-generic-dao-framework-4782f7862131#.bibozinlb" target="_blank">The Art of the DAO</a> &middot; <a href="https://forum.daohub.org/c/theDAO" target="_blank">DAO Hub Forums (Support, too!)</a></p>
     </div>
@@ -882,7 +882,7 @@ <h4> Account Information </h4>
             <strong class="text-success" style="margin-left: 1em"> {{btcBalance}} BTC </strong>
         </p>
         <p> "The DAO" Details: <br />
-          <strong class="text-primary" style="margin-left: 1em"> Your Tokens: <br /> {{token.balance}}</strong>
+          <strong class="text-primary" style="margin-left: 1em"> Your Tokens: {{token.balance}}</strong>
         </p>
 
         </p>
@@ -894,7 +894,7 @@ <h4> Account Information </h4>
       <h4>Get DAO Tokens</h4>
       <div class="form-group col-xs-10">
         <label> To Address: </label>
-        <input class="form-control readonly"   type="text" placeholder="0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8" ng-model="tx.to" ng-change="validateAddress()" readonly/>
+        <input class="form-control readonly"   type="text" placeholder="0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413" ng-model="tx.to" ng-change="validateAddress()" readonly/>
         <div ng-bind-html="validateAddressStatus"></div>
       </div>
       <div class="col-xs-2 address-identicon-container">

diff --git a/dist/js/etherwallet-master-min.js b/dist/js/etherwallet-master-min.js
@@ -507,7 +507,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
 	walletService.password = '';
 	$scope.showAdvance = false;
 	$scope.showRaw = false;
-	$scope.slockitContract = "0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa";
+	$scope.slockitContract = "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413";
 	$scope.slockitBalance = "0x70a08231";
 	$scope.slockitSupply = "0x18160ddd";
 	$scope.tx = {
@@ -582,6 +582,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
 	}
 };
 module.exports = theDaoCtrl;
+
 },{}],9:[function(require,module,exports){
 'use strict';
 var viewCtrl = function($scope, globalService) {
@@ -1331,13 +1332,13 @@ var globalService = function($http, $httpParamSerializerJQLike) {
       name: "Offline Transaction",
             url:"offline-transaction"
     },
-//    thedao: {
-//      id: 5,
-//      name: "\"The DAO\"",
-//            url: "the-dao"
-//    },
-    digix: {
+    thedao: {
       id: 5,
+      name: "\"The DAO\"",
+            url: "the-dao"
+    },
+    digix: {
+      id: 6,
       name: "Digix",
             url: "digix"
     },
@@ -1347,7 +1348,7 @@ var globalService = function($http, $httpParamSerializerJQLike) {
 //            url: "contracts"
 //    },
     help: {
-      id: 6,
+      id: 7,
       name: "Help",
             url: "help"
     }

diff --git a/dist/js/etherwallet-master.js b/dist/js/etherwallet-master.js
@@ -507,7 +507,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
 	walletService.password = '';
 	$scope.showAdvance = false;
 	$scope.showRaw = false;
-	$scope.slockitContract = "0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa";
+	$scope.slockitContract = "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413";
 	$scope.slockitBalance = "0x70a08231";
 	$scope.slockitSupply = "0x18160ddd";
 	$scope.tx = {
@@ -582,6 +582,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
 	}
 };
 module.exports = theDaoCtrl;
+
 },{}],9:[function(require,module,exports){
 'use strict';
 var viewCtrl = function($scope, globalService) {
@@ -1331,13 +1332,13 @@ var globalService = function($http, $httpParamSerializerJQLike) {
       name: "Offline Transaction",
             url:"offline-transaction"
     },
-//    thedao: {
-//      id: 5,
-//      name: "\"The DAO\"",
-//            url: "the-dao"
-//    },
-    digix: {
+    thedao: {
       id: 5,
+      name: "\"The DAO\"",
+            url: "the-dao"
+    },
+    digix: {
+      id: 6,
       name: "Digix",
             url: "digix"
     },
@@ -1347,7 +1348,7 @@ var globalService = function($http, $httpParamSerializerJQLike) {
 //            url: "contracts"
 //    },
     help: {
-      id: 6,
+      id: 7,
       name: "Help",
             url: "help"
     }