605 Commits

Author	SHA1	Message	Date
Dan Finlay	ea56426b23	Use callback in placeSeedWord method. ... When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842	2016-11-21 20:08:36 -08:00
Kevin Serrano	7cf6e372eb	Merge pull request #837 from MetaMask/FixMenuItem ... Fix custom provider menu item	2016-11-21 12:19:54 -08:00
Dan Finlay	6ae2400ef2	Fix custom provider menu item ... The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.	2016-11-21 11:45:31 -08:00
Dan Finlay	7ab9d40820	Merge branch 'dev' into i831-AddRopsten-Dev	2016-11-21 11:03:32 -08:00
Dan Finlay	e8a8302624	Begin adding Ropsten support ... Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831	2016-11-21 10:58:49 -08:00
Kevin Serrano	a07e5826ad	Convert conversion util to pure json.	2016-11-18 16:49:39 -08:00
Kevin Serrano	592b64a19f	Revert one cb to previous state.	2016-11-15 17:13:33 -08:00
Kevin Serrano	5bfb700fa8	Minimize dispatches by using emitters and relying on state updates.	2016-11-15 17:12:13 -08:00
Kevin Serrano	7de6b12aad	Re-enable disclaimer screen. Rename variables to reflect role more clearly.	2016-11-14 16:49:16 -08:00
Kevin Serrano	0c23925c23	Fix lint rules for ternary operator placement.	2016-11-11 15:37:22 -08:00
Kevin Serrano	3828edf6a4	Typo fix.	2016-11-11 10:54:15 -08:00
Kevin Serrano	23263bec7d	Linting to the max.	2016-11-11 10:26:12 -08:00
kumavis	c664b8f11e	Merge branch 'master' into i328-MultiVault	2016-11-11 03:18:33 -05:00
Frankie	b60f51dfc2	lint fix	2016-11-10 22:20:58 -08:00
Frankie	b60992b446	Fix funny looking errors in conf-tx	2016-11-10 22:13:30 -08:00
kumavis	e123e3095b	Merge branch 'master' into i328-MultiVault	2016-11-11 01:01:06 -05:00
kumavis	536cab0687	detect tx error - show warning and fix gasLimit	2016-11-10 21:19:34 -08:00
Frankie	f665b779cb	Merge branch 'master' into i328-MultiVault	2016-11-10 16:53:47 -08:00
Kevin G. Serrano	7b3f1ecc41	Unify warning functions.	2016-11-07 16:02:02 -08:00
Dan Finlay	161ff62fdc	Merge branch 'master' into i328-MultiVault	2016-11-07 15:38:25 -08:00
Dan Finlay	e3fb7fa7bb	Remove insane actions hash	2016-11-04 10:48:24 -07:00
Kevin Serrano	8f3db0dbc0	Add reveal of seed words.	2016-11-01 22:19:04 -07:00
Dan Finlay	f2bfdd7f8c	Make identicon tolerant of changing state	2016-11-01 17:06:18 -07:00
Dan Finlay	b5f6ef8c01	Fixed bugs related to clearing caches when restoring to a new vault	2016-11-01 17:00:17 -07:00
Dan Finlay	72729060dc	Make forgot password button.	2016-11-01 15:00:28 -07:00
Dan Finlay	498b30bddc	Fix seed phrase restore	2016-11-01 11:51:51 -07:00
Kevin Serrano	db356a181a	Made progress on parity for MultiVault ... - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.	2016-11-01 11:30:10 -07:00
Kevin Serrano	0643c35936	Linted	2016-10-31 11:38:48 -07:00
Kevin Serrano	96643c222a	Implement seed word confirmation page. ... Remove logs. Move HD render files to ui/app.	2016-10-31 11:35:09 -07:00
Dan Finlay	18cf635735	Fix github link on info page	2016-10-31 09:30:55 -07:00
Kevin Serrano	25c46a1636	Make case condition more consistent. Remove extra action. Fix incorrect display of network.	2016-10-30 16:01:12 -07:00
Kevin Serrano	625c54b7ec	Add focus to password field.	2016-10-30 14:08:14 -07:00
Kevin Serrano	02b0cf2e6d	Add password warning div.	2016-10-30 14:00:04 -07:00
Kevin Serrano	2418197041	Modify first-screen design to match docs.	2016-10-30 13:38:37 -07:00
Kevin Serrano	9b4f3825e7	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-10-28 16:19:14 -07:00
Kevin Serrano	6eb6968037	Merge branch 'master' into i328-MultiVault	2016-10-28 16:19:03 -07:00
Dan Finlay	6ec471c6dc	Configure BIP44 Keychain as default one	2016-10-28 12:10:35 -07:00
Dan Finlay	ed3814bff8	Fix identicon rendering	2016-10-27 16:16:28 -07:00
Dan Finlay	28eec68f85	Update first screen to match design.	2016-10-27 16:02:34 -07:00
Dan Finlay	b1fb8da3b0	Fix provider menu selection indication	2016-10-25 14:16:04 -07:00
Kevin Serrano	678301a20e	Phase out extra warning screen.	2016-10-25 13:24:03 -07:00
Dan Finlay	152419a79b	Merge branch 'master' into i328-MultiVault	2016-10-21 17:58:18 -07:00
Frankie	7d9e295b75	Change regex in isHex function	2016-10-21 16:39:14 -07:00
Frankie	d79424e9c0	clean up the isHex function	2016-10-21 16:05:39 -07:00
Dan Finlay	a462fc82e0	Fix duplicate provider menu item bug	2016-10-21 15:19:16 -07:00
Dan Finlay	957b7a72b5	Improved simple account generation	2016-10-20 17:29:25 -07:00
Dan Finlay	55d56f77cf	Began adding first basic keyring	2016-10-20 16:45:58 -07:00
Dan Finlay	0deed17752	Fix tests	2016-10-20 12:07:53 -07:00
Dan Finlay	383f8ea7dc	Linted & added salting to vault	2016-10-20 11:33:18 -07:00
Dan Finlay	e5c95d68f8	Fix state updating after vault creation and unlocking	2016-10-20 11:00:38 -07:00