aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions
Commit message (Expand)AuthorAgeFilesLines
* tx-gas-util - set error message when invalidating tx based on tx data but no ...kumavis2018-10-211-4/+5
* Merge branch 'develop' into developkumavis2018-10-212-1/+43
|\
| * Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-162-1/+39
| * Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-0/+4
| * Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5...Whymarrh Whitby2018-10-111-23/+1
| * transactions - add txReceipt to the txMeta body for confirmed txs (#5375)Frankie2018-10-101-1/+23
* | tx-gas-utils - improve format + commentskumavis2018-10-101-12/+18
* | ganache-core merged my PR, so I changed some comments to clarify that ganache...Howard Braham2018-10-101-5/+6
* | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-101-7/+16
|/
* Fix updating of pending transactionsDan Finlay2018-10-061-0/+1
* Switch existing modals from using Notification to Modal. Remove Notification ...Alexander Tseung2018-09-201-2/+3
* Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-112-2/+59
|\
| * Add createCancelTransaction methodAlexander Tseung2018-09-112-2/+59
* | Attach the RPC error value to txMetaWhymarrh Whitby2018-09-091-0/+1
|/
* Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-021-7/+3
|\
| * tx-gas-utils - catch all errors from gas estimationJenny Pollack2018-07-251-7/+3
* | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-262-13/+6
|\|
| * Merge pull request #4669 from MetaMask/removeNonceTrackerFunctionThomas Huang2018-07-131-13/+0
| |\
| | * Merge branch 'develop' into removeNonceTrackerFunctionThomas2018-07-111-1/+1
| | |\
| | * | Remove unsued nonce tracker functiontmashuang2018-06-261-13/+0
| * | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-111-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-261-0/+6
| | |/ | |/|
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-041-1/+1
|\ \ \ | | |/ | |/|
| * | eslint --fix .brunobar792018-07-031-1/+1
| |/
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-035-19/+27
|\|
| * lint - fix recipient-blacklist.jskumavis2018-06-161-13/+13
| * blacklist - recipient blacklist as js for inline commentskumavis2018-06-162-2/+2
| * Update recipient-blacklist-config.jsonkumavis2018-06-161-0/+2
| * Add apparent phishing address to block listDan Finlay2018-06-151-0/+1
| * controllers - transaction - prefer log over consolekumavis2018-06-131-2/+2
| * metamask - ensure all nonce locks are releasedkumavis2018-06-133-5/+10
| * nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
* | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-073-1/+43
|\|
| * remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-313-18/+20
| * fix documentationCsaba Solya2018-05-301-1/+1
| * adding tests for recipient blacklist checkerCsaba Solya2018-05-302-5/+5
| * adding transaction controller testsCsaba Solya2018-05-301-1/+1
| * initial implementationCsaba Solya2018-05-302-1/+41
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-072-10/+19
|\|
| * Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-ma...kumavis2018-05-302-10/+19
| |\
| | * cleanErrorStack moved to separate library moduleAnton2018-05-291-12/+4
| | * error message fixAnton2018-05-291-2/+1
| | * Clean up user rejection error messageAnton2018-05-281-3/+14
| | * require logfrankiebee2018-05-011-0/+1
| | * log emitter errorsfrankiebee2018-04-301-6/+10
| | * transactions - run event emitters outside context of _setTxStatusfrankiebee2018-04-301-7/+9
* | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
* | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
* | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
* | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-293-96/+55
* | | controllers - transactions - pending-tx-tracker - _getBlock - poll until bloc...kumavis2018-05-261-1/+10
* | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
* | | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-231-15/+0
|\ \ \
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-15/+0
| |\| |
| | * | Reveal get filtered tx list (#4332)Frankie2018-05-221-15/+0
* | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-7/+18
* | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
|/ / /
* / / network - create provider and block-tracker via json-rpc-enginekumavis2018-05-172-14/+5
|/ /
* | tx-state-history-helper - use more readable Date.now methodkumavis2018-05-171-1/+1
* | fix lint issuesCsaba Solya2018-05-102-2/+2
* | remove unnecessary libCsaba Solya2018-05-101-1/+0
* | revert unnecessary change in state managerCsaba Solya2018-05-101-13/+7
* | add time stamps to transaction history log entriesCsaba Solya2018-05-102-16/+28
* | Fix documentation typobitpshr2018-05-081-1/+1
* | transactions - add a nonce check utility for ui usefrankiebee2018-05-021-0/+15
* | fix - getTxsByMetaData check if the key is in the object not if the value is ...frankiebee2018-05-021-1/+1
|/
* transactions - more docs and clean upsfrankiebee2018-04-266-55/+116
* Cleaned up some typos and JSDocs in TransactionsDan Finlay2018-04-243-38/+40
* transactions - fix referncesfrankiebee2018-04-202-1/+2
* Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-201-0/+1
* meta - transactions - docs yo!frankiebee2018-04-208-73/+351
* fix up - more docsfrankiebee2018-04-143-38/+77
* meta - transactions - code clean up and jsDocfrankiebee2018-04-141-41/+109
* transactions - code cleanupfrankiebee2018-04-132-58/+59
* transactions - lint fixesfrankiebee2018-04-113-12/+12
* meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-117-0/+1203