Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Commit

Permalink
update bignumber, clean transation files, start fixing some terrible …
Browse files Browse the repository at this point in the history
…error messages
  • Loading branch information
tayvano committed Apr 21, 2017
1 parent 0e64d2b commit cca1a65
Show file tree
Hide file tree
Showing 42 changed files with 23,754 additions and 7,907 deletions.
2 changes: 1 addition & 1 deletion app/includes/header.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>

&middot; v3.6.3 &nbsp;&nbsp;
&middot; v3.6.4 &nbsp;&nbsp;

<span class="dropdown" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
Expand Down
9 changes: 7 additions & 2 deletions app/scripts/controllers/tabsCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ var tabsCtrl = function($scope, globalService, $translate, $sce) {
key: key
}));
ajaxReq.getCurrentBlock(function(data) {
if (data.error) $scope.nodeIsConnected = false;
else $scope.nodeIsConnected = true;
if (data.error) {
$scope.nodeIsConnected = false;
//$scope.notifier.danger(globalFuncs.errorMsgs[32]);
} else {
$scope.nodeIsConnected = true;
//$scope.notifier.success(globalFuncs.successMsgs[5]);
}
});
}
$scope.checkNodeUrl = function(nodeUrl) {
Expand Down
5 changes: 2 additions & 3 deletions app/scripts/globalFuncs.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ globalFuncs.getDangerText = function(str) {
globalFuncs.errorMsgs = ["Please enter valid amount.", "Your password must be at least 9 characters. Please ensure it is a strong password. ", "Sorry! We don\'t recognize this type of wallet file. ", "This is not a valid wallet file. ", "This unit doesn\'t exists, please use the one of the following units ", "Invalid address. ", "Invalid password. ", "Invalid amount. ", "Invalid gas limit. ", "Invalid data value. ", "Invalid gas amount. ", // 10
"Invalid nonce. ", "Invalid signed transaction. ", "A wallet with this nickname already exists. ", "Wallet not found. ", "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ", // 15
"A wallet with this address already exists in storage. Please check your wallets page. ", "You need to have at least 0.01 ETH in your account to cover the cost of gas. Please add some ETH and try again. ", "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.", "Invalid symbol", "Not a valid ERC-20 token", "Could not estimate gas. There are not enough funds in the account, or the receiving contract address would throw an error. Feel free to manually set the gas and proceed. The error message upon sending may be more informative.",
"Please enter valid node name", "Enter valid url, if you are on https your url must be https", "Please enter valid port", "Please enter valid chain ID", "Please enter valid ABI", "Minimum amount: 0.01. Max amount: ", "You need your Keystore File & Password (or Private Key) to access this wallet in the future.", "Please enter valid user and password", "Invalid name", "Invalid secret phrase"
];
"Please enter valid node name", "Enter valid url, if you are on https your url must be https", "Please enter valid port", "Please enter valid chain ID", "Please enter valid ABI", "Minimum amount: 0.01. Max amount: ", "You need your Keystore File & Password (or Private Key) to access this wallet in the future.", "Please enter valid user and password", "Invalid name", "Invalid secret phrase", "Could not change the node or connect to the node you selected. Please refresh the page and try again."];
// These are translated in the translation files
globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "Your wallet was successfully added: ", "File Selected: "];
globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "Your wallet was successfully added: ", "File Selected: ", "You are successfully connected to the node "];
// These are translated in the translation files
globalFuncs.gethErrors = {
"Invalid sender": "GETH_InvalidSender",
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/staticJS/etherwallet-static.min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions app/scripts/staticJS/ledger-eth.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ LedgerEth.prototype.getAddress = function(path, callback, boolDisplay, boolChain
response = new Buffer(response, 'hex');
var sw = response.readUInt16BE(response.length - 2);
if (sw != 0x9000) {
callback(undefined, "Invalid status " + sw.toString(16));
callback(undefined, "Invalid status " + sw.toString(16) + ". Check to make sure contract data is on?");
return;
}
}
var publicKeyLength = response[0];
var addressLength = response[1 + publicKeyLength];
result['publicKey'] = response.slice(1, 1 + publicKeyLength).toString('hex');
Expand Down Expand Up @@ -113,11 +113,11 @@ LedgerEth.prototype.signTransaction = function(path, rawTxHex, callback) {
response = new Buffer(response, 'hex');
var sw = response.readUInt16BE(response.length - 2);
if (sw != 0x9000) {
callback(undefined, "Invalid status " + sw.toString(16));
callback(undefined, "Invalid status " + sw.toString(16) + ". Check to make sure contract data is on?");
return;
}
}
if (apdus.length == 0) {
var result = {};
var result = {};
result['v'] = response.slice(0, 1).toString('hex');
result['r'] = response.slice(1, 1 + 32).toString('hex');
result['s'] = response.slice(1 + 32, 1 + 32 + 32).toString('hex');
Expand Down Expand Up @@ -148,7 +148,7 @@ LedgerEth.prototype.getAppConfiguration = function(callback) {
var result = {};
var sw = response.readUInt16BE(response.length - 2);
if (sw != 0x9000) {
callback(undefined, "Invalid status " + sw.toString(16));
callback(undefined, "Invalid status " + sw.toString(16) + ". Check to make sure contract data is on?");
return;
}
result['arbitraryDataEnabled'] = (response[0] & 0x01);
Expand Down
Loading

0 comments on commit cca1a65

Please sign in to comment.