498 Commits

Author	SHA1	Message	Date
Esteban MIno	e743f44150	fix conflicts	2018-08-28 15:20:30 -03:00
Esteban MIno	3106374cc3	watchAsset small changes	2018-08-27 22:10:14 -03:00
Esteban MIno	b59a1e91b8	typo watchAsset imageUrl to image	2018-08-23 15:54:40 -03:00
Evgeniy Filatov	9a80d6e859	updated docs, small improvement of recent RPC rendering	2018-08-23 01:26:30 +03:00
Evgeniy Filatov	b23cca1469	implemented improvements to RPC history	2018-08-23 01:18:13 +03:00
Esteban MIno	4e6c71e969	Merge branch 'develop' into WatchTokenFeature	2018-08-21 20:14:49 -03:00
kumavis	13dfea7f2d	bugfix - prevents old blocktracker from getting internal hooks migrated	2018-08-21 14:13:23 -07:00
Esteban MIno	3a3732eb24	returning error in watchAsset	2018-08-21 13:12:45 -03:00
Esteban MIno	6fa889abcb	refactor watchToken related functions	2018-08-21 12:59:42 -03: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
Esteban MIno	dbab9a007f	delete according image when token added with watchToken deleted	2018-08-16 21:17:02 -03:00
Esteban MIno	bb868f5834	correct behavior when notification is closed when popup	2018-08-16 20:19:19 -03:00
Esteban MIno	a36ea0e232	show watch asset image from hide token modal	2018-08-16 12:04:43 -03:00
Esteban MIno	5289a36664	change watchAsset to new spec for type ERC20	2018-08-15 20:01:59 -03:00
Esteban MIno	b766104c8d	add suggested tokens objects in metamask state	2018-08-15 18:34:57 -03:00
Esteban MIno	a4b6b2357a	watchToken to watchAsset	2018-08-14 20:09:56 -03:00
Esteban MIno	a4c3f6b65c	add support for images base64 and urls on new ui	2018-08-14 20:08:12 -03: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
Esteban MIno	8f5b80a0fe	update method to metamask_watchToken	2018-08-14 13:58:47 -03:00
Esteban MIno	33357e3538	refactor unused code	2018-08-07 19:12:16 -04:00
Esteban MIno	15ea8c04b2	fix merge	2018-08-07 17:53:36 -04:00
Esteban Miño	3f57d5f66b	Merge branch 'develop' into WatchTokenFeature	2018-08-07 17:50:58 -04:00
frankiebee	115d3c9aaf	Merge branch 'network-remove-provider-engine' into network-remove-provider-engine-tests	2018-08-07 01:38:32 -07:00
frankiebee	c2d4b237eb	network - fix blockTracker reference to return the blockTrackerProxy instead of the direct blockTracker reference	2018-08-07 01:35:30 -07:00
Esteban MIno	78ad3c38e2	add suggested token params validation	2018-08-06 18:28:47 -04:00
Esteban MIno	9ac9f53a73	eth_watchToken working	2018-08-03 19:24:12 -04:00
Esteban MIno	081884bd80	rpc-engine not crashing when eth_watchToken	2018-08-03 16:42:13 -04:00
Esteban MIno	21a61f2987	merge develop	2018-08-03 14:56:02 -04:00
Thomas Huang	024ebe07e0	Merge branch 'develop' into network-remove-provider-engine-tests	2018-08-01 10:40:31 -07:00
Esteban MIno	d8817b2646	fix doc tag	2018-07-31 16:18:06 -04:00
Esteban MIno	3124e8c612	tokens related functions refactor	2018-07-31 15:59:19 -04:00
Esteban MIno	ccae79d392	fix undefined for tokens on tests	2018-07-31 13:07:28 -04:00
Esteban MIno	822c1734d6	fix double state update when account changed	2018-07-30 20:36:31 -04:00
Esteban MIno	fbcba8f019	create tokens storage when setadresses	2018-07-30 19:09:17 -04:00
Esteban MIno	31286673c3	isolation of tokens related methods in preferences	2018-07-30 18:43:34 -04:00
Esteban Miño	228f48c6e5	Merge branch 'develop' into TokensPerAccountBasis	2018-07-27 16:07:08 -04:00
Esteban MIno	5b9725d1f1	refactor to accountTokens	2018-07-27 16:05:12 -04:00
Esteban MIno	2827e13caa	add & delete tokens per network	2018-07-26 19:28:12 -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
Frankie	b5e3aafe2e	Merge pull request #4871 from MetaMask/3519-new-contract-gas ... tx-gas-utils - catch all errors from gas estimation	2018-07-25 15:33:17 -10:00
Esteban MIno	adee549c43	preferences test fixes for tokens per account	2018-07-25 17:46:31 -04:00
Esteban MIno	2770df80e3	add & delete tokens per account	2018-07-25 16:14:10 -04:00
pinkiebell	3667f3cb85	network.js: convert rpc protocol to lower case (#4855) ... Fixes #4253	2018-07-24 19:33:36 -02:30
Jenny Pollack	00bae74475	tx-gas-utils - catch all errors from gas estimation	2018-07-24 14:16:37 -07:00
brunobar79	5ebefc0e50	run linter	2018-07-21 16:03:31 -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
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