4891 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	b9bbf8f329	Resolving that ugly merge.	2017-10-25 15:45:26 -07:00
Dan Finlay	2489caddd4	Merge pull request #2476 from MetaMask/100MweiMinGasPrice ... Reduce minimum gas price to 100 MWEI	2017-10-25 13:53:03 -07:00
Dan	78836b0ead	Signature Request	2017-10-25 12:40:16 -07:00
Dan	0d39a3a8d4	Fix send token bug.	2017-10-25 12:21:35 -07:00
Dan	f89b766534	Adds revert feature to customize gas modal.	2017-10-25 12:19:29 -07:00
Alexander Tseung	3d8182f5d5	Add Info section	2017-10-25 12:16:47 -07:00
Kevin Serrano	4903f3e71a	Add labels to clarify warning.	2017-10-25 11:52:16 -07:00
Kevin Serrano	e7a22fc62b	Account for non-submitted mins and max	2017-10-25 11:47:40 -07:00
Kevin Serrano	b3b9e16ec0	Add clarifying comment about wei conversion.	2017-10-25 11:40:07 -07:00
Kevin Serrano	7f093f67a7	Cut out intermediary wei steps.	2017-10-25 11:38:32 -07:00
Kevin Serrano	dee172fb3a	Remove unneeded toString conversions.	2017-10-25 11:36:12 -07:00
Kevin Serrano	e1b9734cbf	Move upsize conversions for input warning at front of fn.	2017-10-25 11:35:18 -07:00
Kevin Serrano	cb7d07ebae	Fix mismatched decimal/hex conversion in pending-tx	2017-10-25 11:32:38 -07:00
Dan Finlay	c0e0522c30	Remove css build bundle from uat	2017-10-25 10:39:03 -07:00
Dan Finlay	074f10575f	Update changelog	2017-10-25 10:29:46 -07:00
Frankie	bba2980d0a	Merge pull request #2478 from MetaMask/mascaraHeadersFix ... Fix X-Frame-Options for mascara	2017-10-25 10:12:43 -07:00
tmashuang	81d11ecd59	Fix X-Frame-Options for mascara	2017-10-25 08:50:58 -07:00
Chi Kei Chan	2b72b70647	Add GWEI to gas price unit	2017-10-25 01:17:17 -07:00
Chi Kei Chan	ff7e7db9ec	From and To field cannot be the same	2017-10-25 01:12:53 -07:00
Chi Kei Chan	0d522139ba	Fix gas input styling on mobile view	2017-10-25 01:08:14 -07:00
Chi Kei Chan	e263ae9421	Update Import Account Help Link	2017-10-25 00:38:20 -07:00
Chi Kei Chan	8d3a317b91	Show home page when metafox is clicked	2017-10-25 00:34:12 -07:00
Chi Kei Chan	7c10cda8a4	Fix alignment on right arrow of confirm tx screens	2017-10-25 00:24:26 -07:00
Chi Kei Chan	311ca1f3ca	Fix styling on notification view	2017-10-25 00:10:09 -07:00
Chi Kei Chan	3e55caeffd	Add ellipsis to super long account name	2017-10-24 23:47:43 -07:00
Chi Kei Chan	6231431894	Change download to show in Export Private Key Modal	2017-10-24 22:48:20 -07:00
Chi Kei Chan	ebb2d38480	Remove memo input	2017-10-24 22:43:49 -07:00
Chi Kei Chan	e89ae877aa	Add BuyEtherWidget for future use in buy ether modal	2017-10-24 22:21:30 -07:00
Chi Kei Chan	630ab79cc3	Styling and UX changes on sidebar	2017-10-24 20:04:29 -07:00
Chi Kei Chan	ad91fcd662	Add token list and buy modal alignment fix	2017-10-24 17:15:10 -07:00
Chi Kei Chan	301c737bbc	Merge branch 'master' into NewUI-flat	2017-10-24 16:56:49 -07:00
Chi Kei Chan	3f1ae92bb7	Hide sidebar on add token	2017-10-24 16:55:02 -07:00
Kevin Serrano	1767dceba4	Merge pull request #2422 from watilde/fixes-lint ... Fixes lint warnings	2017-10-24 16:53:54 -07:00
Chi Kei Chan	7c20011023	Merge branch 'master' into NewUI-flat	2017-10-24 16:50:25 -07:00
Kevin Serrano	242456ba6a	Resolve merge conflict.	2017-10-24 16:44:25 -07:00
Kevin Serrano	98d8275743	Fix for gas price to be lowered.	2017-10-24 16:43:03 -07:00
Chi Kei Chan	ac3072e037	Merge pull request #2435 from danjm/NewUI-flat-disable-send-next-in-error ... [NewUI] Disable Send-v2 next button when form is in error	2017-10-24 16:31:35 -07:00
Dan	ef2b0d8485	Simply logic for rendering matching accounts in to-autocomplete dropdown.	2017-10-24 16:31:04 -07:00
Dan	07c4c92db6	Style dropdown of to-autocomplete.	2017-10-24 16:31:04 -07:00
Dan Finlay	35ca7e83bd	Reduce minimum gas price to 100 MWEI ... Also now representing gas price in MWEI, because our current bn inputs actually aren't tolerant of minimums less than 1 unit.	2017-10-24 15:10:03 -07:00
Thomas Huang	ae56b865e8	Merge pull request #1990 from chikeichan/firsttimeflow ... Implement Mascara First Time Flow	2017-10-24 11:22:31 -07:00
tmashuang	099078d13b	Add error messages when importing an account	2017-10-24 08:40:07 -07:00
tmashuang	91b23246cd	Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow	2017-10-24 08:36:02 -07:00
Daniel Tsui	09445ef692	Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-error	2017-10-24 04:32:19 -07:00
Chi Kei Chan	de3a48ec66	Fix mobile add token button	2017-10-24 01:19:00 -07:00
Chi Kei Chan	6daa834323	Disable network dropdown on conf tx screen	2017-10-24 01:07:51 -07:00
Chi Kei Chan	966e4cfd11	Change clickable area for account detail; change network dot size	2017-10-24 00:54:49 -07:00
Chi Kei Chan	4336794355	Fix styling in private key modal	2017-10-24 00:43:12 -07:00
Chi Kei Chan	ba9cefb24e	Add caret to Add Token toggle	2017-10-24 00:38:39 -07:00
Chi Kei Chan	2871beebe6	Add "Add Token" button to side bar	2017-10-24 00:29:20 -07:00