Latest Block#: {{currentBlockNumber}}
-Latest Block#: {{currentBlockNumber}}
- Gas Price: - {{gas.value}} Gwei + Gas Price: + {{gas.value}} Gwei
Not So Fast
diff --git a/app/includes/header.tpl b/app/includes/header.tpl index 4d2573fc8a..128ad9a005 100644 --- a/app/includes/header.tpl +++ b/app/includes/header.tpl @@ -31,11 +31,9 @@A message from {{tx.to}}
- +{{customGasMsg}}
A message from {{tx.to}}
- +{{customGasMsg}}
Latest Block#: {{currentBlockNumber}}
-Latest Block#: {{currentBlockNumber}}
- Gas Price: - {{gas.value}} Gwei + Gas Price: + {{gas.value}} Gwei
Not So Fast
diff --git a/chrome-extension/helpers.html b/chrome-extension/helpers.html index 918e6b5897..499167d725 100644 --- a/chrome-extension/helpers.html +++ b/chrome-extension/helpers.html @@ -33,7 +33,7 @@Latest Block#: {{currentBlockNumber}}
-Latest Block#: {{currentBlockNumber}}
- Gas Price: - {{gas.value}} Gwei + Gas Price: + {{gas.value}} Gwei
Not So Fast
diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js index 695b788696..acdf68186a 100644 --- a/chrome-extension/js/etherwallet-master.js +++ b/chrome-extension/js/etherwallet-master.js @@ -138,7 +138,7 @@ module.exports=[] },{}],7:[function(require,module,exports){ 'use strict'; -var ajaxReq = function () {}; +var ajaxReq = function ajaxReq() {}; ajaxReq.http = null; ajaxReq.postSerializer = null; ajaxReq.getETHvalue = null; @@ -148,7 +148,7 @@ module.exports = ajaxReq; },{}],8:[function(require,module,exports){ 'use strict'; -var bity = function () {}; +var bity = function bity() {}; bity.SERVERURL = "https://bity.myetherapi.com"; bity.decimals = 6; bity.ethExplorer = 'https://etherscan.io/tx/[[txHash]]'; @@ -219,7 +219,7 @@ module.exports = bity; },{}],9:[function(require,module,exports){ 'use strict'; -var addWalletCtrl = function ($scope, $sce) { +var addWalletCtrl = function addWalletCtrl($scope, $sce) { $scope.showBtnGen = $scope.showBtnUnlock = $scope.showBtnAdd = $scope.showBtnAddWallet = $scope.showAddWallet = $scope.requireFPass = $scope.requirePPass = $scope.showPassTxt = false; $scope.nickNames = []; $scope.filePassword = $scope.fileContent = ""; @@ -426,7 +426,7 @@ module.exports = addWalletCtrl; },{}],10:[function(require,module,exports){ 'use strict'; -var cxDecryptWalletCtrl = function ($scope, $sce, walletService) { +var cxDecryptWalletCtrl = function cxDecryptWalletCtrl($scope, $sce, walletService) { $scope.allWallets = []; $scope.selectedWallet = $scope.password = ""; $scope.setAllWallets = function () { @@ -477,7 +477,7 @@ module.exports = cxDecryptWalletCtrl; },{}],11:[function(require,module,exports){ 'use strict'; -var mainPopCtrl = function ($scope, $sce) { +var mainPopCtrl = function mainPopCtrl($scope, $sce) { $scope.allWallets = []; $scope.allWatchOnly = []; $scope.setAllWallets = function () { @@ -513,7 +513,7 @@ module.exports = mainPopCtrl; },{}],12:[function(require,module,exports){ 'use strict'; -var myWalletsCtrl = function ($scope, $sce, walletService) { +var myWalletsCtrl = function myWalletsCtrl($scope, $sce, walletService) { $scope.editModal = new Modal(document.getElementById('editWallet')); $scope.viewModal = new Modal(document.getElementById('viewWalletDetails')); $scope.removeModal = new Modal(document.getElementById('removeWallet')); @@ -672,7 +672,7 @@ module.exports = myWalletsCtrl; },{}],13:[function(require,module,exports){ 'use strict'; -var quickSendCtrl = function ($scope, $sce) { +var quickSendCtrl = function quickSendCtrl($scope, $sce) { $scope.allWallets = []; $scope.selectedWallet = ""; $scope.showConfirm = false; @@ -771,7 +771,7 @@ module.exports = quickSendCtrl; },{}],14:[function(require,module,exports){ 'use strict'; -var bulkGenCtrl = function ($scope) { +var bulkGenCtrl = function bulkGenCtrl($scope) { $scope.showWallets = false; $scope.genWallets = function () { if ($scope.amount == '' || $scope.amount != parseInt($scope.amount, 10)) alert(globalFuncs.errorMsgs[0]);else { @@ -803,7 +803,7 @@ module.exports = bulkGenCtrl; },{}],15:[function(require,module,exports){ 'use strict'; -var contractsCtrl = function ($scope, $sce, walletService) { +var contractsCtrl = function contractsCtrl($scope, $sce, walletService) { $scope.ajaxReq = ajaxReq; walletService.wallet = null; $scope.visibility = "interactView"; @@ -968,13 +968,14 @@ var contractsCtrl = function ($scope, $sce, walletService) { if (!$scope.Validator.isValidAddress($scope.contract.address)) throw globalFuncs.errorMsgs[5];else if (!$scope.Validator.isJSON($scope.contract.abi)) throw globalFuncs.errorMsgs[26]; $scope.contract.functions = []; var tAbi = JSON.parse($scope.contract.abi); - for (var i in tAbi) if (tAbi[i].type == "function") { - tAbi[i].inputs.map(function (i) { - i.value = ''; - }); - $scope.contract.functions.push(tAbi[i]); - } - $scope.showReadWrite = true; + for (var i in tAbi) { + if (tAbi[i].type == "function") { + tAbi[i].inputs.map(function (i) { + i.value = ''; + }); + $scope.contract.functions.push(tAbi[i]); + } + }$scope.showReadWrite = true; } catch (e) { $scope.notifier.danger(e); } @@ -995,7 +996,7 @@ module.exports = contractsCtrl; (function (Buffer){ 'use strict'; -var decryptWalletCtrl = function ($scope, $sce, walletService) { +var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) { var hval = window.location.hash; $scope.walletType = ""; $scope.requireFPass = $scope.requirePPass = $scope.showFDecrypt = $scope.showPDecrypt = $scope.showAOnly = $scope.showParityDecrypt = false; @@ -1019,7 +1020,8 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { ledgerClassicPath: "m/44'/60'/160720'/0'", // first address: m/44'/60'/160720'/0/0 trezorTestnetPath: "m/44'/1'/0'/0", // first address: m/44'/1'/0'/0/0 trezorClassicPath: "m/44'/61'/0'/0", // first address: m/44'/61'/0'/0/0 - trezorPath: "m/44'/60'/0'/0" }; + trezorPath: "m/44'/60'/0'/0" // first address: m/44'/60'/0'/0/0 + }; $scope.HDWallet.dPath = $scope.HDWallet.defaultDPath; $scope.mnemonicModel = new Modal(document.getElementById('mnemonicModel')); $scope.$watch('ajaxReq.type', function () { @@ -1055,7 +1057,9 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { $scope.HDWallet.dPath = $scope.HDWallet.defaultDPath; } }); - $scope.onHDDPathChange = function (password = $scope.mnemonicPassword) { + $scope.onHDDPathChange = function () { + var password = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : $scope.mnemonicPassword; + $scope.HDWallet.numWallets = 0; if ($scope.walletType == 'pastemnemonic') { $scope.HDWallet.hdk = hd.HDKey.fromMasterSeed(hd.bip39.mnemonicToSeed($scope.manualmnemonic.trim(), password)); @@ -1087,7 +1091,7 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { $scope.showFDecrypt = $scope.filePassword.length >= 0; }; $scope.onPrivKeyChange = function () { - const manualprivkey = fixPkey($scope.manualprivkey); + var manualprivkey = fixPkey($scope.manualprivkey); $scope.requirePPass = manualprivkey.length == 128 || manualprivkey.length == 132; $scope.showPDecrypt = manualprivkey.length == 64; @@ -1179,10 +1183,10 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { $scope.wallet = { type: "addressOnly", address: $scope.addressOnly, - getAddressString: function () { + getAddressString: function getAddressString() { return this.address; }, - getChecksumAddressString: function () { + getChecksumAddressString: function getChecksumAddressString() { return ethUtil.toChecksumAddress(this.getAddressString()); }, setBalance: tempWallet.setBalance, @@ -1247,10 +1251,10 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { module.exports = decryptWalletCtrl; }).call(this,require("buffer").Buffer) -},{"buffer":175}],17:[function(require,module,exports){ +},{"buffer":173}],17:[function(require,module,exports){ 'use strict'; -var ensCtrl = function ($scope, $sce, walletService) { +var ensCtrl = function ensCtrl($scope, $sce, walletService) { $scope.ajaxReq = ajaxReq; $scope.hideEnsInfoPanel = false; walletService.wallet = null; @@ -1308,10 +1312,10 @@ var ensCtrl = function ($scope, $sce, walletService) { $scope.getCurrentTime = function () { return new Date().toString(); }; - var updateScope = function () { + var updateScope = function updateScope() { if (!$scope.$$phase) $scope.$apply(); }; - var timeRem = function (timeUntil) { + var timeRem = function timeRem(timeUntil) { var rem = timeUntil - new Date(); if (rem < 0) { clearInterval($scope.objENS.timer); @@ -1348,8 +1352,9 @@ var ensCtrl = function ($scope, $sce, walletService) { ENS.getAuctionEntries($scope.objENS.name, function (data) { if (data.error) $scope.notifier.danger(data.msg);else { var entries = data.data; - for (var key in entries) $scope.objENS[key] = entries[key]; - switch ($scope.objENS.status) { + for (var key in entries) { + $scope.objENS[key] = entries[key]; + }switch ($scope.objENS.status) { case $scope.ensModes.owned: ENS.getOwner($scope.objENS.name + '.eth', function (data) { $scope.objENS.owner = data.data; @@ -1365,19 +1370,25 @@ var ensCtrl = function ($scope, $sce, walletService) { ENS.getAllowedTime($scope.objENS.name, function (data) { $scope.objENS.allowedTime = data.data; clearInterval($scope.objENS.timer); - $scope.objENS.timer = setInterval(() => timeRem($scope.objENS.allowedTime), 1000); + $scope.objENS.timer = setInterval(function () { + return timeRem($scope.objENS.allowedTime); + }, 1000); }); break; case $scope.ensModes.auction: clearInterval($scope.objENS.timer); - $scope.objENS.timer = setInterval(() => timeRem($scope.objENS.registrationDate), 1000); + $scope.objENS.timer = setInterval(function () { + return timeRem($scope.objENS.registrationDate); + }, 1000); break; case $scope.ensModes.reveal: $scope.objENS.bidValue = 0; $scope.objENS.secret = ''; $scope.objENS.highestBid = etherUnits.toEther($scope.objENS.highestBid.toString(), 'wei'); clearInterval($scope.objENS.timer); - $scope.objENS.timer = setInterval(() => timeRem($scope.objENS.registrationDate), 1000); + $scope.objENS.timer = setInterval(function () { + return timeRem($scope.objENS.registrationDate); + }, 1000); break; } updateScope(); @@ -1407,12 +1418,12 @@ var ensCtrl = function ($scope, $sce, walletService) { $scope.notifier.danger(e.message); } }; - var getShaBid = function (_bidObject, callback) { + var getShaBid = function getShaBid(_bidObject, callback) { ENS.shaBid(_bidObject.nameSHA3, _bidObject.owner, _bidObject.value, _bidObject.secretSHA3, function (data) { if (data.error) callback(true, data.msg);else callback(false, data.data); }); }; - var getBidObject = function () { + var getBidObject = function getBidObject() { var _objENS = $scope.objENS; var bidObject = { name: _objENS.name, @@ -1569,7 +1580,7 @@ module.exports = ensCtrl; },{}],18:[function(require,module,exports){ 'use strict'; -var footerCtrl = function ($scope, globalService) { +var footerCtrl = function footerCtrl($scope, globalService) { var gasPriceKey = "gasPrice"; $scope.footerModal = new Modal(document.getElementById('disclaimerModal')); $scope.ethBlockNumber = "loading"; @@ -1589,7 +1600,7 @@ var footerCtrl = function ($scope, globalService) { globalFuncs.localStorage.setItem(gasPriceKey, $scope.gas.value); ethFuncs.gasAdjustment = $scope.gas.value; }; - var setGasValues = function () { + var setGasValues = function setGasValues() { $scope.gas = { curVal: 21, value: globalFuncs.localStorage.getItem(gasPriceKey, null) ? parseInt(globalFuncs.localStorage.getItem(gasPriceKey)) : 21, @@ -1606,7 +1617,7 @@ module.exports = footerCtrl; },{}],19:[function(require,module,exports){ 'use strict'; -var helpersCtrl = function ($scope) { +var helpersCtrl = function helpersCtrl($scope) { var ENS = new ens(); var unitNames = ['wei', 'kwei', 'mwei', 'gwei', 'szabo', 'finney', 'ether', 'kether', 'mether', 'gether', 'tether']; @@ -1704,7 +1715,7 @@ var helpersCtrl = function ($scope) { }; $scope.findMyPrivateKey = function () { - var setCharAt = function (str, index, chr) { + var setCharAt = function setCharAt(str, index, chr) { if (index > str.length - 1) return str; return str.substr(0, index) + chr + str.substr(index + 1); }; @@ -1758,7 +1769,7 @@ FINALIZE },{}],20:[function(require,module,exports){ 'use strict'; -var offlineTxCtrl = function ($scope, $sce, walletService) { +var offlineTxCtrl = function offlineTxCtrl($scope, $sce, walletService) { $scope.ajaxReq = ajaxReq; walletService.wallet = null; walletService.password = ''; @@ -1845,7 +1856,9 @@ var offlineTxCtrl = function ($scope, $sce, walletService) { $scope.dropdownEnabled = true; } }, true); - $scope.setSendMode = function (index, tokenSymbol = '') { + $scope.setSendMode = function (index) { + var tokenSymbol = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; + $scope.tokenTx.id = index; if (index == 'ether') { $scope.unitReadable = ajaxReq.type; @@ -1927,7 +1940,7 @@ module.exports = offlineTxCtrl; },{}],21:[function(require,module,exports){ 'use strict'; -var sendTxCtrl = function ($scope, $sce, walletService) { +var sendTxCtrl = function sendTxCtrl($scope, $sce, walletService) { $scope.ajaxReq = ajaxReq; $scope.unitReadable = ajaxReq.type; $scope.sendTxModal = new Modal(document.getElementById('sendTransaction')); @@ -1961,7 +1974,10 @@ var sendTxCtrl = function ($scope, $sce, walletService) { tokenSymbol: globalFuncs.urlGet('tokenSymbol') == null ? false : globalFuncs.urlGet('tokenSymbol'), readOnly: globalFuncs.urlGet('readOnly') == null ? false : true }; - $scope.setSendMode = function (sendMode, tokenId = '', tokenSymbol = '') { + $scope.setSendMode = function (sendMode) { + var tokenId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; + var tokenSymbol = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ''; + $scope.tx.sendMode = sendMode; $scope.unitReadable = ''; if (sendMode == 'ether') { @@ -1988,10 +2004,10 @@ var sendTxCtrl = function ($scope, $sce, walletService) { } if ($scope.tx.sendMode != 'token') $scope.tokenTx.id = -1; }; - var applyScope = function () { + var applyScope = function applyScope() { if (!$scope.$$phase) $scope.$apply(); }; - var defaultInit = function () { + var defaultInit = function defaultInit() { globalFuncs.urlGet('sendMode') == null ? $scope.setSendMode('ether') : $scope.setSendMode(globalFuncs.urlGet('sendMode')); $scope.showAdvance = globalFuncs.urlGet('gaslimit') != null || globalFuncs.urlGet('gas') != null || globalFuncs.urlGet('data') != null; if (globalFuncs.urlGet('data') || globalFuncs.urlGet('value') || globalFuncs.urlGet('to') || globalFuncs.urlGet('gaslimit') || globalFuncs.urlGet('sendMode') || globalFuncs.urlGet('gas') || globalFuncs.urlGet('tokenSymbol')) $scope.hasQueryString = true; // if there is a query string, show an warning at top of page @@ -2006,7 +2022,7 @@ var sendTxCtrl = function ($scope, $sce, walletService) { $scope.wallet.setBalance(applyScope); //$scope.wallet.setTokens(); if ($scope.parentTxConfig) { - var setTxObj = function () { + var setTxObj = function setTxObj() { $scope.addressDrtv.ensAddressField = $scope.parentTxConfig.to; $scope.tx.value = $scope.parentTxConfig.value; $scope.tx.sendMode = $scope.parentTxConfig.sendMode ? $scope.parentTxConfig.sendMode : 'ether'; @@ -2095,7 +2111,7 @@ var sendTxCtrl = function ($scope, $sce, walletService) { } else $scope.notifier.danger(data.msg); }); }; - var isEnough = function (valA, valB) { + var isEnough = function isEnough(valA, valB) { return new BigNumber(valA).lte(new BigNumber(valB)); }; $scope.hasEnoughBalance = function () { @@ -2172,7 +2188,7 @@ module.exports = sendTxCtrl; (function (Buffer){ 'use strict'; -var signMsgCtrl = function ($scope, $sce, walletService) { +var signMsgCtrl = function signMsgCtrl($scope, $sce, walletService) { walletService.wallet = null; $scope.visibility = "signView"; $scope.$watch(function () { @@ -2231,10 +2247,10 @@ var signMsgCtrl = function ($scope, $sce, walletService) { module.exports = signMsgCtrl; }).call(this,require("buffer").Buffer) -},{"buffer":175}],23:[function(require,module,exports){ +},{"buffer":173}],23:[function(require,module,exports){ 'use strict'; -var swapCtrl = function ($scope, $sce, walletService) { +var swapCtrl = function swapCtrl($scope, $sce, walletService) { var lStorageKey = "swapOrder"; $scope.ajaxReq = ajaxReq; $scope.Validator = Validator; @@ -2247,7 +2263,7 @@ var swapCtrl = function ($scope, $sce, walletService) { }, 30000); $scope.priceTicker = { ETHBTC: 1, ETHREP: 1, BTCREP: 1, BTCETH: 1, REPBTC: 1, REPETH: 1 }; $scope.availableCoins = ["ETH", "BTC", "REP"]; - var initValues = function () { + var initValues = function initValues() { $scope.showStage1 = true; $scope.showStage2 = $scope.showStage3Eth = $scope.showStage3Btc = false; $scope.orderResult = null; @@ -2271,7 +2287,7 @@ var swapCtrl = function ($scope, $sce, walletService) { greaterThanMax: 2, noErrors: 3 }; - var verify = function () { + var verify = function verify() { if (!$scope.bity.priceLoaded) return errors.priceNotLoaded;else if ($scope.swapOrder.toVal < bity.min || $scope.swapOrder.fromVal < bity.min) return errors.lessThanMin;else if ($scope.swapOrder.toCoin == "BTC" && $scope.swapOrder.toVal > bity.max || $scope.swapOrder.fromCoin == "BTC" && $scope.swapOrder.fromVal > bity.max) return errors.greaterThanMax;else if ($scope.swapOrder.toCoin == "ETH" && $scope.swapOrder.toVal * $scope.bity.curRate['ETHBTC'] > bity.max || $scope.swapOrder.fromCoin == "ETH" && $scope.swapOrder.fromVal * $scope.bity.curRate['ETHBTC'] > bity.max) return errors.greaterThanMax;else if ($scope.swapOrder.toCoin == "REP" && $scope.swapOrder.toVal * $scope.bity.curRate['REPBTC'] > bity.max || $scope.swapOrder.fromCoin == "REP" && $scope.swapOrder.fromVal * $scope.bity.curRate['REPBTC'] > bity.max) return errors.greaterThanMax; return errors.noErrors; }; @@ -2283,11 +2299,12 @@ var swapCtrl = function ($scope, $sce, walletService) { }; $scope.setOrderCoin = function (isFrom, coin) { if (isFrom) $scope.swapOrder.fromCoin = coin;else $scope.swapOrder.toCoin = coin; - if ($scope.swapOrder.fromCoin == $scope.swapOrder.toCoin) for (var i in $scope.availableCoins) if ($scope.availableCoins[i] != $scope.swapOrder.fromCoin) { - $scope.swapOrder.toCoin = $scope.availableCoins[i]; - break; - } - $scope.swapOrder.swapRate = $scope.bity.curRate[$scope.swapOrder.fromCoin + $scope.swapOrder.toCoin]; + if ($scope.swapOrder.fromCoin == $scope.swapOrder.toCoin) for (var i in $scope.availableCoins) { + if ($scope.availableCoins[i] != $scope.swapOrder.fromCoin) { + $scope.swapOrder.toCoin = $scope.availableCoins[i]; + break; + } + }$scope.swapOrder.swapRate = $scope.bity.curRate[$scope.swapOrder.fromCoin + $scope.swapOrder.toCoin]; $scope.swapOrder.swapPair = $scope.swapOrder.fromCoin + "/" + $scope.swapOrder.toCoin; $scope.updateEstimate(isFrom); $scope.dropdownFrom = $scope.dropdownTo = false; @@ -2307,27 +2324,27 @@ var swapCtrl = function ($scope, $sce, walletService) { $scope.notifier.danger(e); } }; - var getProgressBarArr = function (index, len) { + var getProgressBarArr = function getProgressBarArr(index, len) { var tempArr = []; for (var i = 0; i < len; i++) { if (i < index) tempArr.push('progress-true');else if (i == index) tempArr.push('progress-active');else tempArr.push(''); } return tempArr; }; - var isStorageOrderExists = function () { + var isStorageOrderExists = function isStorageOrderExists() { var order = globalFuncs.localStorage.getItem(lStorageKey, null); return order && $scope.Validator.isJSON(order); }; - var setOrderFromStorage = function () { + var setOrderFromStorage = function setOrderFromStorage() { var order = JSON.parse(globalFuncs.localStorage.getItem(lStorageKey, null)); $scope.orderResult = order; $scope.swapOrder = order.swapOrder; processOrder(); }; - var saveOrderToStorage = function (order) { + var saveOrderToStorage = function saveOrderToStorage(order) { globalFuncs.localStorage.setItem(lStorageKey, JSON.stringify(order)); }; - var processOrder = function () { + var processOrder = function processOrder() { var orderResult = $scope.orderResult; orderResult.progress = { status: "OPEN", @@ -2440,7 +2457,7 @@ module.exports = swapCtrl; },{}],24:[function(require,module,exports){ 'use strict'; -var tabsCtrl = function ($scope, globalService, $translate, $sce) { +var tabsCtrl = function tabsCtrl($scope, globalService, $translate, $sce) { $scope.gService = globalService; $scope.tabNames = $scope.gService.tabs; $scope.curLang = 'English'; @@ -2485,9 +2502,11 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) { $scope.dropdownNode = false; Token.popTokens = $scope.curNode.tokenList; ajaxReq['key'] = key; - for (var attrname in $scope.curNode.lib) ajaxReq[attrname] = $scope.curNode.lib[attrname]; - for (var attrname in $scope.curNode) if (attrname != 'name' && attrname != 'tokenList' && attrname != 'lib') ajaxReq[attrname] = $scope.curNode[attrname]; - globalFuncs.localStorage.setItem('curNode', JSON.stringify({ + for (var attrname in $scope.curNode.lib) { + ajaxReq[attrname] = $scope.curNode.lib[attrname]; + }for (var attrname in $scope.curNode) { + if (attrname != 'name' && attrname != 'tokenList' && attrname != 'lib') ajaxReq[attrname] = $scope.curNode[attrname]; + }globalFuncs.localStorage.setItem('curNode', JSON.stringify({ key: key })); if (nodes.ensNodeTypes.indexOf($scope.curNode.type) == -1) $scope.tabNames.ens.cx = $scope.tabNames.ens.mew = false;else $scope.tabNames.ens.cx = $scope.tabNames.ens.mew = true; @@ -2536,7 +2555,9 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) { var localNodes = globalFuncs.localStorage.getItem('localNodes', null); if (localNodes) { localNodes = JSON.parse(localNodes); - for (var i = 0; i < localNodes.length; i++) $scope.addCustomNodeToList(localNodes[i]); + for (var i = 0; i < localNodes.length; i++) { + $scope.addCustomNodeToList(localNodes[i]); + } } }; $scope.getCustomNodesFromStorage(); @@ -2609,8 +2630,11 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) { }; $scope.setErrorMsgLanguage = function () { - for (var i = 0; i < globalFuncs.errorMsgs.length; i++) $scope.setLanguageVal('ERROR_' + i, 'errorMsgs', i); - for (var i = 0; i < globalFuncs.successMsgs.length; i++) $scope.setLanguageVal('SUCCESS_' + (i + 1), 'successMsgs', i); + for (var i = 0; i < globalFuncs.errorMsgs.length; i++) { + $scope.setLanguageVal('ERROR_' + i, 'errorMsgs', i); + }for (var i = 0; i < globalFuncs.successMsgs.length; i++) { + $scope.setLanguageVal('SUCCESS_' + (i + 1), 'successMsgs', i); + } }; $scope.setGethErrMsgLanguage = function () { @@ -2698,7 +2722,7 @@ module.exports = tabsCtrl; },{}],25:[function(require,module,exports){ 'use strict'; -var viewCtrl = function ($scope, globalService, $sce) { +var viewCtrl = function viewCtrl($scope, globalService, $sce) { $scope.globalService = globalService; $scope.notifier = uiFuncs.notifier; $scope.notifier.sce = $sce; @@ -2709,7 +2733,7 @@ module.exports = viewCtrl; },{}],26:[function(require,module,exports){ 'use strict'; -var viewWalletCtrl = function ($scope, walletService) { +var viewWalletCtrl = function viewWalletCtrl($scope, walletService) { $scope.usdBalance = "loading"; $scope.gbpBalance = "loading"; $scope.eurBalance = "loading"; @@ -2769,7 +2793,7 @@ module.exports = viewWalletCtrl; },{}],27:[function(require,module,exports){ 'use strict'; -var walletBalanceCtrl = function ($scope, $sce) { +var walletBalanceCtrl = function walletBalanceCtrl($scope, $sce) { $scope.ajaxReq = ajaxReq; $scope.tokensLoaded = false; $scope.localToken = { @@ -2822,7 +2846,7 @@ module.exports = walletBalanceCtrl; },{}],28:[function(require,module,exports){ 'use strict'; -var walletGenCtrl = function ($scope) { +var walletGenCtrl = function walletGenCtrl($scope) { $scope.password = ""; $scope.wallet = null; $scope.showWallet = false; @@ -2876,6 +2900,8 @@ var walletGenCtrl = function ($scope) { module.exports = walletGenCtrl; },{}],29:[function(require,module,exports){ +'use strict'; + // For token sale holders: // 1. Add the address users are sending to // 2. Add the gas limit users should use to send successfully (this avoids OOG errors) @@ -2886,6 +2912,9 @@ module.exports = walletGenCtrl; // http://www.tokensalecalendar.com/ // If you aren't on the above, you should get on it. +// msg: '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗' + + module.exports = [{ // DCORP to: '0xD42433A8a0A1CEB73c8ff4e432463e2ee109039d', @@ -2897,7 +2926,7 @@ module.exports = [{ to: '0x55d34b686aa8C04921397c5807DB9ECEdba00a4c', gasLimit: 200000, data: '', - msg: 'Status.im https://contribute.status.im ______________________________________________________________________________________________________________________ STARTS:_June 20th 2pm GMT @ Block 3903900______________________________________________________________________ GAS_PRICE:_50 GWEI. Change via slider in the footer_____________________________________________________________________ GAS_LIMIT:_200000___________________________________________________________________________________________________ NOT_LOADING:_Change the node in upper right corner to ETH (Etherscan.io)_____________________________________________ SUPPORT:_https://www.reddit.com/r/statusim/ https://twitter.com/ethstatus' + msg: 'DONT SEND UNTIL BLOCK 3903900!!!! Status.im https://contribute.status.im ______________________________________________________________________________________________________________________ STARTS: Block 3903900______________________________________________________________________ GAS_PRICE:_50 GWEI. Change via slider in the footer_____________________________________________________________________ GAS_LIMIT:_200000___________________________________________________________________________________________________ NOT_LOADING:_Change the node in upper right corner to ETH (Etherscan.io)_____________________________________________ SUPPORT:_https://www.reddit.com/r/statusim/ https://twitter.com/ethstatus' }, { // Status to: '0x0000', @@ -2951,7 +2980,7 @@ module.exports = [{ },{}],30:[function(require,module,exports){ 'use strict'; -var cxFuncs = function () {}; +var cxFuncs = function cxFuncs() {}; cxFuncs.storage = chrome.storage.sync; cxFuncs.getAllNickNames = function (callback) { var nickNames = []; @@ -3039,7 +3068,7 @@ module.exports = cxFuncs; },{}],31:[function(require,module,exports){ 'use strict'; -var QRCodeDrtv = function () { +var QRCodeDrtv = function QRCodeDrtv() { return function (scope, element, attrs) { var watchVar = attrs.watchVar; scope.$watch(watchVar, function () { @@ -3065,14 +3094,14 @@ module.exports = QRCodeDrtv; },{}],32:[function(require,module,exports){ 'use strict'; -var addressFieldDrtv = function ($compile) { +var addressFieldDrtv = function addressFieldDrtv($compile) { return { restrict: "E", - link: function (scope, element, attrs) { + link: function link(scope, element, attrs) { var varName = attrs.varName; var varArr = varName.split('.'); var placeholder = attrs.placeholder; - var setValue = function (value) { + var setValue = function setValue(value) { var temp = scope; for (var i in varArr) { if (i == varArr.length - 1) temp[varArr[i]] = value;else { @@ -3129,7 +3158,7 @@ module.exports = "