diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-09-07 05:01:07 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-09-07 05:01:07 +0800 |
| commit | a73aecc796c2f2416227508db8e96e22915cfa65 (patch) | |
| tree | 7cdc662b5d6bf4dd74a8b3eea5dc7f6bb34a850b /app/scripts/controllers/transactions.js | |
| parent | 6c83ba762e73419c6db444dde05b3ebe31d7028e (diff) | |
| download | tangerine-wallet-browser-a73aecc796c2f2416227508db8e96e22915cfa65.tar tangerine-wallet-browser-a73aecc796c2f2416227508db8e96e22915cfa65.tar.gz tangerine-wallet-browser-a73aecc796c2f2416227508db8e96e22915cfa65.tar.bz2 tangerine-wallet-browser-a73aecc796c2f2416227508db8e96e22915cfa65.tar.lz tangerine-wallet-browser-a73aecc796c2f2416227508db8e96e22915cfa65.tar.xz tangerine-wallet-browser-a73aecc796c2f2416227508db8e96e22915cfa65.tar.zst tangerine-wallet-browser-a73aecc796c2f2416227508db8e96e22915cfa65.zip | |
fix merge and errors disaperaing on update
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 3f2a7ce16..5aaee7be0 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -56,7 +56,7 @@ module.exports = class TransactionController extends EventEmitter { }) }, getConfirmedTransactions: (address) => { - return this.getFilteredTxList({ + return this.txStateManager.getFilteredTxList({ from: address, status: 'confirmed', err: undefined, |