1345 Commits

Author	SHA1	Message	Date
sdtsui	8cc3ae5988	Cleanup breakpoint css + comment on hackiness	2017-08-04 13:19:06 -07:00
sdtsui	0cd72db2d2	Adds early breakpoint from @frankiebee 's + @kumavis 's CR	2017-08-04 12:57:16 -07:00
sdtsui	4d967ebea9	Bring menu-droppo component into project, remove as a dependency	2017-08-04 11:47:36 -07:00
frankiebee	89a4fef1e4	Merge branch 'master' into transactionControllerRefractor	2017-08-04 14:45:22 -04:00
frankiebee	fa3df576bc	fixed: showing tx-s as errors vs. warning	2017-08-04 14:43:08 -04:00
sdtsui	781ac00eac	Re-enable css transitions for dropdowns in header, needs menu-droppo library update	2017-08-04 11:31:07 -07:00
kumavis	29dcadc346	ui - dropdown - use Object.assign syntax to appease coverage parser	2017-08-03 21:32:08 -07:00
kumavis	5a9257208c	Merge branch 'master' into NewUI	2017-08-03 21:02:01 -07:00
kumavis	17c9fd450f	Merge pull request #1858 from sdtsui/NewUI ... UI Tweaks, Minor Bugfixes, and Dropdown Resizing	2017-08-03 20:59:47 -07:00
sdtsui	777eb865df	Adjust padding of accountSwitcher dropdown	2017-08-03 20:03:48 -07:00
sdtsui	5ddb40f60c	Adjust top and bottom padding of accountSwitcher	2017-08-03 19:23:22 -07:00
sdtsui	baee076348	Lint ui/app	2017-08-03 19:17:46 -07:00
sdtsui	6f14f4b717	Allow new accounts selector to handle clicks	2017-08-03 19:10:37 -07:00
sdtsui	28fd016d12	Increase size of accountSelection dropdown	2017-08-03 19:08:36 -07:00
sdtsui	36d8c3dd39	Increase size of settings dropdown and account settings dropdown	2017-08-03 18:55:11 -07:00
sdtsui	086441e41c	Increase size of network dropdown	2017-08-03 18:50:29 -07:00
sdtsui	10d3a519c8	De-dupe click handler for sandwich-expando	2017-08-03 18:35:10 -07:00
frankiebee	7de58c8709	fix cancelTransaction not reciving a callback	2017-08-03 21:22:08 -04:00
sdtsui	4d6a289629	Add note with previous fa-angle-down for future refactor	2017-08-03 17:50:00 -07:00
sdtsui	aff213e845	Position account switcher icon back in app header	2017-08-03 17:49:23 -07:00
sdtsui	850e9b63d2	Move accountselector menu-droppo up to app-header	2017-08-03 17:17:00 -07:00
sdtsui	ecb09fcc0a	Disable account selection dropdown from account details	2017-08-03 17:08:19 -07:00
sdtsui	67f10d660f	Adjust account checksumAddress location up	2017-08-03 17:03:14 -07:00
Kevin Serrano	24a13d116c	Fix fox positioning.	2017-08-03 16:35:14 -07:00
Kevin Serrano	77908e1181	Fix wonky widths for notices.	2017-08-03 16:30:57 -07:00
Kevin Serrano	b4f621c980	Add maximum width for private key reveal	2017-08-03 16:00:44 -07:00
Kevin Serrano	ce2e9872cf	Remove 100% properties that were messing up sizing.	2017-08-03 15:51:20 -07:00
Kevin Serrano	6176a4b1bf	Add QR functionality	2017-08-03 15:32:44 -07:00
kumavis	da16f39626	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:05:32 -07:00
kumavis	da7471e095	lint fixes	2017-08-03 14:48:19 -07:00
sdtsui	0171918407	Add rough layout for flat layout tx details, add notes for breakpoints	2017-08-03 01:17:27 -07:00
sdtsui	267d12646c	Implement 'clear buttons' for tx view	2017-08-03 00:43:24 -07:00
sdtsui	6fd1c15a5c	Fix color for large password input	2017-08-03 00:25:25 -07:00
sdtsui	0e631f6ac0	Add notes for @Zanibar, with props.isUnlocked and currentView.name logs	2017-08-03 00:22:41 -07:00
sdtsui	d6779115cd	Fix background color for lock screen	2017-08-03 00:21:19 -07:00
sdtsui	3ed81847d1	Isolate routing logic for isUnlocked, remove stray logs	2017-08-03 00:01:38 -07:00
sdtsui	c7ac20ff65	Finalize sidebar dimensions	2017-08-02 23:14:53 -07:00
sdtsui	01788376d5	Finalize height for main screens, excluding sidebar	2017-08-02 23:07:35 -07:00
sdtsui	c47f81b2e0	Finalize width of main container for all viewports	2017-08-02 22:59:04 -07:00
sdtsui	b523faba13	Make mobile view flush with header	2017-08-02 22:23:48 -07:00
sdtsui	ff7ba83a6c	Add note for styling buttons	2017-08-02 22:09:12 -07:00
sdtsui	b70a399faa	Isolate container component, add refactor notes	2017-08-02 21:53:40 -07:00
sdtsui	41250f9769	Adjust header spacing for 500px and 900px heights	2017-08-02 19:48:33 -07:00
sdtsui	dd4586ee84	Adjust sidebar transition using @cjeria\'s feedback	2017-08-02 19:26:46 -07:00
sdtsui	61b4b1f947	Ensure app-header is rendered in responsive layout	2017-08-02 19:13:17 -07:00
sdtsui	49e3713704	Cleanup send, move send token into separate func to make room for send ETH	2017-08-02 18:24:48 -07:00
sdtsui	c312f34119	Move overlay out of transition area	2017-08-02 17:50:27 -07:00
sdtsui	8a39ef03c2	Hook up css animation	2017-08-02 17:49:04 -07:00
sdtsui	84aba21ae9	Add notes for overlay click action	2017-08-02 14:19:13 -07:00
sdtsui	9ebdc343aa	Implement custom sidebar, with close button	2017-08-02 14:17:58 -07:00
sdtsui	dfa10763e3	Integrate slideout menu with tx view	2017-08-02 13:32:02 -07:00
sdtsui	7767f9f7ad	Hook up responsive sidebar	2017-08-02 13:03:36 -07:00
sdtsui	22b03c62e6	Add burger icon and phone-visible media queries	2017-08-02 12:29:07 -07:00
sdtsui	41c585c796	Make wallet view visible iff vw above 575px	2017-08-02 12:18:29 -07:00
kumavis	4115c25d8f	lint fix	2017-08-01 13:21:02 -07:00
sdtsui	6f4bee4599	Hook up send button to Send Token screen	2017-07-31 23:21:11 -07:00
sdtsui	a7fc512650	Implement mobile-friendly responsive layout with flex wrap	2017-07-31 23:07:58 -07:00
sdtsui	caab0b61cc	Add rough layout for tx list items	2017-07-31 22:00:18 -07:00
sdtsui	ce06fbd36d	Add tx-view content divider component	2017-07-31 21:34:37 -07:00
sdtsui	c7ace5b23d	Add hyperscript for tx-view tabs	2017-07-31 21:27:37 -07:00
sdtsui	c876428044	Add TxView, use width percentages instead of flex-grow for layout	2017-07-31 21:16:07 -07:00
sdtsui	92bd783e0c	Adjust button styles to left align with wallet text	2017-07-31 20:54:04 -07:00
sdtsui	2d5c3394f4	Use DIN OT in wallet view	2017-07-31 20:46:56 -07:00
sdtsui	3797b9921f	Adjust popup size to 545x450; refactor wallet view to fit	2017-07-31 20:22:15 -07:00
sdtsui	0c1aea97c7	Isolate wallet-content-display component	2017-07-30 22:30:55 -07:00
sdtsui	7d4927c975	Add layout for Buy and Send buttons	2017-07-30 22:25:20 -07:00
sdtsui	610d6da8ae	Add hyperscript for wallet display component	2017-07-30 22:10:59 -07:00
sdtsui	0ca50dfb1b	Center account name and dropdowns	2017-07-30 21:53:13 -07:00
sdtsui	ddbf5613b3	Add note for later on isolating components	2017-07-30 21:35:41 -07:00
sdtsui	4cdfd00f58	Add box shadow to main container	2017-07-30 21:35:27 -07:00
sdtsui	cbd53d4601	Add containers for wallet view and dropdown UI	2017-07-30 21:25:32 -07:00
sdtsui	ca1a4b3096	Add layout for main container elements	2017-07-30 20:42:12 -07:00
sdtsui	b15575b453	Remove old header space	2017-07-30 20:02:42 -07:00
sdtsui	dd3766242d	Adjust dimensions of popup.html and app bar to match	2017-07-30 19:52:27 -07:00
sdtsui	a7ab69b940	Adjust button styles for Send Token screen	2017-07-30 16:47:47 -07:00
sdtsui	97cb25c9f1	Adjust copy in send token confirmation screen	2017-07-29 23:11:11 -07:00
sdtsui	9373ba9f38	Move action buttons out of send token container, tweak styles	2017-07-29 23:09:49 -07:00
sdtsui	f368f371c2	Simplify btn-green colors	2017-07-29 23:02:04 -07:00
sdtsui	6a5e73e673	Enhance button and input css reset to protect from user agent stylesheet	2017-07-29 23:00:44 -07:00
sdtsui	689f60d1ce	Add rounded background to total token, with minor styling tweaks	2017-07-29 22:44:39 -07:00
sdtsui	4880ee26d5	Add note to self, for future code cleanup	2017-07-29 22:20:29 -07:00
sdtsui	abc78a1bf9	Add content boxes to pendingTx, prep for reusability	2017-07-29 22:18:26 -07:00
sdtsui	65327dd11f	Cleanup unnecessary pending tx-switching logic	2017-07-29 22:17:56 -07:00
sdtsui	35ff4c195c	[WIP] Isolate form logic from rest of confirmation UI	2017-07-29 20:55:55 -07:00
sdtsui	8ace4710ff	Clean up send screen	2017-07-29 19:46:59 -07:00
sdtsui	25259cc2cd	Center action buttons, add minor style adjustments	2017-07-29 19:37:08 -07:00
sdtsui	9709881679	Center send token content; hook up 'Next' and 'Cancel' buttons	2017-07-29 18:54:21 -07:00
sdtsui	fec3e64d63	Add high-level css layout for Send Token	2017-07-29 18:07:58 -07:00
sdtsui	2a5f2c7f40	Add responsive container; add send token copy	2017-07-29 17:38:29 -07:00
sdtsui	c0483fc230	Add token logo to send screen	2017-07-29 13:31:53 -07:00
sdtsui	8c5be54722	Rearrange header components: closer to redesigned UI	2017-07-29 12:21:10 -07:00
sdtsui	4d7295b05f	Add for use in main header	2017-07-29 12:20:19 -07:00
sdtsui	8e1713e1e0	[WIP] Propose more scaleable color management	2017-07-29 12:07:46 -07:00
sdtsui	4044b58b5a	Fix dropdown behavior - network	2017-07-28 15:55:55 -07:00
sdtsui	34834c108d	Fix dropdown toggle behavior - settings	2017-07-28 15:40:26 -07:00
sdtsui	24d375aaf1	Fix dropdown toggle behavior - account dropdowns	2017-07-28 15:31:07 -07:00
Dan Finlay	d1828b6dc9	Fix react warning	2017-07-27 18:43:09 -07:00
Dan Finlay	a25c4f34c0	Limit max width of seed word conf screen	2017-07-27 18:32:32 -07:00
Dan Finlay	87c26eb5bc	Correct token pluralization for one token	2017-07-27 18:07:42 -07:00
Dan Finlay	f8cadbcb32	Merge branch 'master' into NewUI	2017-07-27 15:10:02 -07:00
Dan Finlay	8ba32d5ea8	Set min gas price to 1 gwei	2017-07-27 14:58:51 -07:00
Dan Finlay	9a1cf2a0d4	Ensure loading indication is full screen	2017-07-27 14:15:56 -07:00
Dan Finlay	56496f1ea0	Fix loading indication placement	2017-07-27 14:13:53 -07:00
Dan Finlay	f884477abb	Remove unused parameter	2017-07-27 14:07:36 -07:00
Dan Finlay	e73c7b907a	Restore support link	2017-07-27 14:00:09 -07:00
Dan Finlay	1d9fea8654	Fix info page formatting	2017-07-27 13:57:01 -07:00
Dan Finlay	21bde25780	Fix spelling	2017-07-27 09:19:03 -07:00
Dan Finlay	c071591adb	Fix custom provider indication	2017-07-26 15:30:41 -07:00
Dan Finlay	bc65484e1b	Remove object spread syntax	2017-07-26 15:11:32 -07:00
Dan Finlay	8fc0a025f6	Set initial scale for mobile.	2017-07-26 14:36:22 -07:00
sdtsui	8006d798ee	Re-center network dropdown	2017-07-26 13:02:08 -07:00
sdtsui	4c0f827946	Make account selection dropdown menu scrollable when too large for view	2017-07-26 12:43:18 -07:00
sdtsui	0fdbb80962	Remove Account Settings item from optionsMenu, unnecessary	2017-07-26 12:31:08 -07:00
kumavis	9d69951dec	logState - dont redundantly log to console	2017-07-26 10:50:06 -07:00
Dan Finlay	0ea6749dbc	Lots of flex rearrangement on account detail view ... Includes removal of ReactCssTransitionGroup for a simpler UI refactor.	2017-07-25 18:25:56 -07:00
Dan Finlay	7a04643d8e	Restore sort order fix	2017-07-24 21:43:34 -07:00
Dan Finlay	a22adec66f	Replace ui with responsive-ui	2017-07-24 17:05:07 -07:00
Dan Finlay	38dccab12e	Fix reference	2017-07-20 12:54:08 -07:00
Dan Finlay	31e7d8a24b	Fix css links	2017-07-20 12:52:01 -07:00
Dan Finlay	a41e5788cf	Merge branch 'master' into NewUI	2017-07-20 12:39:06 -07:00
Dan Finlay	86d367957f	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
Dan Finlay	51c5bebdf5	Lowered minimum gas price to 1 gwei	2017-07-19 11:44:00 -07:00
sdtsui	9e8e445695	Reorder Account Selector and Account Options	2017-07-18 10:51:11 -07:00
sdtsui	f329c232a2	Hook up new dropdown components	2017-07-18 05:40:43 -07:00
sdtsui	b9dfb3cd1e	Remove account options icons	2017-07-18 05:31:53 -07:00
sdtsui	fce7bf3a1c	Remove accounts screen	2017-07-18 05:31:52 -07:00
sdtsui	b05775bfa4	Fix click handlers on AccountOptionsMenus	2017-07-18 05:31:52 -07:00
sdtsui	433fb4d242	Cleanup ... Fix lint error breaking gulp build Add presentational options menus	2017-07-18 05:31:39 -07:00
Dan Finlay	614501e743	Fix transaction confirmation ordering ... Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed. Fixes #1637	2017-07-17 14:18:00 -07:00
Dan Finlay	a4e567ffc5	Add support page link to help page ... Also adjust github link to be a new bug link, which goes to the new issue page.	2017-07-17 09:57:16 -07:00
sdtsui	d01b5c927d	Brighten dropdown menu item\'s text	2017-07-13 22:39:44 -07:00
sdtsui	a49e5e158a	Implement redesigned dropdown	2017-07-13 00:40:00 -07:00
Dan Finlay	ed8a71d350	Merge branch 'master' into NewUI	2017-07-05 15:49:51 -07:00
tmashuang	5c1ccc657c	Fix spelling	2017-07-05 13:42:15 -07:00
Dan Finlay	52a6b9f103	Reenable Default Token List ... Looks pretty clear to me now that the heavy traffic spike was not this feature, but was the EOS crowdsale. Now that we've mitigated their traffic spike, I think we can safely re-introduce this feature.	2017-07-05 10:30:48 -07:00
Dan Finlay	b72861fc98	Make responsive UI more flexy	2017-07-03 17:18:26 -07:00
Dan Finlay	e285f2cae9	Get duplicate UI template working	2017-07-03 16:16:53 -07:00
Dan Finlay	5eb3d5d485	Make folder for responsive UI	2017-07-03 15:39:25 -07:00
Kevin Serrano	36e0fef854	Merge branch 'master' into i1720-NoSpinnerOnConfig	2017-07-03 15:24:10 -07:00
Dan Finlay	8f65f964ae	Indicate which network is being searched for	2017-07-03 15:12:24 -07:00
Dan Finlay	4e4d6cea40	Add menu carrat next to network searching indicator	2017-07-03 15:06:26 -07:00
Dan Finlay	1503dba5ca	No longer show network spinner on config screen ... The config screen is used to select networks, so we must not block it with network loading indication.	2017-07-03 13:51:39 -07:00
Thomas Huang	7de87154e8	Merge branch 'master' into NoPopularTOkens	2017-06-30 10:55:01 -07:00
Dan Finlay	0c011d0fda	Remove send button ... Some token precisions are not respected by TokenFactory, so it's not sufficient for a default send form. Removing for now.	2017-06-30 10:28:27 -07:00
Dan Finlay	8abd592034	Stop loading popular tokens by default ... Improves performance when loading the token tab.	2017-06-30 10:26:45 -07:00
Kevin Serrano	ca3de2dc74	Merge pull request #1700 from MetaMask/StyleImprovements ... Add padding to token messages	2017-06-29 14:45:00 -07:00
frankiebee	5e8b4e3226	change “ACCEPT” to “SUBMIT”	2017-06-29 12:06:22 -07:00
Dan Finlay	c81a3c649a	Add padding to token messages	2017-06-28 16:36:58 -07:00
Thomas Huang	d2278699da	Merge pull request #1690 from MetaMask/i1669-StateCopyButton ... Add copy state logs button	2017-06-28 10:33:57 -07:00
Dan Finlay	1b8a4395ab	Add copy state logs button	2017-06-28 10:22:51 -07:00
Thomas Huang	bd523102fe	Merge pull request #1634 from MetaMask/i784-SendTokenButton ... Add send token button (link to TokenFactory)	2017-06-28 10:09:58 -07:00
Thomas Huang	ffd3773ef3	Merge pull request #1620 from MetaMask/i1616-AddTokenAdding ... Add ability to add tokens to token list	2017-06-28 10:07:49 -07:00
Dan Finlay	3fde5481ef	Merge pull request #1681 from MetaMask/AddressStripping ... Remove trailing periods and whitespace	2017-06-27 20:56:42 -07:00
Thomas Huang	d5f0ee4f5e	Add Back Button for Import Screen	2017-06-27 18:40:47 -07:00
Dan Finlay	8642feee09	Remove token contract validation step	2017-06-27 15:49:57 -07:00
Dan Finlay	ed08e736d7	Merge pull request #1675 from MetaMask/warning-fixes ... React Warning Fixes	2017-06-27 15:29:26 -07:00
Dan Finlay	40223687ae	Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton	2017-06-27 15:08:29 -07:00
Dan Finlay	78af771c79	Do not allow adding non token addresses	2017-06-27 15:03:35 -07:00
Dan Finlay	5440ed23d6	Support other network links	2017-06-27 14:53:27 -07:00
Dan Finlay	81ec53a814	Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin into i1616-AddTokenAdding	2017-06-27 14:46:06 -07:00
Dan Finlay	5cfce8c45a	Fix token adding bug	2017-06-27 14:45:43 -07:00
Thomas Huang	77054e1fbb	Rename Send to Next	2017-06-27 13:56:51 -07:00
Thomas Huang	a352690661	Remove trailing periods and white space	2017-06-27 12:09:50 -07:00
Kevin Serrano	9962a3068b	Change disabling button as state property.	2017-06-26 15:57:46 -07:00
Kevin Serrano	615b8d05a1	Prevent users from accidentally submitting two transactions by disabling button.	2017-06-26 15:47:53 -07:00
Kevin Serrano	f925a37a9f	Fix react warning for keys on ens address book	2017-06-26 14:01:35 -07:00
Kevin Serrano	31da623c21	Fix react warning on create-vault-complete	2017-06-26 14:01:09 -07:00
Thomas Huang	7628a83fd6	Fix Back Button on Add Token View	2017-06-26 11:47:08 -07:00
Dan Finlay	58e993ff29	Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton	2017-06-24 02:42:03 -04:00
Dan Finlay	b04d1de447	Merge branch 'master' into i784-SendTokenButton	2017-06-23 11:00:58 -04:00
Dan Finlay	06706f6e1b	Merge branch 'master' into i1616-AddTokenAdding	2017-06-23 08:50:44 -04:00
Kevin Serrano	f022c7c714	Merge pull request #1603 from MetaMask/AddTokenList ... Add popular token list	2017-06-22 17:28:10 -07:00
Thomas Huang	2a42925399	Merge pull request #1655 from MetaMask/fix-malito ... Fix broken malito link.	2017-06-21 16:20:25 -07:00
Kevin Serrano	eb7a9d7517	Fix broken malito link.	2017-06-21 15:55:22 -07:00
Dan Finlay	d0294720e2	Make seed confirmation wording scarier	2017-06-20 18:23:49 -07:00
Dan Finlay	027394b205	Reduce token list clutter by only showing held tokens ... We could change this when we allow hiding/removing tokens, but for now, this is a simple and pleasant solution.	2017-06-20 08:58:25 -07:00
Dan Finlay	97ab48ba0d	Fix propagation	2017-06-20 08:01:00 -07:00
Dan Finlay	a2781df8b4	Add better event lifecycle management to token list. ... Token list now renders errors when a token lookup fails. Also now cleans up event listeners when re-initializing the token list.	2017-06-19 19:11:55 -07:00
Dan Finlay	60855b0510	Add send button to TokenFactory ... A simple solution to a temporary token send screen: Linking to EtherScan. Will hold us over until we make our own token send view.	2017-06-19 19:02:13 -07:00
Dan Finlay	48789f2a3d	Add ability to add tokens to token list ... Fiex #1616	2017-06-15 16:22:53 -07:00
Dan Finlay	711a4def86	Make add token screen a fully working form ... Entering the address of a valid HumanStandardToken even auto-fills the other fields!	2017-06-15 15:38:23 -07:00
Dan Finlay	c4f6176820	Merge branch 'AddTokenList' into AddingTokens	2017-06-15 14:00:28 -07:00
Dan Finlay	39c7ed230d	Merge remote-tracking branch 'origin/master' into AddTokenList	2017-06-15 13:44:58 -07:00
Dan Finlay	f87c5f8a14	Remove log	2017-06-15 13:31:37 -07:00
Dan Finlay	0e1e0aa323	Create add token button and template view	2017-06-14 20:55:56 -07:00
Dan Finlay	a80945e730	Hide message on normal loading	2017-06-14 19:36:37 -07:00
Dan Finlay	1ed5804e4d	Multiple loading style improvements ... - When seeking network, show a full screen loading indication + message. - Network menu is still accessible "over" this indication. - Top Menu-Droppo components now slide *under* the menu bar like they should. - Loading indication opacity increased to increase message legibility.	2017-06-14 19:15:50 -07:00
Dan Finlay	68389d5d49	Remove excessive log	2017-06-14 18:12:41 -07:00
Dan Finlay	1814721e80	Add no tokens message	2017-06-14 18:08:03 -07:00
Dan Finlay	96d416c486	Vertically center loading indication	2017-06-14 15:30:47 -07:00
Dan Finlay	6fda78cd2b	Refresh token balance on network change	2017-06-14 15:21:51 -07:00
Dan Finlay	b7b9e0c1ac	Persist selected account tab ... Also improve error handling with token balances.	2017-06-14 14:21:50 -07:00
Kevin Serrano	a8ababe2f4	Add a new warning for file import JSON	2017-06-14 10:13:07 -07:00
Dan Finlay	3df2f2b2d4	Rename history to sent	2017-06-13 18:00:06 -07:00
Dan Finlay	108c4ab2c5	Auto populate token list with popular token balances ... Half implements #175 Things to do: - Add ability to add tokens to the list. - Persist the token tab selection (so it is an implicit preference) - Check what's up with the token-tracker polling, it seems like it is not waiting the interval.	2017-06-13 17:53:42 -07:00
Kevin Serrano	141e66171b	Merge pull request #1600 from MetaMask/i1554-ensSymFix ... ENS symbol renders on proper networks	2017-06-13 14:31:58 -07:00
Kevin Serrano	790712e6fd	Cleanup zero addresses.	2017-06-13 13:38:27 -07:00
Dan Finlay	a741cc4fc4	Merge branch 'master' into AddTokenList	2017-06-12 17:17:16 -07:00
Kevin Serrano	5e03b69892	Fix check icon appearing in inappropriate situations.	2017-06-12 16:56:37 -07:00
frankiebee	d1fa3c6de1	only prefix ethereum address	2017-06-12 14:38:26 -07:00