aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Solya <csaba.solya@gmail.com>2018-07-21 01:58:26 +0800
committerCsaba Solya <csaba.solya@gmail.com>2018-07-21 01:58:26 +0800
commit72591d4f41aafa7556cbc37d613fcbe016444156 (patch)
treed10fbfec5617becd03a47b76eee04350e4c2ef04
parenta3822b4680a295848f900616e3e154a1e1003a54 (diff)
downloadtangerine-wallet-browser-72591d4f41aafa7556cbc37d613fcbe016444156.tar
tangerine-wallet-browser-72591d4f41aafa7556cbc37d613fcbe016444156.tar.gz
tangerine-wallet-browser-72591d4f41aafa7556cbc37d613fcbe016444156.tar.bz2
tangerine-wallet-browser-72591d4f41aafa7556cbc37d613fcbe016444156.tar.lz
tangerine-wallet-browser-72591d4f41aafa7556cbc37d613fcbe016444156.tar.xz
tangerine-wallet-browser-72591d4f41aafa7556cbc37d613fcbe016444156.tar.zst
tangerine-wallet-browser-72591d4f41aafa7556cbc37d613fcbe016444156.zip
remove dropped handler
-rw-r--r--app/scripts/metamask-controller.js2
-rw-r--r--app/scripts/platforms/extension.js10
2 files changed, 1 insertions, 11 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 31156b5b6..939a30d74 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -165,7 +165,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.txController.on('newUnapprovedTx', opts.showUnapprovedTx.bind(opts))
this.txController.on(`tx:status-update`, (txId, status) => {
- if (status === 'confirmed' || status === 'failed' || status === 'dropped') {
+ if (status === 'confirmed' || status === 'failed') {
const txMeta = this.txController.txStateManager.getTx(txId)
this.platform.showTransactionNotification(txMeta)
}
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index afcc9bbca..60ecfeff4 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -40,8 +40,6 @@ class ExtensionPlatform {
this._showConfirmedTransaction(txMeta)
} else if (status === 'failed') {
this._showFailedTransaction(txMeta)
- } else if (status === 'dropped') {
- this._showDroppedTransaction(txMeta)
}
}
@@ -65,14 +63,6 @@ class ExtensionPlatform {
this._showNotification(title, message)
}
- _showDroppedTransaction (txMeta) {
-
- const nonce = parseInt(txMeta.txParams.nonce, 16)
- const title = 'Dropped transaction'
- const message = `Transaction ${nonce} was dropped, because another transaction with that number was successfully processed.`
- this._showNotification(title, message)
- }
-
_showNotification (title, message, url) {
extension.notifications.create(
url,