diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-11-15 11:39:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 11:39:17 +0800 |
| commit | 68d5b459ed406fd8d5e460e3208250530b21aa43 (patch) | |
| tree | 84937c9021f97cb68934b0540dbac6718fdebe2c /app/scripts/lib/idStore.js | |
| parent | 115fdc36fefd33e4bf4a9e551dd6267d3d75f2c5 (diff) | |
| parent | acf02c929036953306037a660c75adc905631706 (diff) | |
| download | tangerine-wallet-browser-68d5b459ed406fd8d5e460e3208250530b21aa43.tar tangerine-wallet-browser-68d5b459ed406fd8d5e460e3208250530b21aa43.tar.gz tangerine-wallet-browser-68d5b459ed406fd8d5e460e3208250530b21aa43.tar.bz2 tangerine-wallet-browser-68d5b459ed406fd8d5e460e3208250530b21aa43.tar.lz tangerine-wallet-browser-68d5b459ed406fd8d5e460e3208250530b21aa43.tar.xz tangerine-wallet-browser-68d5b459ed406fd8d5e460e3208250530b21aa43.tar.zst tangerine-wallet-browser-68d5b459ed406fd8d5e460e3208250530b21aa43.zip | |
Merge pull request #811 from MetaMask/deadly-fix
Fix error display in confirmation screen
Diffstat (limited to 'app/scripts/lib/idStore.js')
| -rw-r--r-- | app/scripts/lib/idStore.js | 6 |
1 files changed, 3 insertions, 3 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() |