548 Commits

Author	SHA1	Message	Date
brunobar79	34e3ec6092	fix account removal	2018-08-21 00:04:07 -04:00
Esteban MIno	68c1b4c170	watchAsset returns result wether token was added or not	2018-08-20 22:32:14 -03:00
Esteban MIno	81cd29df43	Merge branch 'develop' into WatchTokenFeature	2018-08-20 19:35:38 -03:00
Bruno Barbieri	bd904c86f6	Merge branch 'develop' into ledger-support	2018-08-17 13:45:46 -04:00
brunobar79	992e7f1b5a	fix merge conflicts	2018-08-17 12:56:07 -04:00
Dan Matthews	df799d7fd6	Restores accounts until one with a zero balance is found	2018-08-17 10:26:47 -04:00
brunobar79	82a5ed1e03	remove console logs	2018-08-14 22:40:29 -04:00
brunobar79	fdf202efb0	fixed unit tests	2018-08-14 21:19:01 -04:00
Thomas	96d789d2cf	Merge branch 'develop' into network-remove-provider-engine ... Override package-lock and fix merge conflicts	2018-08-14 10:44:42 -07:00
brunobar79	b77cc3d969	fix tx tests	2018-08-14 03:42:23 -04:00
brunobar79	61a279204a	legacy and new hd path working	2018-08-14 01:26:18 -04:00
brunobar79	4e1d8ba19d	good progress adding paths	2018-08-13 19:29:43 -04:00
brunobar79	0b9b892c6b	this should be ready to go	2018-08-12 01:34:01 -04:00
brunobar79	8e842a8947	able to add accounts	2018-08-11 05:02:02 -04:00
brunobar79	78a1cd3314	iframe communication working	2018-08-11 02:35:20 -04:00
brunobar79	5ef80495cf	refactor to support multiple hw wallets	2018-08-10 21:54:34 -04:00
Esteban Miño	3f57d5f66b	Merge branch 'develop' into WatchTokenFeature	2018-08-07 17:50:58 -04:00
Esteban MIno	9ac9f53a73	eth_watchToken working	2018-08-03 19:24:12 -04:00
Esteban MIno	21a61f2987	merge develop	2018-08-03 14:56:02 -04:00
Esteban MIno	22cf5a1391	improve comments	2018-07-30 20:44:22 -04:00
Esteban MIno	1d3ad7cfbb	tokens per network for individual account	2018-07-26 18:04:34 -04:00
Thomas	138858647e	Merge branch 'develop' into network-remove-provider-engine	2018-07-25 22:38:44 -07:00
brunobar79	5ebefc0e50	run linter	2018-07-21 16:03:31 -04:00
Esteban MIno	9be22775c3	fix merge	2018-07-20 20:15:33 -04:00
Esteban Miño	110efa9ec1	Merge branch 'develop' into detectTokenFeature	2018-07-20 20:09:37 -04:00
Esteban MIno	9c95554933	fix detection on submit password	2018-07-20 19:58:03 -04:00
Csaba S	c11dea9afc	Merge branch 'develop' into transaction-notifications	2018-07-20 20:09:57 +02:00
Csaba Solya	72591d4f41	remove dropped handler	2018-07-20 19:58:26 +02:00
Esteban Miño	cb045fd8fe	Auto-detect tokens #3034 (#4683) ... * detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog	2018-07-20 12:36:24 -04:00
Csaba Solya	a3822b4680	add notifications	2018-07-20 13:20:40 +02:00
Esteban MIno	009b1cefbe	keyring unlocked detect and unit tests	2018-07-19 19:46:46 -04:00
brunobar79	aa5a987765	added some e2e tests	2018-07-17 21:54:04 -04:00
brunobar79	e89350b19f	added tests for removeAccount	2018-07-17 01:44:28 -04:00
brunobar79	de4265c629	added more unit tests	2018-07-17 01:17:18 -04:00
brunobar79	e5512c306d	added unit tests for metamaskcontroller	2018-07-16 19:36:08 -04:00
Esteban MIno	2fffe09873	detect tokens through infura	2018-07-12 20:43:43 -04:00
brunobar79	80e875308b	forget device and autiload account features added	2018-07-11 21:21:36 -04:00
brunobar79	89cc48789a	update to temp dependencies	2018-07-11 20:01:44 -04:00
Esteban MIno	910713c6b3	improve tests	2018-07-11 15:59:05 -04:00
brunobar79	523cf9ad33	account removal is working	2018-07-11 00:20:40 -04:00
brunobar79	85a4e39b05	fix trezor label	2018-07-09 20:54:47 -04:00
brunobar79	d3f793a44a	added label for trezor accounts	2018-07-09 19:04:30 -04:00
brunobar79	2de3039b6b	fix account duplication	2018-07-09 17:55:37 -04:00
brunobar79	7cca7ace2e	fix all the account related bugs	2018-07-09 17:24:52 -04:00
brunobar79	7c9d942ba1	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support	2018-07-06 19:21:18 -04:00
brunobar79	6b2511f94f	UI refactor	2018-07-05 20:59:31 -04:00
Dan J Miller	46cda26f3b	Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui ... Use background gas price estimation method in new ui.	2018-07-05 08:01:03 -02:30
brunobar79	9d3f2435e5	lint fix	2018-07-03 15:46:15 -04:00
kumavis	77daed5c74	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-07-03 12:42:14 -07:00
Esteban MIno	0494b2fc8a	Merge branch 'develop' into detectTokenFeature	2018-07-03 13:23:15 -04:00
brunobar79	a8f745f9fe	eslint --fix .	2018-07-02 18:49:33 -04:00
kumavis	a89902c170	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-07-02 13:54:05 -07:00
brunobar79	1494cc5e6c	fix merge conflicts	2018-07-01 11:41:34 -10:00
Dan	de01a6f112	Use background gas price estimation method in new ui.	2018-06-28 21:28:59 -02:30
Esteban MIno	0e863d5fab	network store to detect token	2018-06-27 19:54:43 -04:00
Esteban MIno	bfac9c2c2d	detect tokens polling	2018-06-27 16:29:24 -04:00
brunobar79	87dfca0767	fixes	2018-06-23 02:52:11 -04:00
Dan Finlay	5e4f3e430a	Get popup appearing when suggesting new token	2018-06-18 15:37:37 -07:00
Dan Finlay	5d7c2810a7	Begin adding eth_watchToken	2018-06-18 15:07:08 -07:00
Dan Finlay	d814bee578	Merge pull request #4571 from MetaMask/disable-diagnostics ... diagnostics - temporarily disable	2018-06-14 10:03:53 -07:00
kumavis	44a8e48a04	notices - replace getLatestNotice with getNextNotice	2018-06-13 23:30:31 -07:00
kumavis	43e805805e	diagnostics - temporarily disable	2018-06-13 17:40:28 -07:00
Bruno	704e2a21f8	clean up	2018-06-13 02:09:25 -04:00
Bruno	bb4cc72646	fix merge conflicts	2018-06-13 02:01:47 -04:00
Bruno	8763ea898e	move TrezorKeyring to its own package	2018-06-13 01:32:13 -04:00
kumavis	177cc3f280	metamask - ensure all nonce locks are released	2018-06-12 11:51:35 -07:00
Bruno	d1880073f6	balances working	2018-06-10 21:10:22 -04:00
Bruno	f6b27fa9eb	add account working	2018-06-10 19:02:54 -04:00
Bruno	f5f66f59d7	clean up	2018-06-10 18:48:42 -04:00
Bruno	8c4d58aa45	initial trezor support	2018-06-10 03:52:32 -04:00
Dan Finlay	c0d2dab28b	Merge pull request #4523 from MetaMask/i4462-FixResetBug ... Fix bug where reset account would not work.	2018-06-07 10:47:34 -07:00
kumavis	66b703b1a4	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-06-07 10:07:36 -07:00
Dan Finlay	c53c5d5c9e	Fix bug where reset account would not work. ... Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod.	2018-06-06 16:46:39 -07:00
Dan	ae55e8a3c1	Merge branch 'develop' into i3725-refactor-send-component-	2018-06-06 16:40:43 -02:30
kumavis	ffb8fa1649	lint - remove unused require	2018-06-06 11:17:52 -07:00
kumavis	9d77b0a196	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-06-06 11:08:29 -07:00
kumavis	60e61e6834	diagnostics - fix reportMultipleKeyrings call	2018-06-05 12:36:15 -07:00
kumavis	36a0574f56	diagnostics - minor fixes	2018-06-05 12:20:24 -07:00
kumavis	20bdba3d17	diagnostics - rewrite bug-notifier as diagnostics-reporter	2018-06-05 11:51:27 -07:00
kumavis	6247e54fcc	add multivault detection to diagnostics reporting	2018-06-05 11:15:58 -07:00
Dan	aee9247faa	Merge branch 'develop' into i3725-refactor-send-component-	2018-06-04 22:32:30 -02:30
Dan Finlay	0eacee8e45	Add first time info to bug report	2018-06-04 15:03:31 -07:00
Dan Finlay	7382bd0847	Add identity synchronizing code ... Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user.	2018-06-04 13:43:26 -07:00
kumavis	eb3241ccba	metamask-controller - clear account labels on restore from seed phrase	2018-06-03 12:02:35 -07:00
kumavis	d4cdd1a0f3	metamask - update preferences controller identities on keyring controller update	2018-06-03 11:27:25 -07:00
Dan	701611e317	Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation	2018-05-31 15:39:24 -02:30
Dan	0f20fce9b7	Auto update gas estimate when to changes.	2018-05-30 20:54:31 -02:30
kumavis	4205d92729	Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master	2018-05-29 16:12:36 -07:00
kumavis	c9f3404ca5	metamask-controller - lint fix	2018-05-28 23:25:48 -07:00
kumavis	7e87600042	metamask-controller - lint fix	2018-05-28 23:14:38 -07:00
kumavis	09601439e3	metamask-controller - update preferences controller addresses after import account	2018-05-28 23:00:22 -07:00
kumavis	fe42de4642	metamask-controller - update preferences controller addresses after import account	2018-05-28 22:58:14 -07:00
Anton	71a6e97327	cleanErrorStack moved to separate library module ... more errors traces cleaned up	2018-05-28 22:57:08 +02:00
kumavis	76cfb10864	metamask-controller - wrap txController.addUnapprovedTx for wallet middleware reference before txController is instantiated	2018-05-24 16:05:07 -07:00
kumavis	aab9691c42	provider - update wallet hooks for new wallet middleware	2018-05-24 15:51:46 -07:00
kumavis	66a62dfd0c	metamask-controller - fix account lookup hook	2018-05-24 13:44:33 -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
Whymarrh Whitby	c54e4c7191	Add PreferencesController#setAddresses to update ids	2018-05-17 12:57:39 -02:30
Whymarrh Whitby	cbe4d0d88c	Update AddressBookController to read from preferences store	2018-05-17 12:57:39 -02:30