1451 Commits

Author	SHA1	Message	Date
frankiebee	8adb03074c	Merge branch 'master' into retry-tx-refractor	2018-03-07 17:16:35 -08:00
frankiebee	62febac876	refactor retrytx with higher gas price: ... - create a new tx instead of overwriting the tx hash - add a new state 'dropped' to the txStateManager - mark duplicate txs as dropped when one gets confirmed in a block	2018-03-07 17:16:16 -08:00
Dan Finlay	dd9cac69ae	Merge pull request #3309 from scsaba/edge-support ... Add Edge Support	2018-03-06 09:39:57 -08:00
kumavis	c3bd27c965	sentry - extractErrorMessage - fix comment formatting	2018-02-28 10:57:54 -08:00
kumavis	8e5bcf8935	sentry - failed tx - improve ethjs-rpc error formating	2018-02-28 10:53:54 -08:00
kumavis	fca2cbc8ef	sentry - clean - move setupRaven to lib	2018-02-28 10:37:53 -08:00
Dan Finlay	fe21f8a952	Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch ... sentry - report failed tx with more specific message	2018-02-27 10:15:18 -08:00
Csaba Solya	73d9bfc52c	make keyFromPassword private	2018-02-23 10:09:16 +01:00
Csaba S	2f34630486	Merge branch 'master' into edge-support	2018-02-22 14:55:46 +01:00
Csaba Solya	5ec311ba3e	add edge support	2018-02-22 14:39:32 +01:00
Thomas Huang	e27a3823ba	Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix ... [NewUI] Prevents new tx from active tab from opening popup	2018-02-21 12:50:45 -08:00
Dan Finlay	716acc088e	Merge branch 'master' into uat-master	2018-02-21 10:56:23 -08:00
Dan	a4ed6af2ad	Prevents new transaction from generating popup when metamask is open in an active tab.	2018-02-21 15:04:04 -03:30
Dan Finlay	98d3fba3ef	Fix promise construction	2018-02-20 15:45:48 -08:00
kumavis	06838774fa	sentry - report failed tx with more specific message	2018-02-16 10:21:06 -08:00
kumavis	c0893f2bcc	Merge pull request #3250 from MetaMask/i#3136 ... fix - hex prefix estimatedGas on txMeta	2018-02-16 15:59:20 +00:00
Dan Finlay	73e5ae6e29	Fix incorrect promise instantiation	2018-02-15 15:32:48 -08:00
Dan Finlay	58871cb146	Merge pull request #3222 from MetaMask/mesh-test ... metamask mesh - inject mesh testing container	2018-02-15 12:08:06 -08:00
frankiebee	dc3f3e79ca	fix - hex prefix estimatedGas on txMeta	2018-02-14 14:37:02 -08:00
Lazaridis	58a554b168	use the providers initial _blocktracker. fixes #2393	2018-02-11 05:09:27 +02:00
kumavis	94cd5b9df4	metamask mesh - inject mesh testing container	2018-02-10 19:33:33 +00:00
Dan	b0db68a281	Merge branch 'uat' into uat-next	2018-02-07 21:19:14 -03:30
Dan J Miller	7f151b861c	[NewUI] Opens to full screen when restoring from seed. (#3201) ... * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.	2018-02-07 21:08:55 -03:30
Dan	d8896a8c31	Merge branch 'master' into uat	2018-02-07 16:32:47 -03:30
Frankie	201e0579a5	Merge branch 'master' into localStorage-clean-up	2018-01-31 11:57:38 -08:00
frankiebee	c3adbda5f5	remove RecentBlocks from disk	2018-01-31 10:49:58 -08:00
Bruno Barbieri	c1b7cfe91d	preserve other networks TXs	2018-01-31 13:29:02 -05:00
Bruno Barbieri	7dc1b09f94	use txMeta.txParams	2018-01-31 04:40:32 -05:00
Bruno Barbieri	03d17c75ae	wipe only transactions for current account	2018-01-31 04:25:32 -05:00
Bruno Barbieri	5f39844382	clean up	2018-01-31 03:36:04 -05:00
Bruno Barbieri	e6fda855a5	added reset account feature	2018-01-31 03:33:15 -05:00
frankiebee	28ee0aae91	creater migration to remove BlacklistController	2018-01-30 14:07:32 -08:00
frankiebee	f13ad6bd6a	remove BlacklistController from disk state	2018-01-30 14:07:32 -08:00
Kevin Serrano	19a379edba	Bump limit for event emitter warning.	2018-01-25 12:28:11 -08:00
Thomas	97ca86733c	Merge branch 'master' into uat	2018-01-23 01:12:50 -08:00
kumavis	b91e2b5eb1	sentry - report failed txs	2018-01-22 15:54:26 -08:00
Chi Kei Chan	77c545336b	Merge branch 'uat' into newmaster	2018-01-19 15:29:36 -08:00
Dan Finlay	59d0fa2637	Merge pull request #3016 from MetaMask/sentry ... Stability - Add Sentry Remote Error Reporting	2018-01-18 13:11:15 -08:00
kumavis	d7c8ec22a4	test - tx controller - fix txGasUtil reference	2018-01-17 20:09:13 -08:00
kumavis	96fc916024	Update transactions.js	2018-01-17 17:56:31 -08:00
frankiebee	234c2417ca	transactions - transtion approved transactions to failed transactions on boot	2018-01-17 16:49:38 -08:00
frankiebee	be8d924432	transactions - fail txs on boot who fail addTxDefaults	2018-01-17 15:48:37 -08:00
frankiebee	9f19fea8e0	transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on boot if they did not complete	2018-01-17 15:42:01 -08:00
kumavis	1f5325804b	sentry - dedupe raven vendor	2018-01-17 15:38:25 -08:00
kumavis	daa62b507a	sentry - breakout raven setup and add release config	2018-01-17 14:59:15 -08:00
kumavis	52a1c954f1	sentry - update raven and add to ui	2018-01-17 14:28:37 -08:00
kumavis	7d1554b1c1	sentry - add raven + sentry reporting config	2018-01-17 14:04:37 -08:00
Alexander Tseung	81f86cfab6	Merge branch 'uat' into uat-master-011618	2018-01-16 18:17:28 -08:00
Dan Finlay	8fb62b97c5	Create new flag for simple sends to avoid overloading other flag	2018-01-16 11:05:11 -08:00
kumavis	6cfaf03b3d	Merge branch 'master' into i2907-NoCodeGasLimit	2018-01-16 09:59:32 -08:00