29 Commits

Author	SHA1	Message	Date
Chi Kei Chan	162a3827c7	Fix Merge Problems; update yarn lock	2017-09-18 11:34:07 -07:00
Chi Kei Chan	6c5865d564	Merge branch 'master' into nm	2017-09-18 11:28:10 -07:00
Dan	b0f1fba2e5	Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account'	2017-09-15 16:19:48 -07:00
Dan	8342c20b58	Cleaner css for circle icon.	2017-09-11 19:16:43 -07:00
Dan	6beb1b33bb	Replace checkmark with font-awesome equivalent.	2017-09-11 19:16:43 -07:00
Dan	99047e3ef4	Adds title, divider and descriptive text to network dropdown.	2017-09-11 19:16:43 -07:00
Dan	6a3c59e409	Highlighted circle icons for the network menu.	2017-09-11 19:16:43 -07:00
Chi Kei Chan	663cb758b3	Style send token screen	2017-09-11 00:45:06 -07:00
Chi Kei Chan	75c3009f83	Fix header style; Address comments	2017-09-04 15:57:43 -07:00
Chi Kei Chan	9213789c44	Fix merge conflict	2017-09-04 15:57:43 -07:00
Jacky Chan	b1fc290bed	Fix menu style	2017-09-04 15:57:43 -07:00
Dan	e7b3ef0708	Lint fixes	2017-08-31 04:16:07 -07:00
sdtsui	9d69401041	Hook up showAddToken to dropdown menu item in account options dropdown	2017-08-22 16:25:23 -07:00
sdtsui	d82233b95c	Hook up actions to EditAccountNameModal	2017-08-21 04:46:38 -07:00
sdtsui	66829b7a05	Implement new dropdown design, integrate account balances	2017-08-21 03:27:11 -07:00
sdtsui	18ea874a80	Hook up edit account name modal	2017-08-20 19:39:37 -07:00
sdtsui	beedd5b11e	Remove old design - 'Show QR Code' dropdown menu item from account selection dropdown	2017-08-20 19:29:14 -07:00
sdtsui	73a593b42e	Hook up template for New Account Modal	2017-08-20 19:28:20 -07:00
sdtsui	71b2dd290b	Enhance global modal to handle Buy, Edit, and Details Modals	2017-08-20 19:10:49 -07:00
sdtsui	e550d36084	Add 'Account Details' dropdown menu item to account options dropdown	2017-08-20 18:10:06 -07:00
sdtsui	7d02c90510	Add 'Add Token' dropdown menu item to account options dropdown	2017-08-20 18:09:09 -07:00
sdtsui	dbc539ac55	Merge remote-tracking branch 'mm/master' into NewUI-flat	2017-08-14 11:06:14 +02:00
sdtsui	2eadf72fb7	Lint and cleanup all scss	2017-08-14 10:31:27 +02:00
sdtsui	1743ccbdb5	Center account selection dropdown and specify useCssTransition prop	2017-08-14 08:50:49 +02:00
sdtsui	5f775315bd	Reconfigure AccoutSelector dropdown to use new fa-caret-down instead of old icon	2017-08-14 08:40:16 +02:00
sdtsui	88665ba150	Extract dropdown component into components/dropdowns, hook up to app	2017-08-14 08:31:49 +02:00
sdtsui	d01a663342	Remove unused code - network dropdown components in app	2017-08-13 22:20:58 +02:00
sdtsui	4cd33453dc	[WIP] Extract network dropdown into own component	2017-08-13 22:15:21 +02:00
sdtsui	e39c600a45	[WIP] Extract network dropdown out of main app render function	2017-08-13 10:49:41 -07:00