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

Commit

Permalink
added gnosis and fixed token min eth error msg
Browse files Browse the repository at this point in the history
  • Loading branch information
kvhnuke committed May 2, 2017
1 parent 01b3742 commit c5d446e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/scripts/controllers/tabsCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ var tabsCtrl = function($scope, globalService, $translate, $sce) {
globalFuncs.parityErrorMsgs = {};
for (var s in globalFuncs.parityErrors) {
var key = globalFuncs.parityErrors[s];
if (key.indexOf('PARITY_') === 0) {
if (key.indexOf('PARITY_') === 0 || key.indexOf('ERROR_17') === 0) {
$scope.setLanguageVal(key, 'parityErrorMsgs', key);
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/globalFuncs.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ globalFuncs.parityErrors = {
"Transaction fee is too low\\. There is another transaction with same nonce in the queue\\. Try increasing the fee or incrementing the nonce\\.": "PARITY_TooCheapToReplace",
"There are too many transactions in the queue\\. Your transaction was dropped due to limit\\. Try increasing the fee\\.": "PARITY_LimitReached",
"Transaction fee is too low\\. It does not satisfy your node's minimal fee \\(minimal: (\\d+), got: (\\d+)\\)\\. Try increasing the fee\\.": "PARITY_InsufficientGasPrice",
"Insufficient funds\\. The account you tried to send transaction from does not have enough funds\\. Required (\\d+) and got: (\\d+)\\.": "PARITY_InsufficientBalance",
"Insufficient funds\\. The account you tried to send transaction from does not have enough funds\\. Required (\\d+) and got: (\\d+)\\.": "ERROR_17",
"Transaction cost exceeds current gas limit\\. Limit: (\\d+), got: (\\d+)\\. Try decreasing supplied gas\\.": "PARITY_GasLimitExceeded",
"Supplied gas is beyond limit\\.": "PARITY_InvalidGasLimit"
};
Expand Down
6 changes: 6 additions & 0 deletions app/scripts/tokens/ethTokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@
"decimal":2,
"type":"default"
},
{
"address":"0x6810e776880c02933d47db1b9fc05908e5386b96",
"symbol":"GNO",
"decimal":18,
"type":"default"
},
{
"address":"0xa74476443119A942dE498590Fe1f2454d7D4aC0d",
"symbol":"GNT",
Expand Down
10 changes: 8 additions & 2 deletions chrome-extension/js/etherwallet-master.js
Original file line number Diff line number Diff line change
Expand Up @@ -2068,7 +2068,7 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) {
globalFuncs.parityErrorMsgs = {};
for (var s in globalFuncs.parityErrors) {
var key = globalFuncs.parityErrors[s];
if (key.indexOf('PARITY_') === 0) {
if (key.indexOf('PARITY_') === 0 || key.indexOf('ERROR_17') === 0) {
$scope.setLanguageVal(key, 'parityErrorMsgs', key);
}
}
Expand Down Expand Up @@ -2851,7 +2851,7 @@ globalFuncs.parityErrors = {
"Transaction fee is too low\\. There is another transaction with same nonce in the queue\\. Try increasing the fee or incrementing the nonce\\.": "PARITY_TooCheapToReplace",
"There are too many transactions in the queue\\. Your transaction was dropped due to limit\\. Try increasing the fee\\.": "PARITY_LimitReached",
"Transaction fee is too low\\. It does not satisfy your node's minimal fee \\(minimal: (\\d+), got: (\\d+)\\)\\. Try increasing the fee\\.": "PARITY_InsufficientGasPrice",
"Insufficient funds\\. The account you tried to send transaction from does not have enough funds\\. Required (\\d+) and got: (\\d+)\\.": "PARITY_InsufficientBalance",
"Insufficient funds\\. The account you tried to send transaction from does not have enough funds\\. Required (\\d+) and got: (\\d+)\\.": "ERROR_17",
"Transaction cost exceeds current gas limit\\. Limit: (\\d+), got: (\\d+)\\. Try decreasing supplied gas\\.": "PARITY_GasLimitExceeded",
"Supplied gas is beyond limit\\.": "PARITY_InvalidGasLimit"
};
Expand Down Expand Up @@ -7671,6 +7671,12 @@ module.exports=[
"decimal":2,
"type":"default"
},
{
"address":"0x6810e776880c02933d47db1b9fc05908e5386b96",
"symbol":"GNO",
"decimal":18,
"type":"default"
},
{
"address":"0xa74476443119A942dE498590Fe1f2454d7D4aC0d",
"symbol":"GNT",
Expand Down
10 changes: 8 additions & 2 deletions dist/js/etherwallet-master.js
Original file line number Diff line number Diff line change
Expand Up @@ -2068,7 +2068,7 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) {
globalFuncs.parityErrorMsgs = {};
for (var s in globalFuncs.parityErrors) {
var key = globalFuncs.parityErrors[s];
if (key.indexOf('PARITY_') === 0) {
if (key.indexOf('PARITY_') === 0 || key.indexOf('ERROR_17') === 0) {
$scope.setLanguageVal(key, 'parityErrorMsgs', key);
}
}
Expand Down Expand Up @@ -2851,7 +2851,7 @@ globalFuncs.parityErrors = {
"Transaction fee is too low\\. There is another transaction with same nonce in the queue\\. Try increasing the fee or incrementing the nonce\\.": "PARITY_TooCheapToReplace",
"There are too many transactions in the queue\\. Your transaction was dropped due to limit\\. Try increasing the fee\\.": "PARITY_LimitReached",
"Transaction fee is too low\\. It does not satisfy your node's minimal fee \\(minimal: (\\d+), got: (\\d+)\\)\\. Try increasing the fee\\.": "PARITY_InsufficientGasPrice",
"Insufficient funds\\. The account you tried to send transaction from does not have enough funds\\. Required (\\d+) and got: (\\d+)\\.": "PARITY_InsufficientBalance",
"Insufficient funds\\. The account you tried to send transaction from does not have enough funds\\. Required (\\d+) and got: (\\d+)\\.": "ERROR_17",
"Transaction cost exceeds current gas limit\\. Limit: (\\d+), got: (\\d+)\\. Try decreasing supplied gas\\.": "PARITY_GasLimitExceeded",
"Supplied gas is beyond limit\\.": "PARITY_InvalidGasLimit"
};
Expand Down Expand Up @@ -7671,6 +7671,12 @@ module.exports=[
"decimal":2,
"type":"default"
},
{
"address":"0x6810e776880c02933d47db1b9fc05908e5386b96",
"symbol":"GNO",
"decimal":18,
"type":"default"
},
{
"address":"0xa74476443119A942dE498590Fe1f2454d7D4aC0d",
"symbol":"GNT",
Expand Down

0 comments on commit c5d446e

Please sign in to comment.