1636 Commits

Author	SHA1	Message	Date
Kevin Serrano	27ba7f6ed3	Show reject all only when tx count is > 1	2017-09-11 14:12:35 -07:00
Kevin Serrano	2e18dd27a4	Merge github.com:MetaMask/metamask-extension into rejectallunapproved	2017-09-11 13:58:46 -07:00
Chi Kei Chan	663cb758b3	Style send token screen	2017-09-11 00:45:06 -07:00
Thomas Huang	430d6d20f1	Merge pull request #2047 from MetaMask/i1997-networkindicate ... Add caret to dropdown network selector	2017-09-08 14:38:00 -07:00
Dan	395e8bfce0	Use width 100 and margin for the new modal input.	2017-09-08 10:56:56 -07:00
Dan	5a8433b6ce	New account modal top right close button working.	2017-09-08 10:56:56 -07:00
Dan	ab4005cab8	Tweak styles in new-account-modal.	2017-09-08 10:56:56 -07:00
Kevin Serrano	0e6c11a3b5	Fix typo.	2017-09-07 18:01:39 -07:00
Kevin Serrano	54a5a117d5	Fix link to open new tab.	2017-09-07 18:00:45 -07:00
Kevin Serrano	6560a2c3af	Add front-end validation for own adddresses as a token contract address. Add information on token contract addresses.	2017-09-07 17:55:34 -07:00
Kevin Serrano	54fb8e8cef	Add cursor on hover on loading. Change some wording.	2017-09-07 16:26:31 -07:00
Kevin Serrano	8d7f78c1a5	Add caret to indicate network is dropdown.	2017-09-07 16:18:32 -07:00
Dan Finlay	64717726c4	Reword forgot password to restore seed phrase ... This always confuses people, I just finally did it.	2017-09-07 15:27:40 -07:00
Kevin Serrano	41e9904d9b	Convert icon to button.	2017-09-07 15:03:25 -07:00
Kevin Serrano	3a87a30912	Fold submit and buy ether into one button slot	2017-09-07 13:55:59 -07:00
Kevin Serrano	34e7bb5015	Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved	2017-09-07 13:20:14 -07:00
Kevin Serrano	69c7fe24b3	Place object property retrieval inside try-catch	2017-09-07 12:17:36 -07:00
Kevin Serrano	f0ab4ce52d	Change expected type to array.	2017-09-07 11:51:04 -07:00
Chi Kei Chan	272ade0f66	Fix .filter token tx	2017-09-07 11:46:05 -07:00
Chi Kei Chan	ca69fa5d91	Re-enable Contract tx list item	2017-09-07 11:38:21 -07:00
Chi Kei Chan	687d2f755d	Fix css merge conflicts	2017-09-07 11:25:31 -07:00
Dan	a0ca3fab77	Modify readonly value in for input in qr-code.	2017-09-07 10:26:21 -07:00
Dan	c4eb2fb3ea	Account-detail address is a readonly input.	2017-09-07 10:26:21 -07:00
Dan	1d5a725ffb	Close button in account-details-modal working.	2017-09-07 10:26:21 -07:00
Dan	b8b0c8c62a	Remove highlight on modal	2017-09-07 10:26:21 -07:00
Dan	61b965fe14	Touch up style of account-details-modal.	2017-09-07 10:26:21 -07:00
Dan	7fb1c6836d	Modify status copy for status === 'unapproved'	2017-09-07 10:25:56 -07:00
Dan	eabbfb8319	Link user from transaction list to etherscan if they have a transaction hash.	2017-09-07 10:25:56 -07:00
Dan	3e6b619bd8	Use ternary operator instead of two conditionals.	2017-09-07 10:25:56 -07:00
Dan	64f8a4d22b	Improve tx-list item hover scss.	2017-09-07 10:25:56 -07:00
Dan	17b5afb8de	Create tx-list-item component.	2017-09-07 10:25:56 -07:00
Dan	6d3b3d4203	Show confirm transaction screen when clicking a pending transaction in the list.	2017-09-07 10:25:56 -07:00
Dan	aa60944e30	Remove default to confirm screen on login.	2017-09-07 10:25:56 -07:00
Chi Kei Chan	b670c8074e	Fix font sizes on Send Token	2017-09-07 04:26:29 -07:00
Chi Kei Chan	8b919758e5	Send Token screen partial UI	2017-09-07 04:24:03 -07:00
Chi Kei Chan	983fa2a117	Add Contract Tx List Item; Update Token Tx on select	2017-09-07 03:14:53 -07:00
Chi Kei Chan	14b2f3e391	Show token balance and identicon	2017-09-06 23:03:23 -07:00
Chi Kei Chan	f1fb9e10a0	Adding Token transaction detail screen	2017-09-06 03:17:49 -07:00
Chi Kei Chan	690ddf5ed7	Fix token list	2017-09-06 00:36:52 -07:00
Chi Kei Chan	06b2a04a42	Implement tokens list UI	2017-09-06 00:36:31 -07:00
Kevin Serrano	3e2bd19881	Merge branch 'master' into readd-loose	2017-09-05 15:48:15 -07:00
Dan	562d2fadae	Use .entries() instead of .keys(), and use more destructuring, for simpler code.	2017-09-05 13:00:50 -07:00
Dan	78f39bcce6	Send tx working; user is taken to confirm page with correct transaction information.	2017-09-05 13:00:50 -07:00
Dan Finlay	90272e252f	Make eth_sign deprecation warning more useful ... Link to descriptive article that demonstrates the new preferred method.	2017-09-05 11:44:26 -07:00
Kevin Serrano	e647337a8a	Resolve merge conflict from master	2017-09-05 09:03:44 -07:00
Kevin Serrano	162aedb30b	Merge branch 'master' into new-currency-test	2017-09-05 09:01:05 -07:00
Dan	6ef483be4a	Remove wallet-view scrollbars.	2017-09-04 18:46:14 -07:00
Dan	7d6ad48f15	Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content..	2017-09-04 18:46:14 -07:00
Dan	57b3cdf948	Fix styling of buy and send buttons on main screen.	2017-09-04 18:46:14 -07:00
Dan	3cb51e32c9	Capitalizations via text-transform for main screen transactions.	2017-09-04 18:46:14 -07:00