165 Commits

Author	SHA1	Message	Date
Alexander Tseung	3fd5af636f	Merge pull request #4633 from MetaMask/i4580-import-account-errors ... Show all errors on account creation screen.	2018-07-03 07:43:40 -10:00
brunobar79	3290421e2f	fix merge conflicts	2018-07-03 13:31:30 -04:00
Sara Reynolds	d126887bc3	fixes 4663	2018-07-03 09:50:59 -07:00
brunobar79	a8f745f9fe	eslint --fix .	2018-07-02 18:49:33 -04:00
brunobar79	f19ffaf08d	move hardcoded strings to localization file	2018-07-02 15:16:05 -04:00
brunobar79	1494cc5e6c	fix merge conflicts	2018-07-01 11:41:34 -10:00
Dan	03f17d910a	Check that error is defined in import-account error catch.	2018-06-28 21:45:46 -02:30
Dan	75581ceebe	Show all errors on account creation screen.	2018-06-28 21:45:46 -02:30
Dan Finlay	d26ce807fb	Linted	2018-06-18 15:44:43 -07:00
Dan Finlay	f14ed32980	Begin letting UI show suggested tokens	2018-06-18 15:33:50 -07:00
kumavis	44a8e48a04	notices - replace getLatestNotice with getNextNotice	2018-06-13 23:30:31 -07:00
Bruno	8763ea898e	move TrezorKeyring to its own package	2018-06-13 01:32:13 -04:00
Bruno	d1880073f6	balances working	2018-06-10 21:10:22 -04:00
Bruno	8c4d58aa45	initial trezor support	2018-06-10 03:52:32 -04:00
kumavis	72f7a4e1d0	Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui ... Handle errors for null selected address after Importing account (json or private key)	2018-06-06 11:47:45 -07:00
03-26	ccd4884db1	i18n - ja improvements	2018-06-06 11:38:57 -07:00
Dan	8f0a3b8311	Merge branch 'develop' into handle-import-account-failure-in-ui	2018-06-03 06:46:45 -02:30
Bobby Dresser	966583026a	update helpscout links to zenhub	2018-05-31 15:26:04 -07:00
Alexander Tseung	f4d833cb09	Change btn-secondary styles to btn-default. Make btn-secondary red warning style buttons	2018-05-31 10:37:52 -07:00
Dan	0f3480a97f	Fix then-catch + error handling in import-account	2018-05-30 21:33:40 -02:30
Dan	1c3d2aa18b	Importing account by json and private key shows error and does not change account if no selectedAddress comes after import.	2018-05-30 17:00:50 -02:30
Alexander Tseung	d40971e7f3	Fix error handling on incorrect password (#4401)	2018-05-30 09:23:31 -07:00
Alexander Tseung	e3c9629130	Fix add-token token list placeholder width (#4365)	2018-05-29 10:03:08 -07:00
kumavis	a7b7c8f034	newui - unlock - dont catch errors unrelated to tryUnlockMetamask	2018-05-28 23:34:40 -07:00
kumavis	b5bbfd3264	Merge pull request #4308 from MetaMask/i4232-addtoken ... Update designs for Add Token screen	2018-05-22 12:53:59 -07:00
Alexander Tseung	c4e75a7075	Fix tests	2018-05-20 14:08:45 -07:00
Alexander Tseung	4f6b53c1aa	Update designs for Add Token screen	2018-05-19 23:04:19 -07:00
Whymarrh Whitby	924cc1fcf7	Move setAccountLabel into PreferencesController	2018-05-17 12:57:39 -02:30
kumavis	ff91ef96ef	ui - unlock - remove setNetworkEndpoints calls from new unlock screen	2018-05-16 12:35:43 -07:00
kumavis	c6f822ad45	ui - remove files accidently added by bad merge	2018-05-16 12:29:57 -07:00
kumavis	c27d9162d7	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints	2018-05-16 11:57:07 -07:00
Alexander Tseung	0301b33a48	Add TextField component to storybook	2018-05-11 12:49:17 -07:00
Alexander Tseung	2381c0e0f4	Add new unlock screen design	2018-05-11 12:49:17 -07:00
kumavis	a1d13d45cf	lint - cleanup some unused variables	2018-05-02 18:23:55 -07:00
kumavis	6f316ca450	network - remove setNetworkEndpoints	2018-04-30 16:36:17 -07:00
Paul Bouchon	5ec631cad3	Handle Promise rejections when importing accounts (#4142) ... * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement	2018-04-30 18:07:25 -04:00
kumavis	5f3f8c85fc	Merge pull request #4059 from MetaMask/i-4033-seed-words ... Use new design for Reveal Seed screen. Persist seed words only in the first time flow.	2018-04-30 12:04:53 -06:00
Dan	b71dbf52d1	Convert decimals to string in getSymbolAndDecimals; return null for symbol or decimals.	2018-04-27 21:33:56 -02:30
Alexander Tseung	61b8c3efff	Redirect to correct seed phrase screen	2018-04-26 19:27:33 -07:00
Alexander Tseung	9e41f58af2	Clean up network config	2018-04-23 10:18:05 -07:00
Alexander Tseung	1d2d9798cb	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into i-4033-seed-words	2018-04-22 09:28:29 -07:00
Alexander Tseung	3082d2e4ef	Use new design for reveal seed screen. Persist seed words only in first time flow	2018-04-22 09:24:21 -07:00
Alexander Tseung	2fdf45b418	Show correct MetaMask version number in the Info page	2018-04-18 18:44:51 -07:00
Alexander Tseung	b0a105ce80	Fix confirmation popup not always opening	2018-04-17 08:58:37 -07:00
bitpshr	7129d7c0f3	Require loglevel singleton in each module that uses it	2018-04-13 17:56:28 -04:00
Alexander Tseung	4c15c0d3ba	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 23:17:22 -07:00
Alexander Tseung	9d7e49fc3b	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 10:07:14 -07:00
Alexander Tseung	34e608e9dc	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-03 17:06:00 -07:00
Alexander Tseung	bf38aa6f1d	Fix transaction confirmations	2018-04-03 16:59:32 -07:00
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
Alexander Tseung	516c1869b0	Fix lint errors	2018-04-02 16:24:37 -07:00
Alexander Tseung	6277a4c46a	Refactor onboarding flow	2018-04-02 02:59:49 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Alexander Tseung	bdc4a6964a	Fix merge conflicts. Refactor renderPrimary into Home component	2018-03-30 15:07:00 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
Alexander Tseung	58f52b2b8d	Fix merge conflicts. Refactor onboarding flow.	2018-03-28 13:23:50 -07:00
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
Alexander Tseung	eb919f4710	Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254	2018-02-08 16:43:31 -08:00
Alexander Tseung	4f1fe1da62	Fix merge conflicts from uat-next	2018-01-31 18:24:20 -08:00
Alexander Tseung	0c6fef3dec	Add create new account routes, fix conflicts from uat updates	2018-01-31 18:08:49 -08:00
Alexander Tseung	ecc39c5a7a	Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254	2018-01-29 18:22:52 -08:00
Alexander Tseung	5d1187c37b	Add route for signature request	2017-12-14 14:11:23 -08:00
Alexander Tseung	706a6b0ad6	Add initialized checks for first time flow routes	2017-12-14 14:11:23 -08:00
Alexander Tseung	dde39e82b5	Add routes for mascara	2017-12-14 14:11:23 -08:00
Alexander Tseung	e226b10a89	Add react-router to allow use of the browser back button	2017-12-14 12:50:20 -08:00