diff options
| author | Alexander Tseung <alextsg@users.noreply.github.com> | 2017-12-23 03:31:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-23 03:31:07 +0800 |
| commit | 5a58add797fcdbb023678af84a61f1d2bfdafaf1 (patch) | |
| tree | e9a6fa414f277d3c094e7d6871ef50e3340b0fec /app/scripts/controllers/transactions.js | |
| parent | 8f6c322e0121ff1dd086086e5599c2ce8eadfe05 (diff) | |
| parent | ca51cab35f7123cd6e2e9feb61f2d7e7bcd42fd1 (diff) | |
| download | tangerine-wallet-browser-5a58add797fcdbb023678af84a61f1d2bfdafaf1.tar tangerine-wallet-browser-5a58add797fcdbb023678af84a61f1d2bfdafaf1.tar.gz tangerine-wallet-browser-5a58add797fcdbb023678af84a61f1d2bfdafaf1.tar.bz2 tangerine-wallet-browser-5a58add797fcdbb023678af84a61f1d2bfdafaf1.tar.lz tangerine-wallet-browser-5a58add797fcdbb023678af84a61f1d2bfdafaf1.tar.xz tangerine-wallet-browser-5a58add797fcdbb023678af84a61f1d2bfdafaf1.tar.zst tangerine-wallet-browser-5a58add797fcdbb023678af84a61f1d2bfdafaf1.zip | |
Merge pull request #2798 from alextsg/NewUI-flat-4.0.5
Merge master into NewUI-flat
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 8a193849a..7f3130540 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -59,7 +59,6 @@ module.exports = class TransactionController extends EventEmitter { this.pendingTxTracker = new PendingTransactionTracker({ provider: this.provider, nonceTracker: this.nonceTracker, - retryTimePeriod: 86400000, // Retry 3500 blocks, or about 1 day. publishTransaction: (rawTx) => this.query.sendRawTransaction(rawTx), getPendingTransactions: this.txStateManager.getPendingTransactions.bind(this.txStateManager), getCompletedTransactions: this.txStateManager.getConfirmedTransactions.bind(this.txStateManager), |