diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-15 03:17:53 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-15 03:19:01 +0800 |
| commit | d891869eff39cc0d617e04d0bccc88875676bac9 (patch) | |
| tree | 464b5bbca6074344621bbd774cb2f62c1901c75d /app/scripts | |
| parent | 115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5 (diff) | |
| download | tangerine-wallet-browser-d891869eff39cc0d617e04d0bccc88875676bac9.tar tangerine-wallet-browser-d891869eff39cc0d617e04d0bccc88875676bac9.tar.gz tangerine-wallet-browser-d891869eff39cc0d617e04d0bccc88875676bac9.tar.bz2 tangerine-wallet-browser-d891869eff39cc0d617e04d0bccc88875676bac9.tar.lz tangerine-wallet-browser-d891869eff39cc0d617e04d0bccc88875676bac9.tar.xz tangerine-wallet-browser-d891869eff39cc0d617e04d0bccc88875676bac9.tar.zst tangerine-wallet-browser-d891869eff39cc0d617e04d0bccc88875676bac9.zip | |
First attempt at fixing errors in confirmation screen.
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/lib/idStore.js | 6 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index cd717df28..65b8c7029 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -248,7 +248,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone function analyzeForDelegateCall(cb){ if (txParams.to) { query.getCode(txParams.to, (err, result) => { - if (err) return cb(err) + if (err) return cb(err.message || err) var containsDelegateCall = self.checkForDelegateCall(result) txData.containsDelegateCall = containsDelegateCall cb() @@ -264,7 +264,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone var gasLimit = '0x3b9aca00' estimationParams.gas = gasLimit query.estimateGas(estimationParams, function(err, result){ - if (err) return cb(err) + if (err) return cb(err.message || err) if (result === estimationParams.gas) { txData.simulationFails = true query.getBlockByNumber('latest', true, function(err, block){ @@ -282,7 +282,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone } function didComplete (err) { - if (err) return cb(err) + if (err) return cb(err.message || err) configManager.addTx(txData) // signal update self._didUpdate() diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index da05e5f5d..5e76c5ebd 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -212,7 +212,6 @@ module.exports = class MetamaskController { newUnsignedTransaction (txParams, onTxDoneCb) { const idStore = this.idStore - let err = this.enforceTxValidations(txParams) if (err) return onTxDoneCb(err) idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { |