1925 Commits

Author	SHA1	Message	Date
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	22cf5a1391	improve comments	2018-07-30 20:44:22 -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 MIno	0757f47e84	passing tokens to all accounts in migration	2018-07-30 11:41:31 -04:00
Esteban MIno	e687bc5a47	fix migration for preferences controller tokens	2018-07-27 16:17:28 -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	f5107fa12e	migration for preferences controller tokens	2018-07-27 14:56:03 -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
Kelvin Tan	7ca402147d	add phishing html page, and redirect to bundled page in-window	2018-07-27 00:03:39 +08: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
frankiebee	527b62ee8e	migrations - fix to include 27	2018-07-25 14:11:07 -07:00
Esteban MIno	2770df80e3	add & delete tokens per account	2018-07-25 16:14:10 -04:00
William Morriss	5782926c28	Merge pull request #4825 from MetaMask/no-inject-ani-gamer ... Do not inject on ani.gamer.com.tw	2018-07-24 19:48:10 -07: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
Kevin Serrano	1d241bef76	Merge branch 'develop' into no-inject-ani-gamer	2018-07-24 12:27:18 -07:00
Dan Miller	a61227f224	Remove unneeded code from i4829-close-notifications-from-ui branch.	2018-07-24 15:01:03 -02:30
Dan Miller	64a82fd3da	Uncomment closePopupIfOpen code.	2018-07-24 11:45:36 -02:30
Dan Miller	2359062b62	UI confirm screen closes confirmation window on submit or cancel of a tx	2018-07-23 22:20:06 -02:30
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
Csaba Solya	6921f94bfe	initial test	2018-07-19 22:34:06 +02:00
Esteban MIno	3b97d816ff	detect tokens when submit password and new account selected	2018-07-19 15:56:38 -04:00
Bruno Barbieri	9be2248d7a	Merge pull request #4625 from MetaMask/initial-trezor-support ... Initial trezor support	2018-07-19 15:00:59 -04:00
Dan Finlay	3784a7e2c8	Merge pull request #4656 from MetaMask/portal-metamask-ens-test ... Add support for .test ENS domains	2018-07-19 09:41:28 -07:00
Jenny Pollack	ae811628d9	Merge pull request #4833 from MetaMask/brave-flag-sentry ... sentry - add detection for Brave Browser	2018-07-19 11:58:59 -04:00
Jenny Pollack	16fc7efef1	remove local tests	2018-07-19 09:59:58 -04:00
bitpshr	d24b5b76fd	Update variable name	2018-07-19 08:04:17 -04:00
bitpshr	d02c160db5	Updates for linting	2018-07-19 08:04:17 -04:00
bitpshr	94f99b6ed0	Updates	2018-07-19 08:04:17 -04:00
bitpshr	8df433ca84	Add support for .test Ropsten ENS domains	2018-07-19 08:04:17 -04:00
Jenny Pollack	1a9748667d	sentry - add detection for Brave Browser	2018-07-19 02:22:56 -04:00
Dan Finlay	dd9e3587d4	Do not inject on ani.gamer.com.tw ... Fixes #4799	2018-07-18 15:23:32 -07: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