218 Commits

Author	SHA1	Message	Date
Anton	1d23a5c81b	error message fix	2018-05-28 18:08:33 +02:00
Anton	62dc6e20eb	Clean up user rejection error message	2018-05-28 17:57:45 +02:00
frankiebee	61caee9d94	Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker	2018-05-22 16:45:20 -07:00
frankiebee	10aecf4922	remove dependance on the even tx:confirmed	2018-05-22 16:40:01 -07:00
kumavis	3a80f3dd83	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-05-22 13:20:04 -07:00
Frankie	e8b2e11c56	Reveal get filtered tx list (#4332) ... * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken)	2018-05-21 16:00:44 -07:00
kumavis	088d7930e0	network - create provider and block-tracker via json-rpc-engine	2018-05-16 20:46:34 -07:00
bitpshr	6351b7bb88	Fix documentation typo	2018-05-07 15:08:43 -04:00
frankiebee	a45cb75435	transactions - add a nonce check utility for ui use	2018-05-01 13:57:43 -07:00
frankiebee	8ffce8b59d	transactions - more docs and clean ups	2018-04-25 11:13:51 -07:00
Dan Finlay	621e9334bc	Cleaned up some typos and JSDocs in Transactions ... Nonce tracker is not fully documented yet. Have not yet touched: - tx-state-manager - tx-state-history-helper - util - tx-gas-utils - pending-tx-tracker	2018-04-23 09:43:18 -07:00
frankiebee	e862a5091e	transactions - fix refernces	2018-04-19 12:07:45 -07:00
frankiebee	c20c97ce62	Merge branch 'master' into tx-controller-rewrite-v3	2018-04-19 11:49:11 -07:00
frankiebee	eeb9390de8	meta - transactions - docs yo!	2018-04-19 11:46:15 -07:00
frankiebee	943eea043c	fix up - more docs	2018-04-13 13:18:45 -07:00
frankiebee	88f4212363	meta - transactions - code clean up and jsDoc	2018-04-13 12:38:07 -07:00
frankiebee	3aaa28531e	transactions - code cleanup	2018-04-12 12:24:16 -07:00
frankiebee	2d7c3c2b00	meta - transactions - create a transactions dir in controller and move relevant files into it	2018-04-10 14:28:05 -07:00