Skip to content

Commit

Permalink
Merge remote-tracking branch 'kvhnuke/mercury' into mercury
Browse files Browse the repository at this point in the history
  • Loading branch information
@sekisanchi
sekisanchi committed Aug 31, 2016
2 parents 5037539 + 0d22903 commit b9eaedb
Show file tree
Hide file tree
Showing 72 changed files with 83,430 additions and 89,111 deletions.
10 changes: 6 additions & 4 deletions app/includes/dao.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,22 @@

<h4 class="col-xs-12" translate="DAO_TitleETC"> Withdraw DAO for ETC </h4>
<!-- Address for ETC to be Delivered -->

<!--<h4 class="col-xs-12"> There were some irregularities occcuring. Please sit tight for now. </h4>-->

<div class="form-group col-xs-10">
<label translate="DAO_ETC_Label_1"> Where do you want your ETC to be sent to? </label>
<input class="form-control" type="text" ng-model="daoC.to" ng-change="validateAddress(daoC.to)"/>
<div ng-bind-html="validateAddressStatus"></div>
<input class="form-control" type="text" ng-model="daoC.to" ng-class="Validator.isValidAddress(daoC.to) ? 'is-valid' : 'is-invalid'"/>
</div>

<div class="col-xs-2 address-identicon-container">
<div id="addressIdenticon" title="Address Indenticon" blockie-address="{{daoC.to}}" watch-var="daoC.to"></div>
</div>

<!-- Percentage to Donate to WHG -->
<div class="form-group col-xs-10">
<label translate="DAO_ETC_Label_2"> The 'White Hat Group' has been working tirelessly to get your ETC back to you. You can say 'thank you' by donating a percentage of your withdrawal, if you choose to. </label>
<div class="input-group" style="max-width: 150px;">
<input type="number" class="form-control" placeholder="10" ng-model="daoC.donation"/>
<input type="number" class="form-control" placeholder="10" ng-model="daoC.donation" ng-class="Validator.isPositiveNumber(daoC.donation) ? 'is-valid' : 'is-invalid'"/>
<span class="input-group-addon">%</span>
</div>

Expand All @@ -103,6 +104,7 @@
<br /><br />

<p translate="DAO_Warning">If you are getting an <em>insufficient balance for gas * ... </em> error, you must have a small amount of ETH in your account in order to cover the cost of gas. Add .01 ETH to this account and try again. </p>

</section>
<!-- / Withdraw DAO For ETC -->

Expand Down
8 changes: 4 additions & 4 deletions app/includes/deployContract.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<div ng-bind-html="deployContractStatus"></div>
<!-- Sign TX Button (once wallet has been unlocked) -->
<div class="form-group">
<a class="btn btn-info btn-block" ng-click="generateTx()" translate="DEP_signtx"> Sign Transaction </a>
<a class="btn btn-info btn-block" ng-click="generateTx()" translate="DEP_signtx" ng-show="wallet!=null"> Sign Transaction </a>
</div>

<section class="row">
<section class="row" ng-show="showRaw">
<!-- Raw TX -->
<div class="form-group col-sm-6">
<h4 translate="SEND_raw"> Raw Transaction </h4>
Expand All @@ -46,7 +46,7 @@
</section>

<!-- Deploy Contract Button (once tx has been signged) -->
<div class="form-group">
<div class="form-group" ng-show="showRaw">
<a class="btn btn-primary btn-block" data-toggle="modal" data-target="#sendTransaction" translate="NAV_DeployContract"> Deploy Contract </a>
</div>

Expand All @@ -66,7 +66,7 @@

<div class="modal-body">
<h4>
<span translate="">You are about to deploy a contract to the blockchain.</span>
<span>You are about to deploy a contract to the blockchain.</span>
</h4>
<h4 translate="SENDModal_Content_3"> Are you sure you want to do this? </h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/includes/myWallet.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</td>
<td class="chrome-tokens">
<strong class="text-success">{{twallet.balance | number:4 }} ETH</strong><br>
<span class="small" ng-repeat="token in twallet.tokens" ng-hide="token.balance==0"><strong>{{token.getBalance() }}</strong>&nbsp;{{token.getSymbol()}} &nbsp;&nbsp;</span>
<span class="small" ng-repeat="token in twallet.tokens" ng-show="token.balance!=0 && token.balance!='loading'"><strong>{{token.getBalance() }}</strong>&nbsp;{{token.getSymbol()}} &nbsp;&nbsp;</span>
<br />
<span class="small"><strong>{{twallet.btc }}</strong> BTC</span> &nbsp;&nbsp; <span>$ <strong>{{twallet.usd }}</strong> USD</span> &nbsp;&nbsp; <span>€ <strong>{{twallet.eur }}</strong> EUR</span>
</td>
Expand Down
6 changes: 6 additions & 0 deletions app/scripts/controllers/deployContractCtrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ var deployContractCtrl = function($scope, $sce, walletService) {
nonce: null,
gasPrice: null
}
$scope.showRaw = false;
$scope.$watch(function() {
if (walletService.wallet == null) return null;
return walletService.wallet.getAddressString();
}, function() {
if (walletService.wallet == null) return;
$scope.wallet = walletService.wallet;
});
$scope.$watch('tx', function(newValue, oldValue) {
$scope.showRaw = false;
}, true);
$scope.generateTx = function() {
try {
if ($scope.wallet == null) throw globalFuncs.errorMsgs[3];
Expand All @@ -34,7 +38,9 @@ var deployContractCtrl = function($scope, $sce, walletService) {
$scope.rawTx = rawTx.rawTx;
$scope.signedTx = rawTx.signedTx;
$scope.sendTxStatus = $sce.trustAsHtml(globalFuncs.getDangerText(''));
$scope.showRaw = true;
} else {
$scope.showRaw = false;
$scope.sendTxStatus = $sce.trustAsHtml(globalFuncs.getDangerText(rawTx.error));
}
});
Expand Down
15 changes: 7 additions & 8 deletions app/scripts/controllers/theDaoCtrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ var theDaoCtrl = function($scope, $sce, walletService) {
$scope.slockitContract = "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413"; //0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa
$scope.withdrawContract = "0xbf4ed7b27f1d666546e30d74d50d173d20bca754"; //0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa
$scope.daoCContract = "0x180826b05452ce96e157f0708c43381fee64a6b8";
$scope.daoWithdrawContract = "0x5cead42dc4adb64f128a11382bf8e11f567a743d";
// change this to go live
$scope.daoWithdrawContract = "0x9f5304da62a5408416ea58a17a92611019bd5ce3";
$scope.slockitTransfer = "0xa9059cbb";
$scope.balanceOf = "0x70a08231";
$scope.daoWithdraw = "0x3ccfd60b";
$scope.approveWithdraw = "0x095ea7b3";
$scope.withdrawDAOC = "0xf3fef3a3";
$scope.numETChex = "0x02ef6c86";
$scope.Validator = Validator;
$scope.tx = {
gasLimit: 100000,
data: '',
Expand Down Expand Up @@ -129,6 +131,10 @@ var theDaoCtrl = function($scope, $sce, walletService) {
$scope.withdrawModal.close();
}
$scope.generateAndWithdrawDAOC = function() {
if(!Validator.isPositiveNumber($scope.daoC.donation)){
$scope.withdrawETCTxStatus = $sce.trustAsHtml(globalFuncs.getDangerText(globalFuncs.errorMsgs[0]));
return;
}
$scope.tx.to = $scope.daoWithdrawContract;
$scope.tx.data = $scope.withdrawDAOC + ethFuncs.padLeft(ethFuncs.getNakedAddress($scope.daoC.to), 64) + ethFuncs.padLeft(new BigNumber($scope.daoC.donation).toString(16), 64);
$scope.tx.value = 0;
Expand All @@ -144,12 +150,5 @@ var theDaoCtrl = function($scope, $sce, walletService) {
});
$scope.withdrawModalETC.close();
}
$scope.validateAddress = function(addr) {
if (ethFuncs.validateEtherAddress(addr)) {
$scope.validateAddressStatus = $sce.trustAsHtml(globalFuncs.getSuccessText(globalFuncs.successMsgs[0]));
} else {
$scope.validateAddressStatus = $sce.trustAsHtml(globalFuncs.getDangerText(globalFuncs.errorMsgs[5]));
}
}
};
module.exports = theDaoCtrl;
10 changes: 5 additions & 5 deletions app/scripts/translations/ar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,16 +477,16 @@ ar.data = {
HELP_12_Desc_15b: 'If you are on a PC:',
HELP_12_Desc_16: 'Open Text Edit and paste this private key.',
HELP_12_Desc_17: 'Go to the menu bar and click "Format" -> "Make Plain Text".',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt/`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt/`',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt`',
HELP_12_Desc_20: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it. ',
HELP_12_Desc_21: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_22: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts".',
HELP_12_Desc_23: 'Open Notepad & paste the private key',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C://`',
HELP_12_Desc_25: 'Run the command, `geth account import C:/nothing_special_delete_me.txt`',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C:`',
HELP_12_Desc_25: 'Run the command, `geth account import C:\\nothing_special_delete_me.txt`',
HELP_12_Desc_26: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it.',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt/`',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_28: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts". ',

HELP_13_Title: '13) What does "Gas Limit Too Low" Mean?',
Expand Down
10 changes: 5 additions & 5 deletions app/scripts/translations/bg.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,16 +477,16 @@ bg.data = {
HELP_12_Desc_15b: 'If you are on a PC:',
HELP_12_Desc_16: 'Open Text Edit and paste this private key.',
HELP_12_Desc_17: 'Go to the menu bar and click "Format" -> "Make Plain Text".',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt/`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt/`',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt`',
HELP_12_Desc_20: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it. ',
HELP_12_Desc_21: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_22: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts".',
HELP_12_Desc_23: 'Open Notepad & paste the private key',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C://`',
HELP_12_Desc_25: 'Run the command, `geth account import C:/nothing_special_delete_me.txt`',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C:`',
HELP_12_Desc_25: 'Run the command, `geth account import C:\\nothing_special_delete_me.txt`',
HELP_12_Desc_26: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it.',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt/`',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_28: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts". ',

HELP_13_Title: '13) What does "Gas Limit Too Low" Mean?',
Expand Down
10 changes: 5 additions & 5 deletions app/scripts/translations/de.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,16 +477,16 @@ de.data = {
HELP_12_Desc_15b: 'Wenn du an einem PC bist:',
HELP_12_Desc_16: 'Open Text Edit and paste this private key.',
HELP_12_Desc_17: 'Go to the menu bar and click "Format" -> "Make Plain Text".',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt/`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt/`',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt`',
HELP_12_Desc_20: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it. ',
HELP_12_Desc_21: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_22: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts".',
HELP_12_Desc_23: 'Open Notepad & paste the private key',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C://`',
HELP_12_Desc_25: 'Run the command, `geth account import C:/nothing_special_delete_me.txt`',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C:`',
HELP_12_Desc_25: 'Run the command, `geth account import C:\\nothing_special_delete_me.txt`',
HELP_12_Desc_26: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it.',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt/`',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_28: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts". ',

HELP_13_Title: '13) What does "Gas Limit Too Low" Mean?',
Expand Down
10 changes: 5 additions & 5 deletions app/scripts/translations/el.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,16 +481,16 @@ el.data = {
HELP_12_Desc_15: 'If you are on a Mac:',
HELP_12_Desc_16: 'Open Text Edit and paste this private key.',
HELP_12_Desc_17: 'Go to the menu bar and click "Format" -> "Make Plain Text".',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt/`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt/`',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt`',
HELP_12_Desc_20: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it. ',
HELP_12_Desc_21: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_22: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts".',
HELP_12_Desc_23: 'Open Notepad & paste the private key',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C://`',
HELP_12_Desc_25: 'Run the command, `geth account import C:/nothing_special_delete_me.txt`',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C:`',
HELP_12_Desc_25: 'Run the command, `geth account import C:\\nothing_special_delete_me.txt`',
HELP_12_Desc_26: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it.',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt/`',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_28: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts". ',

HELP_13_Title: '13) What does "Gas Limit Too Low" Mean?',
Expand Down
10 changes: 5 additions & 5 deletions app/scripts/translations/en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,16 +477,16 @@ en.data = {
HELP_12_Desc_15b: 'If you are on a PC:',
HELP_12_Desc_16: 'Open Text Edit and paste this private key.',
HELP_12_Desc_17: 'Go to the menu bar and click "Format" -> "Make Plain Text".',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt/`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt/`',
HELP_12_Desc_18: 'Save this file to your `desktop/` as `nothing_special_delete_me.txt`. Make sure it says "UTF-8" and "If no extension is provided use .txt" in the save dialog.',
HELP_12_Desc_19: 'Open terminal and run the following command: `geth account import ~/Desktop/nothing_special_delete_me.txt`',
HELP_12_Desc_20: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it. ',
HELP_12_Desc_21: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_22: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts".',
HELP_12_Desc_23: 'Open Notepad & paste the private key',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C://`',
HELP_12_Desc_25: 'Run the command, `geth account import C:/nothing_special_delete_me.txt`',
HELP_12_Desc_24: 'Save the file as `nothing_special_delete_me.txt` at `C:`',
HELP_12_Desc_25: 'Run the command, `geth account import C:\\nothing_special_delete_me.txt`',
HELP_12_Desc_26: 'This will prompt you to make a new password. This is the password you will use in geth / Ethereum Wallet / Mist whenever you send a transaction, so don\'t forget it.',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt/`',
HELP_12_Desc_27: 'After successful import, delete `nothing_special_delete_me.txt`',
HELP_12_Desc_28: 'The next time you open the Ethereum Wallet application, your account will be listed under "Accounts". ',

HELP_13_Title: '13) What does "Gas Limit Too Low" Mean?',
Expand Down
Loading

0 comments on commit b9eaedb

Please sign in to comment.