From f31aeba49de133e7e9f744b78877e3e67c560e2b Mon Sep 17 00:00:00 2001 From: Taylor Van Orden Date: Sat, 30 Apr 2016 02:59:03 -0700 Subject: [PATCH] the dao. --- app/scripts/controllers/thedaoCtrl.js | 4 ++-- app/scripts/services/globalService.js | 14 +++++++------- app/views/thedao.tpl | 6 +++--- dist/index.html | 6 +++--- dist/js/etherwallet-master-min.js | 17 +++++++++-------- dist/js/etherwallet-master.js | 17 +++++++++-------- 6 files changed, 33 insertions(+), 31 deletions(-) diff --git a/app/scripts/controllers/thedaoCtrl.js b/app/scripts/controllers/thedaoCtrl.js index 78f7746fb9..61e92341db 100644 --- 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; \ No newline at end of file +module.exports = theDaoCtrl; diff --git a/app/scripts/services/globalService.js b/app/scripts/services/globalService.js index dc630aa4da..a82bc0f24a 100644 --- 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 index 49778865ce..016ece2160 100644 --- a/app/views/thedao.tpl +++ b/app/views/thedao.tpl @@ -3,7 +3,7 @@

"The DAO"

-

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.

+

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.

It should be noted that in order to participate in the voting process later, you will need a small amount of ETH to cover the cost of gas.

Helpful links: DAOHub · The Art of the DAO · DAO Hub Forums (Support, too!)

@@ -32,7 +32,7 @@ {{btcBalance}} BTC

"The DAO" Details:
- Your Tokens:
{{token.balance}} + Your Tokens: {{token.balance}}

@@ -44,7 +44,7 @@

Get DAO Tokens

- +
diff --git a/dist/index.html b/dist/index.html index e788992cdd..c736d6e681 100644 --- a/dist/index.html +++ b/dist/index.html @@ -853,7 +853,7 @@

Are you sure you want to do this?

"The DAO"

-

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.

+

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.

It should be noted that in order to participate in the voting process later, you will need a small amount of ETH to cover the cost of gas.

Helpful links: DAOHub · The Art of the DAO · DAO Hub Forums (Support, too!)

@@ -882,7 +882,7 @@

Account Information

{{btcBalance}} BTC

"The DAO" Details:
- Your Tokens:
{{token.balance}} + Your Tokens: {{token.balance}}

@@ -894,7 +894,7 @@

Account Information

Get DAO Tokens

- +
diff --git a/dist/js/etherwallet-master-min.js b/dist/js/etherwallet-master-min.js index 5ba3d892d7..73543360a7 100644 --- 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 index 5ba3d892d7..73543360a7 100644 --- 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" }