aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-07-12 03:05:00 +0800
committerGitHub <noreply@github.com>2017-07-12 03:05:00 +0800
commit0eee232e26dec61512e36bedf131ce0f7ce1ddd4 (patch)
tree9f188c8e10e9891fb134542e4a2d9d28afdda57f
parent2d1b7c0ee152c38ebb0f3a63bd9f2daef18ded36 (diff)
parent611338c4e0b6de670f1a3ac6a0f1ddd3a2c063f7 (diff)
downloadtangerine-wallet-browser-0eee232e26dec61512e36bedf131ce0f7ce1ddd4.tar.gz
tangerine-wallet-browser-0eee232e26dec61512e36bedf131ce0f7ce1ddd4.tar.zst
tangerine-wallet-browser-0eee232e26dec61512e36bedf131ce0f7ce1ddd4.zip
Merge pull request #1761 from MetaMask/resubmimtErrors
add "Gateway timeout"
-rw-r--r--app/scripts/controllers/transactions.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 18bb245de..c0d4841a9 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -426,11 +426,13 @@ module.exports = class TransactionController extends EventEmitter {
const errorMessage = err.message.toLowerCase()
const isKnownTx = (
// geth
- errorMessage === 'replacement transaction underpriced'
- || errorMessage.startsWith('known transaction')
+ errorMessage.includes('replacement transaction underpriced')
+ || errorMessage.includes('known transaction')
// parity
- || errorMessage === 'gas price too low to replace'
- || errorMessage === 'transaction with the same hash was already imported.'
+ || errorMessage.includes('gas price too low to replace')
+ || errorMessage.includes('transaction with the same hash was already imported')
+ // other
+ || errorMessage.includes('gateway timeout')
)
// ignore resubmit warnings, return early
if (isKnownTx) return