4500 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Thomas Huang	a27a7e22f2	Merge pull request #1893 from MetaMask/readd-loose ... Re-add loose label onto accounts.	2017-09-07 12:57:56 -07:00
Dan Finlay	d4d7c6d89e	Linted	2017-09-07 12:54:28 -07:00
Dan Finlay	65c00e9fbb	Improve test name	2017-09-07 12:53:30 -07:00
Dan Finlay	fadc0617df	Make tx calculations account for gas prices	2017-09-07 12:52:49 -07:00
Dan Finlay	532a4040de	Add test for computing gas price	2017-09-07 12:52:25 -07:00
Dan Finlay	c616581001	Remove logs	2017-09-07 12:47:52 -07:00
Dan Finlay	a95a3c7e4f	Fix balance calc test	2017-09-07 12:47:27 -07:00
Dan Finlay	74c6de7d23	Add constructor comment	2017-09-07 12:45:00 -07:00
Dan Finlay	7b92268428	Fix valueFor test	2017-09-07 12:43:10 -07:00
Dan Finlay	4058574436	Add basic test for valueFor	2017-09-07 12:30:25 -07:00
Kevin Serrano	69c7fe24b3	Place object property retrieval inside try-catch	2017-09-07 12:17:36 -07:00
Dan Finlay	b6e8791bc2	test not passing	2017-09-07 11:59:15 -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
kumavis	440a42bbc3	inpage - add idRemapMiddleware	2017-09-07 10:08:07 -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
frankiebee	50075c6df5	fix messy merge	2017-09-07 00:55:21 -07:00
Chi Kei Chan	14b2f3e391	Show token balance and identicon	2017-09-06 23:03:23 -07:00
frankiebee	00fca4f1f2	remove unused variable	2017-09-06 14:38:39 -07:00
Dan Finlay	74f7fc4613	Check balances in parallel	2017-09-06 14:37:46 -07:00
Dan Finlay	f9a052deed	Add first passing balance calc test	2017-09-06 14:36:15 -07:00
Dan Finlay	714df393b4	Add test template	2017-09-06 14:27:21 -07:00
Kevin Serrano	7ff5fd8691	Changelog bump	2017-09-06 14:04:17 -07:00
frankiebee	a73aecc796	fix merge and errors disaperaing on update	2017-09-06 14:01:07 -07:00
Kevin Serrano	0217984a40	Merge branch 'master' into readd-loose	2017-09-06 13:59:52 -07:00
Kevin Serrano	b5f48730cd	Properly update keyring state on new account addition.	2017-09-06 13:59:41 -07:00
kumavis	351db952c5	Merge pull request #2033 from MetaMask/Version-3.9.12 ... Version 3.9.12	2017-09-06 13:54:47 -07:00
frankiebee	6c83ba762e	Merge branch 'master' into transactionControllerRefractorPt3	2017-09-06 13:45:03 -07:00
Dan Finlay	5e934994d1	Version 3.9.12	2017-09-06 13:33:30 -07:00
kumavis	47340ca550	Merge pull request #2017 from MetaMask/DevEnviornment ... Update redux middleware imports	2017-09-06 13:18:14 -07:00
tmashuang	36a44ef61f	Update mock-store dependency	2017-09-06 11:04:17 -07:00