273 Commits

Author	SHA1	Message	Date
Alexander Tseung	34e608e9dc	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-03 17:06:00 -07:00
David Yoo	4ddf5d2516	Address feedback	2018-04-03 09:38:27 -07:00
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
David Yoo	0ab227d8a2	Address Add Token design feedback	2018-04-02 17:04:27 -07:00
Dan	7ccf6163fd	Adds simulation failure error messages to confirm screen.	2018-04-02 16:29:35 -02:30
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
kumavis	b324a9c295	Merge branch 'master' into i3471-checkbalanceonconfirmscreen	2018-03-27 19:42:42 -07:00
kumavis	00952c899b	Merge pull request #3745 from danjm/i3723-fix-long-token-ammounts ... Long token amounts in wallet are truncated with ellipsis.	2018-03-27 19:08:41 -07:00
Dan	8e6ab7df05	Checking for sufficient balance in confirm ether screen; includes error messages for user.	2018-03-27 22:38:04 -02:30
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
Dan	f2ab3a06b1	Long token amounts in wallet are truncated with ellipsis.	2018-03-27 04:40:46 -02:30
Thomas Huang	b0fae2ca39	Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate ... Updates Add token screen to latest design.	2018-03-26 14:55:30 -07:00
Dan	1779cff65b	Merge branch 'master' into i3326-addtokenscreendesignupdate	2018-03-26 16:51:02 -02:30
Thomas Huang	a6af5fad96	Merge pull request #3695 from danjm/i3379-signtypedata-overflow ... Signed type data notification handles long messages.	2018-03-26 12:11:16 -07:00
Alexander Tseung	cfa2592d78	Update button styles	2018-03-25 22:58:04 -07:00
Dan	fa022e0883	Updates Add token screen to latest design.	2018-03-24 01:13:43 -02:30
Dan	07f4839600	Signed type data notification handles long messages.	2018-03-22 16:49:07 -02:30
kumavis	e005e9ac51	Merge pull request #3624 from alextsg/cb-941 ... Update confirm transaction screen	2018-03-20 17:15:59 -07:00
Alexander Tseung	3c1248c816	Update confirm transaction screen	2018-03-20 11:56:12 -07:00
Dan	49e3ada382	Fix styling regression from master merge.	2018-03-20 13:28:59 -02:30
Dan	36b371283c	Improve responsiveness of gas price row on confirm screen.	2018-03-20 12:41:03 -02:30
Dan	d9160ac6da	Merge branch 'master' into retry-tx-refractor	2018-03-20 09:27:27 -02:30
Alexander Tseung	4af1003b0e	Fix Account Names being cropped (#3626)	2018-03-20 09:02:20 -02:30
Dan J Miller	5cdaf270f7	Don't block user from setting gas if estimating gas returns errors. (#3627)	2018-03-20 06:47:45 -02:30
Dan	d8788af9b8	Merge branch 'master' into retry-tx-refractor	2018-03-19 15:30:47 -02:30
Alexander Tseung	6f749e5576	Update Confirm Contract screen (#3597)	2018-03-16 13:09:49 -07:00
frankiebee	4c947d466c	Merge branch 'master' into retry-tx-refractor	2018-03-15 09:47:25 -07:00
Alexander Tseung	66193c823c	Update Deposit Eth icon (#3569)	2018-03-15 13:50:22 -02:30
Dan	798988597b	Merge branch 'master' into retry-tx-refractor	2018-03-14 00:02:27 -02:30
Dan	e293b6349c	Styling for dropped.	2018-03-13 21:15:35 -02:30
kumavis	572234e383	Merge branch 'master' into i3033-responsive-newui-onboarding	2018-03-13 10:46:14 -07:00
kumavis	c1387cdc54	Merge pull request #3495 from alextsg/cb-290 ... Increase tap areas for menu buttons on mobile	2018-03-13 10:42:59 -07:00
Dan	70f33d4747	Left align create password.	2018-03-12 20:17:44 -02:30
Alexander Tseung	08542c18e1	Update deposit ether styling (#3510)	2018-03-12 19:25:12 +01:00
Dan	0dad6db973	Styling fixes to welcome; hide network component on create password; shown welcoem in popup.	2018-03-12 14:33:45 -02:30
Alexander Tseung	a07550d2ab	Increase tap areas for menu buttons on mobile	2018-03-09 18:50:00 +01:00
Alexander Tseung	4b2e52795d	Explicitly define state in import account from json component (#3491)	2018-03-09 16:30:31 +01:00
Dan	81e72147ef	Merge branch 'master' into retry-tx-refractor	2018-03-09 02:07:27 -03:30
Dan	2d6b378bf8	Adds inline opening of gas customization to confirm-send-ether screen.	2018-03-09 02:03:36 -03:30
Dan	6cee76b3e7	Add html and css for responsive retry button.	2018-03-08 16:12:25 -03:30
Dan	91c890041c	Add welcome screen to new-ui browser first time flow.	2018-03-08 14:21:54 -03:30
Dan	b8dec68271	Make new-ui create password screen responsive.	2018-03-07 12:47:33 -03:30
kumavis	6a9ca29244	Merge branch 'master' into ImportAccountMessageV2	2018-03-06 17:13:57 -08:00
Dan Finlay	a4bd7992cd	Merge branch 'master' into ImportAccountMessageV2	2018-03-06 10:32:47 -08:00
Dan	376ffb758f	Shapeshift form handles market info unavailable errors.	2018-03-06 13:49:41 -03:30
Alexander Tseung	5f8a632fec	Fix seed phrase validation clearing form (#3417) ... * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns.	2018-03-06 09:14:57 -08:00
Thomas Huang	d3a0a27c0c	Merge branch 'master' into ImportAccountMessageV2	2018-03-02 18:26:52 -08:00
Thomas	ee254b4f6f	Import Account disclaimer	2018-03-02 18:24:09 -08:00
Thomas	6f8077f587	Swap color scheme for import account label	2018-03-02 18:23:27 -08:00
Alexander Tseung	f22dfd4ae8	Fix network menu for custom URLs (#3366)	2018-03-01 17:42:10 -03:30