aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-07-27 01:43:36 +0800
committerkumavis <aaron@kumavis.me>2017-07-27 01:43:36 +0800
commitde2cf4e9cd00ec947e265b0bff3f676c02d5a4f7 (patch)
tree968b070a4b023af29063e823f1ee9c218c991f49 /app
parent0ef90fb1f0f1a1bf4a7efd90df7b8f8c66fc07d5 (diff)
parent5af753a597d565e4654899ea37349ba7e839bb00 (diff)
downloadtangerine-wallet-browser-de2cf4e9cd00ec947e265b0bff3f676c02d5a4f7.tar
tangerine-wallet-browser-de2cf4e9cd00ec947e265b0bff3f676c02d5a4f7.tar.gz
tangerine-wallet-browser-de2cf4e9cd00ec947e265b0bff3f676c02d5a4f7.tar.bz2
tangerine-wallet-browser-de2cf4e9cd00ec947e265b0bff3f676c02d5a4f7.tar.lz
tangerine-wallet-browser-de2cf4e9cd00ec947e265b0bff3f676c02d5a4f7.tar.xz
tangerine-wallet-browser-de2cf4e9cd00ec947e265b0bff3f676c02d5a4f7.tar.zst
tangerine-wallet-browser-de2cf4e9cd00ec947e265b0bff3f676c02d5a4f7.zip
Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterErrorsOnTx
Diffstat (limited to 'app')
-rw-r--r--app/scripts/controllers/transactions.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 32795a9f2..d6b2b555e 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -482,7 +482,7 @@ module.exports = class TransactionController extends EventEmitter {
if (!this.txProviderUtils.sufficientBalance(txMeta.txParams, balance)) {
const message = 'Insufficient balance.'
this.setTxStatusFailed(txMeta.id, {
- stack: '_resubnitTx: custom tx-controller error',
+ stack: '_resubmitTx: custom tx-controller error',
message,
})
log.error(message)